From 7152d165727c24f3ab7c14f7e3addac5ab4ba2ab Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 6 Sep 2012 22:21:17 +0000 Subject: consistency git-svn-id: svn://tug.org/texlive/trunk@27610 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/tetex/updmap.pl | 5 ++- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 46 +++++++++++++++----- Master/texmf-dist/tex/texinfo/texinfo.tex | 49 ++++++++++++---------- Master/texmf/scripts/texlive/NEWS | 3 +- 4 files changed, 66 insertions(+), 37 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl b/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl index 710c61cd9c4..c8e3f2dfc3d 100755 --- a/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl +++ b/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl @@ -1018,10 +1018,11 @@ sub mkMaps { &writeLines(">$dvipsoutputdir/builtin35.map", normalizeLines(@builtin35_map)); - my @dftdvips_fonts = ($dvipsDownloadBase35 ? @ps2pk_fonts : @dvips35_fonts); + my @dftdvips_fonts = + (($dvipsDownloadBase35 eq "true") ? @ps2pk_fonts : @dvips35_fonts); my @psfonts_t1_map; - if ($dvipsDownloadBase35) { + if ($dvipsDownloadBase35 eq "true") { push @psfonts_t1_map, "% ps2pk35.map", @dftdvips_fonts = @ps2pk_fonts; } else { diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index ea05a4c7abc..b5c20567972 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 27413 2012-08-15 22:26:59Z karl $ +# $Id: tlmgr.pl 27601 2012-09-05 23:52:48Z preining $ # # Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 27413 $'; -my $datrev = '$Date: 2012-08-16 00:26:59 +0200 (Thu, 16 Aug 2012) $'; +my $svnrev = '$Revision: 27601 $'; +my $datrev = '$Date: 2012-09-06 01:52:48 +0200 (Thu, 06 Sep 2012) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -280,8 +280,24 @@ sub main { # But not all Unix platforms have it, and on Windows our Config.pm # can apparently interfere, so always skip it there. my @noperldoc = (); - if (win32() || ! TeXLive::TLUtils::which("perldoc")) { + if (win32()) { @noperldoc = ("-noperldoc", "1"); + } else { + if (!TeXLive::TLUtils::which("perldoc")) { + @noperldoc = ("-noperldoc", "1"); + } else { + # checking only for the existence of perldoc is not enough + # because stupid Debian/Ubuntu ships a stub that does nothing + # which is very very bad idea + # try to check for that, too + my $ret = system("perldoc -V > /dev/null 2>&1"); + if ($ret == 0) { + debug("Working perldoc found, using it.\n"); + } else { + tlwarn("Your perldoc seems to be non functional!\n"); + @noperldoc = ("-noperldoc", "1"); + } + } } # in some cases LESSPIPE of less breaks control characters # and the output of pod2usage is broken. @@ -3489,11 +3505,13 @@ sub array_to_repository { } for my $k (keys %r) { my $v = $r{$k}; - if ($k eq $v) { - push @ret, $k; - } else { - push @ret, "$v#$k"; + if ($k ne $v) { + $v = "$v#$k"; } + # encode spaces and % in the path and tags + $v =~ s/%/%25/g; + $v =~ s/ /%20/g; + push @ret, $v; } return "@ret"; } @@ -3507,11 +3525,17 @@ sub repository_to_array { return %r; } for my $rr (@repos) { + my $tag; + my $url; + # decode spaces and % in reverse order + $rr =~ s/%20/ /g; + $rr =~ s/%25/%/g; + $tag = $url = $rr; if ($rr =~ m/^([^#]+)#(.*)$/) { - $r{$2} = $1; - } else { - $r{$rr} = $rr; + $tag = $2; + $url = $1; } + $r{$tag} = $url; } return %r; } diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index dc4bf6400c4..9a2439c815d 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-07-29.17} +\def\texinfoversion{2012-09-05.06} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -594,7 +594,7 @@ \def\:{\spacefactor=1000 } % @* forces a line break. -\def\*{\hfil\break\hbox{}\ignorespaces} +\def\*{\unskip\hfil\break\hbox{}\ignorespaces} % @/ allows a line break. \let\/=\allowbreak @@ -3269,6 +3269,20 @@ end \finishedtitlepagetrue } +% Settings used for typesetting titles: no hyphenation, no indentation, +% don't worry much about spacing, ragged right. This should be used +% inside a \vbox, and fonts need to be set appropriately first. Because +% it is always used for titles, nothing else, we call \rmisbold. \par +% should be specified before the end of the \vbox, since a vbox is a group. +% +\def\raggedtitlesettings{% + \rmisbold + \hyphenpenalty=10000 + \parindent=0pt + \tolerance=5000 + \ptexraggedright +} + % Macros to be used within @titlepage: \let\subtitlerm=\tenrm @@ -3276,7 +3290,7 @@ end \parseargdef\title{% \checkenv\titlepage - \leftline{\titlefonts\rmisbold #1} + \vbox{\titlefonts \raggedtitlesettings #1\par}% % print a rule at the page bottom also. \finishedtitlepagefalse \vskip4pt \hrule height 4pt width \hsize \vskip4pt @@ -5579,14 +5593,6 @@ end % Define @majorheading, @heading and @subheading -% NOTE on use of \vbox for chapter headings, section headings, and such: -% 1) We use \vbox rather than the earlier \line to permit -% overlong headings to fold. -% 2) \hyphenpenalty is set to 10000 because hyphenation in a -% heading is obnoxious; this forbids it. -% 3) Likewise, headings look best if no \parindent is used, and -% if justification is not attempted. Hence \raggedright. - \def\majorheading{% {\advance\chapheadingskip by 10pt \chapbreak }% \parsearg\chapheadingzzz @@ -5594,10 +5600,8 @@ end \def\chapheading{\chapbreak \parsearg\chapheadingzzz} \def\chapheadingzzz#1{% - {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\ptexraggedright - \rmisbold #1\hfill}}% - \bigskip \par\penalty 200\relax + \vbox{\chapfonts \raggedtitlesettings #1\par}% + \nobreak\bigskip \nobreak \suppressfirstparagraphindent } @@ -5756,8 +5760,7 @@ end % % Typeset the actual heading. \nobreak % Avoid page breaks at the interline glue. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright - \hangindent=\wd0 \centerparametersmaybe + \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe \unhbox0 #1\par}% }% \nobreak\bigskip % no page break after a chapter title @@ -5779,18 +5782,18 @@ end \def\setchapterstyle #1 {\csname CHAPF#1\endcsname} % \def\unnchfopen #1{% -\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\ptexraggedright - \rmisbold #1\hfill}}\bigskip \par\nobreak + \chapoddpage + \vbox{\chapfonts \raggedtitlesettings #1\par}% + \nobreak\bigskip\nobreak } \def\chfopen #1#2{\chapoddpage {\chapfonts \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% \par\penalty 5000 % } \def\centerchfopen #1{% -\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt - \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak + \chapoddpage + \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}% + \nobreak\bigskip \nobreak } \def\CHAPFopen{% \global\let\chapmacro=\chfopen diff --git a/Master/texmf/scripts/texlive/NEWS b/Master/texmf/scripts/texlive/NEWS index cf9e0d5c4ba..50bdde9840f 100644 --- a/Master/texmf/scripts/texlive/NEWS +++ b/Master/texmf/scripts/texlive/NEWS @@ -1,8 +1,9 @@ (This file public domain. Originally written by Norbert Preining and Karl Berry, 2010.) -

tlmgr revision NEXT (released NNmmm12):
+

tlmgr revision 27601 (released 07sep12):

  • allow for spaces in the repository path (again) +
  • make tlmgr --help more robust against broken perldoc

    tlmgr revision 27413 (released 16aug12):

  • fix Perl syntax warning in trans.pl -- cgit v1.2.3