lollipop, new format

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

4 files changed, 31 insertions, 3 deletions

diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index ee0000c88f5..8586711877f 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -283,7 +283,7 @@ my @TLP_working = qw(
     listbib listing listings listings-ext listliketab listofsymbols
     lithuanian liturg lkproof lm lm-math lmake lobster2
     locality localloc logbox logical-markup-utils logicproof logicpuzzle
-    logpap logreq
+    logpap logreq lollipop
     longnamefilelist loops lpic lplfitch lps lsc
     lshort-bulgarian lshort-chinese lshort-czech lshort-dutch lshort-english
     lshort-finnish lshort-french lshort-german lshort-italian
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 955f0a11b2c..8f420420a93 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1114,6 +1114,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'latex-git-log'        => '&PREHOOK_latex_git_log',
  'latexdiff'            => '&PREHOOK_latexdiff',
  'lilyglyphs'           => '&PREHOOK_lilyglyphs',
+ 'lollipop'             => '&PREHOOK_flatten1',
  'mathspic'             => '&PREHOOK_mathspic',
  'movie15'              => '&PREHOOK_flatten1',
  'musixtex-fonts'       => '&PREHOOK_unzip',
@@ -1177,6 +1178,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'lilyglyphs'           => '&POSTlilyglyphs',
  'listbib'              => '&POSTlistbib',
  'lithuanian'           => '&POSTlithuanian',
+ 'lollipop'             => '&POSTlollipop',
  'luaotfload'           => '&POST_do_man',
  'luatexja'             => '&POSTluatexja',
  'm-tx'                 => '&POST_do_man',
@@ -1262,6 +1264,7 @@ $standarddest = "texmf-dist";
  'knuth-local', 'plain',
  'kotex-plain', 'plain',
  'levy',        'generic',  # one .sty, one .tex
+ 'lollipop',	'lollipop',
  'luatexja',    'luatex',
  'luaxml',      'luatex',
  'mathabx',     'generic',
@@ -1472,6 +1475,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'listbib',     'listbib.tex|' . $standardtex,
  'listings-ext','\.sty',        # not .cfg
  'logic',       'milstd\.tex|' . $standardtex,
+ 'lollipop',	'\.ini|lollipop-.*tex',
  'ltxkeys',     '\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$',  # not cfg
  'lua-check-hyphen', '\.lua|' . $standardtex,
  'lua-visual-debug', '\.lua|' . $standardtex,
@@ -1780,6 +1784,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'lfb',                 'fonts',
  'lh',                  'fonts',
  'latex-notes-zh-cn',   'generic',
+ 'lollipop',            'otherformats',
  'lua-alt-getopt',      'support',
  'lua2dox',             'support',
  'luaintro',            'luatex',
@@ -5532,6 +5537,11 @@ sub POSTlithuanian {
   &SYSTEM ("$MV $DEST/doc/latex/lithuanian/l7xenc.dfu $DEST/tex/latex/lithuanian/");
 }
 
+sub POSTlollipop {
+  print "POST$package - move macros up a level\n";
+  &SYSTEM ("$MV $DEST/tex/$package/$package/* $DEST/tex/$package/");
+}
+
 sub POSTluatexja {
   print "POST$package - runins, move directories\n";
   &xchdir ("src");
diff --git a/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
index a00a8b4c2a0..9fdd7469ad7 100644
--- a/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
@@ -1,13 +1,14 @@
 category Collection
 shortdesc Additional formats
 longdesc Collected TeX `formats', i.e., large-scale macro packages
-longdesc designed to be dumped into .fmt files, other than most common
-longdesc ones, such as latex and context.
+longdesc designed to be dumped into .fmt files -- excluding the most common
+longdesc ones, such as latex and context, which have their own package(s).
 #
 depend collection-basic
 #
 depend edmac
 depend eplain
+depend lollipop
 depend mltex
 depend psizzl
 depend startex
diff --git a/Master/tlpkg/tlpsrc/lollipop.tlpsrc b/Master/tlpkg/tlpsrc/lollipop.tlpsrc
new file mode 100644
index 00000000000..67412443a8c
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/lollipop.tlpsrc
@@ -0,0 +1,17 @@
+binpattern f bin/${ARCH}/lollipop
+execute AddFormat name=lollipop engine=pdftex \
+        options="-translate-file=cp227.tcx *lollipop.ini" 
+#
+binpattern f bin/${ARCH}/lualollipop
+execute AddFormat name=lualollipop engine=luatex \
+        options="lualollipop.ini" 
+#
+binpattern f bin/${ARCH}/xelollipop
+execute AddFormat name=xelollipop engine=pdftex \
+        options="xelollipop.ini" 
+#
+# leave dvi formats disabled, users can set \pdfoutput=0.
+execute AddFormat name=dvilollipop mode=disabled engine=pdftex \
+        options="-translate-file=cp227.tcx *lollipop.ini"
+execute AddFormat name=dvilualollipop mode=disabled engine=luatex \
+        options="-translate-file=cp227.tcx lualollipop.ini"