lollipop (14may16), now plain tex only

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

5 files changed, 75 insertions, 98 deletions

diff --git a/Master/texmf-dist/doc/otherformats/lollipop/README b/Master/texmf-dist/doc/otherformats/lollipop/README
index e92be5dd887..4e3d0cc5f95 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/README
+++ b/Master/texmf-dist/doc/otherformats/lollipop/README
@@ -3,11 +3,6 @@ About Lollipop and its manual.
 You have obtained a package containing the Lollipop format 
 and its manual.
 
-
-The manual uses only Computer Modern, but there are a few
-lines in `lollipop-manual.tex' that allow you to switch easily to Times
-and Helvetica on Macintosh and Unix systems.
-
 The manual is a pretty good illustration of the power of
 Lollipop, but there is also a file 'address.tex' which
 contains example macros for an address book.
@@ -21,15 +16,15 @@ your appreciation :-) , feel free to contact me:
  persian-tex@tug.org
 
 Here is how much of TeX's memory you used:
- 1194 strings out of 495844
- 16212 string characters out of 6190699
- 74602 words of memory out of 5000000
- 3495 multiletter control sequences out of 15000+600000
- 11241 words of font info for 40 fonts, out of 8000000 for 9000
+ 1187 strings out of 496577
+ 16107 string characters out of 6202674
+ 66696 words of memory out of 5000000
+ 3268 multiletter control sequences out of 15000+600000
+ 10531 words of font info for 38 fonts, out of 8000000 for 9000
  19 hyphenation exceptions out of 8191
- 27i,4n,24p,187b,448s stack positions out of 
- 5000i,500n,10000p,200000b,80000s
-Output written on lollipop-manual.pdf (59 pages, 334502 bytes).
+ 24i,4n,24p,189b,562s stack positions out of 5000i,500n,10000p,200000b,80000s
+
+Output written on lollipop-manual.dvi (71 pages, 158476 bytes).
 
 
 History so far:
@@ -64,15 +59,13 @@ History so far:
 0.98 6 April 2014, changed all lollipop filenames
            to start with `lollipop' prefix, and fixed typewriter font.
            
-0.99 9 April 2014, improved ini files, and the error in 
+0.99 9 April 2014, improved ini file, and the error in 
            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
            
 1.02 16 April 2014, Updated lollipop-text.tex (defined \EveryParagraph,
              \EveryMath, and \EveryDisplay), defined \PointSizeScriptSizes:12
@@ -89,5 +82,7 @@ History so far:
          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
+         fixed the error caused by \newhelp
+
+1.06 14 May 2016, Defined \FrenchSpacing
+         Use 12pt size
\ No newline at end of file
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 0fb90d57be4..295640973a5 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/prelim.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
index 3faf7a7d2b6..1e4a16f231d 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
@@ -98,31 +98,13 @@ The following files comprise the Lollipop format:
     lollipop-tools.tex             lollipop.tex<Rev
 
 
-Lollipop comes in the following three formats:
-\Itemize
-\item \n{lollipop} uses Pdf\TeX{} engine and produces pdf output.
-\item \n{lualollipop} uses Lua\TeX{} engine and produces pdf output.
-\item \n{xelollipop} uses Xe\TeX{} engine and produces pdf output.
-\>
-
-
 To process a file, say \file{test.tex}, with
 Lollipop you then type:
 
 \Ver>
 > lollipop test.tex <Rev
 
-or
-
-\Ver>
-> lualollipop test.tex <Rev
-
-or
-
-\Ver>
-> xelollipop test.tex <Rev
-
-depending on which of the three formats you want to use.
+to get the dvi output.
 
 
 \Section[sec:style-dump] Processing a Lollipop file
@@ -184,7 +166,7 @@ This shouldn't cause any problem, but it has to be fixed.
 
  
 If you find any other issues, or if you have any fixes/workarounds
-for any existing issues, then please post them on sourceforge.
+for any existing issues, then please post them on GitHub.
 
 \Section About this manual
 
@@ -216,17 +198,16 @@ and
 bibliography there are the Bib\TeX\ input file \file{lollipop-manual.bib} and
 output file \file{lollipop-manual.bbl}.
 
-This manual needs quite some resources: here's what pdf\TeX\ told me
+This manual needs quite some resources: here's what \TeX\ told me
 it needed.
 \Ver>Here is how much of TeX's memory you used:
- 1193 strings out of 495844
- 16191 string characters out of 6190699
- 74602 words of memory out of 5000000
- 3494 multiletter control sequences out of 15000+600000
- 10941 words of font info for 39 fonts, out of 8000000 for 9000
+ 1187 strings out of 496577
+ 16107 string characters out of 6202674
+ 66696 words of memory out of 5000000
+ 3268 multiletter control sequences out of 15000+600000
+ 10531 words of font info for 38 fonts, out of 8000000 for 9000
  19 hyphenation exceptions out of 8191
- 27i,4n,24p,187b,448s stack positions out of 
- 5000i,500n,10000p,200000b,80000s<Rev
+ 24i,4n,24p,189b,562s stack positions out of 5000i,500n,10000p,200000b,80000s<Rev
 
 
 Because of all the examples this manual takes quite some time to
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex
index 6ed604e595c..14383a56b4e 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 http://lollipoptex.sourceforge.net}
+{\tt https://github.com/persian-tex/lollipop}
 
 \white:30pt
 
@@ -33,8 +33,9 @@ Vafa Khalighi    {\rm(Current developer)}
 \white:50pt
 
 \PointSize:15 \Style:roman
-A manual for the Lollipop \TeX\ format,\par
-last updated 16 April 2016\par
+A manual for the Lollipop \TeX\ format\par
+Version 1.06\par
+Last updated 14 May 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 7acf11b3e66..a62f7dcab30 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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop.tex
@@ -84,8 +84,8 @@ Description: main file for the lollipop package
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: requires lollipop-define.tex, lollipop-document.tex 
  lollipop-float.tex, lollipop-fontdefs.tex, lollipop-fonts.tex, 
  lollipop-heading.tex, lollipop-lists,tex,
@@ -98,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-output.tex
@@ -108,8 +108,8 @@ Description: output routine macros
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-text.tex
@@ -118,8 +118,8 @@ Description: text environment definitions
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-tools.tex
@@ -127,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
 %% lollipop manual
@@ -139,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -150,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -160,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -170,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -180,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -190,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 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.
@@ -202,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -213,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -223,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -234,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -244,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -254,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.05, 16 April 2016
-Archives: http://lollipoptex.sourceforge.net
+Latest version: v1.06, 14 May 2016
+Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.