diff options
| -rwxr-xr-x | Build/source/build-aux/depcomp | 10 | ||||
| -rwxr-xr-x | Build/source/extra/xz/build-aux/depcomp | 66 | ||||
| -rw-r--r-- | Master/doc.html | 25 | ||||
| -rw-r--r-- | Master/texmf/scripts/texlive/var/texcatalogue.keywords | 7 |
4 files changed, 89 insertions, 19 deletions
diff --git a/Build/source/build-aux/depcomp b/Build/source/build-aux/depcomp index c3163befc32..43bd0f9bc12 100755 --- a/Build/source/build-aux/depcomp +++ b/Build/source/build-aux/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2010-10-07.20; # UTC +scriptversion=2011-04-09-11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -557,7 +557,9 @@ makedepend) touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff --git a/Build/source/extra/xz/build-aux/depcomp b/Build/source/extra/xz/build-aux/depcomp index df8eea7e4ce..43bd0f9bc12 100755 --- a/Build/source/extra/xz/build-aux/depcomp +++ b/Build/source/extra/xz/build-aux/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-04-09-11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -90,10 +90,18 @@ if test "$depmode" = msvcmsys; then # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -405,6 +413,52 @@ tru64) rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/ \1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/ / + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -503,7 +557,9 @@ makedepend) touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff --git a/Master/doc.html b/Master/doc.html index 8b058161b80..684cdd0e3ca 100644 --- a/Master/doc.html +++ b/Master/doc.html @@ -5539,7 +5539,7 @@ A system for specifying fonts. </small></li> <li><b><a href="texmf-dist/doc/fonts/metafont-beginners">metafont-beginners</a></b>:<small> -An introductory tutorial for MetaFont. +An introductory tutorial for Metafont. <a href="texmf-dist/doc/fonts/metafont-beginners/metafont-for-beginners.pdf">metafont-for-beginners.pdf</a> (en). </small></li> @@ -5574,12 +5574,12 @@ Plot-manipulation macros for use in Metapost. </small></li> <li><b><a href="texmf-dist/doc/metapost/base">metapost</a></b>:<small> -A development of MetaFont for creating graphics. +A development of Metafont for creating graphics. <a href="texmf-dist/doc/metapost/base/index.html">index.html</a>. </small></li> <li><b><a href="texmf-dist/doc/plain/metatex">metatex</a></b>:<small> -Incorporate MetaFont pictures in TeX source. +Incorporate Metafont pictures in TeX source. <a href="texmf-dist/doc/plain/metatex/mtpaper.pdf">mtpaper.pdf</a>. </small></li> @@ -5605,7 +5605,7 @@ Polish formats for TeX. </small></li> <li><b><a href="texmf-dist/doc/latex/mflogo">mflogo</a></b>:<small> -LaTeX support for MetaFont logo fonts. +LaTeX support for Metafont logo fonts. <a href="texmf-dist/doc/latex/mflogo/mflogo.pdf">mflogo.pdf</a>. </small></li> @@ -5615,7 +5615,7 @@ Packages to typeset oldgerman and pandora fonts in LaTeX. </small></li> <li><b><a href="texmf-dist/doc/generic/mfpic">mfpic</a></b>:<small> -Draw MetaFont/Post pictures from (La)TeX commands. +Draw Metafont/post pictures from (La)TeX commands. <a href="texmf-dist/doc/generic/mfpic/mfpcard.pdf">mfpcard.pdf</a> (en), <a href="texmf-dist/doc/generic/mfpic/mfpguide.pdf">mfpguide.pdf</a> (en), <a href="texmf-dist/doc/generic/mfpic/mfpic-doc.pdf">mfpic-doc.pdf</a> (en). @@ -5634,7 +5634,7 @@ Pretty-print Metafont source. </small></li> <li><b><a href="texmf/doc/man/man1">mfware</a></b>:<small> -Supporting tools for use with MetaFont. +Supporting tools for use with Metafont. <a href="texmf/doc/man/man1/gftodvi.man1.pdf">gftodvi.man1.pdf</a>, <a href="texmf/doc/man/man1/gftopk.man1.pdf">gftopk.man1.pdf</a>, <a href="texmf/doc/man/man1/gftype.man1.pdf">gftype.man1.pdf</a>, @@ -6965,7 +6965,7 @@ Typesetting articles for "Philosophers' Imprint". </small></li> <li><b><a href="texmf-dist/doc/fonts/phonetic">phonetic</a></b>:<small> -MetaFont Phonetic fonts, based on Computer Modern. +Metafont Phonetic fonts, based on Computer Modern. <a href="texmf-dist/doc/fonts/phonetic/phonetic-table.pdf">phonetic-table.pdf</a>. </small></li> @@ -10343,11 +10343,16 @@ Simulating word processor layout. <a href="texmf-dist/doc/latex/wordlike/wordlike.pdf">wordlike.pdf</a>. </small></li> +<li><b><a href="texmf-dist/doc/latex/wrapfig">wrapfig</a></b>:<small> +Produces figures which text can flow around. +<a href="texmf-dist/doc/latex/wrapfig/wrapfig-doc.pdf">wrapfig-doc.pdf</a>. +</small></li> + </ol> <h2 id="letter-X">X</h2> -<ol start="1586"> +<ol start="1587"> <li><b><a href="texmf-dist/doc/latex/xargs">xargs</a></b>:<small> Define commands with many optional arguments. @@ -10580,7 +10585,7 @@ Tree macros using XY-Pic. <h2 id="letter-Y">Y</h2> -<ol start="1620"> +<ol start="1621"> <li><b><a href="texmf-dist/doc/latex/yafoot">yafoot</a></b>:<small> A bundle of miscellaneous footnote packages. @@ -10628,7 +10633,7 @@ Many-featured Young tableaux and Young diagrams. <h2 id="letter-Z">Z</h2> -<ol start="1628"> +<ol start="1629"> <li><b><a href="texmf-dist/doc/latex/zed-csp">zed-csp</a></b>:<small> Typesetting Z and CSP format specifications. diff --git a/Master/texmf/scripts/texlive/var/texcatalogue.keywords b/Master/texmf/scripts/texlive/var/texcatalogue.keywords index c3cc2bdad29..47b4d670686 100644 --- a/Master/texmf/scripts/texlive/var/texcatalogue.keywords +++ b/Master/texmf/scripts/texlive/var/texcatalogue.keywords @@ -1962,6 +1962,9 @@ $taxonomy = { 'context-lettrine' => [ 'dropped letter, often initial letter' ], + 'makeindexk' => [ + 'index, indexing' + ], 'fwlw' => [ 'macro programming' ], @@ -20357,6 +20360,8 @@ $taxonomy = { > Computer science', 'context-lettrine' => 'Page-focused > Paragraphs', + 'makeindexk' => 'Document parts > + Index', 'fwlw' => 'Programming in TeX > Other', 'amsmath' => 'Subject-specific typesetting @@ -29224,6 +29229,7 @@ $taxonomy = { 'makeidx', 'index', 'makeindex', + 'makeindexk', 'forindex', 'esindex', 'csindex', @@ -36918,6 +36924,7 @@ $taxonomy = { 'makeidx', 'index', 'makeindex', + 'makeindexk', 'forindex', 'esindex', 'hvindex', |