devrelease

alltt.hva

@@ -0,0 +1,2 @@
+\@primitives{alltt}
+\alltt@loadedtrue

examples/suite.tex

@@ -335,7 +335,7 @@ \section{Test du display}
 
 $$1 + a_{i+1} + \int^N_01/x dx + \frac{\partial x}{2}$$
 
-Mauvais espacemnt en mode display~:
+Mauvais espacement en mode display~:
 $$
 {C_N \over C_{N-1}} + \frac{C_{N+1}}{C_N} + \begin{array}{c}C_{N-2} \\
 \hline C_{N-1}\end{array} + 4 + \cdots + 5
@@ -1031,6 +1031,7 @@ \subsection{Arrays}
 \end{tabular*}
 
 \section{The \texttt{ifthen} Package}
+
 \subsection{Des ok partout}
 \newboolean{coucou}\newboolean{zob}%
 \ifthenelse{\boolean{coucou}}{\setboolean{zob}{false}}{\setboolean{zob}{true}}%

get.mll

@@ -18,7 +18,7 @@ open Lexstate
 open Stack
 
 (* Compute functions *)
-let header = "$Id: get.mll,v 1.21 2000-06-02 15:23:17 maranget Exp $"
+let header = "$Id: get.mll,v 1.22 2000-07-19 16:39:20 maranget Exp $"
 
 exception Error of string
 
@@ -212,7 +212,7 @@ rule result = parse
 |  '#' ['1'-'9']
     {let lxm = lexeme lexbuf in
     let i = Char.code (lxm.[1]) - Char.code '1' in
-    scan_arg (scan_this result) i ;
+    scan_arg (scan_this_arg result) i ;
     result lexbuf} 
 | command_name
     {let lxm = lexeme lexbuf in

html/fancyvrb.hva

@@ -0,0 +1,95 @@
+\@primitives{fancyvrb}
+\usepackage{keyval}
+%%%%%%%% Helper
+\def\verb@table#1{\@open{TABLE}{#1}\@open{TR}{}\@open{TD}{}}
+\def\verb@elbat{\@close{TD}\@close{TR}\@close{TABLE}}
+%%%%%%%%% Font size
+\define@key{fancyvrb}{fontsize}{\def\verb@size{#1}}
+\def\verb@size{}
+\define@key{fancyvrb}{fontshape}{\def\verb@shape{\csname #1shape\endcsname}}
+\def\verb@shape{}
+%%%%%%% Labels
+\def\verb@label@
+  #1{\@open{TR}{}\@open{TH}{ALIGN=center COLSPAN=3}#1\@close{TH}\@close{TR}}
+\def\verb@toplabel{}\def\verb@bottomlabel{}
+\def\verb@deftop#1{\def\verb@toplabel{\ifverb@top\verb@horiz@line\verb@label@{#1}\fi}}
+\def\verb@defbottom#1{\def\verb@bottomlabel{\ifverb@bottom\verb@label@{#1}\verb@horiz@line\fi}}
+\newcommand{\verb@labelkey}[2][]
+  {\def\verb@test{#1}%
+  \ifx\verb@test\@empty\def\verb@label{#2}\else
+  \def\verb@label{#1}\def\verb@labelbis{#2}\fi}
+\newcommand{\verb@labels}[2][]
+  {\def\verb@test{#1}%
+  \ifx\verb@test\@empty\verb@deftop{#2}\else
+  \verb@deftop{#1}\verb@defbottom{#2}\fi}
+\define@key{fancyvrb}{label}{\@callopt{\verb@labelkey}{#1}}
+\def\verb@labelpos{default}
+\define@key{fancyvrb}{labelposition}{\def\verb@labelpos{#1}}
+%%%%%%% Framing
+\def\verb@framesize{2}
+\define@key{fancyvrb}{framerule}{\def\verb@framesize{\@getlength{#1}}}
+\def\verb@framesep{1}
+\define@key{fancyvrb}{framesep}{\def\verb@framesep{\@getlength{#1}}}
+\def\verb@rulecolor{black}
+\def\verb@rulecolor@key
+#1{\def\verb@rulecolor{{\let\color\@getcolor#1}}}
+\define@key{fancyvrb}{rulecolor}{\verb@rulecolor@key{#1}}
+\def\verb@fillcolor@key
+#1{\def\verb@fillcolor{{\let\color\@getcolor{}BGCOLOR=#1{}}}}
+\define@key{fancyvrb}{fillcolor}{\verb@fillcolor@key{#1}}
+\def\verb@fillcolor{}
+\def\verb@horiz@line
+  {\@open{TR}{}\verb@vert@line[3]\@close{TR}}
+\newcommand{\verb@vert@line}[1][1]
+  {\@open{TD}{BGCOLOR=\verb@rulecolor{} COLSPAN="\@getprint{#1}"}%
+   \verb@table{CELLSPACING="\verb@framesize" CELLPADDING=0 BORDER=0}
+   \verb@elbat\@close{TD}}
+\define@key{fancyvrb}{frame}{\def\verb@frame{#1}}
+\def\verb@frame{none}
+\def\begin@frame@{\@open{TABLE}{BORDER=1 CELLSPACING=0 CELLPADDING=0}\verb@toplabel\@open{TR}{}\@open{TD}{}\@open{TABLE}{\@getprint{\verb@fillcolor} BORDER=0 CELLPADDING=0
+  CELLSPACING=0}\ifverb@top\verb@horiz@line\fi\@open{TR}{}\ifverb@left\verb@vert@line\fi\@open{TD}{}\@open{TABLE}{BORDER=0
+  CELLPADDING="\verb@framesep" CELLSPACING=0}\@open{TR}{}\@open{TD}{}}
+\def\end@frame@{\@close{TD}\@close{TR}\@close{TABLE}\@close{TD}\ifverb@right\verb@vert@line\fi\@close{TR}\ifverb@bottom\verb@horiz@line\fi\@close{TABLE}\@close{TD}\@close{TR}\verb@bottomlabel\@close{TABLE}}
+\newif\ifverb@left\newif\ifverb@bottom\newif\ifverb@top\newif\ifverb@right
+\def\reset@frame
+  {\setcounter{verb@count}{0}%
+  \verb@leftfalse\verb@bottomfalse\verb@topfalse\verb@rightfalse%
+  \def\verb@toplabel{}\def\verb@bottomlabel{}}
+\def\verb@labelmaker#1#2{\ifu#2\else#1#2\fi}
+\def\check@labels
+  {\ifthenelse{\equal{\verb@labelpos}{topline}}
+    {\verb@labelmaker{\verb@deftop}{\verb@label}}{}%
+  \ifthenelse{\equal{\verb@labelpos}{bottomline}}
+    {\verb@labelmaker{\verb@defbottom}{\verb@label}%
+    \verb@labelmaker{\verb@defbottom}{\verb@labelbis}}{}%
+  \ifthenelse{\equal{\verb@labelpos}{all}}
+    {\verb@labelmaker{\verb@deftop}{\verb@label}%
+    \verb@labelmaker{\verb@defbottom}{\verb@label}%
+    \verb@labelmaker{\verb@defbottom}{\verb@labelbis}}{}%
+  \ifthenelse{\equal{\verb@labelpos}{default}}
+    {\verb@labelmaker{\verb@deftop}{\verb@label}%
+    \verb@labelmaker{\verb@defbottom}{\verb@labelbis}}{}}
+\def\check@frame
+  {\reset@frame%
+   \ifthenelse{\equal{\verb@frame}{lines}}{\verb@toptrue\verb@bottomtrue}{}%
+   \ifthenelse{\equal{\verb@frame}{leftline}}{\verb@lefttrue}{}%
+   \ifthenelse{\equal{\verb@frame}{topline}}{\verb@toptrue}{}%
+   \ifthenelse{\equal{\verb@frame}{bottomline}}{\verb@bottomtrue}{}%
+   \ifthenelse{\equal{\verb@frame}{single}}
+     {\verb@toptrue\verb@bottomtrue\verb@lefttrue\verb@righttrue}{}%
+   \ifthenelse{\equal{\verb@frame}{none}}
+      {\let\begin@frame\@empty\let\end@frame\@empty}
+      {\check@labels\let\begin@frame\begin@frame@\let\end@frame\end@frame@}}
+%%%%%%%%% Line numbers
+\newcounter{verb@count}
+\newcommand{\verb@startline}{\stepcounter{verb@count}\theverb@count}
+%%%%%%%%%% User command
+\newcommand{\fvset}[1]{\@setkeys{fancyvrb}{#1}}
+\newenvironment{Verbatim}[1][]
+  {\@end{Verbatim}\begingroup%
+  \@setkeys{fancyvrb}{#1}%
+  \let\Verbatim\@Verbatim%
+  \def\endVerbatim{\@endVerbatim\@close{}\end@frame\endgroup\@open{}{}}%
+  \check@frame\begin@frame\verb@shape\verb@size\begin{Verbatim}}{}
+\newcommand{\VerbatimInput}[1]
+  {\@scaninput{\begin{Verbatim}}{#1}{\end{Verbatim}}}

latexscan.mll

@@ -9,7 +9,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: latexscan.mll,v 1.188 2000-07-18 20:25:49 maranget Exp $ *)
+(* $Id: latexscan.mll,v 1.189 2000-07-19 16:39:24 maranget Exp $ *)
 
 
 {
@@ -770,33 +770,42 @@ let debug = function
 
 let expand_command main skip_blanks name lexbuf =
   let cur_subst = get_subst () in
-  let exec = function
-    | Subst body ->
-        if !verbose > 2 then
-          prerr_endline ("user macro: "^body) ;            
-        let old_alltt = !alltt in
-        Stack.push stack_alltt old_alltt ;        
-        alltt :=
-           (match old_alltt with
-           | Not -> Not
-           | _   -> Macro) ;
+  let exec =
+    if !alltt_loaded then
+      function
+        | Subst body ->
+            if !verbose > 2 then
+              prerr_endline ("user macro: "^body) ;            
+            let old_alltt = !alltt in
+            Stack.push stack_alltt old_alltt ;        
+            alltt :=
+               (match old_alltt with
+               | Not -> Not
+               | _   -> Macro) ;
 (*
-        Printf.fprintf stderr
-          "Enter: %s, %s -> %s\n" name (debug old_alltt) (debug !alltt) ;
-*)
-        scan_this_may_cont main lexbuf cur_subst (string_to_arg body) ;
-        let _ =  Stack.pop stack_alltt in
-        alltt :=
-          (match old_alltt, !alltt with
-          | Not, Inside         -> Inside
-          | (Macro|Inside), Not -> Not
-          | _, _                -> old_alltt)
+  Printf.fprintf stderr
+  "Enter: %s, %s -> %s\n" name (debug old_alltt) (debug !alltt) ;
+  *)
+            scan_this_may_cont main lexbuf cur_subst (string_to_arg body) ;
+            let _ =  Stack.pop stack_alltt in
+            alltt :=
+               (match old_alltt, !alltt with
+               | Not, Inside         -> Inside
+               | (Macro|Inside), Not -> Not
+               | _, _                -> old_alltt)
 (*
-        Printf.fprintf stderr
-          "After: %s, %s -> %s\n" name (debug old_alltt) (debug !alltt)
-*)
-
-    | CamlCode f -> f lexbuf in
+  Printf.fprintf stderr
+  "After: %s, %s -> %s\n" name (debug old_alltt) (debug !alltt)
+  *)
+
+        | CamlCode f -> f lexbuf
+    else
+      function
+        | Subst body ->
+            if !verbose > 2 then
+              prerr_endline ("user macro: "^body) ;            
+            scan_this_may_cont main lexbuf cur_subst (string_to_arg body)
+        | CamlCode f -> f lexbuf in
 
   let pat,body = Latexmacros.find name in
   let par_before = Dest.forget_par () in
@@ -930,12 +939,16 @@ rule  main = parse
       else
         let i = Char.code lxm.[1] - Char.code '1' in
         scan_arg
-          (fun s ->
-            let old_alltt = !alltt in
-            alltt := Stack.pop stack_alltt ;
-            scan_this main s ;
-            alltt := old_alltt ;
-            Stack.push stack_alltt old_alltt) i
+          (if !alltt_loaded then
+            (fun arg ->
+              let old_alltt = !alltt in
+              alltt := Stack.pop stack_alltt ;
+              scan_this_may_cont main lexbuf (get_subst ()) arg ;
+              alltt := old_alltt ;
+              Stack.push stack_alltt old_alltt)
+          else
+            (fun arg -> scan_this_may_cont main lexbuf (get_subst ()) arg))
+          i
       end ;
       main lexbuf}
 (* Commands *)
@@ -1057,7 +1070,7 @@ and image = parse
 | '#' ['1'-'9']
     {let lxm = lexeme lexbuf in
     let i = Char.code (lxm.[1]) - Char.code '1' in
-    scan_arg (scan_this image) i ;
+    scan_arg (scan_this_arg image) i ;
     image lexbuf}
 |  "\\end"
      {let lxm = lexeme lexbuf in
@@ -1342,7 +1355,7 @@ def_code "\\mathop"
   (fun lexbuf ->
     let symbol = save_arg lexbuf in
     let {limits=limits ; sup=sup ; sub=sub} = save_sup_sub lexbuf in
-    match limits with
+    begin match limits with
     | (Some Limits|None) when !display ->
         Dest.limit_sup_sub
           (scan_this_arg main)
@@ -1356,7 +1369,8 @@ def_code "\\mathop"
         scan_this_arg main symbol ;
         Dest.standard_sup_sub
           (scan_this_arg main)
-          (fun _ -> ()) sup sub !display)
+          (fun _ -> ()) sup sub !display
+    end)
 ;;
 
 
@@ -2154,6 +2168,7 @@ newif_ref "styleloaded" styleloaded;
 newif_ref "activebrace" activebrace;
 newif_ref "pedantic" pedantic ;
 newif_ref "fixpoint" fixpoint ;
+newif_ref "alltt@loaded" alltt_loaded ;
 def_code ("\\iftrue") (testif (ref true)) ;
 def_code ("\\iffalse") (testif (ref false))
 ;;
@@ -2583,17 +2598,19 @@ def_code "\\endgroup"
 
 (* alltt *)
 
-def_code "\\alltt"
-  (fun _ ->
-    if !verbose > 1 then prerr_endline "begin alltt" ;
-    alltt := Inside ;
-    fun_register (fun () -> alltt := Not) ;
-    Dest.close_block "" ; Dest.open_block "PRE" "") ;
-
-def_code "\\endalltt"
-  (fun _ ->
-    if !verbose > 1 then prerr_endline "end alltt" ;
-    Dest.close_block "PRE" ; Dest.open_block "" "")
+register_init "alltt"
+    (fun () ->
+      def_code "\\alltt"
+        (fun _ ->
+          if !verbose > 1 then prerr_endline "begin alltt" ;
+          alltt := Inside ;
+          fun_register (fun () -> alltt := Not) ;
+          Dest.close_block "" ; Dest.open_block "PRE" "") ;
+
+      def_code "\\endalltt"
+        (fun _ ->
+          if !verbose > 1 then prerr_endline "end alltt" ;
+          Dest.close_block "PRE" ; Dest.open_block "" ""))
 ;;
 
 (* Multicolumn *)