lollipop

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

17 files changed, 25 insertions, 90 deletions

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