diff options
3 files changed, 21 insertions, 16 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji.pl b/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji.pl index 167c4073abb..367fddff829 100755 --- a/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji.pl +++ b/Build/source/texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji.pl @@ -19,10 +19,10 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; my $prg = "updmap-setup-kanji"; -my $vers = "0.9.5"; -my $version = '$Id: updmap-setup-kanji.pl 25640 2012-03-14 22:44:37Z preining $'; +my $vers = "0.9.6"; +my $version = '$Id: updmap-setup-kanji.pl 27277 2012-08-02 00:16:14Z karl $'; -my $updmap_real = "updmap-sys"; +my $updmap_real = "updmap"; my $updmap = $updmap_real; my $dry_run = 0; @@ -44,7 +44,7 @@ my $nul = (win32() ? 'nul' : '/dev/null') ; if ($dry_run) { - $updmap = "echo updmap-sys"; + $updmap = "echo updmap"; } if ($opt_help) { @@ -91,7 +91,7 @@ sub Usage { Please see the documentation of updmap for details (updmap --help). - Usage: $prg {<fontname>|auto|nofont|status} + Usage: $prg [OPTION] {<fontname>|auto|nofont|status} <family> embed an arbitrary font family <family>, at least the map file otf-<family>.map has to be available. @@ -106,6 +106,12 @@ sub Usage { automatically. status: get information about current environment and usable font map + Options: + -n, --dry-run do not actually run updmap + -h, --help show this message and exit + -jis2004 use JIS2004 variants for default fonts of (u)pTeX + --version show version information and exit + EOF ; print $usage; @@ -145,13 +151,10 @@ sub check_mapfile { sub GetStatus { my $val = `$updmap_real --quiet --showoption kanjiEmbed`; my $STATUS; - if ($val =~ m/^kanjiEmbed=(.*)( \()?/) { + if ($val =~ m/^kanjiEmbed=([^()\s]*)(\s+\()?/) { $STATUS = $1; - $STATUS =~ s/\s*$//; - $STATUS =~ s/\(.*\)$//; - $STATUS =~ s/^"(.*)"$/\1/; } else { - printf STDERR "Cannot find status of current kanjiEmbed setting via updmap-sys --showoption!\n"; + printf STDERR "Cannot find status of current kanjiEmbed setting via updmap --showoption!\n"; exit 1; } diff --git a/Build/source/texk/texlive/linked_scripts/typeoutfileinfo/typeoutfileinfo.sh b/Build/source/texk/texlive/linked_scripts/typeoutfileinfo/typeoutfileinfo.sh index c4544edad5a..18d618a1849 100755 --- a/Build/source/texk/texlive/linked_scripts/typeoutfileinfo/typeoutfileinfo.sh +++ b/Build/source/texk/texlive/linked_scripts/typeoutfileinfo/typeoutfileinfo.sh @@ -1,4 +1,4 @@ -%!/usr/bin/env bash +#!/bin/sh ## ## This is `typeoutfileinfo.sh', a minimalist shell script for Unices. ## @@ -31,11 +31,11 @@ EOM ## ## There is NO WARRANTY. ## -## This is package version v0.2 as of 2012-09-16. +## This is package version v0.21 as of 2012-09-19. ## ## CREDIT: this work derived from Harald Harders' `latexfileversion' ## as a simplification using my `readprov'. I learnt "here document" -## from `latexfileversion' -- UL. +## from `latexfileversion's -- UL. ## ## PURPOSE/BACKGROUND: A package like this, `latexfileversion' or ## `ltxfileinfo' when you wonder which version of a source file @@ -50,3 +50,4 @@ EOM ## HISTORY: ## v0.1a 2012/03/16 ## v0.2 2012/09/16 adds \batchmode thanks to Heiko Oberdiek on texhax +## v0.21 2012/09/19 shebang line corrected/improved by Reinhard Kotucha diff --git a/Master/texmf-dist/scripts/typeoutfileinfo/typeoutfileinfo.sh b/Master/texmf-dist/scripts/typeoutfileinfo/typeoutfileinfo.sh index c4544edad5a..18d618a1849 100755 --- a/Master/texmf-dist/scripts/typeoutfileinfo/typeoutfileinfo.sh +++ b/Master/texmf-dist/scripts/typeoutfileinfo/typeoutfileinfo.sh @@ -1,4 +1,4 @@ -%!/usr/bin/env bash +#!/bin/sh ## ## This is `typeoutfileinfo.sh', a minimalist shell script for Unices. ## @@ -31,11 +31,11 @@ EOM ## ## There is NO WARRANTY. ## -## This is package version v0.2 as of 2012-09-16. +## This is package version v0.21 as of 2012-09-19. ## ## CREDIT: this work derived from Harald Harders' `latexfileversion' ## as a simplification using my `readprov'. I learnt "here document" -## from `latexfileversion' -- UL. +## from `latexfileversion's -- UL. ## ## PURPOSE/BACKGROUND: A package like this, `latexfileversion' or ## `ltxfileinfo' when you wonder which version of a source file @@ -50,3 +50,4 @@ EOM ## HISTORY: ## v0.1a 2012/03/16 ## v0.2 2012/09/16 adds \batchmode thanks to Heiko Oberdiek on texhax +## v0.21 2012/09/19 shebang line corrected/improved by Reinhard Kotucha |