lollipop

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

34 files changed, 101 insertions, 176 deletions

diff --git a/Master/texmf-dist/doc/otherformats/lollipop/README b/Master/texmf-dist/doc/otherformats/lollipop/README
index 51cc0b3cd3e..8b383b19596 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/README
+++ b/Master/texmf-dist/doc/otherformats/lollipop/README
@@ -77,4 +77,6 @@ History so far:
 1.02 16 April 2014, Updated lollipop-text.tex (defined \EveryParagraph,
           \EveryMath, and \EveryDisplay), defined \PointSizeScriptSizes:12
           
-1.03 19 April 2014, Fixed the wrong numbering of nested enumerate lists
\ No newline at end of file
+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
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/address.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/address.tex
index 26da950a505..f5d2d8202ed 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/address.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/address.tex
@@ -1,6 +1,6 @@
 % address book macros
 % copyright 1993 Victor Eijkhout
-% copyright 2014 Vafa Khalighi
+% copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 %
 % These macros are based on the Lollipop macro package,
 % copyright 1992/3 Victor Eijkhout
-% copyright 2014 Vafa Khalighi
+% copyright 2014--2016 Vafa Khalighi
 %
 % Format this file twice to get external files right.
 %
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/appendix.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/appendix.tex
index 80a998443fd..5b05e322147 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/appendix.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/appendix.tex
@@ -1,5 +1,5 @@
 % appendix.tex copyright1992 Victor Eijkhout
-%                       copyright 2014 Vafa Khalighi
+%                       copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/comm.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/comm.tex
index 5fba81be50d..2876acf959d 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/comm.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/comm.tex
@@ -1,5 +1,5 @@
 % comm.tex copyright 1992 Victor Eijkhout
-%                  copyright 2014 Vafa Khalighi
+%                  copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/extern.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/extern.tex
index e9a3c5937bd..aff8e97d59c 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/extern.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/extern.tex
@@ -1,5 +1,5 @@
 % extern.tex copyright 1992 Victor Eijkhout
-%                  copyright 2014 Vafa Khalighi
+%                  copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/head.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/head.tex
index cceb07930cf..2053c58c635 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/head.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/head.tex
@@ -1,5 +1,5 @@
 % head.tex copyright 1992 Victor Eijkhout
-%                 copyright 2014 Vafa Khalighi
+%                 copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/list.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/list.tex
index 87396cbc1f2..24df43a61bd 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/list.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/list.tex
@@ -1,5 +1,5 @@
 % list.tex copyright 1992 Victor Eijkhout
-%              copyright 2014 Vafa Khalighi
+%              copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
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 a91065dc19a..0a62cc760d8 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 9ad2d7b743a..1b834837807 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.tex
@@ -1,6 +1,6 @@
 % lollipop-manual.tex master file for the Lollipop TeX manual.
 % this file and all input files for it copyright 1992 Victor Eijkhout,
-%                                                 copyright 2014 Vafa Khalighi,
+%                                                 copyright 2014--2016 Vafa Khalighi,
 % except where indicated otherwise.
 %
 %
@@ -94,6 +94,6 @@
 \BackStepCounter:LastRegPage
 \Stop
 
-% 2014/04/11  Updated the manual
+% 2016/04/09  Updated the manual
 % 92/11/20 Total pages counter
 % 93/01/08 \comment and such for two part processing
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/mandefs.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/mandefs.tex
index e952bea1ebb..dbc822d78da 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/mandefs.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/mandefs.tex
@@ -1,6 +1,6 @@
 % mandefs.tex style definition for the Lollipop manual
 % copyright 1992/3 Victor Eijkhout
-% copyright 2014 Vafa Khalighi
+% copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/opt.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/opt.tex
index 041842ff8da..1d0b5d79594 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/opt.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/opt.tex
@@ -1,5 +1,5 @@
 % opt.tex copyright 1992 Victor Eijkhout
-%              copyright 2014 Vafa Khalighi
+%              copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/out.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/out.tex
index 9ed6cc00022..23dab4395d2 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/out.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/out.tex
@@ -1,5 +1,5 @@
 % out.tex copyright 1992/3 Victor Eijkhout
-%              copyright 2014 Vafa Khalighi
+%              copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
index c124feb91db..cee047bbaa9 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex
@@ -1,5 +1,5 @@
 % prelim.tex copyright 1992 Victor Eijkhout
-%                  copyright 2014 Vafa Khalighi
+%                  copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
@@ -98,12 +98,10 @@ The following files comprise the Lollipop format:
     lollipop-tools.tex             lollipop.tex<Rev
 
 
-Lollipop comes in the following five formats:
+Lollipop comes in the following three formats:
 \Itemize
 \item \n{lollipop} uses Pdf\TeX{} engine and produces pdf output.
-\item \n{dvilollipop} uses Pdf\TeX{} engine and produces dvi output.
 \item \n{lualollipop} uses Lua\TeX{} engine and produces pdf output.
-\item \n{dvilualollipop} uses Lua\TeX{} engine and produces dvi output.
 \item \n{xelollipop} uses Xe\TeX{} engine and produces pdf output.
 \>
 
@@ -114,27 +112,17 @@ Lollipop you then type:
 \Ver>
 > lollipop test.tex <Rev
 
-or 
-
-\Ver>
-> dvilollipop test.tex <Rev
-
 or
 
 \Ver>
 > lualollipop test.tex <Rev
 
-or 
-
-\Ver>
-> dvilualollipop test.tex <Rev
-
 or
 
 \Ver>
 > xelollipop test.tex <Rev
 
-depending on which of the five formats you want to use.
+depending on which of the three formats you want to use.
 
 
 \Section[sec:style-dump] Processing a Lollipop file
@@ -194,12 +182,12 @@ This shouldn't cause any problem, but it has to be fixed.
 \item \cs{ToExternalFile} doesn't work.
 \> 
 
-There are also other known bugs on the sourceforge tickets of Lollipop:
-\n{http://sourceforge.net/p/lollipop-project/tickets/?source=navbar}.
+There may be other known issues on GitHub:
+\n{https://github.com/persian-tex/lollipop/issues}.
  
  
-If you find any other bugs, or if you have any fixes/workarounds
- for any existing bugs, then please open a ticket on the tickets.
+If you find any other issues, or if you have any fixes/workarounds
+for any existing issues, then please post them on GitHub.
 
 \Section About this manual
 
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/struct.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/struct.tex
index b390cff88d5..7590b5a3659 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/struct.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/struct.tex
@@ -1,5 +1,5 @@
 % struct.tex copyright 1992 Victor Eijkhout
-%                 copyright 2014 Vafa Khalighi
+%                 copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex
index a3415bfc2b9..f270cf48b0b 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex
@@ -1,5 +1,5 @@
 % titlepag.tex copyright 1992 Victor Eijkhout
-%                     copyright 2014 Vafa Khalighi
+%                     copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 \begingroup\AlwaysIndent:no
 \PointSize:25 \Style:bold  Lollipop Unwrapped
 
-{\tt http://lollipop-project.sourceforge.net}
+{\tt https://github.com/persian-tex}
 
 \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 19 April 2014\par
+last updated 9 April 2016\par
 Pages: \LastInPageCounter+\LastRegPageCounter
 % so far we could have done this with labels, however
 \AddToCounter:LastRegPage=LastInPageValue
@@ -79,6 +79,6 @@ after you've sorted them.)
 
 \endinput
 
-% 2014/04/11 Updated the manual
+% 2016/04/09 Updated the manual
 % 92/11/19 Page total included
 % 92/11/26 Bibliography
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/manual/trace.tex b/Master/texmf-dist/doc/otherformats/lollipop/manual/trace.tex
index b66cf31e070..febf97fa76c 100644
--- a/Master/texmf-dist/doc/otherformats/lollipop/manual/trace.tex
+++ b/Master/texmf-dist/doc/otherformats/lollipop/manual/trace.tex
@@ -1,5 +1,5 @@
 % trace.tex copyright 1992 Victor Eijkhout
-%                 copyright 2014 Vafa Khalighi
+%                 copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/doc/otherformats/lollipop/tex-inde.xen b/Master/texmf-dist/doc/otherformats/lollipop/tex-inde.xen
index 60b25a42b57..413132f5d70 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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+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.
@@ -96,8 +96,8 @@ Description: version of plain.tex customized
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-output.tex
@@ -106,8 +106,8 @@ Description: output routine macros
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-text.tex
@@ -116,8 +116,8 @@ Description: text environment definitions
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the lollipop package, see lollipop.tex.
 
 Name: lollipop-tools.tex
@@ -125,8 +125,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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the lollipop package, see lollipop.tex.
 
 %% lollipop manual
@@ -137,8 +137,8 @@ Description: comment environment for plain TeX,
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -148,8 +148,8 @@ Description: description of external file handling
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -158,8 +158,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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -168,8 +168,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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -178,8 +178,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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -188,8 +188,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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 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 +200,8 @@ Description: description of construct options
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -211,8 +211,8 @@ Description: description of output handling
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -221,8 +221,8 @@ Description: introductory chapter of lollipop manual.
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -232,8 +232,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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -242,8 +242,8 @@ Description: titlepage of the lollipop manual
 Keywords: lollipop, macro package, style definitions
 Author: Victor Eijkhout and Vafa Khalighi
 Supported: yes
-Latest version: v1.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
@@ -252,8 +252,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.03, 19 April 2014
-Archives: https://github.com/vafa/lollipop
+Latest version: v1.04, 9 April 2016
+Archives: https://github.com/persian-tex
 Note: part of the manual of the lollipop package,
   see lollipop.tex.
 
diff --git a/Master/texmf-dist/tex/lollipop/dvilollipop.ini b/Master/texmf-dist/tex/lollipop/dvilollipop.ini
deleted file mode 100644
index e15d75ee551..00000000000
--- a/Master/texmf-dist/tex/lollipop/dvilollipop.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-% copyright 2014 Vafa Khalighi
-%
-%
-%    This program is free software: you can redistribute it and/or modify
-%    it under the terms of the GNU General Public License as published by
-%    the Free Software Foundation, either version 3 of the License, or
-%    (at your option) any later version.
-%
-%    This program is distributed in the hope that it will be useful,
-%    but WITHOUT ANY WARRANTY; without even the implied warranty of
-%    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%    GNU General Public License for more details.
-%
-%    You should have received a copy of the GNU General Public License
-%    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-%
-%
-\ifx\pdfoutput\undefined \else
-  \ifx\pdfoutput\relax \else
-    \input pdftexconfig
-    \pdfoutput=0
-  \fi
-\fi
-%
-% the usual format initialization.
-\scrollmode
-\input lollipop.tex
-\dump
-\endinput
-
-% dvilollipop.fmt is generated by `pdftex -ini   -jobname=dvilollipop -progname=dvilollipop -translate-file=cp227.tcx -etex dvilollipop.ini'
diff --git a/Master/texmf-dist/tex/lollipop/dvilualollipop.ini b/Master/texmf-dist/tex/lollipop/dvilualollipop.ini
deleted file mode 100644
index 53249eeeaed..00000000000
--- a/Master/texmf-dist/tex/lollipop/dvilualollipop.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-% copyright 2014 Vafa Khalighi
-%
-%
-%    This program is free software: you can redistribute it and/or modify
-%    it under the terms of the GNU General Public License as published by
-%    the Free Software Foundation, either version 3 of the License, or
-%    (at your option) any later version.
-%
-%    This program is distributed in the hope that it will be useful,
-%    but WITHOUT ANY WARRANTY; without even the implied warranty of
-%    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%    GNU General Public License for more details.
-%
-%    You should have received a copy of the GNU General Public License
-%    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-%
-%
-% must be done first (activation of primitives)
-\input luatexiniconfig.tex
-
-% settings inherited from pdftex
-\input pdftexconfig.tex
-% dvi output by default
-\pdfoutput=0
-
-\input luatex-unicode-letters.tex   % set codes based on Unicode (full range)
-
-% the usual format initialization.
-\scrollmode
-\input lollipop.tex
-\dump
-\endinput
-
-% dvilualollipop.ini is generated by `luatex -ini   -jobname=dvilualollipop -progname=dvilualollipop dvilualollipop.ini'
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-define.tex b/Master/texmf-dist/tex/lollipop/lollipop-define.tex
index b01e4e75473..6f805a27912 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-define.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-define.tex
@@ -1,5 +1,5 @@
 % lollipop-define.tex copyright 1992/3 Victor Eijkhout
-%                  copyright 2014     Vafa Khalighi
+%                  copyright 2014--2016     Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-document.tex b/Master/texmf-dist/tex/lollipop/lollipop-document.tex
index 7014bae8423..e643cfcab08 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-document.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-document.tex
@@ -1,5 +1,5 @@
 % lollipop-document.tex copyright 1992/3 Victor Eijkhout
-%                        copyright 2014    Vafa Khalighi
+%                        copyright 2014--2016    Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-float.tex b/Master/texmf-dist/tex/lollipop/lollipop-float.tex
index 5aaa54c13ff..cc8c3b99901 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-float.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-float.tex
@@ -1,5 +1,5 @@
 % lollipop-floats.tex copyright 1992/3 Victor Eijkhout
-%                  copyright 2014    Vafa Khalighi
+%                  copyright 2014--2016    Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-fontdefs.tex b/Master/texmf-dist/tex/lollipop/lollipop-fontdefs.tex
index 2d9e02319f3..282d880e38f 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-fontdefs.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-fontdefs.tex
@@ -1,4 +1,4 @@
-% lollipop-fontdefs.tex copyright 2014 Vafa Khalighi
+% lollipop-fontdefs.tex copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-fonts.tex b/Master/texmf-dist/tex/lollipop/lollipop-fonts.tex
index d7a1ce76dc2..70465c162a9 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-fonts.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-fonts.tex
@@ -1,5 +1,5 @@
 % lollipop-fonts.tex copyright 1992/3 Victor Eijkhout
-%                 copyright 2014    Vafa Khalighi
+%                 copyright 2014--2016    Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-heading.tex b/Master/texmf-dist/tex/lollipop/lollipop-heading.tex
index 29023bf6cc1..02f0a235960 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-heading.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-heading.tex
@@ -1,5 +1,5 @@
 % lollipop-heading.tex copyright 1992 Victor Eijkhout
-%                     copyright 2014 Vafa Khalighi
+%                     copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-lists.tex b/Master/texmf-dist/tex/lollipop/lollipop-lists.tex
index 0da48fdcb3e..578610f2c6e 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-lists.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-lists.tex
@@ -1,5 +1,5 @@
 % lollipop-lists.tex copyright 1992/3 Victor Eijkhout
-%               copyright 2014 Vafa Khalighi
+%               copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-output.tex b/Master/texmf-dist/tex/lollipop/lollipop-output.tex
index eac3898a550..e3267600e1f 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-output.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-output.tex
@@ -1,5 +1,5 @@
 % lollipop-output.tex copyright 1992/3 Victor Eijkhout
-%                   copyright 2014 Vafa Khalighi
+%                   copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-plain.tex b/Master/texmf-dist/tex/lollipop/lollipop-plain.tex
index eb2c173f19d..c580773dcce 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-plain.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-plain.tex
@@ -1,7 +1,7 @@
 % This is lollipop-plain.tex, the version of plain.tex adapted to the
 % Lollipop format of Victor Eijkhout and Vafa Khalighi. 
 % copyright 1991/92 Victor Eijkhout
-% copyright 2014 Vafa Khalighi
+% copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-text.tex b/Master/texmf-dist/tex/lollipop/lollipop-text.tex
index 0c822fb7a50..a00bdcb38cf 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-text.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-text.tex
@@ -1,5 +1,5 @@
 % lollipop-text.tex copyright 1992 Victor Eijkhout
-% copyright 2014 Vafa Khalighi
+% copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-tools.tex b/Master/texmf-dist/tex/lollipop/lollipop-tools.tex
index a0ccbefdf99..8d5e7be24ec 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-tools.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-tools.tex
@@ -1,5 +1,5 @@
 % lollipop-tools.tex copyright 1992/3 Victor Eijkhout
-%                copyright 2014 Vafa Khalighi
+%                copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop.ini b/Master/texmf-dist/tex/lollipop/lollipop.ini
index 506961b5c6f..1448786763e 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop.ini
+++ b/Master/texmf-dist/tex/lollipop/lollipop.ini
@@ -1,4 +1,4 @@
-% copyright 2014 Vafa Khalighi
+% copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
diff --git a/Master/texmf-dist/tex/lollipop/lollipop.tex b/Master/texmf-dist/tex/lollipop/lollipop.tex
index 842b0123407..db1221c6381 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop.tex
@@ -2,7 +2,7 @@
 % This file and all input files and all files for the manual
 % (with the exception of hyphen.tex and btxmac.tex)
 % copyright 1992/3 Victor Eijkhout
-% copyright 2014 Vafa Khalighi
+% copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
@@ -119,8 +119,10 @@
 %
 %v1.03 Fixed the wrong numbering of nested enumerate lists
 %
+%v1.04 Updated version number and date of the format in \fmtversion
+%
 \edef\fmtname{\lolli@name}%defined in Tools
-\def\fmtversion{v1.03, 19 April 2014}
+\def\fmtversion{v1.04, 9 April 2016}
 \append@to@list{everyjob}{\message{
 >>>>  This is Lollipop TeX (\fmtversion)  <<<<}}
 
diff --git a/Master/texmf-dist/tex/lollipop/lualollipop.ini b/Master/texmf-dist/tex/lollipop/lualollipop.ini
index 9e74711ec2c..15b30c5dbec 100644
--- a/Master/texmf-dist/tex/lollipop/lualollipop.ini
+++ b/Master/texmf-dist/tex/lollipop/lualollipop.ini
@@ -1,4 +1,4 @@
-% copyright 2014 Vafa Khalighi
+% copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify
@@ -17,19 +17,17 @@
 %
 % PDF output by default.
 
-% must be done first (activation of primitives)
+% Must be done first (as needs to 'tidy up')
+\input luatexconfig.tex
+% Activate primitives
 \input luatexiniconfig.tex
-
-% settings inherited from pdftex
-\input pdftexconfig.tex
-% pdf output by default
-
-\input luatex-unicode-letters.tex   % set codes based on Unicode (full range)
-
+%
+\input load-unicode-data.tex
+%
 % the usual format initialization.
 \scrollmode
 \input lollipop.tex
 \dump
 \endinput
 
-% lualollipop.fmt is generated by `luatex -ini   -jobname=lualollipop -progname=lualollipop lualollipop.ini'
\ No newline at end of file
+% lualollipop.fmt is generated by `luatex -ini   -jobname=lualollipop -progname=lualollipop lualollipop.ini'
diff --git a/Master/texmf-dist/tex/lollipop/xelollipop.ini b/Master/texmf-dist/tex/lollipop/xelollipop.ini
index 2885acd55b0..41035f990a8 100644
--- a/Master/texmf-dist/tex/lollipop/xelollipop.ini
+++ b/Master/texmf-dist/tex/lollipop/xelollipop.ini
@@ -1,4 +1,4 @@
-% copyright 2014 Vafa Khalighi
+% copyright 2014--2016 Vafa Khalighi
 %
 %
 %    This program is free software: you can redistribute it and/or modify