*** empty log message ***

* empty log message *
Olivier Duvernois
1 parent a237dba4
Showing 1 changed file with 79 additions and 38 deletions Show diff stats
anubis_dev/library/tools/latex.anubis
@@ -199,6 +199,27 @@ public define String
    Compilation LaTeX (to PDF)
    --------------------------
  
+  
+define Bool
+   execute_control
+     (
+       ExecuteControl    ec,
+       Int32             max_time
+     ) =
+   checking every 2000 milliseconds,
+   wait for true 
+     then if check_execute_status(ec) is 
+            {
+              still_running        then 
+                if now>max_time
+                  then print("Time over \n"); false
+                  else execute_control(ec,max_time),
+              abnormal_termination then print("abnormal_termination \n"); false
+              finished(i)          then 
+                if i = 0 then true else print("Error: finished <> 0 \n"); false
+            }.
+   
+   
 define One
    make_pdf_file
      (
@@ -208,28 +229,67 @@ define One
      ) =
    if (Maybe(ExecuteControl))execute(mb_execution_directory,"dvipdf",[file_name+".dvi"]) is 
      {
-       failure    then print("Error execute making pdf file \n"),
-       success(s) then 
-        if check_execute_status(s) is 
-          {
-            still_running          then print("compilation is still running 2 \n"),
-            abnormal_termination   then print("abnormal_termination 2\n"),
-            finished(i)  then 
-              if i = 0 then  
+       failure     then print("Error execute making pdf file \n"),
+       success(ec) then
+         print("dvipdf : ");
+         if execute_control(ec,now+30) 
+           then print("OK \n");
              if mb_pdf_directory is 
                 {
-                failure           then unique,
-                 success(pdf_dir)  then 
-             if (Maybe(Int8))execute(mb_execution_directory,"mv",[file_name+".pdf",pdf_dir]) is  
-            { 
-              failure     then print("Error execute mv pdf \n"),
-              success(mv) then 
-                if mv = 0 then print("mv pdf = OK ") else print("Error mv PDF \n")
-            }}
-     else print("Error making pdf file \n")}
+                  failure           then unique,
+                  success(pdf_dir)  then 
+             if (Maybe(ExecuteControl))execute(mb_execution_directory,"mv",[file_name+".pdf",pdf_dir]) is  
+                { 
+                  failure     then print("Error execute mv pdf \n"),
+                  success(mv) then 
+                    print("mv pdf file -> pdf_directory : ");
+                    if execute_control(mv,now+10) 
+                      then print("OK \n")
+                      else  print("Error mv PDF \n")
+               }}
+                 
+           else print("Error making pdf file \n")
       }.
  
  
+   
+public define One
+   latex_compilation
+     (
+       String          file_name,           // without extension
+       Maybe(String)   mb_execution_directory,
+       Maybe(String)   mb_pdf_directory,
+       Int32           compilation_number   // 2 if table-of-contents is required
+     ) =
+   if (Maybe(ExecuteControl))
+     execute(mb_execution_directory,"latex",[file_name+".tex"]) is 
+     {
+       failure     then print("Error executing compilation n°"+compilation_number+"\n"),
+       success(ec) then 
+         print("Compilation n°"+compilation_number+" : ");
+         if execute_control(ec,now+60) 
+           then print("OK\n");
+                if compilation_number = 1
+                  then make_pdf_file(file_name,mb_execution_directory,mb_pdf_directory)
+                   else latex_compilation(file_name,mb_execution_directory,
+                                          mb_pdf_directory,compilation_number-1)
+           else print("Error compilation n°"+compilation_number+"\n")
+      }.
+
+   
+
+   
+   
+   
+   - Compilation par un 'execute produisant un Maybe(Int8))   
+   --------------------------------------------------------
+ define One
+   make_pdf_file
+     (
+       String          file_name,
+       Maybe(String)   mb_execution_directory,
+       Maybe(String)   mb_pdf_directory,
+     ) =
    if (Maybe(Int8))execute(mb_execution_directory,"dvipdf",[file_name+".dvi"]) is 
      {
        failure    then print("Error execute making pdf file \n"),
@@ -248,7 +308,8 @@ define One
      else print("Error making pdf file \n")
       }.
  
-public define One
+   
+ public define One
    latex_compilation
      (
        String          file_name,           // without extension
@@ -256,26 +317,6 @@ public define One
        Maybe(String)   mb_pdf_directory,
        Int32           compilation_number   // 2 if table-of-contents is required
      ) =
-   if (Maybe(ExecuteControl))
-     execute(mb_execution_directory,"latex",[file_name+".tex"]) is 
-     {
-       failure    then print("Error executing compilation n°"+compilation_number+"\n"),
-       success(s) then 
-         if check_execute_status(s) is 
-           {
-             still_running          then print("compilation is still running 1 \n"),
-             abnormal_termination   then print("abnormal_termination 1\n"),
-             finished(i)  then 
-               if i = 0
-               then if compilation_number = 1
-                     then make_pdf_file(file_name,mb_execution_directory,mb_pdf_directory)
-                     else latex_compilation(file_name,mb_execution_directory,
-                                         mb_pdf_directory,compilation_number-1)
-               else print("Error compilation n°"+compilation_number+"\n")
-          }
-      }.
-
-   
    if (Maybe(Int8))
      execute(mb_execution_directory,"latex",[file_name+".tex"]) is 
      {