diff --git a/anubis_dev/library/tools/latex.anubis b/anubis_dev/library/tools/latex.anubis index 29eb84f..ffb362b 100644 --- a/anubis_dev/library/tools/latex.anubis +++ b/anubis_dev/library/tools/latex.anubis @@ -266,7 +266,7 @@ define String + "\\usepackage{textcomp}\n" + "\\usepackage{color}\n" + "\\usepackage{graphics}\n" - + "\\usepackage{longtable}\n" + //+ "\\usepackage{longtable}\n" + "\\usepackage{fancyhdr}\n" + "\\fancyhead{}\n" + "\\fancyhead[LE]{\\thepage \\hfill \\textsl{Section \\leftmark}}\n" @@ -274,7 +274,7 @@ define String + "\\fancyfoot{}\n" + "\\pagestyle{fancy}\n" + "\\renewcommand{\\headrulewidth}{0.4pt}\n\n" - + "\\raggedbottom \n" + + "\\raggedbottom\n" + more_ahead + "\n\n". @@ -338,16 +338,18 @@ define Bool ) = checking every 2000 milliseconds, wait for true - then if read(process_stdout(ec),1000,10) is + then if read(process_stdout(ec),1000,120) is { failure then print("SO=failure \n"), success(s) then print("SO=["+to_string(s)+"]\n") }; - if read(process_stderr(ec),1000,10) is + + if read(process_stderr(ec),1000,120) is { failure then print("SE=failure \n"), success(s) then print("SE=["+to_string(s)+"]\n") }; + if check_execute_status(ec) is { still_running then @@ -451,7 +453,7 @@ define ResultMakePdf --------------- -define One + define One make_pdf_file ( String file_name, @@ -513,7 +515,7 @@ define One - Compilation par un 'execute produisant un Maybe(Int8)) -------------------------------------------------------- - define One +define One make_pdf_file ( String file_name, diff --git a/anubis_dev/library/tools/maml.anubis b/anubis_dev/library/tools/maml.anubis index 7cf13ec..93672de 100644 --- a/anubis_dev/library/tools/maml.anubis +++ b/anubis_dev/library/tools/maml.anubis @@ -743,7 +743,7 @@ define String itemize_end ( List(Environment) lenv - ) = + ) ="". if member(lenv,textcolor) then "" else "\\vspace{5mm}\n". @@ -884,10 +884,11 @@ define Text site_name,public_dir) else if name = "code" then - t-("\\vspace{2mm}\n {\\tt \\setlongtables " - +"\\begin{longtable}["+(if member(lenv,center)then "c" else "l")+"]{l}\n") + //t-("\\vspace{2mm}\n{\\tt" + t-("\\\\{\\tt" + +"\\begin{tabular}{"+(if member(lenv,center)then "c" else "l")+"}\n") -code_to_LaTeX(m1,sub_environment,site_name,public_dir,lenv) - -" \\end{longtable}}\n\n \\vspace{3mm}" else + -" \\end{tabular}}\\\\ \n" else if name = "center" then t-"\\begin{center} " @@ -1004,10 +1005,11 @@ public define Text else if name = "code" then - t-(s_en(unique)+"\n {\\tt \\setlongtables " - + "\\begin{longtable}["+(if member(lenv,center) then "c" else "l")+"]{l}\n") + t-((if member(lenv,center) then "" else "\n")+s_en(unique)+"\n{\\tt" + + "\\begin{tabular}{"+(if member(lenv,center) then "c" else "l")+"}\n") -code_to_LaTeX(a1,failure,site_name,public_dir,[]) - -(" \\end{longtable}} \n"+us_en(unique)+" \n\n ") else + -("\\end{tabular}}\\vspace{0.4cm}"+us_en(unique)+ + "\n\n") else if name = "center" then t-"\\begin{center} " @@ -1029,7 +1031,9 @@ public define Text t-"\\mbox{\\textsuperscript{"-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}}" else if name = "tt" then - t-"{\\tt "-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}" else + t-"{\\tt\\textcolor{code_color}{" + -to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en) + -"}}" else alert, -- libgit2 0.21.4