lollipop (16apr16)

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

8 files changed, 152 insertions, 124 deletions

diff --git a/Master/texmf-dist/tex/lollipop/lollipop-float.tex b/Master/texmf-dist/tex/lollipop/lollipop-float.tex
index cc8c3b99901..6f493748f91 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-float.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-float.tex
@@ -49,46 +49,3 @@
   \@DefineStopCommand{\the\after@coms \egroup}
   }
 \endinput
-\newinsert\footins
-\def\footnote#1{\let\@sf\empty % parameter #2 (the text) is read later
-  \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\/\fi
-  #1\@sf\vfootnote{#1}}
-\def\vfootnote#1{\insert\footins\bgroup
-  \interlinepenalty\interfootnotelinepenalty
-  \splittopskip\ht\strutbox % top baseline for broken footnotes
-  \splitmaxdepth\dp\strutbox \floatingpenalty\@MM
-  \leftskip\z@skip \rightskip\z@skip \spaceskip\z@skip \xspaceskip\z@skip
-  \textindent{#1}\footstrut\futurelet\next\fo@t}
-\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
-  \else\let\next\f@t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
-\def\f@t#1{#1\@foot}
-\def\@foot{\strut\egroup}
-\def\footstrut{\vbox to\splittopskip{}}
-\skip\footins=\bigskipamount % space added when footnote is present
-\count\footins=1000 % footnote magnification factor (1 to 1)
-\dimen\footins=8in % maximum footnotes per page
-
-\newif\ifp@ge \newif\if@mid
-\let\p@getrue=\p@geyes \let\p@gefalse=\p@geno
-\let\@midtrue=\@midyes \let\@midfalse=\@midno
-\def\topinsert{\@midfalse\p@gefalse\@ins}
-\def\midinsert{\@midtrue\@ins}
-\def\pageinsert{\@midfalse\p@getrue\@ins}
-\skip\topins=\z@skip % no space added when a topinsert is present
-\count\topins=1000 % magnification factor (1 to 1)
-\dimen\topins=\maxdimen % no limit per page
-\def\@ins{\par\begingroup\setbox\z@\vbox\bgroup} % start a \vbox
-\def\endinsert{\egroup % finish the \vbox
-  \if@mid \dimen@\ht\z@ \advance\dimen@\dp\z@
-    \advance\dimen@12\p@ \advance\dimen@\pagetotal
-    \ifdim\dimen@>\pagegoal\@midfalse\p@gefalse\fi\fi
-  \if@mid \bigskip\box\z@\bigbreak
-  \else\insert\topins{\penalty100 % floating insertion
-    \splittopskip\z@skip
-    \splitmaxdepth\maxdimen \floatingpenalty\z@
-    \ifp@ge \dimen@\dp\z@
-    \vbox to\vsize{\unvbox\z@\kern-\dimen@}% depth is zero
-    \else \box\z@\nobreak\bigskip\fi}\fi\endgroup}
-
-\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-fontdefs.tex b/Master/texmf-dist/tex/lollipop/lollipop-fontdefs.tex
index 282d880e38f..1d10a3d411a 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-fontdefs.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-fontdefs.tex
@@ -35,33 +35,8 @@
      default:10;}%
     [\ifStyle:bold \ifnum\Fsize<10 bx10\fi\fi]
 
-% MonoType
-\DefineTypeface{MTGill}{MGilSan}
- {roman:; italic:Ita; mitalic:Ita; bold:Bol; 
-  lite:Lig; litital:LigIta; default:;}
- {default: at \Fsize pt;}
-
-% Postscript
-\DefineTypeface{macTimes}{Times}
-    {roman:; italic:I; mitalic:I; bold:B; default:;}
-    {default: at \Fsize pt;}
-\DefineTypeface{macHelvetica}{Helvetica}
-    {roman:; italic:I; mitalic:I; bold:B; default:;}
-    {default: at \Fsize pt;}
-\DefineTypeface{macAvantGarde}{AvantGarde}
-    {roman:; italic:I; mitalic:I; bold:B; default:;}
-    {default: at \Fsize pt;}
-\DefineTypeface{macCourier}{cour}
-    {roman:; italic:i; mitalic:i; bold:b; default:;}
-    {default: at \Fsize pt;}
-\DefineTypeface{unixTimes}{Times}
-    {roman:; italic:I; mitalic:I; bold:B; default:;}
-    {default: at \Fsize pt;}
-\DefineTypeface{unixHelvetica}{Helvetica}
-    {roman:; italic:I; mitalic:I; bold:B; default:;}
-    {default: at \Fsize pt;}
-\DefineTypeface{unixCourier}{cour}
-    {roman:; italic:i; mitalic:i; bold:b; default:;}
-    {default: at \Fsize pt;}
 
 \endinput
+
+% 2016/04/13 Removed \DefineTypeface definitions for fonts
+%                    not in TeXLive
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-fonts.tex b/Master/texmf-dist/tex/lollipop/lollipop-fonts.tex
index 70465c162a9..3b9a72c19f0 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-fonts.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-fonts.tex
@@ -295,6 +295,7 @@
 \let\sy@size=\mi@size \let\cm@size=\mi@size
 \def\ex@size#1{\ifnum#1<10 10 \else\mi@size{#1}\fi}
 
+
 % For a size, test if it has been loaded yet, if not do;
 % then install as given style
 %
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-output.tex b/Master/texmf-dist/tex/lollipop/lollipop-output.tex
index e3267600e1f..57b0ef83320 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-output.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-output.tex
@@ -225,8 +225,11 @@
     \ifnum\n@cols=\@ne
         \vbox to \vsize{\boxmaxdepth\maxdepth
                  \ifvoid\topins\else\unvbox\topins \fi
-                 \unvbox\@cclv
-                 \ifvoid\footins\else\unvbox\footins \fi}%
+                 \unvbox\@cclv % open up \box255
+                 \ifvoid\footins\else % footnote info is present
+                   \vskip\skip\footins
+                   \footnoterule
+                   \unvbox\footins \fi}%
         \Tmessage[out]{Column: \the\ht\z@+\the\dp\z@}%
     \else
         \vsplit\@cclv to \text@height
@@ -736,4 +739,6 @@
 \@PageGridOption{kolommenbalanceren}{
     \eqstring{#1}{}{\tempgyes}{\csn tempg#1\ecs}}
 
-\endinput
\ No newline at end of file
+\endinput
+
+% 2016/04/14 Added \footnoterule to \real@text@column
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-plain.tex b/Master/texmf-dist/tex/lollipop/lollipop-plain.tex
index c580773dcce..b9f914ff8ec 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-plain.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-plain.tex
@@ -146,7 +146,7 @@
  
 % Here are macros for the automatic allocation of \count, \box, \dimen,
 % \skip, \muskip, and \toks registers, as well as \read and \write
-% stream numbers, \fam codes, \language codes, and \insert numbers.
+% stream numbers, \fam codes, and \insert numbers.
  
 % When a register is used only temporarily, it need not be allocated;
 % grouping can be used, making the value previously in the register return
@@ -154,7 +154,7 @@
 % registers that are defined by one macro and used by others, possibly at
 % different nesting levels.  All such registers should be defined through
 % these macros; otherwise conflicts may occur, especially when two or more
-% macro packages are being used at once.
+% more macro packages are being used at once.
  
 % The following counters are reserved:
 %   0 to 9  page numbering
@@ -178,11 +178,11 @@
 % \count 10 always contains the number of the highest-numbered counter that
 % has been allocated, \count 14 the highest-numbered box, etc.
 % Inserts are given numbers 254, 253, etc., since they require a \count,
-% \dimen, \skip, and \box all with the same number; \count 20 contains the
+% \dimen, \skip, and \box all with the same number; \count 19 contains the
 % lowest-numbered insert that has been allocated. Of course, \box255 is
 % reserved for \output; \count255, \dimen255, and \skip255 can be used freely.
  
-% It is recommended that macro designers always use
+% It is recommends that macro designers always use
 % \global assignments with respect to registers numbered 1, 3, 5, 7, 9, and
 % always non-\global assignments with respect to registers 0, 2, 4, 6, 8, 255.
 % This will prevent ``save stack buildup'' that might otherwise occur.
@@ -249,7 +249,7 @@
 \def\newmuskip#1{\@TM@s\@@newmuskip#1\@TM@r}
 \def\newbox#1{\@TM@s\@@newbox#1\@TM@r}
 \let\newtoks=\relax % we do this to allow plain.tex to be read in twice
-\def\newhelp#1#2{\@TM@s\@@newhelp#1#2\@TM@r}
+\def\newhelp#1#2{\@TM@s\@@newhelp#1{#2}\@TM@r}
 \def\newtoks#1{\@TM@s\@@newtoks#1\@TM@r}
 \def\newread#1{\@TM@s\@@newread#1\@TM@r}
 \def\newwrite#1{\@TM@s\@@newwrite#1\@TM@r}
@@ -287,7 +287,7 @@
 \newskip\hideskip \hideskip=-1000pt plus 1fill % negative but can grow
 \newskip\centering \centering=0pt plus 1000pt minus 1000pt
 \newdimen\p@ \p@=1pt % this saves macro space and time
-%V \newdimen\z@ \z@=0pt % naar boven
+%V \newdimen\z@ \z@=0pt % defined above
 \newskip\z@skip \z@skip=0pt plus0pt minus0pt
 \newbox\voidb@x % permanently void box register
  
@@ -441,21 +441,21 @@
 %\font\preloaded=cmr6
 %\font\fiverm=cmr5
  
-%\font\teni=cmmi10 % math italic %LP in fonts.tex
+%\font\teni=cmmi10 % math italic %LP in lollipop-fonts.tex
 %\font\preloaded=cmmi9
 %\font\preloaded=cmmi8
 %\font\seveni=cmmi7
 %\font\preloaded=cmmi6
 %\font\fivei=cmmi5
  
-%\font\tensy=cmsy10 % math symbols %LP in fonts.tex
+%\font\tensy=cmsy10 % math symbols %LP in lollipop-fonts.tex
 %\font\preloaded=cmsy9
 %\font\preloaded=cmsy8
 %\font\sevensy=cmsy7
 %\font\preloaded=cmsy6
 %\font\fivesy=cmsy5
  
-\font\tenex=cmex10 % This seems to be necessary here
+\font\tenex=cmex10 % math extension (This seems to be necessary here)
  
 %\font\preloaded=cmss10 % sans serif
 %\font\preloaded=cmssq8
@@ -488,7 +488,7 @@
  
 \let\preloaded=\undefined % preloaded fonts must be declared anew later.
  
-%LP \skewchar moved to fonts.tex
+%LP \skewchar moved to lollipop-fonts.tex
 %\skewchar\teni='177 \skewchar\seveni='177 \skewchar\fivei='177
 %\skewchar\tensy='60 \skewchar\sevensy='60 \skewchar\fivesy='60
  
@@ -498,6 +498,11 @@
   \sfcode`\:\@m \sfcode`\;\@m \sfcode`\,\@m}
 \def\nonfrenchspacing{\sfcode`\.3000\sfcode`\?3000\sfcode`\!3000%
   \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 }
+  
+
+% VK define \normalbaselines
+\def\normalbaselines{\lineskip\normallineskip
+  \baselineskip\normalbaselineskip \lineskiplimit\normallineskiplimit}
  
 \def\^^M{\ } % control <return> = control <space>
 \def\^^I{\ } % same for <tab>
@@ -697,8 +702,9 @@
 \def\Orb{\mathhexbox20D}
  
 \def\oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex%
-  \ialign{##\crcr#1\crcr}}} \def\o@lign{\lineskiplimit\z@ \oalign}
-\def\ooalign{\lineskiplimit-\maxdimen \oalign} % chars over each other
+  \ialign{##\crcr#1\crcr}}} % put characters over each other
+\def\o@lign{\lineskiplimit\z@ \oalign}
+\def\ooalign{\lineskiplimit-\maxdimen \oalign}
 {\catcode`p=12 \catcode`t=12 \gdef\\#1pt{#1}} \let\getf@ctor=\\
 \def\sh@ft#1{\dimen@#1\kern\expandafter\getf@ctor\the\fontdimen1\font
   \dimen@} % kern by #1 times the current slant
@@ -758,7 +764,6 @@
   \else\let\nxt\egroup\fi\fi \nxt}
 \def\pr@@@s#1{\prim@s} \def\pr@@@t#1#2{#2\egroup}
 {\catcode`\^^Z=\active \gdef^^Z{\not=}} % ^^Z is like \ne in math
-
 {\catcode`\_=\active \global\let_=\_} % _ in math is either subscript or \_
  
 \mathchardef\alpha="010B
@@ -803,7 +808,7 @@
 \mathchardef\Omega="700A
  
 \mathchardef\aleph="0240
-\def\hbar{{\mathchar'26\mkern-9muh}}
+\def\hbar{{\mathchar'26\mkern-9muh}} 
 \mathchardef\imath="017B
 \mathchardef\jmath="017C
 \mathchardef\ell="0160
@@ -882,7 +887,7 @@
 \mathchardef\ast="2203
 \mathchardef\times="2202
 \mathchardef\star="213F
- 
+
 \mathchardef\propto="322F
 \mathchardef\sqsubseteq="3276
 \mathchardef\sqsupseteq="3277
@@ -929,7 +934,7 @@
 \mathchardef\leftharpoondown="3129
 \mathchardef\rightharpoonup="312A
 \mathchardef\rightharpoondown="312B
- 
+
 \def\joinrel{\mathrel{\mkern-3mu}}
 \def\relbar{\mathrel{\smash-}} % \smash, because - has the same height as +
 \def\Relbar{\mathrel=}
@@ -945,7 +950,7 @@
 \def\longleftrightarrow{\leftarrow\joinrel\rightarrow}
 \def\Longleftrightarrow{\Leftarrow\joinrel\Rightarrow}
 \def\iff{\;\Longleftrightarrow\;}
- 
+
 \mathchardef\ldotp="613A % ldot as a punctuation mark
 \mathchardef\cdotp="6201 % cdot as a punctuation mark
 \mathchardef\colon="603A % colon as a punctuation mark
@@ -955,7 +960,7 @@
     \kern6\p@\hbox{.}\hbox{.}\hbox{.}}}
 \def\ddots{\mathinner{\mkern1mu\raise7\p@\vbox{\kern7\p@\hbox{.}}\mkern2mu
     \raise4\p@\hbox{.}\mkern2mu\raise\p@\hbox{.}\mkern1mu}}
- 
+
 \def\acute{\mathaccent"7013 }
 \def\grave{\mathaccent"7012 }
 \def\ddot{\mathaccent"707F }
@@ -1007,7 +1012,7 @@
 \def\lceil{\delimiter"4264306 }
 \def\rfloor{\delimiter"5263305 }
 \def\lfloor{\delimiter"4262304 }
- 
+
 \def\bigl{\mathopen\big}
 \def\bigm{\mathrel\big}
 \def\bigr{\mathclose\big}
@@ -1025,21 +1030,21 @@
 \def\bigg#1{{\hbox{$\left#1\vbox to14.5\p@{}\right.\n@space$}}}
 \def\Bigg#1{{\hbox{$\left#1\vbox to17.5\p@{}\right.\n@space$}}}
 \def\n@space{\nulldelimiterspace\z@ \m@th}
- 
+
 \def\choose{\atopwithdelims()}
 \def\brack{\atopwithdelims[]}
 \def\brace{\atopwithdelims\{\}}
- 
+
 \def\sqrt{\radical"270370 }
- 
+
 \def\mathpalette#1#2{\mathchoice{#1\displaystyle{#2}}%
   {#1\textstyle{#2}}{#1\scriptstyle{#2}}{#1\scriptscriptstyle{#2}}}
 \newbox\rootbox
-\def\root#1\of{\setbox\rootbox\hbox{$\m@th\scriptscriptstyle{#1}$}
-  \mathpalette\r@@t}
-\def\r@@t#1#2{\setbox\z@\hbox{$\m@th#1\sqrt{#2}$}
-  \dimen@\ht\z@ \advance\dimen@-\dp\z@
-  \mkern5mu\raise.6\dimen@\copy\rootbox \mkern-10mu \box\z@}
+\def\root#1\of{\setbox\rootbox
+  \hbox{$\m@th\scriptscriptstyle{#1}$}\mathpalette\r@@t}
+\def\r@@t#1#2{\setbox\z@\hbox{$\m@th#1\sqrt{#2}$}\dimen@\ht\z@
+  \advance\dimen@-\dp\z@
+  \mkern5mu\raise.6\dimen@\copy\rootbox \mkern-10mu\box\z@}
 \newif\ifv@ \newif\ifh@
 %% LP
 \let\v@true=\v@yes \let\v@false=\v@no 
@@ -1067,7 +1072,7 @@
     \ialign{$\m@th#1\hfil##\hfil$\crcr#2\crcr=\crcr}}}
 \def\notin{\mathrel{\mathpalette\c@ncel\in}}
 \def\c@ncel#1#2{\m@th\ooalign{$\hfil#1\mkern1mu/\hfil$\crcr$#1#2$}}
-\def\rightleftharpoons{\mathrel{\mathpalette\rlh@{}}}
+\def\rightleftharpoons{\mathrel{\mathpalette\rlh@{}}} 
 \def\rlh@#1{\vcenter{\m@th\hbox{\ooalign{\raise2pt
           \hbox{$#1\rightharpoonup$}\crcr
         $#1\leftharpoondown$}}}}
@@ -1111,11 +1116,9 @@
   \mathbin{\rm mod}\penalty900\mkern5mu\nonscript\mskip-\medmuskip}
 \def\pmod#1{\allowbreak\mkern18mu({\rm mod}\,\,#1)}
  
-\def\cases#1{\left\{\,\vcenter{%\normalbaselines
-    \m@th
+\def\cases#1{\left\{\,\vcenter{\normalbaselines\m@th
     \ialign{$##\hfil$&\quad##\hfil\crcr#1\crcr}}\right.}
-\def\matrix#1{\null\,\vcenter{%\normalbaselines
-    \m@th
+\def\matrix#1{\null\,\vcenter{\normalbaselines\m@th
     \ialign{\hfil$##$\hfil&&\quad\hfil$##$\hfil\crcr
       \mathstrut\crcr\noalign{\kern-\baselineskip}
       #1\crcr\mathstrut\crcr\noalign{\kern-\baselineskip}}}\,}
@@ -1142,7 +1145,7 @@
 \def\eqalign#1{\null\,\vcenter{\openup\jot\m@th
   \ialign{\strut\hfil$\displaystyle{##}$&$\displaystyle{{}##}$\hfil
       \crcr#1\crcr}}\,}
-\newif\ifdt@p 
+\newif\ifdt@p
 \let\dt@ptrue=\dt@pyes \let\dt@pfalse=\dt@pno %%LP
 \def\displ@y{\global\dt@ptrue\openup\jot\m@th
   \everycr{\noalign{\ifdt@p \global\dt@pfalse \ifdim\prevdepth>-1000\p@
@@ -1213,6 +1216,10 @@
     \vbox to\vsize{\unvbox\z@\kern-\dimen@}% depth is zero
     \else \box\z@\nobreak\bigskip\fi}\fi\endgroup}
  
+ 
+\def\footnoterule{\kern-3\p@
+  \hrule width 2truein \kern 2.6\p@} % the \hrule is .4pt high 
+ 
 % Hyphenation, miscellaneous macros, and initial values for standard layout
  
 \lefthyphenmin=2 \righthyphenmin=3 % disallow x- or -xx breaks
@@ -1222,16 +1229,22 @@
 \def\m@g{\mag\count@
   \hsize6.5truein\vsize8.9truein\dimen\footins8truein}
  
-\def\tracingall{\tracingonline\@ne\tracingcommands\tw@\tracingstats\tw@
+\def\loggingall{\tracingcommands\tw@\tracingstats\tw@
   \tracingpages\@ne\tracingoutput\@ne\tracinglostchars\@ne
   \tracingmacros\tw@\tracingparagraphs\@ne\tracingrestores\@ne
   \showboxbreadth\maxdimen\showboxdepth\maxdimen\errorstopmode}
+\def\tracingall{\tracingonline\@ne\loggingall}
 
 \font\tenrm=cmr10 % aw hell.
 \def\showhyphens#1{\setbox0\vbox{\parfillskip\z@skip\hsize\maxdimen\tenrm
   \pretolerance\m@ne\tolerance\m@ne\hbadness0\showboxdepth0\ #1}}
  
+ 
+\normalbaselines
+
+ 
 \endinput
 
+% 2016/04/16 Fixed the error caused by \newhelp
 % 2014/04/11 brought up to date with plain.tex for 3.141592653
-% 92/11/03 brought up to date with plain.tex for 3.0
+% 92/11/03 brought up to date with plain.tex for 3.0
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-text.tex b/Master/texmf-dist/tex/lollipop/lollipop-text.tex
index a00bdcb38cf..5cf2f62ee2f 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-text.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-text.tex
@@ -285,28 +285,75 @@
 
 % Push/Pop indentlevels
 %
-\def\PushIndentLevel
-   {\Tmessage[indent]{Old indent: \the\leftskip}%
+\def\PushLeftIndentLevel
+   {\Tmessage[indent]{Old left indent: \the\leftskip}%
     \advance\leftskip\levelindent 
     \previousindent=\levelindent
     \step@counter{indentlevel}\set@level@indent
-    \Tmessage[indent]{New indent: \the\leftskip, 
+    \Tmessage[indent]{New left indent: \the\leftskip, 
                       at level \the\cs@counter@name{indentlevel}}%
     }
+    
+\let\PushIndentLevel\PushLeftIndentLevel % for backwards compatibility
 
 % Popping an indent level requires two pops: one for the \levelindent
 % and one for the \previousindent. This last one then has to be 
 % pushed again.
 %
-\def\PopIndentLevel
+\def\PopLeftIndentLevel
    {\ifnum\cs@counter@name{indentlevel}=\@ne
-        \Emessage{Pop indent level attempted at outer level}
+        \Emessage{Pop left indent level attempted at outer level}
     \else \back@step@counter{indentlevel}%
         \back@step@counter{indentlevel}%
         \set@level@indent \previousindent\levelindent
         \step@counter{indentlevel}%
         \set@level@indent\advance\leftskip-\levelindent
     \fi}
+    
+\let\PopIndentLevel\PopLeftIndentLevel % for backwards compatibility
+  
+\def\PushRightIndentLevel
+   {\Tmessage[indent]{Old right indent: \the\rightskip}%
+    \advance\rightskip\levelindent 
+    \previousindent=\levelindent
+    \step@counter{indentlevel}\set@level@indent
+    \Tmessage[indent]{New right indent: \the\rightskip, 
+                      at level \the\cs@counter@name{indentlevel}}%
+    }
+    
+\def\PopRightIndentLevel
+   {\ifnum\cs@counter@name{indentlevel}=\@ne
+        \Emessage{Pop right indent level attempted at outer level}
+    \else \back@step@counter{indentlevel}%
+        \back@step@counter{indentlevel}%
+        \set@level@indent \previousindent\levelindent
+        \step@counter{indentlevel}%
+        \set@level@indent\advance\rightskip-\levelindent
+    \fi}
+    
+\def\PushLeftRightIndentLevels
+   {\Tmessage[indent]{Old left indent: \the\leftskip}%
+     \Tmessage[indent]{Old right indent: \the\rightskip}%
+    \advance\leftskip\levelindent 
+    \advance\rightskip\levelindent 
+    \previousindent=\levelindent
+    \step@counter{indentlevel}\set@level@indent
+    \Tmessage[indent]{New left indent: \the\leftskip, 
+                      at level \the\cs@counter@name{indentlevel}}%
+    \Tmessage[indent]{New right indent: \the\rightskip, 
+                      at level \the\cs@counter@name{indentlevel}}%
+    }    
+
+\def\PopLeftRightIndentLevels
+   {\ifnum\cs@counter@name{indentlevel}=\@ne
+        \Emessage{Pop left and right indents level attempted at outer level}
+    \else \back@step@counter{indentlevel}%
+        \back@step@counter{indentlevel}%
+        \set@level@indent \previousindent\levelindent
+        \step@counter{indentlevel}%
+        \set@level@indent\advance\rightskip-\levelindent
+                                       \advance\leftskip-\levelindent
+    \fi}
 
 %%%%%%%%%%%%%%%% Paragraph Skip control
 % parskip is stored and set to zero at the start and end
@@ -372,6 +419,7 @@
 %
 \Distance:rightmarginstretch={0pt plus 6cm}
 \Distance:leftmarginstretch={0pt plus 6cm}
+\Distance:leftrightmarginstretch={0pt plus 1fil}
 \def\FlushLeft:#1 {\switch {\if\EqualString{#1}}
     {yes} {\leftskip=1\leftskip}
     {default} {\leftskip=1\leftskip
@@ -385,6 +433,15 @@
     \endswitch \relax}
 \FlushRight:yes
 
+
+\def\FlushCenter:#1 {\switch {\if\EqualString{#1}}
+    {yes} {\leftskip=\leftrightmarginstretch
+              \rightskip=\leftrightmarginstretch
+              \parindent\z@\parfillskip\z@}
+    {no} {}
+    \endswitch \relax}
+
+
 %%%%%%% lijn
 % #1 : hoogte; #2 : lengte; #3 : elevatie
 % parameters kunnen van achter af aan weggelaten worden;
@@ -480,6 +537,13 @@
 
 \endinput
 
+% 2016/04/14 defined \PushLeftIndentLevel, \PopLeftIndentLevel, 
+%                    \PushRightIndentLevel, \PopRightIndentLevel, 
+%                    \PushLeftRightIndentLevels, and \PopLeftRightIndentLevels
+%                    commands. \PushIndentLevel is now a synonym for
+%                    \PushLeftIndentLevel and \PopIndentLevel is a synonym
+%                    for \PopLeftIndentLevel
+%                    defined \FlushCenter
 % 2014/04/13 defined \EveryParagraph, \EveryMath, and \EveryDisplay
 % 2014/04/12 changed "#1 cs to \"#1 cs to be compatible with plain;
 % also we can not make " active since it is used by xetex for font selection
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-tools.tex b/Master/texmf-dist/tex/lollipop/lollipop-tools.tex
index 8d5e7be24ec..f7b11454b5c 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-tools.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-tools.tex
@@ -72,8 +72,8 @@
 % by \input'ting on top of an already existing format.
 % This is to avoid double definitions and major accidents.
 % 
-\def\lolli@name{Lollipop}
-\expandafter\ifx\csname fmtname\endcsname\lolli@name
+\def\lollipop@name{Lollipop}
+\expandafter\ifx\csname fmtname\endcsname\lollipop@name
     \let\ifini\take@one
     \let\ifnin\keep@one
     \message{! Loading Lollipop on top of format !}
@@ -1498,6 +1498,7 @@
 
 \endinput
 
+% 2016/04/13 Chnaged \lolli@name to \lollipop@name
 % 2014/04/18 Fixed the wrong numbering of nested enumerate lists
 % 92/11/03 Improved penalty handling for embedded environments
 %     \ifini test extended to make loading on top of plain possible
@@ -1505,4 +1506,4 @@
 % 92/11/14 Resetlist generation made conditional
 % 92/11/21 option 'arg'
 % 92/12/12 \sTitelize, \give@title
-% 93/07/30 late@after@toks, inputlineno in group errmsg
+% 93/07/30 late@after@toks, inputlineno in group errmsg
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/lollipop/lollipop.tex b/Master/texmf-dist/tex/lollipop/lollipop.tex
index db1221c6381..b180e91efc2 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop.tex
@@ -52,6 +52,7 @@
 
 \input lollipop-lists
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \frenchspacing 
 \showboxdepth=7 \showboxbreadth=300 
@@ -113,16 +114,27 @@
 %           " active since it is used by xetex for font selection,
 %           new ini file xelollipop.ini
 %
-%v1.02 Updated lollipop-text.tex (defined \EveryParagraph,
-%          \EveryMath, and \EveryDisplay), defined 
-%          \PointSizeScriptSizes:12
+% v1.02 Updated lollipop-text.tex (defined \EveryParagraph,
+%           \EveryMath, and \EveryDisplay), defined 
+%           \PointSizeScriptSizes:12
+%
+% v1.03 Fixed the wrong numbering of nested enumerate lists
 %
-%v1.03 Fixed the wrong numbering of nested enumerate lists
+% v1.04 Updated version number and date of the format in \fmtversion
 %
-%v1.04 Updated version number and date of the format in \fmtversion
+% v1.05 Changed \lolli@name to \lollipop@name
+%           added \footnoterule to output routine
+%           defined \PushLeftIndentLevel, \PopLeftIndentLevel, 
+%           \PushRightIndentLevel, \PopRightIndentLevel, 
+%           \PushLeftRightIndentLevels, and \PopLeftRightIndentLevels
+%           commands. \PushIndentLevel is now a synonym for
+%           \PushLeftIndentLevel and \PopIndentLevel is a synonym
+%           for \PopLeftIndentLevel
+%           defined \FlushCenter
+%           fixed the error caused by \newhelp
 %
-\edef\fmtname{\lolli@name}%defined in Tools
-\def\fmtversion{v1.04, 9 April 2016}
+\edef\fmtname{\lollipop@name}%defined in Tools
+\def\fmtversion{v1.05, 16 April 2016}
 \append@to@list{everyjob}{\message{
 >>>>  This is Lollipop TeX (\fmtversion)  <<<<}}