[tex-live] More shortdescs for texlive.tlpdb
Alexander Cherepanov
cherepan at mccme.ru
Wed Oct 7 11:01:12 CEST 2009
Hi all!
Please consider the following patches.
1. Remove unused variable in TLPOBJ.pm:
diff -ur TeXLive.orig/TLPOBJ.pm TeXLive/TLPOBJ.pm
--- TeXLive.orig/TLPOBJ.pm 2009-10-06 04:23:51.000000000 +0400
+++ TeXLive/TLPOBJ.pm 2009-10-07 11:58:17.000000000 +0400
@@ -741,7 +741,6 @@
if (defined($self->catalogue)) {
$tlcname = $self->catalogue;
} elsif ($tlcname =~ m/^bin-(.*)$/) {
- my $shortname = $1;
if (!defined($tlc->entries->{$tlcname})) {
$tlcname = $1;
}
2. Record catalogue mapping in texlive.tlpdb when package name differs
from catalogue id. It's not necessary but it documents what
quest4texlive have found.
diff -ur TeXLive.orig/TLPOBJ.pm TeXLive/TLPOBJ.pm
--- TeXLive.orig/TLPOBJ.pm 2009-10-06 04:23:51.000000000 +0400
+++ TeXLive/TLPOBJ.pm 2009-10-07 11:58:17.000000000 +0400
@@ -748,6 +748,11 @@
$tlcname = lc($tlcname);
if (defined($tlc->entries->{$tlcname})) {
my $entry = $tlc->entries->{$tlcname};
+ # Record the id of the catalogue entry if it's found due to
+ # quest4texlive.
+ if ($entry->entry->{'id'} ne $tlcname) {
+ $self->catalogue($entry->entry->{'id'});
+ }
if (defined($entry->entry->{'date'})) {
my $foo = $entry->entry->{'date'};
$foo =~ s/^.Date: //;
BTW here is a rough "perl -n" script which prints texlive-to-catalogue
mapping from texlive.tlpdb:
# Print catalogue mapping
if (/^name (.*)/) {
$name = $1;
} elsif (/^catalogue (.*)/) {
$catalogue = $1;
} elsif (/^shortdesc (.*)/) {
$shortdesc = $1;
} elsif (/^$/) {
if ($name) {
print $name . ":" . ($shortdesc ? $catalogue || lc($name) : "") . "\n";
}
$name = $catalogue = $shortdesc = undef;
}
It helps to track changes in this mapping.
3. Remove bin- part from texlive names in the Catalogue in-memory.
diff -ur TeXLive.orig/TeXCatalogue.pm TeXLive/TeXCatalogue.pm
--- TeXLive.orig/TeXCatalogue.pm 2009-10-06 04:23:51.000000000 +0400
+++ TeXLive/TeXCatalogue.pm 2009-10-07 11:58:17.000000000 +0400
@@ -208,9 +208,11 @@
# Try to build the inverse mapping:
my (%inv, %count);
for my $id (keys %{$texcat}) {
- if (defined($texcat->{$id}{'texlive'})) {
- $count{$texcat->{$id}{'texlive'}}++;
- $inv{$texcat->{$id}{'texlive'}} = $id;
+ my $tl = $texcat->{$id}{'texlive'};
+ if (defined($tl)) {
+ $tl =~ s/^bin-//;
+ $count{$tl}++;
+ $inv{$tl} = $id;
}
}
# Go through texlive names
It gives several more matches (for bibtex8, dviout, ps2pkm) and a
couple of funny correspondings: pstools -> ps2eps (this is left as is
right now) and seetexk -> dviconcat (fixed in the next patch).
4. Finally, a patch to add explicit mappings to catalogue into tlpsrc
files. It adds the following mappings:
<texlive> <catalogue>
MemoirChapStyles memoirchapterstyles
Type1fonts fontinstallationguide
armenian armtex
asciichart ascii-chart
autoarea pictex-autoarea
beamer-contrib beamerthemejltree
beebe biblio
bengali bengali-pandey
carolmin-ps carolmin-t1
cbfonts cbgreek-complete
components-of-TeX components
devnag devanagari
es-tex-faq faq-es
hyphen-coptic cbcoptic
hyphen-german gnhyph
impatient-fr impatient
itrans itrans-processor
latex-graphics-companion lgc-examples
latex-tipps-und-tricks ltt
latex-web-companion lwc-examples
lcdftypetools lcdf-typetools
lshort-chinese lshort-zh-cn
math-into-latex mil
mathmode voss-mathmode
mkgrkindex greek-makeindex
omega-devanagari devanagari-omega
plain-doc csname-doc
rtklage ratex
tex-refs tex-references
tlc2 tlc2-examples
tlgs.win32 ghostscript
And corrected:
abstyles abstyles-orig
mp3d threed
seetexk dvibook
wasy wasy2
(Please review, as I'm not quite sure in all these mappings.)
It remaps abstyles from abstyles-babel to abstyles-orig, wasy from
wasy to wasy2, mp3d from 3d (non-existent) to threed. And maps seetexk
to dvibook (instead of dviconcat, from patch 3).
Patch:
diff -ur tlpsrc.orig/abstyles.tlpsrc tlpsrc/abstyles.tlpsrc
--- tlpsrc.orig/abstyles.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/abstyles.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue abstyles-orig
diff -ur tlpsrc.orig/armenian.tlpsrc tlpsrc/armenian.tlpsrc
--- tlpsrc.orig/armenian.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/armenian.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue armtex
diff -ur tlpsrc.orig/asciichart.tlpsrc tlpsrc/asciichart.tlpsrc
--- tlpsrc.orig/asciichart.tlpsrc 2009-05-23 04:40:02.000000000 +0400
+++ tlpsrc/asciichart.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue ascii-chart
diff -ur tlpsrc.orig/autoarea.tlpsrc tlpsrc/autoarea.tlpsrc
--- tlpsrc.orig/autoarea.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/autoarea.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue pictex-autoarea
diff -ur tlpsrc.orig/beamer-contrib.tlpsrc tlpsrc/beamer-contrib.tlpsrc
--- tlpsrc.orig/beamer-contrib.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/beamer-contrib.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue beamerthemejltree
diff -ur tlpsrc.orig/beebe.tlpsrc tlpsrc/beebe.tlpsrc
--- tlpsrc.orig/beebe.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/beebe.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue biblio
diff -ur tlpsrc.orig/bengali.tlpsrc tlpsrc/bengali.tlpsrc
--- tlpsrc.orig/bengali.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/bengali.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue bengali-pandey
diff -ur tlpsrc.orig/carolmin-ps.tlpsrc tlpsrc/carolmin-ps.tlpsrc
--- tlpsrc.orig/carolmin-ps.tlpsrc 2009-06-18 21:48:20.000000000 +0400
+++ tlpsrc/carolmin-ps.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1 +1,2 @@
+catalogue carolmin-t1
execute addMap cmin.map
diff -ur tlpsrc.orig/cbfonts.tlpsrc tlpsrc/cbfonts.tlpsrc
--- tlpsrc.orig/cbfonts.tlpsrc 2009-06-18 21:48:20.000000000 +0400
+++ tlpsrc/cbfonts.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1 +1,2 @@
+catalogue cbgreek-complete
execute addMixedMap cbgreek-full.map
diff -ur tlpsrc.orig/components-of-TeX.tlpsrc tlpsrc/components-of-TeX.tlpsrc
--- tlpsrc.orig/components-of-TeX.tlpsrc 2009-05-23 03:51:44.000000000 +0400
+++ tlpsrc/components-of-TeX.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue components
diff -ur tlpsrc.orig/devnag.tlpsrc tlpsrc/devnag.tlpsrc
--- tlpsrc.orig/devnag.tlpsrc 2009-06-18 21:48:20.000000000 +0400
+++ tlpsrc/devnag.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1,2 +1,3 @@
category TLCore
+catalogue devanagari
binpattern f bin/${ARCH}/devnag
diff -ur tlpsrc.orig/es-tex-faq.tlpsrc tlpsrc/es-tex-faq.tlpsrc
--- tlpsrc.orig/es-tex-faq.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/es-tex-faq.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue faq-es
diff -ur tlpsrc.orig/hyphen-coptic.tlpsrc tlpsrc/hyphen-coptic.tlpsrc
--- tlpsrc.orig/hyphen-coptic.tlpsrc 2009-06-18 21:48:20.000000000 +0400
+++ tlpsrc/hyphen-coptic.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1,3 +1,4 @@
category TLCore
+catalogue cbcoptic
execute AddHyphen name=coptic lefthyphenmin=1 righthyphenmin=1 file=loadhyph-cop.tex
runpattern f texmf/tex/generic/hyphen/copthyph.tex
diff -ur tlpsrc.orig/hyphen-german.tlpsrc tlpsrc/hyphen-german.tlpsrc
--- tlpsrc.orig/hyphen-german.tlpsrc 2009-06-18 21:48:20.000000000 +0400
+++ tlpsrc/hyphen-german.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1,4 +1,5 @@
category TLCore
+catalogue gnhyph
execute AddHyphen name=german lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-1901.tex
execute AddHyphen name=ngerman lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-1996.tex
runpattern f texmf/tex/generic/hyphen/dehypht.tex
diff -ur tlpsrc.orig/impatient-fr.tlpsrc tlpsrc/impatient-fr.tlpsrc
--- tlpsrc.orig/impatient-fr.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/impatient-fr.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue impatient
diff -ur tlpsrc.orig/itrans.tlpsrc tlpsrc/itrans.tlpsrc
--- tlpsrc.orig/itrans.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/itrans.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue itrans-processor
diff -ur tlpsrc.orig/latex-graphics-companion.tlpsrc tlpsrc/latex-graphics-companion.tlpsrc
--- tlpsrc.orig/latex-graphics-companion.tlpsrc 2009-05-23 04:23:51.000000000 +0400
+++ tlpsrc/latex-graphics-companion.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue lgc-examples
diff -ur tlpsrc.orig/latex-tipps-und-tricks.tlpsrc tlpsrc/latex-tipps-und-tricks.tlpsrc
--- tlpsrc.orig/latex-tipps-und-tricks.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/latex-tipps-und-tricks.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue ltt
diff -ur tlpsrc.orig/latex-web-companion.tlpsrc tlpsrc/latex-web-companion.tlpsrc
--- tlpsrc.orig/latex-web-companion.tlpsrc 2009-05-23 04:23:51.000000000 +0400
+++ tlpsrc/latex-web-companion.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue lwc-examples
diff -ur tlpsrc.orig/lcdftypetools.tlpsrc tlpsrc/lcdftypetools.tlpsrc
--- tlpsrc.orig/lcdftypetools.tlpsrc 2009-06-18 04:38:13.000000000 +0400
+++ tlpsrc/lcdftypetools.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1,4 +1,5 @@
category TLCore
+catalogue lcdf-typetools
depend glyphlist
docpattern f texmf/doc/man/man1/cfftot1.*
docpattern f texmf/doc/man/man1/mmafm.*
diff -ur tlpsrc.orig/lshort-chinese.tlpsrc tlpsrc/lshort-chinese.tlpsrc
--- tlpsrc.orig/lshort-chinese.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/lshort-chinese.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue lshort-zh-cn
diff -ur tlpsrc.orig/math-into-latex.tlpsrc tlpsrc/math-into-latex.tlpsrc
--- tlpsrc.orig/math-into-latex.tlpsrc 2009-05-23 04:23:51.000000000 +0400
+++ tlpsrc/math-into-latex.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue mil
diff -ur tlpsrc.orig/mathmode.tlpsrc tlpsrc/mathmode.tlpsrc
--- tlpsrc.orig/mathmode.tlpsrc 2009-05-23 04:23:51.000000000 +0400
+++ tlpsrc/mathmode.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue voss-mathmode
diff -ur tlpsrc.orig/MemoirChapStyles.tlpsrc tlpsrc/MemoirChapStyles.tlpsrc
--- tlpsrc.orig/MemoirChapStyles.tlpsrc 2009-05-23 04:23:51.000000000 +0400
+++ tlpsrc/MemoirChapStyles.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue memoirchapterstyles
diff -ur tlpsrc.orig/mkgrkindex.tlpsrc tlpsrc/mkgrkindex.tlpsrc
--- tlpsrc.orig/mkgrkindex.tlpsrc 2009-09-10 16:45:07.000000000 +0400
+++ tlpsrc/mkgrkindex.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1 +1,2 @@
+catalogue greek-makeindex
binpattern f bin/${ARCH}/mkgrkindex
diff -ur tlpsrc.orig/mp3d.tlpsrc tlpsrc/mp3d.tlpsrc
--- tlpsrc.orig/mp3d.tlpsrc 2009-06-18 21:48:20.000000000 +0400
+++ tlpsrc/mp3d.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1 +1 @@
-catalogue 3d
+catalogue threed
diff -ur tlpsrc.orig/omega-devanagari.tlpsrc tlpsrc/omega-devanagari.tlpsrc
--- tlpsrc.orig/omega-devanagari.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/omega-devanagari.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue devanagari-omega
diff -ur tlpsrc.orig/plain-doc.tlpsrc tlpsrc/plain-doc.tlpsrc
--- tlpsrc.orig/plain-doc.tlpsrc 2009-05-23 04:40:02.000000000 +0400
+++ tlpsrc/plain-doc.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue csname-doc
diff -ur tlpsrc.orig/rtklage.tlpsrc tlpsrc/rtklage.tlpsrc
--- tlpsrc.orig/rtklage.tlpsrc 2009-05-21 16:17:11.000000000 +0400
+++ tlpsrc/rtklage.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue ratex
diff -ur tlpsrc.orig/seetexk.tlpsrc tlpsrc/seetexk.tlpsrc
--- tlpsrc.orig/seetexk.tlpsrc 2009-06-18 21:48:20.000000000 +0400
+++ tlpsrc/seetexk.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1,4 +1,5 @@
category TLCore
+catalogue dvibook
runpattern f texmf/doc/man/man1/dvibook.*
runpattern f texmf/doc/man/man1/dviconcat.*
runpattern f texmf/doc/man/man1/dviselect.*
diff -ur tlpsrc.orig/tex-refs.tlpsrc tlpsrc/tex-refs.tlpsrc
--- tlpsrc.orig/tex-refs.tlpsrc 2009-05-23 04:19:39.000000000 +0400
+++ tlpsrc/tex-refs.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue tex-references
diff -ur tlpsrc.orig/tlc2.tlpsrc tlpsrc/tlc2.tlpsrc
--- tlpsrc.orig/tlc2.tlpsrc 2009-05-23 04:23:51.000000000 +0400
+++ tlpsrc/tlc2.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue tlc2-examples
diff -ur tlpsrc.orig/tlgs.win32.tlpsrc tlpsrc/tlgs.win32.tlpsrc
--- tlpsrc.orig/tlgs.win32.tlpsrc 2009-08-27 11:23:33.000000000 +0400
+++ tlpsrc/tlgs.win32.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1,4 +1,5 @@
category TLCore
+catalogue ghostscript
binpattern d/win32 tlpkg/tlgs
binpattern d/win32 texmf/scripts/tlgs
binpattern f/win32 bin/win32/eps2eps
diff -ur tlpsrc.orig/Type1fonts.tlpsrc tlpsrc/Type1fonts.tlpsrc
--- tlpsrc.orig/Type1fonts.tlpsrc 2009-05-23 03:58:24.000000000 +0400
+++ tlpsrc/Type1fonts.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -0,0 +1 @@
+catalogue fontinstallationguide
diff -ur tlpsrc.orig/wasy.tlpsrc tlpsrc/wasy.tlpsrc
--- tlpsrc.orig/wasy.tlpsrc 2009-06-18 21:48:20.000000000 +0400
+++ tlpsrc/wasy.tlpsrc 2009-10-07 12:00:33.000000000 +0400
@@ -1 +1,2 @@
+catalogue wasy2
execute addMixedMap wasy.map
5. And here is the list of remaining packages without shortdesc (135):
afm2pl
albertus
amsldoc-it
amsmath-it
amsthdoc-it
antiqua
atqolive
avantgar
bayer
bookman
c90
cjkutils
clarendo
cmextra
cns
context-games
coronet
cs
ctie
cyrplain
dnp
dvipdfmx-def
dvipos
em
euxm
fancyhdr-it
fontware
garamond
garuda-c90
genmisc
getafm
getnonfreefonts
glyphlist
groff
guide-to-latex
gustprog
helvetic
hyperref-docsrc
hyphen-ancientgreek
hyphen-arabic
hyphen-base
hyphen-bulgarian
hyphen-catalan
hyphen-chinese
hyphen-czech
hyphen-dutch
hyphen-esperanto
hyphen-estonian
hyphen-farsi
hyphen-french
hyphen-galician
hyphen-indonesian
hyphen-interlingua
hyphen-irish
hyphen-kurmanji
hyphen-latvian
hyphen-lithuanian
hyphen-mongolian
hyphen-norwegian
hyphen-portuguese
hyphen-romanian
hyphen-russian
hyphen-sanskrit
hyphen-slovak
hyphen-slovenian
hyphen-swedish
hyphen-ukrainian
hyphen-uppersorbian
hyphen-welsh
jmn
kastrup
keys3
kluwer
knuthotherfonts
kopka
lambda
latexconfig
lettrgth
lmextra
marigold
mft
mftoeps
misc
misc209
mkind-english
mkind-german
multi
musixps
ncntrsbk
norasi-c90
ntheorem-vn
omegaware
optima
otibet
palatino
patgen
pdfwin
polyglot
psafm
pst-ghsb
pstricks-tutorial
qpxqtx
rjlparshap
roex
symbol
synctex
taupin
tcdialog
tex-virtual-academy-pl
texconfig
texlive-common
texlive-cz
texlive-de
texlive-en
texlive-fr
texlive-pl
texlive-ru
texlive-zh-cn
texworks
timescyr
timesht
tlperl.win32
tlpsv.win32
ttfutils
univers
utf8mex
vlna
voss-de
vtex
wintools.win32
xbmc
xetex
xetexconfig
zapfchan
zapfding
Either they are packages specific to texlive, or they don't easily map
to any catalogue entry, or I don't know the mapping.
It seems I have done everything relatively easy that I could think
of:-) Probably it's better to do mapping in the place where ctan
sources for a given package are known (ctan2tl?). And in the long run,
I hope package names could be harmonized.
Alexander Cherepanov
More information about the tex-live
mailing list