summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-14 22:14:55 +0000
committerKarl Berry <karl@freefriends.org>2016-05-14 22:14:55 +0000
commite781084b9ee8888696b4ee6c9dc070fe1dd059e8 (patch)
tree9c605c859e7267ca0e591e26847671bc1c8815b3
parent018978bb05cad50aacc24f4aeda53453db5a07fe (diff)
lollipop (14may16), now plain tex only
git-svn-id: svn://tug.org/texlive/trunk@41130 c570f23f-e606-0410-a88d-b1316a301751
l---------Master/bin/amd64-freebsd/lualollipop1
l---------Master/bin/amd64-freebsd/xelollipop1
l---------Master/bin/amd64-netbsd/lualollipop1
l---------Master/bin/amd64-netbsd/xelollipop1
l---------Master/bin/armel-linux/lualollipop1
l---------Master/bin/armel-linux/xelollipop1
l---------Master/bin/armhf-linux/lualollipop1
l---------Master/bin/armhf-linux/xelollipop1
l---------Master/bin/i386-cygwin/lualollipop1
l---------Master/bin/i386-cygwin/xelollipop1
l---------Master/bin/i386-freebsd/lualollipop1
l---------Master/bin/i386-freebsd/xelollipop1
l---------Master/bin/i386-linux/lualollipop1
l---------Master/bin/i386-linux/xelollipop1
l---------Master/bin/i386-netbsd/lualollipop1
l---------Master/bin/i386-netbsd/xelollipop1
l---------Master/bin/i386-solaris/lualollipop1
l---------Master/bin/i386-solaris/xelollipop1
l---------Master/bin/powerpc-linux/lualollipop1
l---------Master/bin/powerpc-linux/xelollipop1
l---------Master/bin/sparc-solaris/lualollipop1
l---------Master/bin/sparc-solaris/xelollipop1
l---------Master/bin/universal-darwin/lualollipop1
l---------Master/bin/universal-darwin/xelollipop1
-rwxr-xr-xMaster/bin/win32/lualollipop.exebin1536 -> 0 bytes
-rwxr-xr-xMaster/bin/win32/xelollipop.exebin1536 -> 0 bytes
l---------Master/bin/x86_64-cygwin/lualollipop1
l---------Master/bin/x86_64-cygwin/xelollipop1
l---------Master/bin/x86_64-darwin/lualollipop1
l---------Master/bin/x86_64-darwin/xelollipop1
l---------Master/bin/x86_64-linux/lualollipop1
l---------Master/bin/x86_64-linux/xelollipop1
l---------Master/bin/x86_64-solaris/lualollipop1
l---------Master/bin/x86_64-solaris/xelollipop1
-rw-r--r--Master/texmf-dist/doc/otherformats/lollipop/README33
-rw-r--r--Master/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.pdfbin334882 -> 345852 bytes
-rw-r--r--Master/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex37
-rw-r--r--Master/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex7
-rw-r--r--Master/texmf-dist/doc/otherformats/lollipop/tex-inde.xen96
-rw-r--r--Master/texmf-dist/tex/lollipop/lollipop-plain.tex15
-rw-r--r--Master/texmf-dist/tex/lollipop/lollipop-text.tex15
-rw-r--r--Master/texmf-dist/tex/lollipop/lollipop.ini5
-rw-r--r--Master/texmf-dist/tex/lollipop/lollipop.tex13
-rw-r--r--Master/texmf-dist/tex/lollipop/lualollipop.ini33
-rw-r--r--Master/texmf-dist/tex/lollipop/xelollipop.ini51
-rw-r--r--Master/tlpkg/tlpsrc/lollipop.tlpsrc18
46 files changed, 100 insertions, 255 deletions
diff --git a/Master/bin/amd64-freebsd/lualollipop b/Master/bin/amd64-freebsd/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/amd64-freebsd/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/xelollipop b/Master/bin/amd64-freebsd/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/amd64-freebsd/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/lualollipop b/Master/bin/amd64-netbsd/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/amd64-netbsd/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/xelollipop b/Master/bin/amd64-netbsd/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/amd64-netbsd/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/armel-linux/lualollipop b/Master/bin/armel-linux/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/armel-linux/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/armel-linux/xelollipop b/Master/bin/armel-linux/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/armel-linux/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/armhf-linux/lualollipop b/Master/bin/armhf-linux/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/armhf-linux/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/armhf-linux/xelollipop b/Master/bin/armhf-linux/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/armhf-linux/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/lualollipop b/Master/bin/i386-cygwin/lualollipop
deleted file mode 120000
index 2f4735ef4fe..00000000000
--- a/Master/bin/i386-cygwin/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex.exe \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/xelollipop b/Master/bin/i386-cygwin/xelollipop
deleted file mode 120000
index 0778769767d..00000000000
--- a/Master/bin/i386-cygwin/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex.exe \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/lualollipop b/Master/bin/i386-freebsd/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/i386-freebsd/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/xelollipop b/Master/bin/i386-freebsd/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/i386-freebsd/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/i386-linux/lualollipop b/Master/bin/i386-linux/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/i386-linux/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/i386-linux/xelollipop b/Master/bin/i386-linux/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/i386-linux/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/lualollipop b/Master/bin/i386-netbsd/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/i386-netbsd/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/xelollipop b/Master/bin/i386-netbsd/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/i386-netbsd/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/i386-solaris/lualollipop b/Master/bin/i386-solaris/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/i386-solaris/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/i386-solaris/xelollipop b/Master/bin/i386-solaris/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/i386-solaris/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/powerpc-linux/lualollipop b/Master/bin/powerpc-linux/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/powerpc-linux/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/powerpc-linux/xelollipop b/Master/bin/powerpc-linux/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/powerpc-linux/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/sparc-solaris/lualollipop b/Master/bin/sparc-solaris/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/sparc-solaris/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/sparc-solaris/xelollipop b/Master/bin/sparc-solaris/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/sparc-solaris/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/universal-darwin/lualollipop b/Master/bin/universal-darwin/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/universal-darwin/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/universal-darwin/xelollipop b/Master/bin/universal-darwin/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/universal-darwin/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/win32/lualollipop.exe b/Master/bin/win32/lualollipop.exe
deleted file mode 100755
index cb73a4563a9..00000000000
--- a/Master/bin/win32/lualollipop.exe
+++ /dev/null
Binary files differ
diff --git a/Master/bin/win32/xelollipop.exe b/Master/bin/win32/xelollipop.exe
deleted file mode 100755
index 61abca0560f..00000000000
--- a/Master/bin/win32/xelollipop.exe
+++ /dev/null
Binary files differ
diff --git a/Master/bin/x86_64-cygwin/lualollipop b/Master/bin/x86_64-cygwin/lualollipop
deleted file mode 120000
index 2f4735ef4fe..00000000000
--- a/Master/bin/x86_64-cygwin/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex.exe \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/xelollipop b/Master/bin/x86_64-cygwin/xelollipop
deleted file mode 120000
index 0778769767d..00000000000
--- a/Master/bin/x86_64-cygwin/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex.exe \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/lualollipop b/Master/bin/x86_64-darwin/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/x86_64-darwin/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/xelollipop b/Master/bin/x86_64-darwin/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/x86_64-darwin/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/lualollipop b/Master/bin/x86_64-linux/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/x86_64-linux/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/xelollipop b/Master/bin/x86_64-linux/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/x86_64-linux/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/lualollipop b/Master/bin/x86_64-solaris/lualollipop
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/x86_64-solaris/lualollipop
+++ /dev/null
@@ -1 +0,0 @@
-luatex \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/xelollipop b/Master/bin/x86_64-solaris/xelollipop
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/x86_64-solaris/xelollipop
+++ /dev/null
@@ -1 +0,0 @@
-xetex \ No newline at end of file
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
Binary files differ
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.
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-plain.tex b/Master/texmf-dist/tex/lollipop/lollipop-plain.tex
index b9f914ff8ec..96a3ed703d8 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-plain.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-plain.tex
@@ -18,7 +18,6 @@
% along with this program. If not, see <http://www.gnu.org/licenses/>.
%
%
-
\catcode`\{=1 % left brace is begin-group character
\catcode`\}=2 % right brace is end-group character
\catcode`\$=3 % dollar sign is math shift
@@ -143,10 +142,10 @@
\mathchardef\@MM=20000
% Allocation of registers
-
+
% Here are macros for the automatic allocation of \count, \box, \dimen,
% \skip, \muskip, and \toks registers, as well as \read and \write
-% stream numbers, \fam codes, and \insert numbers.
+% stream numbers, \fam codes, \language codes, and \insert numbers.
% When a register is used only temporarily, it need not be allocated;
% grouping can be used, making the value previously in the register return
@@ -154,7 +153,7 @@
% registers that are defined by one macro and used by others, possibly at
% different nesting levels. All such registers should be defined through
% these macros; otherwise conflicts may occur, especially when two or more
-% more macro packages are being used at once.
+% macro packages are being used at once.
% The following counters are reserved:
% 0 to 9 page numbering
@@ -178,11 +177,11 @@
% \count 10 always contains the number of the highest-numbered counter that
% has been allocated, \count 14 the highest-numbered box, etc.
% Inserts are given numbers 254, 253, etc., since they require a \count,
-% \dimen, \skip, and \box all with the same number; \count 19 contains the
+% \dimen, \skip, and \box all with the same number; \count 20 contains the
% lowest-numbered insert that has been allocated. Of course, \box255 is
% reserved for \output; \count255, \dimen255, and \skip255 can be used freely.
-
-% It is recommends that macro designers always use
+
+% It is recommended that macro designers always use
% \global assignments with respect to registers numbered 1, 3, 5, 7, 9, and
% always non-\global assignments with respect to registers 0, 2, 4, 6, 8, 255.
% This will prevent ``save stack buildup'' that might otherwise occur.
@@ -1228,7 +1227,7 @@
\def\magnification{\afterassignment\m@g\count@}
\def\m@g{\mag\count@
\hsize6.5truein\vsize8.9truein\dimen\footins8truein}
-
+
\def\loggingall{\tracingcommands\tw@\tracingstats\tw@
\tracingpages\@ne\tracingoutput\@ne\tracinglostchars\@ne
\tracingmacros\tw@\tracingparagraphs\@ne\tracingrestores\@ne
diff --git a/Master/texmf-dist/tex/lollipop/lollipop-text.tex b/Master/texmf-dist/tex/lollipop/lollipop-text.tex
index 5cf2f62ee2f..d90c0a16b89 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop-text.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop-text.tex
@@ -419,7 +419,6 @@
%
\Distance:rightmarginstretch={0pt plus 6cm}
\Distance:leftmarginstretch={0pt plus 6cm}
-\Distance:leftrightmarginstretch={0pt plus 1fil}
\def\FlushLeft:#1 {\switch {\if\EqualString{#1}}
{yes} {\leftskip=1\leftskip}
{default} {\leftskip=1\leftskip
@@ -434,13 +433,13 @@
\FlushRight:yes
-\def\FlushCenter:#1 {\switch {\if\EqualString{#1}}
- {yes} {\leftskip=\leftrightmarginstretch
- \rightskip=\leftrightmarginstretch
- \parindent\z@\parfillskip\z@}
- {no} {}
+% French Spacing
+%
+\def\FrenchSpacing:#1 {\switch {\if\EqualString{#1}}
+ {yes} {\frenchspacing}
+ {no} {\nonfrenchspacing}
\endswitch \relax}
-
+\FrenchSpacing:no
%%%%%%% lijn
% #1 : hoogte; #2 : lengte; #3 : elevatie
@@ -537,13 +536,13 @@
\endinput
+% 2016/05/14 defined \FrenchSpacing
% 2016/04/14 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
% 2014/04/13 defined \EveryParagraph, \EveryMath, and \EveryDisplay
% 2014/04/12 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
diff --git a/Master/texmf-dist/tex/lollipop/lollipop.ini b/Master/texmf-dist/tex/lollipop/lollipop.ini
index 1448786763e..d7314a3e44e 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop.ini
+++ b/Master/texmf-dist/tex/lollipop/lollipop.ini
@@ -15,10 +15,9 @@
% along with this program. If not, see <http://www.gnu.org/licenses/>.
%
%
-\input pdftexconfig.tex
\scrollmode
-\input lollipop.tex
+\input lollipop
\dump
\endinput
-% lollipop.fmt is generated by `pdftex -ini -jobname=lollipop -progname=lollipop -translate-file=cp227.tcx -etex lollipop.ini' \ No newline at end of file
+% lollipop.fmt is generated by `tex -ini -jobname=lollipop -progname=lollipop lollipop.ini' \ No newline at end of file
diff --git a/Master/texmf-dist/tex/lollipop/lollipop.tex b/Master/texmf-dist/tex/lollipop/lollipop.tex
index b180e91efc2..4052cc1904d 100644
--- a/Master/texmf-dist/tex/lollipop/lollipop.tex
+++ b/Master/texmf-dist/tex/lollipop/lollipop.tex
@@ -54,14 +54,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\frenchspacing
\showboxdepth=7 \showboxbreadth=300
\errorcontextlines=\maxdimen
\let\willbeunhskip\unhskip
\Typeface:ComputerModern
-\Pointsize:10
+\Pointsize:12
\Style:bold \Style:slant \Style:italic \Style:roman
\Distance:verbatimwhiteleft=levelindent
@@ -110,9 +109,7 @@
% v1.00 Updated lollipop-plain.tex.
%
% v1.01 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
%
% v1.02 Updated lollipop-text.tex (defined \EveryParagraph,
% \EveryMath, and \EveryDisplay), defined
@@ -130,11 +127,13 @@
% commands. \PushIndentLevel is now a synonym for
% \PushLeftIndentLevel and \PopIndentLevel is a synonym
% for \PopLeftIndentLevel
-% defined \FlushCenter
% fixed the error caused by \newhelp
%
+% v1.06 Defined \FrenchSpacing
+% Use 12pt size
+%
\edef\fmtname{\lollipop@name}%defined in Tools
-\def\fmtversion{v1.05, 16 April 2016}
+\def\fmtversion{v1.06, 14 May 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
deleted file mode 100644
index 15b30c5dbec..00000000000
--- a/Master/texmf-dist/tex/lollipop/lualollipop.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-% copyright 2014--2016 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/>.
-%
-%
-% PDF output by default.
-
-% Must be done first (as needs to 'tidy up')
-\input luatexconfig.tex
-% Activate primitives
-\input luatexiniconfig.tex
-%
-\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'
diff --git a/Master/texmf-dist/tex/lollipop/xelollipop.ini b/Master/texmf-dist/tex/lollipop/xelollipop.ini
deleted file mode 100644
index 41035f990a8..00000000000
--- a/Master/texmf-dist/tex/lollipop/xelollipop.ini
+++ /dev/null
@@ -1,51 +0,0 @@
-% copyright 2014--2016 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/>.
-%
-%
-\catcode`\{=1 \catcode`\}=2 \catcode`\#=6 \catcode`\^=7 \catcode`\@=11
-
-\scrollmode
-
-\input unicode-letters
-\input lollipop.tex
-
-\catcode`\@=11
-%
-% Allocator for \XeTeXintercharclass values, from Enrico Gregorio
-%
-\newcount\xe@alloc@intercharclass % allocates intercharclass
-\xe@alloc@intercharclass=\thr@@ % from 4 (1,2 and 3 are used by CJK, AFAIK)
-\def\xe@alloc@#1#2#3#4#5{\global\advance#1\@ne
- \xe@ch@ck#1#4#2% make sure there's still room
- \allocationnumber#1%
- \global#3#5\allocationnumber
- \wlog{\string#5=\string#2\the\allocationnumber}}
-\def\xe@ch@ck#1#2#3{%
- \ifnum#1<#2\else
- \errmessage{No room for a new #3}%
- \fi}
-\def\newXeTeXintercharclass{%
- \xe@alloc@\xe@alloc@intercharclass\XeTeXintercharclass\chardef\@cclv} %at most 254
-
-\catcode`\@=12
-
-\XeTeXuseglyphmetrics=1
-\XeTeXdashbreakstate=1
-
-\dump
-\endinput
-
-% xelollipop.fmt is generated by `xetex -ini -jobname=xelollipop -progname=xelollipop -etex xelollipop.ini' \ No newline at end of file
diff --git a/Master/tlpkg/tlpsrc/lollipop.tlpsrc b/Master/tlpkg/tlpsrc/lollipop.tlpsrc
index 7798aa9b44c..43d96dd341c 100644
--- a/Master/tlpkg/tlpsrc/lollipop.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lollipop.tlpsrc
@@ -1,16 +1,4 @@
-tlpsetvar fmtcomm cm,hyphen-base,lollipop
-
binpattern f bin/${ARCH}/lollipop
-execute AddFormat name=lollipop engine=pdftex \
- options="-translate-file=cp227.tcx *lollipop.ini" \
- fmttriggers=${fmtcomm},tex-ini-files
-#
-binpattern f bin/${ARCH}/lualollipop
-execute AddFormat name=lualollipop engine=luatex \
- options="lualollipop.ini" \
- fmttriggers=${fmtcomm},luatex,tex-ini-files,unicode-data
-#
-binpattern f bin/${ARCH}/xelollipop
-execute AddFormat name=xelollipop engine=xetex \
- options="-etex xelollipop.ini" \
- fmttriggers=${fmtcomm},xetexconfig
+execute AddFormat name=lollipop engine=tex \
+ options="lollipop.ini" \
+ fmttriggers=cm,hyphen-base,lollipop,tex-ini-files