lecturer (11sep11)

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

2 files changed, 17 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/generic/lecturer/lecturer.tex b/Master/texmf-dist/tex/generic/lecturer/lecturer.tex
index e0bf73ea8be..e19e7d2f4d6 100644
--- a/Master/texmf-dist/tex/generic/lecturer/lecturer.tex
+++ b/Master/texmf-dist/tex/generic/lecturer/lecturer.tex
@@ -110,7 +110,7 @@
 %
 % Here we go.
 %
-\def\ltr@input#1 {\priminput ltr/ltr-#1.tex }
+\def\ltr@input#1 {\priminput ltr-#1.tex }
 \ltr@input job
 \ltr@input slides
 \ltr@input steps
@@ -119,4 +119,4 @@
 \ltr@input navigation
 \restorecatcodes
 \endinput
-% Goodbye.
\ No newline at end of file
+% Goodbye.
diff --git a/Master/texmf-dist/tex/generic/lecturer/ltr-job.tex b/Master/texmf-dist/tex/generic/lecturer/ltr-job.tex
index 0dd3fe6cf85..4ac3d0d42ba 100644
--- a/Master/texmf-dist/tex/generic/lecturer/ltr-job.tex
+++ b/Master/texmf-dist/tex/generic/lecturer/ltr-job.tex
@@ -91,6 +91,7 @@
   \else
     {\setbox\ltr@temp_box=\box255}%
   \fi}
+\newbox\ltr@output_box
 \def\ltr@slide_output{%    
     % This chains the steps.
     \reverse\iffemptycommand\ltr@page_steplist{\passexpanded{\ltr@output_loop{}{}{}}\ltr@page_steplist}
@@ -98,23 +99,23 @@
     \ifnum\formatnumber>3
       \let\protect\noexpand
     \fi
-    \setbox255=\vbox{\unvbox255}
+    \setbox\ltr@output_box=\vbox{\unvbox255}
     \ltr@ifattribute ltr@inner_slide:vsize;
       {}
       {\ltr@setattribute ltr@inner_slide:vsize; = {\dimexpr(\pdfpageheight-2\pdfvorigin)\relax} }% We badly need this value.
     % If the page is too high, it is scaled if scale=true.
-    \ifdim\dimexpr\ht255-\pageshrink>\ltr@usevalue ltr@inner_slide:vsize;\relax
+    \ifdim\dimexpr\ht\ltr@output_box-\pageshrink>\ltr@usevalue ltr@inner_slide:vsize;\relax
       \ltr@ifvalue ltr@inner_slide:scale; = true
-        {\setbox255=\vbox{
+        {\setbox\ltr@output_box=\vbox{
            \pdfsave
-           \pdfsetmatrix{\ltr@point_convert{\ltr@usevalue ltr@inner_slide:vsize;/\ltr@integer{\ht255-\pageshrink}} 0 0
-             \ltr@point_convert{\ltr@usevalue ltr@inner_slide:vsize;/\ltr@integer{\ht255-\pageshrink}}}
-           \unvcopy255
-           \kern-\dimexpr\ht255-\pageshrink\relax \kern-\dp255
+           \pdfsetmatrix{\ltr@point_convert{\ltr@usevalue ltr@inner_slide:vsize;/\ltr@integer{\ht\ltr@output_box-\pageshrink}} 0 0
+             \ltr@point_convert{\ltr@usevalue ltr@inner_slide:vsize;/\ltr@integer{\ht\ltr@output_box-\pageshrink}}}
+           \unvcopy\ltr@output_box
+           \kern-\dimexpr\ht\ltr@output_box-\pageshrink\relax \kern-\dp\ltr@output_box
            \pdfrestore
-           \kern\dimexpr\ht255-\pageshrink\relax \kern\dp255
+           \kern\dimexpr\ht\ltr@output_box-\pageshrink\relax \kern\dp\ltr@output_box
            }}{}
-       \fi
+    \fi
     \shipout\vbox{% At last...
       \pdfliteral direct {q}
       % Paints the slide background.
@@ -130,10 +131,10 @@
       \pdfcolorstack0 push {\ltr@passvalueor\ltr@color_use ltr@inner_slide:foreground;{\ltr@color_use{black}}}
       \vbox to \ltr@usevalue ltr@inner_slide:vsize;{%
         \ltr@ifcasevalue ltr@inner_slide:vpos;
-          \val top    \unvbox255 \vfil
-          \val center \vfil\unvbox255 \vfil
-          \val bottom \vfil\unvbox255
-          \elseval    \unvbox255 \vfil
+          \val top    \unvbox\ltr@output_box \vfil
+          \val center \vfil\unvbox\ltr@output_box \vfil
+          \val bottom \vfil\unvbox\ltr@output_box
+          \elseval    \unvbox\ltr@output_box \vfil
         \endval
         }%
       \pdfcolorstack0 pop
@@ -403,4 +404,4 @@
 %
 % And I'm not really lecturing on PDF here. I'm just
 % trying to write things down while I understand them.
-\endinput
\ No newline at end of file
+\endinput