diff options
| -rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 8 | ||||
| -rw-r--r-- | Build/source/utils/biber/TeXLive/TLUtils.pm | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/texinfo/texinfo.tex | 37 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/check-files-by-format | 1 |
4 files changed, 41 insertions, 13 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index f76b3328f63..6787e2fbc45 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 27249 $'; +my $svnrev = '$Revision: 27741 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -2691,8 +2691,12 @@ sub check_for_old_updmap_cfg { return unless -r $oldupd; # if no such file, good. open (OLDUPD, "<$oldupd") || die "open($oldupd) failed: $!"; - chomp( my $firstline = <OLDUPD> ); + my $firstline = <OLDUPD>; close(OLDUPD); + # cygwin returns undef when reading from an empty file, we have + # to make sure that this is anyway initialized + $firstline = "" if (!defined($firstline)); + chomp ($firstline); # if ($firstline =~ m/^# Generated by (install-tl|.*\/tlmgr) on/) { # assume it was our doing, rename it. diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm index f76b3328f63..6787e2fbc45 100644 --- a/Build/source/utils/biber/TeXLive/TLUtils.pm +++ b/Build/source/utils/biber/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 27249 $'; +my $svnrev = '$Revision: 27741 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -2691,8 +2691,12 @@ sub check_for_old_updmap_cfg { return unless -r $oldupd; # if no such file, good. open (OLDUPD, "<$oldupd") || die "open($oldupd) failed: $!"; - chomp( my $firstline = <OLDUPD> ); + my $firstline = <OLDUPD>; close(OLDUPD); + # cygwin returns undef when reading from an empty file, we have + # to make sure that this is anyway initialized + $firstline = "" if (!defined($firstline)); + chomp ($firstline); # if ($firstline =~ m/^# Generated by (install-tl|.*\/tlmgr) on/) { # assume it was our doing, rename it. diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index f3093d0853f..b5f31415771 100644 --- a/Master/texmf-dist/tex/texinfo/texinfo.tex +++ b/Master/texmf-dist/tex/texinfo/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2012-09-12.16} +\def\texinfoversion{2012-11-08.11} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -6559,16 +6559,9 @@ end \makedispenvdef{quotation}{\quotationstart} % \def\quotationstart{% - {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip - \parindent=0pt - % - % @cartouche defines \nonarrowing to inhibit narrowing at next level down. + \indentedblockstart % same as \indentedblock, but increase right margin too. \ifx\nonarrowing\relax - \advance\leftskip by \lispnarrowing \advance\rightskip by \lispnarrowing - \exdentamount = \lispnarrowing - \else - \let\nonarrowing = \relax \fi \parsearg\quotationlabel } @@ -6594,6 +6587,32 @@ end \fi } +% @indentedblock is like @quotation, but indents only on the left and +% has no optional argument. +% +\makedispenvdef{indentedblock}{\indentedblockstart} +% +\def\indentedblockstart{% + {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip + \parindent=0pt + % + % @cartouche defines \nonarrowing to inhibit narrowing at next level down. + \ifx\nonarrowing\relax + \advance\leftskip by \lispnarrowing + \exdentamount = \lispnarrowing + \else + \let\nonarrowing = \relax + \fi +} + +% Keep a nonzero parskip for the environment, since we're doing normal filling. +% +\def\Eindentedblock{% + \par + {\parskip=0pt \afterenvbreak}% +} +\def\Esmallindentedblock{\Eindentedblock} + % LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>} % If we want to allow any <char> as delimiter, diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format index 486e9e09ea8..007c99d153e 100755 --- a/Master/tlpkg/bin/check-files-by-format +++ b/Master/tlpkg/bin/check-files-by-format @@ -41,6 +41,7 @@ my $exclude_pdf = { # the value has no meaning here my $exclude_pfb = { '*base*' => 'texmf-dist/fonts/type1', 'adobe/courier/' => 1, + 'adobe/sourcecodepro/' => 1, # SourceCodePro-Regular.pfb, 10nov12 contacted 'arabi/arabeyes/' => 1, 'arabi/farsiweb/' => 1, 'arkandis/adfsymbols/' => 1, |