diff options
author | Norbert Preining <preining@logic.at> | 2009-08-15 09:59:35 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2009-08-15 09:59:35 +0000 |
commit | e9accfc9db71d64443b0c2494055774987618974 (patch) | |
tree | f4cf9a3200f12a4a081642811558bf8b8c161ba0 | |
parent | e40e695e58b9da79f20f21644df6048fc7dc41bb (diff) |
update patch so that disabling hyphenations is possible (independently)
in language-local.def and language-local.dat using %!NAME
git-svn-id: svn://tug.org/texlive/trunk@14690 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/tlpkg/etc/dev.allow-disabling-formats-and-maps-in-local-cfg-file.patch | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/Master/tlpkg/etc/dev.allow-disabling-formats-and-maps-in-local-cfg-file.patch b/Master/tlpkg/etc/dev.allow-disabling-formats-and-maps-in-local-cfg-file.patch index 0e919f7af2a..ea770c0ea13 100644 --- a/Master/tlpkg/etc/dev.allow-disabling-formats-and-maps-in-local-cfg-file.patch +++ b/Master/tlpkg/etc/dev.allow-disabling-formats-and-maps-in-local-cfg-file.patch @@ -166,7 +166,7 @@ Index: tlpkg/TeXLive/TLUtils.pm =================================================================== --- tlpkg/TeXLive/TLUtils.pm (revision 14688) +++ tlpkg/TeXLive/TLUtils.pm (working copy) -@@ -2297,22 +2297,45 @@ +@@ -2297,30 +2297,58 @@ =cut @@ -175,19 +175,19 @@ Index: tlpkg/TeXLive/TLUtils.pm +# returns the list of disabled formats/hyphenpatterns/maps +# disabling is done by putting +# #!NAME ++# or ++# %!NAME +# into the respective XXXX-local.cnf/cfg file +# -+# WARNING this is only supported for updmap.cfg and fmtutil.cnf, since -+# WARNING those files use # as comment char and have line oriented structure -+# +sub get_disabled_local_configs { + my $localconf = shift; ++ my $cc = shift; + if (-r "$localconf") { + open FOO, "<$localconf" + or die "strange, -r ok but cannot open $localconf: $!"; + my @tmp = <FOO>; + close(FOO) || warn("Closing $localconf did not succeed: $!"); -+ my @disabled = map { if (m/^#!(\S+)\s*$/) { $1 } else { }} @tmp; ++ my @disabled = map { if (m/^$cc!(\S+)\s*$/) { $1 } else { }} @tmp; + return @disabled; + } +} @@ -195,7 +195,8 @@ Index: tlpkg/TeXLive/TLUtils.pm sub create_fmtutil { my ($tlpdb,$dest,$localconf) = @_; - my @lines = $tlpdb->fmtutil_cnf_lines; -+ my @lines = $tlpdb->fmtutil_cnf_lines(get_disabled_local_configs($localconf)); ++ my @lines = $tlpdb->fmtutil_cnf_lines( ++ get_disabled_local_configs($localconf, '#')); _create_config_files($tlpdb, "texmf/web2c/fmtutil-hdr.cnf", $dest, $localconf, 0, '#', \@lines); } @@ -203,22 +204,28 @@ Index: tlpkg/TeXLive/TLUtils.pm sub create_updmap { my ($tlpdb,$dest,$localconf) = @_; - my @lines = $tlpdb->updmap_cfg_lines; -+ my @lines = $tlpdb->updmap_cfg_lines(get_disabled_local_configs($localconf)); ++ my @lines = $tlpdb->updmap_cfg_lines( ++ get_disabled_local_configs($localconf, '#')); _create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest, $localconf, 0, '#', \@lines); } sub create_language_dat { my ($tlpdb,$dest,$localconf) = @_; +- my @lines = $tlpdb->language_dat_lines; + # no checking for disabled stuff for language.dat and .def - my @lines = $tlpdb->language_dat_lines; ++ my @lines = $tlpdb->language_dat_lines( ++ get_disabled_local_configs($localconf, '%')); _create_config_files($tlpdb, "texmf/tex/generic/config/language.us", $dest, $localconf, 0, '%', \@lines); -@@ -2320,6 +2343,7 @@ + } sub create_language_def { my ($tlpdb,$dest,$localconf) = @_; +- my @lines = $tlpdb->language_def_lines; + # no checking for disabled stuff for language.dat and .def - my @lines = $tlpdb->language_def_lines; ++ my @lines = $tlpdb->language_def_lines( ++ get_disabled_local_configs($localconf, '%')); my @postlines; push @postlines, "%%% No changes may be made beyond this point.\n"; + push @postlines, "\n"; |