eplain (14feb13)

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

3 files changed, 44 insertions, 13 deletions

diff --git a/Master/texmf-dist/source/eplain/eplain-source-3.4.zip b/Master/texmf-dist/source/eplain/eplain-source-3.4.zip
deleted file mode 100644
index 9f08f5730e4..00000000000
--- a/Master/texmf-dist/source/eplain/eplain-source-3.4.zip
+++ /dev/null
diff --git a/Master/texmf-dist/source/eplain/eplain-source-3.5.zip b/Master/texmf-dist/source/eplain/eplain-source-3.5.zip
new file mode 100644
index 00000000000..0d75c7f9634
--- /dev/null
+++ b/Master/texmf-dist/source/eplain/eplain-source-3.5.zip
diff --git a/Master/texmf-dist/source/eplain/xeplain.tex b/Master/texmf-dist/source/eplain/xeplain.tex
index 0424c321de7..e2bf6e2d913 100644
--- a/Master/texmf-dist/source/eplain/xeplain.tex
+++ b/Master/texmf-dist/source/eplain/xeplain.tex
@@ -2296,6 +2296,7 @@
 % We put the term in an \hbox, even though that might make the output
 % run off the page, since we don't really need to see all of it, and
 % I think it's better to opt for simplicity -- one term per line.
+%
 \font\indexprooffont = cmtt8
 \def\indexproofterm#1{\hbox{\strut \indexprooffont #1}}%
 %
@@ -2303,6 +2304,7 @@
 % If \output doesn't use \makeheadline, or redefines it, it's up to the
 % new \output to define index hyperlink destination and to call
 % \indexproofunbox.
+%
 \let\@plainmakeheadline = \makeheadline
 \def\makeheadline{%
   % Define index page destination only when this `page anchor' is defined.
@@ -3485,15 +3487,15 @@
 %  2) if it's the last one, it is saved and the added skip is removed.
 %
 % When the box is processed according to 1), an underfull vbox can appear,
-% but it's not our problem, the manuscript (or it's macros) has to be fixed.
+% but it's not our problem, the manuscript (or its macros) has to be fixed.
 %
 % Gather this many baselines
 \chardef\@col@extralines = 3
-% more material per each column than the combined height of the
+% of additional material per each column than the combined height of the
 % columns, before attempting to break the columns.  This sometimes
-% considerably improves the last column, when it would become too
-% spaced out because TeX had to squeeze some lines into the previous
-% columns due to unfortunate column breaks.
+% considerably improves the last column, when it would become too spaced
+% out because TeX had to squeeze some lines into the previous columns
+% due to unfortunate column breaks.
 %
 % The larger \@col@extralines, the better, but we don't want to make
 % it too large.  If there are less than \@col@extralines * num_columns
@@ -3505,6 +3507,7 @@
 % we'll stuff everything on the current page, producing an overfull
 % box, even though these extra lines could successfully be moved to
 % the next page.
+%
 \newdimen\@col@extraheight
 %
 % Another note: all assignments are global; it is not possible to call
@@ -3564,6 +3567,7 @@
   \multiply\count\topins by \@numcolumns
   %
   \global\vsize = \@numcolumns\vsize
+  %
   % Gather some extra material, to improve the last column.
   \@col@extraheight=\@col@extralines\baselineskip
   \multiply\@col@extraheight by \@numcolumns
@@ -3614,7 +3618,11 @@
     \vbadness = 10000
     %
     % The first (leftmost) column.
+    %d\message{^^J starting columnsplit, splitting to \the\dimen@}%
+    %d\showbox255
     \global\setbox1 = \vsplit255 to \dimen@  \global\wd1 = \hsize
+    %d\message{^^J split off to this box1:}%
+    %d\showbox1
     %
     % The second column.
     \global\setbox3 = \vsplit255 to \dimen@  \global\wd3 = \hsize
@@ -3652,8 +3660,10 @@
 % Our output routine splits the columns and then calls the previous one.
 % 
 \def\@columnoutput{%
+  %d\message{^^J starting columnoutput, ht255: \the\ht255}%
   \dimen@ = \ht255
     \advance\dimen@ by -\@col@extraheight
+    %d\message{^^J minus col@extraheight: \the\@col@extraheight}%
     \divide\dimen@ by \@numcolumns
   \@columnsplit
   \@recoverclubpenalty 
@@ -3666,7 +3676,7 @@
   \penalty\outputpenalty
   %
   % The correct vsize is the original vsize times the
-  % number of columns, plus the "extra height".
+  % number of columns, plus the ``extra height''.
   \global\vsize = \@numcolumns\@normalvsize
   \global\advance\vsize by \@col@extraheight
 }%
@@ -3845,28 +3855,42 @@
 \newdimen\temp@dimen
 \def\columnfill{%
   \par
-  \dimen@=\pagetotal   % The height of the text set so far. 
-  \temp@dimen = \vsize % = \@numcolumns * columnheight
-  \divide\temp@dimen by \@numcolumns % find out column height
+  \dimen@ = \pagetotal  % The height of the text so far. 
+  %d\message{^^J pagetotal start (dimen@): \the\dimen@}%
+  %
+  \temp@dimen = \vsize  % = \@numcolumns * columnheight
+  %d\message{^^J temp@dimen (total height): \the\temp@dimen}%
+  %
+  \advance\temp@dimen by -\@col@extraheight
+  %d\message{^^J reducing temp@dimen \the\temp@dimen (-@col@extraheight)}%
+  %
+  \divide\temp@dimen by \@numcolumns  % Compute column height
+  %d\message{^^J col height (tempdimen@): \the\temp@dimen}%
+  %
   \loop
-    \ifdim \dimen@ > \temp@dimen
+    %d\message{^^J looping}%
+    \ifdim \dimen@ > \temp@dimen  % more material than a column?
       \advance \dimen@ by -\temp@dimen
       \advance \dimen@ by \topskip % fudge factor
+      %d\message{^^J reducing dimen@ to \the\dimen@ (tempdimen@ + \the\topskip)}%
   \repeat
   \advance \temp@dimen by -\dimen@
+  %d\message{^^J reducing temp@dimen to \the\temp@dimen (-dimen@)}%
+  %
   \advance \temp@dimen by -\prevdepth
+  %d\message{ reducing temp@dimen to \the\temp@dimen (-prevdepth)}%
+  %
   \@saveclubpenalty 
   \clubpenalty=10000\relax
-  \hrule height\temp@dimen width0pt depth0pt\relax
+  \hrule height\temp@dimen width0pt depth0pt\relax  % fill space with rule
   \nointerlineskip
   \par
   \nointerlineskip
-  \penalty0\vfil % To allow a page break here.
+  \allowbreak \vfil % To allow a page break here.
   \relax
 }%
 %
 %
-%
 %  Hypertext links support.
 %
 % Hyperlink destinations (driver-independent code).
@@ -5134,6 +5158,7 @@
 \let\usepkg@at@end@of@package\empty
 \def\usepkg@word@autopict{autopict}%
 \def\usepkg@word@psfrag{psfrag}%
+%
 % \beginpackages...\endpackages
 %
 % All packages must be loaded within this `environment' (a kind of
@@ -5153,6 +5178,7 @@
 % 
 % Define \DoNotLoadEpstopdf so that graphics.cfg does not try to load
 % epstopdf.sty, which is a complication surely not wanted by default.
+%
 \long\def\beginpackages#1\endpackages{%
   \let\usepackage\real@usepackage
   \let\DoNotLoadEpstopdf=t
@@ -5163,7 +5189,10 @@
   \global\let\usepackage\fake@usepackage
   \let\packageinput=\input
   \let\input=\eplaininput
+  % should always be defined (from miniltx), but just in case:
+  \ifx\resetatcatcode\@undefined \else\resetatcatcode \fi
 }%
+%
 % \fake@usepackage
 %
 % This is what \usepackage is defined to outside of
@@ -5413,6 +5442,7 @@
 % accumulate its argument, to be executed by us at the end of
 % \beginpackages...\endpackages.  \AtEndOfPackage is not defined by
 % miniltx.tex at all; we define it similar to \AtBeginDocument.
+%
 \def\usepkg@accumulate@cmds#1#2{%
   \toks@=\expandafter{#1}%
   \toks@ii={#2}%
@@ -5420,6 +5450,7 @@
 }%
 \def\eplain@AtBeginDocument{\usepkg@accumulate@cmds\usepkg@at@begin@document}%
 \def\eplain@AtEndOfPackage{\usepkg@accumulate@cmds\usepkg@at@end@of@package}%
+%
 % \ProvidesFile{FILENAME.EXT}[VERSION]
 % \ProvidesPackage{PACKAGENAME}[VERSION]
 %