diff options
| -rw-r--r-- | Build/source/utils/biber/TeXLive/TLUtils.pm | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/texinfo/texinfo.tex | 91 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 6 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/place | 40 |
4 files changed, 104 insertions, 41 deletions
diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm index dda38e50936..ff334dd231d 100644 --- a/Build/source/utils/biber/TeXLive/TLUtils.pm +++ b/Build/source/utils/biber/TeXLive/TLUtils.pm @@ -1,12 +1,12 @@ -# $Id: TLUtils.pm 21755 2011-03-18 08:36:58Z peter $ +# $Id: TLUtils.pm 21770 2011-03-20 18:34:02Z karl $ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. -# Copyright 2007, 2008, 2009, 2010 Norbert Preining, Reinhard Kotucha +# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 # or any later version. package TeXLive::TLUtils; -my $svnrev = '$Revision: 21755 $'; +my $svnrev = '$Revision: 21770 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -3111,7 +3111,7 @@ sub process_logging_options { =pod -This function returns a "windowsified" version of its single argument +This function returns a "Windows-ized" version of its single argument I<path>, i.e., replaces all forward slashes with backslashes, and adds an additional C<"> at the beginning and end if I<path> contains any spaces. It also makes the path absolute. So if $path does not start diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index 4467c1e860f..7b943897de2 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{2011-02-14.11} +\def\texinfoversion{2011-02-24.09} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -218,7 +218,7 @@ \tracingmacros2 \tracingrestores1 \showboxbreadth\maxdimen \showboxdepth\maxdimen - \ifx\eTeXversion\undefined\else % etex gives us more logging + \ifx\eTeXversion\thisisundefined\else % etex gives us more logging \tracingscantokens1 \tracingifs1 \tracinggroups1 @@ -611,7 +611,7 @@ \else\ifx\temp\offword \plainnonfrenchspacing \else \errhelp = \EMsimple - \errmessage{Unknown @frenchspacing option `\temp', must be on/off}% + \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% \fi\fi } @@ -1082,9 +1082,8 @@ where each line of input produces a line of output.} \newif\ifpdfmakepagedest % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 -% can be set). So we test for \relax and 0 as well as \undefined, -% borrowed from ifpdf.sty. -\ifx\pdfoutput\undefined +% can be set). So we test for \relax and 0 as well as being undefined. +\ifx\pdfoutput\thisisundefined \else \ifx\pdfoutput\relax \else @@ -1516,7 +1515,7 @@ output) for that.)} % if we are producing pdf, and we have \pdffontattr, then define cmaps. % (\pdffontattr was introduced many years ago, but people still run % older pdftex's; it's easy to conditionalize, so we do.) -\ifpdf \ifx\pdffontattr\undefined \else +\ifpdf \ifx\pdffontattr\thisisundefined \else \begingroup \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap @@ -1783,7 +1782,7 @@ end % Use cm as the default font prefix. % To specify the font prefix, you must define \fontprefix % before you read in texinfo.tex. -\ifx\fontprefix\undefined +\ifx\fontprefix\thisisundefined \def\fontprefix{cm} \fi % Support font families that don't use the same naming scheme as CM. @@ -2297,12 +2296,11 @@ end \let\markupsetuplqkbd \markupsetnoligaturesquoteleft -% Allow an option to not replace quotes with a regular directed right -% quote/apostrophe (char 0x27), but instead use the undirected quote -% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it -% the default, but it works for pasting with more pdf viewers (at least -% evince), the lilypond developers report. xpdf does work with the -% regular 0x27. +% Allow an option to not use regular directed right quote/apostrophe +% (char 0x27), but instead the undirected quote from cmtt (char 0x0d). +% The undirected quote is ugly, so don't make it the default, but it +% works for pasting with more pdf viewers (at least evince), the +% lilypond developers report. xpdf does work with the regular 0x27. % \def\codequoteright{% \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax @@ -2326,6 +2324,36 @@ end \else \char'22 \fi } +% Commands to set the quote options. +% +\parseargdef\codequoteundirected{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxicodequoteundirected\endcsname + = t% + \else\ifx\temp\offword + \expandafter\let\csname SETtxicodequoteundirected\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% + \fi\fi +} +% +\parseargdef\codequotebacktick{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxicodequotebacktick\endcsname + = t% + \else\ifx\temp\offword + \expandafter\let\csname SETtxicodequotebacktick\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}% + \fi\fi +} + % [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. \def\noligaturesquoteleft{\relax\lq} @@ -2527,7 +2555,7 @@ end \allowcodebreaksfalse \else \errhelp = \EMsimple - \errmessage{Unknown @allowcodebreaks option `\txiarg'}% + \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}% \fi\fi } @@ -3109,7 +3137,7 @@ end % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 % so we'll define it if necessary. % -\ifx\Orb\undefined +\ifx\Orb\thisisundefined \def\Orb{\mathhexbox20D} \fi @@ -3384,7 +3412,7 @@ end % This produces Day Month Year style of output. % Only define if not already defined, in case a txi-??.tex file has set % up a different format (e.g., txi-cs.tex does this). -\ifx\today\undefined +\ifx\today\thisisundefined \def\today{% \number\day\space \ifcase\month @@ -6465,7 +6493,7 @@ end % \def\Equotation{% \par - \ifx\quotationauthor\undefined\else + \ifx\quotationauthor\thisisundefined\else % indent a bit. \leftline{\kern 2\leftskip \sl ---\quotationauthor}% \fi @@ -7000,7 +7028,7 @@ end % To do this right we need a feature of e-TeX, \scantokens, % which we arrange to emulate with a temporary file in ordinary TeX. -\ifx\eTeXversion\undefined +\ifx\eTeXversion\thisisundefined \newwrite\macscribble \def\scantokens#1{% \toks0={#1}% @@ -7422,6 +7450,27 @@ end \fi } +% @xrefautosectiontitle on|off says whether @section(ing) names are used +% automatically in xrefs, if the third arg is not explicitly specified. +% This was provided as a "secret" @set xref-automatic-section-title +% variable, now it's official. +% +\parseargdef\xrefautomaticsectiontitle{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETxref-automatic-section-title\endcsname + = \empty + \else\ifx\temp\offword + \expandafter\let\csname SETxref-automatic-section-title\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @xrefautomaticsectiontitle value `\temp', + must be on|off}% + \fi\fi +} + + % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is % the node name, #2 the name of the Info cross-reference, #3 the printed % node name, #4 the name of the Info file, #5 the name of the printed @@ -7438,7 +7487,7 @@ end \setbox0=\hbox{\printedrefname\unskip}% \ifdim \wd0 = 0pt % No printed node name was explicitly given. - \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax + \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax % Use the node name inside the square brackets. \def\printedrefname{\ignorespaces #1}% \else @@ -7908,7 +7957,7 @@ end it from ftp://tug.org/tex/epsf.tex.} % \def\image#1{% - \ifx\epsfbox\undefined + \ifx\epsfbox\thisiundefined \ifwarnednoepsf \else \errhelp = \noepsfhelp \errmessage{epsf.tex not found, images will be ignored}% diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 6b5d740a9da..4d0cc00e81c 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2029,8 +2029,8 @@ for (@ARGV) { $TOPDEST = $COOKED_PKG; # that is, Master } - my $dest_tree = $specialdest{$package} || $standarddest; # usually texmf-dist - $DEST = "$TOPDEST/$dest_tree"; # goes to Master/texmf-dist or whatever + $DEST_TREE = $specialdest{$package} || $standarddest; # usually texmf-dist + $DEST = "$TOPDEST/$DEST_TREE"; # goes to Master/texmf-dist or whatever $insrunner = $specialinsrunner{$package} || $standardinsrunner; @@ -2528,7 +2528,7 @@ sub doscripts { my $platdir = "$TOPDEST/bin/$p"; &xmkdir ($platdir); if ($p ne "win32") { - my $linktarget = "../../$dest_tree/scripts/$package/$s"; + my $linktarget = "../../$DEST_TREE/scripts/$package/$s"; &SYSTEM ("ln -s $linktarget $platdir/$linkname"); } else { # Windows. If a shell script, skip. Else copy the wrapper. diff --git a/Master/tlpkg/libexec/place b/Master/tlpkg/libexec/place index 8c932529a9e..6912e6554d8 100755 --- a/Master/tlpkg/libexec/place +++ b/Master/tlpkg/libexec/place @@ -105,7 +105,10 @@ print "\n\f "; &compare_disk_vs_tlpobj ($cooked_master, $tlpnew); &show_tlp_diffs ($tlpnew, %Old); -my @new_build_files = &handle_build_files ($cooked_pkg, $DEST); +# xx add dirs for existing files +# xx need svn cp, too. +my ($new_build_files,$exxisting) = &build_files ($cooked_pkg, $DEST); +my @new_build_files = @$new_build_files; &xchdir ($cooked_pkg); print "place: checking for case-insensitive clashes\n"; @@ -114,7 +117,7 @@ print "\n"; # Figure out removals relative to old package. &xchdir ($cooked_master); -find (\&files, "."); # sets %New (= all files under Master) +find (\&files, "."); # sets %New to all new files under Master foreach $file (sort keys %Old) { my $status = $New{$file} ? "retained" : "removed"; print "* $file\t[$status]\n"; @@ -132,8 +135,9 @@ foreach $file (sort keys %Old) { $dirs{$dname}++; } + -# Copy files. +# Copy in new files. &xchdir ($cooked_pkg); &xsystem ("tar cf - . | (cd $DEST && tar xf - )"); @@ -157,12 +161,19 @@ if (keys %Old == 0) { # new package # this file will often change, so be sure and include it. $dirs{"$M/tlpkg/tlpsrc/$package.tlpsrc"}++; -# print dirs with changed files, for svn commit purposes. -# if other files have been modified in those same dirs, though, this -# won't detect it. It would be better to list exactly the *files* which -# should be committed, but ... lazy. -# -# also write dir list to a separate file, for easy passing to a commit. +# if we have a new directory Build/.../linked_scripts/foo, we +# need the linked_scripts directory itself, too, since the Makefile.am +# should have been changed (by hand). +for my $dir (keys %dirs) { + next unless $dir =~ m,Build/.*/linked_scripts,; + $dir =~ s,/linked_scripts/.*$,/linked_scripts,; + $dirs{$dir}++; +} + +# print dirs with changed files, and write the dir list to a file, for +# passing to svn commit. if other files have been modified in those +# same dirs, though, this won't detect it. It would be better to list +# exactly the *files* which should be committed. # my $dirlist_file = "$tmpfile.dirs"; $DIRLIST = ">$dirlist_file"; @@ -344,9 +355,10 @@ sub show_tlp_diffs { # return list of new files under Build, if any. # do nothing to try to remove files under Build, that doesn't make sense. # -sub handle_build_files { +sub build_files { my ($cooked_pkg, $svn_dest) = @_; - my @ret = (); + my @new_ret = (); + my @existing_ret = (); return unless -d "$cooked_pkg/Build"; die "no Build subdir in $svn_dest?!" if ! -d "$svn_dest/Build"; @@ -362,11 +374,13 @@ sub handle_build_files { my $status = -e $dest_file ? "existing" : "new"; print "* $file\t[$status]\n"; if ($status eq "new") { - push (@ret, $dest_file); + push (@new_ret, $dest_file); + } else { + push (@existing_ret, $dest_file); } } - return @ret; + return (\@new_ret, \@existing_ret); } |