lollipop (16apr16)

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

7 files changed, 74 insertions, 72 deletions

diff --git a/Master/texmf-dist/doc/otherformats/lollipop/README b/Master/texmf-dist/doc/otherformats/lollipop/README
index 8b383b19596..e92be5dd887 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/README
+++ b/Master/texmf-dist/doc/otherformats/lollipop/README
@@ -65,18 +65,29 @@ History so far:
            to start with `lollipop' prefix, and fixed typewriter font.
            
 0.99 9 April 2014, improved ini files, and the error in 
-        address.tex example fixed.
+           address.tex example fixed.
         
 1.00 11 April 2014, updated lollipop-plain.tex and manual.
 
 1.01 12 April 2014, Updated lollipop-text.tex (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, new ini
-           file xelollipop.ini
+            to be compatible with plain; also we can not make 
+            " active since it is used by xetex for font selection, new ini
+            file xelollipop.ini
            
 1.02 16 April 2014, Updated lollipop-text.tex (defined \EveryParagraph,
-          \EveryMath, and \EveryDisplay), defined \PointSizeScriptSizes:12
+             \EveryMath, and \EveryDisplay), defined \PointSizeScriptSizes:12
           
 1.03 19 April 2014, Fixed the wrong numbering of nested enumerate lists
 
-1.04 9 April 2016, Updated lualollipop.ini for the new luatex binary
\ No newline at end of file
+1.04 9 April 2016, Updated lualollipop.ini for the new luatex binary
+
+1.05 16 April 2016, 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
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/address.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/address.tex
index f5d2d8202ed..3627c90d557 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/address.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/address.tex
@@ -29,7 +29,6 @@
 %
 \Distance:whitebefore=0pt \Distance:whiteafter=0pt
 \AlwaysIndent:no \FlushRight:no
-%\TypeFace:macHelvetica \PointSize:7 \Style:roman
 \TypeFace:ComputerSans \PointSize:8 \Style:roman
 \def\\{,\Spaces:1 }
 
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.pdf b/Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.pdf
index 0a62cc760d8..0fb90d57be4 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.pdf
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.pdf
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.tex
index 1b834837807..b2e78847334 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.tex
@@ -30,14 +30,7 @@
 %
 \def\SerifFace{\TypeFace:ComputerModern }
 \def\SansFace{\TypeFace:ComputerSans }
-\comment
-% Macintosh Times & Helvetica
-\def\SerifFace{\TypeFace:macTimes }
-\def\SansFace{\TypeFace:macHelvetica }
-% Unix Postscript has different names
-\def\SerifFace{\TypeFace:unixTimes }
-\def\SansFace{\TypeFace:unixHelvetica }
-\endcomment 
+
 
 % Now load the style definition. This takes some time.
 \input mandefs
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
index cee047bbaa9..3faf7a7d2b6 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
@@ -182,12 +182,9 @@ This shouldn't cause any problem, but it has to be fixed.
 \item \cs{ToExternalFile} doesn't work.
 \> 
 
-There may be other known issues on GitHub:
-\n{https://github.com/persian-tex/lollipop/issues}.
- 
  
 If you find any other issues, or if you have any fixes/workarounds
-for any existing issues, then please post them on GitHub.
+for any existing issues, then please post them on sourceforge.
 
 \Section About this manual
 
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex
index f270cf48b0b..6ed604e595c 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex
@@ -20,7 +20,7 @@
 \begingroup\AlwaysIndent:no
 \PointSize:25 \Style:bold  Lollipop Unwrapped
 
-{\tt https://github.com/persian-tex}
+{\tt http://lollipoptex.sourceforge.net}
 
 \white:30pt
 
@@ -34,7 +34,7 @@ Vafa Khalighi    {\rm(Current developer)}
 
 \PointSize:15 \Style:roman
 A manual for the Lollipop \TeX\ format,\par
-last updated 9 April 2016\par
+last updated 16 April 2016\par
 Pages: \LastInPageCounter+\LastRegPageCounter
 % so far we could have done this with labels, however
 \AddToCounter:LastRegPage=LastInPageValue
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/tex-inde.xen b/Master/texmf-dist/doc/otherformats/lollipop/tex-inde.xen
index 413132f5d70..7acf11b3e66 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/tex-inde.xen
+++ b/Master/texmf-dist/doc/otherformats/lollipop/tex-inde.xen
@@ -17,8 +17,8 @@ Description: cross referencing macros for
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-document.tex
@@ -27,8 +27,8 @@ Description: document handling macros for the
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-float.tex
@@ -37,8 +37,8 @@ Description: floating insertion macros
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-fontdefs.tex
@@ -46,8 +46,8 @@ Description: fontdefinitions for the lollipop package
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-fonts.tex
@@ -56,8 +56,8 @@ Description: font handling macros
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-heading.tex
@@ -65,8 +65,8 @@ Description: heading macros for the lollipop package
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-lists.tex
@@ -75,8 +75,8 @@ Description: list definition macros
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop.tex
@@ -84,11 +84,13 @@ Description: main file for the lollipop package
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
-Note: requires define.tex, document.tex float.tex, 
- fontdefs.tex, fonts.tex, heading.tex, lists,tex,
- lolplain.tex, output.tex, text.tex, tools.tex.
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
+Note: requires lollipop-define.tex, lollipop-document.tex 
+ lollipop-float.tex, lollipop-fontdefs.tex, lollipop-fonts.tex, 
+ lollipop-heading.tex, lollipop-lists,tex,
+ lollipop-plain.tex, lollipop-output.tex, lollipop-math.tex,
+ lollipop-text.tex, lollipop-tools.tex.
 
 Name: lollipop-plain.tex
 Description: version of plain.tex customized
@@ -96,8 +98,8 @@ Description: version of plain.tex customized
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-output.tex
@@ -106,8 +108,8 @@ Description: output routine macros
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-text.tex
@@ -116,8 +118,8 @@ Description: text environment definitions
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-tools.tex
@@ -125,8 +127,8 @@ Description: utility macros for the lollipop package
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the lollipop package, see lollipop.tex.
 
 %% lollipop manual
@@ -137,8 +139,8 @@ Description: comment environment for plain TeX,
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -148,8 +150,8 @@ Description: description of external file handling
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -158,8 +160,8 @@ Description: description of headings in lollipop TeX.
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -168,8 +170,8 @@ Description: description of lists in lollipop TeX.
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -178,8 +180,8 @@ Description: style definition for the lollipop TeX manual.
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -188,8 +190,8 @@ Description: master file for the lollipop TeX manual
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: requires comment.tex, extern.tex, head.tex, list.tex
  mandefs.tex, lollipop-manual.bbl, opt.tex, out.tex, prelim.tex,
  struct.tex, titlepag.tex, trace.tex.
@@ -200,8 +202,8 @@ Description: description of construct options
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -211,8 +213,8 @@ Description: description of output handling
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -221,8 +223,8 @@ Description: introductory chapter of lollipop manual.
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -232,8 +234,8 @@ Description: description of the overall structure of
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -242,8 +244,8 @@ Description: titlepage of the lollipop manual
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -252,8 +254,8 @@ Description: description of trace modes in lollipop TeX
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.04, 9 April 2016
-Archives: https://github.com/persian-tex
+Latest version: v1.05, 16 April 2016
+Archives: http://lollipoptex.sourceforge.net
 Note: part of the manual of the lollipop package,
   see lollipop.tex.