5 files changed, 43 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/README b/Master/texmf-dist/doc/otherformats/lollipop/README
index 4e3d0cc5f95..fd6a6503180 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/README
+++ b/Master/texmf-dist/doc/otherformats/lollipop/README
@@ -16,23 +16,22 @@ your appreciation :-) , feel free to contact me:
  persian-tex@tug.org
 
 Here is how much of TeX's memory you used:
- 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
+ 1194 strings out of 496579
+ 16173 string characters out of 6202690
+ 72655 words of memory out of 5000000
+ 3270 multiletter control sequences out of 15000+600000
+ 11241 words of font info for 40 fonts, out of 8000000 for 9000
  19 hyphenation exceptions out of 8191
- 24i,4n,24p,189b,562s stack positions out of 5000i,500n,10000p,200000b,80000s
-
-Output written on lollipop-manual.dvi (71 pages, 158476 bytes).
+ 24i,4n,24p,187b,562s stack positions out of 5000i,500n,10000p,200000b,80000s
 
+Output written on lollipop-manual.dvi (59 pages, 155468 bytes).
 
 History so far:
 
 0.9  October 1992, first public release
 
 0.91 Unannounced update
-     TeX3 based lolplain
+     TeX3 based lollipop-plain
      penalties and white space in embedded constructs
      splittopskip set equal to topskip
      
@@ -54,7 +53,7 @@ History so far:
      address book example format.
      
 0.97 4 April 2014, organized and updated
-        files and also generated various formats.
+        files and also generated format.
         
 0.98 6 April 2014, changed all lollipop filenames
            to start with `lollipop' prefix, and fixed typewriter font.
@@ -72,8 +71,6 @@ History so far:
           
 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
-
 1.05 16 April 2016, Changed \lolli@name to \lollipop@name
          added \footnoterule to output routine
          defined \PushLeftIndentLevel, \PopLeftIndentLevel, 
@@ -85,4 +82,5 @@ History so far:
          fixed the error caused by \newhelp
 
 1.06 14 May 2016, Defined \FrenchSpacing
-         Use 12pt size
-\ No newline at end of file
+
+1.07 21 May 2016, Some minor changes
+\ 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 295640973a5..533d578a0bc 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 1e4a16f231d..d0af6d3e025 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
@@ -201,13 +201,13 @@ output file \file{lollipop-manual.bbl}.
 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:
- 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
+ 1194 strings out of 496579
+ 16173 string characters out of 6202690
+ 72655 words of memory out of 5000000
+ 3270 multiletter control sequences out of 15000+600000
+ 11241 words of font info for 40 fonts, out of 8000000 for 9000
  19 hyphenation exceptions out of 8191
- 24i,4n,24p,189b,562s stack positions out of 5000i,500n,10000p,200000b,80000s<Rev
+ 24i,4n,24p,187b,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 14383a56b4e..c03ee4cd9ed 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex
@@ -34,8 +34,8 @@ Vafa Khalighi    {\rm(Current developer)}
 
 \PointSize:15 \Style:roman
 A manual for the Lollipop \TeX\ format\par
-Version 1.06\par
-Last updated 14 May 2016\par
+Version 1.07\par
+Last updated 21 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 a62f7dcab30..3f8f2acca65 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/tex-inde.xen
+++ b/Master/texmf-dist/doc/otherformats/lollipop/tex-inde.xen
@@ -17,7 +17,7 @@ Description: cross referencing macros for
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -27,7 +27,7 @@ Description: document handling macros for the
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -37,7 +37,7 @@ Description: floating insertion macros
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -46,7 +46,7 @@ Description: fontdefinitions for the lollipop package
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -56,7 +56,7 @@ Description: font handling macros
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -65,7 +65,7 @@ Description: heading macros for the lollipop package
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -75,7 +75,7 @@ Description: list definition macros
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -84,7 +84,7 @@ Description: main file for the lollipop package
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 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, 
@@ -98,7 +98,7 @@ Description: version of plain.tex customized
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -108,7 +108,7 @@ Description: output routine macros
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -118,7 +118,7 @@ Description: text environment definitions
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -127,7 +127,7 @@ Description: utility macros for the lollipop package
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the lollipop package, see lollipop.tex.
 
@@ -139,7 +139,7 @@ Description: comment environment for plain TeX,
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
@@ -150,7 +150,7 @@ Description: description of external file handling
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
@@ -160,7 +160,7 @@ Description: description of headings in lollipop TeX.
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
@@ -170,7 +170,7 @@ Description: description of lists in lollipop TeX.
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
@@ -180,7 +180,7 @@ 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.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
@@ -190,7 +190,7 @@ 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.06, 14 May 2016
+Latest version: v1.07, 21 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,
@@ -202,7 +202,7 @@ Description: description of construct options
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
@@ -213,7 +213,7 @@ Description: description of output handling
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
@@ -223,7 +223,7 @@ Description: introductory chapter of lollipop manual.
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
@@ -234,7 +234,7 @@ Description: description of the overall structure of
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
@@ -244,7 +244,7 @@ Description: titlepage of the lollipop manual
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
@@ -254,7 +254,7 @@ 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.06, 14 May 2016
+Latest version: v1.07, 21 May 2016
 Archives: http://ctan.org/pkg/lollipop
 Note: part of the manual of the lollipop package,
   see lollipop.tex.