\addlay does not add interline skip between layers

[ucwmac.git] / ucwmac.tex

diff --git a/ucwmac.tex b/ucwmac.tex
index 96680ad2e7df7bb527691c9e143ed1f8aa0a996c..102496e65e2b27b0250d9f793f9955ab93687911 100644 (file)
--- a/ucwmac.tex
+++ b/ucwmac.tex
@@ -1,6 +1,6 @@
 % The UCW Macro Collection (a successor of mjmac.tex)
-% Written by Martin Mares <mj@ucw.cz> in 2010 and placed into public domain
-% -------------------------------------------------------------------------
+% Written by Martin Mares <mj@ucw.cz> in 2010--2013 and placed into public domain
+% -------------------------------------------------------------------------------
 
 %%% Prolog %%%
 
@@ -15,6 +15,7 @@
 \ifx\pdfoutput\undefined
 \else\ifnum\pdfoutput>0
        \pdftrue
+       \pdfpkresolution=600    % Provide a reasonable default
 \fi\fi
 
 %%% Page size and margins %%%
@@ -40,6 +41,8 @@
        \voffset=\topmargin
        \advance\voffset by -1truein
        \ifpdf
+               \pdfhorigin=1truein
+               \pdfvorigin=1truein
                \pdfpagewidth=\pagewidth
                \pdfpageheight=\pageheight
        \fi
@@ -75,7 +78,6 @@
 \defpaper{a3}{297truemm}{420truemm}
 \defpaper{a4}{210truemm}{297truemm}
 \defpaper{a5}{148truemm}{210truemm}
-\defpaper{a6}{105truemm}{148truemm}
 \defpaper{letter}{8.5truein}{11truein}
 \defpaper{legal}{8.5truein}{14truein}
 
@@ -87,8 +89,8 @@
 
 % Set all dimensions of a given box register to zero
 \def\smashbox#1{\ht#1=0pt \dp#1=0pt \wd#1=0pt}
-\def\smashedhbox#1{{\setbox0=\hbox{#1}\smashbox0\box0}}
-\def\smashedvbox#1{{\setbox0=\vbox{#1}\smashbox0\box0}}
+\long\def\smashedhbox#1{{\setbox0=\hbox{#1}\smashbox0\box0}}
+\long\def\smashedvbox#1{{\setbox0=\vbox{#1}\smashbox0\box0}}
 
 % Variants of \llap and \rlap working equally on both sides and/or vertically
 \def\hlap#1{\hbox to 0pt{\hss #1\hss}}
@@ -119,7 +121,7 @@
 % and underlays, which are zero-size vboxes positioned absolutely in the
 % front / in the back of the normal material. Also, there are global
 % versions of both which are not reset after every page.
-\def\addlay#1#2{\setbox#1=\vbox{\ifvbox#1\box#1\fi\smashedvbox{#2}}}
+\def\addlay#1#2{\setbox#1=\vbox{\ifvbox#1\box#1\fi\nointerlineskip\smashedvbox{#2}}}
 \def\pageunderlay{\addlay\pageunderlays}
 \def\pageoverlay{\addlay\pageoverlays}
 \def\commonunderlay{\addlay\commonoverlays}
@@ -127,13 +129,17 @@
 
 % Our variation on \plainoutput, which manages inner/outer margins and overlays
 \output{\ucwoutput}
+\newdimen\pagebodydepth
 \def\ucwoutput{\wigglepage\shipout\vbox{%
        \makeheadline
        \ifvbox\commonunderlays\copy\commonunderlays\nointerlineskip\fi
        \ifvbox\pageunderlays\box\pageunderlays\nointerlineskip\fi
        \pagebody
-       \ifvbox\commonoverlays\vbox to 0pt{\vskip -\vsize\copy\commonoverlays}\fi
-       \ifvbox\pageoverlays\vbox to 0pt{\vskip -\vsize\box\pageoverlays}\fi
+       \pagebodydepth=\prevdepth
+       \nointerlineskip
+       \ifvbox\commonoverlays\vbox to 0pt{\vskip -\vsize\copy\commonoverlays\vss}\nointerlineskip\fi
+       \ifvbox\pageoverlays\vbox to 0pt{\vskip -\vsize\box\pageoverlays\vss}\nointerlineskip\fi
+       \prevdepth=\pagebodydepth
        \makefootline
 }\advancepageno
 \ifnum\outputpenalty>-\@MM \else\dosupereject\fi}
@@ -229,6 +235,12 @@
 % A handy shortcut
 \let\>=\noindent
 
+% Variants of \centerline, \leftline and \rightline, which are compatible with
+% verbatim environments and other catcode hacks
+\def\cline{\bgroup\def\linet@mp{\aftergroup\box\aftergroup0\aftergroup\egroup\hss\bgroup\aftergroup\hss\aftergroup\egroup}\afterassignment\linet@mp\setbox0\hbox to \hsize}
+\def\lline{\bgroup\def\linet@mp{\aftergroup\box\aftergroup0\aftergroup\egroup\bgroup\aftergroup\hss\aftergroup\egroup}\afterassignment\linet@mp\setbox0\hbox to \hsize}
+\def\rline{\bgroup\def\linet@mp{\aftergroup\box\aftergroup0\aftergroup\egroup\hss\bgroup\aftergroup\egroup}\afterassignment\linet@mp\setbox0\hbox to \hsize}
+
 %%% Epilog %%%
 
 % Let's hide all internal macros