From 5b9f00811d6384a64a5083c8a644ce8ef38ea0d7 Mon Sep 17 00:00:00 2001 From: Olivier Duvernois Date: Sun, 18 Sep 2005 21:39:55 +0000 Subject: [PATCH] *** empty log message *** --- anubis_dev/library/tools/latex.anubis | 14 ++++++++++++-- anubis_dev/library/tools/maml.anubis | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------- 2 files changed, 83 insertions(+), 48 deletions(-) diff --git a/anubis_dev/library/tools/latex.anubis b/anubis_dev/library/tools/latex.anubis index d4d2c47..3f1fe2d 100644 --- a/anubis_dev/library/tools/latex.anubis +++ b/anubis_dev/library/tools/latex.anubis @@ -251,7 +251,7 @@ define String String more_ahead ) = "\\documentclass[a4paper,twoside,10pt]{article}\n\n" - + "\\batchmode" + //+ "\\batchmode\n" + "\\setlength{\\headheight}{15pt}\n" + "\\setlength{\\headsep}{0.5cm}\n" + "\\setlength{\\headheight}{15pt}\n" @@ -336,7 +336,17 @@ define Bool ) = checking every 2000 milliseconds, wait for true - then if check_execute_status(ec) is + then if read(process_stdout(ec),1000,10) is + { + failure then print("SO=failure \n"), + success(s) then print("SO=["+to_string(s)+"]\n") + }; + if read(process_stderr(ec),1000,10) 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 if now>max_time diff --git a/anubis_dev/library/tools/maml.anubis b/anubis_dev/library/tools/maml.anubis index 9b6768a..5a99f44 100644 --- a/anubis_dev/library/tools/maml.anubis +++ b/anubis_dev/library/tools/maml.anubis @@ -558,8 +558,17 @@ define Text public define String maml_LaTeX_colors = - "\\definecolor{my_green}{rgb}{0.27,0.51,0.27}\n" - + "\\definecolor{my_grey}{gray}{0.50}\n". + //"\\definecolor{my_green}{rgb}{0.27,0.51,0.27}\n" + "\\definecolor{my_green}{rgb}{0.09,0.66,0.09}\n" + + "\\definecolor{my_grey}{gray}{0.50}\n" + + "\\definecolor{code_color}{rgb}{0.05,0.41,0.64}\n". + + "\\definecolor{code_color}{rgb}{0.61,0.50,0}\n". + + "\\definecolor{code_color}{rgb}{0.43,0.43,0.12}\n". + + "\\definecolor{code_color}{rgb}{0.54,0.54,0.15}\n". + + "\\definecolor{code_color}{rgb}{0.60,0.60,0.16}\n". + + "\\definecolor{code_color}{rgb}{0.77,0.77,0.29}\n". + + "\\definecolor{code_color}{rgb}{0.53,0.50,0.21}\n". + "\\definecolor{my_green}{rgb}{0.15,0.54,0.15}\n" Prise en compte de la balise 'big' de MAML @@ -774,7 +783,9 @@ define String { failure then end_code_color+(if t is [] then "" else "\\\\ ")+begin_code_color, success(s) then end_code_color+"} "+(if t is [] then "" else "\\\\ ")+begin_code_color+s - } + } else + if h ='|' then "\\raisebox{-2.8pt}{\\rule{0.5pt}{11pt}}" else + if h = '-' then "$-$" else transform_schar(h,latex_schar)) + format_code_with_color2(t,sub_environment,begin_code_color,end_code_color) }. @@ -791,7 +802,8 @@ define String { [] then end_code_color, [h . t] then - if h=13 //h = '\n' //| h = 13 + //if h=13 //h = '\n' //| h = 13 + if h = '\n' | h = 13 then format_code_with_color(t,sub_environment,begin_code_color,end_code_color) else format_code_with_color2(l,sub_environment,begin_code_color,end_code_color) }. @@ -811,8 +823,8 @@ define Text format_code(te,sub_environment,lenv) - if member(lenv,textcolor) then format_code_with_color(explode(s),sub_environment,"","") - else ("\\textcolor{my_grey}{" - + format_code_with_color(explode(s),sub_environment," \\textcolor{my_grey}{","}")), + else ("\\textcolor{code_color}{" + + format_code_with_color(explode(s),sub_environment," \\textcolor{code_color}{","}")), Text t1 - Text t2 then format_code(t1,sub_environment,lenv) - format_code(t2,sub_environment,lenv) }. @@ -823,21 +835,24 @@ define Text define Text code_to_LaTeX ( - MAML m, - Maybe(String) sub_environment, - String site_name, - String public_dir, - List(Environment) lenv + MAML m, + Maybe(String) sub_environment, + String site_name, + String public_dir, + List(Environment) lenv ) = if m is { text(Text t) then format_code(t,sub_environment,lenv), - mark(String name) then to_text(name), + mark(String name) then + t-"\\textcolor{code_color}{"-to_text(name)-"}", mark(String name,MAML m1) then - if name = "bold" then t-"{\\bf " - -code_to_LaTeX(m1,success("\\bf"),site_name,public_dir,lenv)-"}" else - if name = "italic" then t-"{\\it " - -code_to_LaTeX(m1,success("\\it"),site_name,public_dir,lenv)-"}" else + if name = "bold" then + t-"{\\bf " + -code_to_LaTeX(m1,success("\\bf"),site_name,public_dir,lenv)-"}" else + if name = "italic" then + t-"{\\it " + -code_to_LaTeX(m1,success("\\it"),site_name,public_dir,lenv)-"}" else if name = "yellow" then t-"\\textcolor{yellow}{" -code_to_LaTeX(m1,success("\\textcolor{yellow}{"),site_name,public_dir,[textcolor . lenv]) @@ -938,7 +953,9 @@ public define Text MAML m, String site_name, String public_dir, - List(Environment) lenv + List(Environment) lenv, + One -> String s_en, // select_english + One -> String us_en // unselect_english ) = if m is { @@ -948,88 +965,94 @@ public define Text mark(String name,MAML a1) then if name = "bold" then - t-"{\\bf "-to_LaTeX(a1,site_name,public_dir,lenv)-"}" else + t-"{\\bf "-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}" else if name = "italic" then - t-"{\\it "-to_LaTeX(a1,site_name,public_dir,lenv)-"}" else + t-"{\\it "-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}" else if name = "yellow" then t-"\\textcolor{yellow}{" - -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv]) + -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv],s_en,us_en) -("}"+textcolor_end(lenv)) else if name = "red" then if next_maml_is(a1,"code") - then to_LaTeX(a1,site_name,public_dir,lenv) + then to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en) else (t-"\\textcolor{red}{" - -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv]) + -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv],s_en,us_en) -("}"+textcolor_end(lenv))) else if name = "grey" then t-"\\textcolor{my_grey}{" - -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv]) + -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv],s_en,us_en) -("}"+textcolor_end(lenv)) else if name = "green" then t-"\\textcolor{my_green}{" - -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv]) + -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv],s_en,us_en) -("}"+textcolor_end(lenv)) else if name = "blue" then t-"\\textcolor{blue}{" - -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv]) + -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv],s_en,us_en) -("}"+textcolor_end(lenv)) else if name = "big" then (if big_to_LaTeX(1,a1) is (string_latex,next_maml) then - t-("{"+string_latex)-to_LaTeX(next_maml,site_name,public_dir,lenv)-"}") else + t-("{"+string_latex)-to_LaTeX(next_maml,site_name,public_dir,lenv,s_en,us_en)-"}") else if name = "image" then image_to_LaTeX - (a1,(MAML ma) |-> to_LaTeX(ma,site_name,public_dir,lenv),site_name,public_dir) else + (a1,(MAML ma) |-> to_LaTeX(ma,site_name,public_dir,lenv,s_en,us_en),site_name,public_dir) + else if name = "code" then - t-(" {\\tt \\setlongtables " + t-(s_en(unique)+"\n {\\tt \\setlongtables " + "\\begin{longtable}["+(if member(lenv,center) then "c" else "l")+"]{l}\n") -code_to_LaTeX(a1,failure,site_name,public_dir,[]) - -" \\end{longtable}} \n\n " else + -(" \\end{longtable}} \n"+us_en(unique)+" \n\n ") else if name = "center" then - t-"\\begin{center} "-to_LaTeX(a1,site_name,public_dir,[center . lenv])-"\\end{center}" else + t-"\\begin{center} " + -to_LaTeX(a1,site_name,public_dir,[center . lenv],s_en,us_en) + -"\\end{center}" else if name = "link" then - t-"{\\tt "-to_LaTeX(a1,site_name,public_dir,lenv)-"}" else + t-"{\\tt "-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}" else if name = "list" then - t-("\\begin{itemize}\n"+itemize_format) - -to_LaTeX(a1,site_name,public_dir,[itemize . lenv]) - -("\\end{itemize} "+itemize_end(lenv)) else + t-(s_en(unique)+"\n \\begin{itemize}\n"+itemize_format) + -to_LaTeX(a1,site_name,public_dir,[itemize . lenv],s_en,us_en) + -("\\end{itemize} "+itemize_end(lenv)+"\n "+us_en(unique)) else if name = "sub" then - t-"\\mbox{$_{"-to_LaTeX(a1,site_name,public_dir,lenv)-"}$}" else + t-"\\mbox{$_{"-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}$}" else if name = "sup" then - t-"\\mbox{\\textsuperscript{"-to_LaTeX(a1,site_name,public_dir,lenv)-"}}" else + 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)-"}" else + t-"{\\tt "-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}" else alert, mark(String name,MAML a1,MAML a2) then alert, mark(String name,MAML a1,MAML a2,MAML a3) then alert, - m1 + m2 then to_LaTeX(m1,site_name,public_dir,lenv) - to_LaTeX(m2,site_name,public_dir,lenv) + m1 + m2 then to_LaTeX(m1,site_name,public_dir,lenv,s_en,us_en) + - to_LaTeX(m2,site_name,public_dir,lenv,s_en,us_en) }. public define Text to_LaTeX ( - MAML m, - String site_name, - String public_dir, + MAML m, + String site_name, + String public_dir, + One -> String select_english, + One -> String unselect_english ) = - to_LaTeX(m,site_name,public_dir,[]). + to_LaTeX(m,site_name,public_dir,[],select_english,unselect_english). @@ -1063,14 +1086,16 @@ public define Result(Int32,String) public define Result(Int32,String) convert_MAML_to_LaTeX ( - String s, - String site_name, // sommething like : "www.my_beautiful_site.com" - String public_dir + String s, + String site_name, // sommething like : "www.my_beautiful_site.com" + String public_dir, + One -> String select_english, + One -> String unselect_english ) = if parse_MAML(make_stream(s)) is { error(i) then error(i), - ok(m) then ok(to_string(to_LaTeX(m,site_name,public_dir))) + ok(m) then ok(to_string(to_LaTeX(m,site_name,public_dir,select_english,unselect_english))) }. \ No newline at end of file -- libgit2 0.21.4