From bd6d7e8aec8f17e431eeb83e77f8844c446de5fb Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 7 Oct 2009 11:46:52 +0000 Subject: include patches from Alexander Cherepanov git-svn-id: svn://tug.org/texlive/trunk@15667 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLPOBJ.pm | 6 +++++- Master/tlpkg/TeXLive/TeXCatalogue.pm | 8 +++++--- Master/tlpkg/tlpsrc/MemoirChapStyles.tlpsrc | 1 + Master/tlpkg/tlpsrc/Type1fonts.tlpsrc | 1 + Master/tlpkg/tlpsrc/abstyles.tlpsrc | 1 + Master/tlpkg/tlpsrc/armenian.tlpsrc | 1 + Master/tlpkg/tlpsrc/asciichart.tlpsrc | 1 + Master/tlpkg/tlpsrc/autoarea.tlpsrc | 1 + Master/tlpkg/tlpsrc/beamer-contrib.tlpsrc | 1 + Master/tlpkg/tlpsrc/beebe.tlpsrc | 1 + Master/tlpkg/tlpsrc/bengali.tlpsrc | 1 + Master/tlpkg/tlpsrc/carolmin-ps.tlpsrc | 1 + Master/tlpkg/tlpsrc/cbfonts.tlpsrc | 1 + Master/tlpkg/tlpsrc/components-of-TeX.tlpsrc | 1 + Master/tlpkg/tlpsrc/devnag.tlpsrc | 1 + Master/tlpkg/tlpsrc/es-tex-faq.tlpsrc | 1 + Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc | 1 + Master/tlpkg/tlpsrc/hyphen-german.tlpsrc | 1 + Master/tlpkg/tlpsrc/impatient-fr.tlpsrc | 1 + Master/tlpkg/tlpsrc/itrans.tlpsrc | 1 + Master/tlpkg/tlpsrc/latex-graphics-companion.tlpsrc | 1 + Master/tlpkg/tlpsrc/latex-tipps-und-tricks.tlpsrc | 1 + Master/tlpkg/tlpsrc/latex-web-companion.tlpsrc | 1 + Master/tlpkg/tlpsrc/lcdftypetools.tlpsrc | 1 + Master/tlpkg/tlpsrc/lshort-chinese.tlpsrc | 1 + Master/tlpkg/tlpsrc/math-into-latex.tlpsrc | 1 + Master/tlpkg/tlpsrc/mathmode.tlpsrc | 1 + Master/tlpkg/tlpsrc/mkgrkindex.tlpsrc | 1 + Master/tlpkg/tlpsrc/mp3d.tlpsrc | 2 +- Master/tlpkg/tlpsrc/omega-devanagari.tlpsrc | 1 + Master/tlpkg/tlpsrc/plain-doc.tlpsrc | 1 + Master/tlpkg/tlpsrc/rtklage.tlpsrc | 1 + Master/tlpkg/tlpsrc/seetexk.tlpsrc | 1 + Master/tlpkg/tlpsrc/tex-refs.tlpsrc | 1 + Master/tlpkg/tlpsrc/tlc2.tlpsrc | 1 + Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc | 1 + Master/tlpkg/tlpsrc/wasy.tlpsrc | 1 + 37 files changed, 45 insertions(+), 5 deletions(-) diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 0a2eae5bcfa..f5669398359 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -741,7 +741,6 @@ sub update_from_catalogue if (defined($self->catalogue)) { $tlcname = $self->catalogue; } elsif ($tlcname =~ m/^bin-(.*)$/) { - my $shortname = $1; if (!defined($tlc->entries->{$tlcname})) { $tlcname = $1; } @@ -749,6 +748,11 @@ sub update_from_catalogue $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: //; diff --git a/Master/tlpkg/TeXLive/TeXCatalogue.pm b/Master/tlpkg/TeXLive/TeXCatalogue.pm index 8ff06b08040..ca524411373 100644 --- a/Master/tlpkg/TeXLive/TeXCatalogue.pm +++ b/Master/tlpkg/TeXLive/TeXCatalogue.pm @@ -208,9 +208,11 @@ sub quest4texlive # 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 diff --git a/Master/tlpkg/tlpsrc/MemoirChapStyles.tlpsrc b/Master/tlpkg/tlpsrc/MemoirChapStyles.tlpsrc index e69de29bb2d..03b1620597d 100644 --- a/Master/tlpkg/tlpsrc/MemoirChapStyles.tlpsrc +++ b/Master/tlpkg/tlpsrc/MemoirChapStyles.tlpsrc @@ -0,0 +1 @@ +catalogue memoirchapterstyles diff --git a/Master/tlpkg/tlpsrc/Type1fonts.tlpsrc b/Master/tlpkg/tlpsrc/Type1fonts.tlpsrc index e69de29bb2d..91a60b3a5a6 100644 --- a/Master/tlpkg/tlpsrc/Type1fonts.tlpsrc +++ b/Master/tlpkg/tlpsrc/Type1fonts.tlpsrc @@ -0,0 +1 @@ +catalogue fontinstallationguide diff --git a/Master/tlpkg/tlpsrc/abstyles.tlpsrc b/Master/tlpkg/tlpsrc/abstyles.tlpsrc index e69de29bb2d..5f564aed6c7 100644 --- a/Master/tlpkg/tlpsrc/abstyles.tlpsrc +++ b/Master/tlpkg/tlpsrc/abstyles.tlpsrc @@ -0,0 +1 @@ +catalogue abstyles-orig diff --git a/Master/tlpkg/tlpsrc/armenian.tlpsrc b/Master/tlpkg/tlpsrc/armenian.tlpsrc index e69de29bb2d..67de61d45e7 100644 --- a/Master/tlpkg/tlpsrc/armenian.tlpsrc +++ b/Master/tlpkg/tlpsrc/armenian.tlpsrc @@ -0,0 +1 @@ +catalogue armtex diff --git a/Master/tlpkg/tlpsrc/asciichart.tlpsrc b/Master/tlpkg/tlpsrc/asciichart.tlpsrc index e69de29bb2d..2a7fd011977 100644 --- a/Master/tlpkg/tlpsrc/asciichart.tlpsrc +++ b/Master/tlpkg/tlpsrc/asciichart.tlpsrc @@ -0,0 +1 @@ +catalogue ascii-chart diff --git a/Master/tlpkg/tlpsrc/autoarea.tlpsrc b/Master/tlpkg/tlpsrc/autoarea.tlpsrc index e69de29bb2d..5abd32723e9 100644 --- a/Master/tlpkg/tlpsrc/autoarea.tlpsrc +++ b/Master/tlpkg/tlpsrc/autoarea.tlpsrc @@ -0,0 +1 @@ +catalogue pictex-autoarea diff --git a/Master/tlpkg/tlpsrc/beamer-contrib.tlpsrc b/Master/tlpkg/tlpsrc/beamer-contrib.tlpsrc index e69de29bb2d..f2016a278f3 100644 --- a/Master/tlpkg/tlpsrc/beamer-contrib.tlpsrc +++ b/Master/tlpkg/tlpsrc/beamer-contrib.tlpsrc @@ -0,0 +1 @@ +catalogue beamerthemejltree diff --git a/Master/tlpkg/tlpsrc/beebe.tlpsrc b/Master/tlpkg/tlpsrc/beebe.tlpsrc index e69de29bb2d..c72a30c855f 100644 --- a/Master/tlpkg/tlpsrc/beebe.tlpsrc +++ b/Master/tlpkg/tlpsrc/beebe.tlpsrc @@ -0,0 +1 @@ +catalogue biblio diff --git a/Master/tlpkg/tlpsrc/bengali.tlpsrc b/Master/tlpkg/tlpsrc/bengali.tlpsrc index e69de29bb2d..d1f9b5c8a45 100644 --- a/Master/tlpkg/tlpsrc/bengali.tlpsrc +++ b/Master/tlpkg/tlpsrc/bengali.tlpsrc @@ -0,0 +1 @@ +catalogue bengali-pandey diff --git a/Master/tlpkg/tlpsrc/carolmin-ps.tlpsrc b/Master/tlpkg/tlpsrc/carolmin-ps.tlpsrc index ab1ef2b0426..22bd6a8db6a 100644 --- a/Master/tlpkg/tlpsrc/carolmin-ps.tlpsrc +++ b/Master/tlpkg/tlpsrc/carolmin-ps.tlpsrc @@ -1 +1,2 @@ +catalogue carolmin-t1 execute addMap cmin.map diff --git a/Master/tlpkg/tlpsrc/cbfonts.tlpsrc b/Master/tlpkg/tlpsrc/cbfonts.tlpsrc index 6693efd8675..0f9e16b83e6 100644 --- a/Master/tlpkg/tlpsrc/cbfonts.tlpsrc +++ b/Master/tlpkg/tlpsrc/cbfonts.tlpsrc @@ -1 +1,2 @@ +catalogue cbgreek-complete execute addMixedMap cbgreek-full.map diff --git a/Master/tlpkg/tlpsrc/components-of-TeX.tlpsrc b/Master/tlpkg/tlpsrc/components-of-TeX.tlpsrc index e69de29bb2d..b64dcc23248 100644 --- a/Master/tlpkg/tlpsrc/components-of-TeX.tlpsrc +++ b/Master/tlpkg/tlpsrc/components-of-TeX.tlpsrc @@ -0,0 +1 @@ +catalogue components diff --git a/Master/tlpkg/tlpsrc/devnag.tlpsrc b/Master/tlpkg/tlpsrc/devnag.tlpsrc index 568a44c7cf9..b26fcc373ce 100644 --- a/Master/tlpkg/tlpsrc/devnag.tlpsrc +++ b/Master/tlpkg/tlpsrc/devnag.tlpsrc @@ -1,2 +1,3 @@ category TLCore +catalogue devanagari binpattern f bin/${ARCH}/devnag diff --git a/Master/tlpkg/tlpsrc/es-tex-faq.tlpsrc b/Master/tlpkg/tlpsrc/es-tex-faq.tlpsrc index e69de29bb2d..574802198c4 100644 --- a/Master/tlpkg/tlpsrc/es-tex-faq.tlpsrc +++ b/Master/tlpkg/tlpsrc/es-tex-faq.tlpsrc @@ -0,0 +1 @@ +catalogue faq-es diff --git a/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc index 3d8f1c8d4f3..7d693da2a0a 100644 --- a/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc +++ b/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc @@ -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 --git a/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc index 1f3b9c7903a..9dc9b602af4 100644 --- a/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc +++ b/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc @@ -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 --git a/Master/tlpkg/tlpsrc/impatient-fr.tlpsrc b/Master/tlpkg/tlpsrc/impatient-fr.tlpsrc index e69de29bb2d..5528288e338 100644 --- a/Master/tlpkg/tlpsrc/impatient-fr.tlpsrc +++ b/Master/tlpkg/tlpsrc/impatient-fr.tlpsrc @@ -0,0 +1 @@ +catalogue impatient diff --git a/Master/tlpkg/tlpsrc/itrans.tlpsrc b/Master/tlpkg/tlpsrc/itrans.tlpsrc index e69de29bb2d..020227bbeea 100644 --- a/Master/tlpkg/tlpsrc/itrans.tlpsrc +++ b/Master/tlpkg/tlpsrc/itrans.tlpsrc @@ -0,0 +1 @@ +catalogue itrans-processor diff --git a/Master/tlpkg/tlpsrc/latex-graphics-companion.tlpsrc b/Master/tlpkg/tlpsrc/latex-graphics-companion.tlpsrc index e69de29bb2d..16ff88b0d65 100644 --- a/Master/tlpkg/tlpsrc/latex-graphics-companion.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex-graphics-companion.tlpsrc @@ -0,0 +1 @@ +catalogue lgc-examples diff --git a/Master/tlpkg/tlpsrc/latex-tipps-und-tricks.tlpsrc b/Master/tlpkg/tlpsrc/latex-tipps-und-tricks.tlpsrc index e69de29bb2d..09e9182c978 100644 --- a/Master/tlpkg/tlpsrc/latex-tipps-und-tricks.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex-tipps-und-tricks.tlpsrc @@ -0,0 +1 @@ +catalogue ltt diff --git a/Master/tlpkg/tlpsrc/latex-web-companion.tlpsrc b/Master/tlpkg/tlpsrc/latex-web-companion.tlpsrc index e69de29bb2d..f0b41ee22be 100644 --- a/Master/tlpkg/tlpsrc/latex-web-companion.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex-web-companion.tlpsrc @@ -0,0 +1 @@ +catalogue lwc-examples diff --git a/Master/tlpkg/tlpsrc/lcdftypetools.tlpsrc b/Master/tlpkg/tlpsrc/lcdftypetools.tlpsrc index 9b7670b2709..743a2c6d4e2 100644 --- a/Master/tlpkg/tlpsrc/lcdftypetools.tlpsrc +++ b/Master/tlpkg/tlpsrc/lcdftypetools.tlpsrc @@ -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 --git a/Master/tlpkg/tlpsrc/lshort-chinese.tlpsrc b/Master/tlpkg/tlpsrc/lshort-chinese.tlpsrc index e69de29bb2d..98541031ed6 100644 --- a/Master/tlpkg/tlpsrc/lshort-chinese.tlpsrc +++ b/Master/tlpkg/tlpsrc/lshort-chinese.tlpsrc @@ -0,0 +1 @@ +catalogue lshort-zh-cn diff --git a/Master/tlpkg/tlpsrc/math-into-latex.tlpsrc b/Master/tlpkg/tlpsrc/math-into-latex.tlpsrc index e69de29bb2d..9774b7a7dc2 100644 --- a/Master/tlpkg/tlpsrc/math-into-latex.tlpsrc +++ b/Master/tlpkg/tlpsrc/math-into-latex.tlpsrc @@ -0,0 +1 @@ +catalogue mil diff --git a/Master/tlpkg/tlpsrc/mathmode.tlpsrc b/Master/tlpkg/tlpsrc/mathmode.tlpsrc index e69de29bb2d..7a998f507eb 100644 --- a/Master/tlpkg/tlpsrc/mathmode.tlpsrc +++ b/Master/tlpkg/tlpsrc/mathmode.tlpsrc @@ -0,0 +1 @@ +catalogue voss-mathmode diff --git a/Master/tlpkg/tlpsrc/mkgrkindex.tlpsrc b/Master/tlpkg/tlpsrc/mkgrkindex.tlpsrc index 541e99a84e0..4e0010796a6 100644 --- a/Master/tlpkg/tlpsrc/mkgrkindex.tlpsrc +++ b/Master/tlpkg/tlpsrc/mkgrkindex.tlpsrc @@ -1 +1,2 @@ +catalogue greek-makeindex binpattern f bin/${ARCH}/mkgrkindex diff --git a/Master/tlpkg/tlpsrc/mp3d.tlpsrc b/Master/tlpkg/tlpsrc/mp3d.tlpsrc index 1de25ea6b86..66b162d8280 100644 --- a/Master/tlpkg/tlpsrc/mp3d.tlpsrc +++ b/Master/tlpkg/tlpsrc/mp3d.tlpsrc @@ -1 +1 @@ -catalogue 3d +catalogue threed diff --git a/Master/tlpkg/tlpsrc/omega-devanagari.tlpsrc b/Master/tlpkg/tlpsrc/omega-devanagari.tlpsrc index e69de29bb2d..c9e0c1c99be 100644 --- a/Master/tlpkg/tlpsrc/omega-devanagari.tlpsrc +++ b/Master/tlpkg/tlpsrc/omega-devanagari.tlpsrc @@ -0,0 +1 @@ +catalogue devanagari-omega diff --git a/Master/tlpkg/tlpsrc/plain-doc.tlpsrc b/Master/tlpkg/tlpsrc/plain-doc.tlpsrc index e69de29bb2d..a2443c8d45c 100644 --- a/Master/tlpkg/tlpsrc/plain-doc.tlpsrc +++ b/Master/tlpkg/tlpsrc/plain-doc.tlpsrc @@ -0,0 +1 @@ +catalogue csname-doc diff --git a/Master/tlpkg/tlpsrc/rtklage.tlpsrc b/Master/tlpkg/tlpsrc/rtklage.tlpsrc index e69de29bb2d..c0857d443c8 100644 --- a/Master/tlpkg/tlpsrc/rtklage.tlpsrc +++ b/Master/tlpkg/tlpsrc/rtklage.tlpsrc @@ -0,0 +1 @@ +catalogue ratex diff --git a/Master/tlpkg/tlpsrc/seetexk.tlpsrc b/Master/tlpkg/tlpsrc/seetexk.tlpsrc index 80f8ae370b6..f00733dbd4b 100644 --- a/Master/tlpkg/tlpsrc/seetexk.tlpsrc +++ b/Master/tlpkg/tlpsrc/seetexk.tlpsrc @@ -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 --git a/Master/tlpkg/tlpsrc/tex-refs.tlpsrc b/Master/tlpkg/tlpsrc/tex-refs.tlpsrc index e69de29bb2d..f02f3e16858 100644 --- a/Master/tlpkg/tlpsrc/tex-refs.tlpsrc +++ b/Master/tlpkg/tlpsrc/tex-refs.tlpsrc @@ -0,0 +1 @@ +catalogue tex-references diff --git a/Master/tlpkg/tlpsrc/tlc2.tlpsrc b/Master/tlpkg/tlpsrc/tlc2.tlpsrc index e69de29bb2d..bc18d40e9e3 100644 --- a/Master/tlpkg/tlpsrc/tlc2.tlpsrc +++ b/Master/tlpkg/tlpsrc/tlc2.tlpsrc @@ -0,0 +1 @@ +catalogue tlc2-examples diff --git a/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc b/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc index 6dd61b78999..98222aba1e9 100644 --- a/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc +++ b/Master/tlpkg/tlpsrc/tlgs.win32.tlpsrc @@ -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 --git a/Master/tlpkg/tlpsrc/wasy.tlpsrc b/Master/tlpkg/tlpsrc/wasy.tlpsrc index a837ed0ed8d..97c84538e31 100644 --- a/Master/tlpkg/tlpsrc/wasy.tlpsrc +++ b/Master/tlpkg/tlpsrc/wasy.tlpsrc @@ -1 +1,2 @@ +catalogue wasy2 execute addMixedMap wasy.map -- cgit v1.2.3