summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/lollipop
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 /Master/texmf-dist/tex/lollipop
parent018978bb05cad50aacc24f4aeda53453db5a07fe (diff)
lollipop (14may16), now plain tex only
git-svn-id: svn://tug.org/texlive/trunk@41130 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lollipop')
-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
6 files changed, 22 insertions, 110 deletions
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