summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-07 23:03:14 +0000
committerKarl Berry <karl@freefriends.org>2012-02-07 23:03:14 +0000
commit7d61254314ea9eb108ab22507d315a7e39a0f9a8 (patch)
tree63e0703c222190c2e4dbe2138df2391ff3b1c2cc
parent33066250d10f280ee380a4eb2becfe03fcc3a6f8 (diff)
doc tweaks of various kinds
git-svn-id: svn://tug.org/texlive/trunk@25332 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/linked_scripts/README48
-rw-r--r--Master/texmf-dist/tex/texinfo/texinfo.tex89
-rw-r--r--Master/texmf/doc/info/dir5
-rw-r--r--Master/texmf/doc/texlive/texlive-en/texlive-en.tex19
4 files changed, 97 insertions, 64 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/README b/Build/source/texk/texlive/linked_scripts/README
index 4a5cd2b4a11..b64374105ab 100644
--- a/Build/source/texk/texlive/linked_scripts/README
+++ b/Build/source/texk/texlive/linked_scripts/README
@@ -1,37 +1,27 @@
+$Id$
+Copyright (C) 2012 Norbert Preining <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
+
source/texk/texlive/linked_scripts
==================================
-
This directory contains copies of the scripts that are shipped within
-TeX Live.
+TeX Live. See more discussion, rationale, etc., in ./Makefile.am.
+
+Steps to add a new script (take your time, do it right):
+
+* svn mkdir the directory with the package name, and add the script
-Steps to add a new script:
---------------------------
-* create a directory with the package name, and add the script
* add the dir/script-name to Makefile.am in the respective section
(shell vs general interpreter, texmf vs texmf-dist)
-* add the package/script to ctan2tds so that is found and installed automatically
-* get ctan2tl run properly
-* (reautoconf?)
-Other explanation from Makefile.am
-----------------------------------
-# The idea is to install the scripts themselves in texmf*/scripts, and
-# have bin/arch/foo be a symlink to, say,
-# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk
-# space, but more importantly omit duplication, and most
-# importantly of all make it possible to invoke the same Perl script on
-# Windows (see ../w32_wrapper).
-#
-# The installation into texmf*/scripts is ideally done with ctan2tl.
-# The copy of the wrapper for Windows is also done by ctan2tl. (And
-# for shell scripts, its addition must be undone by hand.) The
-# check-wrapper-consistency script checks after the fact for problems.
-#
-# We also keep a copy of all the scripts here and install into the runtime.
-# This is purely for other distro builders, so symlinks are not dangling in
-# the inst/bin dir (it is meaningless in native TL). We have not yet
-# written the auto-update to ensure linked_scripts is actually up to date
-# with the masters in Master/texmf*/scripts, but one day.
-#
-# We support native builds, multiplatform or not, as well as distro builds.
+* add the package/script to ctan2tds so that is found and installed
+ automatically (%specialscripts), etc.
+
+* get ctan2tl to run properly
+* cd .. && autoreconf -v
+ But only commit the results of this last if you have the same version
+ of GNU m4, libtool, autoconf, automake, etc., installed that were
+ already used (generally the latest official releases). And if you
+ have installed the original versions straight from ftp.gnu.org for
+ yourself -- don't use versions from distro packages.
diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index 2abda0f3daf..dcdeb9b4ffa 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-01-03.09}
+\def\texinfoversion{2012-01-19.16}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2842,8 +2842,8 @@ end
%
\def\outfmtnametex{tex}
%
-\def\inlinefmt#1{\doinlinefmt #1,\finish}
-\def\doinlinefmt#1,#2,\finish{%
+\long\def\inlinefmt#1{\doinlinefmt #1,\finish}
+\long\def\doinlinefmt#1,#2,\finish{%
\def\inlinefmtname{#1}%
\ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
}
@@ -2855,8 +2855,8 @@ end
% well use a command to get a left brace too. We could re-use the
% delimiter character idea from \verb, but it seems like overkill.
%
-\def\inlineraw{\tex \doinlineraw}
-\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
+\long\def\inlineraw{\tex \doinlineraw}
+\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
\def\doinlinerawtwo#1,#2,\finish{%
\def\inlinerawname{#1}%
\ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi
@@ -7802,26 +7802,36 @@ end
\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
\def\ref#1{\xrefX[#1,,,,,,,]}
+%
+\newbox\topbox
+\newbox\printedrefnamebox
+\newbox\printedmanualbox
+%
\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
\unsepspaces
- \def\printedmanual{\ignorespaces #5}%
+ %
\def\printedrefname{\ignorespaces #3}%
- \setbox1=\hbox{\printedmanual\unskip}%
- \setbox0=\hbox{\printedrefname\unskip}%
- \ifdim \wd0 = 0pt
+ \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
+ %
+ \def\printedmanual{\ignorespaces #5}%
+ \setbox\printedmanualbox = \hbox{\printedmanual\unskip}%
+ %
+ % If the printed reference name (arg #3) was not explicitly given in
+ % the @xref, figure out what we want to use.
+ \ifdim \wd\printedrefnamebox = 0pt
% No printed node name was explicitly given.
\expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
- % Use the node name inside the square brackets.
+ % Not auto section-title: use node name inside the square brackets.
\def\printedrefname{\ignorespaces #1}%
\else
- % Use the actual chapter/section title appear inside
- % the square brackets. Use the real section title if we have it.
- \ifdim \wd1 > 0pt
- % It is in another manual, so we don't have it.
+ % Auto section-title: use chapter/section title inside
+ % the square brackets if we have it.
+ \ifdim \wd\printedmanualbox > 0pt
+ % It is in another manual, so we don't have it; use node name.
\def\printedrefname{\ignorespaces #1}%
\else
\ifhavexrefs
- % We know the real title if we have the xref values.
+ % We (should) know the real title if we have the xref values.
\def\printedrefname{\refx{#1-title}{}}%
\else
% Otherwise just copy the Info node name.
@@ -7867,7 +7877,7 @@ end
\iffloat\Xthisreftitle
% If the user specified the print name (third arg) to the ref,
% print it instead of our usual "Figure 1.2".
- \ifdim\wd0 = 0pt
+ \ifdim\wd\printedrefnamebox = 0pt
\refx{#1-snt}{}%
\else
\printedrefname
@@ -7875,21 +7885,46 @@ end
%
% if the user also gave the printed manual name (fifth arg), append
% "in MANUALNAME".
- \ifdim \wd1 > 0pt
+ \ifdim \wd\printedmanualbox > 0pt
\space \putwordin{} \cite{\printedmanual}%
\fi
\else
% node/anchor (non-float) references.
- %
- % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
- % insert empty discretionaries after hyphens, which means that it will
- % not find a line break at a hyphen in a node names. Since some manuals
- % are best written with fairly long node names, containing hyphens, this
- % is a loss. Therefore, we give the text of the node name again, so it
- % is as if TeX is seeing it for the first time.
- \ifdim \wd1 > 0pt
- \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
+ %
+ % If we use \unhbox to print the node names, TeX does not insert
+ % empty discretionaries after hyphens, which means that it will not
+ % find a line break at a hyphen in a node names. Since some manuals
+ % are best written with fairly long node names, containing hyphens,
+ % this is a loss. Therefore, we give the text of the node name
+ % again, so it is as if TeX is seeing it for the first time.
+ %
+ % Cross-manual reference. Only include the "Section ``foo'' in" if
+ % the foo is neither missing or Top. Thus, @xref{,,,foo,The Foo Manual}
+ % outputs simply "see The Foo Manual".
+ \ifdim \wd\printedmanualbox > 0pt
+ % What is the 7sp about? The idea is that we also want to omit
+ % the Section part if we would be printing "Top", since they are
+ % clearly trying to refer to the whole manual. But, this being
+ % TeX, we can't easily compare strings while ignoring the possible
+ % spaces before and after in the input. By adding the arbitrary
+ % 7sp, we make it much less likely that a real node name would
+ % happen to have the same width as "Top" (e.g., in a monospaced font).
+ % I hope it will never happen in practice.
+ %
+ % For the same basic reason, we retypeset the "Top" at every
+ % reference, since the current font is indeterminate.
+ %
+ \setbox\topbox = \hbox{Top\kern7sp}%
+ \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+ \ifdim \wd2 > 7sp
+ \ifdim \wd2 = \wd\topbox \else
+ \putwordSection{} ``\printedrefname'' \putwordin{}\space
+ \fi
+ \fi
+ \cite{\printedmanual}%
\else
+ % Reference in this manual.
+ %
% _ (for example) has to be the character _ for the purposes of the
% control sequence corresponding to the node, but it has to expand
% into the usual \leavevmode...\vrule stuff for purposes of
@@ -7901,7 +7936,7 @@ end
\setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
\ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
}%
- % output the `[mynode]' via a macro so it can be overridden.
+ % output the `[mynode]' via the macro below so it can be overridden.
\xrefprintnodename\printedrefname
%
% But we always want a comma and a space:
diff --git a/Master/texmf/doc/info/dir b/Master/texmf/doc/info/dir
index 9fee1312b94..95e408043f2 100644
--- a/Master/texmf/doc/info/dir
+++ b/Master/texmf/doc/info/dir
@@ -19,8 +19,8 @@ Science
* Asymptote FAQ: (asy-faq). FAQ for Asymptote.
TeX
-* DVI-to-PNG: (dvipng). DVI to Portable Network Graphics (PNG).
-* DVI-to-Postscript: (dvips). Translating TeX DVI files to PostScript.
+* Dvipng: (dvipng). DVI to Portable Network Graphics (PNG).
+* Dvips: (dvips). Translating TeX DVI files to PostScript.
* Eplain: (eplain). Expanding on plain TeX.
* EpsPDF: (epspdf). Portable GUI&cmdline EPS-to-PDF conversion.
* Kpathsea: (kpathsea). File lookup along search paths.
@@ -37,7 +37,6 @@ Individual utilities
* bibtex: (web2c)bibtex invocation. Managing bibliographies.
* dmp: (web2c)dmp invocation. Troff->MPX (MetaPost pictures).
* dvicopy: (web2c)dvicopy invocation. Virtual font expansion.
-* dvips: (dvips)Invoking Dvips. DVI-to-PostScript translator.
* dvitomp: (web2c)dvitomp invocation. DVI to MPX (MetaPost pictures).
* dvitype: (web2c)dvitype invocation. DVI to human-readable text.
* gftodvi: (web2c)gftodvi invocation. Generic font proofsheets.
diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.tex b/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
index 6cc17594483..a3df16208d3 100644
--- a/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
+++ b/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
@@ -1064,9 +1064,14 @@ specify a particular \CTAN\ mirror from the list at
\dirname{tlnet} subdir on that mirror, as shown above.
-\htmlanchor{xetexfontconfig}
-\subsubsection{Font configuration for \XeTeX}
-\label{sec:font-conf-xetex}
+\htmlanchor{xetexfontconfig} % keep historical anchor working
+\htmlanchor{sysfontconfig}
+\subsubsection{System font configuration for \XeTeX\ and Lua\TeX}
+\label{sec:font-conf-sys}
+
+\XeTeX\ and Lua\TeX\ can use any font installed on the system, not just
+those in the \TeX\ trees. They do these via related but not identical
+methods.
On Windows, fonts shipped with \TL\ are made available to \XeTeX\
automatically. But if you have installed the \filename{xetex} package
@@ -1096,7 +1101,9 @@ you can do the following:
\item Run \Ucom{fc-cache -fv}.
\end{enumerate*}
-You can run \code{fc-list} to see the names of the system fonts.
+You can run \code{fc-list} to see the names of the system fonts. The
+incantation \code{fc-list : family style file spacing} (all arguments
+are literal strings) shows generally interesting information.
\subsubsection{\ConTeXt{} Mark IV}
@@ -1284,10 +1291,12 @@ This is XeTeX, Version 3.1415926\dots
Output written on opentype-info.pdf (1 page).
Transcript written on opentype-info.log.
\end{alltt}
+(Or the same for \filename{luatex}.)
+
If you get an error message saying ``Invalid fontname `Latin Modern
Roman/ICU'\dots'', then you need to configure your system so that
\XeTeX{} can find the fonts shipped with \TL. See
-Section~\ref{sec:font-conf-xetex}.
+Section~\ref{sec:font-conf-sys}.
\end{enumerate}