interpreter 1.1 (3dec11)

git-svn-id: svn://tug.org/texlive/trunk@24740 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 60 insertions, 43 deletions

diff --git a/Master/texmf-dist/doc/luatex/interpreter/interpreter-doc.tex b/Master/texmf-dist/doc/luatex/interpreter/interpreter-doc.tex
index 8d78ad02963..8a1ab383a81 100644
--- a/Master/texmf-dist/doc/luatex/interpreter/interpreter-doc.tex
+++ b/Master/texmf-dist/doc/luatex/interpreter/interpreter-doc.tex
@@ -1,36 +1,20 @@
 % This is the master file producing interpreter-doc.pdf. The version of the
 % documentation readable in a text editor is interpreter-doc.txt (input below).
 % 
-% Paul Isambert - zappathustra AT free DOT fr - July 2011
+% Paul Isambert - zappathustra AT free DOT fr - December 2011
+
 \input pitex
 
-% Output stuff.
-\gates remove {output_headers}{output_shipout}
-\gates remove {output_postship}{output_shipout}
-\gates remove {output_precheck}{output}
-\gates close  {output_shipout}{output}
-
-\newif\ifright
-\newbox\leftbox
-\gates def {twocol}{%
-  \ifright
-    \global\rightfalse
-    \setbox\outputbox=\hbox{\box\leftbox\kern24pt\box\outputbox}%
-    \gates ajar {output_shipout}{output}%
-  \else
-    \global\righttrue
-    \global\setbox\leftbox=\box\outputbox
-  \fi
-  }
-\gates add {twocol}[before output_shipout]{output}
+\overfullrule=0pt
 
+\OutputRoutine remove {headers}{shipout}
 
 \setparameter page :
-  hsize  = 20pc
+  hsize  = 25pc
   left   = 60pt
-  width  = "\dimexpr 144pt + 40pc\relax"
-  lines  = 45
-  height = 24cm
+  width  = "\dimexpr 25pc + 120pt\relax"
+  lines  = 35
+  height = 20cm
 
 \setparameter section :
   font = \bf
@@ -40,36 +24,37 @@
   beforeskip = 1
 
 \setparameter navigator :
-  open   = true
   title  = "Interpreter documentation"
   author = "Paul Isambert"
   mode   = outlines
 
-\setparameter font :
-  command = \mainfont
-  name    = "Chaparral Pro"
-  bold    = Semibold
-  big     = 18pt
-
-\setparameter font :
-  command  = \codefont
-  name     = "Lucida Console"
-  bold     = none
-  size     = 8pt
-  features = "space = .6, -tlig, -trep, -liga"
+\setfont\mainfont:
+  name     = "Chaparral Pro"
+  bold     = Semibold
+  big      = 18pt
 
+\setfont\codefont:
+  name        = "Lucida Console"
+  slant       = 15
+  bold italic = none
+  size        = 8pt
+  features    = "-tlig, -trep, space = mono"
 
 \parfillskip=0pt plus 1fill
 \def\describe#1#2#3{%
-  \iflines3{\vskip\baselineskip}{\breakpage}%
+  \unless\ifdim\lastskip=\baselineskip
+    \vskip\baselineskip
+  \fi
+  \needspace{2\baselineskip}%
   \noindent\color{.8 0 0}{%
     {\outline{#3}{\directlua{%
       local t = string.gsub("\luaescapestring{#1}", "[ (].*", "")
       tex.print(t)}}%
      \codefont#1}%
-    \reverse\iffemptystring{#2}
-      {\kern1em \hfil\penalty0\hbox{\ital{(#2)}}}}%
-  \par\removenextindent}
+  \reverse\iffemptystring{#2}
+    {\kern1em \hfil\penalty0\hbox{\ital{(#2)}}}}%
+  \par
+  \removenextindent}
 
 \newverbatim\source{}
                    {\vskip\baselineskip
@@ -80,19 +65,51 @@
                     \pdfcolorstack0 pop
                     \vskip\baselineskip}
 
+% The verbatim facilities in PiTeX aren't gated yet, so I must rely on
+% this horrible hack!
+\directlua{
+function do_verbatim (name, exec)
+	if exec then
+    tex.print(pitex.verbatims[name])
+  else
+    for n, l in ipairs(pitex.verbatims[name]) do
+      if n == \string#pitex.verbatims[name] then
+        tex.print("\noexpand\\penalty\noexpand\\widowpenalty")
+      end
+      tex.print(pitex.verbatims[name].regime, l)
+      if n == 1 and \string#pitex.verbatims[name] > 2 then
+        tex.print("\noexpand\\penalty\noexpand\\widowpenalty")
+      end
+    end
+  end
+end
+}
+
 \def\arg#1{{\codefont\char"2039 #1\char"203A}}
+\pdfdef\ital#1{#1}
+\pdfdef\verb`#1`{#1}
+
+% Not optimal, but hey, with all the "intepreter.core.classes" stuff...
+\hyphenation{li-nes cla-sses}
 
 \input interpreter
 
 % Title
 \vbox to 3\baselineskip{
 \hbox to \hsize{\big Interpreter\hfil\normalsize Paul Isambert}
-\hbox to \hsize{v.1.0, July 2011 \hfil \tcode{zappathustra AT free DOT fr}}
+\hbox to \hsize{v.1.1, December 2011 \hfil \tcode{zappathustra AT free DOT fr}}
 \vfil
 }
+
+
+
 % Bulk of the doc.
 \interpretfile{doc}{interpreter-doc.txt}
 \vskip0pt plus 1filll
-\noindent\ital{Typeset with Lua\TeX\ 0.71 in Chaparral Pro and Lucida Console}
+\noindent
+\bgroup\it
+Typeset with Lua\TeX\ 0.71 in Chaparral Pro and Lucida Console
+... nonetheless this documentation looks dull, I don't know why.
+\egroup
 
 \bye