Anubis / Anubis

Commit 5b9f00811d6384a64a5083c8a644ce8ef38ea0d7

Authored by Olivier Duvernois
1 parent a39f4d7d

*** empty log message ***

Showing 2 changed files with 83 additions and 48 deletions   Show diff stats
Inline Side-by-side
anubis_dev/library/tools/latex.anubis
  Show/Hide comments   View file @5b9f008
... ... @@ -251,7 +251,7 @@ define String
251 251 String more_ahead
252 252 ) =
253 253 "\\documentclass[a4paper,twoside,10pt]{article}\n\n"
254   - + "\\batchmode"
  254 + //+ "\\batchmode\n"
255 255 + "\\setlength{\\headheight}{15pt}\n"
256 256 + "\\setlength{\\headsep}{0.5cm}\n"
257 257 + "\\setlength{\\headheight}{15pt}\n"
... ... @@ -336,7 +336,17 @@ define Bool
336 336 ) =
337 337 checking every 2000 milliseconds,
338 338 wait for true
339   - then if check_execute_status(ec) is
  339 + then if read(process_stdout(ec),1000,10) is
  340 + {
  341 + failure then print("SO=failure \n"),
  342 + success(s) then print("SO=["+to_string(s)+"]\n")
  343 + };
  344 + if read(process_stderr(ec),1000,10) is
  345 + {
  346 + failure then print("SE=failure \n"),
  347 + success(s) then print("SE=["+to_string(s)+"]\n")
  348 + };
  349 + if check_execute_status(ec) is
340 350 {
341 351 still_running then
342 352 if now>max_time
... ...
anubis_dev/library/tools/maml.anubis
  Show/Hide comments   View file @5b9f008
... ... @@ -558,8 +558,17 @@ define Text
558 558 public define String
559 559 maml_LaTeX_colors
560 560 =
561   - "\\definecolor{my_green}{rgb}{0.27,0.51,0.27}\n"
562   - + "\\definecolor{my_grey}{gray}{0.50}\n".
  561 + //"\\definecolor{my_green}{rgb}{0.27,0.51,0.27}\n"
  562 + "\\definecolor{my_green}{rgb}{0.09,0.66,0.09}\n"
  563 + + "\\definecolor{my_grey}{gray}{0.50}\n"
  564 + + "\\definecolor{code_color}{rgb}{0.05,0.41,0.64}\n".
  565 + + "\\definecolor{code_color}{rgb}{0.61,0.50,0}\n".
  566 + + "\\definecolor{code_color}{rgb}{0.43,0.43,0.12}\n".
  567 + + "\\definecolor{code_color}{rgb}{0.54,0.54,0.15}\n".
  568 + + "\\definecolor{code_color}{rgb}{0.60,0.60,0.16}\n".
  569 + + "\\definecolor{code_color}{rgb}{0.77,0.77,0.29}\n".
  570 + + "\\definecolor{code_color}{rgb}{0.53,0.50,0.21}\n".
  571 + "\\definecolor{my_green}{rgb}{0.15,0.54,0.15}\n"
563 572  
564 573  
565 574 Prise en compte de la balise 'big' de MAML
... ... @@ -774,7 +783,9 @@ define String
774 783 {
775 784 failure then end_code_color+(if t is [] then "" else "\\\\ ")+begin_code_color,
776 785 success(s) then end_code_color+"} "+(if t is [] then "" else "\\\\ ")+begin_code_color+s
777   - }
  786 + } else
  787 + if h ='|' then "\\raisebox{-2.8pt}{\\rule{0.5pt}{11pt}}" else
  788 + if h = '-' then "$-$"
778 789 else transform_schar(h,latex_schar))
779 790 + format_code_with_color2(t,sub_environment,begin_code_color,end_code_color)
780 791 }.
... ... @@ -791,7 +802,8 @@ define String
791 802 {
792 803 [] then end_code_color,
793 804 [h . t] then
794   - if h=13 //h = '\n' //| h = 13
  805 + //if h=13 //h = '\n' //| h = 13
  806 + if h = '\n' | h = 13
795 807 then format_code_with_color(t,sub_environment,begin_code_color,end_code_color)
796 808 else format_code_with_color2(l,sub_environment,begin_code_color,end_code_color)
797 809 }.
... ... @@ -811,8 +823,8 @@ define Text
811 823 format_code(te,sub_environment,lenv)
812 824 - if member(lenv,textcolor)
813 825 then format_code_with_color(explode(s),sub_environment,"","")
814   - else ("\\textcolor{my_grey}{"
815   - + format_code_with_color(explode(s),sub_environment," \\textcolor{my_grey}{","}")),
  826 + else ("\\textcolor{code_color}{"
  827 + + format_code_with_color(explode(s),sub_environment," \\textcolor{code_color}{","}")),
816 828 Text t1 - Text t2 then
817 829 format_code(t1,sub_environment,lenv) - format_code(t2,sub_environment,lenv)
818 830 }.
... ... @@ -823,21 +835,24 @@ define Text
823 835 define Text
824 836 code_to_LaTeX
825 837 (
826   - MAML m,
827   - Maybe(String) sub_environment,
828   - String site_name,
829   - String public_dir,
830   - List(Environment) lenv
  838 + MAML m,
  839 + Maybe(String) sub_environment,
  840 + String site_name,
  841 + String public_dir,
  842 + List(Environment) lenv
831 843 ) =
832 844 if m is
833 845 {
834 846 text(Text t) then format_code(t,sub_environment,lenv),
835   - mark(String name) then to_text(name),
  847 + mark(String name) then
  848 + t-"\\textcolor{code_color}{"-to_text(name)-"}",
836 849 mark(String name,MAML m1) then
837   - if name = "bold" then t-"{\\bf "
838   - -code_to_LaTeX(m1,success("\\bf"),site_name,public_dir,lenv)-"}" else
839   - if name = "italic" then t-"{\\it "
840   - -code_to_LaTeX(m1,success("\\it"),site_name,public_dir,lenv)-"}" else
  850 + if name = "bold" then
  851 + t-"{\\bf "
  852 + -code_to_LaTeX(m1,success("\\bf"),site_name,public_dir,lenv)-"}" else
  853 + if name = "italic" then
  854 + t-"{\\it "
  855 + -code_to_LaTeX(m1,success("\\it"),site_name,public_dir,lenv)-"}" else
841 856 if name = "yellow" then
842 857 t-"\\textcolor{yellow}{"
843 858 -code_to_LaTeX(m1,success("\\textcolor{yellow}{"),site_name,public_dir,[textcolor . lenv])
... ... @@ -938,7 +953,9 @@ public define Text
938 953 MAML m,
939 954 String site_name,
940 955 String public_dir,
941   - List(Environment) lenv
  956 + List(Environment) lenv,
  957 + One -> String s_en, // select_english
  958 + One -> String us_en // unselect_english
942 959 ) =
943 960 if m is
944 961 {
... ... @@ -948,88 +965,94 @@ public define Text
948 965  
949 966 mark(String name,MAML a1) then
950 967 if name = "bold" then
951   - t-"{\\bf "-to_LaTeX(a1,site_name,public_dir,lenv)-"}" else
  968 + t-"{\\bf "-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}" else
952 969  
953 970 if name = "italic" then
954   - t-"{\\it "-to_LaTeX(a1,site_name,public_dir,lenv)-"}" else
  971 + t-"{\\it "-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}" else
955 972  
956 973 if name = "yellow" then
957 974 t-"\\textcolor{yellow}{"
958   - -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv])
  975 + -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv],s_en,us_en)
959 976 -("}"+textcolor_end(lenv)) else
960 977  
961 978 if name = "red" then
962 979 if next_maml_is(a1,"code")
963   - then to_LaTeX(a1,site_name,public_dir,lenv)
  980 + then to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)
964 981 else (t-"\\textcolor{red}{"
965   - -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv])
  982 + -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv],s_en,us_en)
966 983 -("}"+textcolor_end(lenv))) else
967 984  
968 985 if name = "grey" then
969 986 t-"\\textcolor{my_grey}{"
970   - -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv])
  987 + -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv],s_en,us_en)
971 988 -("}"+textcolor_end(lenv)) else
972 989  
973 990 if name = "green" then
974 991 t-"\\textcolor{my_green}{"
975   - -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv])
  992 + -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv],s_en,us_en)
976 993 -("}"+textcolor_end(lenv)) else
977 994  
978 995 if name = "blue" then
979 996 t-"\\textcolor{blue}{"
980   - -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv])
  997 + -to_LaTeX(a1,site_name,public_dir,[textcolor . lenv],s_en,us_en)
981 998 -("}"+textcolor_end(lenv)) else
982 999  
983 1000 if name = "big" then
984 1001 (if big_to_LaTeX(1,a1) is (string_latex,next_maml) then
985   - t-("{"+string_latex)-to_LaTeX(next_maml,site_name,public_dir,lenv)-"}") else
  1002 + t-("{"+string_latex)-to_LaTeX(next_maml,site_name,public_dir,lenv,s_en,us_en)-"}") else
986 1003  
987 1004 if name = "image" then
988 1005 image_to_LaTeX
989   - (a1,(MAML ma) |-> to_LaTeX(ma,site_name,public_dir,lenv),site_name,public_dir) else
  1006 + (a1,(MAML ma) |-> to_LaTeX(ma,site_name,public_dir,lenv,s_en,us_en),site_name,public_dir)
  1007 + else
990 1008  
991 1009 if name = "code" then
992   - t-(" {\tt \setlongtables "
  1010 + t-(s_en(unique)+"\n {\tt \setlongtables "
993 1011 + "\\begin{longtable}["+(if member(lenv,center) then "c" else "l")+"]{l}\n")
994 1012 -code_to_LaTeX(a1,failure,site_name,public_dir,[])
995   - -" \\end{longtable}} \n\n " else
  1013 + -(" \\end{longtable}} \n"+us_en(unique)+" \n\n ") else
996 1014  
997 1015 if name = "center" then
998   - t-"\\begin{center} "-to_LaTeX(a1,site_name,public_dir,[center . lenv])-"\\end{center}" else
  1016 + t-"\\begin{center} "
  1017 + -to_LaTeX(a1,site_name,public_dir,[center . lenv],s_en,us_en)
  1018 + -"\\end{center}" else
999 1019  
1000 1020 if name = "link" then
1001   - t-"{\\tt "-to_LaTeX(a1,site_name,public_dir,lenv)-"}" else
  1021 + t-"{\\tt "-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}" else
1002 1022  
1003 1023 if name = "list" then
1004   - t-("\\begin{itemize}\n"+itemize_format)
1005   - -to_LaTeX(a1,site_name,public_dir,[itemize . lenv])
1006   - -("\\end{itemize} "+itemize_end(lenv)) else
  1024 + t-(s_en(unique)+"\n \\begin{itemize}\n"+itemize_format)
  1025 + -to_LaTeX(a1,site_name,public_dir,[itemize . lenv],s_en,us_en)
  1026 + -("\\end{itemize} "+itemize_end(lenv)+"\n "+us_en(unique)) else
1007 1027  
1008 1028 if name = "sub" then
1009   - t-"\\mbox{$_{"-to_LaTeX(a1,site_name,public_dir,lenv)-"}$}" else
  1029 + t-"\\mbox{$_{"-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}$}" else
1010 1030  
1011 1031 if name = "sup" then
1012   - t-"\\mbox{\\textsuperscript{"-to_LaTeX(a1,site_name,public_dir,lenv)-"}}" else
  1032 + t-"\\mbox{\\textsuperscript{"-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}}" else
1013 1033  
1014 1034 if name = "tt" then
1015   - t-"{\\tt "-to_LaTeX(a1,site_name,public_dir,lenv)-"}" else
  1035 + t-"{\\tt "-to_LaTeX(a1,site_name,public_dir,lenv,s_en,us_en)-"}" else
1016 1036  
1017 1037 alert,
1018 1038  
1019 1039 mark(String name,MAML a1,MAML a2) then alert,
1020 1040 mark(String name,MAML a1,MAML a2,MAML a3) then alert,
1021   - m1 + m2 then to_LaTeX(m1,site_name,public_dir,lenv) - to_LaTeX(m2,site_name,public_dir,lenv)
  1041 + m1 + m2 then to_LaTeX(m1,site_name,public_dir,lenv,s_en,us_en)
  1042 + - to_LaTeX(m2,site_name,public_dir,lenv,s_en,us_en)
1022 1043 }.
1023 1044  
1024 1045  
1025 1046 public define Text
1026 1047 to_LaTeX
1027 1048 (
1028   - MAML m,
1029   - String site_name,
1030   - String public_dir,
  1049 + MAML m,
  1050 + String site_name,
  1051 + String public_dir,
  1052 + One -> String select_english,
  1053 + One -> String unselect_english
1031 1054 ) =
1032   - to_LaTeX(m,site_name,public_dir,[]).
  1055 + to_LaTeX(m,site_name,public_dir,[],select_english,unselect_english).
1033 1056  
1034 1057  
1035 1058  
... ... @@ -1063,14 +1086,16 @@ public define Result(Int32,String)
1063 1086 public define Result(Int32,String)
1064 1087 convert_MAML_to_LaTeX
1065 1088 (
1066   - String s,
1067   - String site_name, // sommething like : "www.my_beautiful_site.com"
1068   - String public_dir
  1089 + String s,
  1090 + String site_name, // sommething like : "www.my_beautiful_site.com"
  1091 + String public_dir,
  1092 + One -> String select_english,
  1093 + One -> String unselect_english
1069 1094 ) =
1070 1095 if parse_MAML(make_stream(s)) is
1071 1096 {
1072 1097 error(i) then error(i),
1073   - ok(m) then ok(to_string(to_LaTeX(m,site_name,public_dir)))
  1098 + ok(m) then ok(to_string(to_LaTeX(m,site_name,public_dir,select_english,unselect_english)))
1074 1099 }.
1075 1100  
1076 1101  
1077 1102 \ No newline at end of file
... ...