From 0adbaaeb3c7cf72b34a6a9f7b43fcede95fcc386 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 8 Apr 2013 20:59:28 +0000 Subject: yet more pattern and wording fixes git-svn-id: svn://tug.org/texlive/trunk@29762 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TeXCatalogue.pm | 4 ++-- Master/tlpkg/bin/check-wrapper-consistency | 5 +++++ Master/tlpkg/bin/tl-update-asy | 4 +++- Master/tlpkg/tlpsrc/arara.tlpsrc | 1 + Master/tlpkg/tlpsrc/cmap.tlpsrc | 1 + Master/tlpkg/tlpsrc/koma-script.tlpsrc | 2 +- Master/tlpkg/tlpsrc/texdoc.tlpsrc | 2 +- Master/tlpkg/tlpsrc/texworks.tlpsrc | 8 ++++++-- 8 files changed, 20 insertions(+), 7 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/TeXLive/TeXCatalogue.pm b/Master/tlpkg/TeXLive/TeXCatalogue.pm index 575242d19a6..7d116c2ba69 100644 --- a/Master/tlpkg/TeXLive/TeXCatalogue.pm +++ b/Master/tlpkg/TeXLive/TeXCatalogue.pm @@ -186,13 +186,13 @@ sub initialize { || die "chdir($self->{location}/entries failed: $!"; # parse all the files foreach (glob("?/*.xml")) { - open(my $io,"<$_") or die "Cannot read $_: $!"; + open(my $io,"<$_") or die "open($_) failed: $!"; our $tce; # the XML parser die's on malformed xml entries, so we catch # that and continue, simply skipping the entry eval { $tce = TeXLive::TeXCatalogue::Entry->new( 'ioref' => $io ); }; if ($@) { - printf STDERR "TeX Catalogue: cannot read $_, skipping it!\n"; + printf STDERR "TeXCatalogue.pm: cannot parse $_, skipping it!\n"; close($io); next; } diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency index aaa23ac0892..e8351037532 100755 --- a/Master/tlpkg/bin/check-wrapper-consistency +++ b/Master/tlpkg/bin/check-wrapper-consistency @@ -143,5 +143,10 @@ sub list_shell_scripts { $sh{$script} = 1; # save without extension (everything else) } + # more shell scripts, that are not part of linked_scripts. + $sh{"chkweb"} = 1; + $sh{"getafm"} = 1; + $sh{"showchar"} = 1; + return %sh; } diff --git a/Master/tlpkg/bin/tl-update-asy b/Master/tlpkg/bin/tl-update-asy index 344f3c458ad..c1cbc8ac867 100755 --- a/Master/tlpkg/bin/tl-update-asy +++ b/Master/tlpkg/bin/tl-update-asy @@ -101,7 +101,9 @@ elif false && $update_runtime_from_ainst; then $lb/asy \ $pg/asymptote/ \ $xist/asymptote/ \ - $xist/doc \ + $xist/doc/info \ + $xist/doc/man \ + $xist/doc/asymptote \ $xist/tex/*/asymptote" svn status $ci | sed -n 's/^\?//p' | fgrep -v binaries diff --git a/Master/tlpkg/tlpsrc/arara.tlpsrc b/Master/tlpkg/tlpsrc/arara.tlpsrc index dca338c719c..aefd3a571c4 100644 --- a/Master/tlpkg/tlpsrc/arara.tlpsrc +++ b/Master/tlpkg/tlpsrc/arara.tlpsrc @@ -1 +1,2 @@ binpattern f bin/${ARCH}/${PKGNAME} + diff --git a/Master/tlpkg/tlpsrc/cmap.tlpsrc b/Master/tlpkg/tlpsrc/cmap.tlpsrc index 75b94c4a270..020d4bde5c3 100644 --- a/Master/tlpkg/tlpsrc/cmap.tlpsrc +++ b/Master/tlpkg/tlpsrc/cmap.tlpsrc @@ -1,2 +1,3 @@ runpattern +!d texmf-dist/fonts/cmap/adobemapping +runpattern +!d texmf-dist/fonts/cmap/dvipdfmx runpattern +!d texmf-dist/fonts/cmap/uptex diff --git a/Master/tlpkg/tlpsrc/koma-script.tlpsrc b/Master/tlpkg/tlpsrc/koma-script.tlpsrc index 915e8a6dff1..eab3fd15fd6 100644 --- a/Master/tlpkg/tlpsrc/koma-script.tlpsrc +++ b/Master/tlpkg/tlpsrc/koma-script.tlpsrc @@ -9,4 +9,4 @@ runpattern t texmf-dist source koma-script runpattern t texmf-dist doc koma-script # # thus, nothing in doc. -docpattern d nonesuch +docpattern d ignore diff --git a/Master/tlpkg/tlpsrc/texdoc.tlpsrc b/Master/tlpkg/tlpsrc/texdoc.tlpsrc index 43196241b68..97d022330a2 100644 --- a/Master/tlpkg/tlpsrc/texdoc.tlpsrc +++ b/Master/tlpkg/tlpsrc/texdoc.tlpsrc @@ -3,7 +3,7 @@ depend kpathsea postaction shortcut type=menu name="TeXdoc GUI" \ cmd="TEXDIR/bin/win32/texdoctk.exe" # -runpattern f texmf-dist/scripts/texlive/texdoctk.pl +runpattern f texmf-dist/scripts/texdoctk/texdoctk.pl runpattern f texmf-dist/scripts/texdoc/* runpattern f texmf-dist/texdoctk/* runpattern f texmf-dist/texdoc/* diff --git a/Master/tlpkg/tlpsrc/texworks.tlpsrc b/Master/tlpkg/tlpsrc/texworks.tlpsrc index 7dda544ca2f..db7193f3eae 100644 --- a/Master/tlpkg/tlpsrc/texworks.tlpsrc +++ b/Master/tlpkg/tlpsrc/texworks.tlpsrc @@ -4,13 +4,17 @@ longdesc See http://tug.org/texworks for information and downloads. longdesc TeX Live includes executables only for Windows. postaction shortcut type=menu name="TeXworks editor" \ - cmd=TEXDIR/bin/win32/texworks.exe + cmd=TEXDIR/bin/win32/texworks.exe postaction filetype name=TL.TeXworks.edit \ - cmd='"TEXDIR/bin/win32/texworks.exe" "%1"' + cmd='"TEXDIR/bin/win32/texworks.exe" "%1"' postaction fileassoc extension=.tex filetype=TL.TeXworks.edit postaction fileassoc extension=.sty filetype=TL.TeXworks.edit postaction fileassoc extension=.cls filetype=TL.TeXworks.edit +# binpattern f/win32 bin/${ARCH}/texworks binpattern f/win32 tlpkg/texworks/texworks.exe +# runpattern d tlpkg/texworks runpattern +!f tlpkg/texworks/texworks.exe +# +docpattern +!d texmf-dist/doc/support/arara/figures/tetworks -- cgit v1.2.3