diff options
Diffstat (limited to 'Master/texmf-dist/source/latex')
175 files changed, 7179 insertions, 23209 deletions
diff --git a/Master/texmf-dist/source/latex/base/alltt.dtx b/Master/texmf-dist/source/latex/base/alltt.dtx index 96f4710c91c..92461034c7d 100644 --- a/Master/texmf-dist/source/latex/base/alltt.dtx +++ b/Master/texmf-dist/source/latex/base/alltt.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -63,6 +63,7 @@ % revised \filedate.}} % \author{Johannes Braams} % \date{\filedate} +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \begin{abstract} diff --git a/Master/texmf-dist/source/latex/base/alltt.ins b/Master/texmf-dist/source/latex/base/alltt.ins index 5239993efa4..1995a9d13f4 100644 --- a/Master/texmf-dist/source/latex/base/alltt.ins +++ b/Master/texmf-dist/source/latex/base/alltt.ins @@ -5,31 +5,31 @@ %% %% Copyright 1993-2014 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/autoload.ins b/Master/texmf-dist/source/latex/base/autoload.ins deleted file mode 100644 index 782b3a0dd37..00000000000 --- a/Master/texmf-dist/source/latex/base/autoload.ins +++ /dev/null @@ -1,148 +0,0 @@ -%% -%% This file will generate fast loadable files and documentation -%% driver files from the doc files in this package when run through -%% LaTeX or TeX. -%% -%% Copyright 1993-2014 -%% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% -%% This file is part of the LaTeX base system. -%% ------------------------------------------- -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3b -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -%% -%% This file has the LPPL maintenance status "maintained". -%% -%% In particular, NO PERMISSION is granted to modify the contents of this -%% file since it contains the legal notices that are placed in the files -%% it generates. -%% -%% The list of all files belonging to the LaTeX base distribution is -%% given in the file `manifest.txt'. See also `legal.txt' for additional -%% information. -%% -%% -%% -%% -%% --------------- start of docstrip commands ------------------ -%% - -\input docstrip - -\keepsilent -\declarepreamble\mainpreamble - -This is a generated file. - -Copyright 1993-2014 -The LaTeX3 Project and any individual authors listed elsewhere -in this file. - -This file was generated from file(s) of the LaTeX base system. --------------------------------------------------------------- - -It may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either version 1.3c -of this license or (at your option) any later version. -The latest version of this license is in - http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX -version 2005/12/01 or later. - -This file has the LPPL maintenance status "maintained". - -This file may only be distributed together with a copy of the LaTeX -base system. You may however distribute the LaTeX base system without -such generated files. - -The list of all files belonging to the LaTeX base distribution is -given in the file `manifest.txt'. See also `legal.txt' for additional -information. - -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with -extension .ins) which are part of the distribution. -\endpreamble -\usepreamble\mainpreamble -\usedir{tex/latex/base} - -\generate{ - \file{latexa.ltx}{% - \from{ltdirchk.dtx}{initex,2ekernel,dircheck} - \from{ltplain.dtx}{autoload} - \from{ltvers.dtx}{2ekernel,autoload} - \from{ltdefns.dtx}{2ekernel,autoload} - \from{ltalloc.dtx}{2ekernel} - \from{ltcntrl.dtx}{2ekernel} - \from{lterror.dtx}{autoload} - \from{ltpar.dtx}{2ekernel} - \from{ltspace.dtx}{2ekernel} - \from{ltlogos.dtx}{2ekernel} - \from{ltfiles.dtx}{autoload} - \from{ltoutenc.dtx}{autoload} - \from{ltfssbas.dtx}{autoload} - \from{ltfsstrc.dtx}{autoload} - \from{ltfsscmp.dtx}{compat,2ekernel} - \from{ltfssdcl.dtx}{autoload} - \from{ltfssini.dtx}{compat} - \from{ltfntcmd.dtx}{2ekernel} - \from{ltcounts.dtx}{2ekernel} - \from{ltpageno.dtx}{2ekernel} - \from{ltxref.dtx}{2ekernel} - \from{ltlength.dtx}{2ekernel} - \from{ltmiscen.dtx}{2ekernel} - \from{ltmath.dtx}{2ekernel} - \from{ltlists.dtx}{2ekernel} - \from{ltboxes.dtx}{2ekernel} - \from{lttab.dtx}{autoload} - \from{ltpictur.dtx}{autoload} - \from{ltthm.dtx}{2ekernel} - \from{ltsect.dtx}{2ekernel} - \from{ltfloat.dtx}{2ekernel} - \from{ltidxglo.dtx}{2ekernel} - \from{ltbibl.dtx}{2ekernel} - \from{ltpage.dtx}{2ekernel} - \from{ltoutput.dtx}{autoload} - \from{ltclass.dtx}{2ekernel} - \from{ltfinal.dtx}{2ekernel}} - \file{autopict.sty}{% - \from{ltpictur.dtx}{def}} - \file{autotabg.sty}{% - \from{lttab.dtx}{def}} - \file{autoerr.sty}{% - \from{ltplain.dtx}{autoerr} - \from{lterror.dtx}{def} - \from{ltfiles.dtx}{autoerr} - \from{ltoutenc.dtx}{autoerr} - \from{ltfssbas.dtx}{autoerr} - \from{ltfssdcl.dtx}{autoerr}} - \file{autofss1.sty}{% - \from{ltfssbas.dtx}{def1} - \from{ltfsstrc.dtx}{def1}} -% This one is disabled at present. -% \file{autofss2.sty}}{% -% \from{ltfssbas.dtx}{def2} -% \from{ltfsstrc.dtx}{def2}} - \file{autoout1.sty}{% - \from{ltoutput.dtx}{def1}} -} - - -\Msg{} -\Msg{***********************************} -\Msg{*} -\Msg{* Now run INITEX on latexa.ltx} -\Msg{* to generate the auto-load version} -\Msg{* of LaTeX.} -\Msg{*} -\Msg{***********************************} -\Msg{} - -\endbatchfile diff --git a/Master/texmf-dist/source/latex/base/cfgguide.tex b/Master/texmf-dist/source/latex/base/cfgguide.tex deleted file mode 100644 index e47659fde92..00000000000 --- a/Master/texmf-dist/source/latex/base/cfgguide.tex +++ /dev/null @@ -1,561 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% -% This file is part of the LaTeX base system. -% ------------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This file has the LPPL maintenance status "maintained". -% -% The list of all files belonging to the LaTeX base distribution is -% given in the file `manifest.txt'. See also `legal.txt' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% -% \fi -% Filename: cfgguide.tex - -\NeedsTeXFormat{LaTeX2e}[1995/12/01] - -\documentclass{ltxguide}[1995/11/28] - -\newcommand{\filesection}[1]{\subsection{\sffamily{#1}}} -\newcommand{\iniTeX}{ini\TeX} - -\setcounter{secnumdepth}{0} - -\title{Configuration options for \LaTeXe} - -\author{\copyright~Copyright 1998, 2001, 2003 \LaTeX3 Project Team.\\ - All rights reserved.} - -\date{14 February 2003} - -\begin{document} - -\maketitle - -\tableofcontents - -\newpage - -\section{Configuring \LaTeX} - -Since one of the main aims of the new standard \LaTeX{} is to give all -users the freedom provided by a reliable document processing system -linked to a highly portable document format, the number of -configuration possibilities is strictly limited. The reasons for this -are explained in more detail in the article -\textit{Modifying \LaTeX{}} in the file \texttt{modguide.tex}. -An important consequence of this is that any document that relies on -any extension package must declare this package within the document -file; this helps to ensure that the document will work at a different -site, where the \LaTeX{} system may be configured differently. - -Local configuration options are, by convention, placed in -`configuration files', which have extension |.cfg|. This document -describes the possibilities for configuration in this release of -\LaTeX; it also explains how to configure the font definition files to -take advantage of the available fonts. - -The last section considers briefly how to proceed if you require -further customisation of the formatter. - - -\section{System configuration} - -\filesection{texsys.cfg} - -This is the only configuration file that \emph{must} be present. -During installation, if \LaTeX\ cannot find a file with this name -then a default file |texsys.cfg|, consisting entirely of comments, is -written out and used. Note that, until this file has been read, -\LaTeX{} is not able to test reliably whether a given file exists on -the system. - -The contents of the file |texsys.cfg| allow \LaTeX{} to cope with -various differences between the behaviours of different \TeX{} systems, -mainly in relation to file handling. The default version of this file -contains, in its comments, possible settings that may be needed for a -range of \TeX{} systems. For more information, typeset the file -|ltdirchk.dtx|. - -If you have copied your \LaTeX{} installation from a computer that -used a different operating system then you may well have a version of -|texsys.cfg| that will make it difficult to install \LaTeX{} on your -system. If this happens then start the process again with an empty -|texsys.cfg| file; this will produce an installation that should, at -least, allow you to typeset the documentation. However, it is -possible that \LaTeX{} can still find only those files that are in the -current directory; in this case you must set the macro |\input@path| -correctly for your system. - - -\section{Configuring the \LaTeX\ format} - -There are four configuration files that enable personal preferences to -be incorporated into the \LaTeX{} format file |latex.fmt|. The range -of preferences that can be configured by these files is strictly -limited as this helps to ensure document portability. - -All four files work in the same way: if the file \m{file}|.cfg| is -found, it will be input by \iniTeX; otherwise a default file -\m{file}|.ltx| will be input; this is sometimes done via a -minimal \m{file}|.cfg| that simply inputs \m{file}|.ltx|. Thus, -providing your own version of any of these |.cfg| files can completely -override any settings in the corresponding default standard |.ltx| -file. - - -\subsection{Font configuration} - -Before you even think about configuring the font declarations by -producing a file |fontmath.cfg| or |fonttext.cfg|, you should -read the documented file |fontdef.dtx|. This is the source file from -which the default files |fonttext.ltx| and |fontmath.ltx| are -produced; it contains information concerning the -contents of the default files and what sort of customisation is -possible. In particular, it describes in detail the effects of -individual customisations on document portability including: which -customisations can be made without endangering the ability to exchange -documents with other sites (even if the formatting differs); and which -things should be left untouched because they will make your system so -different from others that the documents it produces will be -non-portable. - -\textbf{WARNING } Please note that use of either of these font -configuration files has the following consequences. - \begin{itemize} - \item Since the content of the file |fontdef.dtx| \emph{might} - change in the future, anyone writing a font configuration file - must be prepared to update it for use with future releases. - \item Documents produced on your system are likely, at best, to be - portable only in the sense of being processable at a different - site---the actual formatting will not be the same if different - fonts are used. - \item The \LaTeX3 project team will not be able to support you in - diagnosing problems if these cannot be reproduced with a format - that does not use any configuration files. - \end{itemize} - -\filesection{fonttext.cfg} - -The file |fonttext.cfg| can contain declarations relating to the use -of fonts in text modes. - -If it exists, it defines which font shapes, families and encodings are -normally used in text mode, as well as the behavior of font attribute -commands such as |\textbf| etc. - -It could be used, for example, to produce a \LaTeX\ format that, by -default, typesets documents using Times fonts. Be warned, however, -that such customisation can have unfortunate consequences; so please -read carefully this section and the file |fontdef.dtx| below if you -are thinking of doing this. - -Please note carefully the above \textbf{warning}. - -\filesection{fontmath.cfg} - -The file |fontmath.cfg| can contain declarations relating to the use -of fonts in math mode. - -If it exists, it defines which fonts in which sizes are used in math -mode, and how they are used. It also defines all the math mode -commands that `are likely to' depend on the choice of math fonts used -(e.g.~commands that depend on the position of a glyph in a math font). - -The main reason for the existence of this file is to provide for future -updates when a standard math font encoding is available. Right now we -do \emph{not} encourage the use of this configuration file other than -for special applications. Writing a proper configuration file for math -mode needs expert knowledge! - -Please note carefully the above \textbf{warning}. - -\filesection{preload.cfg} - -The contents of the file |preload.cfg| can control the preloading of -commonly used fonts. Preloading fonts speeds up the processing of -documents but, because fonts cannot be `unloaded', you should not -preload too many; otherwise you may be unable to process documents -requiring unusual font families. - -The default file |preload.ltx| is produced from |preload.dtx|. It -loads only a few fonts and these are a good choice if you normally use -documents at the default, 10\,pt, size. If you normally use 11\,pt -or~12\,pt then the time for \LaTeX\ to startup may be noticeably -decreased if you preload the corresponding fonts for the sizes you -use. Similarly, if you normally use a different font family, for -example Times Roman (|ptm|) then you may want to preload fonts in this -family rather than the default Computer Modern fonts. - -\subsection{Hyphenation configuration} - -\filesection{hyphen.cfg} - -In order to hyphenate text, \TeX{} must have hyphenation patterns and, -since these patterns can be loaded only by \iniTeX, the choice of -which patterns to load must be made when the format is created. - -The hyphenation patterns for American English are stored in the file -named |hyphen.tex|; \LaTeX~2.09 always loaded this file when its -format was made. - -With \LaTeXe{} it is possible to configure which hyphenation patterns -are to be loaded into the format. When \iniTeX{} is processing -|latex.ltx|, it looks for a file called |hyphen.cfg|; this file can -be used to control which hyphenation patterns are loaded. If a file -|hyphen.cfg| cannot be found then \iniTeX{} will load the file -|hyphen.ltx|. - -The file |hyphen.ltx| loads the file |hyphen.tex| if it can find it; -otherwise it stops with an error since a format with no hyphenation -patterns is not very useful. It then sets |\language=0| and it sets -the values |\lefthyphenmin=2| and |\righthyphenmin=3|, which are -needed for American English. - -Thus, if you want any other patterns to be loaded then you should -create a file |hyphen.cfg|. For each language for which you wish to -load hyphenation patterns this file should: -\begin{itemize} -\item set |\language=|\m{number}; -\item load the file which contains the hyphenation patterns for that - language. -\end{itemize} -If the patterns you use require some definitions or assignments then -a group should be used to keep such changes local to their file. - -\textbf{Note.} The hyphenation files that are read in should \emph{only} -set the hyphenation tables for the language, using the commands -|\hyphenation| and |\patterns|. In particular they should make no -assignments to the lowercase/uppercase tables (|\lccode| and -|\uccode|) and should not make any global command definitions to be -used after the file has been read. Unfortunately some older -hyphenation files do contain such settings; thus they are -\emph{incompatible} with the mechanisms \LaTeX\ uses to ensure -independence of input and output encodings. - -After this the file |hyphen.cfg| should: -\begin{itemize} -\item set |\language| to its default value; -\item set |\lefthyphenmin| and |\righthyphenmin| to the correct values - for this default language. -\end{itemize} - -There are packages available, such as `french', that can help you with -this configuration. The `babel' collection contains many examples of -setting up a multi-lingual \LaTeX{} format. The documentation in -|lthyphen.dtx| (the source file for |hyphen.ltx|) also contains some -useful examples. - -[We intend in a future release of \LaTeX{} to provide a set of -standard commands for use in configuring hyphenation.] - - -\section{Configuring the font definition files} - -If you have special fonts available (or if some fonts are unavailable) -at your site then you may need to produce customised versions of the -font definition files; these have extension \texttt{.fd} and are read -by \LaTeX{} to obtain information about the font files installed at your -system and when to load them. - -Although we do not encourage such customisation, you will find -information about the content of these files and its syntax in the -documented source file \texttt{cmfonts.fdd} and -\textit{\LaTeXe{} font selection} in the file \texttt{fntguide.tex}. -[We hope to be able to provide further information and examples on -this subject at some time in the future.] - -Please note that the use of customised font definition files has the -following consequences. - \begin{itemize} - \item Documents produced on your system will, at best, to be - portable only in the sense of being processable at a different - site---the actual formatting will not be the same if different - fonts are used. - \item The \LaTeX3 project team will not be able to support you in - diagnosing problems if these cannot be reproduced with a format - that does not use any customised font definition files. - \end{itemize} - -Please also note that the whilst licence conditions on the standard -font definition files allow you to produce a customised version for -your own use, they do not allow you to distribute such a customised -font definition file under the original file name! - - -\subsection*{Note to system administrators} - -If you install a version of \LaTeX{} with a locally configured font -set-up then this system is likely to produce documents that are no -longer `formatting compatible'; for example, the use of different -default fonts will most likely produce different line and page breaks. -If you do install, on a multi-user system, a system that is configured -in such a way that it is not `formatting compatible' then you should -consider carefully the needs of users who need to create portable -documents. A good way to provide for their needs is to make -available, in addition, a standard form of \LaTeX{} without any -`formatting incompatible' customisations. - - -\section{Configuring compatibility mode} - -When processing documents that begin with |\documentstyle|, \LaTeXe{} -tries to emulate the old \LaTeX~2.09 system as far as possible. - -\filesection{latex209.cfg} - -Whenever a \LaTeX{} document starts with |\documentstyle|, rather than -with |\documentclass|, \LaTeX{} assumes that it is a \LaTeX~2.09 -document and therefore processes it in `compatibility mode'. This -does the following: -\begin{itemize} -\item sets the flag |\@compatibilitytrue|; -\item inputs the file |latex209.def|; -\item inputs the file |latex209.cfg| if it exists. -\end{itemize} - -The \LaTeX~2.09 set-up allowed the format itself to be customised. -When making the format with \iniTeX, the process ended with this -request: -\begin{quote}\tt - Input any local modifications here. -\end{quote} - -If your site did input any modifications at that point then the -\LaTeXe{} `compatibility mode' will not fully emulate \LaTeX~2.09 -\emph{as installed at your site}. In this case you should put all -these `local modifications' into a file called |latex209.cfg| and put -this file in the default input path at your site. These `local -modifications', although not stored in the format, will then be loaded -before any old-style document is processed. This should ensure that -you can continue to process any old documents that made use of this -local customisation. - - -\section[Configuration files for standard packages and classes]% - {Configuration files for standard packages\\ and classes} - -Most of the packages in the distribution do not have any associated -configuration files. The exceptions are listed here. - -\filesection{sfonts.cfg} - -The file |sfonts.cfg| can contain declarations relating to the use of -fonts in the slides class. -If it exists, it is read instead of the file |sfonts.def|. - -Please note that use of this configuration file has the following -consequences. - \begin{itemize} - \item Since the font set-up for slides has not yet been revised to - fit modern usage, the content of this file should be completely - updated sometime. Thus anyone writing such a configuration - file must be prepared to update it for use with future releases. - \item Documents are portable only in the sense of being processable - at a different site---the actual formatting will not be the same - if different fonts are used. - \item The \LaTeX3 project team will not be able to support you in - diagnosing problems if these cannot be reproduced with a format - that does not use this configuration file. - \end{itemize} - - -\filesection{ltnews.cfg} - -The file |ltnews.cfg| can be used to customise some aspects of the -behaviour of the \textsf{ltnews} class; this class is used to typeset -the the one page newsletter accompanying every \LaTeX{} distribution. -If this file is present then it is read in at the beginning of the -file |ltnews.cls|. - - -\filesection{ltxdoc.cfg} - -The file |ltxdoc.cfg| can be used to customise some aspects of the -behaviour of the \textsf{ltxdoc} class; this class is used to typeset -the documented code in the |.dtx| files. If this file is present then -it is read in at the beginning of the file |ltxdoc.cls|. - -As this file is read before the \textsf{article} class is loaded, you -may pass options to \textsf{article}. For example the following line -might be added to |ltxdoc.cfg| to format the documentation for A4 paper -instead of the default US letter paper size. -\begin{quote} -|\PassOptionsToClass{a4paper}{article}| -\end{quote} -You should note however, that even if paper size options are specified, -the \textsf{ltxdoc} class always sets the |\textwidth| parameter to -355\,pt, to enable 72 columns of text to appear in the verbatim code -listings. If you really need to over-ride this you could use: -\begin{quote} -|\AtEndOfClass{\setlength{\textwidth}{ ...}}| -\end{quote} -To set the |\textwidth| to your desired value at the end of the -\textsf{ltxdoc} class. - -By default, most of the |.dtx| documented code files in the -distribution will produce a `description' section followed by full -source listing of the package. If you wish to suppress the source -listings you may add the following line to |ltxdoc.cfg|: -\begin{quote} -|\AtBeginDocument{\OnlyDescription}| -\end{quote} - -The documentation of the \textsf{ltxdoc} package, which may be typeset -from the file |ltxdoc.dtx|, contains more examples of the use of this -configuration file. - -\filesection{ltxguide.cfg} - -The class \textsf{ltxguide} is used by the `guide' documents, such as -this document, in the \LaTeX\ distribution. A configuration file -|ltxguide.cfg| may be used with this class in a way very similar to -the customisation of the \textsf{ltxdoc} class described in the -previous section. - -\section{Configuration for other supported packages} - -The `graphics' bundle of packages needs two configuration files, -primarily to specify the driver used to process the |.dvi| file that -\LaTeX{} produces. More documentation on these files comes with the -graphics bundle but we mention them here for completeness. - -\filesection{graphics.cfg} - Normally this file just specifies a default option, by calling - |\ExecuteOptions|, for example |\ExecuteOptions{dvips}| or - |\ExecuteOptions{textures}|. - - This file is read by the \textsf{graphics} package, and so affects - all the packages in the bundle that are based on \textsf{graphics}: - \textsf{graphicx}, \textsf{epsfig}, \textsf{lscape}. - -\filesection{color.cfg} - Normally this file is identical to |graphics.cfg|. It specifies the - default driver option for the \textsf{color} package. - -\section{Non-standard versions} - -If you feel the need to make a version of \LaTeX{} that differs from -the standard version in ways that are not possible using the above -configuration possibilities, then you should first read -\textit{Modifying \LaTeX{}} in the file |modguide.tex|; this -will probably make you realise that you do not have any such need. - -Thus we are sure that you will never need to create a non-standard -version and, even if you do create one, we hope that you will not -distribute such a version. Nevertheless, you are permitted to do this -provided you take great care to do the following: -\begin{itemize} -\item -respect the conditions in legal.txt and individual files regarding -modification of files and changing the name; - -\item -change all the relevant `|\typeout| banners': i.e.~those produced by -all the non-standard files in your version and by the format; - -\item - ensure that the method used to run your version is clearly - distinguished from that used to run standard \LaTeX{}; e.g.~by using - a command name or menu entry that is clearly different from - \texttt{latex} (or \texttt{LaTeX} etc). -\end{itemize} - -\subsection{Examples} - -Since we have been prompted, despite our misgivings, to document how -to do this by members of the League for Programming Freedom, it seems -appropriate to describe here a possible modification of \LaTeX{} to -produce a system called fsf\TeX. - -To do this, you should create a file called \texttt{fsftex.tex} and -then run it using \iniTeX{} and the standard \LaTeX{} format. - -The contents of the file \texttt{fsftex.tex} should be as shown on -page \pageref{fsfcode}. The particular changes to the \LaTeX{} kernel -that you wish to make need to be added to the file at the position -indicated. You can also choose the extensions you want to use for the -class and package files in your system. - -\newpage -\label{fsfcode} - -\begin{footnotesize} -\begin{verbatim} -% fsftex.tex -% -% iniTEX Source code to make a `fsftex' format. -% -% To make this format on Unix: -% -% initex \&latex fsftex -% -% Then to run the format on file.tex: -% -% tex &fsftex file -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% *** VERY IMPORTANT!!! *** -% Change the typeout banner so users know that they -% are NOT running Standard LaTeX. -\everyjob{\typeout{fsfTeX 1.0 based on LaTeX2e \fmtversion}} -\makeatletter - -% fsfTeX changes some LaTeX internals: -% ... put what you like here ... -\def \fsf@xxxx {Some arbitrary \emph{freely modifiable} code goes here} - -% fsfTeX class files have extension .fcl (this week): -\def \@clsextension {fcl} - -% fsfTeX package files have extension .fsy: -\def \@pkgextension {fsy} - -% Change the file handling so that when a fsfTeX package or class -% is not available, the standard LaTeX file will be read. -% -% For example, \documentclass{article} will load article.fcl if such -% a file exists, but article.cls otherwise. This allows arbitrary -% processing on `article' documents without changing the standard -% article.cls file. - -\let\fsf@missingfileerror\@missingfileerror - -\def\@missingfileerror#1#2{% - \ifx #2\@clsextension - \InputIfFileExists {#1.cls}% - {\wlog {fsfTeX: loading #1.cls rather than #1.#2.}}% - {\fsf@missingfileerror {#1}{#2}}% - \else - \ifx #2\@pkgextension - \InputIfFileExists {#1.sty}% - {\wlog {fsfTeX: loading #1.sty rather than #1.#2.}}% - {\fsf@missingfileerror {#1}{#2}}% - \else - \fsf@missingfileerror {#1}{#2}% - \fi - \fi -} - -\makeatother -\dump -\end{verbatim} -\end{footnotesize} - -\end{document} diff --git a/Master/texmf-dist/source/latex/base/classes.dtx b/Master/texmf-dist/source/latex/base/classes.dtx index 9c906a7044b..da03be2cf7a 100644 --- a/Master/texmf-dist/source/latex/base/classes.dtx +++ b/Master/texmf-dist/source/latex/base/classes.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -239,6 +239,7 @@ % Copyright (C) 1994-97 by Frank Mittelbach \and Johannes Braams % } % \date{\filedate} +% \MaintainedByLaTeXTeam{latex} % \maketitle % \tableofcontents % diff --git a/Master/texmf-dist/source/latex/base/classes.ins b/Master/texmf-dist/source/latex/base/classes.ins index 85ab77e41a0..31170114b9a 100644 --- a/Master/texmf-dist/source/latex/base/classes.ins +++ b/Master/texmf-dist/source/latex/base/classes.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/clsguide.tex b/Master/texmf-dist/source/latex/base/clsguide.tex deleted file mode 100644 index 3a99d1a15fb..00000000000 --- a/Master/texmf-dist/source/latex/base/clsguide.tex +++ /dev/null @@ -1,1874 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% -% This file is part of the LaTeX base system. -% ------------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This file has the LPPL maintenance status "maintained". -% -% The list of all files belonging to the LaTeX base distribution is -% given in the file `manifest.txt'. See also `legal.txt' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% -% \fi -% Filename: clsguide.tex - -\NeedsTeXFormat{LaTeX2e}[1995/12/01] - -\documentclass{ltxguide}[1995/11/28] - -\title{\LaTeXe~for class and package writers} - -\author{Copyright \copyright~1995--2006 The \LaTeX3 Project\\ - All rights reserved} - -\date{15 February 2006} - -\begin{document} - -\maketitle - -\tableofcontents - -\section{Introduction} - -This document is an introduction to writing classes and packages for -\LaTeX{}, with special attention given to upgrading existing -\LaTeX~2.09 packages to \LaTeXe{}. The latter subject is also -covered in an article by Johannes Braams published in TUGboat~15.3. - -\subsection{Writing classes and packages for \LaTeXe} - -\LaTeX{} is a document preparation system that enables the document -writer to concentrate on the contents of their text, without bothering -too much about the formatting of it. For example, chapters are -indicated by |\chapter{<title>}| rather than by selecting 18pt bold. - -The file that contains the information about how to turn logical -structure (like `|\chapter|') into formatting (like `18pt bold ragged -right') is a \emph{document class}. In addition, some features (such -as colour or included graphics) are independent of the document class -and these are contained in \emph{packages}. - -One of the largest differences between \LaTeX~2.09 and \LaTeXe{} is in -the commands used to write packages and classes. In \LaTeX~2.09, -there was very little support for writing |.sty| files, and so writers -had to resort to using low-level commands. - -\LaTeXe{} provides high-level commands for structuring packages. -It is also much easier to build classes and packages on top of each -other, for example writing a local technical report class |cetechr| -(for the Chemical Engineering department) based on |article|. - -\subsection{Overview} - -This document contains an overview of how to write classes and -packages for \LaTeX{}. It does \emph{not} introduce all of the -commands necessary to write packages: these can be found in either -\emph{\LaTeXbook} or \emph{\LaTeXcomp}. But it does describe the new -commands for structuring classes and packages. - -\begin{description} - -\item[Section~\ref{Sec:general}] contains some general advice about - writing classes and packages. It describes the difference between - classes and packages, the command naming conventions, the use of - |doc| and |docstrip|, how \TeX's primitive file and box commands - interact with \LaTeX{}. It also contains some hints about general - \LaTeX{} style. - -\item[Section~\ref{Sec:structure}] describes the structure of classes - and packages. This includes building classes and packages on top of - other classes and packages, declaring options and declaring - commands. It also contains example classes. - -\item[Section~\ref{Sec:commands}] lists the new class and package - commands. - - \item[Section~\ref{Sec:upgrade}] gives detailed advice on how to - upgrade existing \LaTeX~2.09 classes and packages to \LaTeXe{}. - -\end{description} - -\subsection{Further information} - -For a general introduction to \LaTeX{}, including the new features of -\LaTeXe{}, you should read \emph{\LaTeXbook} -by Leslie Lamport~\cite{A-W:LLa94}. - -A more detailed description of the new features of \LaTeX, including an -overview of more than 200 packages and nearly 1000 ready to run examples, is -to be found in \emph{\LaTeXcomp second edition} by Frank Mittelbach and -Michel Goossens~\cite{A-W:MG2004}. - -The \LaTeX{} system is based on \TeX{}, which is -described in \emph{The \TeX book} by Donald E.~Knuth~\cite{A-W:DEK91}. - -There are a number of documentation files which accompany every copy -of \LaTeX{}. A copy of \emph{\LaTeX{} News} will come out with each -six-monthly release of \LaTeX{}, and is found in the files -|ltnews*.tex|. The author's guide \emph{\usrguide} describes the new -\LaTeX{} document features; it is in |usrguide.tex|. The guide -\emph{\fntguide} describes the \LaTeX{} font selection scheme for -class- and package-writers; it is in |fntguide.tex|. Configuring -\LaTeX{} is covered by the guide \emph{\cfgguide} in -\texttt{cfgguide.tex} whilst the philosophy behind our policy on -modifying \LaTeX{} is described in \emph{\modguide} in -\texttt{modguide.tex}. - -The documented source code (from the files used to produce the kernel -format via |latex.ltx|) is now available as -\emph{The \LaTeXe\ Sources}. -This very large document also includes an index of -\LaTeX{} commands. It can be typeset from the \LaTeX{} file -|source2e.tex| in the |base| directory, using the source files and -the class file |ltxdoc.cls| from this directory. - -For more information about \TeX{} and \LaTeX{}, please contact your -local \TeX{} Users Group, or the international \TeX{} Users Group. -Addresses and other details can be found at: -\begin{quote}\small\label{addrs} - \texttt{http://www.tug.org/lugs.html} -\end{quote} - - -\subsection{Policy on standard classes} - -Many of the problem reports we receive concerning the standard classes -are not concerned with bugs but are suggesting, more or less politely, -that the design decisions embodied in them are `not optimal' and -asking us to modify them. - -There are several reasons why we should not make such changes to these -files. -\begin{itemize} -\item - However misguided, the current behaviour is clearly what was - intended when these classes were designed. -\item - It is not good practice to change such aspects of `standard classes' - because many people will be relying on them. -\end{itemize} - -We have therefore decided not to even consider making such -modifications, nor to spend time justifying that decision. This does -not mean that we do not agree that there are many deficiencies in the -design of these classes, but we have many tasks with higher priority -than continually explaining why the standard classes for \LaTeX{} -cannot be changed. - -We would, of course, welcome the production of better classes, or of -packages that can be used to enhance these classes. So your first -thought when you consider such a deficiency will, we hope, be ``what -can I do to improve this?'' - -Similar considerations apply to those parts of the kernel that are -implementing design decisions, many of which should be left to the -class file but are not in the current system. We realise that in such -cases it is much more difficult for you to rectify the problem -yourself but it is also the case that making such changes in the -kernel would probably be a major project for us; therefore such -enhancements will have to wait for \LaTeX3. - -\section{Writing classes and packages} -\label{Sec:writing} - -This section covers some general points concerned with writing -\LaTeX{} classes and packages. - - -\subsection{Old versions} - -If you are upgrading an existing \LaTeX~2.09 style file then we -recommend freezing the 2.09 version and no longer maintaining it. -Experience with the various dialects of \LaTeX{} which existed in the -early 1990's suggests that maintaining packages for different versions -of \LaTeX{} is almost impossible. It will, of course, be necessary -for some organisations to maintain both versions in parallel for some -time but this is not essential for those packages and classes -supported by individuals: they should support only the new standard -\LaTeXe{}, not obsolete versions of \LaTeX{}. - - -\subsection{Using `docstrip' and `doc'} - -If you are going to write a large class or package for \LaTeX{} then -you should consider using the |doc| software which comes with -\LaTeX{}. -\LaTeX{} classes and packages written using this can be -processed in two ways: they can be run through \LaTeX{}, to produce -documentation; and they can be processed with |docstrip|, to produce -the |.cls| or |.sty| file. - -The |doc| software can automatically generate indexes of definitions, -indexes of command use, and change-log lists. It is very useful for -maintaining and documenting large \TeX{} sources. - -The documented sources of the \LaTeX{} kernel itself, and of the -standard classes, etc, are |doc| documents; they are in the |.dtx| -files in the distribution. You can, in fact, typeset the source code -of the kernel as one long document, complete with index, by running -\LaTeX{} on |source2e.tex|. Typesetting these documents uses the -class file |ltxdoc.cls|. - -For more information on |doc| and |docstrip|, consult the files -|docstrip.dtx|, |doc.dtx|, and \emph{\LaTeXcomp}. For examples of its -use, look at the |.dtx| files. - -\subsection{Is it a class or a package?} -\label{Sec:classorpkg} - -The first thing to do when you want to put some new \LaTeX{} commands -in a file is to decide whether it should be a \emph{document class} or a -\emph{package}. The rule of thumb is: -\begin{quote} - If the commands could be used with any document class, then make - them a package; and if not, then make them a class. -\end{quote} - -There are two major types of class: those like |article|, |report| or -|letter|, which are free-standing; and those which are extensions or -variations of other classes---for example, the |proc| document class, -which is built on the |article| document class. - -Thus, a company might have a local |ownlet| class for printing letters -with their own headed note-paper. Such a class would build on top of -the existing |letter| class but it cannot be used with any other -document class, so we have |ownlet.cls| rather than |ownlet.sty|. - -The |graphics| package, in contrast, provides commands for including -images into a \LaTeX{} document. Since these commands can be used -with any document class, we have |graphics.sty| rather than -|graphics.cls|. - - -\subsection{Command names} - -\LaTeX{} has three types of command. - -There are the author commands, such as |\section|, |\emph| and -|\times|: most of these have short names, all in lower case. - -There are also the class and package writer commands: -most of these have long mixed-case names such as the following. -\begin{verbatim} - \InputIfFileExists \RequirePackage \PassOptionsToClass -\end{verbatim} - -Finally, there are the internal commands used in the \LaTeX{} -implementation, such as |\@tempcnta|, |\@ifnextchar| and |\@eha|: -most of these commands contain |@| in their name, which means they -cannot be used in documents, only in class and package files. - -Unfortunately, for historical reasons the distinction between these -commands is often blurred. For example, |\hbox| is an internal -command which should only be used in the \LaTeX{} kernel, whereas -|\m@ne| is the constant $-1$ and could have been |\MinusOne|. - -However, this rule of thumb is still useful: if a command has |@| in -its name then it is not part of the supported \LaTeX{} language---and -its behaviour may change in future releases! If a command is -mixed-case, or is described in \emph{\LaTeXbook}, then you can rely on -future releases of \LaTeXe{} supporting the command. - -\subsection{Box commands and colour} -\label{Sec:colour} - -Even if you do not intend to use colour in your own documents, by -taking note of the points in this section you can ensure that your -class or package is compatible with the |color| package. This may -benefit people using your class or package who have access to colour -printers. - -The simplest way to ensure `colour safety' is to always use \LaTeX{} -box commands rather than \TeX{} primitives, that is use |\sbox| rather -than |\setbox|, |\mbox| rather than |\hbox| and |\parbox| or -the |minipage| environment rather than |\vbox|. -The \LaTeX{} box commands have new options which mean that they are now -as powerful as the \TeX{} primitives. - -As an example of what can go wrong, consider that in -|{\ttfamily <text>}| -the font is restored just \emph{before} the |}|, whereas in the -similar looking construction -|{\color{green} <text>}| -the colour is restored just \emph{after} the final |}|. Normally this -distinction does not matter at all; but consider a primitive \TeX{} -box assignment such as: -\begin{verbatim} - \setbox0=\hbox{\color{green} <text>} -\end{verbatim} -Now the colour-restore occurs after the |}| and so is \emph{not} -stored in the box. Exactly what bad effects this can have depends on -how colour is implemented: it can range from getting the wrong -colours in the rest of the document, to causing errors in the -dvi-driver used to print the document. - -Also of interest is the command |\normalcolor|. This is -normally just |\relax| (i.e., does nothing) -but you can use it rather like |\normalfont| to -set regions of the page such as captions or section headings to the -`main document colour'. - - -\subsection{Defining text and math characters} -\label{Sec:chars} - -Because \LaTeXe{} supports different encodings, definitions of commands -for producing symbols, accents, composite glyphs, etc.\ must be -defined using the commands provided for this purpose and described in -\emph{\fntguide}. This part of the system is still under development -so such tasks should be undertaken with great caution. - -Also, |\DeclareRobustCommand| should be used for encoding-independent -commands of this type. - -Note that it is no longer possible to refer to the math font set-up -outside math mode: for example, neither |\textfont 1| nor -|\scriptfont 2| are guaranteed to be defined in other modes. - - -\subsection{General style} -\label{Sec:general} - -The new system provides many commands designed to help you produce -well-structured class and package files that are both robust and -portable. This section outlines some ways to make intelligent use of -these. - -\subsubsection{Loading other files} -\label{Sec:loading} - -\NEWdescription{1995/12/01} -\LaTeX{} provides these commands: -\begin{verbatim} - \LoadClass \LoadClassWithOptions - \RequirePackage \RequirePackageWithOptions -\end{verbatim} -for using classes or packages inside other classes or packages. We -recommend strongly that you use them, rather than the primitive -|\input| command, for a number of reasons. - -Files loaded with |\input <filename>| will not be listed in the -|\listfiles| list. - -If a package is always loaded with |\RequirePackage...| or |\usepackage| -then, even if its loading is requested several times, it will be -loaded only once. By contrast, if it is loaded with |\input| then it -can be loaded more than once; such an extra loading may waste time and -memory and it may produce strange results. - -If a package provides option-processing then, again, strange results -are possible if the package is |\input| rather than loaded by means of -|\usepackage| or |\RequirePackage...|. - -If the package |foo.sty| loads the package |baz.sty| by use of -|\input baz.sty| then the user will get a warning: -\begin{verbatim} - LaTeX Warning: You have requested package `foo', - but the package provides `baz'. -\end{verbatim} -Thus, for several reasons, using |\input| to load packages is not a -good idea. - -Unfortunately, if you are upgrading the file |myclass.sty| to a class -file then you have to make sure that any old files which contain -|\input myclass.sty| still work. - -This was also true for the standard classes (|article|, |book| and -|report|), since a lot of existing \LaTeX~2.09 document styles contain -|\input article.sty|. The approach which we use to solve this is -to provide minimal files |article.sty|, |book.sty| and |report.sty|, -which simply load the appropriate class files. - -For example, |article.sty| contains just the following lines: -\begin{verbatim} - \NeedsTeXFormat{LaTeX2e} - \@obsoletefile{article.cls}{article.sty} - \LoadClass{article} -\end{verbatim} -You may wish to do the same or, if you think that it is safe to do so, -you may decide to just remove |myclass.sty|. - -\subsubsection{Make it robust} - -We consider it good practice, when writing packages and classes, to use -\LaTeX{} commands as much as possible. - -Thus, instead of using |\def...| we recommend using one of -|\newcommand|, |\renewcommand| or |\providecommand|; |\CheckCommand| is -also useful. Doing this makes -it less likely that you will inadvertently redefine a command, giving -unexpected results. - -When you define an environment, use |\newenvironment| or -|\renewenvironment| instead |\def\foo{...}| and |\def\endfoo{...}|. - -If you need to set or change the value of a \m{dimen} or \m{skip} -register, use |\setlength|. - -To manipulate boxes, use \LaTeX{} commands such as |\sbox|, -|\mbox| and |\parbox| rather than |\setbox|, |\hbox| and |\vbox|. - -Use |\PackageError|, |\PackageWarning| or |\PackageInfo| (or the -equivalent class commands) rather than |\@latexerr|, |\@warning| or -|\wlog|. - -It is still possible to declare options by defining |\ds@<option>| and -calling |\@options|; but we recommend the |\DeclareOption| and -|\ProcessOptions| commands instead. These are more powerful and use -less memory. So rather than using: -\begin{verbatim} - \def\ds@draft{\overfullrule 5pt} - \@options -\end{verbatim} -you should use: -\begin{verbatim} - \DeclareOption{draft}{\setlength{\overfullrule}{5pt}} - \ProcessOptions\relax -\end{verbatim} - -The advantage of this kind of practice is that your code is more -readable and, more important, that it is less likely to break when -used with future versions of \LaTeX{}. - -\subsubsection{Make it portable} - -It is also sensible to make your files are as portable as possible. To -ensure this; they should contain only visible 7-bit text; and the -filenames should contain at most eight characters (plus the three -letter extension). Also, of course, it \textbf{must not} have the -same name as a file in the standard \LaTeX{} distribution, however -similar its contents may be to one of these files. - -It is also useful if local classes or packages have a common prefix, -for example the University of Nowhere classes might begin with |unw|. -This helps to avoid every University having its own thesis class, all -called |thesis.cls|. - -If you rely on some features of the \LaTeX{} kernel, or on a package, -please specify the release-date you need. For example, the package -error commands were introduced in the June 1994 release so, if you use -them then you should put: -\begin{verbatim} - \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\end{verbatim} - -\subsubsection{Useful hooks} - -Some packages and document styles had to redefine the command -|\document| or |\enddocument| to achieve their goal. This is no -longer necessary. You can now use the `hooks' |\AtBeginDocument| and -|\AtEndDocument| (see Section~\ref{Sec:delays}). Again, using these -hooks makes it less likely that your code breaks with future versions -of \LaTeX{}. It also makes it more likely that your package can work -together with someone else's. - -\NEWdescription{1996/12/01} -However, note that code in the |\AtBeginDocument| hook is part of the -preamble. Thus there are restrictions on what can be put there; in -particular, no typesetting can be done. - -\section{The structure of a class or package} -\label{Sec:structure} - -\LaTeXe{} classes and packages have more structure than \LaTeX~2.09 -style files did. The outline of a class or package file is: -\begin{description} -\item[Identification] The file says that it is a \LaTeXe{} package or - class, and gives a short description of itself. -\item[Preliminary declarations] - Here the file declares some commands and can also load - other files. Usually these commands will be just those needed for - the code used in the declared options. -\item[Options] The file declares and processes its options. -\item[More declarations] This is where the file does most of its work: - declaring new variables, commands and fonts; and loading other files. -\end{description} - -\subsection{Identification} - -The first thing a class or package file does is identify itself. -Package files do this as follows: -\begin{verbatim} - \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{<package>}[<date> <other information>] -\end{verbatim} -For example: -\begin{verbatim} - \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{latexsym}[1994/06/01 Standard LaTeX package] -\end{verbatim} -Class files do this as follows: -\begin{verbatim} - \NeedsTeXFormat{LaTeX2e} - \ProvidesClass{<class-name>}[<date> <other information>] -\end{verbatim} -For example: -\begin{verbatim} - \NeedsTeXFormat{LaTeX2e} - \ProvidesClass{article}[1994/06/01 Standard LaTeX class] -\end{verbatim} -\NEWdescription{1998/06/19} -The \m{date} should be given in the form `\textsc{yyyy/mm/dd}' and -must be present if the optional argument is used (this is also true -for the |\NeedsTeXFormat| command). -Any derivation from this syntax will result in low-level \TeX{} -errors---the commands expect a valid syntax to speed up the daily -usage of the package or class and make no provision for the case that -the developer made a mistake! - -This date is checked whenever a user specifies a date in their -|\documentclass| or |\usepackage| command. For example, if you wrote: -\begin{verbatim} - \documentclass{article}[1995/12/23] -\end{verbatim} -then users at a different location -would get a warning that their copy of |article| was out of -date. - -The description of a class is displayed when the class is used. The -description of a package is put into the log file. These descriptions -are also displayed by the |\listfiles| command. The phrase -\texttt{Standard LaTeX} \textbf{must not} be used in the identification -banner of any file other than those in the standard \LaTeX{} -distribution. - - -\subsection{Using classes and packages} - -The first major difference between \LaTeX~2.09 style files and -\LaTeXe{} packages and classes is that \LaTeXe{} supports -\emph{modularity}, in the sense of building files from small -building-blocks rather than using large single files. - -A \LaTeX{} package or class can load a package as follows: -\begin{verbatim} - \RequirePackage[<options>]{<package>}[<date>] -\end{verbatim} -For example: -\begin{verbatim} - \RequirePackage{ifthen}[1994/06/01] -\end{verbatim} -This command has the same syntax as the author command |\usepackage|. -It allows packages or classes to use features provided by other -packages. For example, by loading the |ifthen| package, a package -writer can use the `if\dots then\dots else\dots' commands provided -by that package. - -A \LaTeX{} class can load one other class as follows: -\begin{verbatim} - \LoadClass[<options>]{<class-name>}[<date>] -\end{verbatim} -For example: -\begin{verbatim} - \LoadClass[twocolumn]{article} -\end{verbatim} -This command has the same syntax as the author command |\documentclass|. -It allows classes to be based on the syntax and appearance of another -class. For example, by loading the |article| class, a class writer -only has to change the bits of |article| they don't like, rather than -writing a new class from scratch. - -\NEWfeature{1995/12/01} -The following commands can be used in the common case that you want to -simply load a class or package file with exactly those options that -are being used by the current class. -\begin{verbatim} - \LoadClassWithOptions{<class-name>}[<date>] - \RequirePackageWithOptions{<package>}[<date>] -\end{verbatim} -For example: -\begin{verbatim} - \LoadClassWithOptions{article} - \RequirePackageWithOptions{graphics}[1995/12/01] -\end{verbatim} - -\subsection{Declaring options} - -\NEWdescription{1998/12/01} -The other major difference between \LaTeX~2.09 styles and \LaTeXe{} -packages and classes is in option handling. Packages and classes can -now declare options and these can be specified by authors; for -example, the |twocolumn| option is declared by the |article| class. -Note that the name of an option should contain only those characters -allowed in a `\LaTeX{} name'; in particular it must not contain any -control sequences. - -An option is declared as follows: -\begin{verbatim} - \DeclareOption{<option>}{<code>} -\end{verbatim} -For example, the |dvips| option (slightly simplified) -to the |graphics| package is implemented as: -\begin{verbatim} - \DeclareOption{dvips}{\input{dvips.def}} -\end{verbatim} -This means that when an author writes |\usepackage[dvips]{graphics}|, -the file |dvips.def| is loaded. As another example, the |a4paper| -option is declared in the |article| class to set the |\paperheight| -and |\paperwidth| lengths: -\begin{verbatim} - \DeclareOption{a4paper}{% - \setlength{\paperheight}{297mm}% - \setlength{\paperwidth}{210mm}% - } -\end{verbatim} -Sometimes a user will request an option which the class -or package has not explicitly declared. By default this will produce -a warning (for classes) or error (for packages); this behaviour -can be altered as follows: -\begin{verbatim} - \DeclareOption*{<code>} -\end{verbatim} -For example, to make the package |fred| produce a warning rather than -an error for unknown options, you could specify: -\begin{verbatim} - \DeclareOption*{% - \PackageWarning{fred}{Unknown option `\CurrentOption'}% - } -\end{verbatim} -Then, if an author writes |\usepackage[foo]{fred}|, they will get a -warning \texttt{Package fred Warning: Unknown option `foo'.} As -another example, the |fontenc| package tries to load a file -|<ENC>enc.def| whenever the \m{ENC} option is used. This -can be done by writing: -\begin{verbatim} - \DeclareOption*{% - \input{\CurrentOption enc.def}% - } -\end{verbatim} -\NEWdescription{1998/12/01} -It is possible to pass options on to another package or class, using -the command |\PassOptionsToPackage| or |\PassOptionsToClass| (note -that this is a specialised operation that works only for option -names). For example, to pass every unknown option on to the |article| -class, you can use: -\begin{verbatim} - \DeclareOption*{% - \PassOptionsToClass{\CurrentOption}{article}% - } -\end{verbatim} -If you do this then you should make sure you load the class at some -later point, otherwise the options will never be processed! - -So far, we have explained only how to declare options, not how to -execute them. To process the options with which the file was called, -you should use: -\begin{verbatim} - \ProcessOptions\relax -\end{verbatim} -This executes the \m{code} for each option that was both specified and -declared (see Section~\ref{Sec:commands.options} for details of how -this is done). - -For example, if the |jane| package file contains: -\begin{verbatim} - \DeclareOption{foo}{\typeout{Saw foo.}} - \DeclareOption{baz}{\typeout{Saw baz.}} - \DeclareOption*{\typeout{What's \CurrentOption?}} - \ProcessOptions\relax -\end{verbatim} -and an author writes |\usepackage[foo,bar]{jane}|, then they will see -the messages \texttt{Saw foo.} and \texttt{What's bar?} - -\subsection{A minimal class file} - -Most of the work of a class or package is in defining new commands, or -changing the appearance of documents. This is done in the body of the -package, using commands such as |\newcommand| or |\setlength|. - -\LaTeXe{} provides several new commands to help class and package -writers; these are described in detail in Section~\ref{Sec:commands}. - -There are four things that every class file \emph{must} contain: these -are a definition of |\normalsize|, values for |\textwidth| and -|\textheight| and a specification for page-numbering. So a minimal -document class file\footnote {This class is now in the standard -distribution, as \texttt{minimal.cls}.} looks like this: -\begin{verbatim} - \NeedsTeXFormat{LaTeX2e} - \ProvidesClass{minimal}[1995/10/30 Standard LaTeX minimal class] - \renewcommand{\normalsize}{\fontsize{10pt}{12pt}\selectfont} - \setlength{\textwidth}{6.5in} - \setlength{\textheight}{8in} - \pagenumbering{arabic} % needed even though this class will - % not show page numbers -\end{verbatim} -However, this class file will not support footnotes, marginals, -floats, etc., nor will it provide any of the 2-letter font commands -such as |\rm|; thus most classes will contain more than this minimum! - -\subsection{Example: a local letter class} - -A company may have its own letter class, for setting letters in the -company style. This section shows a simple implementation of such a -class, although a real class would need more structure. - -The class begins by announcing itself as |neplet.cls|. -\begin{verbatim} - \NeedsTeXFormat{LaTeX2e} - \ProvidesClass{neplet}[1995/04/01 NonExistent Press letter class] -\end{verbatim} -Then this next bit passes any options on to the |letter| class, which -is loaded with the |a4paper| option. -\begin{verbatim} - \DeclareOption*{\PassOptionsToClass{\CurrentOption}{letter}} - \ProcessOptions\relax - \LoadClass[a4paper]{letter} -\end{verbatim} -In order to use the company letter head, it redefines the -|firstpage| page style: this is the page style that is used on -the first page of letters. -\begin{verbatim} - \renewcommand{\ps@firstpage}{% - \renewcommand{\@oddhead}{<letterhead goes here>}% - \renewcommand{\@oddfoot}{<letterfoot goes here>}% - } -\end{verbatim} -And that's it! - -\subsection{Example: a newsletter class} - -A simple newsletter can be typeset with \LaTeX{}, using a variant of the -|article| class. -The class begins by announcing itself as |smplnews.cls|. -\begin{verbatim} - \NeedsTeXFormat{LaTeX2e} - \ProvidesClass{smplnews}[1995/04/01 The Simple News newsletter class] - - \newcommand{\headlinecolor}{\normalcolor} -\end{verbatim} -It passes most specified options on to the |article| class: apart from -the |onecolumn| option, which is switched off, and the |green| option, -which sets the headline in green. -\begin{verbatim} - \DeclareOption{onecolumn}{\OptionNotUsed} - \DeclareOption{green}{\renewcommand{\headlinecolor}{\color{green}}} - - \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} - - \ProcessOptions\relax -\end{verbatim} -It then loads the class |article| with the option |twocolumn|. -\begin{verbatim} - \LoadClass[twocolumn]{article} -\end{verbatim} -Since the newsletter is to be printed in colour, it now loads the -|color| package. The class does not specify a device driver option -since this should be specified by the user of the |smplnews| class. -\begin{verbatim} - \RequirePackage{color} -\end{verbatim} -The class then redefines |\maketitle| to produce the title in 72pt -Helvetica bold oblique, in the appropriate colour. -\begin{verbatim} - \renewcommand{\maketitle}{% - \twocolumn[% - \fontsize{72}{80}\fontfamily{phv}\fontseries{b}% - \fontshape{sl}\selectfont\headlinecolor - \@title - ]% - } -\end{verbatim} -It redefines |\section| and switches off section numbering. -\begin{verbatim} - \renewcommand{\section}{% - \@startsection - {section}{1}{0pt}{-1.5ex plus -1ex minus -.2ex}% - {1ex plus .2ex}{\large\sffamily\slshape\headlinecolor}% - } - - \setcounter{secnumdepth}{0} -\end{verbatim} -It also sets the three essential things. -\begin{verbatim} - \renewcommand{\normalsize}{\fontsize{9}{10}\selectfont} - \setlength{\textwidth}{17.5cm} - \setlength{\textheight}{25cm} -\end{verbatim} -In practice, a class would need more than this: it would provide -commands for issue numbers, authors of articles, page styles and so -on; but this skeleton gives a start. The |ltnews| class file is not -much more complex than this one. - -\section{Commands for class and package writers} -\label{Sec:commands} - -This section describes briefly each of the new commands for class and -package writers. To find out about other aspects of the new system, -you should also read \emph{\LaTeXbook}, \emph{\LaTeXcomp} and -\emph{\usrguide}. - -\subsection{Identification} - -The first group of commands discussed here are those used -to identify your class or package file. - -\begin{decl} -|\NeedsTeXFormat| \arg{format-name} \oarg{release-date} -\end{decl} -This command tells \TeX{} that this file should be processed using a -format with name \m{format-name}. You can use the optional argument -\m{release-date} to further specify the earliest release date of the -format that is needed. When the release date of the format is older -than the one specified a warning will be generated. The standard -\m{format-name} is \texttt{LaTeX2e}. The date, if present, must be in -the form \textsc{yyyy/mm/dd}. - -Example: -\begin{verbatim} - \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\end{verbatim} - -\begin{decl} -|\ProvidesClass| \arg{class-name} \oarg{release-info} \\ -|\ProvidesPackage| \arg{package-name} \oarg{release-info} -\end{decl} -This declares that the current file contains the definitions for the -document class \m{class-name} or package \m{package-name}. - -The optional \m{release-info}, if used, must contain: -\begin{itemize} - \item the release date of - this version of the file, in the form \textsc{yyyy/mm/dd}; -\item optionally followed by a space and a short description, possibly - including a version number. -\end{itemize} -The above syntax must be followed exactly so that this information -can be used by |\LoadClass| or |\documentclass| (for classes) or -|\RequirePackage| or |\usepackage| (for packages) to test that the -release is not too old. - -The whole of this \m{release-info} information is displayed by -|\listfiles| and should therefore not be too long. - -Example: -\begin{verbatim} - \ProvidesClass{article}[1994/06/01 v1.0 Standard LaTeX class] - \ProvidesPackage{ifthen}[1994/06/01 v1.0 Standard LaTeX package] -\end{verbatim} - -\begin{decl} - |\ProvidesFile| \arg{file-name} \oarg{release-info} -\end{decl} -This is similar to the two previous commands except that here the full -filename, including the extension, must be given. It is used for -declaring any files other than main class and package files. - -Example: -\begin{verbatim} - \ProvidesFile{T1enc.def}[1994/06/01 v1.0 Standard LaTeX file] -\end{verbatim} - -Note that the phrase \texttt{Standard LaTeX} \textbf{must not} be used -in the identification banner of any file other than those in the -standard \LaTeX{} distribution. - -\subsection{Loading files} -\label{Sec:loadf} - -\NEWfeature{1995/12/01} -This group of commands can be used to create your own document class or -package by building on existing classes or packages. -\begin{decl} - |\RequirePackage| \oarg{options-list} \arg{package-name} - \oarg{release-info}\\ - |\RequirePackageWithOptions| \arg{package-name} - \oarg{release-info} -\end{decl} -Packages and classes should use these commands to load other packages. - -The use of |\RequirePackage| is the same as the author command -|\usepackage|. - -Examples: -\begin{verbatim} - \RequirePackage{ifthen}[1994/06/01] - \RequirePackageWithOptions{graphics}[1995/12/01] -\end{verbatim} - -\begin{decl} - |\LoadClass| \oarg{options-list} \arg{class-name} - \oarg{release-info}\\ - |\LoadClassWithOptions| \arg{class-name} - \oarg{release-info} -\end{decl} -\NEWfeature{1995/12/01} -These commands are for use \emph{only} in class files, they cannot be -used in packages files; -they can be used at most once within a class file. - -The use of|\LoadClass| is the same as -the use of |\documentclass| to load a class file. - -Examples: -\begin{verbatim} - \LoadClass{article}[1994/06/01] - \LoadClassWithOptions{article}[1995/12/01] -\end{verbatim} - -\NEWfeature{1995/12/01} -The two |WithOptions| versions simply load the class (or package) file -with exactly those options that are being used by the current file -(class or package). See below, in \ref{Sec:opmove}, for further -discussion of their use. - - -\subsection{Option declaration} -\label{Sec:commands.options.dec} - -\NEWdescription{1998/12/01} -The following commands deal with the declaration and handling of -options to document classes and packages. Every option name must be a -`\LaTeX{} name'. - -There are some commands designed especially for use within the -\m{code} argument of these commands (see below). - -\begin{decl} - |\DeclareOption| \arg{option-name} \arg{code} -\end{decl} -This makes \m{option-name} a `declared option' of the class or package -in which it is put. - -The \m{code} argument contains the code to be executed if that option -is specified for the class or package; it can contain any valid -\LaTeXe{} construct. - -Example: -\begin{verbatim} - \DeclareOption{twoside}{\@twosidetrue} -\end{verbatim} - -\begin{decl} - |\DeclareOption*| \arg{code} -\end{decl} -This declares the \m{code} to be executed for every option which is -specified for, but otherwise not explicitly declared by, the class or -package; this code is called the `default option code' and it can -contain any valid \LaTeXe{} construct. - -If a class file contains no |\DeclareOption*| then, by default, all -specified but undeclared options for that class will be silently -passed to all packages (as will the specified and declared options for -that class). - -If a package file contains no |\DeclareOption*| then, by default, each -specified but undeclared option for that package will produce an error. - - -\subsection{Commands within option code} -\label{Sec:within.code} - -These two commands can be used only within the \m{code} argument of -either |\DeclareOption| or |\DeclareOption*|. Other commands commonly -used within these arguments can be found in the next few subsections. - -\begin{decl} - |\CurrentOption| -\end{decl} -This expands to the name of the current option. - -\begin{decl} - |\OptionNotUsed| -\end{decl} -This causes the current option to -be added to the list of `unused options'. - -\NEWfeature{1995/06/01} - You can now include hash marks (\texttt{\#}) within these \m{code} - arguments without special treatment (formerly, it had been - necessary to double them). - -\subsection{Moving options around} -\label{Sec:opmove} - -These two commands are also very useful within the \m{code} argument -of |\DeclareOption| or |\DeclareOption*|: -\begin{decl} - |\PassOptionsToPackage| \arg{options-list} \arg{package-name}\\ - |\PassOptionsToClass| \arg{options-list} \arg{class-name} -\end{decl} -The command |\PassOptionsToPackage| passes the option names in -\m{options-list} to package \m{package-name}. -This means that it adds the \m{option-list} to the -list of options used by any future |\RequirePackage| or |\usepackage| -command for package \m{package-name}. - -Example: -\begin{verbatim} - \PassOptionsToPackage{foo,bar}{fred} - \RequirePackage[baz]{fred} -\end{verbatim} -is the same as: -\begin{verbatim} - \RequirePackage[foo,bar,baz]{fred} -\end{verbatim} - -Similarly, |\PassOptionsToClass| may be used in a class file to pass -options to another class to be loaded with |\LoadClass|. - -\NEWdescription{1995/12/01} -The effects and use of these two commands should be contrasted with -those of the following two (documented above, in \ref{Sec:loadf}): -\begin{verbatim} - \LoadClassWithOptions - \RequirePackageWithOptions -\end{verbatim} -The command|\RequirePackageWithOptions| is similar to -|\RequirePackage|, but it always loads the required package with -exactly the same option list as that being used by the current class -or package, rather than with any option explicitly supplied or passed -on by |\PassOptionsToPackage|. - -The main purpose of |\LoadClassWithOptions| is to allow one class to -simply build on another, for example: -\begin{verbatim} - \LoadClassWithOptions{article} -\end{verbatim} -This should be compared with the slightly different construction -\begin{verbatim} - \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} - \ProcessOptions\relax - \LoadClass{article} -\end{verbatim} -As used above, the effects are more or less the same, but the first is -a lot less to type; also the |\LoadClassWithOptions| method runs -slightly quicker. - -If, however, the class declares options of its own then -the two constructions are different. Compare, for example: -\begin{verbatim} - \DeclareOption{landscape}{\@landscapetrue} - \ProcessOptions\relax - \LoadClassWithOptions{article} -\end{verbatim} -with: -\begin{verbatim} - \DeclareOption{landscape}{\@landscapetrue} - \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} - \ProcessOptions\relax - \LoadClass{article} -\end{verbatim} -In the first example, the \textsf{article} class will be loaded with -option |landscape| precisely when the current class is called with -this option. By contrast, in the second example it will never be -called with option \texttt{landscape} as in that case \textsf{article} -is passed options only by the default option handler, but this handler -is not used for |landscape| because that option is explicitly -declared. - -\subsection{Delaying code} -\label{Sec:delays} - -These first two commands are also intended primarily for use within -the \m{code} argument of |\DeclareOption| or |\DeclareOption*|. - -\begin{decl} - |\AtEndOfClass| \arg{code}\\ - |\AtEndOfPackage| \arg{code} -\end{decl} -These commands declare \m{code} that is saved away internally and then -executed after processing the whole of the current class or package -file. - -Repeated use of these commands is permitted: the code in the -arguments is stored (and later executed) in the order of their -declarations. - -\begin{decl} - |\AtBeginDocument| \arg{code}\\ - |\AtEndDocument| \arg{code} -\end{decl} -These commands declare \m{code} to be saved internally and executed -while \LaTeX{} is executing |\begin{document}| or |\end{document}|. - -The \m{code} specified in the argument to |\AtBeginDocument| is -executed near the end of the |\begin{document}| code, \emph{after} the -font selection tables have been set up. It is therefore a useful -place to put code which needs to be executed after everything has been -prepared for typesetting and when the normal font for the document is -the current font. - -\NEWdescription{1995/12/01} -The |\AtBeginDocument| hook should not be used for code that does any -typesetting since the typeset result would be unpredictable. - -The \m{code} specified in the argument to |\AtEndDocument| is -executed at the beginning of the |\end{document}| code, -\emph{before} the final page is finished and before any leftover -floating environments are processed. If some of the \m{code} is to be -executed after these two processes, you should include a |\clearpage| -at the appropriate point in \m{code}. - -Repeated use of these commands is permitted: the code in the -arguments is stored (and later executed) in the order of their -declarations. - -\begin{decl}[1994/12/01] - |\AtBeginDvi| \arg{specials} -\end{decl} -These commands save in a box register things which are written to the -|.dvi| file at the beginning of the `shipout' of the first page of the -document. - -This should not be used for anything that will add any typeset -material to the |.dvi| file. - -Repeated use of this command is permitted. - - -\subsection{Option processing} -\label{Sec:commands.options} - -\begin{decl} - |\ProcessOptions| -\end{decl} -This command executes the \m{code} for each selected option. - -We shall first describe how |\ProcessOptions| works in a package file, -and then how this differs in a class file. - -To understand in detail what |\ProcessOptions| does in a package file, -you have to know the difference between \emph{local} and \emph{global} -options. -\begin{itemize} -\item \textbf{Local options} are those which have been explicitly - specified for this particular package in the \m{options} argument of - any of these: -\begin{quote} - |\PassOptionsToPackage{<options>}| \ |\usepackage[<options>]|\\ - |\RequirePackage[<options>]| -\end{quote} -\item \textbf{Global options} are any other options that are specified - by the author in the \m{options} argument of - |\documentclass[<options>]|. -\end{itemize} -For example, suppose that a document begins: -\begin{verbatim} - \documentclass[german,twocolumn]{article} - \usepackage{gerhardt} -\end{verbatim} -whilst package |gerhardt| calls package |fred| with: -\begin{verbatim} - \PassOptionsToPackage{german,dvips,a4paper}{fred} - \RequirePackage[errorshow]{fred} -\end{verbatim} -then: -\begin{itemize} -\item |fred|'s local options are |german|, |dvips|, |a4paper| - and |errorshow|; -\item |fred|'s only global option is |twocolumn|. -\end{itemize} - -When |\ProcessOptions| is called, the following happen. -\begin{itemize} -\item \emph{First}, for each option so far declared in |fred.sty| - by |\DeclareOption|, it looks to see if that option is either a - global or a local option for |fred|: if it is then the corresponding - code is executed. - - This is done in the order in which these options - were declared in |fred.sty|. -\item \emph{Then}, for each remaining \emph{local} option, the command - |\ds@<option>| is executed if it has been defined somewhere (other - than by a |\DeclareOption|); otherwise, the `default option code' is - executed. If no default option code has been declared then an error - message is produced. - - This is done in the order in which these - options were specified. -\end{itemize} -Throughout this process, the system ensures that the code declared for -an option is executed at most once. - -Returning to the example, if |fred.sty| contains: -\begin{verbatim} - \DeclareOption{dvips}{\typeout{DVIPS}} - \DeclareOption{german}{\typeout{GERMAN}} - \DeclareOption{french}{\typeout{FRENCH}} - \DeclareOption*{\PackageWarning{fred}{Unknown `\CurrentOption'}} - \ProcessOptions\relax -\end{verbatim} -then the result of processing this document will be: -\begin{verbatim} - DVIPS - GERMAN - Package fred Warning: Unknown `a4paper'. - Package fred Warning: Unknown `errorshow'. -\end{verbatim} -Note the following: - -\begin{itemize} -\item the code for the |dvips| option is executed before that for the - |german| option, because that is the order in which they are declared - in |fred.sty|; -\item the code for the |german| option is executed only once, when the - declared options are being processed; -\item the |a4paper| and |errorshow| options produce the warning from - the code declared by |\DeclareOption*| (in the order in which they - were specified), whilst the |twocolumn| option does not: this is - because |twocolumn| is a global option. -\end{itemize} - -In a class file, |\ProcessOptions| works in the same way, except -that: \emph{all} options are local; and the default value for -|\DeclareOption*| is |\OptionNotUsed| rather than an error. - -\NEWdescription{1995/12/01} -Note that, because |\ProcessOptions| has a |*|-form, it is wise to -follow the non-star form with |\relax|, as in the previous examples, -since this prevents unnecessary look ahead and possibly misleading -error messages being issued. - -\begin{decl} - |\ProcessOptions*| \\ - |\@options| -\end{decl} -This is like |\ProcessOptions| but it executes the options in the -order specified in the calling commands, rather than in the order of -declaration in the class or package. For a package this means that the -global options are processed first. - -The |\@options| command from \LaTeX~2.09 has been made equivalent to -this in order to ease the task of updating old document styles to -\LaTeXe{} class files. - -\begin{decl} - |\ExecuteOptions| \arg{options-list} -\end{decl} - -For each option in the \m{options-list}, in order, -this command simply executes the command -|\ds@<option>| (if this command is not defined, then that option is -silently ignored). - -It can be used to provide a `default option list' just before -|\ProcessOptions|. For example, suppose that in a class file you want -to set up the default design to be: two-sided printing; 11pt fonts; -in two columns. Then it could specify: -\begin{verbatim} - \ExecuteOptions{11pt,twoside,twocolumn} -\end{verbatim} - - -\subsection{Safe file commands} - -These commands deal with file input; they ensure that the non-existence -of a requested file can be handled in a user-friendly way. - -\begin{decl} -|\IfFileExists| \arg{file-name} \arg{true} \arg{false} -\end{decl} -If the file exists then the code specified in \m{true} is -executed. - -If the file does not exist then the code specified in \m{false} is -executed. - -This command does \emph{not} input the file. - -\begin{decl} - |\InputIfFileExists| \arg{file-name} \arg{true} \arg{false} -\end{decl} -This inputs the file \m{file-name} if it exists and, immediately -before the input, the code specified in \m{true} is executed. - -If the file does not exist then the code specified in \m{false} is -executed. - -It is implemented using |\IfFileExists|. - - -\subsection{Reporting errors, etc} - -These commands should be used by third party classes and packages to -report errors, or to provide information to authors. - -\begin{decl} - |\ClassError| \arg{class-name} \arg{error-text} \arg{help-text}\\ - |\PackageError| \arg{package-name} \arg{error-text} \arg{help-text} -\end{decl} -These produce an error message. The \m{error-text} is displayed and the -|?| error prompt is shown. If the user types |h|, they will be shown -the \m{help-text}. - -Within the \m{error-text} and \m{help-text}: |\protect| can be used to -stop a command from expanding; |\MessageBreak| causes a line-break; -and |\space| prints a space. - -Note that the \m{error-text} will have a full stop added to it, so do -not put one into the argument. - -For example: -\begin{verbatim} - \newcommand{\foo}{FOO} - \PackageError{ethel}{% - Your hovercraft is full of eels,\MessageBreak - and \protect\foo\space is \foo - }{% - Oh dear! Something's gone wrong.\MessageBreak - \space \space Try typing \space <<return>> - \space to proceed, ignoring \protect\foo. - } -\end{verbatim} -produces this display: -\begin{verbatim} - ! Package ethel Error: Your hovercraft is full of eels, - (ethel) and \foo is FOO. - - See the ethel package documentation for explanation. -\end{verbatim} -If the user types |h|, this will be shown: -\begin{verbatim} - Oh dear! Something's gone wrong. - Try typing <<return>> to proceed, ignoring \foo. -\end{verbatim} - -\begin{decl} - |\ClassWarning| \arg{class-name} \arg{warning-text}\\ - |\PackageWarning| \arg{package-name} \arg{warning-text}\\ - |\ClassWarningNoLine| \arg{class-name} \arg{warning-text}\\ - |\PackageWarningNoLine| \arg{package-name} \arg{warning-text}\\ - |\ClassInfo| \arg{class-name} \arg{info-text}\\ - |\PackageInfo| \arg{package-name} \arg{info-text} -\end{decl} -The four |Warning| commands are similar to the error commands, except -that they produce only a warning on the screen, with no error prompt. - -The first two, |Warning| versions, also show the line number where the -warning occurred, whilst the second two, |WarningNoLine| versions, do -not. - -The two |Info| commands are similar except that they log the -information only in the transcript file, including the line number. -There are no |NoLine| versions of these two. - -Within the \m{warning-text} and \m{info-text}: |\protect| can be used to -stop a command from expanding; |\MessageBreak| causes a line-break; -and |\space| prints a space. -Also, these should not end with a full stop as one is -automatically added. - - -\subsection{Defining commands} -\label{Sec:commands.define} - -\LaTeXe{} provides some extra methods of (re)defining commands that are -intended for use in class and package files. - -\NEWfeature{1994/12/01} -The \texttt{*}-forms of these commands should be used to define -commands that are not, in \TeX{} terms, long. This can be useful for -error-trapping with commands whose arguments are not intended to -contain whole paragraphs of text. - -\begin{decl} - |\DeclareRobustCommand| \arg{cmd} \oarg{num} \oarg{default} - \arg{definition}\\ - |\DeclareRobustCommand*| \arg{cmd} \oarg{num} \oarg{default} - \arg{definition} -\end{decl} -This command takes the same arguments as |\newcommand| but it declares -a robust command, even if some code within the\m{definition} is -fragile. You can use this command to define new robust commands, or -to redefine existing commands and make them robust. A log is put into -the transcript file if a command is redefined. - -For example, if |\seq| is defined as follows: -\begin{verbatim} - \DeclareRobustCommand{\seq}[2][n]{% - \ifmmode - #1_{1}\ldots#1_{#2}% - \else - \PackageWarning{fred}{You can't use \protect\seq\space in text}% - \fi - } -\end{verbatim} -Then the command |\seq| can be used in moving arguments, even though -|\ifmmode| cannot, for example: -\begin{verbatim} - \section{Stuff about sequences $\seq{x}$} -\end{verbatim} - -Note also that there is no need to put a |\relax| before the -|\ifmmode| at the beginning of the definition; this is because the -protection given by this |\relax| against expansion at the wrong time -will be provided internally. - -\begin{decl} - |\CheckCommand| \arg{cmd} \oarg{num} \oarg{default} - \arg{definition}\\ - |\CheckCommand*| \arg{cmd} \oarg{num} \oarg{default} - \arg{definition} -\end{decl} -This takes the same arguments as |\newcommand| but, rather than define -\m{cmd}, it just checks that the current definition of \m{cmd} is -exactly as given by \m{definition}. An error is raised if these -definitions differ. - -This command is useful for checking the state of the system before -your package starts altering the definitions of commands. It allows -you to check, in particular, that no other package has redefined the -same command. - -\subsection{Moving arguments} - -\NEWdescription{1994/12/01} -The setting of protect whilst processing (i.e.~moving) moving arguments -has been reimplemented, as has the method of writing information from -the |.aux| file to other files such as the |.toc| file. Details can -be found in the file |ltdefns.dtx|. - -We hope that these changes will not affect many packages. - -\section{Miscellaneous commands, etc} -\label{Sec:commands.misc} - -\subsection{Layout parameters} - -\begin{decl} -|\paperheight|\\ -|\paperwidth| -\end{decl} -These two parameters are usually set by the class to be the size of -the paper being used. This should be actual paper size, unlike -|\textwidth| and |\textheight| which are the size of the main text -body within the margins. - - -\subsection{Case changing} -\label{sec:case} - -\begin{decl} - |\MakeUppercase| \arg{text} \\ - |\MakeLowercase| \arg{text} -\end{decl} - -\NEWfeature{1995/06/01} -\TeX{} provides two primitives |\uppercase| and |\lowercase| for -changing the case of text. These are sometimes used in document -classes, for example to set information in running heads in all -capitals. - -Unfortunately, these \TeX{} primitives do not change the case of -characters accessed by commands like |\ae| or |\aa|. To overcome this -problem, \LaTeX{} provides two new commands |\MakeUppercase| and -|\MakeLowercase| to do this. - -For example: -\begin{quotation} -\begin{tabular}{rl} - |\uppercase{aBcD\ae\AA\ss\OE}| & \uppercase{aBcD\ae\AA\ss\OE}\\ - |\lowercase{aBcD\ae\AA\ss\OE}| & \lowercase{aBcD\ae\AA\ss\OE}\\ - |\MakeUppercase{aBcD\ae\AA\ss\OE}| & - \MakeUppercase{aBcD\ae\AA\ss\OE}\\ - |\MakeLowercase{aBcD\ae\AA\ss\OE}| & \MakeLowercase{aBcD\ae\AA\ss\OE} -\end{tabular} -\end{quotation} - -The commands |\MakeUppercase| and |\MakeLowercase| themselves are -robust, but they have moving arguments. - -The commands use the \TeX{} primitives |\uppercase| and |\lowercase|, -and so have a number of unexpected `features'. In particular, they -change the case of everything (except characters in the names of -control-sequences) in their text argument: this includes mathematics, -environment names, and label names. - -For example: -\begin{verbatim} - \MakeUppercase{$x+y$ in \ref{foo}} -\end{verbatim} -produces $X+Y$ and the warning: -\begin{verbatim} - LaTeX Warning: Reference `FOO' on page ... undefined on ... -\end{verbatim} -In the long run, we would like to use all-caps fonts rather than any -command like |\MakeUppercase| but this is not possible at the moment -because such fonts do not exist. - -\NEWdescription{1995/12/01} -In order that upper/lower-casing will work reasonably well, and in -order to provide any correct hyphenation, \LaTeXe{} \emph{must} use, -throughout a document, the same fixed table for changing case. -The table used is designed for the font encoding |T1|; this works well -with the standard \TeX{} fonts for all Latin alphabets but will cause -problems when using other alphabets. - -\subsection{The `openany' option in the `book' class} - -\NEWdescription{1996/06/01} -The |openany| option allows chapter and similar openings to -occur on left hand pages. Previously this option affected only -|\chapter| and |\backmatter|. It now also affects -|\part|, |\frontmatter| and |\mainmatter|. - -\subsection{Better user-defined math display environments} - -\begin{decl} - |\ignorespacesafterend| -\end{decl} - -\NEWfeature{1996/12/01} -\NEWdescription{2003/12/01} -Suppose that you want to define an environment for displaying text -that is numbered as an equation. A straightforward way to do this is -as follows: -\begin{verbatim} - \newenvironment{texteqn} - {\begin{equation} - \begin{minipage}{0.9\linewidth}} - {\end{minipage} - \end{equation}} -\end{verbatim} -However, if you have tried this then you will probably have noticed -that it does not work perfectly when used in the middle of a paragraph -because an inter-word space appears at the beginning of the first -line after the environment. - -There is now an extra command (with a very long name) available that -you can use to avoid this problem; it should be inserted as shown here: -\begin{verbatim} - \newenvironment{texteqn} - {\begin{equation} - \begin{minipage}{0.9\linewidth}} - {\end{minipage} - \end{equation} - \ignorespacesafterend} -\end{verbatim} - -This command may also have other uses. - -\subsection{Normalising spacing} - -\begin{decl} - |\normalsfcodes| -\end{decl} - -\NEWfeature{1997/06/01} -This command should be used to restore the normal settings of the -parameters that affect spacing between words, sentences, etc. - -An important use of this feature is to correct a problem, reported by -Donald Arseneau, that punctuation in page headers has always (in all -known \TeX{} formats) been potentially wrong whenever a page break -happens while a local setting of the space codes is in effect. These -space codes are changed by, for example, the command -\verb|\frenchspacing|) and the \textsf{verbatim} environment. - -It is normally given the correct definition automatically in -|\begin{document}| and so need not be explicitly set; however, if it -is explicitly made nonempty in a class file then automatic -default setting will be over-ridden. - - -\section{Upgrading \LaTeX~2.09 classes and packages} -\label{Sec:upgrade} - -This section describes the changes you may need to make when you -upgrade an existing \LaTeX{} style to a package or class but we shall -start in optimistic mode. - -Many existing style files will run with \LaTeXe{} without any -modification to the file itself. When everything is running OK, -please put a note in the newly created package or class file to record -that it runs with the new standard \LaTeX{}; then distribute it to -your users. - -\subsection{Try it first!} -\label{Sec:try-it} - -The first thing you should do is to test your style in `compatibility -mode'. The only change you need to make in order to do this is, -possibly, to change the extension of the file to |.cls|: you should -make this change only if your file was used as a main document style. -Now, without any other modifications, run \LaTeXe{} on a document that -uses your file. This assumes that you have a suitable collection of -files that tests all the functionality provided by your style file. -(If you haven't, now is the time to make one!) - -You now need to change the test document files so that they are -\LaTeXe{} documents: see \emph{\usrguide} for details of how to do -this and then try them again. You have now tried the test documents -in both \LaTeXe{} native mode and \LaTeX~2.09 compatibility mode. - -\subsection{Troubleshooting} -\label{Sec:trouble} - -If your file does not work with \LaTeXe{}, there are two likely -reasons. -\begin{itemize} -\item \LaTeX{} now has a robust, well-defined designer's interface for - selecting fonts, which is very different from the \LaTeX~2.09 - internals. -\item Your style file may have used some \LaTeX~2.09 internal commands - which have changed, or which have been removed. -\end{itemize} - -When you are debugging your file, you will probably need more -information than is normally displayed by \LaTeXe. This is achieved -by resetting the counter |errorcontextlines| from its default value of -$-1$ to a much higher value, e.g.~999. - -\subsection{Accommodating compatibility mode} - -Sometimes an existing collection of \LaTeX~2.09 documents makes it -inconvenient or impossible to abandon the old commands entirely. -If this is the case, then it is possible to accommodate both conventions -by making special provision for documents processed in compatibility -mode. - -\begin{decl} -|\if@compatibility| -\end{decl} -This switch is set when a document begins with |\documentstyle| rather -than |\documentclass|. Appropriate code can be supplied for either -condition, as follows: -\begin{verbatim} - \if@compatibility - <code emulating LaTeX 2.09 behavior> - \else - <code suitable for LaTeX2e> - \fi -\end{verbatim} - - -\subsection{Font commands} - -Some font and size commands are now defined by the document class -rather than by the \LaTeX{} kernel. If you are upgrading a -\LaTeX~2.09 document style to a class that does not load one of the -standard classes, then you will probably need to add definitions for -these commands. - -\begin{decl} - |\rm| |\sf| |\tt| |\bf| |\it| |\sl| |\sc| -\end{decl} -None of these short-form font selection commands are defined in the -\LaTeXe{} kernel. They are defined by all the standard class files. - -If you want to define them in your class file, there are several -reasonable ways to do this. - -One possible definition is: -\begin{verbatim} - \newcommand{\rm}{\rmfamily} - ... - \newcommand{\sc}{\scshape} -\end{verbatim} -This would make the font commands orthogonal; for example -|{\bf\it text}| would produce bold italic, thus: \textbf{\textit{text}}. -It will also make them produce an error if used in math mode. - -Another possible definition is: -\begin{verbatim} - \DeclareOldFontCommand{\rm}{\rmfamily}{\mathrm} - ... - \DeclareOldFontCommand{\sc}{\scshape}{\mathsc} -\end{verbatim} -This will make |\rm| act like |\rmfamily| in text mode (see above) and -it will make |\rm| select the |\mathrm| math alphabet in math mode. - -Thus |${\rm math} = X + 1$| will produce `${\rm math} = X + 1$'. - -If you do not want font selection to be orthogonal then you can -follow the standard classes and define: -\begin{verbatim} - \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} - ... - \DeclareOldFontCommand{\sc}{\normalfont\scshape}{\mathsc} -\end{verbatim} -This means, for example, that |{\bf\it text}| will produce medium -weight (rather than bold) italic, thus: \textit{text}. - -\begin{decl} - |\normalsize| \\ - |\@normalsize| -\end{decl} -The command |\@normalsize| is retained for compatibility with -\LaTeX~2.09 packages which may have used its value; but redefining it -in a class file will have no effect since it is always reset to have -the same meaning as |\normalsize|. - -This means that classes \emph{must} now redefine |\normalsize| rather -than redefining |\@normalsize|; for example (a rather incomplete one): -\begin{verbatim} - \renewcommand{\normalsize}{\fontsize{10}{12}\selectfont} -\end{verbatim} -Note that |\normalsize| is defined by the \LaTeX{} kernel to be an -error message. - -\begin{decl} - |\tiny| |\footnotesize| |\small| |\large|\\ - |\Large| |\LARGE| |\huge| |\Huge| -\end{decl} -None of these other `standard' size-changing commands are defined in -the kernel: each needs to be defined in a class file if you need it. -They are all defined by the standard classes. - -This means you should use |\renewcommand| for |\normalsize| and -|\newcommand| for the other size-changing commands. - - -\subsection{Obsolete commands} - -Some packages will not work with \LaTeXe{}, normally because they relied -on an internal \LaTeX{} command which was never supported and has now -changed, or been removed. - -In many cases there will now be a robust, high-level means of -achieving what previously required low-level commands. Please consult -Section~\ref{Sec:commands} to see if you can now use the \LaTeXe{} -class and package writers commands. - -Also, of course, if your package or class redefined any of the kernel -commands (i.e.~those defined in the files |latex.tex|, |slitex.tex|, -|lfonts.tex|, |sfonts.tex|) then you will need to check it very -carefully against the new kernel in case the implementation has -changed or the command no longer exists in the \LaTeX2e{} kernel. - -Too many of the internal commands of \LaTeX~2.09 have been -re-implemented or removed to be able to list them all here. You must -check any that you have used or changed. - -We shall, however, list some of the more important commands which are -no longer supported. - -\begin{decl} - |\tenrm| |\elvrm| |\twlrm| \dots\\ - |\tenbf| |\elvbf| |\twlbf| \dots\\ - |\tensf| |\elvsf| |\twlsf| \dots\\ - \qquad$\vdots$ -\end{decl} -The (approximately) seventy internal commands of this form are no longer -defined. If your class or package uses them then \emph{please} -replace them with new font commands described in \emph{\fntguide}. - -For example, the command |\twlsf| should be replaced by: -\begin{verbatim} - \fontsize{12}{14}\normalfont\sffamily\selectfont -\end{verbatim} - -Another possibility is to use the |rawfonts| package, described in -\emph{\usrguide}. - -Also, remember that many of the fonts preloaded by \LaTeX~2.09 -are no longer preloaded. - -\begin{decl} - |\vpt| |\vipt| |\viipt| \dots -\end{decl} -These were the internal size-selecting commands in \LaTeX~2.09. -(They can still be used in \LaTeX~2.09 compatibility mode.) -Please use the command |\fontsize| instead: see \emph{\fntguide} for -details. - -For example, |\vpt| should be replaced by: -\begin{verbatim} - \fontsize{5}{6}\normalfont\selectfont -\end{verbatim} - -\begin{decl} - |\prm|, |\pbf|, |\ppounds|, |\pLaTeX| \dots -\end{decl} -\LaTeX~2.09 used several commands beginning with |\p| in order to -provide `protected' commands. For example, |\LaTeX| was defined to be -|\protect\pLaTeX|, and |\pLaTeX| was defined to produce the \LaTeX{} -logo. This made |\LaTeX| robust, even though |\pLaTeX| was not. - -These commands have now been reimplemented using -|\DeclareRobustCommand| -(described in Section~\ref{Sec:commands.define}). -If your package redefined one of the |\p|-commands then you must -remove the redefinition and use |\DeclareRobustCommand| to redefine the -non-|\p| command. - -\begin{decl} -|\footheight|\\ -|\@maxsep|\\ -|\@dblmaxsep| -\end{decl} -These parameters are not used by \LaTeXe{} so they have been removed, -except in \LaTeX~2.09 compatibility mode. Classes should no longer -set them. - -\begin{thebibliography}{1} - -\bibitem{A-W:DEK91} -Donald~E. Knuth. -\newblock {\em The \TeX book}. -\newblock Addison-Wesley, Reading, Massachusetts, 1986. -\newblock Revised to cover \TeX3, 1991. - -\bibitem{A-W:LLa94} -Leslie Lamport. -\newblock {\em {\LaTeX:} A Document Preparation System}. -\newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994. - -\bibitem{A-W:MG2004} -Frank Mittelbach and Michel Goossens. -\newblock {\em The {\LaTeX} Companion second edition}. -\newblock With Johannes Braams, David Carlisle, and Chris Rowley. -\newblock Addison-Wesley, Reading, Massachusetts, 2004. - -\end{thebibliography} - -\newpage -\thispagestyle{empty} - -\section*{\LaTeXe{} Summary sheet: updating old styles} - -Section references below are to \emph{\clsguide}. - -\begin{enumerate} - -\item Should it become a class or a package? - See Section~\ref{Sec:classorpkg} for how to answer this question. - -\item If it uses another style file, then you will need to obtain an - updated version of this other file. Look at Section~\ref{Sec:loading} - for information on how to load other class and package files. - -\item Try it: see Section~\ref{Sec:try-it}. - -\item It worked? Excellent, but there are probably still some things - you should change in order to make your file into a well-structured - \LaTeXe{} file that is both robust and portable. So you should now - read Section~\ref{Sec:writing}, especially~\ref{Sec:general}. You - will also find some useful examples in Section~\ref{Sec:structure}. - - If your file sets up new fonts, font-changing commands or symbols, - you should also read \emph{\fntguide}. - -\item It did not work? There are three possibilities here: - \begin{itemize} - \item error messages are produced whilst reading your file; - \item error messages are produced whilst processing test documents; - \item there are no errors but the output is not as it should be. - \end{itemize} - Don't forget to check carefully for this last possibility. - - If you have got to this stage then you will need to read - Section~\ref{Sec:upgrade} to find the solutions that will make your - file work. -\end{enumerate} - -\end{document} - diff --git a/Master/texmf-dist/source/latex/base/cmextra.ins b/Master/texmf-dist/source/latex/base/cmextra.ins index d8714c26a3f..606519e4e68 100644 --- a/Master/texmf-dist/source/latex/base/cmextra.ins +++ b/Master/texmf-dist/source/latex/base/cmextra.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX @@ -75,43 +80,43 @@ of this file under its original name. \usedir{tex/latex/base} % Concrete font support removed: Use the contributed package available -% from ctan tex-archive/macros/latex/contrib/supported/ccfonts. +% from ctan:macros/latex/contrib/supported/ccfonts. % % \Ask\answer{% % ************************************************************** -% ^^J* +% ^^J* % ^^J* Do you have the Concrete Roman fonts installed on your system, % ^^J* or do you intend to install them? -% ^^J* +% ^^J* % ^^J* If so please answer with `y' otherwise with `n' below. % ^^J* -% ^^J* You can easily redo this installation later in case you +% ^^J* You can easily redo this installation later in case you % ^^J* change your mind. % ^^J**************************************************************} -% +% % {\ifx\answer\y -% +% % \Msg{*** Generating font defs for Cork encoded fonts ***} % \Msg{*** Generating font defs for old TeX Text encoding ***} % \Msg{*** Generating font defs for math italic encoding ***} -% +% % \generate{% % \file{t1ccr.fd}{\from{cmfonts.fdd}{fd,T1ccr}} % \file{ot1ccr.fd}{\from{cmfonts.fdd}{fd,OT1ccr}} % \file{omlccm.fd}{\from{cmfonts.fdd}{fd,OMLccm}}} -% +% % \fi} \Ask\answer{% ************************************************************** - ^^J* + ^^J* ^^J* Do you have the cyrillic fonts from the University of ^^J* Washington installed on your system, ^^J* or do you intend to install them? - ^^J* + ^^J* ^^J* If so please answer with `y' otherwise with `n' below. ^^J* - ^^J* You can easily redo this installation later in case you + ^^J* You can easily redo this installation later in case you ^^J* change your mind. ^^J**************************************************************} diff --git a/Master/texmf-dist/source/latex/base/cmfonts.fdd b/Master/texmf-dist/source/latex/base/cmfonts.fdd index 7e1142b4020..3f9f355ab58 100644 --- a/Master/texmf-dist/source/latex/base/cmfonts.fdd +++ b/Master/texmf-dist/source/latex/base/cmfonts.fdd @@ -1,30 +1,30 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % \CheckSum{295} % @@ -79,6 +79,7 @@ number \fileversion, dated \filedate.}} \date{\filedate}\author{Frank Mittelbach \and Rainer Sch\"opf} \begin{document} +\MaintainedByLaTeXTeam{latex} \maketitle \DocInput{cmfonts.fdd} \end{document} @@ -87,7 +88,7 @@ %\fi % % -% +% % \changes{v2.5e}{1997/06/16}{Replaced reference to DC-fonts by ec % fonts.} % \changes{v2.5c}{1997/05/26}{Removed spaces in and around arguments @@ -106,11 +107,11 @@ % {Dont force T1 hyphenchar to 127. latex/1853} % \changes{v2.4c}{1995/11/07}{Use decimal rather than octal character % specification for \cs{hyphenchar} and \cs{skewchar} so that there is -% no problem with an active quote character.} +% no problem with an active quote character.} % \changes{v2.4a}{1995/10/22}{Added support for new (v1.2) DC fonts % and text companion fonts (TS1 encoding).} % \changes{v2.3d}{1994/11/02}{Added more font substitutions for -% \cs{pounds}.} +% \cs{pounds}.} % \changes{v2.3d}{1994/10/30}{Added OMLcmr.fd and OMScmr.fd.} % \changes{v2.3b}{1994/05/12}{Added \cs{ProvidesFile} commands} % \changes{v2.3a}{1994/05/03}{Included definitions for @@ -513,7 +514,7 @@ %<ec>ecssdc10 }{} % \end{macrocode} -% +% % \begin{macrocode} %<*!new&!ec> %<+T1cmss>%%%%%%%% bold extended series @@ -612,7 +613,7 @@ % % \subsubsection{Computer Modern Variable Typewriter} % -% The Computer Modern Variable Typewriter family is the +% The Computer Modern Variable Typewriter family is the % proportional spaced version of the Computer Modern Typewriter % family. It is implemented as a separate family to allow easy use % in normal text, including changes of shape/series etc if available. @@ -942,7 +943,7 @@ %<-ori> <5><6><7><8><9>cmssdc10% <10><10.95><12><14.4><17.28><20.74><24.88>cmssdc10% }{} - + %<+OT1cmss,Ucmss>%%%%%%%%% bold extended series %<+OT1cmss>\DeclareFontShape{OT1}{cmss}{bx}{n} %<+Ucmss>\DeclareFontShape{U}{cmss}{bx}{n}% @@ -1030,7 +1031,7 @@ % % \subsubsection{Computer Modern Variable Typewriter (\texttt{OT1})} % -% The Computer Modern Variable Typewriter family is the +% The Computer Modern Variable Typewriter family is the % proportional spaced version of the Computer Modern Typewriter % family. It is implemented as a separate family to allow easy use % in normal text, including changes of shape/series etc if available. @@ -1125,7 +1126,7 @@ % % \subsubsection{Computer Modern Roman Math italics} % -% \changes{v2.3d}{1994/10/30}{Added OMLcmr font substitutions pointing +% \changes{v2.3d}{1994/10/30}{Added OMLcmr font substitutions pointing % to OMLcmm. } % \changes{v2.3f}{1995/04/22}{Corrected OMLcmr \cs{skewchar}} % @@ -1152,7 +1153,7 @@ {<->ssub*cmm/b/it}{} %</OMLcmr> % \end{macrocode} -% +% % \subsubsection{Computer Modern Math symbols} % % \changes{v2.3a}{1994/05/02}{Included font definitions for @@ -1173,10 +1174,10 @@ % % \subsubsection{Computer Modern Roman Math symbols} % -% \changes{v2.3d}{1994/10/30}{Added OMScmr font substitutions pointing +% \changes{v2.3d}{1994/10/30}{Added OMScmr font substitutions pointing % to OMScmm. } % -% Some text symbols like `\P' and `\dag' are kept in the OMS encoding, +% Some text symbols like `\P' and `\dag' are kept in the OMS encoding, % so we need font substititutions from OMS/cmr to OMS/cmsy. % \begin{macrocode} %<*OMScmr> diff --git a/Master/texmf-dist/source/latex/base/cmfonts.ins b/Master/texmf-dist/source/latex/base/cmfonts.ins index 5016ea751e2..f708b02f940 100644 --- a/Master/texmf-dist/source/latex/base/cmfonts.ins +++ b/Master/texmf-dist/source/latex/base/cmfonts.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX @@ -93,7 +98,7 @@ of this file under its original name. \file{omscmr.fd}{\from{cmfonts.fdd}{OMScmr}} } - + \ifToplevel{ \Msg{***********************************************************} \Msg{*} @@ -108,6 +113,6 @@ of this file under its original name. \Msg{* Happy TeXing} \Msg{***********************************************************} } - + \endbatchfile diff --git a/Master/texmf-dist/source/latex/base/cyrguide.tex b/Master/texmf-dist/source/latex/base/cyrguide.tex deleted file mode 100644 index e9a163aead6..00000000000 --- a/Master/texmf-dist/source/latex/base/cyrguide.tex +++ /dev/null @@ -1,398 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% -% This file is part of the LaTeX base system. -% ------------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This file has the LPPL maintenance status "maintained". -% -% The list of all files belonging to the LaTeX base distribution is -% given in the file `manifest.txt'. See also `legal.txt' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% -% \fi -\NeedsTeXFormat{LaTeX2e}[1995/12/01] - -\documentclass{ltxguide}[1999/02/28] - -\title{Cyrillic languages support in \LaTeX} - -\author{\copyright~Copyright 1998--1999,\\ Vladimir Volovich, - Werner Lemberg and \LaTeX3 Project Team.\\ All rights reserved.} - -\date{12 March 1999} - -\begin{document} - -\maketitle -\tableofcontents - -\begin{abstract} - This document contains basic information on the Cyrillic setup for - \LaTeX{}: how to get the fonts, how to set them up, how to use - the interface, its interaction with \babel{}, etc. This is only a first - draft of the document and it will probably be modified in future; so - please send in comments on it via the \texttt{latexbug} system - (see below). -\end{abstract} - - -\section{Introduction} - -Most Latin-based European languages were supported in \LaTeX{} by -introducing the~|T1|~font encoding and by using the \textsf{fontenc} -and \textsf{inputenc} packages; these use only standard \TeX{} means -to support any \mbox{8-bit} input encoding and this one standard font -encoding. The restriction to a single font encoding guarantees that -multiple languages can happily coexist in one document (\eg -hyphenation will be correct for all languages). - -Starting with the December~1998 Release, \LaTeX{} finally supports -Cyrillic languages. This support is based on the new standard -Cyrillic \TeX{} font encodings---|T2A|, |T2B|, |T2C|, and~|X2|. The -first three of these satisfy some basic requirements for -\LaTeX{}~|T*|~encodings, and thus can be used in multi-lingual documents -with other languages based on standard font encodings. - -The reason why we need four different Cyrillic font encodings is that -these font encodings support \emph{all} the Cyrillic languages that -have been used during the twentieth century (see -Section~\ref{fontencs})! The number of Cyrillic glyphs is large, so -they cannot be represented with 128~character slots; the other (lower) -128~slots are reserved for Latin letters and other invariant symbols -that are needed for the encoding to be a conformant -\LaTeX{}~\texttt{T}~encoding. - -There are some glyphs in the |T2*|~encodings which do not yet have -associated characters in \emph{Unicode}, the world-wide character -standard. Also, one more font encoding, |T2D|,~is planned for a -forthcoming release of \LaTeX{}. A lot of Cyrillic input encodings -are already supported (see Section~\ref{inputencs}), and additional -encodings could be added easily. - - -\subsection{Acknowledgments} -\label{sec:acks} - -The work on |T2*|~encodings was carried out by the T2~Team, led by -Alexander Berdnikov (other members are Mikhail Kolodin and Andrew -Janishewskii). The LH~fonts were produced by Olga Lapko (with -A.~Khodulev). The \textsf{T2} bundle and \textsf{ruhyphen} package -were written by Werner Lemberg and Vladimir Volovich (except that the -concrete hyphenation patterns which are part of \textsf{ruhyphen} came -from individual authors). The support for the Ukrainian language was -prepared by Andrij Shvaika. - - -\section{Installation} - -The \textsf{fontenc} and \textsf{inputenc} packages are installed -automatically in every base \LaTeX{} distribution. - -All the necessary extra files to use with these packages for Cyrillic -are in the \textsf{cyrillic} bundle, which at present contains the -following: four font encoding definition files (|t2aenc.def|, -|t2benc.def|, |t2cenc.def|, |x2enc.def|); several input encoding -definition files (all the other |*.def| files), and font definition -files (|*.fd|). -The installation of these is described here. - -\subsection{Fonts} - -The default font families in \LaTeX{} are the Computer Modern -families, namely the CM~fonts (|OT1|~encoded) and the EC~fonts -(|T1|~encoded). The LH~fonts, which are now available, provide -Computer Modern fonts for all Cyrillic font encodings. They are -designed to be compatible with the EC~fonts, and they provide the same -font shapes and sizes; they are available at |CTAN:fonts/cyrillic/lh| -(the latest version is 3.20). The installation instructions for the -fonts are in the file |INSTALL| in the font distribution. - -Other fonts, including Type~1 fonts, can also be used, provided that -their encoding (for \TeX{}) is \mbox{|T2|-compatible}. Some -ready-to-use packages supporting such fonts are also available, \eg at -\URL{ftp://ftp.vsu.ru/pub/tex} (they should soon be on \ctan). Currently, -you will find two packages there: \textsf{PsCyr}, which contains some -freely distributable Cyrillic Type~1 fonts with support for \LaTeX{}; -and \textsf{c1fonts}, which contains virtual fonts similar to the -\textsf{AE}~fonts package using the BlueSky and BaKoMa fonts -available from \ctan{} (see the |README| file in that package for -detailed information). Further font packages are expected soon. - -\subsection{Hyphenation patterns} - -You can find a collection of hyphenation patterns for the Russian -language in the \textsf{ruhyphen} package at -|CTAN:language/hyphenation/ruhyphen|. These patterns support the -|T2*|~encodings, as well as other popular font encodings used for -Russian typesetting (including the Omega internal encoding). -Patterns for other Cyrillic languages should be adapted to work with -the |T2*|~encodings. - -\subsection{\babel{} support for Russian and Ukrainian} -\label{bblrus} - -Version~3.6k of \babel{} includes support for the |T2*|~encodings and -for typesetting both Russian and Ukrainian texts using the Cyrillic -letters. The temporary fontencoding |LWN|, which was used in earlier -releases of \babel{}, will be withdrawn in the near future and replaced -by the |OT2| encoding. - -\subsection{Getting pre-built packages} - -Many of the major \TeX{} distributions, such as te\TeX{}, fp\TeX{} and -\TeX{}live, contain (or soon will) everything that is needed, -including the LH~fonts, \textsf{ruhyphen} and the latest version of -\babel{}. We hope that all \TeX{} distributions will soon include all -of these, so that the chances are that you will not need to install -this by yourself (but it is not difficult). - -If you are using em\TeX, Mik\TeX, or fp\TeX, you -can download the \textsf{ruemtex} package from -\URL{ftp://ftp.vsu.ru/pub/tex}. - -\section{Usage} - -Support for Cyrillic is based on these standard \LaTeX{} mechanisms: -the \textsf{fontenc} and \textsf{inputenc} packages (and on \babel{}). -Thus the basic principles for its use are similar to those for other -European languages: you simply add, to your document preamble, lines -like the following. - -\begin{verbatim} -\usepackage[T2A]{fontenc} -\usepackage[koi8-r]{inputenc} -\end{verbatim} - -Here you can put any desired input encoding instead of -\mbox{\texttt{koi8-r}}: for example, it would be \texttt{cp866} if you are -using a MS-DOS text editor with this Cyrillic code page to prepare your -documents, or \texttt{cp1251} if you are a MS~Windows user with Cyrillic -support. A full list of the available Cyrillic encodings can be found in -Section~\ref{inputencs} and in the file |cyinpenc.dtx|. - -Documents are, naturally, not restricted to a single font encoding; -this is essential for multi-lingual journals or documents. Such -changes can be made by using the |\fontencoding| command as part of a -font-change. However, it is best to access these font encodings via a -higher-level interface. - -Since such changes are often closely related to other -language-dependent settings, it is often sensible to use the \babel{} -system, which provides further useful `localisation' and standardised -multi-lingual interfaces (for further details, see -Section~\ref{bblrus}). Then you can use lines like the following in -your document: - -\begin{verbatim} -\usepackage[koi8-r]{inputenc} -\usepackage[russian]{babel} -\end{verbatim} - -This will automatically choose the default font encoding for Russian, -which is |T2A|, if available. Documentation of the complete set of -font-encoding selection rules can be found in |cyrillic.dtx| which is -part of |rusbabel|. - -These \LaTeX{} interfaces are very convenient because they make your -documents completely portable, being based solely on standard \TeX{} -features. This will mean that your documents can be processed on any -\TeX{} system without any need for re-encoding to the `native' -encoding used on each platform; this is because the encoding of the -document is specified in the document itself. - -Moreover, if necessary, more than one input encoding can be used -within a document; this could be useful if, for example, you need to -combine articles prepared by authors on different machines. Each part -of the document is then identified by a |\inputencoding| command, -which can therefore only be used between paragraphs. - -Please note that you must always use the two standard \LaTeX{} -commands, |\MakeUppercase| and |\MakeLowercase| to produce uppercase -or lowercase text in your documents. This is because |\uppercase| and -|\lowercase| will not work at all for Cyrillic (note that these latter -two commands are not, and never have been, available for use directly -in \LaTeX{} documents). - - -\section{Font encodings for Cyrillic languages} -\label{fontencs} - -The Cyrillic font encodings support the following languages. Note -that some languages can be properly typeset with more than one -encoding. - -\begin{itemize} -\raggedright -\item[|T2A|:] - Abaza, Avar, Agul, Adyghei, Azerbaijani, Altai, Balkar, Bashkir, - Bulgarian, Buryat, Byelorussian, Gagauz, Dargin, Dungan, Ingush, - Kabardino-Cherkess, Kazakh, Kalmyk, Karakalpak, Karachaevskii, - Karelian, Kirghiz, Komi-Zyrian, Komi-Permyak, Kumyk, Lak, Lezghin, - Macedonian, Mari-Mountain, Mari-Valley, Moldavian, Mongolian, - Mordvin-Moksha, Mordvin-Erzya, Nogai, Oroch, Osetin, Russian, Rutul, - Serbian, Tabasaran, Tadzhik, Tatar, Tati, Teleut, Tofalar, Tuva, - Turkmen, Udmurt, Uzbek, Ukrainian, Hanty-Obskii, Hanty-Surgut, - Gipsi, Chechen, Chuvash, Crimean-Tatar. -\item[|T2B|:] - Abaza, Avar, Agul, Adyghei, Aleut, Altai, Balkar, Byelorussian, - Bulgarian, Buryat, Gagauz, Dargin, Dolgan, Dungan, Ingush, Itelmen, - Kabardino-Cherkess, Kalmyk, Karakalpak, Karachaevskii, Karelian, - Ketskii, Kirghiz, Komi-Zyrian, Komi-Permyak, Koryak, Kumyk, Kurdian, - Lak, Lezghin, Mansi, Mari-Valley, Moldavian, Mongolian, - Mordvin-Moksha, Mordvin-Erzya, Nanai, Nganasan, Negidal, Nenets, - Nivh, Nogai, Oroch, Russian, Rutul, Selkup, Tabasaran, Tadzhik, - Tatar, Tati, Teleut, Tofalar, Tuva, Turkmen, Udyghei, Uigur, Ulch, - Khakass, Hanty-Vahovskii, Hanty-Kazymskii, Hanty-Obskii, - Hanty-Surgut, Hanty-Shurysharskii, Gipsi, Chechen, Chukcha, Shor, - Evenk, Even, Enets, Eskimo, Yukagir, Crimean Tatar, Yakut. -\item[|T2C|:] - Abkhazian, Bulgarian, Gagauz, Karelian, Komi-Zyrian, Komi-Permyak, - Kumyk, Mansi, Moldavian, Mordvin-Moksha, Mordvin-Erzya, Nanai, - Orok (Uilta), Negidal, Nogai, Oroch, Russian, Saam, Old-Bulgarian, - Old-Russian, Tati, Teleut, Hanty-Obskii, Hanty-Surgut, Evenk, - Crimean Tatar. -\end{itemize} - -The |X2|~encoding was designed to support all the above languages. -Its name does not start with |T| because, for example, it contains no -Latin letters (it is purely a Cyrillic glyph container); it therefore -cannot be used in mixed-script documents along with the other |T*| -encodings. Please consult Section~6.4 \textit{Naming conventions} of -the file |fntguide.tex| in the base \LaTeX{} distribution for details -of the differences between \LaTeX{} font encodings and how they are -named. - -There are two other \LaTeX{} Cyrillic font encodings, |OT2| and |LCY|, -that are not included in the base \LaTeX{} distribution. The first is -a \mbox{7-bit} encoding (hence the |O|) developed by the AMS; it is -useful for typesetting relatively small fragments of text in Cyrillic, -using a Latin transliteration scheme. The other, |LCY|, is an -\mbox{8-bit} Cyrillic encoding which is not compatible with the -requirements for \LaTeX{} |T*|~encodings (hence the |L|); thus it is not -suitable for typesetting multi-lingual documents, but it can be used in -Plain \TeX{}-based macro packages because it is an extension of |OT1|. -These two encodings are supported by \babel{} and by \textsf{ot2cyr}. - - -\section{Input encodings} -\label{inputencs} - -Several Cyrillic code-pages are widely used. Currently, \LaTeX{} -contains support for 20~Cyrillic input encodings (some of which are -variants of each other). - -\begin{itemize} - -\item |cp855| --- the standard \mbox{MS-DOS} Cyrillic code-page. - -\item |cp866| --- the standard \mbox{MS-DOS} Russian code-page. - Several code-pages very similar to this are also supported - (the differences are all in the range 242--254). - \begin{itemize} - \item |cp866av| -- the `Cyrillic Alternative' code-page (an - alternative variant of cp866); - \item |cp866mav| -- the `Modified Alternative Variant'; - \item |cp866nav| -- the `New Alternative Variant'; - \item |cp866tat| -- an experimental Tatarian code-page. - \end{itemize} - -\item |cp1251| --- the standard MS Windows Cyrillic code-page. - -\item \mbox{\texttt{koi8-r}} --- a standard Cyrillic code-page widely - used in UNIX-like systems for Russian language support that is - specified in RFC~1489. The situation with \mbox{\texttt{koi8-r}} is - somewhat similar to that for |cp866|: there are several similar - code-pages which coincide for all Russian letters but add some other - Cyrillic letters. The following are supported: - \begin{itemize} - \item \mbox{\texttt{koi8-u}} -- for Ukrainian; - \item \mbox{\texttt{koi8-ru}} -- this is described in a draft RFC - document specifying a widely used character set for mail and news - exchange in the Ukrainian internet community, as well as for - presenting WWW information resources in the Ukrainian language; - \item |isoir111| -- the \mbox{ISO-IR-111 ECMA} Cyrillic Code Page. - \end{itemize} - -\item |iso88595| --- the \mbox{ISO 8859-5} Cyrillic code-page (also called - \mbox{ISO-IR-144}). - -\item |maccyr| --- the Apple Macintosh Cyrillic code-page (also known - as Microsoft cp10007) and |macukr|, the Apple Macintosh Ukrainian - code-page, very similar to the Cyrillic code-page. - -\item The Mongolian code-pages: |ctt| |dbk| |mnk| |mos| |ncc| |mls|. - These code-pages were taken from Oliver Corff's `Mon\TeX' package - (available at |CTAN:language/mongolian/montex|). Since the |T2*| - encodings support the Mongolian Cyrillic script, it is convenient to - have support for Mongolian input encodings as well. Pointers to - documentation for these code-pages will be much appreciated. - -\end{itemize} - - -\section{Reporting bugs} - -In case you find a bug and want to report it, please follow the -guidelines given in the file |bugs.txt| in the base \LaTeX{} -distributions. Note that there is a category specifically for -reporting any bugs that occur only when using Cyrillic fonts or -support packages. - - -\section{Miscellanea in the \textsf{T2} bundle} -\label{t2m} - -The \textsf{T2}~bundle at |CTAN:macros/latex/contrib/supported/t2| -contains some other useful files, including support for Plain -\TeX{}-based macro packages, support for Bib\TeX{} and MakeIndex (see -also the \textsf{xindy} program and package---highly recommended for -making indices with Cyrillic), support for the \textsf{fontinst} -package, mapping tables relating these Cyrillic font encodings (and -input encodings) to the Unicode character names and slots (these are -in the subdirectory |enc-maps|), and more! - -To produce documented source listings of the \textsf{T2}~package, run -\LaTeX{} on the |*.dtx| and |*.fdd| files therein. - -When typesetting Cyrillic texts, there is a tradition of using -Cyrillic letters (in some situations) within math formul\ae, in -exactly the same way as most of the world uses Latin letters. -By default this does not work, because symbols declared with -|\DeclareTextSymbol| may not be used in math. - -If you need within math to `transparently' typeset glyphs declared in -font encoding definition files, then you could try using the -experimental \textsf{mathtext} package, which is also in the -\textsf{T2}~bundle. Note that this package uses up at least one -additional math alphabet per font encoding. For this and other -reasons, The \LaTeX3 Project Team considers that this experimental -extension to \LaTeX{}'s glyph-handling mechanisms should be used with -caution; but please try it out and send us your opinions and ideas. -Note that it is not included in the core of \LaTeX{} because both the -coding and the interfaces are likely to change at some point in the -future. - -Finally, here are some pointers to further information: - -\begin{quote} - \URL{http://www.cemi.rssi.ru/cyrtug}\\ - \URL{http://xtalk.price.ru/tex} -\end{quote} - -\end{document} diff --git a/Master/texmf-dist/source/latex/base/doc.dtx b/Master/texmf-dist/source/latex/base/doc.dtx index ff04e40869d..be0539c461f 100644 --- a/Master/texmf-dist/source/latex/base/doc.dtx +++ b/Master/texmf-dist/source/latex/base/doc.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -164,9 +164,9 @@ % particularly from \texttt{newdoc}, and % documentation of post-v1.5q features added at v1.7a by Dave % Love (SERC Daresbury Lab). Extraction of \texttt{shortvrb} -% package added by Joachim Schrod (TU~Darmstadt).}\\ -% Gutenberg Universit\"at Mainz} +% package added by Joachim Schrod (TU~Darmstadt).}} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \begin{abstract} @@ -3373,8 +3373,8 @@ % \changes{v2.1b}{2004/02/09}{environment names incorrectly sorted in % index (pr/3615)} % \begin{macrocode} - \index{environments:\levelchar#1\actualchar{\protect\ttfamily#1}\encapchar - usage}\@esphack} + \index{environments:\levelchar#1\actualchar + {\protect\ttfamily#1}\encapchar usage}\@esphack} % \end{macrocode} % Because both entries correspond to `descriptions' of the % environment, we encapsulate the page numbers with the diff --git a/Master/texmf-dist/source/latex/base/docstrip.dtx b/Master/texmf-dist/source/latex/base/docstrip.dtx index 9cc300b15c6..f91d3e965f6 100644 --- a/Master/texmf-dist/source/latex/base/docstrip.dtx +++ b/Master/texmf-dist/source/latex/base/docstrip.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -151,6 +151,7 @@ % % \date{Printed \today} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \begin{abstract} @@ -331,9 +332,9 @@ % \DeclareDir{makeindex}{idxstyle} %\end{verbatim} % This will cause base latex files and font descriptions to be -% written to directory |c:\emtex\texinput\latex2e|, files of -% \texttt{tools} package to |c:\emtex\texinput\tools| and makeindex -% files to |c:\emtex\idxstyle|. +% written to directory |c:\emtex\texinput\latex2e|, files of the +% \texttt{tools} package to be written to |c:\emtex\texinput\tools| +% and makeindex files to |c:\emtex\idxstyle|. % % Sometimes it is desirable to put some files outside of the base % directory. For that reason |\DeclareDir| has a star form @@ -4158,7 +4159,7 @@ for copying and modification in the file \inFileName. % % \begin{macro}{\@setwritedir} % \changes{2.4e}{1996/10/22}{macro added (DPC)} -% The following tests try to automatically set |\WriteToDir|, +% The following tests try to automatically set the macros |\WriteToDir|, % |\dirname| and |\makepathname| in Unix, Mac, or VMS style. % The tests are not run at the top level but held in this macro % so that a configuration file has a chance to define |\WriteToDir| diff --git a/Master/texmf-dist/source/latex/base/docstrip.ins b/Master/texmf-dist/source/latex/base/docstrip.ins index a8da8dcd278..6ca81545ea0 100644 --- a/Master/texmf-dist/source/latex/base/docstrip.ins +++ b/Master/texmf-dist/source/latex/base/docstrip.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -44,9 +44,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -56,7 +61,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -69,8 +74,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/ec.ins b/Master/texmf-dist/source/latex/base/ec.ins index c397daa561f..4b714155404 100644 --- a/Master/texmf-dist/source/latex/base/ec.ins +++ b/Master/texmf-dist/source/latex/base/ec.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX @@ -76,7 +81,7 @@ of this file under its original name. \Msg{*** Generating font defs for Cork encoded and Text Companion fonts ***} - + \generate{ \file{t1cmfib.fd}{ \from{cmfonts.fdd}{fd,T1cmfib,ec}} @@ -126,5 +131,5 @@ of this file under its original name. \Msg{* Happy TeXing} \Msg{***********************************************************} } - + \endbatchfile diff --git a/Master/texmf-dist/source/latex/base/encguide.tex b/Master/texmf-dist/source/latex/base/encguide.tex deleted file mode 100644 index 332368e7585..00000000000 --- a/Master/texmf-dist/source/latex/base/encguide.tex +++ /dev/null @@ -1,1413 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1993-2014 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% -% This file is part of the LaTeX base system. -% ------------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This file has the LPPL maintenance status "maintained". -% -% The list of all files belonging to the LaTeX base distribution is -% given in the file `manifest.txt'. See also `legal.txt' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% -% \fi -% $Id: encguide.tex 5713 2006-01-18 23:29:23Z robin $ -% - - -\NeedsTeXFormat{LaTeX2e}[1995/12/01] - -\documentclass{ltxguide}[1994/11/20] - -\usepackage[T1]{fontenc} -\IfFileExists{lmodern.sty}{\usepackage{lmodern}}{} -\usepackage{textcomp} -\usepackage{url} -\usepackage{mflogo} - -\addtolength\textheight{6\baselineskip} -\addtolength\topmargin{-2\baselineskip} - - -\newcommand\ttverb[1]{\texttt{\string#1}} - - -% for encodings -\providecommand{\Enc}[1]{\texttt{#1}} - -% for packages -\providecommand{\Pkg}[1]{% - \textsf{#1}} - -% for files -\providecommand{\File}[1]{% - \texttt{#1}} - -% let's have meta values too -\providecommand{\meta}[1]{% - \ensuremath{\langle}\emph{#1}\ensuremath{\rangle}} - -\usepackage{tabularx} - -% eine Umgebung zur Darstellung von Kodierungen -% -% Argumente: -% #1: Name in LaTeX (z.B. OT1) -% #2: Name der Kodierung (z.B. TeX text) -% #3: Name des Autors (z.B. Don Knuth) -% #4: Bereich der benützten Glyphindizes -% #5: variable Positionen -% #6: Beispielzeichensatz -% #7: Referenz -% -% XXX add code to handle more than a single font example (e.g., larm1000, -% lbrm1000, and lcrm1000). -% -\newenvironment{encodinginfo}[7]% - {\noindent - \begin{tabularx}{\linewidth}{@{}l>{\raggedright\let\\\tabularnewline}X}% - \LaTeX{} name: & \texttt{#1}\\% - Public name: & #2\\% - Author: & #3\\% - Glyph slots used: & #4\\% - Variable slots: & #5\\% - Font example: & \def\@tempa{#6}\ifx\@tempa\@empty---% - \else\texttt{#6}\referenceftable{#6}\fi\\% - Further reference: & #7% - \end{tabularx}% - \par\nobreak - \vspace*{3pt}% - \quote - }% - {\endquote - \vspace{6pt}} - -\makeatletter -\def\referenceftable#1{ - \@ifundefined{r@fonttable:#1}% - \relax - {;\space encoding table on page~\pageref{fonttable:#1}}% -} - -% font table macros mainly lifted from manmac.tex -\def\oct#1{\hbox{\rm\'{}\kern-.2em\it#1\/\kern.05em}} -\def\hex#1{\hbox{\rm\H{}\tt#1}} - -\def\oddline#1{\cr\noalign{\nointerlineskip} - \multispan{19}\hrulefill& - \setbox0=\hbox{\lower 2.3pt\hbox{\hex{#1x}}}\smash{\box0}\cr - \noalign{\nointerlineskip}} -\def\evenline{\cr\noalign{\hrule}} -\def\chartstrut{\lower4.5pt\vbox to14pt{}} -\def\beginchart#1#2{$$\global\count@=0 #1 - \halign to\hsize\bgroup - \chartstrut##\tabskip0pt plus10pt& - &\hfil##\hfil&\vrule##\cr - \lower6.5pt\null - &&\oct0&&\oct1&&\oct2&&\oct3&&\oct4&&\oct5&&\oct6&&\oct7&\evenline} -\def\endchart{\raise11.5pt\null&&&\hex 8&&\hex 9&&\hex A&&\hex B& - &\hex C&&\hex D&&\hex E&&\hex F&\cr\egroup$$} -\def\:{\setbox0=\hbox{\noboundary\char\count@\noboundary}% - \ifdim\ht0>7.5pt\reposition - \else\ifdim\dp0>2.5pt\reposition\fi\fi - \box0\global\advance\count@ by1 } -\def\reposition{\setbox0=\hbox{$\vcenter{\kern2pt\box0\kern2pt}$}} -\def\normalchart{% - &\oct{00x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline0 - &\oct{01x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{02x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline1 - &\oct{03x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{04x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline2 - &\oct{05x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{06x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline3 - &\oct{07x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{10x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline4 - &\oct{11x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{12x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline5 - &\oct{13x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{14x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline6 - &\oct{15x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{16x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline7 - &\oct{17x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - \top} - -\def\notophalf{} -\def\tophalf{% -%\noalign{\vskip 5pt\hrule} - &\oct{20x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline8 - &\oct{21x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{22x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline9 - &\oct{23x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{24x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline A - &\oct{25x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{26x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline B - &\oct{27x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{30x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline C - &\oct{31x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{32x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline D - &\oct{33x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{34x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline E - &\oct{35x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline - &\oct{36x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\oddline F - &\oct{37x}&&\:&&\:&&\:&&\:&&\:&&\:&&\:&&\:&\evenline} - -\def\ftable#1#2{% - \batchmode - \font\X=#1% - \errorstopmode - \ifx\X\nullfont - \@warning{Font #1 not found, table omitted} - \else - \count@="80 - \setbox0=\hbox{\X - \loop\char\count@\advance\count@ by1 \ifnum\count@<"100 - \repeat}% - \ifdim\wd0>0pt \let\top\tophalf\else\let\top\notophalf\fi - \beginchart\X{\hfill\llap{\textbf{#1, \large#2}\label{fonttable:#1}}}\normalchart - \endchart\par\vfill - \fi} -\makeatother - - -\setcounter{tocdepth}{3} - -\title{\LaTeX{} font encodings} - -\author{Frank Mittelbach \and Robin - Fairbairns \and Werner Lemberg \and \LaTeX3 Project Team.} - -\date{\copyright~Copyright 1995--2014 \\[5pt] 29 October 2014} - -\begin{document} - -\maketitle - -\tableofcontents - -\section{Introduction} - -This document explains the ideas that underpin \LaTeX{} font -encodings and the constraints that apply when defining a new encoding; it -also lists the encodings that have already been defined. - -\subsection{Encodings in \TeX{}} - -\TeX{} (the program) implicitly recognises three sorts of encoding, -and all are (in a sense) discussed in the \TeX{}book~\cite{A-W:DKn86}: -\begin{itemize} -\item[1.] The input encoding, which specifies the meanings of characters - in files presented to \TeX{} for processing. The \TeX{}book - suggests that `your version of \TeX{} will recognise the characters - you type on your keyboard' (\TeX{} the program has provision for - static translations of input characters). -\end{itemize} -Such direct use of \TeX{}'s facilities is not the way modern -\LaTeX{} (or indeed any other \TeX{} macro package) is likely to deal -with input encodings. This document does not address the topic of -input encodings; the interested reader should examine the \LaTeX{} -base package \Pkg{inputenc} \cite[sec.~7.5.2, p.~357]{A-W:MG2004}. -\begin{itemize} -\item[2.] The token stream that \TeX{} processes internally. This stream - of \TeX{}'s consciousness is discussed in great detail in the - \TeX{}book. -\end{itemize} -Again, this document does not address the topic. \LaTeX's internal -character representation (\textsc{licr}) is well discussed in -\cite[sec.~7.11.2, p.~442]{A-W:MG2004}. -\begin{itemize} -\item[3.] The font encoding---i.e., the mapping of character codes to - glyphs in the fonts that are used to typeset \TeX{}'s output. - Again, a set of font encodings is enumerated in the \TeX{}book, but - that set has proved inadequate to the needs of modern multilingual - use of \LaTeX. -\end{itemize} -This document explains \emph{why} Knuth's original set of encodings is -inadequate to modern conditions, and discusses the issues that -surround the design and definition of new font encodings. - -Font encodings are important for more than their r\^{o}le in mapping the -glyphs of the fonts to be used for typesetting: their glyph tables are -also the context in which \TeX{}'s hyphenation algorithm operates. -There are constraints imposed by \TeX{} that affect the way in which -new font encodings, for use in a multi-lingual environment, may be -structured (see section~\ref{sec:restrictions} for details). - -\subsection{The history of \TeX{} font encodings} - -Little attention was paid to font encodings prior to the arrival of -\TeX{}\,3. Up to that time, one used Donald Knuth's fonts (the -Computer Modern family, using the encodings we now refer to as \Enc{OT1} and -the \Enc{OM} series), or one was on one's own. - -The Computer Modern text encoding raises problems in unmodified -\TeX{}, because hyphenation cannot break words containing -\verb"\accent" commands. Even in those Western European languages for -which the \Enc{OT1} encoding has symbols for the necessary -\verb"\accent"-based diacritics, this shortcoming ruins typesetting of -running text. - -With the advent of \TeX{}\,3, with its ability to switch between -hyphenation pattern sets, it was clear that the situation could not -continue. Thus a group at the TUG Annual General Meeting in Cork, -Ireland, specified a uniform encoding for 256-glyph fonts, that -contains accented letters and non-\textsc{ascii} letters necessary to -express most Western European languages (and some Eastern European ones) -without recourse to the \verb"\accent" command. - -This ``Cork'' encoding has since been realised in a series of fonts -designed with Metafont, in at least one font series that is available -both in Adobe Type 1 format and in OpenType format, % viz., Latin Modern -and in a number of virtual-font mappings of other font series. - -Since the time of the Cork meeting, much effort has been devoted to -the design of encodings for text fonts to use with \TeX{}, and the -Cork encoding influenced the design of many such encodings. - -Encodings for mathematical fonts have, in contrast, changed little -since Knuth's contributions. A TUG Technical Working Group was -established at the Cork meeting, whose aim was to define a set of -256-glyph encodings to regularise and extend Knuth's originals, using -ideas from several other fonts that had appeared since, and from the -known needs of researchers in mathematics and the mathematical sciences. - -Independently, a first proposal (the so-called \emph{Aston proposal}) was worked -out by Justin Ziegler together with Frank Mittelbach and other members of the -\LaTeX3 project team~\cite{ziegler}. A first implementation of -this propsal was realized by Matthias Clasen und Ulrik -Vieth~\cite{clasen,clasen-vieth}. - -However, the slow progress of these Mathematical encodings has been -overtaken by the addition (in the last decade or so) of a large number -of mathematical symbols to Unicode~\cite{beeton}; one can expect -further changes so that new public mathematical font encodings will -most likely be delayed still further. - - - -\subsection{Further information} - -For a general introduction to \LaTeX, including the new features of -\LaTeXe, you should read \emph{\LaTeXbook}, -Leslie Lamport, Addison Wesley, 2nd~ed, 1994. - -A more detailed description of the new features of \LaTeX, including an -overview of more than 200 packages and nearly 1000 ready to run examples, is -to be found in \emph{\LaTeXcomp{} second edition} by Frank Mittelbach and -Michel Goossens~\cite{A-W:MG2004}. - -The \LaTeX{} project sponsored a report on Mathematical % spelt out in full -font encodings, which -is worth reading for its insight into the problems of defining the way -in which math is used: see~\cite{ziegler,clasen,clasen-vieth}. - -The \LaTeX{} font selection scheme is based on \TeX, which is described -by its developer in \emph{The \TeX book}, Donald E.~Knuth, Addison -Wesley, 1986, revised in 1991 to include the features of \TeX~3. - -For more information about \TeX{} and \LaTeX, please contact your local -\TeX{} Users Group, or the international \TeX{} Users Group -(\url{http://www.tug.org}). - - - -\section{Existing font encodings} - -This section lists the encodings currently assigned; for each -encoding, we list the registered (\LaTeX{}) name, the assigned purpose -of the encoding, and the author. Further details may list the code -positions used in the encoding, the \emph{variable slots} (see below), -an example font (for which a listing will be provided later in the -document if the relevant fonts are present), and a source for further -reference. - -While the characteristic feature of an encoding is that each font -encoded according to the encoding should have the same glyph set, -there are some encodings (notably \Enc{OT1} and its descendants) in -which a few glyph code slots differ in their contents in different -fonts. - -\subsection{Naming conventions} - -Names for encoding schemes are strings of up to three letters (all -upper case) plus digits. - -The \LaTeX3 project reserves the use of encoding names starting with the -following letters: |T| (standard 256-long text encodings), |TS| -(symbols that are designed to extend a corresponding |T| encoding), -|X| (text encodings that do not conform to the strict requirements for -|T| encodings), |M| (standard 256-long mathematical encodings), |S| (other -symbol encodings), |A| (other special applications), |OT| (standard -128-long text encodings), and |OM| (standard 128-long mathematical encodings). - -Please do not use the above starting letters for non-portable -encodings. If new standard encodings emerge then we shall add them in -a later release of \LaTeX. - -Encoding schemes which are local to a site or a system should start -with |L|, experimental encodings intended for wide distribution will -start with |E|, whilst |U| is for Unknown or Unclassified encodings. - -\begin{quote} - \itshape We recommend that new encoding names should not be - introduced unless careful consideration and discussion in the user - community has confirmed the need for the encoding. If encodings have to - change from font to font, a number of problems arise, so it is best to - develop encodings that can be used with a large number of fonts in parallel. - This allows documents to be typeset using different fonts without problems. - - The \Enc{TS1} encoding is a good example of a \emph{bad} encoding (even - though it was developed with the best intentions) as a huge number of fonts - can only implement parts of it. Similarly, the fact that the few sets of - available mathematical fonts (beside Computer Modern Math) nearly - all implement slightly different encodings is a huge source of - problems. Don't add to this if possible! -\end{quote} - - -\subsection{128$^+$ glyph encodings (text)} - -The `OT' series of font encodings start with Donald Knuth's original -text encoding, that used for the text fonts in the earliest releases -of \TeX{} itself. The `O' of the encoding designator may be taken as -signifying `original', or just `old'. - -\begin{encodinginfo}{OT1} - {\TeX{} text} - {Donald Ervin Knuth} - {0x00--0x7F} - {0x0B--0x0F, 0x24, 0x3C, 0x3E, 0x5C, 0x7B--0x7D} -% {0X--'177} -% {'13--'17, '44, '74, '76, '134, '173--'175} - {cmr10} - {\cite[p.427]{A-W:DKn86}} - - Donald Knuth designed his font encoding (and hence his fonts) in a - very different environment from that which now pervades the \TeX{} - world: his (mainframe) computer had very little memory, there was - little experience in (or demand for) for multilingual technical - typesetting, and as a result it was appropriate to sacrifice - uniformity for efficiency. - - Thus Knuth's original fonts differ slightly in some encoded slots: - for example, the glyphs \texttt{\string<}, \texttt{\string>}, - \verb=\=, \verb={=, and \verb=}= are only available in the - typewriter fonts and the \textdollar{} and \textsterling{} signs - share the same position (in different font shapes). - - This means that direct selection of these slots can produce - unpredictable results, e.g., typing \texttt{\string<} or - \verb=\symbol{'74}= in a document can yield `\textquestiondown'. -\end{encodinginfo} - - -\begin{encodinginfo}{OT2} - {UW cyrillic encoding} - {University of Washington} - {0x00--0x7F} - {---} - {wnr10} - {\cite{Beeton:TB6-3-124}} - Support for this encoding is available in the Cyrillic bundle although for - all practical purposes it is better to use one of the \Enc{T2} encodings. -\end{encodinginfo} - - -\begin{encodinginfo}{OT3} - {UW IPA encoding} - {University of Washington} - {0x00--0x7f} - {---} - {wsuipa10} - {\cite[p.149]{CorkGW:91}} - The \Enc{OT3} encoding was never really used with \LaTeXe{} - following the introduction of the TIPA system which offers much - better support for IPA. In particular, no \File{ot3enc.def} - file was ever produced. -\end{encodinginfo} - - -\begin{encodinginfo}{OT4} - {Polish text encoding} - {B.~Jackowski and M.~Ry\'cko} %% ? Marcin Woli\'nski - {0x00--0x7F, 0x81, 0x82, 0x86, 0x8A, 0x8B, 0x91, 0x99, 0x9B, 0xA1, - 0xA2, 0xA6, 0xAA, 0xAB, 0xAE, 0xAF, 0xB1, 0xB9, 0xBB, 0xD3, 0xF3, - 0xFF} - {0x0B--0x0F, 0x24, 0x3C, 0x3E, 0x5C, 0x7B--0x7D} - {plr10} - {---} - - While Knuth included the means of typesetting the `lost L' (\L) in - his \Enc{OT1} encoding, he omitted the ogonek (\,\,\k{}), a diacritic - mark that is also needed in Polish text; hence the appearance, well - before the \Enc{T1} encoding, of fonts using this encoding. -\end{encodinginfo} - -\begin{encodinginfo}{OT5} - {Not currently allocated} - {---} - {---} - {---} - {} - {---} - -\end{encodinginfo} - - - -\begin{encodinginfo}{OT6} - {Armenian text encoding} - {Serguei Dachian} - {0x03--0x0F, 0x13--0x7F} - {---} - {artmr10} - {---} - - This encoding was allocated to permit use of Dachian's - Armenian fonts in a standard \LaTeX{} environment. - - Because of license issues the \texttt{artmr} fonts are not necessarily - included in distributed \TeX{} installations (and for this reason the - corresponding encoding table is not shown below). However, the fonts - and the support macros can be found on the CTAN archives (look for - \texttt{armtex}). - -\end{encodinginfo} - - - -\subsection{256 glyph encodings (text)} - -\begin{encodinginfo}{T1} - {Cork encoding} - {Euro \TeX{} conference at Cork} - {0x00--0xFF} - {---} - {ecrm1000} - {\cite[p.514]{tub:MFe90}, \cite[p.99]{Knappen:TB17-2-96}} - - The Cork encoding was developed so that advantage could be taken of - the (then) new facilities of \TeX{}\,3, allowing hyphenation of - most Western European (and some Eastern European) languages in an - unmodified version of \TeX{}. - - The encoding was developed in the absence of any extant effort at - font design, but instances written in Metafont (the `EC' fonts), and - more recently Adobe Type 1 instances of the same fonts have become - available. - - Substantial (but incomplete) instances have also been developed, - which use virtual fonts. These latter instances map either Knuth's - original (OT1-encoded) fonts, or commercial fonts that contain the - Adobe `standard' set of 224 glyphs. -\end{encodinginfo} - -\begin{encodinginfo} - {T2A, T2B, T2C} - {Cyrillic encodings} - {The CyrTUG font team} - {0x00--0xFF} - {--- (within each encoding)} - {larm1000} - {\cite{Berdnikov:eurotex-98}} - - There are too many glyphs in the full Cyrillic complement of - languages for all of them to be covered by a single - \LaTeX{}-compliant encoding (the lower half of each - \Enc{T2}~encoding is identical to that of \Enc{T1}, in order that - each should be a conforming \LaTeX{} encoding~--- see - section~\ref{sec:restrictions}). The approach taken is - therefore to develop a single encoding, \Enc{X2} (see \ref{sec:extendedenc}) - which contains all the glyphs needed for the full set of - languages, and then to derive the three \LaTeX{}-complaint - \Enc{T2}-family encodings using the \Enc{X2} set together with that of - \Enc{T1}. - -\end{encodinginfo} - - - -\begin{encodinginfo}{T3} - {IPA encoding} - {FUKUI Rei, University of Tokyo} - {0x00--0xFF} - {---} - {tipa10} - {\cite[p.102]{Rei:TB17-2-102}} - - - The \Enc{T3} encoding (and associated macros) provides the glyphs required - in phonetic description according to current International Phonetic - Association recommendations \cite{ipa}. - - The \Enc{T3} encoding does \emph{not fulfil} the requirements for \Enc{T} - encodings---the name is a historical accident. The correct name would be - \Enc{X3}, but due to the fact that this font family has been used under its - current encoding name for a long time, the name will not change for - compatibility reasons. - -\end{encodinginfo} - - - -\begin{encodinginfo}{T4} - {African Latin (fc)} % public name - {J\"org Knappen} % author name - {0x00--0xFF} % range(s) of slots used for glyphs - {0x24} % range(s) of slots with variable glyphs if any - {fcr10} % name of an example font - {\cite{tub:JKn93}} - -The African Latin fonts contain in their lower half (0--127) the same -characters as the European Latin (T1-encoded) Fonts, while in their -upper half (128--255) they -contain letters and symbols for African languages that use extended -Latin alphabets. -Due to lack of space, J\"org had to play the unfortunate trick of -assigning \verb=\textdollar= and \verb=\textsterling= -the same position; users should take these characters -from the text companion font, if they are needed. Instead of defining -a lot of new control sequences for the single letters, there are three -accent-like control sequences with general purpose: -\verb=\m= (Modified-1), -\verb=\M= (Modified-2) and -\verb=\B= (Barred). -Most standard \LaTeX{} encoding-dependent commands -work. However, the Icelandic special letters are not available and `best -replacements' for \verb=\Th=, \verb=\th=, and \verb=\dh= -are used (barred T and d resp.). -\end{encodinginfo} - - -\begin{encodinginfo}{T5} - {Vietnamese encoding} - {Werner Lemberg and - Vladimir Volovich} - {0x00--0xFF} - {---} - {vnr10} - {\cite{vnr}} - - The \Enc{T5} encoding was developed for Vietnamese. Again, this encoding - \emph{does not} conform to the requirements for a \Enc{T}-encoding - because its large number of accented letters prevent the \verb=\lccode= and - \verb=\uccode= mapping requirements for \Enc{T} encodings from being - fulfilled. However, since the Vietnamese language does not - use word division in typesetting so that this requirement is - actually not important for this particular language. - Since every glyph used in Vietnamese text is internally - represented as \textsc{licr} macros, the commands \verb=\MakeUppercase= and - \verb=\MakeLowercase= still work as expected (as they change the case of the - \textsc{ascii} characters in \textsc{licr} definitions). - -\end{encodinginfo} - -\begin{encodinginfo} - {T6} - {Armenian} - {---} - {---} - {---} - {} - {---} - - This encoding is reserved to permit future expansion of Armenian - \TeX{} to use 256-character (hyphenatable) fonts. -\end{encodinginfo} - -\begin{encodinginfo}{T7} - {Greek encoding} - {---} - {---} - {---} - {} - {---} - -The name is already reserved for a 256 glyph greek encoding. The encoding -itself hasn't been defined so far. - -\end{encodinginfo} - - - -\subsection{256$^-$ glyph encodings (text symbols)} - -\begin{encodinginfo}{TS1} - {Text Companion encoding (Cork)} - {J\"org Knappen} - {0x00--0x0D, 0x12, 0x15, 0x16, 0x18--0x1D, 0x20, 0x24, 0x27, 0x2A, - 0x2C--0x3A, 0x3C--0x3E, 0x4D, 0x4F, 0x57, 0x5B, 0x5D--0x60, - 0x62--0x64, 0x6C--0x6E, 0x7E--0xBF, 0xD6, 0xF6} - {---} - {tcrm1000} - {\cite{Knappen:TB17-2-96}} - - The text symbol encoding offers access to symbolic glyphs that are - commonly used in text (for a variety of reasons), and whose style - should vary with the text that surrounds them. - - Unfortunately, the \Enc{TS1} encoding was developed without - reference to the glyphs available in existing commercial fonts. - As a result, only font families - explicitly developed for \TeX{} (i.e., typically originating with - \MF{}) actually contain all glyphs required by the \Enc{TS1} - encoding. Most other font families (whether free or commercial) - often only provide half of the set% -%% -%% don't show the comment if the tables are not generated -%% -\expandafter\ifx\csname r@fonttable:tcrm1000\endcsname\relax -\else - \expandafter\ifx\csname r@fonttable:ptmr8c\endcsname\relax - \else - \space (compare the two tables for \Enc{TS1} on - pages~\pageref{fonttable:tcrm1000} - and~\pageref{fonttable:ptmr8c})% - \fi -\fi. - To improve this situation somewhat, NFSS provides a way to define encoding - subsets on a per family basis in the \Pkg{textcomp} package (which - package offers support for the \Enc{TS1} encoding). -\end{encodinginfo} - - -\begin{encodinginfo}{TS3} - {IPA symbol encoding} - {FUKUI Rei, University of Tokyo} - {0x00--0x0A, 0x20--0x49, 0x50--0x56, 0x70--0x7B} - {---} - {tipx10} - {\cite{Rei:TB17-2-102}} - - The \Enc{TS3} encoding (together with the \Enc{T3} encoding) provides the - glyphs for typesetting phonetic transcriptions following the - guidelines of the International Phonetic Association \cite{ipa}. Support - is offered through the \Pkg{tipa} package. -\end{encodinginfo} - - - - -\subsection{256 glyph encodings (text extended)} -\label{sec:extendedenc} - -\begin{encodinginfo} - {X2} - {Cyrillic glyph container} - {The CyrTUG font team} - {0x00--0xFF} - {---} - {rxrm1000} - {\cite{Berdnikov:eurotex-98}} - - This encoding specifies the glyph container for Cyrillic characters, - which is used in specifying the \Enc{T2A}, \Enc{T2B} and \Enc{T2C} encodings. -\end{encodinginfo} - - - - -\subsection{128$^+$ glyph encodings (mathematics)} - - -\begin{encodinginfo}{OML} - {\TeX{} math italic} - {Donald Ervin Knuth} - {0x00--0x7F} - {---} - {cmmi10} - {\cite[p.430]{A-W:DKn86}} - - The \Enc{OML} encoding contains italic Latin and Greek letters for - use in mathematical formulas (typically used for variables) together - with some symbols. - -\end{encodinginfo} - -\begin{encodinginfo}{OMS} - {\TeX{} math symbol} - {Donald Ervin Knuth} - {0x00--0x7F} - {---} - {cmsy10} - {\cite[p.431]{A-W:DKn86}} - - The \Enc{OMS} encoding contains basic mathematical symbols, - together with an uppercase ``calligraphic'' Latin alphabet. -\end{encodinginfo} - - -\begin{encodinginfo}{OMX} - {\TeX{} math extension} - {Donald Ervin Knuth} - {0x00--0x7F} - {---} - {cmex10} - {\cite[p.432]{A-W:DKn86}} - - \Enc{OMS} encodes mathematical symbols with variable sizes, such as - the $\sum$ sign, which changes its size if used in displayed - formulas, and the construction parts for - brackets, braces and radicals, etc., which can stretch to accommodate - the thing they're enclosing. - -\end{encodinginfo} - - - - -\subsection{256 glyph encodings (mathematics)} - -So far there are no 256 glyph mathematical encodings. A proposal is -given in \cite{ziegler}. - - -\subsection{Other encodings} - -\begin{encodinginfo} - {C..} - {CJK encodings} - {Werner Lemberg} - {0x00--0xFF} - {---} - {} % no font, of course - {\cite{CJK}} - - The \Pkg{CJK} package defines a number of encodings which access Chinese, - Japanese and Korean fonts. - -\end{encodinginfo} - -\begin{encodinginfo} - {E..} - {Experimental encodings} - {---} - {0x00--0xFF} - {all} - {} - {\cite[p.416]{A-W:MG2004}} - - As the name indicates, encodings starting with the letter \Enc{E} are - intended for experimental encodings, that are still likely to change. -\end{encodinginfo} - -\begin{encodinginfo}{L..} - {Local encoding (site dependent)} - {---} - {0x00--0xFF} - {all} - {} - {\cite[p.416]{A-W:MG2004}} - - `Local' encodings provide the means to develop representation - techniques that are suited to a particular \TeX{} environment. While - the developer has freedom to specify their encoding as he or she - pleases, there is a strong incentive to obey the \LaTeX{} rules for - encodings, since it will otherwise be difficult to compose text using - the encoding. - - At least it was the intention that \Enc{L..} encodings are local and - site dependent. However, a number of such encodings became generally - used without ever getting a different name allocated. - -\end{encodinginfo} - - - -\begin{encodinginfo}{LY1} - {Y\&Y 256 glyph encoding} - {Berthold Horn} - {0x00--0x08, 0x0C, 0x10, 0x12--0xFF} - {\emph{believed none}} - {ptmr8y} - {\cite[p.416]{A-W:MG2004}} - - This is an alternative to the \Enc{T1} encoding developed by Y\&Y and - used in their commercial \TeX{} implementation. - -\end{encodinginfo} - - -\begin{encodinginfo}{LV1} - {MicroPress encoding} - {Michael Vulis} - {\emph{unknown}} - {\emph{unknown}} - {} - {\cite[p.416]{A-W:MG2004}} - - This is an encoding developed by MicroPress and used for some of their - fonts. - -\end{encodinginfo} - - -\begin{encodinginfo}{LGR} - {Greek 256 glyph encoding} - {\emph{unknown}} - {0x00--0xFF} - {\emph{believed none}} - {grmn1000} - {\cite[p.575]{A-W:MG2004}} - - Currently the main encoding in use for the Greek language. - - This encoding doesn't conform to the restrictions for - \Enc{T}-encodings described in section~\ref{sec:restrictions} on - page~\pageref{sec:restrictions} as it doesn't have \textsc{ascii} - glyphs at all. - -\end{encodinginfo} - - -\begin{encodinginfo} - {PD1} - {PDF DocEncoding} - {Adobe} - {0x08--0x0A, 0x0C, 0x0D, 0x18--0x7E, 0x80--0x9E, 0xA0--0xAE, 0xB0--0xFF} - {---} - {} - {\cite{Adobe:PDF-1.6}, \cite{hyperref}} - - The \Enc{PD1} encoding is a virtual encoding with 256 glyphs needed to - produce bookmarks and similar text in PDF document generated with pdf\LaTeX. - The encoding is ``virtual'' because by design there are no \TeX{} - fonts that cover \Enc{PD1}. Details can be found in appendix D.1 - of~\cite{Adobe:PDF-1.6}. -\end{encodinginfo} - -\begin{encodinginfo} - {PU} - {PDF Unicode Encoding} - {Adobe} - {---} - {---} - {} - {\cite{Adobe:PDF-1.6}, \cite{hyperref}} - - Another virtual encoding (with more than 600 characters) for - Unicode-encoded bookmarks in PDF documents. -\end{encodinginfo} - -\begin{encodinginfo}{U} - {Unknown encoding} - {---} - {potentially 0x00-0xFF} - {all} - {wasy10} - {\cite[p.416]{A-W:MG2004}} - - This encoding should be used for fonts that resist classification, - e.g., when it is clear that there will never be more than one font - using the same encoding. - -\end{encodinginfo} - - - -\section{Restrictions} -\label{sec:restrictions} - - -\subsection{Required glyphs for general text encodings} - -Encodings that are supposed to be used with \LaTeX{} for `general -purpose text fonts' need to have certain fixed glyphs in certain -encoding slots. A `general purpose text font' is one intended for -arbitrary natural language text and not just within special -environments (such as the phonetic alphabet) or just for typesetting -individual symbols (e.g., the text companion font with encoding -\Enc{TS1}). - -This is the case for the following glyphs that have to be in their -\textsc{ascii} positions for general purpose text encodings: -\begin{center} -\begin{tabular}[t]{cc} - Glyph & Position \\ \hline - ! & \number`\! \\ - ' & \number`\' \\ - ( & \number`\( \\ - ) & \number`\) \\ - \relax* & \number`\* \\ - + & \number`\+ \\ - , & \number`\, \\ - - & \number`\- \\ - . & \number`\. \\ - / & \number`\/ \\ - 0 \ldots\ 9 & \number`\0\ to \number`\9 \\ - \end{tabular} - \quad - \begin{tabular}[t]{cc} - Glyph & Position \\ \hline - : & \number`\: \\ - ; & \number`\; \\ - = & \number`\= \\ - ? & \number`\? \\ - @ & \number`\@ \\ - A \ldots\ Z & \number`\A\ to \number`\Z \\ - \relax[ & \number`\[ \\ - ] & \number`\] \\ - ` & \number`\` \\ - a \ldots\ z & \number`\a\ to \number`\z \\ -\end{tabular} -\quad -\begin{tabular}[t]{cc} -Glyph\footnotemark & Position \\ \hline -< & \number`\< \\ -> & \number`\> \\ -\string| & \number`\| \\ -\end{tabular}\footnotetext{The requirement for these three glyphs is - violated in the Latin alphabet \Enc{OT} encodings.} -\end{center} -In addition the following glyphs have to be present -somewhere\footnote{The position in this case is not important as they -are generated from ligature programs.} in the encoding together with -corresponding ligature programs to generate them: -\begin{center} -\begin{tabular}[t]{cc} -Glyph & Ligature program \\ \hline - `` & \texttt{`\/`} \\ - '' & \texttt{'\/'} \\ - -- & \texttt{-\/-} \\ - --- & \texttt{-\/-\/-} \\ -\end{tabular} -\end{center} - -This is $33 + 2 * 26 = 85$ positions ``required'', which leaves 171 -positions free. - -If there are free slots available then adding all or some of the -diacritics would be the best way to fill them. - -If there are insufficient slots for the characters needed, a possible -technique is to create a subsidiary encoding, and to move non-letter -characters to it. Since only ``letters'' take part in the hyphenation -algorithm, this technique doesn't affect the appearance of the typeset -result. - -\subsection{The constraints on upper/lower case tables} - -Due to some technical restrictions of \TeX{} related to hyphenation it -is not possible in \LaTeX{} to use more than one \verb=\lccode= or -\verb=\uccode= table. Therefore all encodings need to share these two -tables which are defined to be those of the \Enc{T1} encoding. - -The \Enc{T1} encoding has some nasty peculiarities which make certain slot -positions more or less unusable for other encodings if this -restriction is to be obeyed. This is unfortunate but since \Enc{T1} is well -established and the basis for a large number of languages it seemed -better to live with this situation instead of trying to replace \Enc{T1} with a -slightly better standard (with the result that for a long time -different \LaTeX{} installations would not be able to communicate with -each other because of incompatible font sets). - -The positions that are problematic are as follows. -\begin{center} -\begin{tabular}{lp{.8\linewidth}} -25 (\char 25) & uppercase maps strangely (same as for 105, \char 105)\\ -26 (\char 26) & uppercase maps strangely (same as for 106, \char 106)\\ -27 (\char 27) & lowercase maps to itself which makes this slot subject - to hyphenation (used to support \Enc{OT1} encoding) \\ -157 (\char 157) & lowercase maps strangely (same as for 73, \char 73) \\ -158 (\char 158) & uppercase maps strangely (same as for 240, \char 240) \\ -\end{tabular} -\end{center} -One way to use such slots is to fill them with ligature glyphs as -\TeX{} will not consult these tables for glyphs constructed through -ligatures programs but instead uses the entries for the individual -glyphs used to produce the ligature. - -A complete listing of the uppercase/lowercase mapping tables is to be -found in section~\ref{sec:uclc-tab} (page \pageref{sec:uclc-tab}). - -\newcount\temp \newcount\tempL \newcount\tempU - -\def\nextstep{\global\tempL=\lccode\temp - \global\tempU=\uccode\temp - \lctablenumbersize\the\temp & - \the\tempL& - \the\tempU&\printlowerupper{\the\temp}{\the\tempL}{\the\tempU}\\ - \global\advance\temp by 1 - \stepprint} - -\def\printlowerupper#1#2#3{\char#1\relax - (\ifnum#2=0\relax--\else\char#2\fi - /\ifnum#3=0\relax--\else\char#3\fi)} - -\def\stepprint{\relax\ifnum\temp<\endval - \let\next=\nextstep - \else - \let\next=\relax - \fi - \next} - -\def\dolctable#1#2{{\temp=#1\relax -\def\endval{#2}% -\setlength\tabcolsep{1.5pt}% -\begin{tabular}[t]{@{}cccc@{}} -pos&lc&uc&glyphs\\\hline -\stepprint -\end{tabular}}} - -\iffalse -\begin{center} -\tiny\let\lctablenumbersize\tiny -\mbox{\dolctable{0}{52}\vrule -\dolctable{52}{104}\vrule -\dolctable{104}{156}\vrule -\dolctable{156}{208}\vrule -\dolctable{208}{256}} -\end{center} -\fi - -\iffalse -\begin{center}\tiny -\mbox{\dolctable{0}{65}\vrule -\dolctable{65}{128}\vrule -\dolctable{128}{193}\vrule -\dolctable{193}{256}} -\end{center} -\fi - - - -\section{Encoding specific commands} - -An encoding specific command is one that generates a glyph (or -glyphs), to produce a graphic effect that may be implemented -differently in different encodings. The encoding specific command -automatically changes its implementation when the encoding changes in -the course of the document. Encoding specific commands figure in -\LaTeX's internal character representation (\textsc{licr}) and are also -discussed in \cite[sec.~7.11.2, p.~442]{A-W:MG2004}. - -The following table only covers the encoding specific commands from -the \Enc{OT1} and \Enc{T1} encodings. Other encodings may specify -additional encoding specific commands. In the table, the first 15 -commands are `accent-like' and need as an argument the character to be -accented. For example, |\v{c}| is the \textsc{licr} for `\v{c}'. - -\begin{tabbing} -\ttverb\textvisiblespace\quad\=bbbbbbbbbbbbbb\=b'b'\=ccccccccccc\kill -\ttverb\`{} \>OT1,T1\> \a`{}\> (grave) \\ -\ttverb\'{} \>OT1,T1\> \a'{}\> (acute) \\ -\ttverb\^{} \>OT1,T1\> \^{}\> (circumflex) \\ -\ttverb\~{} \>OT1,T1\> \~{}\> (tilde) \\ -\ttverb\"{} \>OT1,T1\> \"{}\> (umlaut) \\ -\ttverb\H{} \>OT1,T1\> \H{}\> (Hungarian umlaut) \\ -\ttverb\r{} \>OT1,T1\> \r{}\> (ring) \\ -\ttverb\v{} \>OT1,T1\> \v{}\> (ha\v{c}ek) \\ -\ttverb\u{} \>OT1,T1\> \u{}\> (breve) \\ -\ttverb\t{} \>OT1,T1\> \t{}\> (tie) \\ -\ttverb\={} \>OT1,T1\> \a={}\> (macron) \\ -\ttverb\.{} \>OT1,T1\> \.{}\> (dot) \\ -\ttverb\b{} \>OT1,T1\> \b{}\> (underbar) \\ -\ttverb\c{} \>OT1,T1\> \c{}\> (cedilla) \\ -\ttverb\d{} \>OT1,T1\> \d{}\> (dot under) \\ -\ttverb\k{} \>T1 \> \k{}\> (ogonek) \\ -% \ttverb\AA \>OT1,T1\> \AA \> \\ % no longer -\ttverb\AE \>OT1,T1\> \AE \> \\ -\ttverb\DH \>T1 \> \DH \> \\ -\ttverb\DJ \>T1 \> \DJ \> \\ -\ttverb\L \>OT1,T1\> \L \> \\ -\ttverb\NG \>T1 \> \NG \> \\ -\ttverb\OE \>OT1,T1\> \OE \> \\ -\ttverb\O \>OT1,T1\> \O \> \\ -\ttverb\SS \>OT1,T1\> \SS \> \\ -\ttverb\TH \>T1 \> \TH \> \\ -% \ttverb\aa \>OT1,T1\> \aa \> \\ no-longer -\ttverb\ae \>OT1,T1\> \ae \> \\ -\ttverb\dh \>T1 \> \dh \> \\ -\ttverb\dj \>T1 \> \dj \> \\ -\ttverb\guillemotleft \>T1 \> \guillemotleft \> (guillemet) \\ -\ttverb\guillemotright \>T1 \> \guillemotright \> (guillemet) \\ -\ttverb\guilsinglleft \>T1 \> \guilsinglleft \> (guillemet) \\ -\ttverb\guilsinglright \>T1 \> \guilsinglright \> (guillemet) \\ -\ttverb\i \>OT1,T1\> \i \> \\ -\ttverb\j \>OT1,T1\> \j \> \\ -\ttverb\l \>OT1,T1\> \l \> \\ -\ttverb\ng \>T1 \> \ng \> \\ -\ttverb\oe \>OT1,T1\> \oe \> \\ -\ttverb\o \>OT1,T1\> \o \> \\ -\ttverb\quotedblbase \>T1 \> \quotedblbase \> \\ -\ttverb\quotesinglbase \>T1 \> \quotesinglbase \> \\ -\ttverb\ss \>OT1,T1\> \ss \> \\ -\ttverb\textasciicircum \>OT1,T1\> \textasciicircum \> \\ -\ttverb\textasciitilde \>OT1,T1\> \textasciitilde \> \\ -\ttverb\textbackslash \>OT1,T1\> \textbackslash \> \\ -\ttverb\textbar \>OT1,T1\> \textbar \> \\ -\ttverb\textbraceleft \>OT1,T1\> \textbraceleft \> \\ -\ttverb\textbraceright \>OT1,T1\> \textbraceright \> \\ -\ttverb\textcompwordmark \>OT1,T1\> \textcompwordmark\> (invisible) \\ -\ttverb\textdollar \>OT1,T1\> \textdollar \> \\ -\ttverb\textemdash \>OT1,T1\> \textemdash \> \\ -\ttverb\textendash \>OT1,T1\> \textendash \> \\ -\ttverb\textexclamdown \>OT1,T1\> \textexclamdown \> \\ -\ttverb\textgreater \>OT1,T1\> \textgreater \> \\ -\ttverb\textless \>OT1,T1\> \textless \> \\ -\ttverb\textquestiondown \>OT1,T1\> \textquestiondown\> \\ -\ttverb\textquotedbl \>T1 \> \textquotedbl \> \\ -\ttverb\textquotedblleft \>OT1,T1\> \textquotedblleft\> \\ -\ttverb\textquotedblright \>OT1,T1\> \textquotedblright\> \\ -\ttverb\textquoteleft \>OT1,T1\> \textquoteleft \> \\ -\ttverb\textquoteright \>OT1,T1\> \textquoteright \> \\ -\ttverb\textregistered \>OT1,T1\> \textregistered \> \\ -\ttverb\textsection \>OT1,T1\> \textsection \> \\ -\ttverb\textsterling \>OT1,T1\> \textsterling \> \\ -\ttverb\texttrademark \>OT1,T1\> \texttrademark \> \\ -\ttverb\textunderscore \>OT1,T1\> \textunderscore \> \\ -\ttverb\textvisiblespace \>OT1,T1\> \textvisiblespace\> \\ -\ttverb\th \>T1 \> \th \> -\end{tabbing} - - - - -\begin{thebibliography}{99} -\addcontentsline{toc}{section}{\numberline{\relax}\refname} - - -\bibitem{Adobe:PDF-1.6} \emph{\textsc{PDF} reference}: - Adobe portable document format version~1.6. Adobe Systems - Incorporated, 2005. % why \textsuperscript{3}? - \url{http://partners.adobe.com/public/developer/en/pdf/PDFReference16.pdf}. - -\bibitem{Beeton:TB6-3-124} Barbara Beeton: - \emph{Mathematical symbols and cyrillic fonts ready for - distribution}. In: TUGBoat, 6\#3), 1985. - \url{http://tug.org/TUGboat/Articles/tb06-3/tb13beetcyr.pdf}. - -\bibitem{beeton} Barbara Beeton: \emph{Unicode - and math, a combination whose time has come -- Finally!}. In: - TUGBoat, 21\#3, 2000. - \url{http://www.tug.org/TUGboat/Articles/tb21-3/tb68beet.pdf}. - - -\bibitem{Berdnikov:eurotex-98} A.\@ Berdnikov, O.\@ - Lapko, M.\@ Kolodin, A.\@ Janishevsky and - A.\@ Burykin: \emph{The Encoding Paradigm in - \LaTeXe{} and the Projected X2 Encoding for Cyrillic Texts}. - Euro\TeX~98. - \url{http://www.gutenberg.eu.org/pub/GUTenberg/publicationsPDF/28-29-berdnikova.pdf}. - -\bibitem{CJK} \emph{The \Pkg{CJK} package}: - \url{http://cjk.ffii.org}. - -\bibitem{clasen} Matthias Clasen: \emph{A new - implementation of \LaTeX{} math}, 1997-98. - \url{http://www.tug.org/twg/mfg/papers/current/newmath.ps.gz}. - -\bibitem{clasen-vieth} Matthias Clasen and Ulrik - Vieth: \emph{Towards a new Math Font Encoding - for (La)\TeX}. March 1998, - \url{http://www.tug.org/twg/mfg/papers/current/mfg-euro-all.ps.gz}. - -\bibitem{CorkGW:91} -Dean Guenther and Janene Winter. -\newblock An international phonetic alphabet. -\newblock In Guenther \cite{proc:MGu91}, pages 149--156. -\newblock Published as {TUG}boat 12\#1. - -\bibitem{proc:MGu91} -Mary Guenther, editor. -\newblock {\em {\TeX} 90 Conference Proceedings}, March 1991. -\newblock Published as {TUG}boat 12\#1. - -\bibitem{tub:MFe90} -Michael~J. Ferguson. -\newblock Report on multilingual activities. -\newblock {\em {TUG}boat}, 11(4):514--516, 1990. - -\bibitem{fontinst} \emph{The \Pkg{fontinst} package}: - \textlangle CTAN\textrangle\url{/fonts/utilities/fontinst}. - -\bibitem{Rei:TB17-2-102} Fukui Rei: - \emph{\textsl{TIPA}: A system for processing phonetic - symbols in \LaTeX}. In: TUGBoat, 17\#, 1996. - \url{http://www.tug.org/TUGboat/Articles/tb17-2/tb51rei.pdf}. - -\bibitem{hyperref} \emph{The \Pkg{hyperref} package}: - \url{http://www.tug.org/applications/hyperref}. - -\bibitem{tub:JKn93} -J\"org Knappen. -\newblock Fonts for Africa: The fc Fonts. -\newblock {\em {TUG}boat}, 14(2):104, 1993. - -\bibitem{Knappen:TB17-2-96} J\"org Knappen: - \emph{The \Pkg{dc} fonts~1.3: Move towards stability - and completeness}. In: TUGBoat 17\#2, 1996. - \url{http://www.tug.org/TUGboat/Articles/tb17-2/tb51knap.pdf}. - -\bibitem{A-W:DKn86} -Donald~E. Knuth. -\newblock {\em The {\TeX}book}. -\newblock Volume~A of {\em Computers \& {T}ypesetting\/}, - May 1989. -\newblock Eight printing. - -\bibitem{vnr} \emph{The \Pkg{vnr} font family}, developed by - the author of pdf\TeX, {H\`an Th\^e\protect\llap{\raise 0.5ex\hbox{\'{\relax}}} Th\`anh}. - \url{http://vntex.org/download/vntex}. - - \bibitem{ipa} Home page of the International Phonetic Association. - \url{http://www.arts.gla.ac.uk/IPA/ipa.html} - -\bibitem{A-W:LLa94} -Leslie Lamport. -\newblock {\em {\LaTeX:} A Document Preparation System}. -\newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994. - -\bibitem{LH-Fonts} \emph{The \Pkg{lh}-Fonts for Cyrillic}: - \textlangle CTAN\textrangle\url{/fonts/cyrillic/lh}. - -\bibitem{A-W:MG2004} -Frank Mittelbach and Michel Goossens. -\newblock {\em The {\LaTeX} Companion second edition}. -\newblock With Johannes Braams, David Carlisle, and Chris Rowley. -\newblock Addison-Wesley, Reading, Massachusetts, 2004. - -\bibitem{Unicode} \emph{The Unicode Standard}. - \url{http://unicode.org}. - -\bibitem{ziegler} Justin Ziegler, \emph{Technical - Report on Math Font Encodings}, June 1994, - \url{http://www.tug.org/twg/mfg/papers/ltx3pub/l3d007.ps.gz}. - -\end{thebibliography} - -\clearpage\appendix -\begin{center} - \Large\bfseries Appendices -\end{center} - -\section{Example code tables} - -This appendix contains a table of each font mentioned as an ``example'' -font above, providing that the font was available when the document -was processed with \LaTeX{}. (\LaTeX{} generates a warning message -for each font it fails to find.) - -\subsection{Text encodings} - -\ftable{cmr10}{OT1} - -\ftable{wnr10}{OT2} - -\ftable{wsuipa10}{OT3} - -\ftable{plr10}{OT4} - -%\ftable{artmr10}{OT6} - -\ftable{ecrm1000}{T1} - -\ftable{larm1000}{T2A} - -\ftable{lbrm1000}{T2B} - -\ftable{lcrm1000}{T2C} - -\ftable{tipa10}{T3} - -\ftable{fcr10}{T4} - -\ftable{vnr10}{T5} - - -\subsection{Text symbol encodings} - -The full table for \Enc{TS1} as provided by European Computer Modern family: -\ftable{tcrm1000}{TS1} - -\pagebreak - -In contrast typical PostScript fonts usually have incomplete implementations -of \Enc{TS1} sometimes missing more than half of the glyphs: - -\ftable{ptmr8c}{TS1} - -\ftable{tipx10}{TS3} - - - -\subsection{Extended text encodings} - -\ftable{rxrm1000}{X2} - - -\subsection{Mathematical encodings} - -\ftable{cmmi10}{OML} - -\ftable{cmsy10}{OMS} - -\ftable{cmex10}{OMX} - - -\subsection{Other encodings} - -\ftable{ptmr8y}{LY1} - -%%\ftable{????}{LV1} - -\ftable{grmn1000}{LGR} - -\ftable{wasy10}{U} -\ftable{logo10}{U} - -\clearpage -\section{Uppercase and lowercase tables} -\label{sec:uclc-tab} - -The following two sets of tables list the \verb"\uppercase" and -\verb"\lowercase" values for each position in the \LaTeX{} standard -256-character tables. - -Each row of each table lists: -\begin{quote} - \begin{tabular}{lp{0.7\textwidth}} - pos & The position in the table (0-255) \\ - lc & The value in the \verb"\lowercase" table at the position \\ - & (note that value 0 here means that \verb"\lowercase" is - ineffective for this character, and hyphenation does not apply - to it) \\ - uc & The value in the \verb"\uppercase" table at the position \\ - & (note that value 0 here means that \verb"\uppercase" is - ineffective for this character) \\ - glyphs & The glyphs specified for the T1 encoding for this - position, laid out as \meta{glyph}\textbf{(}\meta{lowercase - glyph}\textbf{/}\meta{uppercase glyph}\textbf{)} - \end{tabular} -\end{quote} - -\begin{center} - \let\lctablenumbersize\footnotesize - \makebox[\textwidth]{\hss - \dolctable{0}{32}\quad\dolctable{32}{64}\quad - \dolctable{64}{96}\quad\dolctable{96}{128}% - \hss} - - \makebox[\textwidth]{\hss - \dolctable{128}{160}\quad\dolctable{160}{192}\quad - \dolctable{192}{224}\quad\dolctable{224}{256}% - \hss} -\end{center} -\end{document} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/source/latex/base/exscale.dtx b/Master/texmf-dist/source/latex/base/exscale.dtx index 6d78aa756c0..856aef09a6b 100644 --- a/Master/texmf-dist/source/latex/base/exscale.dtx +++ b/Master/texmf-dist/source/latex/base/exscale.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -46,6 +46,7 @@ for use with \LaTeX2e} \author{Frank Mittelbach \and Rainer Sch\"opf} \date{\filedate} +\MaintainedByLaTeXTeam{latex} \maketitle \DocInput{exscale.dtx} \end{document} diff --git a/Master/texmf-dist/source/latex/base/exscale.ins b/Master/texmf-dist/source/latex/base/exscale.ins index 8263ff4d523..7670ca1176f 100644 --- a/Master/texmf-dist/source/latex/base/exscale.ins +++ b/Master/texmf-dist/source/latex/base/exscale.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/fix-cm.dtx b/Master/texmf-dist/source/latex/base/fix-cm.dtx new file mode 100644 index 00000000000..5bb9b956223 --- /dev/null +++ b/Master/texmf-dist/source/latex/base/fix-cm.dtx @@ -0,0 +1,845 @@ +% \iffalse meta-comment +% +% Copyright 1993-2015 +% The LaTeX3 Project and any individual authors listed elsewhere +% in this file. +% +% This file is part of the LaTeX base system. +% ------------------------------------------- +% +% It may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3c +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This file has the LPPL maintenance status "maintained". +% +% The list of all files belonging to the LaTeX base distribution is +% given in the file `manifest.txt'. See also `legal.txt' for additional +% information. +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with +% extension .ins) which are part of the distribution. +% +% \fi +% +% \iffalse +% +%<*dtx> + \ProvidesFile{fix-cm.dtx} +%</dtx> +%<fix-cm>\NeedsTeXFormat{LaTeX2e} +%<fix-cm>\ProvidesPackage{fix-cm} +%<driver>\ProvidesFile{fix-cm.drv} +% \fi +% \ProvidesFile{fix-cm.dtx} + [2015/01/14 v1.1t fixes to LaTeX] +% +% \iffalse +%<*driver> + \documentclass{ltxdoc} + \newcommand\Lopt[1]{\textsf{#1}} + \let\Lpack\Lopt + \providecommand{\file}[1]{\texttt{#1}} + \providecommand{\MF}{\textsf{Metafont}} + \providecommand{\danger}{\marginpar[\hfill\protect\Huge!!]{\protect\Huge!!\hfill}} + \begin{document} + \DocInput{fix-cm.dtx} + \end{document} +%</driver> +% \fi +% +% \CheckSum{161} +% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +% +% +% +% \let\package\textsf +% +% +% \GetFileInfo{fix-cm.dtx} +% +% \title{The \Lpack{fix-cm} package\thanks{This file +% has version number \fileversion, last +% revised \filedate.}} +% \author{Frank Mittelbach, David Carlisle, Chris Rowley, Walter +% Schmidt\thanks{Walter wrote \Lpack{fix-cm}}} +% \date{\filedate} +% \MaintainedByLaTeXTeam{latex} +% \maketitle +% +% \begin{abstract} +%\Lpack{fix-cm} improves the definitions of the Computer Modern +% font families. +% \end{abstract} +% +% \tableofcontents +% +% \newpage +% +% \section{Introduction} +% +% +% \begin{sloppypar} +% To use the \Lpack{fix-cm} package, +% load \danger it \emph{before} \cmd{\documentclass}, +% and use the command \cmd{\RequirePackage} to do so, rather than the +% normal \cmd{\usepackage}: +% \end{sloppypar} +% \begin{verse} +% |\RequirePackage{fix-cm}|\\ +% |\documentclass| \dots +% \end{verse} +% +% +% \section{Using EC fonts (T1 encoding) makes my documents look +% different} +% +% No I'm not trying to collect any cites from the news group +% discussion on this topic. In a nutshell, if one adds +%\begin{verbatim} +%\usepackage[T1]{fontenc} +%\end{verbatim} +% to a document that uses the Computer Modern typefaces, +% then not only the T1 encoding is used but the fonts +% used in the document look noticeably different. This is due to the fact +% that the EC fonts have more font series designs, e.g.\ a 14.4\,pt bold +% etc and those get used in the standard \texttt{.fd} files, while +% with Computer Modern (in OT1 encoding) such sizes were scaled +% versions of smaller sizes---with a noticeable different look and +% feel. +% +% So we provide a package \Lpack{fix-cm} to ensure that comparable +% definitions are used. In addition to that, the package +% \Lpack{fix-cm} also enables continuous scaling of the CM fonts. +% This package was written by Walter Schmidt. +% +%% +%^^A The documentation in this section was prepared by Walter Schmidt. +% +% +% +% \subsection{What \Lpack{fix-cm} does} +% + +% Loading the package \Lpack{fix-cm} changes the font definitions of the +% Computer Modern fonts, in order to achieve the following effects: +% \begin{itemize} +% \item +% The appearance of the T1 and TS1 encoded CM fonts (aka `EC') is +% made as similar as possible to the traditional (OT1 encoded) ones. +% Particularly, a number of broken or ugly design sizes are no +% longer used, the look of the bold sans serif typeface at large +% sizes is considerably improved, and mismatches between the text +% fonts and the corresponding math fonts are avoided. As a side +% effect, PostScript and PDF documents may become smaller, because +% fewer fonts need to be embedded. +% \item +% The Computer Modern fonts are made available with arbitrary sizes. +% \item +% Only those design sizes of the fonts will be used, that are +% normally available in Type1 format, too. You need not load the +% extra package \Lpack{cmmib57} for this purpose. +% \end{itemize} +% The package acts on the following font families: +% \begin{itemize} +% \item +% The text font families \file{cmr}, \file{cmss}, \file{cmtt} and +% \file{cmvtt} with OT1, T1 and TS1 encoding. +% \item +% The default math fonts used by \LaTeX, i.e., the font families +% \file{cmm} with encoding OML and \file{cms} with encoding OMS. +% \item +% The symbols used by the package \Lpack{latexsym}, i.e., the font +% family \file{lasy}. +% \end{itemize} +% Note that the package does \emph{not} act on: +% \begin{itemize} +% \item Font families such as CM~Fibonacci, CM~Dunhill etc., +% which are provided for experimental purposes or for fun only. +% \item +% CM text fonts with character sets other than Latin, e.g., +% Cyrillic. Loading of the required font and encoding definitions +% while the fonts are not actually used, would not be a good idea. +% This should be addressed by particular packages or by changing the +% standard FDs of these fonts. +% \item +% Extra math fonts such as the AMS symbol fonts. While +% they match the style of Computer Modern, they are frequently used +% in conjunction with other font families, too. Thus, +% \Lpack{fix-cm} is obviously not the right place to make sure that +% they can be scaled continuously. Ask the maintainers of these +% fonts to provide this feature, which is badly needed! +% \item +% The math extension font \file{cmex}. Whether or not this font +% should be scaled is a question of its own, and there are other +% packages (\Lpack{exscale}, \Lpack{amsmath}, \Lpack{amsfonts}) to +% take care of it. +% \end{itemize} +% +% \subsection{How to load the package} +% \begin{sloppypar} +% The package should be loaded \danger \emph{before} \cmd{\documentclass}, +% using the command |\RequirePackage{fix-cm}|, rather than the +% normal \cmd{\usepackage}. +% Rationale: +% If the package is loaded in the preamble, a preceding package or +% even the code of the document class may have used any of the CM +% fonts already. However, the definitions of those fonts, that are +% already in use, cannot be changed any more. +% \end{sloppypar} +% +% \subsection{Usage notes} +% In contrast to what you may expect, \Lpack{fix-cm} does \emph{not} +% ensure that line and page breaks stay the same, when you switch an +% existing document from OT1 to T1 encoding. The package does not +% turn off all of the additional design sizes in the EC fonts +% collection: Those, that contribute considerably to the typographical +% quality and do not conflict with the math fonts, +% are---indeed---used. +% +% Be careful when using arbitrary, non-standard font sizes with +% applications that need bitmap fonts: You may end up \danger with +% lots of possibly huge \file{.pk} files. Also, \MF{} chokes +% sometimes on extremely small or large sizes, because of arithmetic +% problems. +% +% \Lpack{fix-cm} supersedes the experimental packages \Lpack{cmsd} and +% \Lpack{fix-ec}, which are no longer distributed. +% +% The packages \Lpack{type1cm} and \Lpack{type1ec} must not be loaded +% additionally; they enable only continuous scaling. +% +% +% +% +% \StopEventually{} +% +% \section{Implementation} +% +% \subsection{Preliminaries} +% The \LaTeX{} kernel does not declare the font encoding TS1. +% However, we are going to set up font definitions for this encoding, +% so we have to declare it now. +% \begin{macrocode} +%<*fix-cm> +\input{ts1enc.def} +% \end{macrocode} +% +% In case the package is loaded in the preamble, any of the CM fonts may +% have been used already and cannot be redefined. Yet we try to +% intercept at least the problem that is most likely to occur, i.e., +% a hidden \cmd{\normalfont}. Most of the standard definitions +% are ok, but those for T1 encoding and 10.95\,pt need to be removed: +% \begin{macrocode} +\expandafter \let \csname T1/cmr/m/n/10.95\endcsname \relax +\expandafter \let \csname T1/cmss/m/n/10.95\endcsname \relax +\expandafter \let \csname T1/cmtt/m/n/10.95\endcsname \relax +\expandafter \let \csname T1/cmvtt/m/n/10.95\endcsname \relax +% \end{macrocode} +% +% \Lpack{fix-cm} may still fail, if the EC fonts are preloaded in the +% \LaTeX{} format file. This situation is, however, very unlikely and could occur +% only with a customized format. +% +% The remainder of the package is enclosed in a group, where the catcodes +% are guaranteed to be appropriate for the processing of font definitions. +% \begin{macrocode} +\begingroup +\nfss@catcodes +% \end{macrocode} +% +% \subsection{T1 encoding} +% +% \paragraph{CM Roman} +% \begin{macrocode} +\DeclareFontFamily{T1}{cmr}{} +\DeclareFontShape{T1}{cmr}{m}{n}{ + <-6> ecrm0500 + <6-7> ecrm0600 + <7-8> ecrm0700 + <8-9> ecrm0800 + <9-10> ecrm0900 + <10-12> ecrm1000 + <12-17> ecrm1200 + <17-> ecrm1728 + }{} +\DeclareFontShape{T1}{cmr}{m}{sl}{ + <-6> ecsl0500 + <6-7> ecsl0600 + <7-8> ecsl0700 + <8-9> ecsl0800 + <9-10> ecsl0900 + <10-12> ecsl1000 + <12-17> ecsl1200 + <17-> ecsl1728 + }{} +\DeclareFontShape{T1}{cmr}{m}{it}{ + <-8> ecti0700 + <8-9> ecti0800 + <9-10> ecti0900 + <10-12> ecti1000 + <12-17> ecti1200 + <17-> ecti1728 + }{} +\DeclareFontShape{T1}{cmr}{m}{sc}{ + <-6> eccc0500 + <6-7> eccc0600 + <7-8> eccc0700 + <8-9> eccc0800 + <9-10> eccc0900 + <10-12> eccc1000 + <12-17> eccc1200 + <17-> eccc1728 + }{} +\DeclareFontShape{T1}{cmr}{m}{ui}{ + <-8> ecui0700 + <8-9> ecui0800 + <9-10> ecui0900 + <10-12> ecui1000 + <12-17> ecui1200 + <17-> ecui1728 + }{} +\DeclareFontShape{T1}{cmr}{b}{n}{ + <-6> ecrb0500 + <6-7> ecrb0600 + <7-8> ecrb0700 + <8-9> ecrb0800 + <9-10> ecrb0900 + <10-12> ecrb1000 + <12-17> ecrb1200 + <17-> ecrb1728 + }{} +\DeclareFontShape{T1}{cmr}{bx}{n}{ + <-6> ecbx0500 + <6-7> ecbx0600 + <7-8> ecbx0700 + <8-9> ecbx0800 + <9-10> ecbx0900 + <10-12> ecbx1000 + <12-> ecbx1200 + }{} +\DeclareFontShape{T1}{cmr}{bx}{sl}{ + <-6> ecbl0500 + <6-7> ecbl0600 + <7-8> ecbl0700 + <8-9> ecbl0800 + <9-10> ecbl0900 + <10-12> ecbl1000 + <12-> ecbl1200 + }{} +\DeclareFontShape{T1}{cmr}{bx}{it}{ + <-8> ecbi0700 + <8-9> ecbi0800 + <9-10> ecbi0900 + <10-12> ecbi1000 + <12-> ecbi1200 + }{} +\DeclareFontShape{T1}{cmr}{bx}{sc}{ + <-6> ecxc0500 + <6-7> ecxc0600 + <7-8> ecxc0700 + <8-9> ecxc0800 + <9-10> ecxc0900 + <10-12> ecxc1000 + <12-> ecxc1200 + }{} +% +% \end{macrocode} +% +% \paragraph{CM Sans} +% \begin{macrocode} +\DeclareFontFamily{T1}{cmss}{} +\DeclareFontShape{T1}{cmss}{m}{n}{ + <-9> ecss0800 + <9-10> ecss0900 + <10-12> ecss1000 + <12-17> ecss1200 + <17-> ecss1728 + }{} +\DeclareFontShape{T1}{cmss}{m}{sl}{ + <-9> ecsi0800 + <9-10> ecsi0900 + <10-12> ecsi1000 + <12-17> ecsi1200 + <17-> ecsi1728 + }{} +\DeclareFontShape{T1}{cmss}{m}{it} + {<->ssub*cmss/m/sl}{} +\DeclareFontShape{T1}{cmss}{m}{sc} + {<->sub*cmr/m/sc}{} +\DeclareFontShape{T1}{cmss}{sbc}{n}{ + <-> ecssdc10 + }{} +\DeclareFontShape{T1}{cmss}{bx}{n}{ + <-10> ecsx0900 + <10-> ecsx1000 + }{} +\DeclareFontShape{T1}{cmss}{bx}{sl}{ + <-10> ecso0900 + <10-> ecso1000 + }{} +\DeclareFontShape{T1}{cmss}{bx}{it} + {<->ssub*cmss/bx/sl}{} +% \end{macrocode} +% The following substitutions are not provided in the default +% \file{.fd} files. I have included them, so that you can +% easily use the EC fonts with the default bold series being +% \file{b} rather than \file{bx}. +% \begin{macrocode} +\DeclareFontShape{T1}{cmss}{b}{n} + {<->ssub*cmss/bx/n}{} +\DeclareFontShape{T1}{cmss}{b}{sl} + {<->ssub*cmss/bx/sl}{} +\DeclareFontShape{T1}{cmss}{b}{it} + {<->ssub*cmss/bx/sl}{} +% \end{macrocode} +% +% \paragraph{CM Typewriter} +% \begin{macrocode} +\DeclareFontFamily{T1}{cmtt}{\hyphenchar \font\m@ne} +\DeclareFontShape{T1}{cmtt}{m}{n}{ + <-9> ectt0800 + <9-10> ectt0900 + <10-12> ectt1000 + <12-17> ectt1200 + <17-> ectt1728 + }{} +\DeclareFontShape{T1}{cmtt}{m}{it}{ + <-9> ecit0800 + <9-10> ecit0900 + <10-12> ecit1000 + <12-17> ecit1200 + <17-> ecit1728 + }{} +\DeclareFontShape{T1}{cmtt}{m}{sl}{ + <-9> ecst0800 + <9-10> ecst0900 + <10-12> ecst1000 + <12-17> ecst1200 + <17-> ecst1728 + }{} +\DeclareFontShape{T1}{cmtt}{m}{sc}{ + <-9> ectc0800 + <9-10> ectc0900 + <10-12> ectc1000 + <12-17> ectc1200 + <17-> ectc1728 + }{} +\DeclareFontShape{T1}{cmtt}{bx}{n} + {<->sub * cmtt/m/n}{} +\DeclareFontShape{T1}{cmtt}{bx}{it} + {<->sub * cmtt/m/it}{} +\DeclareFontShape{T1}{cmtt}{bx}{sl} + {<->sub * cmtt/m/sl}{} +% \end{macrocode} +% Substitutions not provided in the default \file{.fd} files: +% \begin{macrocode} +\DeclareFontShape{T1}{cmtt}{b}{n} + {<->sub * cmtt/m/n}{} +\DeclareFontShape{T1}{cmtt}{b}{it} + {<->sub * cmtt/m/it}{} +\DeclareFontShape{T1}{cmtt}{b}{sl} + {<->sub * cmtt/m/sl}{} +% \end{macrocode} +% +% \paragraph{CM Typewiter (var.)} +% \begin{macrocode} +\DeclareFontFamily{T1}{cmvtt}{} +\DeclareFontShape{T1}{cmvtt}{m}{n}{ + <-9> ecvt0800 + <9-10> ecvt0900 + <10-12> ecvt1000 + <12-17> ecvt1200 + <17-> ecvt1728 + }{} +\DeclareFontShape{T1}{cmvtt}{m}{it}{ + <-9> ecvi0800 + <9-10> ecvi0900 + <10-12> ecvi1000 + <12-17> ecvi1200 + <17-> ecvi1728 + }{} +% \end{macrocode} +% +% \subsection{TS1 encoding} +% +% \paragraph{CM Roman} +% \begin{macrocode} +\DeclareFontFamily{TS1}{cmr}{\hyphenchar\font\m@ne} +\DeclareFontShape{TS1}{cmr}{m}{n}{ + <-6> tcrm0500 + <6-7> tcrm0600 + <7-8> tcrm0700 + <8-9> tcrm0800 + <9-10> tcrm0900 + <10-12> tcrm1000 + <12-17> tcrm1200 + <17-> tcrm1728 + }{} +\DeclareFontShape{TS1}{cmr}{m}{sl}{ + <-6> tcsl0500 + <6-7> tcsl0600 + <7-8> tcsl0700 + <8-9> tcsl0800 + <9-10> tcsl0900 + <10-12> tcsl1000 + <12-17> tcsl1200 + <17-> tcsl1728 + }{} +\DeclareFontShape{TS1}{cmr}{m}{it}{ + <-8> tcti0700 + <8-9> tcti0800 + <9-10> tcti0900 + <10-12> tcti1000 + <12-17> tcti1200 + <17-> tcti1728 + }{} +\DeclareFontShape{TS1}{cmr}{m}{ui}{ + <-8> tcui0700 + <8-9> tcui0800 + <9-10> tcui0900 + <10-12> tcui1000 + <12-17> tcui1200 + <17-> tcui1728 + }{} +\DeclareFontShape{TS1}{cmr}{b}{n}{ + <-6> tcrb0500 + <6-7> tcrb0600 + <7-8> tcrb0700 + <8-9> tcrb0800 + <9-10> tcrb0900 + <10-12> tcrb1000 + <12-17> tcrb1200 + <17-> tcrb1728 + }{} +\DeclareFontShape{TS1}{cmr}{bx}{n}{ + <-6> tcbx0500 + <6-7> tcbx0600 + <7-8> tcbx0700 + <8-9> tcbx0800 + <9-10> tcbx0900 + <10-12> tcbx1000 + <12-> tcbx1200 + }{} +\DeclareFontShape{TS1}{cmr}{bx}{sl}{ + <-6> tcbl0500 + <6-7> tcbl0600 + <7-8> tcbl0700 + <8-9> tcbl0800 + <9-10> tcbl0900 + <10-12> tcbl1000 + <12-> tcbl1200 + }{} +\DeclareFontShape{TS1}{cmr}{bx}{it}{ + <-8> tcbi0700 + <8-9> tcbi0800 + <9-10> tcbi0900 + <10-12> tcbi1000 + <12-> tcbi1200 + }{} +% \end{macrocode} +% +% \paragraph{CM Sans} +% \begin{macrocode} +\DeclareFontFamily{TS1}{cmss}{\hyphenchar\font\m@ne} +\DeclareFontShape{TS1}{cmss}{m}{n}{ + <-9> tcss0800 + <9-10> tcss0900 + <10-12> tcss1000 + <12-17> tcss1200 + <17-> tcss1728 + }{} +\DeclareFontShape{TS1}{cmss}{m}{it} + {<->ssub*cmss/m/sl}{} +\DeclareFontShape{TS1}{cmss}{m}{sl}{ + <-9> tcsi0800 + <9-10> tcsi0900 + <10-12> tcsi1000 + <12-17> tcsi1200 + <17-> tcsi1728 + }{} +\DeclareFontShape{TS1}{cmss}{sbc}{n}{ + <-> tcssdc10 + }{} +\DeclareFontShape{TS1}{cmss}{bx}{n}{ + <-10> tcsx0900 + <10-> tcsx1000 + }{} +\DeclareFontShape{TS1}{cmss}{bx}{sl}{ + <-10> tcso0900 + <10-> tcso1000 + }{} +\DeclareFontShape{TS1}{cmss}{bx}{it} + {<->ssub*cmss/bx/sl}{} +% \end{macrocode} +% Substitutions not provided in the default \file{.fd} files: +% \begin{macrocode} +\DeclareFontShape{TS1}{cmss}{b}{n} + {<->ssub*cmss/bx/n}{} +\DeclareFontShape{TS1}{cmss}{b}{sl} + {<->ssub*cmss/bx/sl}{} +\DeclareFontShape{TS1}{cmss}{b}{it} + {<->ssub*cmss/bx/sl}{} +% \end{macrocode} +% +% \paragraph{CM Typewriter} +% \begin{macrocode} +\DeclareFontFamily{TS1}{cmtt}{\hyphenchar \font\m@ne} +\DeclareFontShape{TS1}{cmtt}{m}{n}{ + <-9> tctt0800 + <9-10> tctt0900 + <10-12> tctt1000 + <12-17> tctt1200 + <17-> tctt1728 + }{} +\DeclareFontShape{TS1}{cmtt}{m}{it}{ + <-9> tcit0800 + <9-10> tcit0900 + <10-12> tcit1000 + <12-17> tcit1200 + <17-> tcit1728 + }{} +\DeclareFontShape{TS1}{cmtt}{m}{sl}{ + <-9> tcst0800 + <9-10> tcst0900 + <10-12> tcst1000 + <12-17> tcst1200 + <17-> tcst1728 + }{} +\DeclareFontShape{TS1}{cmtt}{bx}{n} + {<->sub * cmtt/m/n}{} +\DeclareFontShape{TS1}{cmtt}{bx}{it} + {<->sub * cmtt/m/it}{} +\DeclareFontShape{TS1}{cmtt}{bx}{sl} + {<->sub * cmtt/m/sl}{} +% \end{macrocode} +% Substitutions not provided in the default \file{.fd} files: +% \begin{macrocode} +\DeclareFontShape{TS1}{cmtt}{b}{n} + {<->sub * cmtt/m/n}{} +\DeclareFontShape{TS1}{cmtt}{b}{it} + {<->sub * cmtt/m/it}{} +\DeclareFontShape{TS1}{cmtt}{b}{sl} + {<->sub * cmtt/m/sl}{} +% \end{macrocode} +% +% \paragraph{CM Typewriter (var.)} +% \begin{macrocode} +\DeclareFontFamily{TS1}{cmvtt}{} +\DeclareFontShape{TS1}{cmvtt}{m}{n}{ + <-9> tcvt0800 + <9-10> tcvt0900 + <10-12> tcvt1000 + <12-17> tcvt1200 + <17-> tcvi1728 + }{} +\DeclareFontShape{TS1}{cmvtt}{m}{it}{ + <-9> tcvi0800 + <9-10> tcvi0900 + <10-12> tcvi1000 + <12-17> tcvi1200 + <17-> tcvi1728 + }{} +% \end{macrocode} +% +% \subsection{OT1 encoding} +% +% \paragraph{CM Roman} +% \begin{macrocode} +\DeclareFontFamily{OT1}{cmr}{\hyphenchar\font45 } +\DeclareFontShape{OT1}{cmr}{m}{n}{ + <-6> cmr5 + <6-7> cmr6 + <7-8> cmr7 + <8-9> cmr8 + <9-10> cmr9 + <10-12> cmr10 + <12-17> cmr12 + <17-> cmr17 + }{} +\DeclareFontShape{OT1}{cmr}{m}{sl}{ + <-9> cmsl8 + <9-10> cmsl9 + <10-12> cmsl10 + <12-> cmsl12 + }{} +\DeclareFontShape{OT1}{cmr}{m}{it}{ + <-8> cmti7 + <8-9> cmti8 + <9-10> cmti9 + <10-12> cmti10 + <12-> cmti12 + }{} +\DeclareFontShape{OT1}{cmr}{m}{sc}{ + <-> cmcsc10 + }{} +\DeclareFontShape{OT1}{cmr}{m}{ui}{ + <-> cmu10 + }{} +\DeclareFontShape{OT1}{cmr}{b}{n}{ + <-> cmb10 + }{} +\DeclareFontShape{OT1}{cmr}{bx}{n}{ + <-6> cmbx5 + <6-7> cmbx6 + <7-8> cmbx7 + <8-9> cmbx8 + <9-10> cmbx9 + <10-12> cmbx10 + <12-> cmbx12 + }{} +\DeclareFontShape{OT1}{cmr}{bx}{sl}{ + <-> cmbxsl10 + }{} +\DeclareFontShape{OT1}{cmr}{bx}{it}{ + <-> cmbxti10 + }{} +\DeclareFontShape{OT1}{cmr}{bx}{ui} + {<->sub*cmr/m/ui}{} +% \end{macrocode} +% +% \paragraph{CM Sans} +% \begin{macrocode} +\DeclareFontFamily{OT1}{cmss}{\hyphenchar\font45 } +\DeclareFontShape{OT1}{cmss}{m}{n}{ + <-9> cmss8 + <9-10> cmss9 + <10-12> cmss10 + <12-17> cmss12 + <17-> cmss17 + }{} +\DeclareFontShape{OT1}{cmss}{m}{it} + {<->sub*cmss/m/sl}{} +\DeclareFontShape{OT1}{cmss}{m}{sl}{ + <-9> cmssi8 + <9-10> cmssi9 + <10-12> cmssi10 + <12-17> cmssi12 + <17-> cmssi17 + }{} +\DeclareFontShape{OT1}{cmss}{m}{sc} + {<->sub*cmr/m/sc}{} +\DeclareFontShape{OT1}{cmss}{m}{ui} + {<->sub*cmr/m/ui}{} +\DeclareFontShape{OT1}{cmss}{sbc}{n}{ + <-> cmssdc10 + }{} +\DeclareFontShape{OT1}{cmss}{bx}{n}{ + <-> cmssbx10 + }{} +\DeclareFontShape{OT1}{cmss}{bx}{ui} + {<->sub*cmr/bx/ui}{} +% \end{macrocode} +% +% \paragraph{CM Typewriter} +% \begin{macrocode} +\DeclareFontFamily{OT1}{cmtt}{\hyphenchar \font\m@ne} +\DeclareFontShape{OT1}{cmtt}{m}{n}{ + <-9> cmtt8 + <9-10> cmtt9 + <10-12> cmtt10 + <12-> cmtt12 + }{} +\DeclareFontShape{OT1}{cmtt}{m}{it}{ + <-> cmitt10 + }{} +\DeclareFontShape{OT1}{cmtt}{m}{sl}{ + <-> cmsltt10 + }{} +\DeclareFontShape{OT1}{cmtt}{m}{sc}{ + <-> cmtcsc10 + }{} +\DeclareFontShape{OT1}{cmtt}{m}{ui} + {<->ssub*cmtt/m/it}{} +\DeclareFontShape{OT1}{cmtt}{bx}{n} + {<->ssub*cmtt/m/n}{} +\DeclareFontShape{OT1}{cmtt}{bx}{it} + {<->ssub*cmtt/m/it}{} +\DeclareFontShape{OT1}{cmtt}{bx}{ui} + {<->ssub*cmtt/m/it}{} +% \end{macrocode} +% +% \paragraph{CM Typewriter (var.)} +% \begin{macrocode} +\DeclareFontFamily{OT1}{cmvtt}{\hyphenchar\font45 } +\DeclareFontShape{OT1}{cmvtt}{m}{n}{ + <-> cmvtt10 + }{} +\DeclareFontShape{OT1}{cmvtt}{m}{it}{ + <-> cmvtti10 + }{} +% \end{macrocode} +% +% \subsection{OML and OMS encoded math fonts} +% \begin{macrocode} +\DeclareFontFamily{OML}{cmm}{\skewchar\font127 } +\DeclareFontShape{OML}{cmm}{m}{it}{ + <-6> cmmi5 + <6-7> cmmi6 + <7-8> cmmi7 + <8-9> cmmi8 + <9-10> cmmi9 + <10-12> cmmi10 + <12-> cmmi12 + }{} +\DeclareFontShape{OML}{cmm}{b}{it}{<-6>cmmib5<6-8>cmmib7<8->cmmib10}{} +\DeclareFontShape{OML}{cmm}{bx}{it} + {<->ssub*cmm/b/it}{} +% \end{macrocode} +% \begin{macrocode} +\DeclareFontFamily{OMS}{cmsy}{\skewchar\font48 } +\DeclareFontShape{OMS}{cmsy}{m}{n}{ + <-6> cmsy5 + <6-7> cmsy6 + <7-8> cmsy7 + <8-9> cmsy8 + <9-10> cmsy9 + <10-> cmsy10 + }{} +\DeclareFontShape{OMS}{cmsy}{b}{n}{<-6>cmbsy5<6-8>cmbsy7<8->cmbsy10}{} +% \end{macrocode} +% +% \subsection{\LaTeX{} symbols} +% \begin{macrocode} +\DeclareFontFamily{U}{lasy}{} +\DeclareFontShape{U}{lasy}{m}{n}{ + <-6> lasy5 + <6-7> lasy6 + <7-8> lasy7 + <8-9> lasy8 + <9-10> lasy9 + <10-> lasy10 + }{} +\DeclareFontShape{U}{lasy}{b}{n}{ + <-10> ssub * lasy/m/n + <10-> lasyb10 + }{} +% \end{macrocode} +% \begin{macrocode} +\endgroup +%</fix-cm> +% \end{macrocode} +% +% \Finale +% +\endinput diff --git a/Master/texmf-dist/source/latex/base/fixltx2e.ins b/Master/texmf-dist/source/latex/base/fix-cm.ins index c54d1f6e235..db6b3cc0075 100644 --- a/Master/texmf-dist/source/latex/base/fixltx2e.ins +++ b/Master/texmf-dist/source/latex/base/fix-cm.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,18 +70,16 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble \keepsilent \usedir{tex/latex/base} -\generateFile{fixltx2e.sty}{t}{% - \from{fixltx2e.dtx}{fixltx2e}} \generateFile{fix-cm.sty}{t}{% - \from{fixltx2e.dtx}{fix-cm}} + \from{fix-cm.dtx}{fix-cm}} \endbatchfile diff --git a/Master/texmf-dist/source/latex/base/fixltx2e.dtx b/Master/texmf-dist/source/latex/base/fixltx2e.dtx deleted file mode 100644 index 0898f5c1303..00000000000 --- a/Master/texmf-dist/source/latex/base/fixltx2e.dtx +++ /dev/null @@ -1,2283 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1993-2014 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% -% This file is part of the LaTeX base system. -% ------------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This file has the LPPL maintenance status "maintained". -% -% The list of all files belonging to the LaTeX base distribution is -% given in the file `manifest.txt'. See also `legal.txt' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% -% \fi -% -% \iffalse -% -%<*dtx> - \ProvidesFile{fixltx2e.dtx} -%</dtx> -%<fixltx2e,fix-cm>\NeedsTeXFormat{LaTeX2e} -%<fixltx2e>\ProvidesPackage{fixltx2e} -%<fix-cm>\ProvidesPackage{fix-cm} -%<driver>\ProvidesFile{fixltx2e.drv} -% \fi -% \ProvidesFile{fixltx2e.dtx} - [2014/09/29 v1.1s fixes to LaTeX] -% -% \iffalse -%<*driver> - \documentclass{ltxdoc} - \newcommand\Lopt[1]{\textsf{#1}} - \let\Lpack\Lopt - \providecommand{\file}[1]{\texttt{#1}} - \providecommand{\MF}{\textsf{Metafont}} - \providecommand{\danger}{\marginpar[\hfill\protect\Huge!!]{\protect\Huge!!\hfill}} - \begin{document} - \DocInput{fixltx2e.dtx} - \end{document} -%</driver> -% \fi -% -% \CheckSum{1221} -% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -% -% -% -% \let\package\textsf -% -% -% \GetFileInfo{fixltx2e.dtx} -% -% \title{The \Lpack{fixltx2e} and \Lpack{fix-cm} packages\thanks{This file -% has version number \fileversion, last -% revised \filedate.}} -% \author{Frank Mittelbach, David Carlisle, Chris Rowley, Walter -% Schmidt\thanks{Walter wrote \Lpack{fix-cm}}} -% \date{\filedate} -% \maketitle -% -% \begin{abstract} -% These packages provides fixes to \LaTeXe{} which are desirable -% but cannot be integrated into the \LaTeXe{} kernel or the -% font definition files directly as they would produce a version -% incompatible to earlier releases (either in formatting or -% functionality). -% -% By providing these fixes in the form of packages, users can benefit -% from them without the danger that their documents will fail or -% produce unexpected results at other sites since the documents -% contain a clear indication (the |\usepackage| line, preferably -% with a required date) that the fixes are needed. -% \end{abstract} -% -% \tableofcontents -% -% \newpage -% -% \section{Introduction} -% -% In the newsletter \texttt{ltnews07.tex}, which accompanied the -% \LaTeXe{} maintenance release of June 1997, we wrote: -% \begin{quote} -% Many of the problem reports we receive concerning the standard -% classes are not concerned with bugs but are suggesting, more or -% less politely, that the design decisions embodied in them are -% `not optimal' and asking us to modify them. -% -% There are several reasons why we have decided not to make such -% changes to these files. -% \begin{itemize} -% \item However misguided, the current behaviour is clearly what -% was intended when these classes were designed. \item It is not -% good practice to change such aspects of `standard classes' -% because many people will be relying on them. -% \end{itemize} -% -% We have therefore decided not to even consider making such -% modifications, nor to spend time justifying that decision. This -% does not mean that we do not agree that there are many -% deficiencies in the design of these classes, but we have many -% tasks with higher priority than continually explaining why the -% standard classes for \LaTeX{} cannot be changed. -% \end{quote} -% -% Back then we probably should have said that this decision also -% covers changes to the \LaTeX{} kernel and font definitions, -% if the change results in -% noticeable differences in the formatting of documents or otherwise -% produces severe incompatibilities between releases. The important -% point to stress here is that ``people rely on the fact that a -% document formatted at one site produces identical output at a -% different site''. By fixing a certain problem in version -% \meta{date}, people making use of the fix will get incorrectly -% formatted documents if they send them to others who still run on a -% version prior to \meta{date}. -% -% In theory one could get around this by adding a line like -% \begin{quote} -% |\NeedsTeXFormat{latex2e}[|\meta{date}|]| -% \end{quote} -% on top of the document. However, this fails for two reasons. Firstly, -% most people will not be aware that they make use of a feature or fix -% that is only available in their version of \LaTeX{}; and thus do not -% add such a line in their documents. Secondly, even if there is such a -% line the receiving site might not be able to upgrade their \LaTeX{} -% in time to process the document properly (the latter is a sad fact -% of life). -% -% By providing the \Lpack{fixltx2e} and \Lpack{fix-cm} packages -% we hope to help people in this respect since, when they -% are used, a document will contain a clear -% indication that special features/fixes are needed and if the -% receiving site does not have the packages available (or not available -% with the right version) it is far easier to download and install them -% from some archive than to upgrade \LaTeX{} in a rush. -% -% The packages are independent from each other and deal with different -% subjects: -% \Lpack{fixltx2e} provides general changes to the \LaTeX{} kernel, -% while \Lpack{fix-cm} improves the definitions of the Computer Modern -% font families. -% -% We will try to maintain the packages in such a way that they can be used -% with all maintenance releases of \LaTeXe{} so that, if urgently -% needed, people can simply add them to the current directory in case -% they cannot upgrade their \LaTeX{} for whatever reason. -% -% The packages are \textbf{NOT} provided so that people can stop -% upgrading their \LaTeX{} system. They will contain only fixes of a -% certain nature, others will still go into the kernel and extensions -% in form of packages, and support files will still be added to the -% base system at regular intervals. -% -% -% \subsection{Using \Lpack{fixltx2e}} -% -% To use the \Lpack{fixltx2e} package include the line -% \begin{quote} -% |\usepackage{fixltx2e}[|\meta{date}|]| -% \end{quote} -% into the preamble of your document, where \meta{date} is the date of -% the \Lpack{fixltx2e} package that you are using. -% This way your document will produce a warning if processed at a site -% that only has an older version of of this package. -% -% \subsection{Using \Lpack{fix-cm}} -% -% \begin{sloppypar} -% To use the \Lpack{fix-cm} package, -% load \danger it \emph{before} \cmd{\documentclass}, -% and use the command \cmd{\RequirePackage} to do so, rather than the -% normal \cmd{\usepackage}: -% \end{sloppypar} -% \begin{verse} -% |\RequirePackage{fix-cm}|\\ -% |\documentclass| \dots -% \end{verse} -% \textbf{Do not to load any other package before the document class}, -% unless you have a thorough understanding of the \LaTeX{} internals -% and know exactly what you are doing! -% -% -% \section{Fixes added} -% -% This section describes all the fixes/features that have been added -% to the initial release of the package. If applicable the bug report -% info (see \texttt{bugs.txt}) is given. -% -% -% -% -% \subsection{2-col: 1-col fig can come before earlier 2-col fig -% (pr/2346)} -% -%\begin{verbatim} -% >Number: 2346 -% >Category: latex -% >Synopsis: 2-col: 1-col fig can come before earlier 2-col fig -% >Arrival-Date: Wed Dec 18 15:41:07 1996 -% >Originator: w.l.kleb@larc.nasa.gov (bil kleb) -% >Description: -% as documented in lamport's book, p. 198, concerning figure -% placement, "a figure will not be printed before an earlier -% figure, and a table will not be printed before an earlier -% table." however, there is a footnote stating, "However, -% in two-column page style, a single-column figure can come before -% an earlier double-column figure, and vice versa." -% -% this twocolumn behavior is undesireable---at least by me and -% most professional organizations i publish in. ed snyzter developed -% a hack fix for 2.09 several years ago which links the two -% counters, but i have not run across a similar "fix" for 2e... -% \end{verbatim} -% -% Originally fixed in package \Lpack{fix2col} which was merged into -% this package. Documentation and code from this package have been -% merged into this file. -% -% \subsubsection{Notes on the Implementation Strategy} -% -% The standard output routine maintains two lists of floats that have -% been `deferred' for later consideration. One list for single column -% floats, and one for double column floats (which are always -% immediately put onto their deferred list). This mechanism means -% that \LaTeX\ `knows' which type of float is contained in each box -% by the list that it is processing, but having two lists means -% that there is no mechanism for preserving the order between the -% floats in each list. -% -% The solution to this problem consists of two small changes to -% the output routine. -% -% Firstly, abandon the `double column float list' |\@dbldeferlist| -% and change every command where it is used so that instead the -% same |\@deferlist| is used as for single column floats. -% That one change ensures that double and single column floats -% stay in the same sequence, but as \LaTeX\ no longer `knows' -% whether a float is double or single column, it will happily -% insert a double float into a single column, overprinting the -% other column, or the margin. -% -% The second change is to provide an alternative mechanism for -% recording the two column floats. \LaTeX\ already has a compact -% mechanism for recording float information, an integer count register -% assigned to each float records information about the `type' of float -% `figure', `table' and the position information `htp' etc. -% -% The type information is stored in the `high' bits, one bit position -% (above `32') allocated to each float type. The `low' bits store -% information about the allowed positions, one bit each allocated for -% |h t b p|. In the \LaTeX2.09 system, the bit corresponding to `16' -% formed a `boundary' between these two sets of information, and it -% was never actually used by the system. Ed Sznyter's -% \package{fixfloats} package not unreasonably used this position to -% store the double column information, setting the bit for double -% column floats. Then at each point in the output routine at which a -% float is committed to a certain region, an additional check must be -% made to check that the float is (or is not) double column. If it -% spans the wrong number of columns it is deferred rather than being -% added. -% -% Unfortunately the bit `16' is not available in \LaTeXe. It is used -% to encode the extra float position possibility `|!|' that was added -% in that system. It would be possible to use position `32' and to -% move the flags for `table', `figure',\ldots\ up one position, to -% start at 64, but this would mean that in principle one less float -% type would be supported, and more importantly is likely to break -% any other packages that assume anything about the output routine -% internals. So here I instead use another mechanism for flagging -% double column floats: By default all floats have depth 0pt. -% This package arranges that double column ones have depth 1sp. -% This information may then be used in the same manner as in -% the \package{fixfloats} package, to defer any floats that are not of -% the correct column spanning type. -% -% -% -% \subsection{Wrong header for twocolumn (pr/2613)} -% -%\begin{verbatim} -% >Number: 2613 -% >Category: latex -% >Synopsis: wrong headline for twocolumn -% >Arrival-Date: Mon Sep 22 16:41:09 1997 -% >Originator: daniel@cs.uni-bonn.de (Daniel Reischert) -% >Description: -% When setting the document in two columns -% the headline shows the top mark of the second column, -% but it should show the top mark of the first column. -% \end{verbatim} -% -% Originally fixed in package \Lpack{fix2col} which was merged into -% this package. Documentation and code from this package have been -% merged into this file. -% -% \subsubsection{Notes on the Implementation Strategy} -% -% The standard \LaTeX\ twocolumn system works internally by making -% each column a separate `page' that is passed independently to \TeX's -% pagebreaker. (Unlike say the \package{multicol} package, where all -% columns are gathered together and then split into columns later, -% using |\vsplit|.) This means that the primitive \TeX\ marks that are -% normally used for header information, are globally reset after the -% first column. By default \LaTeX\ does nothing about this. -% A good solution is provided by Piet van Oostrum (building on earlier -% work of Joe Pallas) in his \package{fixmarks} package. -% -% After the first column box has been collected the mark information -% for that box is saved, so that any |\firstmark| can be -% `artificially' used to set the page-level marks after the second -% column has been collected. (The second column |\firstmark| is not -% normally required.) Unfortunately \TeX\ does not provide a direct -% way of knowing if any marks are in the page, |\firstmark| always has a -% value from previous pages, even if there is no mark in this page. -% The solution is to make a copy of the box and then |\vsplit| it -% so that any marks show up as |\splitfirstmark|. -% -% The use of |\vsplit| does mean that the output routine will globally -% change the value of |\splitfirstmark| and -% |\splitbotmark|. The \package{fixmarks} package goes to some trouble -% to save and restore these values so that the output routine does -% \emph{not} change the values. This part of \package{fixmarks} is not -% copied here as it is quite costly (having to be run on every page) and -% there is no reason why anyone writing code using |\vsplit| should -% allow the output routine to be triggered before the split marks have -% been accessed. -% -% -% \subsection{\texttt{\textbackslash @} discards spaces when moving -% (pr/3039)} -% -%\begin{verbatim} -% >Number: 3039 -% >Category: latex -% >Synopsis: \@ discards spaces when moving -% >Arrival-Date: Sat May 22 09:01:06 1999 -% >Originator: asnd@triumf.ca (Donald Arseneau) -% >Description: -% The \@ command expands to \spacefactor\@m in auxiliary files, -% which then ignores following spaces when it is reprocessed. -%\end{verbatim} -% -% \subsection{\texttt{\textbackslash setlength} produces error if -% used with registers like \texttt{\textbackslash dimen0} (pr/3066)} -% -%\begin{verbatim} -% >Number: 3066 -% >Category: latex -% >Synopsis: \setlength{\dimen0}{10pt} -% >Arrival-Date: Tue Jul 6 15:01:06 1999 -% >Originator: oberdiek@ruf.uni-freiburg.de (Heiko Oberdiek) -% >Description: -% The current implementation of \setlength causes an error, -% because the length specification isn't terminated properly. -% More safe: -% \def\setlength#1#2{#1=#2\relax} -%\end{verbatim} -% -% \subsection{\texttt{\textbackslash addpenalty} ruins flush-bottom (pr/3073)} -% -%\begin{verbatim} -% >Number: 3073 -% >Category: latex -% >Synopsis: \addpenalty ruins flush-bottom -% >Arrival-Date: Sat Jul 17 05:11:05 1999 -% >Originator: asnd@triumf.ca (Donald Arseneau) -% >Description: -% Just to keep in mind for further development eh? -% A page break at an \addpenalty after \vspace does *not* -% give a flush-bottom page. (The intent of \addpenalty is -% apparently just to preserve the flush bottom by putting -% the breakpoint `above' the skip.) -%\end{verbatim} -% -% -% -% \section{Fixes added for 2003/06/01} -% -% \subsection{\texttt{\textbackslash fnsymbol} should use text symbols -% if possible (pr/3400)} -% -%\begin{verbatim} -% >Number: 3400 -% >Category: latex -% >Synopsis: \fnsymbol should use text symbols if possible -% >Arrival-Date: Fri Jan 04 20:41:00 CET 2002 -% >Originator: was@VR-Web.de ( Walter Schmidt ) -% -% The \fnsymbol command can be used in both text and math -% mode. The symbols produced are, however, always taken from -% the math fonts. As a result, they may not match the text -% fonts, even if the symbols are actually available, for -% instance from the TS1 encoding. Since \fnsymbol is -% primarily used for footnotes in text, this should be fixed, -% IMO. -%\end{verbatim} -% -% -% \subsection{No hyphenation in first word after float environment (pr/3498)} -% -%\begin{verbatim} -% >Number: 3498 -% >Category: latex -% >Synopsis: No hyphenation in first word after float environment -% >Arrival-Date: Thu Jan 30 13:21:00 CET 2003 -% >Originator: h.harders@tu-bs.de (Harald Harders) -% -% If a float environment (figure, table) is written within a paragraph, -% the first word after the environment is not hyphenated. -%\end{verbatim} -% -% -% -% \subsection{Allowing \texttt{\textbackslash emph} to produce small -% caps, etc} -% -% By default |\em| or |\emph| switches to roman in an italic -% context but some designers prefer a switch to small caps in that -% case. This can be achieved by setting |\eminnershape|, e.g., -% -%\begin{verbatim} -%\renewcommand\eminnershape{\scshape} -%\end{verbatim} -% -% -% \subsection{Using EC fonts (T1 encoding) makes my documents look -% bl**dy horrible (from c.t.t.)\\ -% I can't use arbitrary sizes with CM fonts (from c.t.t.)} -% -% No I'm not trying to collect any cites from the news group -% discussion on this topic. In a nutshell, if one adds -%\begin{verbatim} -%\usepackage[T1]{fontenc} -%\end{verbatim} -% to a document that uses the Computer Modern typefaces, -% then not only the T1 encoding is used but the fonts -% used in the document look noticeably different. This is due to the fact -% that the EC fonts have more font series designs, e.g.\ a 14.4\,pt bold -% etc and those get used in the standard \texttt{.fd} files, while -% with Computer Modern (in OT1 encoding) such sizes were scaled -% versions of smaller sizes---with a noticeable different look and -% feel. -% -% So we provide a package \Lpack{fix-cm} to ensure that comparable -% definitions are used. In addition to that, the package -% \Lpack{fix-cm} also enables continuous scaling of the CM fonts. -% This package was written by Walter Schmidt. -% -% -% -%^^A \section{The macro package \textsf{fix-cm} for \LaTeXe} -% -%^^A The documentation in this section was prepared by Walter Schmidt. -% -% -% -% \subsubsection{What \Lpack{fix-cm} does} -% -% ^^A Are you bothered by the T1 and TS1 encoded Computer Modern fonts, -% ^^A which look partially worse than the traditional ones? Would you -% ^^A like to use the CM fonts with arbitrary sizes? If so, the macro -% ^^A package \Lpack{fix-cm} can help you. -% -% Loading the package \Lpack{fix-cm} changes the font definitions of the -% Computer Modern fonts, in order to achieve the following effects: -% \begin{itemize} -% \item -% The appearance of the T1 and TS1 encoded CM fonts (aka `EC') is -% made as similar as possible to the traditional (OT1 encoded) ones. -% Particularly, a number of broken or ugly design sizes are no -% longer used, the look of the bold sans serif typeface at large -% sizes is considerably improved, and mismatches between the text -% fonts and the corresponding math fonts are avoided. As a side -% effect, PostScript and PDF documents may become smaller, because -% fewer fonts need to be embedded. -% \item -% The Computer Modern fonts are made available with arbitrary sizes. -% \item -% Only those design sizes of the fonts will be used, that are -% normally available in Type1 format, too. You need not load the -% extra package \Lpack{cmmib57} for this purpose. -% \end{itemize} -% The package acts on the following font families: -% \begin{itemize} -% \item -% The text font families \file{cmr}, \file{cmss}, \file{cmtt} and -% \file{cmvtt} with OT1, T1 and TS1 encoding. -% \item -% The default math fonts used by \LaTeX, i.e., the font families -% \file{cmm} with encoding OML and \file{cms} with encoding OMS. -% \item -% The symbols used by the package \Lpack{latexsym}, i.e., the font -% family \file{lasy}. -% \end{itemize} -% Note that the package does \emph{not} act on: -% \begin{itemize} -% \item Font families such as CM~Fibonacci, CM~Dunhill etc., -% which are provided for experimental purposes or for fun only. -% \item -% CM text fonts with character sets other than Latin, e.g., -% Cyrillic. Loading of the required font and encoding definitions -% while the fonts are not actually used, would not be a good idea. -% This should be addressed by particular packages or by changing the -% standard FDs of these fonts. -% \item -% Extra math fonts such as the AMS symbol fonts. While -% they match the style of Computer Modern, they are frequently used -% in conjunction with other font families, too. Thus, -% \Lpack{fix-cm} is obviously not the right place to make sure that -% they can be scaled continuously. Ask the maintainers of these -% fonts to provide this feature, which is badly needed! -% \item -% The math extension font \file{cmex}. Whether or not this font -% should be scaled is a question of its own, and there are other -% packages (\Lpack{exscale}, \Lpack{amsmath}, \Lpack{amsfonts}) to -% take care of it. -% \end{itemize} -% -% \subsubsection{How to load the package} -% \begin{sloppypar} -% The package should be loaded \danger \emph{before} \cmd{\documentclass}, -% using the command |\RequirePackage{fix-cm}|, rather than the -% normal \cmd{\usepackage}. -% Rationale: -% If the package is loaded in the preamble, a preceding package or -% even the code of the document class may have used any of the CM -% fonts already. However, the definitions of those fonts, that are -% already in use, cannot be changed any more. -% \end{sloppypar} -% -% \subsubsection{Usage notes} -% In contrast to what you may expect, \Lpack{fix-cm} does \emph{not} -% ensure that line and page breaks stay the same, when you switch an -% existing document from OT1 to T1 encoding. The package does not -% turn off all of the additional design sizes in the EC fonts -% collection: Those, that contribute considerably to the typographical -% quality and do not conflict with the math fonts, -% are---indeed---used. -% -% Be careful when using arbitrary, non-standard font sizes with -% applications that need bitmap fonts: You may end up \danger with -% lots of possibly huge \file{.pk} files. Also, \MF{} chokes -% sometimes on extremely small or large sizes, because of arithmetic -% problems. -% -% \Lpack{fix-cm} supersedes the experimental packages \Lpack{cmsd} and -% \Lpack{fix-ec}, which are no longer distributed. -% -% The packages \Lpack{type1cm} and \Lpack{type1ec} must not be loaded -% additionally; they enable only continuous scaling. -% -% -% -% \section{Fixes added for 2005/12/01} -% -% \subsection{\texttt{\textbackslash textsubscript} not defined in -% latex.ltx (pr/3492)} -% -%\begin{verbatim} -% >Number: 3492 -% >Category: latex -% >Synopsis: \textsubscript not defined in latex.ltx -% >Arrival-Date: Tue Jan 14 23:01:00 CET 2003 -% >Originator: tgakic@chem.tue.nl (Ionel Mugurel Ciobica) -% -% I use \textsubscript much more often than \textsuperscript, and -% \textsubscript it is not defined in latex.ltx. Could you please -% consider including the definition of \textsubscript in the latex.ltx -% for the next versions of LaTeX. Thank you. -%\end{verbatim} -% -% \subsection{\texttt{\textbackslash DeclareMathSizes} only take pts. -% (pr/3693)} -% -%\begin{verbatim} -% >Number: 3693 -% >Category: latex -% >Synopsis: \DeclareMathSizes only take pts. -% >Arrival-Date: Fri Jun 11 16:21:00 CEST 2004 -% >Originator: moho01ab@student.cbs.dk (Morten Hoegholm) -% -% The last three arguments of \@DeclareMathSizes cannot take a dimension -% as argument, making it inconsistent with the rest of the font changing -% commands and itself, as the second argument can take a dimension -% specification. -%\end{verbatim} -% -% \subsection{\texttt{\textbackslash addpenalty} ruins flush-bottom (pr/3073)} -% -%\begin{verbatim} -% >Number: 3073 -% >Category: latex -% >Synopsis: \addpenalty ruins flush-bottom -% >Arrival-Date: 20 Oct 2005 14:46:35 -0700 -% >Originator: asnd@triumf.ca (Donald Arseneau) -% >Description: -% The (revised) definition of \addpenalty has been -% incorporated into fixltx2e, but now Plamen Tanovski has found a -% problem: since the \vskip is increased by the previous depth, -% consecutive \addpenalty and \addvspace commands keep enlarging -% the \vskip. -%\end{verbatim} -% -% \subsection{\texttt{\textbackslash footnotemark[x]} crashes with fixltx2e.sty -% (pr/3752)} -% -%\begin{verbatim} -% >Number: 3752 -% >Category: tools -% >Synopsis: feature \footnotemark[x] crashes with fixltx2e.sty -% >Arrival-Date: Fri Dec 17 10:11:00 +0100 2004 -% >Originator: stefan.pofahl@zsw-bw.de (Stefan Pofahl) -% -% If I use /fnsymbol together with fixltx2e.sty I can not use -% optional parameter [num] -% \footnotemark[1] is not showing the mark number 1 but -% the mark \value{footnote}. -%\end{verbatim} -% This bug was related to pr/3400, where |\@fnsymbol| was made robust. -% -% \subsubsection{Notes on the implementation strategy} -% -% Pr/3400 made |\@fnsymbol| decide between text-mode and math-mode, -% which requires a certain level of robustness somewhere as the -% decision between text and math must be made at typesetting time and -% not when inside |\protected@edef| or similar commands. One way of -% dealing with this is to make sure the value seen by |\@fnsymbol| is -% a fully expanded number, which could be handled by code such as -% \begin{verbatim} -% \def\fnsymbol#1{\expandafter\@fnsymbol -% \expandafter{\the\csname c@#1\endcsname}} -% \end{verbatim} -% This would be a good solution if everybody used the high level -% commands only by writing code like |\fnsymbol{footnote}|. Unfortunately -% many classes (including the standard classes) and packages use the -% internal forms directly as in |\@fnsymbol\c@footnote| so the easy -% solution of changing |\fnsymbol| would break code that had worked for -% the past 20~years. -% -% Therefore the implementation here makes |\@fnsymbol| itself a -% non-robust command again and instead uses a new robust command -% \DescribeMacro{\TextOrMath}|\TextOrMath|, which will take care of -% typesetting either the math or the text symbol. In order to do so, -% we face an age old problem and unsolvable problem in \TeX: A -% reliable test for math mode that doesn't destroy -% kerning. Fortunately this problem can be solved when using e\TeX\ so -% if you use this as engine for your \LaTeX\ format, as recommended by -% the \LaTeX3 Project, you will get a fully functioning |\TextOrMath| -% command with no side effects. If you use regular \TeX\ as engine for -% your \LaTeX\ format then we have to choose between the lesser of two -% evils: 1)~breaking ligatures and preventing kerning or 2)~face the -% risk of choosing text-mode at the beginning of an alignment cell, -% which was supposed to be math-mode. We have decided upon 1) as is -% customary for regular robust commands in \LaTeX. -% -% -% \subsection{Fewer fragile commands} -% -%\begin{verbatim} -% >Number: 3816 -% >Category: latex -% >Synopsis: Argument of \@sect has an extra }. -% >Arrival-Date: Sat Oct 22 23:11:01 +0200 2005 -% >Originator: susi@uriah.heep.sax.de (Susanne Wunsch) -% -% Use of a \raisebox in \section{} produces the error message -% mentioned in the subject. -% -% PR latex/1738 described a similar problem, which has been solved -% 10 years ago. Protecting the \raisebox with \protect solved my -% problem as well, but wouldn't it make sense to have a similar fix -% as in the PR? -% -% It is particularly confusing, that an unprotected \raisebox in a -% \section*-environment works fine, while in a \section-environment -% produces error. -%\end{verbatim} -% -% While not technically a bug, in this day and age there are few -% reasons why commands taking optional arguments should not be robust. -% -% \subsubsection{Notes on the implementation strategy} -% -% Rather than changing the kernel macros to be robust, we have decided -% to add the macro \DescribeMacro{\MakeRobust}|\MakeRobust| in -% \Lpack{fixltx2e} so that users can easily turn fragile macros into -% robust ones. A macro |\foo| is made robust by doing the simple -% |\MakeRobust{\foo}|. \Lpack{fixltx2e} makes the following kernel -% macros robust: |\(|, |\)|, |\[|, |\]|, |\makebox|, |\savebox|, -% |\framebox|, |\parbox|, |\rule| and |\raisebox|. -% -% -% \section{Fixes added for 2014/05/01} -% -% \subsection{Check the optional arguments of floats} -% -% By default LaTeX silently ignores unknown letters in the optional -% arguments of floats. |\begin{figure}[tB]| the |B| is ignored so it -% acts like |\begin{figure}[t]| However |\begin{figure}[B]| does -% \emph{not} act like |\begin{figure}[]| as the check for an empty -% argument, or unsupplied argument, is earlier. |[]| causes the -% default float placement to be used, but |[B]| means that \emph{no} -% float area is allowed and so the float will not be placed until the -% next |\clearpage| or end of document, no warning is given. -% -% This package adds a check on each letter, and if it not one of -% |!tbhp| then an error is given and the code acts as if |p| had been -% used, so that the float may be placed somewhere. -% -% \subsection{Infinite glue found (pr/4023 and pr/2346)} -% -% The fix for pr/2346 had an issue when used in conjunction with -% |\enlargethispage| as the latter introduced an infinite negative -% glue at the bottom of the page. That in turn make a |\vsplit| -% operation to get at the column marks invalid. -% -% -% \section{Fixes added after 2014/05/01} -% -% \subsection{Within counters only reset next level down (pr4393)} -% -% This is actually implicitly documented behavior in the \LaTeX{} -% Manual that states that |\stepcounter| resets all counters marked -% ``within''. However it means that if, for example, theorems are -% numbered within sections and you start a new chapter in a book, the -% section counter is reset to zero but the theorem counter is not -% until the first section appears. Thus a theorem directly within the -% chapter body (without a new section) would show an incremented -% number relative to the last theorem of the previous chapter. -% -% -% For this reason we are now resetting all levels of within in one go -% even if that means that some of these resets may happen several times -% unnecessarily. -% -% -% \StopEventually{} -% -% \section{Implementation} -% -% We require at least a somewhat sane version of \LaTeXe{}. Earlier -% ones where really quite different from one another. -% \begin{macrocode} -%<*fixltx2e> -\NeedsTeXFormat{LaTeX2e}[1996/06/01] -% \end{macrocode} -% -% -% -% \subsection{2-col: 1-col fig can come before earlier 2-col fig -% (pr/2346) \\ -% Wrong headline for twocolumn (pr/2613)} -% -% Originally fixed in package \Lpack{fix2col} which was merged into -% this package. Code and documentation are straight copies from that -% package. -% -% \subsubsection{Preserving Marks} -% -% This is just a change to the single command |\@outputdblcol| -% so that it saves mark information for the first column and restores -% it in the second column. -% \begin{macrocode} -\def\@outputdblcol{% - \if@firstcolumn - \global\@firstcolumnfalse -% \end{macrocode} -% Save the left column -% \begin{macrocode} - \global\setbox\@leftcolumn\copy\@outputbox -% \end{macrocode} -% -% Remember the marks from the first column -% \begin{macrocode} - \splitmaxdepth\maxdimen - \vbadness\maxdimen -% \end{macrocode} -% In case of |\enlargethispage| we will have infinite negative glue -% at the bottom of the page (coming from |\vss|) and that will earn -% us an error message if we |\vsplit| to get at the marks. So we -% need to remove thek last glue (if any) at the end of |\@outputbox| -% as we are only interested in marks that change doesn't matter. -% \changes{v1.1o}{2014/04/18}{Handle infinite glue from -% \cs{enlargethispage} (pr/4023)} -% \begin{macrocode} - \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}% - \setbox\@outputbox\vsplit\@outputbox to\maxdimen -% \end{macrocode} -% -% One minor difference from the current \package{fixmarks}, pass the -% marks through a token register to stop any |#| tokens causing an -% error in a |\def|. -% \begin{macrocode} - \toks@\expandafter{\topmark}% - \xdef\@firstcoltopmark{\the\toks@}% - \toks@\expandafter{\splitfirstmark}% - \xdef\@firstcolfirstmark{\the\toks@}% -% \end{macrocode} -% -% This test does not work if truly empty marks have been inserted, but -% \LaTeX\ marks should always have (at least) two brace groups. -% (Except before the first mark is used, when the marks are empty, -% but that is OK here.) -% \begin{macrocode} - \ifx\@firstcolfirstmark\@empty - \global\let\@setmarks\relax - \else - \gdef\@setmarks{% - \let\firstmark\@firstcolfirstmark - \let\topmark\@firstcoltopmark}% - \fi -% \end{macrocode} -% -% End of change -% \begin{macrocode} - \else - \global\@firstcolumntrue - \setbox\@outputbox\vbox{% - \hb@xt@\textwidth{% - \hb@xt@\columnwidth{\box\@leftcolumn \hss}% - \hfil -% \end{macrocode} -% \changes{v1.1m}{2006/09/13}{Ensure that rule is in \cs{normalcolor}} -% The color of the \cs{vrule} should be \cs{normalcolor} as to not -% inherit the color from the column. -% \begin{macrocode} - {\normalcolor\vrule \@width\columnseprule}% - \hfil - \hb@xt@\columnwidth{\box\@outputbox \hss}}}% - \@combinedblfloats -% \end{macrocode} -% Override current first and top with those of first column if necessary -% \begin{macrocode} - \@setmarks -% \end{macrocode} -% End of change -% \begin{macrocode} - \@outputpage - \begingroup - \@dblfloatplacement - \@startdblcolumn - \@whilesw\if@fcolmade \fi{\@outputpage\@startdblcolumn}% - \endgroup - \fi} -% \end{macrocode} -% -% \subsubsection{Preserving Float Order} -% -% Changes |\@dbldeferlist| to |\@deferlist| are not explicitly noted -% but are flagged by blank comment lines around the changed line. -% -% -% \begin{macrocode} -\def\end@dblfloat{% - \if@twocolumn - \@endfloatbox - \ifnum\@floatpenalty <\z@ - \@largefloatcheck -% \end{macrocode} -% -% Force the depth of two column float boxes. -% \begin{macrocode} - \global\dp\@currbox1sp % -% \end{macrocode} -% What follows is essentially |\end@float| without a starting -% |\@endfloatbox|. -% \changes{v1.1d}{2000/09/24}{FMi: use output routine to -% defer float} -% \changes{v1.1p}{2014/04/27}{Inline the code to allow some -% coexistence with packages that hook into \cs{end@float} and do not -% know about the algorithm change} -% \begin{macrocode} - \@cons\@currlist\@currbox - \ifnum\@floatpenalty <-\@Mii - \penalty -\@Miv - \@tempdima\prevdepth - \vbox{}% - \prevdepth\@tempdima - \penalty\@floatpenalty - \else - \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack - \fi -% \end{macrocode} -% \changes{v1.1r}{2014/06/10}{missing \cs{fi} added} -% \begin{macrocode} - \fi - \else - \end@float - \fi -} -% \end{macrocode} -% -% Test if the float box has the wrong width. (Actually as noted above -% the test is for a conventional depth setting rather than for the -% width of the float). -% \begin{macrocode} -\def\@testwrongwidth #1{% - \ifdim\dp#1=\f@depth - \else - \global\@testtrue - \fi} -% \end{macrocode} -% -% Normally looking for single column floats, which have zero depth. -% \begin{macrocode} -\let\f@depth\z@ -% \end{macrocode} -% -% but when making two column float area, look for floats with 1sp -% depth. -% \begin{macrocode} -\def\@dblfloatplacement{\global\@dbltopnum\c@dbltopnumber - \global\@dbltoproom \dbltopfraction\@colht - \@textmin \@colht - \advance \@textmin -\@dbltoproom - \@fpmin \dblfloatpagefraction\textheight - \@fptop \@dblfptop - \@fpsep \@dblfpsep - \@fpbot \@dblfpbot -% \end{macrocode} -% -% \begin{macrocode} - \def\f@depth{1sp}} -% \end{macrocode} -% -% All the remaining changes are replacing the double column defer list -% or inserting the extra test |\@testwrongwidth|\marg{box} at suitable -% places. That is at places where a box is taken off the deferlist. -% \begin{macrocode} -\def \@doclearpage {% - \ifvoid\footins - \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa - \setbox\@tempboxa\box\@cclv - \xdef\@deferlist{\@toplist\@botlist\@deferlist}% - \global \let \@toplist \@empty - \global \let \@botlist \@empty - \global \@colroom \@colht - \ifx \@currlist\@empty - \else - \@latexerr{Float(s) lost}\@ehb - \global \let \@currlist \@empty - \fi - \@makefcolumn\@deferlist - \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% - \if@twocolumn - \if@firstcolumn -% \end{macrocode} -% -% \begin{macrocode} - \xdef\@deferlist{\@dbltoplist\@deferlist}% -% \end{macrocode} -% -% \begin{macrocode} - \global \let \@dbltoplist \@empty - \global \@colht \textheight - \begingroup - \@dblfloatplacement -% \end{macrocode} -% -% \begin{macrocode} - \@makefcolumn\@deferlist - \@whilesw\if@fcolmade \fi{\@outputpage - \@makefcolumn\@deferlist}% -% \end{macrocode} -% -% \begin{macrocode} - \endgroup - \else - \vbox{}\clearpage - \fi - \fi -% \end{macrocode} -% the next line is needed to avoid losing floats in certain -% circumstances a single call to the original |\doclearpage| -% will now no longer output all floats. -% \changes{v1.1d}{2000/09/24}{FMi: ensure \cs{doclearpage} -% is called again until all floats are output.} -% \begin{macrocode} - \ifx\@deferlist\@empty \else\clearpage \fi - \else - \setbox\@cclv\vbox{\box\@cclv\vfil}% - \@makecol\@opcol - \clearpage - \fi -} -% \end{macrocode} -% -% \begin{macrocode} -\def \@startdblcolumn {% - \@tryfcolumn \@deferlist - \if@fcolmade - \else - \begingroup - \let \reserved@b \@deferlist - \global \let \@deferlist \@empty - \let \@elt \@sdblcolelt - \reserved@b - \endgroup - \fi -} -% \end{macrocode} -% -% \begin{macrocode} -\def\@addtonextcol{% - \begingroup - \@insertfalse - \@setfloattypecounts - \ifnum \@fpstype=8 - \else - \ifnum \@fpstype=24 - \else - \@flsettextmin - \@reqcolroom \ht\@currbox - \advance \@reqcolroom \@textmin - \ifdim \@colroom>\@reqcolroom - \@flsetnum \@colnum - \ifnum\@colnum>\z@ - \@bitor\@currtype\@deferlist - \@testwrongwidth\@currbox - \if@test - \else - \@addtotoporbot - \fi - \fi - \fi - \fi - \fi - \if@insert - \else - \@cons\@deferlist\@currbox - \fi - \endgroup -} -% \end{macrocode} -% -% \begin{macrocode} -\def\@addtodblcol{% - \begingroup - \@insertfalse - \@setfloattypecounts - \@getfpsbit \tw@ - \ifodd\@tempcnta - \@flsetnum \@dbltopnum - \ifnum \@dbltopnum>\z@ - \@tempswafalse - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \advance \@dbltoproom \@textmin - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \fi - \advance \@dbltoproom -\@textmin - \fi - \fi - \if@tempswa - \@bitor \@currtype \@deferlist -% \end{macrocode} -% -% not in fixfloats? -% \begin{macrocode} - \@testwrongwidth\@currbox -% \end{macrocode} -% -% \begin{macrocode} - \if@test - \else - \@tempdima -\ht\@currbox - \advance\@tempdima - -\ifx \@dbltoplist\@empty \dbltextfloatsep \else - \dblfloatsep \fi - \global \advance \@dbltoproom \@tempdima - \global \advance \@colht \@tempdima - \global \advance \@dbltopnum \m@ne - \@cons \@dbltoplist \@currbox - \@inserttrue - \fi - \fi - \fi - \fi - \if@insert - \else - \@cons\@deferlist\@currbox - \fi - \endgroup -} -% \end{macrocode} -% -% \begin{macrocode} -\def \@addtocurcol {% - \@insertfalse - \@setfloattypecounts - \ifnum \@fpstype=8 - \else - \ifnum \@fpstype=24 - \else - \@flsettextmin - \advance \@textmin \@textfloatsheight - \@reqcolroom \@pageht - \ifdim \@textmin>\@reqcolroom - \@reqcolroom \@textmin - \fi - \advance \@reqcolroom \ht\@currbox - \ifdim \@colroom>\@reqcolroom - \@flsetnum \@colnum - \ifnum \@colnum>\z@ - \@bitor\@currtype\@deferlist -% \end{macrocode} -% We need to defer the float also if its width -% doesn't fit. -% \changes{v1.1d}{2000/09/24}{FMi: test for wide float was -% in wrong place} -% \begin{macrocode} - \@testwrongwidth\@currbox -% \end{macrocode} -% -% \begin{macrocode} - \if@test - \else - \@bitor\@currtype\@botlist - \if@test - \@addtobot - \else - \ifodd \count\@currbox - \advance \@reqcolroom \intextsep - \ifdim \@colroom>\@reqcolroom - \global \advance \@colnum \m@ne - \global \advance \@textfloatsheight \ht\@currbox - \global \advance \@textfloatsheight 2\intextsep - \@cons \@midlist \@currbox - \if@nobreak - \nobreak - \@nobreakfalse - \everypar{}% - \else - \addpenalty \interlinepenalty - \fi - \vskip \intextsep - \box\@currbox - \penalty\interlinepenalty - \vskip\intextsep - \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi - \outputpenalty \z@ - \@inserttrue - \fi - \fi - \if@insert - \else - \@addtotoporbot - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \if@insert - \else - \@resethfps - \@cons\@deferlist\@currbox - \fi -} -% \end{macrocode} -% -% \begin{macrocode} -\def\@xtryfc #1{% - \@next\reserved@a\@trylist{}{}% - \@currtype \count #1% - \divide\@currtype\@xxxii - \multiply\@currtype\@xxxii - \@bitor \@currtype \@failedlist - \@testfp #1% -% \end{macrocode} -% -% \begin{macrocode} - \@testwrongwidth #1% -% \end{macrocode} -% -% \begin{macrocode} - \ifdim \ht #1>\@colht - \@testtrue - \fi - \if@test - \@cons\@failedlist #1% - \else - \@ytryfc #1% - \fi} -% \end{macrocode} -% -% \begin{macrocode} -\def\@ztryfc #1{% - \@tempcnta\count #1% - \divide\@tempcnta\@xxxii - \multiply\@tempcnta\@xxxii - \@bitor \@tempcnta {\@failedlist \@flfail}% - \@testfp #1% -% \end{macrocode} -% -% not in fixfloats? -% \begin{macrocode} - \@testwrongwidth #1% -% \end{macrocode} -% -% \begin{macrocode} - \@tempdimb\@tempdima - \advance\@tempdimb\ht #1% - \advance\@tempdimb\@fpsep - \ifdim \@tempdimb >\@colht - \@testtrue - \fi - \if@test - \@cons\@flfail #1% - \else - \@cons\@flsucceed #1% - \@tempdima\@tempdimb - \fi} -% \end{macrocode} -% -% -% -% -% -% -% \subsection{\texttt{\textbackslash @} discards spaces when moving -% (pr3039)} -% -% \begin{macro}{\@} -% Ensure that |\@m| can't eat spaces. Alternative would be to make -% |\@| robust but that takes more space. -% \begin{macrocode} -\def\@{\spacefactor\@m{}} -% \end{macrocode} -% \end{macro} -% -% -% \subsection{\texttt{\textbackslash setlength} produces error if -% used with registers like \texttt{\textbackslash dimen0} (pr/3066)} -% -% \begin{macro}{\setlength} -% Add space after register (|#1|) but only if this is still the -% original definition. When, for example, \Lpack{calc} was already -% loaded this wouldn't be a good idea any more. -% \changes{v1.0c}{2000/09/21}{Don't change if definition was -% modified already} -% \begin{macrocode} -\def\@tempa#1#2{#1#2\relax} -\ifx\setlength\@tempa - \def\setlength#1#2{#1 #2\relax} -\fi -% \end{macrocode} -% \end{macro} -% -% -% \subsection{\texttt{\textbackslash addpenalty} ruins flush-bottom -% (pr/3073)} -% -% \begin{macro}{\addpenalty} -% Fix provided by Donald (though the original fix was not good -% enough). In 2005 Plamen Tanovski discovered that this fix wasn't -% good enough either as the \cs{vskip} kept getting bigger if -% several \cs{addpenalty} commands followed each other. Donald -% kindly send a new fix. -% \begin{macrocode} -\def\addpenalty#1{% - \ifvmode - \if@minipage - \else - \if@nobreak - \else - \ifdim\lastskip=\z@ - \penalty#1\relax - \else - \@tempskipb\lastskip -% \end{macrocode} -% \changes{v1.1l}{2005/11/10}{Add the correct \cs{vskip}} -% We have to make sure the final \cs{vskip} seen by \TeX\ is the -% correct one, namely \cs{@tempskipb}. However we may have to -% adjust for \cs{prevdepth} when placing the penalty but that -% should not affect the skip we pass on to \TeX. -% \begin{macrocode} - \begingroup - \advance \@tempskipb - \ifdim\prevdepth>\maxdepth\maxdepth\else -% \end{macrocode} -% If |\prevdepth| is -1000pt due to |\nointerlineskip| we better -% not add it! -% \changes{v1.0c}{2000/09/21}{Don't add \cs{prevdepth} if it is a -% senile value!} -% \begin{macrocode} - \ifdim \prevdepth = -\@m\p@ \z@ \else \prevdepth \fi - \fi - \vskip -\@tempskipb - \penalty#1% - \vskip\@tempskipb - \endgroup - \vskip -\@tempskipb - \vskip \@tempskipb - \fi - \fi - \fi - \else - \@noitemerr - \fi} -% \end{macrocode} -% \end{macro} -% -% -% -% \subsection{\texttt{\textbackslash fnsymbol} should use text symbols -% if possible (pr/3400)} -% \begin{macro}{\@fnsymbol} -% -% This macro is another example of an ever recurring problem in -% \TeX: Determining if something is text-mode or math-mode. It is -% imperative for the decision between text and math to be delayed -% until the actual typesetting is done as the code in question may -% go through an |\edef| or |\write| where an |\ifmmode| test would -% be executed prematurely. Hence in the implementation below, -% |\@fnsymbol| is not robust in itself but the parts doing the -% actual typesetting are. -% -% In the case of |\@fnsymbol| we make use of the robust command -% |\TextOrMath| which takes two arguments and typesets the first if -% in text-mode and the second if in math-mode. Note that in order -% for this command to make the correct decision, it must insert a -% |\relax| token if run under regular \TeX, which ruins any kerning -% between the preceding characters and whatever awaits -% typesetting. If you use e\TeX\ as engine for \LaTeX\ (as -% recommended) this unfortunate side effect is not present. -% \begin{macrocode} -\def\@fnsymbol#1{% - \ifcase#1\or \TextOrMath\textasteriskcentered *\or - \TextOrMath \textdagger \dagger\or - \TextOrMath \textdaggerdbl \ddagger \or - \TextOrMath \textsection \mathsection\or - \TextOrMath \textparagraph \mathparagraph\or - \TextOrMath \textbardbl \|\or - \TextOrMath {\textasteriskcentered\textasteriskcentered}{**}\or - \TextOrMath {\textdagger\textdagger}{\dagger\dagger}\or - \TextOrMath {\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger}\else - \@ctrerr \fi -} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\TextOrMath} -% \changes{v1.1m}{2006/01/08}{Add command to solve robustness -% issues (pr/3752)} -% When using regular \TeX, we make this command robust so that it -% always selects the correct branch in an |\ifmmode| switch with -% the usual disadvantage of ruining kerning. For the application we -% use it for here that shouldn't matter. The alternative would be -% to mimic |\IeC| from \textsf{inputenc} but then it wil have the -% disadvantage of choosing the wrong branch if appearing at the -% beginning of an alignment cell. However, users of e\TeX\ will be -% pleasantly surprised to get the best of both worlds and no bad -% side effects. -% -% First some code for checking if we are running e\TeX\ but making -% sure not to permanently turn |\eTeXversion| into |\relax|. -% \begin{macrocode} -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname eTeXversion\endcsname\relax -% \end{macrocode} -% In case of ordinary \TeX\ we define |\TextOrMath| as a robust -% command but make sure it always grabs its arguments. If we didn't do -% this it might very well gobble spaces in the input stream. -% \begin{macrocode} -\DeclareRobustCommand\TextOrMath{% - \ifmmode \expandafter\@secondoftwo - \else \expandafter\@firstoftwo \fi} -\protected@edef\TextOrMath#1#2{\TextOrMath{#1}{#2}} -\else -% \end{macrocode} -% For e\TeX\ the situation is similar. The robust macro is a hidden -% one so that we again avoid problems of gobbling spaces in the input. -% \begin{macrocode} -\protected\expandafter\def\csname TextOrMath\space\endcsname{% - \ifmmode \expandafter\@secondoftwo - \else \expandafter\@firstoftwo \fi} -\edef\TextOrMath#1#2{% - \expandafter\noexpand\csname TextOrMath\space\endcsname - {#1}{#2}} -\fi -% \end{macrocode} -% \end{macro} -% -% \subsection{No hyphenation in first word after float environment(pr/3498)} -% -% \begin{macro}{\@esphack} -% \begin{macro}{\@Esphack} -% Fix suggested by Donald Arseneau. -% \changes{v1.1g}{2003/09/19}{Fix for \cs{@esphack} (pr/3498)} -% \changes{v1.1h}{2004/02/13}{Fix for \cs{@Esphack} (pr/3498)} -% \begin{macrocode} -\def\@esphack{% - \relax - \ifhmode - \spacefactor\@savsf - \ifdim\@savsk>\z@ - \nobreak \hskip\z@skip % <------ - \ignorespaces - \fi - \fi} -% \end{macrocode} -% -% \begin{macrocode} -\def\@Esphack{% - \relax - \ifhmode - \spacefactor\@savsf - \ifdim\@savsk>\z@ - \nobreak \hskip\z@skip % <------ - \@ignoretrue - \ignorespaces - \fi - \fi} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \subsection{Allowing \texttt{\textbackslash emph} to produce small -% caps, etc} -% \begin{macro}{\em} -% \begin{macro}{\eminnershape} -% \changes{v1.1g}{2003/09/19}{Allow \cs{emph} to produce small caps} -% \begin{macrocode} -\DeclareRobustCommand\em - {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \eminnershape \else \itshape \fi} -\def\eminnershape{\upshape} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \subsection{\texttt{\textbackslash textsubscript} not defined in -% latex.ltx (pr/3492)} -% -% \begin{macro}{\textsubscript} -% \changes{v1.1j}{2005/07/13}{Add \cs{textsubscript}} -% \changes{v1.1k}{2005/09/29}{Fixed blank lines} -% This macro is almost identical to \cs{textsuperscript} from the -% kernel. -% \begin{macrocode} -\DeclareRobustCommand*\textsubscript[1]{% - \@textsubscript{\selectfont#1}} -\def\@textsubscript#1{% - {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}} -% \end{macrocode} -% \end{macro} -% -% \subsection{\texttt{\textbackslash DeclareMathSizes} only take pts. -% (pr/3693)} -% -% \begin{macro}{\@DeclareMathSizes} -% \changes{v1.1k}{2005/09/29}{Fixed blank lines} -% This fix given by Michael J. Downes on comp.text.tex on 2002/10/17 -% allows the user to have settings such as -% \verb=\DeclareMathSizes{9.5dd}{9.5dd}{7.4dd}{6.6dd}=. -% \begin{macrocode} -\def\@DeclareMathSizes #1#2#3#4#5{% - \@defaultunits\dimen@ #2pt\relax\@nnil - \if $#3$% - \expandafter\let\csname S@\strip@pt\dimen@\endcsname\math@fontsfalse - \else - \@defaultunits\dimen@ii #3pt\relax\@nnil - \@defaultunits\@tempdima #4pt\relax\@nnil - \@defaultunits\@tempdimb #5pt\relax\@nnil - \toks@{#1}% - \expandafter\xdef\csname S@\strip@pt\dimen@\endcsname{% - \gdef\noexpand\tf@size{\strip@pt\dimen@ii}% - \gdef\noexpand\sf@size{\strip@pt\@tempdima}% - \gdef\noexpand\ssf@size{\strip@pt\@tempdimb}% - \the\toks@ - }% - \fi -} -% \end{macrocode} -% \end{macro} -% -% \subsection{Fewer fragile macros} -% -% \begin{macro}{\MakeRobust} -% \changes{v1.1n}{2006/03/24}{Added macro} -% -% The macro firstly checks if the controls sequence in question exists -% at all. -% \begin{macrocode} -\providecommand*\MakeRobust[1]{% - \@ifundefined{\expandafter\@gobble\string#1}{% - \@latex@error{The control sequence `\string#1' is undefined!% - \MessageBreak There is nothing here to make robust}% - \@eha - }% -% \end{macrocode} -% Then we check if the macro is already robust. We do this by testing -% if the internal name for a robust macro is defined, namely -% \verb*=\foo =. If it is already defined do nothing, otherwise set -% \verb*=\foo = equal to \verb*=\foo= and redefine \verb*=\foo= so -% that it acts like a macro defined with \verb=\DeclareRobustCommand=. -% \begin{macrocode} - {% - \@ifundefined{\expandafter\@gobble\string#1\space}% - {% - \expandafter\let\csname - \expandafter\@gobble\string#1\space\endcsname=#1% - \edef\reserved@a{\string#1}% - \def\reserved@b{#1}% - \edef\reserved@b{\expandafter\strip@prefix\meaning\reserved@b}% - \edef#1{% - \ifx\reserved@a\reserved@b - \noexpand\x@protect\noexpand#1% - \fi - \noexpand\protect\expandafter\noexpand - \csname\expandafter\@gobble\string#1\space\endcsname}% - }% - {\@latex@info{The control sequence `\string#1' is already robust}}% - }% -} -% \end{macrocode} -% \end{macro} -% Here we make some kernel macros robust. -% \begin{macrocode} -\MakeRobust\( -\MakeRobust\) -\MakeRobust\[ -\MakeRobust\] -\MakeRobust\makebox -\MakeRobust\savebox -\MakeRobust\framebox -\MakeRobust\parbox -\MakeRobust\rule -\MakeRobust\raisebox -% \end{macrocode} -% -% \begin{macrocode} -%</fixltx2e> -% \end{macrocode} -% -% \subsection{Using EC fonts (T1 encoding) makes my documents look -% bl**dy horrible} -% -% \subsubsection{Preliminaries} -% The \LaTeX{} kernel does not declare the font encoding TS1. -% However, we are going to set up font definitions for this encoding, -% so we have to declare it now. -% \begin{macrocode} -%<*fix-cm> -\input{ts1enc.def} -% \end{macrocode} -% -% In case the package is loaded in the preamble, any of the CM fonts may -% have been used already and cannot be redefined. Yet we try to -% intercept at least the problem that is most likely to occur, i.e., -% a hidden \cmd{\normalfont}. Most of the standard definitions -% are ok, but those for T1 encoding and 10.95\,pt need to be removed: -% \begin{macrocode} -\expandafter \let \csname T1/cmr/m/n/10.95\endcsname \relax -\expandafter \let \csname T1/cmss/m/n/10.95\endcsname \relax -\expandafter \let \csname T1/cmtt/m/n/10.95\endcsname \relax -\expandafter \let \csname T1/cmvtt/m/n/10.95\endcsname \relax -% \end{macrocode} -% -% \Lpack{fix-cm} may still fail, if the EC fonts are preloaded in the -% \LaTeX{} format file. This situation is, however, very unlikely and could occur -% only with a customized format. -% -% The remainder of the package is enclosed in a group, where the catcodes -% are guaranteed to be appropriate for the processing of font definitions. -% \begin{macrocode} -\begingroup -\nfss@catcodes -% \end{macrocode} -% -% \subsubsection{T1 encoding} -% -% \paragraph{CM Roman} -% \begin{macrocode} -\DeclareFontFamily{T1}{cmr}{} -\DeclareFontShape{T1}{cmr}{m}{n}{ - <-6> ecrm0500 - <6-7> ecrm0600 - <7-8> ecrm0700 - <8-9> ecrm0800 - <9-10> ecrm0900 - <10-12> ecrm1000 - <12-17> ecrm1200 - <17-> ecrm1728 - }{} -\DeclareFontShape{T1}{cmr}{m}{sl}{ - <-6> ecsl0500 - <6-7> ecsl0600 - <7-8> ecsl0700 - <8-9> ecsl0800 - <9-10> ecsl0900 - <10-12> ecsl1000 - <12-17> ecsl1200 - <17-> ecsl1728 - }{} -\DeclareFontShape{T1}{cmr}{m}{it}{ - <-8> ecti0700 - <8-9> ecti0800 - <9-10> ecti0900 - <10-12> ecti1000 - <12-17> ecti1200 - <17-> ecti1728 - }{} -\DeclareFontShape{T1}{cmr}{m}{sc}{ - <-6> eccc0500 - <6-7> eccc0600 - <7-8> eccc0700 - <8-9> eccc0800 - <9-10> eccc0900 - <10-12> eccc1000 - <12-17> eccc1200 - <17-> eccc1728 - }{} -\DeclareFontShape{T1}{cmr}{m}{ui}{ - <-8> ecui0700 - <8-9> ecui0800 - <9-10> ecui0900 - <10-12> ecui1000 - <12-17> ecui1200 - <17-> ecui1728 - }{} -\DeclareFontShape{T1}{cmr}{b}{n}{ - <-6> ecrb0500 - <6-7> ecrb0600 - <7-8> ecrb0700 - <8-9> ecrb0800 - <9-10> ecrb0900 - <10-12> ecrb1000 - <12-17> ecrb1200 - <17-> ecrb1728 - }{} -\DeclareFontShape{T1}{cmr}{bx}{n}{ - <-6> ecbx0500 - <6-7> ecbx0600 - <7-8> ecbx0700 - <8-9> ecbx0800 - <9-10> ecbx0900 - <10-12> ecbx1000 - <12-> ecbx1200 - }{} -\DeclareFontShape{T1}{cmr}{bx}{sl}{ - <-6> ecbl0500 - <6-7> ecbl0600 - <7-8> ecbl0700 - <8-9> ecbl0800 - <9-10> ecbl0900 - <10-12> ecbl1000 - <12-> ecbl1200 - }{} -\DeclareFontShape{T1}{cmr}{bx}{it}{ - <-8> ecbi0700 - <8-9> ecbi0800 - <9-10> ecbi0900 - <10-12> ecbi1000 - <12-> ecbi1200 - }{} -\DeclareFontShape{T1}{cmr}{bx}{sc}{ - <-6> ecxc0500 - <6-7> ecxc0600 - <7-8> ecxc0700 - <8-9> ecxc0800 - <9-10> ecxc0900 - <10-12> ecxc1000 - <12-> ecxc1200 - }{} -% -% \end{macrocode} -% -% \paragraph{CM Sans} -% \begin{macrocode} -\DeclareFontFamily{T1}{cmss}{} -\DeclareFontShape{T1}{cmss}{m}{n}{ - <-9> ecss0800 - <9-10> ecss0900 - <10-12> ecss1000 - <12-17> ecss1200 - <17-> ecss1728 - }{} -\DeclareFontShape{T1}{cmss}{m}{sl}{ - <-9> ecsi0800 - <9-10> ecsi0900 - <10-12> ecsi1000 - <12-17> ecsi1200 - <17-> ecsi1728 - }{} -\DeclareFontShape{T1}{cmss}{m}{it} - {<->ssub*cmss/m/sl}{} -\DeclareFontShape{T1}{cmss}{m}{sc} - {<->sub*cmr/m/sc}{} -\DeclareFontShape{T1}{cmss}{sbc}{n}{ - <-> ecssdc10 - }{} -\DeclareFontShape{T1}{cmss}{bx}{n}{ - <-10> ecsx0900 - <10-> ecsx1000 - }{} -\DeclareFontShape{T1}{cmss}{bx}{sl}{ - <-10> ecso0900 - <10-> ecso1000 - }{} -\DeclareFontShape{T1}{cmss}{bx}{it} - {<->ssub*cmss/bx/sl}{} -% \end{macrocode} -% The following substitutions are not provided in the default -% \file{.fd} files. I have included them, so that you can -% easily use the EC fonts with the default bold series being -% \file{b} rather than \file{bx}. -% \begin{macrocode} -\DeclareFontShape{T1}{cmss}{b}{n} - {<->ssub*cmss/bx/n}{} -\DeclareFontShape{T1}{cmss}{b}{sl} - {<->ssub*cmss/bx/sl}{} -\DeclareFontShape{T1}{cmss}{b}{it} - {<->ssub*cmss/bx/sl}{} -% \end{macrocode} -% -% \paragraph{CM Typewriter} -% \begin{macrocode} -\DeclareFontFamily{T1}{cmtt}{\hyphenchar \font\m@ne} -\DeclareFontShape{T1}{cmtt}{m}{n}{ - <-9> ectt0800 - <9-10> ectt0900 - <10-12> ectt1000 - <12-17> ectt1200 - <17-> ectt1728 - }{} -\DeclareFontShape{T1}{cmtt}{m}{it}{ - <-9> ecit0800 - <9-10> ecit0900 - <10-12> ecit1000 - <12-17> ecit1200 - <17-> ecit1728 - }{} -\DeclareFontShape{T1}{cmtt}{m}{sl}{ - <-9> ecst0800 - <9-10> ecst0900 - <10-12> ecst1000 - <12-17> ecst1200 - <17-> ecst1728 - }{} -\DeclareFontShape{T1}{cmtt}{m}{sc}{ - <-9> ectc0800 - <9-10> ectc0900 - <10-12> ectc1000 - <12-17> ectc1200 - <17-> ectc1728 - }{} -\DeclareFontShape{T1}{cmtt}{bx}{n} - {<->sub * cmtt/m/n}{} -\DeclareFontShape{T1}{cmtt}{bx}{it} - {<->sub * cmtt/m/it}{} -\DeclareFontShape{T1}{cmtt}{bx}{sl} - {<->sub * cmtt/m/sl}{} -% \end{macrocode} -% Substitutions not provided in the default \file{.fd} files: -% \begin{macrocode} -\DeclareFontShape{T1}{cmtt}{b}{n} - {<->sub * cmtt/m/n}{} -\DeclareFontShape{T1}{cmtt}{b}{it} - {<->sub * cmtt/m/it}{} -\DeclareFontShape{T1}{cmtt}{b}{sl} - {<->sub * cmtt/m/sl}{} -% \end{macrocode} -% -% \paragraph{CM Typewiter (var.)} -% \begin{macrocode} -\DeclareFontFamily{T1}{cmvtt}{} -\DeclareFontShape{T1}{cmvtt}{m}{n}{ - <-9> ecvt0800 - <9-10> ecvt0900 - <10-12> ecvt1000 - <12-17> ecvt1200 - <17-> ecvt1728 - }{} -\DeclareFontShape{T1}{cmvtt}{m}{it}{ - <-9> ecvi0800 - <9-10> ecvi0900 - <10-12> ecvi1000 - <12-17> ecvi1200 - <17-> ecvi1728 - }{} -% \end{macrocode} -% -% \subsubsection{TS1 encoding} -% -% \paragraph{CM Roman} -% \begin{macrocode} -\DeclareFontFamily{TS1}{cmr}{\hyphenchar\font\m@ne} -\DeclareFontShape{TS1}{cmr}{m}{n}{ - <-6> tcrm0500 - <6-7> tcrm0600 - <7-8> tcrm0700 - <8-9> tcrm0800 - <9-10> tcrm0900 - <10-12> tcrm1000 - <12-17> tcrm1200 - <17-> tcrm1728 - }{} -\DeclareFontShape{TS1}{cmr}{m}{sl}{ - <-6> tcsl0500 - <6-7> tcsl0600 - <7-8> tcsl0700 - <8-9> tcsl0800 - <9-10> tcsl0900 - <10-12> tcsl1000 - <12-17> tcsl1200 - <17-> tcsl1728 - }{} -\DeclareFontShape{TS1}{cmr}{m}{it}{ - <-8> tcti0700 - <8-9> tcti0800 - <9-10> tcti0900 - <10-12> tcti1000 - <12-17> tcti1200 - <17-> tcti1728 - }{} -\DeclareFontShape{TS1}{cmr}{m}{ui}{ - <-8> tcui0700 - <8-9> tcui0800 - <9-10> tcui0900 - <10-12> tcui1000 - <12-17> tcui1200 - <17-> tcui1728 - }{} -\DeclareFontShape{TS1}{cmr}{b}{n}{ - <-6> tcrb0500 - <6-7> tcrb0600 - <7-8> tcrb0700 - <8-9> tcrb0800 - <9-10> tcrb0900 - <10-12> tcrb1000 - <12-17> tcrb1200 - <17-> tcrb1728 - }{} -\DeclareFontShape{TS1}{cmr}{bx}{n}{ - <-6> tcbx0500 - <6-7> tcbx0600 - <7-8> tcbx0700 - <8-9> tcbx0800 - <9-10> tcbx0900 - <10-12> tcbx1000 - <12-> tcbx1200 - }{} -\DeclareFontShape{TS1}{cmr}{bx}{sl}{ - <-6> tcbl0500 - <6-7> tcbl0600 - <7-8> tcbl0700 - <8-9> tcbl0800 - <9-10> tcbl0900 - <10-12> tcbl1000 - <12-> tcbl1200 - }{} -\DeclareFontShape{TS1}{cmr}{bx}{it}{ - <-8> tcbi0700 - <8-9> tcbi0800 - <9-10> tcbi0900 - <10-12> tcbi1000 - <12-> tcbi1200 - }{} -% \end{macrocode} -% -% \paragraph{CM Sans} -% \begin{macrocode} -\DeclareFontFamily{TS1}{cmss}{\hyphenchar\font\m@ne} -\DeclareFontShape{TS1}{cmss}{m}{n}{ - <-9> tcss0800 - <9-10> tcss0900 - <10-12> tcss1000 - <12-17> tcss1200 - <17-> tcss1728 - }{} -\DeclareFontShape{TS1}{cmss}{m}{it} - {<->ssub*cmss/m/sl}{} -\DeclareFontShape{TS1}{cmss}{m}{sl}{ - <-9> tcsi0800 - <9-10> tcsi0900 - <10-12> tcsi1000 - <12-17> tcsi1200 - <17-> tcsi1728 - }{} -\DeclareFontShape{TS1}{cmss}{sbc}{n}{ - <-> tcssdc10 - }{} -\DeclareFontShape{TS1}{cmss}{bx}{n}{ - <-10> tcsx0900 - <10-> tcsx1000 - }{} -\DeclareFontShape{TS1}{cmss}{bx}{sl}{ - <-10> tcso0900 - <10-> tcso1000 - }{} -\DeclareFontShape{TS1}{cmss}{bx}{it} - {<->ssub*cmss/bx/sl}{} -% \end{macrocode} -% Substitutions not provided in the default \file{.fd} files: -% \begin{macrocode} -\DeclareFontShape{TS1}{cmss}{b}{n} - {<->ssub*cmss/bx/n}{} -\DeclareFontShape{TS1}{cmss}{b}{sl} - {<->ssub*cmss/bx/sl}{} -\DeclareFontShape{TS1}{cmss}{b}{it} - {<->ssub*cmss/bx/sl}{} -% \end{macrocode} -% -% \paragraph{CM Typewriter} -% \begin{macrocode} -\DeclareFontFamily{TS1}{cmtt}{\hyphenchar \font\m@ne} -\DeclareFontShape{TS1}{cmtt}{m}{n}{ - <-9> tctt0800 - <9-10> tctt0900 - <10-12> tctt1000 - <12-17> tctt1200 - <17-> tctt1728 - }{} -\DeclareFontShape{TS1}{cmtt}{m}{it}{ - <-9> tcit0800 - <9-10> tcit0900 - <10-12> tcit1000 - <12-17> tcit1200 - <17-> tcit1728 - }{} -\DeclareFontShape{TS1}{cmtt}{m}{sl}{ - <-9> tcst0800 - <9-10> tcst0900 - <10-12> tcst1000 - <12-17> tcst1200 - <17-> tcst1728 - }{} -\DeclareFontShape{TS1}{cmtt}{bx}{n} - {<->sub * cmtt/m/n}{} -\DeclareFontShape{TS1}{cmtt}{bx}{it} - {<->sub * cmtt/m/it}{} -\DeclareFontShape{TS1}{cmtt}{bx}{sl} - {<->sub * cmtt/m/sl}{} -% \end{macrocode} -% Substitutions not provided in the default \file{.fd} files: -% \begin{macrocode} -\DeclareFontShape{TS1}{cmtt}{b}{n} - {<->sub * cmtt/m/n}{} -\DeclareFontShape{TS1}{cmtt}{b}{it} - {<->sub * cmtt/m/it}{} -\DeclareFontShape{TS1}{cmtt}{b}{sl} - {<->sub * cmtt/m/sl}{} -% \end{macrocode} -% -% \paragraph{CM Typewriter (var.)} -% \begin{macrocode} -\DeclareFontFamily{TS1}{cmvtt}{} -\DeclareFontShape{TS1}{cmvtt}{m}{n}{ - <-9> tcvt0800 - <9-10> tcvt0900 - <10-12> tcvt1000 - <12-17> tcvt1200 - <17-> tcvi1728 - }{} -\DeclareFontShape{TS1}{cmvtt}{m}{it}{ - <-9> tcvi0800 - <9-10> tcvi0900 - <10-12> tcvi1000 - <12-17> tcvi1200 - <17-> tcvi1728 - }{} -% \end{macrocode} -% -% \subsubsection{OT1 encoding} -% -% \paragraph{CM Roman} -% \begin{macrocode} -\DeclareFontFamily{OT1}{cmr}{\hyphenchar\font45 } -\DeclareFontShape{OT1}{cmr}{m}{n}{ - <-6> cmr5 - <6-7> cmr6 - <7-8> cmr7 - <8-9> cmr8 - <9-10> cmr9 - <10-12> cmr10 - <12-17> cmr12 - <17-> cmr17 - }{} -\DeclareFontShape{OT1}{cmr}{m}{sl}{ - <-9> cmsl8 - <9-10> cmsl9 - <10-12> cmsl10 - <12-> cmsl12 - }{} -\DeclareFontShape{OT1}{cmr}{m}{it}{ - <-8> cmti7 - <8-9> cmti8 - <9-10> cmti9 - <10-12> cmti10 - <12-> cmti12 - }{} -\DeclareFontShape{OT1}{cmr}{m}{sc}{ - <-> cmcsc10 - }{} -\DeclareFontShape{OT1}{cmr}{m}{ui}{ - <-> cmu10 - }{} -\DeclareFontShape{OT1}{cmr}{b}{n}{ - <-> cmb10 - }{} -\DeclareFontShape{OT1}{cmr}{bx}{n}{ - <-6> cmbx5 - <6-7> cmbx6 - <7-8> cmbx7 - <8-9> cmbx8 - <9-10> cmbx9 - <10-12> cmbx10 - <12-> cmbx12 - }{} -\DeclareFontShape{OT1}{cmr}{bx}{sl}{ - <-> cmbxsl10 - }{} -\DeclareFontShape{OT1}{cmr}{bx}{it}{ - <-> cmbxti10 - }{} -\DeclareFontShape{OT1}{cmr}{bx}{ui} - {<->sub*cmr/m/ui}{} -% \end{macrocode} -% -% \paragraph{CM Sans} -% \begin{macrocode} -\DeclareFontFamily{OT1}{cmss}{\hyphenchar\font45 } -\DeclareFontShape{OT1}{cmss}{m}{n}{ - <-9> cmss8 - <9-10> cmss9 - <10-12> cmss10 - <12-17> cmss12 - <17-> cmss17 - }{} -\DeclareFontShape{OT1}{cmss}{m}{it} - {<->sub*cmss/m/sl}{} -\DeclareFontShape{OT1}{cmss}{m}{sl}{ - <-9> cmssi8 - <9-10> cmssi9 - <10-12> cmssi10 - <12-17> cmssi12 - <17-> cmssi17 - }{} -\DeclareFontShape{OT1}{cmss}{m}{sc} - {<->sub*cmr/m/sc}{} -\DeclareFontShape{OT1}{cmss}{m}{ui} - {<->sub*cmr/m/ui}{} -\DeclareFontShape{OT1}{cmss}{sbc}{n}{ - <-> cmssdc10 - }{} -\DeclareFontShape{OT1}{cmss}{bx}{n}{ - <-> cmssbx10 - }{} -\DeclareFontShape{OT1}{cmss}{bx}{ui} - {<->sub*cmr/bx/ui}{} -% \end{macrocode} -% -% \paragraph{CM Typewriter} -% \begin{macrocode} -\DeclareFontFamily{OT1}{cmtt}{\hyphenchar \font\m@ne} -\DeclareFontShape{OT1}{cmtt}{m}{n}{ - <-9> cmtt8 - <9-10> cmtt9 - <10-12> cmtt10 - <12-> cmtt12 - }{} -\DeclareFontShape{OT1}{cmtt}{m}{it}{ - <-> cmitt10 - }{} -\DeclareFontShape{OT1}{cmtt}{m}{sl}{ - <-> cmsltt10 - }{} -\DeclareFontShape{OT1}{cmtt}{m}{sc}{ - <-> cmtcsc10 - }{} -\DeclareFontShape{OT1}{cmtt}{m}{ui} - {<->ssub*cmtt/m/it}{} -\DeclareFontShape{OT1}{cmtt}{bx}{n} - {<->ssub*cmtt/m/n}{} -\DeclareFontShape{OT1}{cmtt}{bx}{it} - {<->ssub*cmtt/m/it}{} -\DeclareFontShape{OT1}{cmtt}{bx}{ui} - {<->ssub*cmtt/m/it}{} -% \end{macrocode} -% -% \paragraph{CM Typewriter (var.)} -% \begin{macrocode} -\DeclareFontFamily{OT1}{cmvtt}{\hyphenchar\font45 } -\DeclareFontShape{OT1}{cmvtt}{m}{n}{ - <-> cmvtt10 - }{} -\DeclareFontShape{OT1}{cmvtt}{m}{it}{ - <-> cmvtti10 - }{} -% \end{macrocode} -% -% \subsubsection{OML and OMS encoded math fonts} -% \begin{macrocode} -\DeclareFontFamily{OML}{cmm}{\skewchar\font127 } -\DeclareFontShape{OML}{cmm}{m}{it}{ - <-6> cmmi5 - <6-7> cmmi6 - <7-8> cmmi7 - <8-9> cmmi8 - <9-10> cmmi9 - <10-12> cmmi10 - <12-> cmmi12 - }{} -\DeclareFontShape{OML}{cmm}{b}{it}{<-6>cmmib5<6-8>cmmib7<8->cmmib10}{} -\DeclareFontShape{OML}{cmm}{bx}{it} - {<->ssub*cmm/b/it}{} -% \end{macrocode} -% \begin{macrocode} -\DeclareFontFamily{OMS}{cmsy}{\skewchar\font48 } -\DeclareFontShape{OMS}{cmsy}{m}{n}{ - <-6> cmsy5 - <6-7> cmsy6 - <7-8> cmsy7 - <8-9> cmsy8 - <9-10> cmsy9 - <10-> cmsy10 - }{} -\DeclareFontShape{OMS}{cmsy}{b}{n}{<-6>cmbsy5<6-8>cmbsy7<8->cmbsy10}{} -% \end{macrocode} -% -% \subsubsection{\LaTeX{} symbols} -% \begin{macrocode} -\DeclareFontFamily{U}{lasy}{} -\DeclareFontShape{U}{lasy}{m}{n}{ - <-6> lasy5 - <6-7> lasy6 - <7-8> lasy7 - <8-9> lasy8 - <9-10> lasy9 - <10-> lasy10 - }{} -\DeclareFontShape{U}{lasy}{b}{n}{ - <-10> ssub * lasy/m/n - <10-> lasyb10 - }{} -% \end{macrocode} -% \begin{macrocode} -\endgroup -%</fix-cm> -% \end{macrocode} -% -% -% \subsection{Check the optional argument to floats} -% -% The default definition of |\@xfloat| allows -% |\begin{figure}[abt23WD]| silently ignoring all but |t|. If you use -% |\begin{figure}[T]| you get no warning but the float is not allowed -% \emph{anywhere} so will go to the end of document (or -% |\clearpage|). This change gives an error message for undefined -% options. -% -% \begin{macrocode} -%<*fixltx2e> -% \end{macrocode} -% -% \changes{v1.1n}{2013/12/13}{Check float optional argument.} -% \changes{v1.1q}{2014/05/13}{Fix DocStrip guards.} -% \begin{macrocode} -\def\@xfloat #1[#2]{% - \@nodocument - \def \@captype {#1}% - \def \@fps {#2}% - \@onelevel@sanitize \@fps - \def \reserved@b {!}% - \ifx \reserved@b \@fps - \@fpsadddefault - \else - \ifx \@fps \@empty - \@fpsadddefault - \fi - \fi - \ifhmode - \@bsphack - \@floatpenalty -\@Mii - \else - \@floatpenalty-\@Miii - \fi - \ifinner - \@parmoderr\@floatpenalty\z@ - \else - \@next\@currbox\@freelist - {% - \@tempcnta \sixt@@n - \expandafter \@tfor \expandafter \reserved@a - \expandafter :\expandafter =\@fps - \do -% \end{macrocode} -% Start of changes, use a nested if structure, ending in an error. -% \begin{macrocode} - {% - \if \reserved@a h% - \ifodd \@tempcnta - \else - \advance \@tempcnta \@ne - \fi - \else\if \reserved@a t% - \@setfpsbit \tw@ - \else\if \reserved@a b% - \@setfpsbit 4% - \else\if \reserved@a p% - \@setfpsbit 8% - \else\if \reserved@a !% - \ifnum \@tempcnta>15 - \advance\@tempcnta -\sixt@@n\relax - \fi - \else - \@latex@error{Unknown float option `\reserved@a'}% - {Option `\reserved@a' ignored and `p' used.}% - \@setfpsbit 8% - \fi\fi\fi\fi\fi - }% -% \end{macrocode} -% End of changes -% \begin{macrocode} - \@tempcntb \csname ftype@\@captype \endcsname - \multiply \@tempcntb \@xxxii - \advance \@tempcnta \@tempcntb - \global \count\@currbox \@tempcnta - }% - \@fltovf - \fi - \global \setbox\@currbox - \color@vbox - \normalcolor - \vbox \bgroup - \hsize\columnwidth - \@parboxrestore - \@floatboxreset -} -% \end{macrocode} -% -% \subsection{Within counters only reset next level down} -% -% \changes{v1.1s}{2014/08/30}{Reset all within counters in one go} -% -% Rather than resetting the ``within'' counter to zero we set it to -% $-1$ and then run |\stepcounter| that moves it to $0$ and also -% initiates resetting the next level down. -% \begin{macrocode} - \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne\stepcounter{#1}} -% \end{macrocode} -% -% \begin{macrocode} -%</fixltx2e> -% \end{macrocode} -% \Finale -% -\endinput diff --git a/Master/texmf-dist/source/latex/base/fntguide.tex b/Master/texmf-dist/source/latex/base/fntguide.tex deleted file mode 100644 index 1959cf480a2..00000000000 --- a/Master/texmf-dist/source/latex/base/fntguide.tex +++ /dev/null @@ -1,1830 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% -% This file is part of the LaTeX base system. -% ------------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This file has the LPPL maintenance status "maintained". -% -% The list of all files belonging to the LaTeX base distribution is -% given in the file `manifest.txt'. See also `legal.txt' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% -% \fi -% Filename: fntguide.tex - -\NeedsTeXFormat{LaTeX2e}[1995/12/01] - -\documentclass{ltxguide}[1995/11/28] - -\title{\LaTeXe{} font selection} - -\author{\copyright~Copyright 1995--2005, \LaTeX3 Project Team.\\ - All rights reserved.} - -\date{27 November 2005} - -\begin{document} - -\maketitle - -\tableofcontents - -\section{Introduction} - -This document describes the new font selection features of the \LaTeX{} -Document Preparation System. It is intended for package writers who -want to write font-loading packages similar to |times| or |latexsym|. - -This document is only a brief introduction to the new facilities and -is intended for package writers who are familiar with \TeX{} fonts and -\LaTeX{} packages. It is \emph{neither} a user-guide \emph{nor} a -reference manual for fonts in \LaTeXe. - -\subsection{\LaTeXe~fonts} - -The most important difference between \LaTeX~2.09 and \LaTeXe{} is the -way that fonts are selected. In \LaTeX~2.09, the Computer Modern fonts -were built into the \LaTeX~format, and so customizing \LaTeX{} to use -other fonts was a major effort. - -In \LaTeXe, very few fonts are built into the format, and there are -commands to load new text and math fonts. Packages such as |times| or -|latexsym| allow authors to access these fonts. -This document describes how to write similar font-loading packages. - -The \LaTeXe{} font selection system was first released as the `New Font -Selection Scheme' (NFSS) in 1989, and then in release~2 in 1993. -\LaTeXe{} includes NFSS release~2 as standard. - -\subsection{Overview} - -This document contains an overview of the new font commands -of \LaTeX. - -\begin{description} - -\item[Section~\ref{Sec:text}] describes the commands for selecting fonts - in classes and packages. It lists the five \LaTeX{} font - attributes, and lists the commands for selecting fonts. It also - describes how to customize the author commands such as |\textrm| and - |\textit| to suit your document design. - -\item[Section~\ref{Sec:math}] explains the commands for controlling - \LaTeX{} math fonts. It describes how to specify new math fonts and - new math symbols. - -\item[Section~\ref{Sec:install}] explains how to install new fonts into - \LaTeX. It shows how \LaTeX{} font attributes are turned into \TeX{} - font names, and how to specify your own fonts using font definition - files. - -\item[Section~\ref{Sec:encode}] discusses text font encodings. - It describes how to declare a new encoding and how to define - commands, such as |\AE| or |\"|, which have different definitions in - different encodings, depending on whether ligatures, etc.\ are - available in the encoding. - -\item[Section~\ref{Sec:misc}] covers font miscellanea. It describes how - \LaTeX{} performs font substitution, how to customize fonts that are - preloaded in the \LaTeX{} format, and the naming conventions used in - \LaTeX{} font selection. - -\end{description} - -\subsection{Further information} - -For a general introduction to \LaTeX, including the new features of -\LaTeXe, you should read \emph{\LaTeXbook}, -Leslie Lamport, Addison Wesley, 2nd~ed, 1994. - -A more detailed description of the \LaTeX{} font selection scheme is to -be found in \emph{\LaTeXcomp}, 2nd~ed, by Mittelbach and Goossens, Addison -Wesley, 2004. - -The \LaTeX{} font selection scheme is based on \TeX, which is described -by its developer in \emph{The \TeX book}, Donald E.~Knuth, Addison -Wesley, 1986, revised in 1991 to include the features of \TeX~3. - -Sebastian Rahtz's |psnfss| software contains the software for using a -large number of Type~1 fonts (including the Adobe Laser Writer 35 and -the Monotype CD-ROM fonts) in \LaTeX. It should be available from the -same source as your copy of \LaTeX. - -The |psnfss| software uses fonts generated by Alan Jeffrey's -|fontinst| software. This can convert fonts from Adobe Font Metric -format into a format readable by \LaTeX, including the generation of -the font definition files described in Section~\ref{Sec:install}. The -|fontinst| software should be available from the same source as your -copy of \LaTeX. - -Whenever practical, \LaTeX{} uses the font naming scheme called -`fontname'; this was described in \emph{Filenames for fonts},% -\footnote{An up-to-date electronic version -of this document can be found on any CTAN server, in the directory -\texttt{info/fontname}.} -\emph{TUGboat}~11(4),~1990. - -The class-writer's guide \emph{\clsguide} describes -the new \LaTeX{} features for writers of document classes and packages -and is kept in |clsguide.tex|. Configuring -\LaTeX{} is covered by the guide \emph{\cfgguide} in -\texttt{cfgguide.tex} whilst the philosophy behind our policy on -modifying \LaTeX{} is described in \emph{\modguide} in -\texttt{modguide.tex}. - -The documented source code (from the files used to produce -the kernel format via |latex.ltx|) is now available as -\emph{The \LaTeXe\ Sources}. -This very large document also includes an index of \LaTeX{} -commands. It can be typeset from the \LaTeX{} file |source2e.tex| -in the |base| directory; this uses the class file |ltxdoc.cls|. - -For more information about \TeX{} and \LaTeX{}, please contact your -local \TeX{} Users Group, or the international \TeX{} Users Group. -Addresses and other details can be found at: -\begin{quote}\small\label{addrs} - \texttt{http://www.tug.org/lugs.html} -\end{quote} - - -\section{Text fonts} -\label{Sec:text} - -This section describes the commands available to class and package -writers for specifying and selecting fonts. - -\subsection{Text font attributes} - -Every text font in \LaTeX{} has five \emph{attributes}: -\begin{description} - -\item[encoding] This specifies the order that characters appear in the - font. The two most common text encodings used in \LaTeX{} are - Knuth's `\TeX{} text' encoding, and the `\TeX{} text extended' - encoding developed by the \TeX{} Users Group members during a \TeX{} - Conference at Cork in~1990 (hence its informal name `Cork encoding'). - -\item[family] The name for a collection of fonts, usually grouped under - a common name by the font foundry. For example, `Adobe Times', `ITC - Garamond', and Knuth's `Computer Modern Roman' are all font families. - -\item[series] How heavy or expanded a font is. For example, `medium - weight', `narrow' and `bold extended' are all series. - -\item[shape] The form of the letters within a font family. For - example, `italic', `oblique' and `upright' (sometimes called - `roman') are all font shapes. - -\item[size] The design size of the font, for example `10pt'. If no - dimension is specified, `pt' is assumed. - -\end{description} -The possible values for these attributes are given short acronyms by -\LaTeX. The most common values for the font encoding are: -\begin{center} -\begin{minipage}{.7\linewidth} - \begin{tabular}{rl} - |OT1| & \TeX{} text \\ - |T1| & \TeX{} extended text \\ - |OML| & \TeX{} math italic \\ - |OMS| & \TeX{} math symbols \\ - |OMX| & \TeX{} math large symbols \\ - |U| & Unknown \\ - |L<xx>| & A local encoding - \end{tabular} -\end{minipage} -\end{center} -The `local' encodings are intended for font encodings which are only -locally available, for example a font containing an organisation's -logo in various sizes. - -There are far too many font families to list them all, but some common -ones are: -\begin{center} -\begin{minipage}{.7\linewidth} - \begin{tabular}{rl} - |cmr| & Computer Modern Roman \\ - |cmss| & Computer Modern Sans \\ - |cmtt| & Computer Modern Typewriter \\ - |cmm| & Computer Modern Math Italic \\ - |cmsy| & Computer Modern Math Symbols \\ - |cmex| & Computer Modern Math Extensions \\ - |ptm| & Adobe Times \\ - |phv| & Adobe Helvetica \\ - |pcr| & Adobe Courier - \end{tabular} -\end{minipage} -\end{center} -The most common values for the font series are: -\begin{center} -\begin{minipage}{.7\linewidth} - \begin{tabular}{rl} - |m| & Medium \\ - |b| & Bold \\ - |bx| & Bold extended \\ - |sb| & Semi-bold \\ - |c| & Condensed - \end{tabular} -\end{minipage} -\end{center} -The most common values for the font shape are: -\begin{center} -\begin{minipage}{.7\linewidth} - \begin{tabular}{rl} - |n| & Normal (that is `upright' or `roman') \\ - |it| & Italic \\ - |sl| & Slanted (or `oblique') \\ - |sc| & Caps and small caps - \end{tabular} -\end{minipage} -\end{center} -The font size is specified as a dimension, for example |10pt| or -|1.5in| or |3mm|; if no unit is specified, |pt| is assumed. These five -parameters specify every \LaTeX{} font, for example: -\begin{center} - \begin{tabular}{@{}r@{\,}l@{\,}c@{\,}c@{\,}cc@{}r@{}} - \multicolumn{5}{@{}c}{\emph{\LaTeX{} specification}} & - \emph{Font} & - \emph{\TeX{} font name} \\ - |OT1| & |cmr| & |m| & |n| & |10| & - Computer Modern Roman 10 point & - |cmr10| \\ - |OT1| & |cmss| & |m| & |sl| & |1pc| & - Computer Modern Sans Oblique 1 pica & - |cmssi12| \\ - |OML| & |cmm| & |m| & |it| & |10pt| & - Computer Modern Math Italic 10 point & - |cmmi10| \\ - |T1| & |ptm| & |b| & |it| & |1in| & - Adobe Times Bold Italic 1 inch & - |ptmb8t at 1in| - \end{tabular} -\end{center} -These five parameters are displayed whenever \LaTeX{} gives an overfull -box warning, for example: -\begin{verbatim} - Overfull \hbox (3.80855pt too wide) in paragraph at lines 314--318 - []\OT1/cmr/m/n/10 Normally [] and [] will be iden-ti-cal, -\end{verbatim} -The author commands for fonts set the five attributes: -\begin{center} - \begin{tabular}{rcl} - \emph{Author command} & - \emph{Attribute} & - \emph{Value in} |article| \emph{class} \\ - |\textrm{..}| or |\rmfamily| & family & |cmr| \\ - |\textsf{..}| or |\sffamily| & family & |cmss| \\ - |\texttt{..}| or |\ttfamily| & family & |cmtt| \\ - |\textmd{..}| or |\mdseries| & series & |m| \\ - |\textbf{..}| or |\bfseries| & series & |bx| \\ - |\textup{..}| or |\upshape| & shape & |n| \\ - |\textit{..}| or |\itshape| & shape & |it| \\ - |\textsl{..}| or |\slshape| & shape & |sl| \\ - |\textsc{..}| or |\scshape| & shape & |sc| \\ - |\tiny| & size & |5pt| \\ - |\scriptsize| & size & |7pt| \\ - |\footnotesize| & size & |8pt| \\ - |\small| & size & |9pt| \\ - |\normalsize| & size & |10pt| \\ - |\large| & size & |12pt| \\ - |\Large| & size & |14.4pt| \\ - |\LARGE| & size & |17.28pt| \\ - |\huge| & size & |20.74pt| \\ - |\Huge| & size & |24.88pt| - \end{tabular} -\end{center} -The values used by these commands are determined by the document class, -using the parameters defined in Section~\ref{Sec:text.param}. - -Note that there are no author commands for selecting new encodings. -These should be provided by packages, such as the |fontenc| package. - -This section does not explain how \LaTeX{} font specifications are -turned into \TeX{} font names. This is described in -Section~\ref{Sec:install}. - -\subsection{Selection commands} - -The low-level commands used to select a text font are as follows. - -\begin{decl} -|\fontencoding| \arg{encoding} \\ -|\fontfamily| \arg{family}\\ -|\fontseries| \arg{series}\\ -|\fontshape| \arg{shape}\\ -|\fontsize| \arg{size} \arg{baselineskip}\\ -|\linespread| \arg{factor} -\end{decl} - -\NEWdescription{1998/12/01} -Each of the commands starting with |\font...| sets one of the font -attributes; |\fontsize| also sets |\baselineskip|. The |\linespread| -command prepares to multiply the current (or newly defined) -|\baselineskip| with \m{factor} (e.g., spreads the lines apart for -values greater one). - -The actual font in use is not altered by these commands, but the -current attributes are used to determine which font and baseline skip -to use after the next |\selectfont| command. - - -\begin{decl} -|\selectfont| -\end{decl} -Selects a text font, based on the current values of the font attributes. - -\emph{Warning}: There \emph{must} be a |\selectfont| command -immediately after any settings of the font parameters by (some of) -the six commands above, before any following text. -For example, it is legal to say: -\begin{verbatim} - \fontfamily{ptm}\fontseries{b}\selectfont Some text. -\end{verbatim} -but it is \emph{not} legal to say: -\begin{verbatim} - \fontfamily{ptm} Some \fontseries{b}\selectfont text. -\end{verbatim} -You may get unexpected results if you put text between a -|\font<parameter>| command (or |\linespread|) and a |\selectfont|. - -\begin{decl} -|\usefont| \arg{encoding} \arg{family} \arg{series} \arg{shape} -\end{decl} -A short hand for the equivalent |\font...| commands followed by a -call to |\selectfont|. - - -\subsection{Internals} - -The current values of the font attributes are held in internal macros. - -\begin{decl} - |\f@encoding| \\ - |\f@family| \\ - |\f@series| \\ - |\f@shape| \\ - |\f@size| \\ - |\f@baselineskip| \\ - |\tf@size| \\ - |\sf@size| \\ - |\ssf@size| -\end{decl} - -These hold the current values of the encoding, the family, the series, -the shape, the size, the baseline skip, the main math size, the -`script' math size and the `scriptscript' math size. The last three -are accessible only within a formula; outside of math they may contain -arbitrary values. - -For example, to set the size to 12 without -changing the baseline skip: -\begin{verbatim} - \fontsize{12}{\f@baselineskip} -\end{verbatim} -However, you should \emph{never} alter the values of the internal -commands directly; they must only be modified using the low-level -commands like |\fontfamily|, |\fontseries|, etc. If you disobey this -warning you might produce code that loops. - -\subsection{Parameters for author commands} -\label{Sec:text.param} - -The parameter values set by author commands such as |\textrm| and -|\rmfamily|, etc.\ are not hard-wired into \LaTeX; instead these -commands use the values of a number of parameters set by the document -class and packages. For example, |\rmdefault| is the name of the -default family selected by |\textrm| and |\rmfamily|. Thus to set a -document in Adobe Times, Helvetica and Courier, the document designer -specifies: -\begin{verbatim} - \renewcommand{\rmdefault}{ptm} - \renewcommand{\sfdefault}{phv} - \renewcommand{\ttdefault}{pcr} -\end{verbatim} - -\begin{decl} - |\encodingdefault| \\ - |\familydefault| \\ - |\seriesdefault| \\ - |\shapedefault| -\end{decl} -The encoding, family, series and shape of the main body font. By -default these are |OT1|, |\rmdefault|, |m| and |n|. Note that since -the default family is |\rmdefault|, this means that changing -|\rmdefault| will change the main body font of the document. - -\begin{decl} - |\rmdefault| \\ - |\sfdefault| \\ - |\ttdefault| -\end{decl} -The families selected by |\textrm|, |\rmfamily|, |\textsf|, -|\sffamily|, |\texttt| and |\ttfamily|. By default these are |cmr|, -|cmss| and |cmtt|. - -\begin{decl} - |\bfdefault| \\ - |\mddefault| -\end{decl} -The series selected by |\textbf|, |\bfseries|, |\textmd| and -|\mdseries|. By default these are |bx| and |m|. -These values are suitable for the default families used. If other -fonts are used as standard document fonts (for example, certain -PostScript fonts) it might be necessary to adjust the value of -|\bfdefault| to |b| since only a few such families have a `bold -extended' series. An alternative (taken for the fonts provided by -|psnfss|) is to define silent substitutions from |bx| series to |b| -series with special |\DeclareFontShape| declarations and the |ssub| -size function, see Section~\ref{sec:sizefunct}. - - -\begin{decl} - |\itdefault| \\ - |\sldefault| \\ - |\scdefault| \\ - |\updefault| -\end{decl} -The shapes selected by |\textit|, |\itshape|, |\textsl|, |\slshape|, -|\textsc|, |\scshape|, |\textup| and |\upshape|. By default these are -|it|, |sl|, |sc| and |n|. - -Note that there are no parameters for the size commands. These should -be defined directly in class files, for example: -\begin{verbatim} - \renewcommand{\normalsize}{\fontsize{10}{12}\selectfont} -\end{verbatim} -More elaborate examples (setting additional parameters when the text -size is changed) can be found in |classes.dtx| the source -documentation for the classes |article|, |report|, and |book|. - - -\subsection{Special font declaration commands} - -\begin{decl} -|\DeclareFixedFont| \arg{cmd} \arg{encoding} \arg{family} \arg{series} - \arg{shape} \arg{size} -\end{decl} - -Declares command \m{cmd} to be a font switch which selects the font -that is specified by the attributes \m{encoding}, \m{family}, -\m{series}, \m{shape}, and \m{size}. - -The font is selected without any adjustments to baselineskip and other -surrounding conditions. - -This example makes |{\picturechar .}| select a small dot very quickly: -\begin{verbatim} - \DeclareFixedFont{\picturechar}{OT1}{cmr}{m}{n}{5} -\end{verbatim} - - -\begin{decl} -|\DeclareTextFontCommand| \arg{cmd} \arg{font-switches} -\end{decl} - -Declares command \m{cmd} to be a font command with one argument. -The current font attributes are locally modified by \m{font-switches} -and then the argument of \m{cmd} is typeset in the resulting new font. - -Commands defined by |\DeclareTextFontCommand| automatically take care -of any necessary italic correction (on either side). - -The following example shows how |\textrm| is defined by the kernel. -\begin{verbatim} - \DeclareTextFontCommand{\textrm}{\rmfamily} -\end{verbatim} - -To define a command that always typeset its argument in the italic -shape of the main document font you could declare: -\begin{verbatim} - \DeclareTextFontCommand{\normalit}{\normalfont\itshape} -\end{verbatim} - -This declaration can be used to change the meaning of a command; if -\m{cmd} is already defined, a log that it has been redefined -is put in the transcript file. - -\begin{decl} -|\DeclareOldFontCommand| \arg{cmd} \arg{text-switch} - \arg{math-switch} -\end{decl} - -Declares command \m{cmd} to be a font switch (i.e.~used with the -syntax |{<cmd>...}|) having the definition \m{text-switch} -when used in text and the definition \m{math-switch} when used in a -formula. -Math alphabet commands, like |\mathit|, when used within \m{math-switch} -should not have an argument. Their use in this argument causes their -semantics to change so that they here act as a font switch, as -required by the usage of the \m{cmd}. - -This declaration is useful for setting up commands like |\rm| to behave -as they did in \LaTeX~2.09. We strongly urge you \emph{not} to misuse -this declaration to invent new font commands. - -The following example defines |\it| to produce the italic shape of the -main document font if used in text and to switch to the font that would -normally be produced by the math alphabet |\mathit| if used in a -formula. -\begin{verbatim} - \DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit} -\end{verbatim} - -This declaration can be used to change the meaning of a command; if -\m{cmd} is already defined, a log that it has been redefined -is put in the transcript file. - - -\section{Math fonts} -\label{Sec:math} - -This section describes the commands available to class and package -writers for specifying math fonts and math commands. - -\subsection{Math font attributes} - -The selection of fonts within math mode is quite different to that of -text fonts. - -Some math fonts are selected explicitly by one-argument commands such -as |\mathsf{max}| or |\mathbf{vec}|; such fonts are called \emph{math -alphabets}. These math alphabet commands affect only the font used -for letters and symbols of type |\mathalpha| (see -Section~\ref{Sec:math.commands}); other symbols within the argument -will be left unchanged. The predefined math alphabets are: -\begin{center} - \begin{tabular}{ccc} - \emph{Alphabet} & \emph{Description} & \emph{Example} \\ - |\mathnormal| & default & $abcXYZ$ \\ - |\mathrm| & roman & $\mathrm{abcXYZ}$ \\ - |\mathbf| & bold roman & $\mathbf{abcXYZ}$ \\ - |\mathsf| & sans serif & $\mathsf{abcXYZ}$ \\ - |\mathit| & text italic & $\mathit{abcXYZ}$ \\ - |\mathtt| & typewriter & $\mathtt{abcXYZ}$ \\ - |\mathcal| & calligraphic & $\mathcal{XYZ}$ - \end{tabular} -\end{center} -Other math fonts are selected implicitly by \TeX{} for symbols, with -commands such as |\oplus| (producing $\oplus$) or with straight -characters like |>>| or |+|. Fonts containing such math symbols are -called \emph{math symbol fonts}. The predefined math symbol fonts -are: -\begin{center} - \begin{tabular}{ccc} - \emph{Symbol font} & \emph{Description} & \emph{Example} \\ - |operators| & symbols from |\mathrm| & $[\;+\;]$ \\ - |letters| & symbols from |\mathnormal| & $<<\star>>$ \\ - |symbols| & most \LaTeX{} symbols & $\leq*\geq$ \\ - |largesymbols| & large symbols & $\sum\prod\int$ - \end{tabular} -\end{center} -Some math fonts are both \emph{math alphabets} and \emph{math symbol -fonts}, for example |\mathrm| and |operators| are the same font, and -|\mathnormal| and |letters| are the same font. - -Math fonts in \LaTeX{} have the same five attributes as text fonts: -encoding, family, series, shape and size. However, there are no -commands that allow the attributes to be individually changed. -Instead, the conversion from math fonts to these five attributes is -controlled by the \emph{math version}. For example, the |normal| math -version maps: -\begin{center} - \begin{tabular}{rlc@{ }c@{ }c@{ }c} - \multicolumn{2}{c}{\emph{Math font}} & - \multicolumn{4}{c}{\emph{External font}} \\ - \emph{Alphabets} & \emph{Symbol fonts} & - \multicolumn{4}{c}{\emph{Attributes}} \\ - |\mathnormal| & |letters| & |OML| & |cmm| & |m| & |it| \\ - |\mathrm| & |operators| & |OT1| & |cmr| & |m| & |n| \\ - |\mathcal| & |symbols| & |OMS| & |cmsy| & |m| & |n| \\ - & |largesymbols| & |OMX| & |cmex| & |m| & |n| \\ - |\mathbf| & & |OT1| & |cmr| & |bx| & |n| \\ - |\mathsf| & & |OT1| & |cmss| & |m| & |n| \\ - |\mathit| & & |OT1| & |cmr| & |m| & |it| \\ - |\mathtt| & & |OT1| & |cmtt| & |m| & |n| - \end{tabular} -\end{center} -The |bold| math version is similar except that it contains bold fonts. -The command |\boldmath| selects the |bold| math version. - -Math versions can only be changed outside of math mode. - -The two predefined math versions are: -\begin{center} - \begin{tabular}{rl} - |normal| & the default math version \\ - |bold| & the bold math version - \end{tabular} -\end{center} -Packages may define new math alphabets, math symbol fonts, and math -versions. This section describes the commands for writing such -packages. - -\subsection{Selection commands} - -There are no commands for selecting symbol fonts. Instead, these are -selected indirectly through symbol commands like |\oplus|. -Section~\ref{Sec:math.commands} explains how to define symbol commands. - -\begin{decl} - |\mathnormal{<math>}|\\ - |\mathcal{<math>}|\\ - |\mathrm{<math>}|\\ - |\mathbf{<math>}|\\ - |\mathsf{<math>}|\\ - |\mathit{<math>}|\\ - |\mathtt{<math>}| -\end{decl} -Each math alphabet is a command which can only be used inside math -mode. For example, |$x + \mathsf{y} + \mathcal{Z}$| produces $x + -\mathsf{y} + \mathcal{Z}$. - -\begin{decl} -|\mathversion{<version>}| -\end{decl} -This command selects a math version; it can only be used outside math -mode. For example, |\boldmath| is defined to be |\mathversion{bold}|. - -\subsection{Declaring math versions} - -\begin{decl} -|\DeclareMathVersion| \arg{version} -\end{decl} - -Defines \m{version} to be a math version. - -The newly declared version is initialised with the defaults for all -symbol fonts and math alphabets declared so far (see the commands -|\DeclareSymbolFont| and |\DeclareMathAlphabet|). - -If used on an already existing version, an information message is -written to the transcript file and all previous |\SetSymbolFont| or -|\SetMathAlphabet| declarations for this version are overwritten by -the math alphabet and symbol font defaults, i.e.~one ends up with a -virgin math version. - -Example: -\begin{verbatim} - \DeclareMathVersion{normal} -\end{verbatim} - - -\subsection{Declaring math alphabets} - -\begin{decl} -|\DeclareMathAlphabet| \arg{math-alph} \arg{encoding} \arg{family} - \arg{series} \arg{shape} -\end{decl} - -\NEWdescription{1997/12/01} -If this is the first declaration for \m{math-alph} then a new math -alphabet with this as its command name is created. - -The arguments \m{encoding} \m{family} \m{series} \m{shape} are used to -set, or reset, the default values for this math alphabet in all math -versions; if required, these must be further reset later for a -particular math version by a |\SetMathAlphabet| command. - -If \m{shape} is empty then this \m{math-alph} is declared to be invalid -in all versions, unless it is set by a later |\SetMathAlphabet| -command for a particular math version. - -Checks that the command \m{math-alph} is either already a math -alphabet command or is undefined; and that \m{encoding} is a known -encoding scheme, i.e., has been previously declared. - - -In these examples, |\foo| is defined for all math versions but |\baz|, -by default, is defined nowhere. -\begin{verbatim} - \DeclareMathAlphabet{\foo}{OT1}{cmtt}{m}{n} - \DeclareMathAlphabet{\baz}{OT1}{}{}{} -\end{verbatim} - - -\begin{decl} -|\SetMathAlphabet| \arg{math-alph} \arg{version}\\ - \null\hfill\arg{encoding} \arg{family} \arg{series} \arg{shape} -\end{decl} - -Changes, or sets, the font for the math alphabet \m{math-alph} in math -version \m{version} to \m{encoding}\m{family}\m{series}\m{shape}. - -Checks that \m{math-alph} has been declared as a math alphabet, -\m{version} is a known math version and \m{encoding} is a known -encoding scheme. - - -This example defines |\baz| for the `normal' math version only: -\begin{verbatim} - \SetMathAlphabet{\baz}{normal}{OT1}{cmss}{m}{n} -\end{verbatim} - -Note that this declaration is not used for all math alphabets: -Section~\ref{sec:symalph} describes |\DeclareSymbolFontAlphabet|, -which is used to set up math alphabets contained in fonts which have -been declared as symbol fonts. - - -\subsection{Declaring symbol fonts} -\label{sec:symalph} - -\begin{decl} -|\DeclareSymbolFont| \arg{sym-font} \arg{encoding} \arg{family} - \arg{series} \arg{shape} -\end{decl} - -\NEWdescription{1997/12/01} -If this is the first declaration for \m{sym-font} then a new -symbol font with this name is created (i.e.~this identifier is assigned -to a new \TeX{} math group). - -The arguments \m{encoding} \m{family} \m{series} \m{shape} are used to -set, or reset. the default values for this symbol font in \emph{all} -math versions; if required, these must be further reset later for -a particular math version by a |\SetSymbolFont| command. - -Checks that \m{encoding} is a declared encoding scheme. - - -For example, the following sets up the first four standard math symbol -fonts: -\begin{verbatim} - \DeclareSymbolFont{operators}{OT1}{cmr}{m}{n} - \DeclareSymbolFont{letters}{OML}{cmm}{m}{it} - \DeclareSymbolFont{symbols}{OMS}{cmsy}{m}{n} - \DeclareSymbolFont{largesymbols}{OMX}{cmex}{m}{n} -\end{verbatim} - - -\begin{decl} -|\SetSymbolFont| \arg{sym-font} \arg{version}\\ - \null\hfill \arg{encoding} \arg{family} \arg{series} \arg{shape} -\end{decl} - -Changes the symbol font \m{sym-font} for math version \m{version} -to \m{encoding} \m{family} \m{series} \m{shape}. - -Checks that \m{sym-font} has been declared as a symbol font, -\m{version} is a known math version and \m{encoding} is a -declared encoding scheme. - - -For example, the following come from the set up of the `bold' -math version: -\begin{verbatim} - \SetSymbolFont{operators}{bold}{OT1}{cmr}{bx}{n} - \SetSymbolFont{letters}{bold}{OML}{cmm}{b}{it} -\end{verbatim} - - -\begin{decl} -|\DeclareSymbolFontAlphabet| \arg{math-alph} \arg{sym-font} -\end{decl} - -\NEWdescription{1997/12/01} -Allows the previously declared symbol font \m{sym-font} to be the -math alphabet with command \m{math-alph} in \emph{all} math versions. - -Checks that the command \m{math-alph} is either already a math alphabet -command or is undefined; and that \m{sym-font} is a symbol font. - - -Example: -\begin{verbatim} - \DeclareSymbolFontAlphabet{\mathrm}{operators} - \DeclareSymbolFontAlphabet{\mathcal}{symbols} -\end{verbatim} - -This declaration should be used in preference to -|\DeclareMathAlphabet| and |\SetMathAlphabet| when a math alphabet is -the same as a symbol font; this is because it makes better use of the -limited number (only 16) of \TeX's math groups. - -\NEWdescription{1997/12/01} -Note that, whereas a \TeX{} math group is allocated to each symbol font -when it is first declared, a math alphabet uses a \TeX{} math group -only when its command is used within a math formula. - - -\subsection{Declaring math symbols} -\label{Sec:math.commands} - -\begin{decl} -|\DeclareMathSymbol| \arg{symbol} \arg{type} \arg{sym-font} - \arg{slot} -\end{decl} - -The \m{symbol} can be either a single character such as `|>>|', or a -macro name, such as |\sum|. - -Defines the \m{symbol} to be a math symbol of type -\m{type} in slot \m{slot} of symbol font \m{sym-font}. The -\m{type} can be given as a number or as a command: -\begin{center} - \begin{tabular}{ccc} - \emph{Type} & \emph{Meaning} & \emph{Example} \\ - |0| or |\mathord | & Ordinary & $\alpha$ \\ - |1| or |\mathop | & Large operator & $\sum$ \\ - |2| or |\mathbin | & Binary operation & $\times$ \\ - |3| or |\mathrel | & Relation & $\leq$ \\ - |4| or |\mathopen | & Opening & $\langle$ \\ - |5| or |\mathclose| & Closing & $\rangle$ \\ - |6| or |\mathpunct| & Punctuation & $;$ \\ - |7| or |\mathalpha| & Alphabet character & $A$ - \end{tabular} -\end{center} -Only symbols of type |\mathalpha| will be affected by math alphabet -commands: within the argument of a math alphabet command they will -produce the character in slot \m{slot} of that math alphabet's font. -Symbols of other types will always produce the same symbol -(within one math version). - -|\DeclareMathSymbol| allows a macro \m{symbol} to be redefined only if -it was previously defined to be a math symbol. It also checks that -the \m{sym-font} is a declared symbol font. - -Example: -\begin{verbatim} - \DeclareMathSymbol{\alpha}{0}{letters}{"0B} - \DeclareMathSymbol{\lessdot}{\mathbin}{AMSb}{"0C} - \DeclareMathSymbol{\alphld}{\mathalpha}{AMSb}{"0C} -\end{verbatim} - -\begin{decl} - |\DeclareMathDelimiter| \arg{cmd} \arg{type} - \arg{sym-font-1} \arg{slot-1}\\ - \null\hfill \arg{sym-font-2} \arg{slot-2} -\end{decl} -Defines \m{cmd} to be a math delimiter where the small variant is in -slot \m{slot-1} of symbol font \m{sym-font-1} and the large -variant is in slot \m{slot-2} of symbol font \m{sym-font-2}. -Both symbol fonts must have been declared previously. - -Checks that \m{sym-font-i} are both declared symbol fonts. - -If \TeX{} is not looking for a delimiter, \m{cmd} is treated just as -if it had been defined with |\DeclareMathSymbol| using -\m{type}, \m{sym-font-1} and \m{slot-1}. In other words, if a -command is defined as a delimiter then this automatically defines it -as a math symbol. - -\NEWdescription{1998/06/01} -In case \m{cmd} is a single character such as `|[|', the same syntax is -used. Previously the \arg{type} argument was not present (and thus the -corresponding math symbol declaration had to be provided seperately). - -Example: -\begin{verbatim} - \DeclareMathDelimiter{\langle}{\mathopen}{symbols}{"68} - {largesymbols}{"0A} - \DeclareMathDelimiter{(} {\mathopen}{operators}{"28} - {largesymbols}{"00} -\end{verbatim} - - -\begin{decl} -|\DeclareMathAccent| \arg{cmd} \arg{type} \arg{sym-font} \arg{slot} -\end{decl} - -Defines \m{cmd} to act as a math accent. - -The accent character comes from slot \m{slot} in -\m{sym-font}. The \m{type} can be either -|\mathord| or |\mathalpha|; in the latter case the accent character -changes font when used in a math alphabet. - -Example: -\begin{verbatim} - \DeclareMathAccent{\acute}{\mathalpha}{operators}{"13} - \DeclareMathAccent{\vec}{\mathord}{letters}{"7E} -\end{verbatim} - - -\begin{decl} -|\DeclareMathRadical| \arg{cmd} - \arg{sym-font-1} \arg{slot-1}\\ - \null\hfill \arg{sym-font-2} \arg{slot-2} -\end{decl} - -Defines \m{cmd} to be a radical where the small variant is in -slot \m{slot-1} of symbol font \m{sym-font-1} and the -large variant is in slot \m{slot-2} of symbol font -\m{sym-font-2}. Both symbol fonts must have been declared -previously. - -Example (probably the only use for it!): -\begin{verbatim} - \DeclareMathRadical{\sqrt}{symbols}{"70}{largesymbols}{"70} -\end{verbatim} - -\subsection{Declaring math sizes} - -\begin{decl} -|\DeclareMathSizes| \arg{t-size} \arg{mt-size} \arg{s-size} - \arg{ss-size} -\end{decl} - -Declares that \m{mt-size} is the (main) math text size, \m{s-size} is -the `script' size and \m{ss-size} the `scriptscript' size to be used -in math, when \m{t-size} is the current text size. For text sizes for -which no such declaration is given the `script' and `scriptscript' -size will be calculated and then fonts are loaded for the calculated -sizes or the best approximation (this may result in a warning -message). - -Normally, \m{t-size} and \m{mt-size} will be identical; however, if, -for example, PostScript text fonts are mixed with bit-map math fonts -then you may not have available a \m{mt-size} for every \m{t-size}. - -Example: -\begin{verbatim} - \DeclareMathSizes{13.82}{14.4}{10}{7} -\end{verbatim} - -\section{Font installation} -\label{Sec:install} - -This section explains how \LaTeX's font attributes are turned into -\TeX{} font specifications. - -\subsection{Font definition files} - -\NEWdescription{1997/12/01} -The description of how \LaTeX{} font attributes are turned into \TeX{} -fonts is usually kept in a \emph{font definition file} (|.fd|). The -file for family \m{family} in encoding \m{ENC} must be -called |<enc><family>.fd|: for example, |ot1cmr.fd| for Computer -Modern Roman with encoding |OT1| or |t1ptm.fd| for Adobe Times with -encoding |T1|. Note that encoding names are converted to lowercase -when used as part of file names. - -Whenever \LaTeX{} encounters an encoding/family combination that it -does not know (e.g.~if the document designer says -|\fontfamily{ptm}\selectfont|) then \LaTeX{} attempts to load the -appropriate |.fd| file. ``Not known'' means: there was no -|\DeclareFontFamily| declaration issued for this encoding/family -combination. If the |.fd| file could not be found, a warning is -issued and font substitutions are made. - -The declarations in the font definition file are responsible for -telling \LaTeX{} how to load fonts for that encoding/family -combination. - -\subsection{Font definition file commands} - -\emph{Note}: A font definition file should contain only commands -from this subsection. - -Note that these commands can also be used outside a font definition -file: they can be put in package or class files, or even in the -preamble of a document. - -\begin{decl} - |\ProvidesFile{<file-name>}[<release-info>]| -\end{decl} -The file should announce itself with a |\ProvidesFile| command, -as described in \emph{\clsguide}. For example: -\begin{verbatim} - \ProvidesFile{t1ptm.fd}[1994/06/01 Adobe Times font definitions] -\end{verbatim} - -Spaces within the arguments specific to font definition files are -ignored to avoid surplus spaces in the document. If a real space is -necessary use |\space|. -\NEWdescription{2004/02/10}However, note that this is only true if the -declaration is made at top level! If used within the definition of -another command, within |\AtBeginDocument|, option code or in similar -places, then spaces within the argument will remain and may result in -incorrect table entries. - -\begin{decl} -|\DeclareFontFamily| \arg{encoding} \arg{family} \arg{loading-settings} -\end{decl} - -Declares a font family \m{family} to be available in encoding scheme -\m{encoding}. - -The \m{loading-settings} are executed immediately after loading any -font with this encoding and family. - -Checks that \m{encoding} was previously declared. - -This example refers to the Computer Modern Typewriter font family in -the Cork encoding: -\begin{verbatim} - \DeclareFontFamily{T1}{cmtt}{\hyphenchar\font=-1} -\end{verbatim} - -Each |.fd| file should contain exactly one |\DeclareFontFamily| -command, and it should be for the appropriate encoding/family -combination. - -\begin{decl} -|\DeclareFontShape| \arg{encoding} \arg{family} \arg{series} - \arg{shape}\\ - \null\hfill \arg{loading-info} \arg{loading-settings} -\end{decl} - -Declares a font shape combination; here \m{loading-info} contains the -information that combines sizes with external fonts. The syntax is -complex and is described in Section~\ref{sec:loadinfo} below. - -The \m{loading-settings} are executed after loading any font with this -font shape. They are executed immediately after the -`loading-settings' which were declared by |\DeclareFontFamily| and so -they can be used to overwrite the settings made at the family level. - -Checks that the combination \m{encoding}\m{family} was previously -declared via |\DeclareFontFamily|. - -Example: -\begin{verbatim} - \DeclareFontShape{OT1}{cmr}{m}{sl}{% - <<5-8>> sub * cmr/m/n - <<8>> cmsl8 - <<9>> cmsl9 - <<10>> <<10.95>> cmsl10 - <<12>> <<14.4>> <<17.28>> <<20.74>> <<24.88>> cmsl12 - }{} -\end{verbatim} -The file can contain any number of |\DeclareFontShape| commands, -which should be for the appropriate \m{encoding} and \m{family}. - -\NEWfeature{1996/06/01} -The font family declarations for the |OT1|-encoded fonts now all -contain: -\begin{verbatim} - \hyphenchar\font=`\- -\end{verbatim} -This enables the use of an alternative |\hyphenchar| in other encodings -whilst maintaining the correct value for all fonts. - -\subsection{Font file loading information} -\label{sec:loadinfo} - -The information which tells \LaTeX{} exactly which font ({\tt .tfm}) -files to load is contained in the \m{loading-info} part of a -|\DeclareFontShape| declaration. This part consists of one or more -\m{fontshape-decl}s, each of which has the following form: - -\begin{center} -\begin{tabular}{r@{ $::=$ }l} - \m{fontshape-decl} & \m{size-infos} \m{font-info} \\ - \m{size-infos} & \m{size-infos} \m{size-info} $\mid$ - \m{size-info} \\ - \m{size-info} & ``|<<|'' \m{number-or-range} ``|>>|'' \\ - \m{font-info} & $[$ \m{size-function} ``|*|'' $]$ - $[$ ``|[|'' \m{optarg} ``|]|'' $]$ \m{fontarg} \\ -\end{tabular} -\end{center} -The \m{number-or-range} denotes the size or size-range -for which this entry applies. - -If it contains a hyphen it is a -range: lower bound on the left (if missing, zero implied), upper bound -on the right (if missing, $\infty$ implied). For ranges, the -upper bound is \emph{not} included in the range and the lower bound is. - -Examples: -\begin{center} -\begin{tabular}{lll} - |<<10>>| & simple size& 10pt only\\ - |<<-8>>| & range& all sizes less than 8pt\\ - |<<8-14.4>>| & range& all sizes greater than or equal to 8pt\\ - & & \ but less than 14.4pt\\ - |<<14.4->>| & range& all sizes greater than or equal 14.4pt -\end{tabular} -\end{center} -If more than one \m{size-info} entry follows without any -intervening \m{font-info}, they all share the next \m{font-info}. - -The \m{size-function}, if present, handles the use of \m{font-info}. -If not present, the `empty' \m{size-function} is assumed. - -All the \m{size-info}s are inspected in the order in which they appear -in the font shape declaration. If a \m{size-info} matches the -requested size, its \m{size-function} is executed. If |\external@font| -is non-empty afterwards this process stops, otherwise the next -\m{size-info} is inspected. (See also |\DeclareSizeFunction|.) - -If this process does not lead to a non-empty |\external@font|, -\LaTeX{} tries the nearest simple size. If the entry contains only -ranges an error is returned. - - -\subsection{Size functions} -\label{sec:sizefunct} - - -\LaTeX{} provides the following size functions, whose `inputs' are -\m{fontarg} and \m{optarg} (when present). - -\begin{description} -\item[`' (empty)] -Load the external font \m{fontarg} at the user-requested size. If -\m{optarg} is present, it is used as the scale-factor. - -\item[s] -Like the empty function but without terminal warnings, only -loggings. - -\item[gen] -Generates the external font from \m{fontarg} followed by -the user-requested size, e.g.~|<<8>> <<9>> <<10>> gen * cmtt| - -\item[sgen] -Like the `gen' function but without terminal warnings, only loggings. - -\item[genb] -\NEWfeature{1995/12/01} -Generates the external font from \m{fontarg} followed by -the user-requested size, using the conventions of the `ec' fonts. -e.g.~|<<10.98>> genb * dctt| produces |dctt1098|. - -\item[sgenb] -\NEWfeature{1995/12/01} -Like the `genb' function but without terminal warnings, only loggings. - -\item[sub] -Tries to load a font from a different font shape declaration given by -\m{fontarg} in the form \m{family}|/|\m{series}|/|\m{shape}. - -\item[ssub] -Silent variant of `sub', only loggings. - -\item[subf] -Like the empty function but issues a warning that it has to substitute -the external font \m{fontarg} because the desired font shape was not -available in the requested size. - -\item[ssubf] -Silent variant of `subf', only loggings. - -\item[fixed] -Load font \m{fontarg} as is, disregarding the user-requested size. -If present, \m{optarg} gives the ``at \ldots pt'' size to be used. - -\item[sfixed] -Silent variant of `fixed', only loggings. - -\end{description} - -Examples for the use of most of the above size functions can be found -in the file |cmfonts.fdd|---the source for the standard |.fd| files -describing the Computer Modern fonts by Donald Knuth. - - -\begin{decl} -|\DeclareSizeFunction| \arg{name} \arg{code} -\end{decl} - -Declares a size-function \m{name} for use in |\DeclareFontShape| -commands. The interface is still under development but there should be -no real need to a define new size functions. - -The \m{code} is executed when the size or size-range in -|\DeclareFontShape| matches the user-requested size. - -The arguments of the size-function are automatically parsed and placed -into |\mandatory@arg| and |\optional@arg| for use in \m{code}. Also -available, of course, is |\f@size|, which is the user-requested size. - -To signal success \m{code} must define the command |\external@font| -to contain the external name and any scaling options (if present) for -the font to be loaded. - -This example sets up the `empty' size function (simplified): -\begin{verbatim} - \DeclareSizeFunction{} - {\edef\external@font{\mandatory@arg\space at\f@size} -\end{verbatim} - - -\section{Encodings} -\label{Sec:encode} - -This section explains how to declare and use new font encodings and -how to declare commands for use with particular encodings. - -\subsection{The \textsf{fontenc} package} - -Users can select new font encodings using the |fontenc| package. The -|fontenc| package has options for encodings; the last option becomes -the default encoding. For example, to use the |OT2| (Washington -University Cyrillic encoding) and |T1| encodings, with |T1| as the -default, an author types: -\begin{verbatim} - \usepackage[OT2,T1]{fontenc} -\end{verbatim} - -\NEWdescription{1997/12/01} -For each font encoding \m{ENC} given as an option, this package loads -the \emph{encoding definition} (|<enc>enc.def|, with an all -lower-case name) file; it also sets |\encodingdefault| to be the last -encoding in the option list. - -The declarations in the encoding definition file |<enc>enc.def| for -encoding \m{ENC} are responsible for declaring this encoding and -telling \LaTeX{} how to produce characters in this encoding; this file -should contain nothing else (see Section~\ref{Sec:encode.def}. - -The standard \LaTeX{} format declares the |OT1| and |T1| text -encodings by inputting the files |ot1enc.def| and |t1enc.def|; it also -sets up various defaults which require that |OT1|-encoded fonts are -available. -Other encoding set-ups might be added to the distribution at a -later stage. - -Thus the example above loads the files |ot2enc.def| and |t1enc.def| -and sets |\encodingdefault| to |T1|. - -\emph{Warning}: If you wish to use |T1|-encoded fonts other than the `cmr' -family then you may need to load the package (e.g.~\texttt{times}) -that selects the fonts \emph{before} loading \texttt{fontenc} (this -prevents the system from attempting to load any |T1|-encoded fonts from -the `cmr' family). - -\subsection{Encoding definition file commands} -\label{Sec:encode.def} - -\emph{Note}: An encoding definition file should contain only commands -from this subsection. - -\NEWdescription{1997/12/01} -As with the font definition file commands, it is also possible -(although normally not necessary) to use these declarations directly -within a class or package file. - -\emph{Warning}: Some aspects of the contents of font definition files -are still under development. Therefore, the current versions of the -files |ot1enc.def| and |t1enc.def| are temporary versions and should -not be used as models for producing further such files. For further -information you should read the documentation in |ltoutenc.dtx|. - -\begin{decl} - |\ProvidesFile{<file-name>}[<release-info>]| -\end{decl} -The file should announce itself with a |\ProvidesFile| -command, described in \emph{\clsguide}. For example: -\begin{verbatim} - \ProvidesFile{ot2enc.def} - [1994/06/01 Washington University Cyrillic encoding] -\end{verbatim} - - -\begin{decl} -|\DeclareFontEncoding| \arg{encoding} \arg{text-settings} - \arg{math-settings} -\end{decl} - -Declares a new encoding scheme \m{encoding}. - -The \m{text-settings} are -declarations which are executed every time |\selectfont| changes the -encoding to be \m{encoding}. - -The \m{math-settings} are similar but are for math alphabets. They -are executed whenever a math alphabet with this encoding is -called. - -\NEWfeature{1998/12/01} -It also saves the value of \m{encoding} in the macro -|\LastDeclaredEncoding|. - -Example: -\begin{verbatim} - \DeclareFontEncoding{OT1}{}{} -\end{verbatim} - -Some author commands need to change their definition depending on -which encoding is currently in use. For example, in the |OT1| -encoding, the letter `\AE' is in slot |"1D|, whereas in the |T1| -encoding it is in slot |"C6|. So the definition of |\AE| has to -change depending on whether the current encoding is |OT1| or |T1|. -The following commands allow this to happen. - -\begin{decl} - |\DeclareTextCommand| \arg{cmd} \arg{encoding} - \oarg{num} \oarg{default} \arg{definition} -\end{decl} -This command is like |\newcommand|, except that it defines a -command which is specific to one encoding. For example, the -definition of |\k| in the |T1| encoding is: -\begin{verbatim} - \DeclareTextCommand{\k}{T1}[1] - {\oalign{\null#1\crcr\hidewidth\char12}} -\end{verbatim} -|\DeclareTextCommand| takes the same optional arguments as -|\newcommand|. - -The resulting command is -robust, even if the code in \m{definition} is fragile. - -It does not produce an error if the command has already -been defined but logs the redefinition in the transcript file. - -\begin{decl}[1994/12/01] - |\ProvideTextCommand| \arg{cmd} \arg{encoding} - \oarg{num} \oarg{default} \arg{definition} -\end{decl} -This command is the same as |\DeclareTextCommand|, except that -if \m{cmd} is already defined in encoding \m{encoding}, then the -definition is ignored. - -\begin{decl} - |\DeclareTextSymbol| \arg{cmd} \arg{encoding} \arg{slot} -\end{decl} -This command defines a text symbol with slot \m{slot} in the -encoding. For example, the definition of |\ss| in the |OT1| encoding -is: -\begin{verbatim} - \DeclareTextSymbol{\ss}{OT1}{25} -\end{verbatim} -It does not produce an error if the command has already -been defined but logs the redefinition in the transcript file. - -\begin{decl} - |\DeclareTextAccent| \arg{cmd} \arg{encoding} \arg{slot} -\end{decl} -This command declares a text accent, with the accent taken from slot -\m{slot} in the encoding. For example, the definition of |\"| in -the |OT1| encoding is: -\begin{verbatim} - \DeclareTextAccent{\"}{OT1}{127} -\end{verbatim} -It does not produce an error if the command has already -been defined but logs the redefinition in the transcript file. - -\begin{decl} - |\DeclareTextComposite| \arg{cmd} \arg{encoding} \arg{letter} - \arg{slot} -\end{decl} -This command declares that the composite letter formed from applying -\m{cmd} to \m{letter} is defined to be simply slot \m{slot} in the -encoding. The \m{letter} should be a single letter (such as |a|) or -a single command (such as |\i|). - - -For example, the definition of |\'{a}| -in the |T1| encoding could be declared like this: -\begin{verbatim} - \DeclareTextComposite{\'}{T1}{a}{225} -\end{verbatim} - -The \m{cmd} will normally have been previously declared -for this encoding, either by using -|\DeclareTextAccent|, or as a one-argument |\DeclareTextCommand|. - -\begin{decl}[1994/12/01] - |\DeclareTextCompositeCommand| \arg{cmd} \arg{encoding} \arg{letter} - \arg{definition} -\end{decl} -This is a more general form of |\DeclareTextComposite|, which allows -for an arbitrary \m{definition}, not just a \m{slot}. The main use -for this is to allow accents on |i| to act like accents on |\i|, for -example: -\begin{verbatim} - \DeclareTextCompositeCommand{\'}{OT1}{i}{\'\i} -\end{verbatim} -It has the same restrictions as |\DeclareTextComposite|. - - -\begin{decl}[1998/12/01] - |\LastDeclaredEncoding| -\end{decl} -This holds the name of the last encoding declared via -|\DeclareFontEncoding| (this should also be the currently most -efficient encoding). It can be used in the \m{encoding} argument -of the above declarations in place of explicitly mentioning the -encoding, e.g. -\begin{verbatim} - \DeclareFontEncoding{T1}{}{} - \DeclareTextAccent{\`}{\LastDeclaredEncoding}{0} - \DeclareTextAccent{\'}{\LastDeclaredEncoding}{1} -\end{verbatim} -This can be useful in cases where encoding files sharing common code -are generated from one source. - - -\subsection{Default definitions} - -\NEWdescription{1997/12/01} -The declarations used in encoding definition files define -encoding-specific commands but they do not allow those commands to be -used without explicitly changing the encoding. For some commands, -such as symbols, this is not enough. For example, the~|OMS| encoding -contains the symbol~`\S', but we need to be able to use the -command~|\S| whatever the current encoding may be, without explicitly -selecting the encoding~|OMS|. - -\NEWdescription{1997/12/01} -To allow this, \LaTeX{} has commands that declare default definitions -for commands; these defaults are used when the command is not defined -in the current encoding. For example, the default encoding for~|\S| -is~|OMS|, and so in an encoding (such as |OT1|) which does not -contain~|\S|, the~|OMS| encoding is selected in order to access this -glyph. But in an encoding (such as~|T1|) which does contain~|\S|, the -glyph in that encoding is used. The standard \LaTeXe{} format sets -up several such defaults using the following encodings: |OT1|,~|OMS| -and~|OML|. - -\emph{Warning}: These commands should \emph{not} occur in encoding -definition files, since those files should declare only commands for use -when that encoding has been selected. They should instead be placed -in packages; they must, of course, always refer to encodings that are -known to be available. - -\begin{decl}[1994/12/01] - |\DeclareTextCommandDefault| \arg{cmd} \arg{definition} -\end{decl} -This command allows an encoding-specific command to be given a default -definition. For example, the default definition for |\copyright| is -defined be be a circled `c' with: -\begin{verbatim} - \DeclareTextCommandDefault{\copyright}{\textcircled{c}} -\end{verbatim} -\begin{decl}[1994/12/01] - |\DeclareTextAccentDefault| \arg{cmd} \arg{encoding} \\ - |\DeclareTextSymbolDefault| \arg{cmd} \arg{encoding} -\end{decl} -These commands allow an encoding-specific command to be given a -default encoding. For example, the default encoding for |\"| and -|\ae| is set to be |OT1| by: -\begin{verbatim} - \DeclareTextAccentDefault{\"}{OT1} - \DeclareTextSymbolDefault{\ae}{OT1} -\end{verbatim} -Note that |\DeclareTextAccentDefault| can be used on any one-argument -encoding-specific command, not just those defined with -|\DeclareTextAccent|. Similarly, |\DeclareTextSymbolDefault| can be -used on any encoding-specific command with no arguments, not just -those defined with |\DeclareTextSymbol|. - -For more examples of these definitions, see |ltoutenc.dtx|. - -\begin{decl}[1994/12/01] - |\ProvideTextCommandDefault| \arg{cmd} \arg{definition} -\end{decl} -This command is the same as |\DeclareTextCommandDefault|, except that -if the command already has a default definition, then the definition -is ignored. This is useful to give `faked' definitions of symbols -which may be given `real' definitions by other packages. For example, -a package might give a fake definition of |\textonequarter| by saying: -\begin{verbatim} - \ProvideTextCommandDefault{\textonequarter}{$\m@th\frac14$} -\end{verbatim} - - \subsection{Encoding defaults} - -\begin{decl} -|\DeclareFontEncodingDefaults| \arg{text-settings} \arg{math-settings} -\end{decl} - -Declares \m{text-settings} and \m{math-settings} for all encoding -schemes. These are executed before the encoding scheme dependent ones -are executed so that one can use the defaults for the major cases and -overwrite them if necessary using |\DeclareFontEncoding|. - -If |\relax| is used as an argument, the current setting of this default -is left unchanged. - -This example is used by amsfonts.sty for accent positioning; it changes -only the math settings: -\begin{verbatim} - \DeclareFontEncodingDefaults{\relax}{\def\accentclass@{7}} -\end{verbatim} - - -\begin{decl} -|\DeclareFontSubstitution| \arg{encoding} \arg{family} \arg{series} - \arg{shape} -\end{decl} - -Declares the default values for font substitution which will be used -when a font with encoding \m{encoding} -should be loaded but no font can be found with the current -attributes. - -These substitutions are local to the encoding scheme because the -encoding scheme is never substituted! They are tried in the order -\m{shape} then \m{series} and finally \m{family}. - -If no defaults are set up for an encoding, the values given by -|\DeclareErrorFont| are used. - -The font specification for -\m{encoding}\m{family}\m{series}\m{shape} -must have been defined by |\DeclareFontShape| -before the |\begin{document}| is reached. - -Example: -\begin{verbatim} - \DeclareFontSubstitution{T1}{cmr}{m}{n} -\end{verbatim} - -\subsection{Case changing} -\label{sec:case} - -\begin{decl} - |\MakeUppercase| \arg{text} \\ - |\MakeLowercase| \arg{text} -\end{decl} - -\NEWfeature{1995/06/01} -\TeX{} provides the two primitives |\uppercase| and |\lowercase| for -changing the case of text. Unfortunately, these \TeX{} primitives do -not change the case of characters accessed by commands like |\ae| or -|\aa|. To overcome this problem, \LaTeX{} provides these two commands. - -In the long run, we would like to use all-caps fonts rather than any -command like |\MakeUppercase| but this is not possible at the moment -because such fonts do not exist. - -For further details, see \texttt{clsguide.tex}. - -\NEWdescription{1999/04/23} -In order that upper/lower-casing will work reasonably well, and in -order to provide any correct hyphenation, \LaTeXe{} \emph{must} use, -throughout a document, the same fixed table for changing case. The -table used is designed for the font encoding |T1|; this works well -with the standard \TeX{} fonts for all Latin alphabets but will cause -problems when using other alphabets. As an experiment, it has now -been extended for use with some Cyrillic encodings. - - -\section{Miscellanea} -\label{Sec:misc} - -This section covers the remaining font commands in \LaTeX{} and some -other issues. - -\subsection{Font substitution} - -\begin{decl} -|\DeclareErrorFont| \arg{encoding} \arg{family} \arg{series} - \arg{shape} \arg{size} -\end{decl} - -Declares \m{encoding}\m{family}\m{series}\m{shape} to be the font shape -used in cases where the standard substitution mechanism fails -(i.e.~would loop). For the standard mechanism see the command -|\DeclareFontSubstitution| above. - -The font specification for -\m{encoding}\m{family}\m{series}\m{shape} -must have been defined by |\DeclareFontShape| -before the |\begin{document}| is reached. - -Example: -\begin{verbatim} - \DeclareErrorFont{OT1}{cmr}{m}{n}{10} -\end{verbatim} - - -\begin{decl} -|\fontsubfuzz| -\end{decl} - -This parameter is used to decide whether or not to produce a terminal -warning if a font size substitution takes place. If the difference -between the requested and the chosen size is less than |\fontsubfuzz| -the warning is only written to the transcript file. The default value -is |0.4pt|. This can be redefined with |\renewcommand|, for example: -\begin{verbatim} - \renewcommand{\fontsubfuzz}{0pt} % always warn -\end{verbatim} - -\subsection{Preloading} - -\begin{decl} -|\DeclarePreloadSizes| \arg{encoding} \arg{family} \arg{series} - \arg{shape} -\arg{size-list} -\end{decl} - - -Specifies the fonts that should be preloaded by the format. These -commands should be put in a |preload.cfg| file, which is read in when -the \LaTeX{} format is being built. -Read |preload.dtx| for more information on how to built such a -configuration file. - -Example: -\begin{verbatim} - \DeclarePreloadSizes{OT1}{cmr}{m}{sl}{10,10.95,12} -\end{verbatim} - - -\subsection{Accented characters} - -\NEWdescription{1996/06/01} -Accented characters in \LaTeX{} can be produced using commands such as -|\"a| etc. The precise effect of such commands depends on the font -encoding being used. When using a font encoding that contains the -accented characters as individual glyphs (such as the |T1| encoding, -in the case of |\"a|) words that contain such accented characters can -be automatically hyphenated. For font encodings that do not contain -the requested individual glyph (such as the |OT1| encoding) such a -command invokes typesetting instructions that produce the accented -character as a combination of character glyphs and diacritical marks -in the font. In most cases this involves a call to the \TeX{} -primitive |\accent|. Glyphs constructed as composites in this way -inhibit hyphenation of the current word; this is one reason why the -|T1| encoding is preferable to the original \TeX{} font encoding -|OT1|. - -It is important to understand that commands like |\"a| in \LaTeXe{} -represent just a name for a single glyph (in this case `umlaut a') and -contain no information about how to typeset that glyph---thus it does -\emph{not} mean `put two dots on top of the character a'. The -decision as to what typesetting routine to use will depend on the -encoding of the current font and so this decision is taken at the last -minute. Indeed, it is possible that the same input will be typeset in -more than one way in the same document; for example, text in section -headings may also appear in table of contents and in running heads; and -each of these may use a font with a different encoding. - -For this reason the notation |\"a| is \emph{not} equivalent to: -\begin{verbatim} - \newcommand \chara {a} \"\chara -\end{verbatim} -In the latter case, \LaTeX{} does not expand the macro |\chara| but -simply compares the notation (the string |\"\chara|) to its list of -known composite notations in the current encoding; when it fails to -find |\"\chara| it does the best it can and invokes the typesetting -instructions that put the umlaut accent on top of the expansion of -|\chara|. Thus, even if the font actually contains `\"a' as an -individual glyph, it will not be used. - -The low-level accent commands in \LaTeX{} are defined in such a way -that it is possible to combine a diacritical mark from one font with a -glyph from another font; for example, |\"\textparagraph| will produce -\"\textparagraph. The umlaut here -is taken from the |OT1| encoded font |cmr10| whilst the paragraph sign -is from the |OMS| encoded font |cmsy10|. (This example may be -typographically silly but better ones would involve font encodings -like |OT2| (Cyrillic) that might not be available at every -site.) - -There are, however, restrictions on the font-changing commands that -will work within the argument to such an accent command. These are -\TeX{}nical in the sense that they follow from the way that \TeX{}'s -|\accent| primitive works, allowing only a special class of commands -between the accent and the accented character. - -The following are examples of commands that will not work correctly as -the accent will appear above a space: the font commands with text -arguments (|\textbf{...}| and friends); all the font size declarations -(|\fontsize| and |\Large|, etc.); |\usefont| and declarations that -depend on it, such as |\normalfont|; box commands (e.g.~|\mbox{...}|). - -The lower-level font declarations that set the attributes family, -series and shape (such as |\fontshape{sl}\selectfont|) will produce -correct typesetting, as will the default declarations such as -|\bfseries|. - - -\subsection{Naming conventions} - -\begin{itemize} -\item -Math alphabet commands all start with |\math...|: examples are -|\mathbf|, |\mathcal|, etc. - -\item -The text font changing commands with arguments all start with -|\text...|: e.g.~|\textbf| and |\textrm|. The exception to this is -|\emph|, since it occurs very commonly in author documents and so -deserves a shorter name. - -\item -Names for encoding schemes are strings of up to three letters (all -upper case) plus digits. - -The \LaTeX3 project reserves the use of encodings starting with the -following letters: |T| (standard 256-long text encodings), |TS| -(symbols that are designed to extend a corresponding |T| encoding), -|X| (text encodings that do not conform to the strict requirements for -|T| encodings), |M| (standard 256-long math encodings), |S| (other -symbol encodings), |A| (other special applications), |OT| (standard -128-long text encodings) and |OM| (standard 128-long math encodings). - -Please do not use the above starting letters for non-portable -encodings. If new standard encodings emerge then we shall add them in -a later release of \LaTeX. - -Encoding schemes which are local to a site or a system should start -with |L|, experimental encodings intended for wide distribution will -start with |E|, whilst |U| is for Unknown or Unclassified encodings. - -\item -Font family names should contain up to five lower case letters. -Where possible, these should conform to the \emph{Filenames for fonts} -font naming scheme. - -\item -Font series names should contain up to four lower case letters. - -\item -Font shapes should contain up to two letters lower case. - -\item -Names for symbol fonts are built from lower and upper case letters -with no restriction. -\end{itemize} - -Whenever possible, you should use the series and shape names suggested -in \emph{\LaTeXcomp} since this will make it easier to combine new -fonts with existing fonts. - -\NEWdescription{1994/12/01} - Where possible, text symbols should be named as |\text| followed by - the Adobe glyph name: for example |\textonequarter| or - |\textsterling|. Similarly, math symbols should be named as - |\math| followed by the glyph name, for example |\mathonequarter| - or |\mathsterling|. Commands which can be used in text or math can - then be defined using |\ifmmode|, for example: -\begin{verbatim} - \DeclareRobustCommand{\pounds}{% - \ifmmode \mathsterling \else \textsterling \fi - } -\end{verbatim} - Note that commands defined in this way must be robust, in case they - get put into a section title or other moving argument. - -\section{If you need to know more \ldots} - -\NEWdescription{1996/06/01} -The |tracefnt| package provides for tracing the actions concerned with -loading, substituting and using fonts. -The package accepts the following options: -\begin{description} -\item[errorshow] Write all information about font changes, etc.\ but - only to the transcript file unless an error occurs. This means that - information about font substitution will not be shown on the - terminal. - -\item[warningshow] Show all font warnings on the terminal. This - setting corresponds to the default behaviour when this - \texttt{tracefnt} package is \emph{not} used! - -\item[infoshow] Show all font warnings and all font info messages - (that are normally only written to the transcript file) also on the - terminal. This is the default when this \texttt{tracefnt} package is - loaded. - -\item[debugshow] In addition to what is shown by \texttt{infoshow}, - show also changes of math fonts (as far as possible): beware, this - option can produce a large amount of output. - -\item[loading] Show the names of external font files when they are - loaded. This option shows only `newly loaded' fonts, not those - already preloaded in the format or the class file before this - \texttt{tracefnt} package becomes active. - -\item[pausing] - Turn all font warnings into errors so that \LaTeX{} will stop. -\end{description} - -\emph{Warning}: The actions of this package can change the layout of a -document and even, in rare cases, produce clearly wrong output, so -it should not be used in the final formatting of `real documents'. - -\begin{thebibliography}{1} - -\bibitem{A-W:MG2004} -Frank Mittelbach and Michel Goossens. -\newblock {\em The {\LaTeX} Companion second edition}. -\newblock With Johannes Braams, David Carlisle, and Chris Rowley. -\newblock Addison-Wesley, Reading, Massachusetts, 2004. - -\bibitem{tub:DKn89} -Donald~E. Knuth. -\newblock Typesetting concrete mathematics. -\newblock {\em {TUG}boat}, 10(1):31--36, April 1989. - -\bibitem{A-W:LLa94} -Leslie Lamport. -\newblock {\em {\LaTeX:} A Document Preparation System}. -\newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994. - -\end{thebibliography} - -\end{document} diff --git a/Master/texmf-dist/source/latex/base/fontdef.dtx b/Master/texmf-dist/source/latex/base/fontdef.dtx index b4f283ff3f2..0767c5a736b 100644 --- a/Master/texmf-dist/source/latex/base/fontdef.dtx +++ b/Master/texmf-dist/source/latex/base/fontdef.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -92,6 +92,7 @@ % \setcounter{StandardModuleDepth}{1} % % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \section{Introduction} diff --git a/Master/texmf-dist/source/latex/base/format.ins b/Master/texmf-dist/source/latex/base/format.ins index df915c33701..9cf0ac42559 100644 --- a/Master/texmf-dist/source/latex/base/format.ins +++ b/Master/texmf-dist/source/latex/base/format.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,18 +70,18 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble \declarepreamble\cfgpreamble -This is a generated file. +This is a generated file. -Copyright 1993-2014 +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -86,7 +91,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX @@ -125,9 +130,9 @@ the system are in the document `cfgguide.tex'. \from{ltlength.dtx}{2ekernel} \from{ltfssbas.dtx}{2ekernel} \from{ltfsstrc.dtx}{2ekernel} - \from{ltfsscmp.dtx}{compat,2ekernel} +% \from{ltfsscmp.dtx}{compat,2ekernel} \from{ltfssdcl.dtx}{compat,2ekernel} - \from{ltfssini.dtx}{compat} + \from{ltfssini.dtx}{compat,2ekernel} \from{ltfntcmd.dtx}{2ekernel} \from{ltpageno.dtx}{2ekernel} \from{ltxref.dtx}{2ekernel} diff --git a/Master/texmf-dist/source/latex/base/graphpap.dtx b/Master/texmf-dist/source/latex/base/graphpap.dtx index 83e69cfe200..9517e90c6f8 100644 --- a/Master/texmf-dist/source/latex/base/graphpap.dtx +++ b/Master/texmf-dist/source/latex/base/graphpap.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -47,6 +47,7 @@ revised \filedate.}} \author{Leslie Lamport} \date{\filedate} + \MaintainedByLaTeXTeam{latex} \maketitle \DocInput{graphpap.dtx} \end{document} @@ -86,15 +87,21 @@ % % VERTICAL GRIDS % -% |\@vgrid|\parg{xpos,ypos}\marg{xincrement}^^A -% \marg{number-of-lines}\marg{length-of-lines}\\ -% |\@nonumvgrid|\parg{xpos,ypos}\marg{xincrement}^^A -% \marg{number-of-lines} \marg{length-of-lines} +% \noindent +% |\@vgrid|\parg{xpos,ypos}\marg{xincrement}\\ +% | |\marg{number-of-lines}\marg{length-of-lines} +% +% \noindent +% |\@nonumvgrid|\parg{xpos,ypos}\marg{xincrement}\\ +% | |\marg{number-of-lines} \marg{length-of-lines} % % HORIZONTAL GRIDS % -% |\@hgrid|\parg{xpos,ypos}\marg{yincrement}^^A -% \marg{number-of-lines}\marg{length-of-lines}\\ +% \noindent +% |\@hgrid|\parg{xpos,ypos}\marg{yincrement}\\ +% | |\marg{number-of-lines}\marg{length-of-lines} +% +% \noindent % |\@nonumhgrid| same as |\@hgrid| but no numbers drawn % % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/base/graphpap.ins b/Master/texmf-dist/source/latex/base/graphpap.ins index 20bec1c6ef0..88eab739f9c 100644 --- a/Master/texmf-dist/source/latex/base/graphpap.ins +++ b/Master/texmf-dist/source/latex/base/graphpap.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/ifthen.dtx b/Master/texmf-dist/source/latex/base/ifthen.dtx index 99a4247c867..3f513a315c2 100644 --- a/Master/texmf-dist/source/latex/base/ifthen.dtx +++ b/Master/texmf-dist/source/latex/base/ifthen.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -60,7 +60,7 @@ % revised \filedate.}} % \author{David Carlisle} % \date{\filedate} -% \author{David Carlisle} +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \CheckSum{306} diff --git a/Master/texmf-dist/source/latex/base/ifthen.ins b/Master/texmf-dist/source/latex/base/ifthen.ins index 48939c6ffab..eda8abfe026 100644 --- a/Master/texmf-dist/source/latex/base/ifthen.ins +++ b/Master/texmf-dist/source/latex/base/ifthen.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/inputenc.dtx b/Master/texmf-dist/source/latex/base/inputenc.dtx index 0bdcb14dcbf..67308bf244c 100644 --- a/Master/texmf-dist/source/latex/base/inputenc.dtx +++ b/Master/texmf-dist/source/latex/base/inputenc.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -39,14 +39,15 @@ Frank Mittelbach} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \setlength\hfuzz{20pt} \DocInput{inputenc.dtx} \end{document} %</driver> % \fi % -% \CheckSum{3522} +% \CheckSum{3534} % %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -249,7 +250,8 @@ % % The Unicode UTF-8 support works differently. It too uses a |.def| file % (i.e., |utf8.def|) but this file does not contain code point declarations -% via |\DeclareInputText| or |\DeclareInputMath|. Instead it defines a number of +% via the commands |\DeclareInputText| or |\DeclareInputMath|. +% Instead it defines a number of % parsing commands that parse UTF-8 characters and then provides the % corresponding \LaTeX{} definitions (if possible). % @@ -424,7 +426,7 @@ %<cp1252&!ansinew> \ProvidesFile{cp1252.def} %<cp1250> \ProvidesFile{cp1250.def} %<cp1257> \ProvidesFile{cp1257.def} - [2014/04/30 v1.2b Input encoding file] + [2015/03/17 v1.2c Input encoding file] %<cp850>%% %<cp850>%% If you need a Euro symbol, try cp858 instead. %<cp850>%% @@ -572,6 +574,7 @@ \gdef\@inpenc@test{\global\let\@inpenc@test\relax}% % \end{macrocode} % Keyboard characters which don't get a definition will be mapped to +% the command % |\@inpenc@undefined| which gets a definition producing an error % message indicating in which input encoding the current keyboard % character is undefined: @@ -612,7 +615,8 @@ % (pr/3273)} % \changes{v1.0f}{2004/05/06}{Really do (pr/3273)} % \changes{v1.1d}{2007/08/06}{Set \cs{endlinechar} properly (pr/3926)} -% \changes{ v1.1e}{2012/06/06}{Save and restore \cs{catcode} of @ (pr/4192)} +% \changes{v1.1e}{2012/06/06}{Save and restore \cs{catcode} of @ (pr/4192)} +% \changes{v1.2c}{2015/03/17}{Save and restore \cs{catcode} of percent (pr/4420)} % \begin{macrocode} \xdef\saved@endlinechar@code{\the\endlinechar}% \endlinechar\m@ne @@ -620,10 +624,13 @@ \catcode`\ 9\relax \xdef\saved@at@catcode{\the\catcode`\@}% \makeatletter + \xdef\saved@percent@catcode{\the\catcode`\%}% + \catcode`\%14\relax \input{#1.def}% \endlinechar\saved@endlinechar@code\relax \catcode`\ \saved@space@catcode\relax \catcode`\@\saved@at@catcode\relax + \catcode`\%\saved@percent@catcode\relax % \end{macrocode} % % If there have been no |\DeclareInputText| or |\DeclareInputMath| @@ -2901,7 +2908,7 @@ % This is an MS Windows encoding for Baltic languages, % known as Code Page 1257; provided by Heiko Oberdiek % using the mappings to Unicode in\\ -% \texttt{http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1257.TXT}\\ +% \texttt{http://www.unicode.org/\\Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1257.TXT}\\ % and\\ % \texttt{http://www.microsoft.com/globaldev/reference/sbcs/1257.mspx}. % diff --git a/Master/texmf-dist/source/latex/base/inputenc.ins b/Master/texmf-dist/source/latex/base/inputenc.ins index 3877951cf29..64ca417eb1c 100644 --- a/Master/texmf-dist/source/latex/base/inputenc.ins +++ b/Master/texmf-dist/source/latex/base/inputenc.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble @@ -95,8 +100,8 @@ extension .ins) which are part of the distribution. \file{latin10.def}{ \from{inputenc.dtx}{latin10}} } - - + + \generate{ \file{cp850.def}{ @@ -114,7 +119,7 @@ extension .ins) which are part of the distribution. \file{decmulti.def}{ \from{inputenc.dtx}{decmulti}} } - + \generate{ \file{ascii.def}{ \from{inputenc.dtx}{ascii}} diff --git a/Master/texmf-dist/source/latex/base/latex209.dtx b/Master/texmf-dist/source/latex/base/latex209.dtx index ed0ffaed591..1d8f986873c 100644 --- a/Master/texmf-dist/source/latex/base/latex209.dtx +++ b/Master/texmf-dist/source/latex/base/latex209.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -138,7 +138,10 @@ % \changes{v0.49}{1995/10/26}{Added code for fleqn.sty, leqno.sty, % openbib.sty.} % \changes{v0.50}{1995/12/08}{Switched of \cs{@inmathwarn}.} +% \changes{v0.53}{2015/02/22}{Dropped \cs{@no@font@optfalse} in various places +% - no longer provided by ltfsscmp.dtx.} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \section{Introduction} @@ -213,7 +216,7 @@ % \end{macrocode} % Describe the file. % \begin{macrocode} -\ProvidesFile{latex209.def}[1998/05/13 v0.52 Standard LaTeX file] +\ProvidesFile{latex209.def}[2015/02/22 v0.53 Standard LaTeX file] % \end{macrocode} % \changes{v0.24}{1994/05/14}{Removed date.} % \changes{v0.40}{1995/03/21} @@ -405,9 +408,10 @@ % |\settoheight|, |\settowidth| and the new options to |\parbox| and % |\minipage|, since these are likely to be used in packages. % -% The intention of the strange |\normalsize| tests below is that after -% the |\documentstyle| command has completed, if neither |\normalsize| -% nor |\@normalsize| was defined by the main style or one of its +% The intention of the strange |\normalsize| tests below are that after +% the |\documentstyle| command has completed, then +% if neither of the commands |\normalsize| +% nor |\@normalsize| were defined by the main style or one of its % `substyles' or `options', then |\@normalsize| will be undefined and % |\normalsize| will generate an error saying it hasn't been defined. % @@ -880,18 +884,18 @@ % options to mimic the \LaTeX~2.09 NFSS1 options. % \begin{macrocode} \def\ds@oldlfont{% - \@no@font@optfalse +%FM \@no@font@optfalse \let\math@bgroup\@empty \let\math@egroup\@empty \let\@@math@bgroup\math@bgroup \let\@@math@egroup\math@egroup } \def\ds@newlfont{% - \@no@font@optfalse +%FM \@no@font@optfalse \OptionNotUsed } \def\ds@margid{% - \@no@font@optfalse +%FM \@no@font@optfalse \let\math@bgroup\bgroup \def\math@egroup##1{##1\egroup}% \let \@@math@bgroup \math@bgroup diff --git a/Master/texmf-dist/source/latex/base/latex209.ins b/Master/texmf-dist/source/latex/base/latex209.ins index a48dd6257a6..217827e2bb8 100644 --- a/Master/texmf-dist/source/latex/base/latex209.ins +++ b/Master/texmf-dist/source/latex/base/latex209.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble @@ -80,7 +85,7 @@ extension .ins) which are part of the distribution. \file{latex209.def}{ \from{latex209.dtx}{head} \from{oldlfont.dtx}{latex209} - \from{latex209.dtx}{tail}} + \from{latex209.dtx}{tail}} \file{article.sty}{ \from{latex209.dtx}{article}} \file{book.sty}{ diff --git a/Master/texmf-dist/source/latex/base/latexbug.el b/Master/texmf-dist/source/latex/base/latexbug.el deleted file mode 100644 index 853b68e1e45..00000000000 --- a/Master/texmf-dist/source/latex/base/latexbug.el +++ /dev/null @@ -1,502 +0,0 @@ -;;; latexbug.el -;;; -;;; Version 0: `test of concept' -;;; Don't look to closely at my lisp coding style... -;;; -;;; David Carlisle -;;; Version 0.1 1994/11/23 -;;; Version 0.2 1994/12/12 -;;; Version 0.3 1995/03/17 -;;; Version 0.4 1995/09/21 -;;; Version 0.5 1995/10/17 -;;; Version 0.6 1997/07/16 -;;; Version 0.7 1997/12/17 -;;; Version 0.8 1999/01/07 -;;; -;;; -;;; LOADING -;;;;;;;;;;; -;;; -;;; To use this code, place the file in a directory searched by lisp -;;; Add -;;; -;;; (autoload 'report-latex-bug "latexbug" -;;; "LaTeX bug report generator" t) -;;; -;;; to your .emacs file (without the ;;;). -;;; -;;; Then if the impossible happens and you discover a bug in LaTeX, -;;; or wish to suggest a change to LaTeX, type -;;; M-x report-latex-bug -;;; -;;; and follow the instructions. -;;; -;;; A file latexbug.cfg can be used to customise -;;; latexbug.tex as described in the comments in latexbug.tex. -;;; or you can customise in your .emacs, as shown below. -;;; -;;; CUSTOMISATION -;;;;;;;;;;;;;;;;;; -;;; -;;; The following variables may be set in your .emacs to customise this -;;; file. -;;; -;;; (setq ltxbug-name "David Carlisle") ; your name -;;; (setq ltxbug-address "dpc@,,,") ; your email address -;;; If these two are not set here, or in the latexbug.cfg -;;; file. emacs will prompt for the values. The prompt -;;; will suggest default values based on standard emacs variables -;;; user-full-name and user-mail-address. -;;; -;;; (setq ltxbug-mail-headers "...") ; additional mail headers. -;;; For example (setq ltxbug-mail-headers "FCC: ~/Mail/sent") -;;; To log outgoing mail in a `sent' file. -;;; -;;; (setq ltxbug-latex-command "...") ; latex command -;;; Set this if LaTeX is not called latex, eg it may be latex2e. -;;; -;;; -;;; Perhaps I should have based this on gnat's send-pr.el but it seemed -;;; easier to write it from scratch to work in latexbug.tex at the -;;; required points. -;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(require 'sendmail) - -(defvar ltxbug-latex-command "latex" - "Command name for Standard LaTeX (LaTeX2e)") - -(defvar ltxbug-directory nil -"Directory in which to run LaTeX, should end with slash. -Default, nil, means inherit directory from current buffer.") - -(defvar user-full-name nil); just needed on ancient emacs -(defvar ltxbug-name nil -"Your name. -If this is nil, will be prompted if not set in latexbug.cfg.") - -(defvar user-mail-address nil); just needed on ancient emacs -(defvar ltxbug-address nil -"Your email-address. -If this is nil, will be prompted if not set in latexbug.cfg.") - -(defvar ltxbug-mail-headers "" -"Extra mail headers that will be added to the mail message. -This is in addition to `To' and `Subject'.") - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(defvar ltxbug-categories -'(("latex") ("tools") ("graphics") - ("mfnfss") ("psnfss") ("amslatex") ("babel") ("expl3") ("cyrillic")) -"Valid GNATS categories") - - -(defun report-latex-bug () -"LaTeX bug report generator" - (interactive) -;; -;; Locally turn off transient mark mode. - (let ((transient-mark-mode nil) - (current-default-directory default-directory)) -;; -;; First produce one large window for the main message -;; and a smaller help window below. - (delete-other-windows) -;; (setq ltxbug-msg (switch-to-buffer "*latex-bugs*")); not emacs18 - (switch-to-buffer - (setq ltxbug-msg (get-buffer-create "*latex-bugs*"))) - (erase-buffer) - (setq default-directory - (or ltxbug-directory current-default-directory)) - (setq major-mode 'ltxbug) - (setq mode-name "LaTeX Bug Report") - (use-local-map ltxbug-map) - (message "Running latex on latexbug.tex ....") - (split-window-vertically -;; -13 ;; old emacs's can't do this - (- (window-height) 13)) - (switch-to-buffer-other-window - (setq ltxbug-help (get-buffer-create "latexbugs help"))) -;; -;; Initially fill the message buffer with the output from running -;; latexbug.tex. - (erase-buffer) -;; -;; Use shell-command not start-process here so shell variables are -;; initialised before calling LaTeX. -;; Hope that is enough \\ to keep all the different shells happy... -;; {} replaced by \\{\\} in version 0.4 (fix for latex/1675) -;; Use \@@input (v0.5) - (shell-command (concat - ltxbug-latex-command - " \\\\nonstopmode\\\\makeatletter\ - \\\\def\\\\batch\\{\\}\\\\@@input latexbug ") t) - (switch-to-buffer-other-window ltxbug-msg) - (goto-char (point-min)) -;; -;; Change header to mention this latexbug.el file. - (if (re-search-forward "!" (point-max) t) - (ltxbug-error) -;; else - (ltxbug-do-report)))) - - - -(defun ltxbug-do-report () - (erase-buffer) -;; -;; Grab the template produced by latexbug.tex - (insert-file "latexbug.msg") -;; -;; Change header to mention this latexbug.el file. - (goto-char (point-min)) - (re-search-forward "\\(by latexbug.\\)\\(tex\\)" (point-max) t) - (replace-match "\\1el") -;; -;; Grab email address into mail field. - (re-search-forward "Re.*email to \\(.*\\)[^Z]*=$" (point-max) t) -;; -;; Put the synopsis template into the Subject field. -;; Add the delimiter used by the mail-send function. - (goto-char (point-min)) - (let ((temp - (concat "To: " - (buffer-substring (match-beginning 1) (match-end 1)) " -Subject: < SYNOPSIS > -" - ltxbug-mail-headers - (if (not (equal "" ltxbug-mail-headers)) " -") - "--text follows this line-- -" ))) -;; -;; Remove the rest of the banner from latexbug.tex - (goto-char (point-min)) - (delete-region (match-beginning 0) (match-end 0)) -;; -;; insert the mail headers - (insert temp)) -;; -;; -;; Get the required category using minibuffer completion. - (set-buffer ltxbug-help) - (erase-buffer) - (insert " -Several categories of files are supported, -corresponding to directories in the standard LaTeX distribution: - - latex: The `base' format, and standard classes only (base). - tools: Packages supported by the LaTeX3 project team (tools). - graphics: The color and graphics packages (graphics). - mfnfss: Packages for using some MetaFont fonts (mfnfss). - psnfss: Packages for using PostScript fonts LaTeX (psnfss). - amslatex: AMS supported Classes and Packages (amsfonts and amslatex). - babel: Packages supporting many different languages (babel). - expl3: Experimental packages for TeX programmers (expl3). - cyrillic: Packages for using Cyrillic fonts (cyrillic). -") - (let* ((completion-ignore-case t) - (cat (completing-read "Which Category ? " - ltxbug-categories nil t ))) - (set-buffer "*latex-bugs*") - (ltxbug-replace "< CATEGORY >" (if (equal cat "") "latex" cat))) -;; -;; Get the synopsis, make sure it is non empty, and not too long. - (set-buffer ltxbug-help) - (erase-buffer) - (insert " - Please enter a One line Synopsis of the report. - This should be < 50 characters. - - This text will be used as the mail header on all - subsequent correspondence. Please use informative strings. - For example: \\mathit generates error in foobar environment - rather than just `LaTeX Bug' or similar strings. -") - (set-buffer ltxbug-msg) - (let ((syn (read-from-minibuffer "Synopsis ? " ))) - (while (or (equal syn "") (> (length syn) 50)) - (setq syn - (read-from-minibuffer "Synopsis (0 < length < 50) ? " syn))) - (set-buffer "*latex-bugs*") - (ltxbug-replace "< SYNOPSIS >" syn)) -;; -;; If latexbug.cfg has not already defined the name -;; grab it from minibuffer - (goto-char (point-min)) - (if (re-search-forward "< ENTER YOUR NAME >" (point-max) t) - (if ltxbug-name - (ltxbug-replace "< ENTER YOUR NAME >" ltxbug-name) -;; else - (set-buffer ltxbug-help) - (erase-buffer) - (insert " - Please enter Your Name -") - (set-buffer ltxbug-msg) - (let ((temp (read-from-minibuffer "Your Name ? " user-full-name))) - (set-buffer "*latex-bugs*") - (ltxbug-replace "< ENTER YOUR NAME >" temp)))) -;; -;; If latexbug.cfg has not already defined the email address -;; grab it from minibuffer - (goto-char (point-min)) - (if (re-search-forward "< ENTER YOUR EMAIL ADDRESS >" (point-max) t) - (if ltxbug-address - (ltxbug-replace "< ENTER YOUR EMAIL ADDRESS >" ltxbug-address) -;; else - (set-buffer ltxbug-help) - (erase-buffer) - (insert " - Please enter Your email address. -") - (set-buffer ltxbug-msg) - (let ((temp (read-from-minibuffer "Your email address ? " - user-mail-address))) - (set-buffer "*latex-bugs*") - (ltxbug-replace "< ENTER YOUR EMAIL ADDRESS >" temp)))) -;; -;; Grab file name. -;; If this is empty, suggest changing the >Class - (set-buffer ltxbug-help) - (erase-buffer) - (insert " -A bug report should be accompanied by a test file -and a the log that the test generates. - -If a test file is not appropriate for this report -Just hit <return> - -Otherwise please specify the file to include. -") - (set-buffer ltxbug-msg) - (let ((temp (read-file-name "Test file ? " nil "" t))) - (if (equal temp "") - (progn - (ltxbug-update-field - "Class" - '(("sw-bug")("doc-bug")("change-request")) - " -You have not offered a test file. - -Perhaps that this is not a bug report. -The default class for messages is sw-bug. - -Possible classes of messages are: - sw-bug: Message reporting a Bug in the software. - doc-bug: Message reporting an error in the documentation. - change-request: Message requesting a change to some LaTeX feature.") - (re-search-forward ">How-to-repeat") - (delete-region (match-beginning 0) (point-max))) -;; else - (set-buffer ltxbug-msg) - (ltxbug-replace " < TEST FILE HERE " "") - (insert-file temp) - (let ((lines 0)) - (while (re-search-forward "\n" (mark) t) - (setq lines (+ lines 1))) - (if (> lines 60) - (progn - (set-buffer ltxbug-help) - (erase-buffer) - (insert -(format "%s%d%s" " -!!!! -Your test file is " lines " lines long!!! - -Test files should be as short as possible, while still showing -the behaviour. Please try to keep the file below 60 lines. -")) - (set-buffer ltxbug-msg)))) - (let* ((log1 - (concat - (substring temp 0 (string-match "\\.[^\\.]*$" temp)) - ".log")) - (log (read-file-name "Log file ? " "" log1 t log1))) - (if (equal log "") - (message "WHY NO LOG ???") - (ltxbug-replace " < LOG FROM TEST FILE HERE >" "") - (insert-file log))))) -;; -;; Prompt for the message text. - (set-buffer ltxbug-help) - (erase-buffer) - (insert " -Complete your bug report by giving the full description -below the `Description of bug:' header. - -There are other database fields you may wish to add, -type C-c C-f to change or add an additional field. - -Once the report is complete, type C-c C-c to send the message. - -A saved copy of the report will be in the file -latexbug.msg. -") - (switch-to-buffer ltxbug-msg) - (ltxbug-replace " < ENTER BUG REPORT HERE >" "") - (auto-fill-mode 1) - (setq fill-column 72)) - - -(defun ltxbug-error () - (set-buffer ltxbug-help) - (erase-buffer) - (insert " -LaTeX did not succesfully produce a bug report template.")) - -(defun ltxbug-save-and-send () - (interactive) - (write-file "latexbug.msg") - (mail-send-and-exit nil)) - - -(defun ltxbug-replace (a b) - "Replace the regexp a by the string b everywhere in the current buffer" - (goto-char (point-min)) - (while (re-search-forward a (point-max) t) - (replace-match b t t))) - -(defvar ltxbug-map (make-sparse-keymap) - "Local keymap used in LaTeX bug buffer.") - -(define-key ltxbug-map "\C-c\C-c" 'ltxbug-save-and-send) -(define-key ltxbug-map "\C-c\C-f" 'ltxbug-oneline-field) - - -(defun ltxbug-update-field (field values help) -"Update FIELD using completion list VALUES and help text HELP. - First entry in VALUES is the default." - (interactive) - (set-buffer ltxbug-help) - (erase-buffer) - (insert help) - (goto-char (point-min)) - (set-buffer ltxbug-msg) - (goto-char (point-min)) - (let ((temp "")) - (if (re-search-forward - (concat"\n>" field ":\\( *\\)\\(.*\\)$") (point-max) t) -;; if field already there - (progn - (setq temp (buffer-substring (match-beginning 2) (match-end 2))) - (delete-region (match-beginning 1) (match-end 2))) -;; else - (re-search-forward ">Category:.*$") - (insert (concat "\n>" field ":"))) - (insert " ") - (let ((temp2 - (completing-read (concat field " ? ") values nil t temp))) - (insert (if (equal temp2 "") - (car(car values)) temp2))))) - - -(defun ltxbug-responsible () - (interactive) - (ltxbug-update-field - "Responsible" -;; Alphabetical order, which makes Alan the default... - '(("alan")("chris")("david")("frank")("johannes") - ("michael")("rainer")) -" - You may set the >Responsible field to a particular person. - **Do not do this unless you have very good reason.** - We may not appreciate having jobs allocated to us in this way:-) - The possible values are: - alan (Alan Jeffrey) - chris (Chris Rowley) - david (David Carlisle) - frank (Frank Mittelbach) - johannes (Johannes Braams) - michael (Michael Downes) - rainer (Rainer Schoepf) -")) - -(defun ltxbug-confidential () - (interactive) - (ltxbug-update-field - "Confidential" - '(("no")("yes")) -" - You may set the >Confidential field to yes. - - The report database is publicly searchable. - See bugs.txt for details. - Reports marked Confidential will not be made public. - Possible values: - no The default. Report may be made public. - yes Report should only be seen by LaTeX maintainers. -")) - - -(defun ltxbug-priority () - (interactive) - (ltxbug-update-field - "Priority" - '(("low")("medium")("high")) -" - Change the priority of the report from `high' - Possible values: - low - medium - high -")) - -(defun ltxbug-severity () - (interactive) - (ltxbug-update-field - "Severity" - '(("non-critical")("serious")("critical")) -" - Classify the severity of the problem.' - Possible values: - non-critical - serious - critical -")) - -(defun ltxbug-class () - (interactive) - (ltxbug-update-field - "Class" - '(("sw-bug")("doc-bug")("change-request")) -" - Classify the type of report. - Possible values: - sw-bug: Message reporting a bug in the software. - doc-bug: Message reporting an error in the documentation. - change-request: Message requesting a change to some LaTeX feature. -")) - -(defun ltxbug-window-setup () - (interactive) - (delete-other-windows) - (split-window-vertically -13) - (switch-to-buffer-other-window ltxbug-help)) - -(defun ltxbug-oneline-field () - (interactive) - (ltxbug-window-setup) - (erase-buffer) - (insert " - You may wish to add or alter the following fields: - Class Class of this report. - Confidential Confidential (or not). - Responsible Assign to a member of the LaTeX maintenance team - Severity Severity of the bug. - Priority Priority of the report. -") - (set-buffer ltxbug-msg) - (let* ((completion-ignore-case t) - (field (completing-read "Which field ? " - '(("Class")("Confidential")("Priority")("Severity") - ("Responsible")) - nil t))) - (cond - ((equal field "Class") (ltxbug-class)) - ((equal field "Confidential") (ltxbug-confidential)) - ((equal field "Responsible") (ltxbug-responsible)) - ((equal field "Severity") (ltxbug-severity)) - ((equal field "Priority") (ltxbug-priority))))) diff --git a/Master/texmf-dist/source/latex/base/latexrelease.dtx b/Master/texmf-dist/source/latex/base/latexrelease.dtx new file mode 100644 index 00000000000..21e5cc909c3 --- /dev/null +++ b/Master/texmf-dist/source/latex/base/latexrelease.dtx @@ -0,0 +1,483 @@ +% \iffalse meta-comment +% +% Copyright 1993-2015 +% The LaTeX3 Project and any individual authors listed elsewhere +% in this file. +% +% This file is part of the LaTeX base system. +% ------------------------------------------- +% +% It may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3c +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This file has the LPPL maintenance status "maintained". +% +% The list of all files belonging to the LaTeX base distribution is +% given in the file `manifest.txt'. See also `legal.txt' for additional +% information. +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with +% extension .ins) which are part of the distribution. +% +% \fi +% +% \iffalse +% +%<*dtx> + \ProvidesFile{latexrelease.dtx} +%</dtx> +%<driver>\ProvidesFile{latexrelease.drv} +%<fixltx2e>\ProvidesPackage{fixltx2e} +%<latexrelease>\ProvidesPackage{latexrelease} +% \fi +% \ProvidesFile{latexrelease.dtx} +%<fixltx2e> [2015/02/21 v2.0a fixes to LaTeX (obsolete)] +%<!fixltx2e> [2015/02/21 v1.0c LaTeX release emulation and tests] +% +% \iffalse +%<*driver> + \documentclass{ltxdoc} + \newcommand\Lopt[1]{\textsf{#1}} + \let\Lpack\Lopt + \providecommand{\file}[1]{\texttt{#1}} + \providecommand{\MF}{\textsf{Metafont}} + \providecommand{\danger}{\marginpar[\hfill\protect\Huge!!]{\protect\Huge!!\hfill}} + \begin{document} + \DocInput{latexrelease.dtx} + \end{document} +%</driver> +% \fi +% +% \CheckSum{100} +% +% +% \let\package\textsf +% +% +% \GetFileInfo{latexrelease.dtx} +% +% \title{The \Lpack{latexrelease} package\thanks{This file +% has version number \fileversion, last +% revised \filedate.}} +% \author{The \LaTeX3 Project} +% \date{\filedate} +% \MaintainedByLaTeXTeam{latex} +% \maketitle +% +% \section{Introduction} +% Prior to the 2015 release of \LaTeX{}, essentially no changes had been +% made to the \LaTeX\ format code for some years, with all +% improvements being instead added to the package \Lpack{fixltx2e}. +% +% While this worked at a technical level it meant that you had to +% explicitly opt-in to bug fixes and improvements, and the vast +% majority of documents did not benefit. +% +% As described in \LaTeX\ News 22, a new policy is being implemented +% in which improvements will now be added to the format by default, +% and this \Lpack{latexrelease} package may be used to ensure +% stability where needed, either by making a new format use an older +% definition of some commands, or conversely may be used to supply the +% new definitions for use with an old format. +% +% The basic use is: +%\begin{verbatim} +% \RequirePackage[2015/01/01]{latexrelease} +% \documentclass{article} +% .... +%\end{verbatim} +% +% After such a declaration the document will use definitions current +% in the January 2015 \LaTeX{}, whether the actual format being used is +% older, or newer than that date. In the former case a copy of +% |latexrelease.sty| would need to be made available for use with the +% older format. This may be used, for example, to share a document +% between co-workers using different \LaTeX\ releases, or to protect a +% document from being affected by system updates. As well as the +% definitions within the format itself, individual packages may use +% the commands defined here to adjust their definitions to the +% specified date as described below. +% +% +% The bulk of this package, after some initial setup and option +% handling consists of a series of |\IncludeInRelease| commands +% which have been extracted from the main source files of the \LaTeX\ +% format. These contain the old and new versions of any commands with +% modified definitions. +% +% \section{Package Options} +% \begin{itemize} +% \item \emph{yyyy/mm/dd} +% The package accepts any \LaTeX\ format date as argument,% +% although dates in the future for which the current release of this +% package has no information will generate a warning. +% +% \item% +% |current| This is the default behaviour, it does not change the +% effective date of the format but does ensure that the +% |\IncludeInRelease| command is defined. +% +% \item +% |latest| sets the effective date of the format to the release date +% of this file, so in an older format applies all patches currently +% available. +% \end{itemize} +% +% +% \section{Release Specific Code} +% +% The |\IncludeInRelease| mechanism allows the kernel developer to +% associate code with a specific date to choose different versions of +% definitions depending on the date specified as an option to the +% \Lpack{latexrelease} package. Is also available for use by package +% authors (or even in a document if necessary). +% +% \medskip +% +% \noindent\DescribeMacro{\IncludeInRelease} +% \marg{code-date}^^A +% \oarg{format-date}%^^A +% \marg{label}^^A +% \marg{message}^^A +% \meta{code}^^A +% |\EndIncludeInRelease| +% +% \begin{description} +% +% \item[\marg{code-date}] This date is associated with the \marg{code} +% argument and will be compared to the requested date in the option to +% the \Lpack{latexrelease}. +% +% \item[\oarg{format-date}] This optional argument can be used to +% specify a format date with the code in addition to the mandatory +% \marg{code-date} argument. This can be useful for package developers +% as described below. +% +% \item[\marg{label}] The \marg{label} argument is an identifier +% (string) that within a given package must be a unique label for each +% related set of optional definitions. Per package at most one code +% block from all the |\IncludeInRelease| declarations with the same +% label will be executed. +% +% \item[\marg{message}] +% The \marg{message} is an informative string that is used in +% messages. It has no other function. +% +% \item[\meta{code}] +% Any \TeX\ code after the |\IncludeInRelease| arguments +% up until the and the following |\EndIncludeInRelease| +% is to be +% conditionally included depending on the date of the format as +% described below. +% +% \end{description} +% +% The |\IncludeInRelease| declarations with a given label should be in +% reverse chronological order in the file. The one chosen will depend +% on this order, the effective format version and the date options, as +% described below. +% +% If your package \Lpack{mypackage} defines a |\widget| command but +% has one definition using the features available in the 2015 \LaTeX\ +% release, and a different definition is required for older formats +% then you can use: +%\begin{verbatim} +% \IncludeInRelease{2015/01/01}{\widget}{Widget Definition} +% \def\widget{new version}% +% \EndIncludeInRelease +% +% \IncludeInRelease{0000/00/00}{\widget}{Widget Definition} +% \def\widget{old version}% +% \EndIncludeInRelease +%\end{verbatim} +% +% If a document using this package is used with a format with +% effective release date of 2015/01/01 or later the new code will be +% used, otherwise the old code will be used. Note the \emph{effective +% release date} might be the original \LaTeX\ release date as shown at +% the start of every \LaTeX\ job, or it may be set by the +% \Lpack{latexrelease} package, so for example a document author who +% wants to ensure the new version is used could use +%\begin{verbatim} +% \RequirePackage[2015/01/01]{latexrelease} +% \documentclass{article} +% \usepackage{mypackage} +%\end{verbatim} +% +% If the document is used with a \LaTeX\ format from 2014 or before, +% then \Lpack{latexrelease} will not have been part of the original +% distribution, but it may be obtained from a later \LaTeX\ release or +% from CTAN and distributed with the document, it will make an older +% \LaTeX\ release act essentially like the 2015 release. +% +% \subsection{Intermediate Package Releases} +% +% The above example works well for testing against the latex format +% but is not always ideal for controlling code by the release date of +% the \emph{package}. Suppose \LaTeX\ is not updated but in March you +% update the \Lpack{mypackage} package and modify the definition of +% |\widget|. You could code the package as: +%\begin{verbatim} +% \IncludeInRelease{2015/03/01}{\widget}{Widget Definition} +% \def\widget{even newer improved March version}% +% \EndIncludeInRelease +% +% \IncludeInRelease{2015/01/01}{\widget}{Widget Definition} +% \def\widget{new version}% +% \EndIncludeInRelease +% +% \IncludeInRelease{0000/00/00}{\widget}{Widget Definition} +% \def\widget{old version}% +% \EndIncludeInRelease +%\end{verbatim} +% +% This would work and allow a document author to choose a date such as +%\begin{verbatim} +% \RequirePackage[2015/03/01]{latexrelease} +% \documentclass{article} +% \usepackage{mypackage} +%\end{verbatim} +% +% To use the latest version, however it would have disadvantage that +% until the next release of \LaTeX, by default, if the document does +% not use \Lpack{latexrelease} to specify a date, the new improved +% code will not be selected as the effective date will be 2015/01/01 +% and so the first code block will be skipped. +% +% For this reason |\IncludeInRelease| has an optional argument that +% specifies an alternative date to use if a date option has not been +% specified to \Lpack{latexrelease}. +%\begin{verbatim} +% \IncludeInRelease{2015/03/01}[2015/01/01]{\widget}{Widget Definition} +% \def\widget{even newer improved March version}% +% \EndIncludeInRelease +% +% \IncludeInRelease{2015/01/01}{\widget}{Widget Definition} +% \def\widget{new version}% +% \EndIncludeInRelease +% +% \IncludeInRelease{0000/00/00}{\widget}{Widget Definition} +% \def\widget{old version}% +% \EndIncludeInRelease +%\end{verbatim} +% +% Now, by default on a 2015/01/01 \LaTeX\ format, the first code block +% will compare the format date to the optional argument 2015/01/01 +% and so will execute the \emph{even newer improved} version. The +% remaining blocks using the |\widget| label argument will all then be +% skipped. +% +% If on the other hand the document requests an explicit release date +% using \Lpack{latexrelease} then this date will be used to decide what +% code block to include. +% +% \subsection{Using \cs{IncludeInRelease} in Packages} +% +% If |\IncludeInRelease| is used within a package then all such +% conditional code needs to be within such declarations, e.g., it is +% not possible in the above example to have the ``current'' definition +% of |\widget| somewhere in the main code and only the two older +% definitions inside |\IncludeInRelease| declarations. If you would do +% this then one of those |\IncludeInRelease| declarations would be +% included overwriting the even newer code in the main part of the +% package. As a result your package may get fragmented over time with +% various |\IncludeInRelease| declarations sprinkled throughout your +% code or you have to interrupt the reading flow by putting those +% declarations together but not necessarily in the place where they +% belong. +% +% To avoid this issue you can use the following coding +% strategy: place the current |\widget| definition in the main code +% where it correctly belongs. +% \begin{verbatim} +% ... +% \def\widget {even newer improved March version} +% \def\@widget{newly added helper command no defined in older releases} +% ... +%\end{verbatim} +% Then, near the end of your package place +% the following: +% \begin{verbatim} +% \IncludeInRelease{2015/03/01}[2015/01/01]{\widget}{Widget Definition} +% \EndIncludeInRelease +% +% \IncludeInRelease{2015/01/01}{\widget}{Widget Definition} +% \def\widget{new version}% +% \let\@widget\@undefined % this doesn't exist in earlier releases +% \EndIncludeInRelease +% +% \IncludeInRelease{0000/00/00}{\widget}{Widget Definition} +% \def\widget{old version}% +% \EndIncludeInRelease +%\end{verbatim} +% This way the empty code block hides the other |\IncludeInRelease| +% declarations unless there is an explicit request with a date +% 2015/01/01 or earlier. +% +% Now if you make a further change to |\widget| in the future you +% simply copy the current definition into the empty block and add a new +% empty declaration with todays date and the current format date. This +% way your main code stays readable and the old versions accumulate at +% the end of the package.\footnote{Of course there may be some cases +% in which the old code has to be in a specific place within the +% package as other code depends on it (e.g., if you +% \texttt{\string\let} something to it). In that case you have to +% place the code variations in the right place in your package rather +% than accumulating them at the very end.} +% +% The only other ``extra effort'' necessary when using this approach +% is that it may be advisable to undo new definitions in the code +% block for the previous release, e.g., in the above example we +% undefined |\@widget| as that isn't available in the 2015/01/01 +% release but was defined in the main code. If all your conditional +% code is within |\IncludeInRelease| declarations that wouldn't been +% necessary as the new code only gets defined if that release is +% chosen. +% +% \section{fixltx2e} +% +% As noted above, prior to the 2015 \LaTeX\ release updates to the +% \LaTeX\ kernel were not made in the format source files but were +% made available in the \Lpack{fixltx2e} package. That package is no +% longer needed but we generate a small package from this source +% that just makes a warning message but otherwise does nothing. +% +% +% +% +% +% \StopEventually{} +% +% \section{Implementation} +% +% We require at least a somewhat sane version of \LaTeXe{}. Earlier +% ones where really quite different from one another. +% \begin{macrocode} +%<*latexrelease> +\NeedsTeXFormat{LaTeX2e}[1996/06/01] +% \end{macrocode} +% +% \section{Setup} +% +% \begin{macro}{\IncludeInRelease} +% \begin{macro}{\EndIncludeInRelease} +% \begin{macrocode} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \changes{v1.0c}{2015/02/19}{Swap argument order} +% \begin{macrocode} +\DeclareOption*{% + \def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#1}}% + \let\requestedpatchdate\CurrentOption} +\DeclareOption{latest}{% + \let\requestedpatchdate\latexreleaseversion} +\DeclareOption{current}{% + \let\requestedpatchdate\fmtversion} +% \end{macrocode} +% +% \begin{macrocode} +\ExecuteOptions{current} +\ProcessOptions\relax +% \end{macrocode} +% +% Sanity check options, it allows some non-legal dates but always +% ensures |requestedLaTeXdate| gets set to a number. Generate an +% error if there are any non digit tokens remaining after removing the +% |//|. +% \begin{macrocode} +\def\reserved@a{% +\edef\requestedLaTeXdate{\the\count@}% +\reserved@b} +\def\reserved@b#1\\{% +\def\reserved@b{#1}% +\ifx\reserved@b\@empty\else +\PackageError{latexrelease}% + {Unexpected option \requestedpatchdate}% + {The option must be of the form yyyy/mm/dd}% +\fi} +\afterassignment\reserved@a +\count@\expandafter + \@parse@version\expandafter0\requestedpatchdate//00\@nil\\ +% \end{macrocode} +% +% less precautions needed for |\fmtversion| +% \begin{macrocode} +\edef\currentLaTeXdate{% + \expandafter\@parse@version\fmtversion//00\@nil} +% \end{macrocode} +% +% \begin{macrocode} +\ifnum\requestedLaTeXdate=\currentLaTeXdate +\PackageWarningNoLine{latexrelease}{% + Current format date selected, no patches applied.} +\expandafter\endinput +\fi +% \end{macrocode} +% +% A newer version of latexrelease should have been distributed with +% the later format. +% \begin{macrocode} +\ifnum\currentLaTeXdate + >\expandafter\@parse@version\latexreleaseversion//00\@nil +\PackageWarningNoLine{latexrelease}{% +The current package is for an older LaTeX format:\MessageBreak +LaTeX \fmtversion\space\MessageBreak +Obtain a newer version of this package!} +\expandafter\endinput +\fi +% \end{macrocode} +% can't patch into the future, could make this an error +% but it has some uses to control package updates +% so allow for now. +% \begin{macrocode} +\ifnum\requestedLaTeXdate + >\expandafter\@parse@version\latexreleaseversion//00\@nil +\PackageWarningNoLine{latexrelease}{% +The current package is for LaTeX \latexreleaseversion:\MessageBreak +It has no patches beyond that date\MessageBreak +There may be an updated version\MessageBreak +of this package available from CTAN} +\expandafter\endinput +\fi +% \end{macrocode} +% +% Update the format version to the requested date. +% \begin{macrocode} +\let\fmtversion\requestedpatchdate +\let\currentLaTeXdate\requestedLaTeXdate +% \end{macrocode} +% +% +% \section{Individual Changes} +% +% The code for each change will be inserted at this point, extracted +% from the kernel source files. +% +% \begin{macrocode} +%</latexrelease> +% \end{macrocode} +% +% \section{fixltx2e} +% +% Generate a stub \Lpack{fixltx2e} package: +% \begin{macrocode} +%<*fixltx2e> +\NeedsTeXFormat{LaTeX2e} +\PackageWarningNoLine{fixltx2e}{% +fixltx2e is not required with releases after 2015\MessageBreak +All fixes are now in the LaTeX kernel.\MessageBreak +See the latexrelease package for details} +%</fixltx2e> +% \end{macrocode} +% +% \Finale +% +\endinput diff --git a/Master/texmf-dist/source/latex/base/latexrelease.ins b/Master/texmf-dist/source/latex/base/latexrelease.ins new file mode 100644 index 00000000000..65d9e677a00 --- /dev/null +++ b/Master/texmf-dist/source/latex/base/latexrelease.ins @@ -0,0 +1,118 @@ +%% +%% This file will generate fast loadable files and documentation +%% driver files from the doc files in this package when run through +%% LaTeX or TeX. +%% +%% Copyright 1993-2015 +%% The LaTeX3 Project and any individual authors listed elsewhere +%% in this file. +%% +%% This file is part of the LaTeX base system. +%% ------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3b +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3b or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This file has the LPPL maintenance status "maintained". +%% +%% In particular, NO PERMISSION is granted to modify the contents of this +%% file since it contains the legal notices that are placed in the files +%% it generates. +%% +%% The list of all files belonging to the LaTeX base distribution is +%% given in the file `manifest.txt'. See also `legal.txt' for additional +%% information. +%% +%% +%% +%% +%% --------------- start of docstrip commands ------------------ +%% + +\input docstrip + +\preamble + +This is a generated file. + +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 +The LaTeX3 Project and any individual authors listed elsewhere +in this file. + +This file was generated from file(s) of the LaTeX base system. +-------------------------------------------------------------- + +It may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3c +of this license or (at your option) any later version. +The latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3c or later is part of all distributions of LaTeX +version 2005/12/01 or later. + +This file has the LPPL maintenance status "maintained". + +This file may only be distributed together with a copy of the LaTeX +base system. You may however distribute the LaTeX base system without +such generated files. + +The list of all files belonging to the LaTeX base distribution is +given in the file `manifest.txt'. See also `legal.txt' for additional +information. + +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with +extension .ins) which are part of the distribution. +\endpreamble + +%\keepsilent +\usedir{tex/latex/base} + +\generateFile{latexrelease.sty}{t}{% + \from{ltvers.dtx} {latexrelease}% + \from{latexrelease.dtx}{latexrelease}% + \from{ltdefns.dtx} {latexrelease}% + \from{ltboxes.dtx} {latexrelease}% + \from{ltmath.dtx} {latexrelease}% + \from{ltlength.dtx} {latexrelease}% + \from{ltfloat.dtx} {latexrelease}% + \from{ltoutput.dtx} {latexrelease}% + \from{ltspace.dtx} {latexrelease}% + \from{ltplain.dtx} {latexrelease}% + \from{ltfssini.dtx} {latexrelease}% + \from{ltfssbas.dtx} {latexrelease}% + \from{ltfsscmp.dtx} {latexrelease}% + \from{ltfinal.dtx} {latexrelease}% +} + + +\ifToplevel{ +\Msg{***********************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* files into a directory searched by TeX:} +\Msg{*} +\Msg{* \space\space latexrelease.sty} +\Msg{*} +\Msg{* To produce the documentation run the files ending with} +\Msg{* `.dtx' through LaTeX2e.} +\Msg{*} +\Msg{* Happy TeXing} +\Msg{***********************************************************} +} + + +\generateFile{fixltx2e.sty}{t}{% + \from{latexrelease.dtx}{fixltx2e}} + +\endbatchfile diff --git a/Master/texmf-dist/source/latex/base/latexsym.dtx b/Master/texmf-dist/source/latex/base/latexsym.dtx index 1fa41604923..bea067171e3 100644 --- a/Master/texmf-dist/source/latex/base/latexsym.dtx +++ b/Master/texmf-dist/source/latex/base/latexsym.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -52,6 +52,7 @@ \date{\filedate} \author{Frank Mittelbach} \begin{document} +\MaintainedByLaTeXTeam{latex} \maketitle \DocInput{latexsym.dtx} \end{document} diff --git a/Master/texmf-dist/source/latex/base/latexsym.ins b/Master/texmf-dist/source/latex/base/latexsym.ins index 8555ca294dd..bce5ff544e9 100644 --- a/Master/texmf-dist/source/latex/base/latexsym.ins +++ b/Master/texmf-dist/source/latex/base/latexsym.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble @@ -74,9 +79,14 @@ extension .ins) which are part of the distribution. This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -86,7 +96,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX diff --git a/Master/texmf-dist/source/latex/base/lb2.err b/Master/texmf-dist/source/latex/base/lb2.err deleted file mode 100644 index 68aba155ed3..00000000000 --- a/Master/texmf-dist/source/latex/base/lb2.err +++ /dev/null @@ -1,1624 +0,0 @@ -\def\readRCS$#1 #2 #3 #4 #5${\def\erratafiledate{#4}} -\readRCS -$Id: lb2.err 210 2014-02-22 14:54:09Z mittelba $ - -\def\comando#1{\texttt{\string#1}} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% To produce a printed version of this errata file run this file through -% LaTeX. It will unpack a small class file (if not already present) and -% a configuration file with the extension .cfg. You might want to modify -% the setting in this configuration file to print only a partial errata -% suitable for your printed revision of this book, see details in the -% .cfg file. -% -% The current version of this file can be found at: -% -% http://www.latex-project.org/guides/books.html -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - -\begin{filecontents}{ttcterrata.cls} -%% -%% Copyright (C) 1997,2004,2005,2007 Frank Mittelbach -%% This class file is licenced under LPPL latest version; -%% see http://www.latex-project.org/lppl -% -% -% It sets up a few commands used to format the errata entries for books in the -% Addison-Wesley Series: -% -% Tools and Techniques for Computer Typesetting -% -% hence the name. However, anybody who likes to use it is free to apply it for -% errata files of other books. -% -% Changes: -% -% v1.0a - changed name from errata.cls to ttcterrata.cls - -\ProvidesClass{ttcterrata} - [2007/11/10 v1.0a Mini class for errata files; subject to change (FMi)] - -\LoadClass{article} - -\setcounter{secnumdepth}{-1} -\addtolength\textwidth{5cm} -\addtolength\oddsidemargin{-3cm} - -\addtolength\textheight{36pt} - -\RequirePackage{shortvrb} -\MakeShortVerb{\|} - -\RequirePackage{array,longtable} -\RequirePackage{multicol} - - -\newcommand\erratagetnumber{} -\def\erratagetnumber#1/#2/#3\erratagetnumber{#1#2#3} - - -\newcommand\gobbleerrata{% - \setbox\@tempboxa\vbox\bgroup - \let\endgobble\egroup - \let\hideamp\relax - \let\\\relax\let\par\@@par} - -\newcommand*\hideamp{&} - -\let\endgobble\relax - - -\newcommand\erratastartdate{} -\newcommand\myprinting{1} - - -\newcommand\doweprint[2]{% - \ifnum \myprinting < \if!#2!1000 \else \ifx s#2 1000\else#2 \fi\fi - \ifnum \expandafter\erratagetnumber\erratastartdate\erratagetnumber < - \erratagetnumber#1\erratagetnumber \relax - \@tempswatrue - \else - \@tempswafalse - \fi - \else - \@tempswafalse - \fi -} - - - -\newcommand\includedentries{entries after = \erratastartdate} -\newcommand\printedentries{between \erratastartdate\space and} - -\newcommand\showallerrors{% - \renewcommand\includedentries{all errata entries}% - \renewcommand\printedentries{up to} - \renewcommand\doweprint[2]{\@tempswatrue}} - - -\newcommand\displayrevisionfix[2]{% - \if!#2!\textbf{#1}\else\textit{#1}\rlap{\textsuperscript{#2}}\fi} - -\newcommand\norevisionnumbers{% - \renewcommand\displayrevisionfix[2]{\textbf{##1}}} - -\IfFileExists{\jobname.cfg} - { - \input{\jobname.cfg} - \typeout{***************************************************} - \typeout{*} - \typeout{* Configuration file for \jobname.err found } - \typeout{*} - \typeout{***************************************************} - \AtEndDocument{ - \typeout{***************************************************} - \typeout{*} - \typeout{* If you wish to generate an errata listing} - \typeout{* containing only errors found after a certain revision} - \typeout{* and/or only errors found after a certain date} - \typeout{* modify the information stored in \jobname.cfg} - \typeout{*} - \typeout{* Current settings are:} - \typeout{*} - \typeout{* \@spaces printing of your book = \myprinting} - \typeout{* \@spaces include \includedentries} - \typeout{*} - \typeout{***************************************************} - }} - {} - -%% \erroronpage <page> <line info> <contributor> <date> <fixed in revision> - -\newcommand\erroronpage[5]{% - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\newcommand\seriouserroronpage[5]{% - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \fbox{\bfseries !!}\hfill - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\newcommand\CHAPTER[1]{\endgobble - &\\[4pt]% - \multicolumn{4}{l}{\framebox[10cm][l]{\textbf{\normalsize\strut#1}}} \\} - -\newenvironment{erratalist} - {\begin{longtable}{r>{\raggedright}p{2cm}l>{\raggedright}p{10cm}l}} - {\endgobble\end{longtable}} - -\newcommand\erratatitle[2] - {\begin{center}\LARGE\bfseries - Errata list for #1\\[5pt](\myprinting.\ printing)\\[10pt] - \small Includes all entries found \printedentries\space #2\\ - (For other periods/print runs reprocess this document - with different config settings) - \end{center}% - \markright{Errata for #1 (\printedentries\space #2)}% - \thispagestyle{plain}% - \vspace{20pt}} - -\pagestyle{myheadings} - -\AtBeginDocument{\small} - -\setlength\parindent{0pt} -\setlength\parskip{2pt} - -\newcommand\contributor[2]{\makebox[1cm][l]{\sffamily#1} #2\par} - -% some special shortcuts overwriting existing commands: - -\let\u\underline -\renewcommand\>{$\to$} - -%%% some code suggested by Thorsten Hansen to count the number of -%%% contributions by individuals (will work only if we do not get -%%% too many :-) - -\def\count@contributors#1/#2/#3\@nil{ - \@ifundefined{c@#1}{\newcounter{#1}}{}\stepcounter{#1}% -%%% also count secondary: -%%% \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}% -} - -\renewcommand\erroronpage[5]{% - \count@contributors#3/secondary/\@nil - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\renewcommand\seriouserroronpage[5]{% - \count@contributors#3/secondary/\@nil - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \fbox{\bfseries !!}\hfill - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\renewcommand\contributor[2]{\makebox[1cm][l]{% - \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par} - -\end{filecontents} - - -\begin{filecontents}{\jobname.cfg} -% -% -% Configuration file for the errata listing of -% -% Der LaTeX-Begleiter 2 Auflage -% -% -% \erratastartdate -% -% Specifies the date from which on errata entries should be listed. -% -% The format is YYYY/MM/DD. -% -% The default below ensures that all entries for a particular -% printing are typeset. -% - -\renewcommand\erratastartdate{2005/09/01} - - -% -% \myprinting -% -% Specifies which (revised) printing you own. For example, if you -% have the second printing set this to 2 so that errors already -% corrected in that printing will not appear in your errata -% listing. -% -% The default below ensures that all entries relevant to the second -% printing are typeset. -% -% - -\renewcommand\myprinting{2} - -% -% \norevisionnumbers -% -% Specifies that all page numbers in the errata are shown in the same -% format (bold face) irregardless of whether or not they are fixed -% in some revision. The default is to print corrected errors in -% italic and add the revision number as a superscript. - -% -% \showallerrors -% -% With this command you tell the program that all errata entries are -% supposed to be generated. This makes \myprinting and -% \erratastartdate basically obsolete so this isn't turned on by -% default. -% -% -\endinput -\end{filecontents} - - -\documentclass{ttcterrata}[2005/11/10] % we want new class - -\usepackage[T1]{fontenc} -\let\u\underline % shortcut for this file - -\newcommand\meta[1]{$\langle$\textit{#1\/}$\rangle$} -\newcommand\BibTeX{\textsc{Bib}\TeX} - - -\usepackage{textcomp} - -\usepackage{url} - -\usepackage[ngerman]{babel} -\usepackage[utf8]{inputenc} - - -\renewcommand\erratatitle[2] - {\begin{center}\LARGE\bfseries - Errataliste f\"ur #1\\[5pt](\myprinting.\ Druck)\\[10pt] - \small Enth\"alt alle Eintr\"age die \printedentries\space #2 - gemeldet wurden \\ - (F\"ur andere Zeitr\"aume/Druckausgaben \"andert man die \texttt{.cfg} - Datei und formatiert erneut.) - \end{center}% - \markright{Errata für #1 (\printedentries\space #2)}% - \thispagestyle{plain}% - \vspace{20pt}} - -\renewcommand\printedentries{zwischen \erratastartdate\space und} - - - -\begin{document} - -\erratatitle{Der \LaTeX{}-Begleiter, zweite Auf\/lage}{\erratafiledate} - - -\vspace*{-\baselineskip} - -Hardcover-Ausgabe: -\begin{verbatim} -@book(Pearson:MG05, - author = {Frank Mittelbach and Michel Goossens}, - title = {Der {\LaTeX}-Begleiter}, edition = 2, - note = {Unter Mitarbeit von Johannes Braams, David Carlisle, und Chris Rowley}, - publisher = {Pearson Studium}, address = {M\"unchen}, year = 2005, - pagenums = {1180}, bibliography = {yes}, index = {yes}, - isbn = {3-8273-7166-X}, -) -\end{verbatim} -Bafög-Ausgabe (Softcover) die inhaltlich identisch ist: -\begin{verbatim} -@book(Pearson:MG10, - author = {Frank Mittelbach and Michel Goossens}, - title = {Der {\LaTeX}-Begleiter Baf\"og-Ausgabe}, edition = 2, - note = {Unter Mitarbeit von Johannes Braams, David Carlisle, und Chris Rowley}, - publisher = {Pearson Studium}, address = {M\"unchen}, year = 2010, - pagenums = {1180}, bibliography = {yes}, index = {yes}, - isbn = {3-8689-4088-X}, -) -\end{verbatim} - - -\begin{list}{}{\setlength\leftmargin{0cm}\setlength\rightmargin{3cm}} -\item[] - -Diese Errata-Datei (\texttt{\jobname.err}) ist Teil der -\LaTeX-Distribution und die neuste Version findet man auf der \LaTeX{} -Project Webseite unter -\url{http://www.latex-project.org/guides/}\texttt{\jobname.err}. Dort -findet man auch einige Abschnitte des Buches als PDF-Dateien. - -Die erste Spalte der Tabelle zeigt die Seitennummer des -Errataeintrags. Hochgestellte Ziffern in der ersten Spalte verweisen -auf den Nachdruck, in dem der beschriebene Fehler korrigiert wurde -(ein \textit{s} zeigt, an, dass das Problem bisher nur in den -"`S"'ourcen korrigiert wurde). Die zweite Spalte beschreibt die genaue -Position (negative Zeilen- oder Absatznummern werden vom Fuß der Seite -gezählt). Die dritte Spalte zeigt die Initialen der Person die den -Fehler zuerst aufgespürt/gemeldet hat. - - -Mithilfe der Konfigurationsdatei \texttt{\jobname.cfg} ist es möglich die -Liste so anzupassen, dass nur Errataeinträge ab einem -speziellen Nachdruck oder ab einem gewünschten Datum angezeigt werden. - - -\begin{center} - \Large \bfseries Irren ist menschlich -- Fehlerwettbewerb -\end{center} - - -Jeder gefundene und mitgeteilte Fehler ist ein Gewinn für alle Leser -und Käufer unseres Buches. Aus diesem Grund schreiben wir, Pearson -Studium und die Autoren, einen Preis aus -- halbjährlich, später (mehr)jährlich -- den -die Person erhält, die die meisten Fehler innerhalb dieser Zeit findet -(im Falle einer Überschneidung wird das Los zwischen den "`besten"' -Fehlersuchern entscheiden). Eine Person kann nur einmal einen Preis -bekommen; Fehler die durch die Autoren gefunden werden, zählen nicht. -\begin{center} -Ihr Preis: Ein Lehrbuch Ihrer Wahl! -\end{center} -Auswählen können Sie dieses unter \url{http://www.pearson-studium.de}. -(Bundles und mehrbändige Bücher sind davon ausgenommen). - -Wie üblich behalten sich die Autoren und der Verlag das Recht vor, -selbst zu entscheiden ob ein Fehler tatsächlich als Fehler anzusehen -ist oder ob ein wiederholt vorkommender Fehler als ein oder mehrere Fehler -gezählt wird. - -- Viel Erfolg - - -\begin{center} -\begin{tabular}{clr@{ Eingaben}} -Ende der Wettbewerbsperiode & Gewinner \\[4pt] -2006/04 & Jens Mandavid & 121 \\ -2006/10 & Ralf Heckmann & 61 \\ -2008/04 & --- \\ -\ldots & Termin einer weiteren Verlosung offen -%2008/10 & \\ -\end{tabular} -\end{center} -\end{list} - -\newpage - - -%<-------------------------- - -\begin{erratalist} - -\CHAPTER{Allgemein} - -\iffalse -\seriouserroronpage{general}{}{FMi}{2004/06/12}{} - - To help you in assessing this errata document we have placed - exclamation marks in front of each entry that we consider essential - for correctly understanding the book contents. - \fi - -\erroronpage{}{}{RHe}{2006/06/10}{} - Einzelne Teile mehrgliedriger Abkürzungen werden im deutschsprachigen - Satz normalerweise durch einen kleinen Zwischenraum (Spatium) getrennt; nur in - englischsprachigen Texten wird zwischen den Abkürzungsteilen kein - Zwischenraum gesetzt. - Beispiele: z.\,B., u.\,a.\ anstatt z.B., u.a. - - Dies wird im Buch \emph{vermutlich} nicht korrigiert werden. - - -\CHAPTER{Titelei} - - -\erroronpage{iii}{bottom}{MHo}{2005/10/10}{2} -LB2 mentions the fabled city of ``San Franciso'' which of course -should be ``Francis\u{c}o''. - -\CHAPTER{Kapitel 1} - -\erroronpage{3}{Abs.4, Z.4}{JMa}{2005/12/26}{2} - Ersetze: (NFSS) \> (\textsf{NFSS}) - -\erroronpage{15}{Abs.5, Z.2}{ESt}{2006/03/11}{2} - \texttt{info/examples/lb2} wird nicht gefunden. Kein wirklicher Fehler im - Buch, sondern ein Versehen auf CTAN. - - -\CHAPTER{Kapitel 2} - -\erroronpage{24}{Abs.1, Z.1}{MLi}{2013/07/12}{} - Das Kommando lautet \verb=\AskOption= (ohne ``s'') - -\erroronpage{26}{Abs.-3, Z.4}{JMa}{2006/01/03}{2} - Zur schließenden Klammer in Zeile 5 gibt es keine öffnende; es sollte wohl -heißen: (zum Beispiel \ldots{} - -\erroronpage{29}{Abs. nach 2-2-3, Z.7}{JMa}{2006/01/03}{2} - Es muss ``mit unterschiedliche\u{n} Definitionen'' heißen. - -\erroronpage{31}{Abs.3, Z.3}{FMi}{2006/02/28}{2} -Im Deutschen steht bei einer Aufzählung kein Komma vor ``oder''. - -\erroronpage{33}{Abs.2, Z.-2}{FMi}{2006/02/28}{2} -Im Deutschen steht bei einer Aufzählung kein Komma vor ``oder''. - -\erroronpage{37}{Abs.1, Z.1}{JMa}{2006/01/03}{2} -Im Deutschen steht bei einer Aufzählung kein Komma vor ``oder''. - -\erroronpage{39}{Abs.3, Z.4 und Z.7}{JMa}{2006/01/03}{2} -Im Deutschen steht bei einer Aufzählung kein Komma vor ``oder''. - -\erroronpage{42}{Absatz \textit{rechts}, Z.2}{JMa}{2006/01/03}{2} -Im Deutschen steht bei einer Aufzählung kein Komma vor ``oder''. - -\erroronpage{56}{Abs.3, Z.3}{JMa}{2006/01/03}{2} -Hier fehlt ein Buchstabe: ``Das Beispiel zeigt, das\u{s} es -wahrscheinlich''. - -\erroronpage{59}{2.3.6 Abs.\ 4, Z.\ 1}{RHe}{2006/06/10}{2} - Füge Komma ein: "`Um das \textsf{minitoc}-System zu initialisieren, -muss ein \dots{}"' - -\erroronpage{60}{Tab.2.3, rechte Spalte, Z.1}{JMa}{2006/01/03}{2} -Hier fehlt zu einer schließenden Klammer die öffnende. - -\erroronpage{61}{Abs.3, Z.-1}{JMa}{2006/01/03}{2} -\LaTeX-Trennfehler: Kapitel-eintr"age statt Kapite-leintr"age. - -\erroronpage{64}{Abs.3, Z.-2}{JMa}{2006/01/03}{2} -\LaTeX-Trennfehler: Abschnitts-eintrag statt Abschnitt-seintrag. - -\erroronpage{65}{Abs.1, Z.1-2}{JMa}{2006/01/03}{2} -Es muss ``Ein solcher Wechsel'' statt ``Eine solcher Wechsel'' heißen. - -\erroronpage{65}{Abs.-2, Z.1-2}{JMa}{2006/01/03}{2} -\LaTeX-Trennfehler: Verzeichnis-eintr"age statt Verzeichni-seintr"age. - -\erroronpage{70}{Abs.-1, Z.1-2}{JMa}{2006/01/03}{2} -Hier fehlt ein Komma am Ende der ersten Zeile und ein Punkt am Ende des -ersten Satzes. - -\erroronpage{73}{Abs.2, Z.4}{JMa}{2006/01/03}{2} -Im Deutschen steht bei einer Aufzählung kein Komma vor ``oder''. - -\erroronpage{74}{Abs.2, Z.12}{JMa}{2006/01/03}{2} -Hier fehlt ein Komma vor ``wenn sie durch''. - -\erroronpage{75}{Abs.3, Z.1}{JMa}{2006/01/03}{2} -Es fehlen zwei Buchstaben: ``ohne daf"ur einen eigen\u{en} Abstand -einzuf"ugen''. - - -\CHAPTER{Kapitel 3} - -\erroronpage{94}{Abs.-3, Z.-1}{JMa}{2006/01/06}{2} -Lösche s aus Grau\u{s}wertproblem - - -\erroronpage{101}{Abs.3, Z.3}{JMa}{2006/01/14}{2} -Kein Komma vor und bei einer Aufzählung. - -\erroronpage{109}{Abs.\ 2, Z.\ 5}{RHe}{2006/06/10}{2} - Streiche Kommata: "`Möglich\_ und absolut nicht unwahrscheinlich\_ ist -beispielsweise, \dots{}"' - -\erroronpage{114}{para 3}{FMi/CBe}{2005/09/02}{2} -Ersetze Absatz durch: "`Da es nicht empfehlenswert ist, die Einstellung von -|\baselineskip| -direkt zu ändern, verfügt \LaTeX{} über den Befehl |\lineskip|\,, mit -dem sich |\baselineskip| global für alle Größen ändern lässt. Nach -einer Anweisung wie etwa \verb!\linespread{1.5}\selectfont! tritt der neue -Wert sofort in Kraft. [Fußnote: Die veraltete \LaTeX~2.09 Lösung - \verb=\renewcommand\baselinestretch=\texttt{\textbraceleft - 1.5\textbraceright} benötigt dagegen einen nachfolgenden - Schriftgrößenwechsel (wie |\small| oder |\Large|), damit der neue - Wert in Kraft tritt.] - - - -\erroronpage{117}{3.2.1 Abs.\ 2, Z.\ 7}{RHe}{2006/06/10}{2} - Trennung der Hauptsätze: "`\dots{} der Zähler \texttt{footnote} wird -weiter hochgesetzt, und die Darstellung erfolgt \dots{}"' - -\erroronpage{119}{Abs.\ 2, Z.\ 3}{RHe}{2006/06/10}{2} - Da die Beispiele unmittelbar folgen: "`\dots{} schematisch -dargestellt \u{und bedeuten}:"' - -%%Ebenfalls als Vorschlag zur Neuformulierung -- weil es um zwei -%%unterschiedliche Aspekte geht, sollte durch Punkt oder Semikolon -%%getrennt werden: -% -% -maybe differently -\erroronpage{121}{3.2.3 Abs.\ 2, Z.\ 3}{RHe}{2006/06/10}{2} - "`\u{Es wird ausreichend} Abstand zwischen -Fußnoten und Text gelassen -und die Fußnoten werden in einem kleineren Schriftgrad -gesetzt."' - - -\erroronpage{123}{2. Abs, Z.2}{JMa}{2006/01/14}{2} -\ldots \u{auf denen} die Auswirkung\u{en} von \textsf{perpage} deutlich zu sehen sind. - -\erroronpage{143}{3. Abs, Z.1}{JMa}{2006/01/14}{2} -Am Ende der Zeile fehlt ein Komma. - -\erroronpage{144}{1. Abs, Z.2}{JMa}{2006/01/14}{2} -Es muss \u{kein} statt keinen hei\ss{}en. - -\erroronpage{147}{Bsp.3-3-19}{JMa}{2006/01/14}{2} -Der \LaTeX{}-Begleiter sollte stets mit Bindestrich geschrieben werden. - -\erroronpage{149}{Abs.\ 1, Z.\ 1}{RHe}{2006/06/10}{2} - Streiche Anführungszeichen bei "`theoremähnliche"'. - - -\erroronpage{149}{Abs.\ 1, Z.\ 3}{RHe/FMi}{2006/06/10}{2} -Ersetze: "`Bei vielen dieser Argumente wird der unten aufgeführte, voreingestellte -Wert verwendet, wenn ein leeres Argument angegeben wird. -\> -"`Bei vielen dieser Argumente erhält man den unten aufgeführten voreingestellten -Wert, wenn ein leeres Argument angegeben wird."' - - - - -\erroronpage{149}{Argument \textit{kopf-nach-abstand}, Z.\ -2}{RHe}{2006/06/10}{2} - Streiche Anführungszeichen bei "`Interpunktion"'. - -\erroronpage{155}{Bsp. 3-3-25}{RHe/FMi}{2006/06/10}{2} - Benutze babel Paket und ersetze englische Anführungszeichen durch deutsche. - -\erroronpage{158}{Bsp.3-3-28}{FMi/JBez}{2005/09/02}{} - The vertical space above ``Return values'' is too small. - - Das ist ein ziemlich versteckter \LaTeX-Fehler, mit dem man wohl - leben muss. - -\erroronpage{159}{Abs.\ -1, Z.\ 1}{RHe}{2006/06/10}{2} - "`\dots{} unverändert, also "`wie über die Tastatur eingegeben"'\u{,} -darstellen."' - -\erroronpage{160}{Abs.\ 2, Z.\ 2}{RHe}{2006/06/10}{2} - Anstelle "`extensiv"': "`\dots{} in der Vergangenheit \emph{intensiv} -genutzt wurden, \dots{}"' - -\erroronpage{163}{Z.-3}{JMa}{2006/01/14}{2} -Ersetze: "`fontenc"' \> "`\textsf{fontenc}"' - -\erroronpage{174}{3. Abs, Z.-2}{JMa}{2006/01/14}{2} -Ersetze: "`diesen"' \> "`diesem"' - -\erroronpage{175}{Z. -4}{JMa}{2006/01/14}{2} -Streiche einmal das Wort "`sich"'. - -\erroronpage{182}{Abs -1, Z.3}{JMa}{2006/01/14}{2} -Es geht um eine Untermenge \u{von} \ldots - -\erroronpage{184}{Z.3}{JMa}{2006/01/14}{2} -Streiche einmal das Wort "`Beispiel"'. - -\erroronpage{192}{3. Abs, Z.3}{JMa}{2006/01/14}{2} -Es soll wohl "`von dieser \u{durch} das Resultat von \ldots"' hei\ss{}en. - -\erroronpage{195}{4. Abs, Z.5}{JMa}{2006/01/14}{2} -Ersetze: "`ausgeben"' \> "`aus\u{ge}geben"' - -\erroronpage{197}{2. Abs, Z.1}{JMa}{2006/01/14}{2} -Streiche das zweite t aus setz\u{t}en. - - - - -\CHAPTER{Kapitel 4} - -% - but also a national one, so could stay -% -% \erroronpage{204}{Abs.\ 2, Z.\ -2}{RHe}{2006/06/15}{} -% Streiche "`DIN"' in "`DIN A4"', da A4 nationaler (DIN 476), -% europ\"{a}ischer (EN 20 216) und internationaler (ISO 216) Standard ist. - -\erroronpage{205}{Tab.\ 4.2}{YiL}{2012/05/07}{} - - Die in der Tabelle aufgelisteten Werte sind nur ann\"aherend korrekt - -- einige Werte h\"angen von der gew\"ahlten Papier-Option (etwa |a4paper|) ab. - - - -\erroronpage{205}{4.2, Abs.\ 1, Z.\ 5}{RHe}{2006/06/15}{2} - F\"{u}ge Komma ein: "`\dots{} nicht v\"{o}llig unm\"{o}glich ist\u, sie -\dots{} zu \"{a}ndern, \dots{}"'. - -\erroronpage{208}{Z. 1}{JMa}{2006/01/27}{2} -Fehlendes Komma: "`zwei Pakete\u, mit deren"' - -\erroronpage{210}{Abs.\ 5, Z.\ 5}{RHe}{2006/06/15}{2} - Streiche Komma vor der Klammer: "`\dots{} von Listen Verwendung -finden\_ (\dots{})."' - -\erroronpage{210}{Abs.6, Z.-1}{JMa}{2006/01/27}{2} -Fehlendes Komma: "`abliest), kann man"' - -\erroronpage{213}{Abs.\ 3, Z.\ -1}{RHe}{2006/06/15}{2} - F\"{u}ge Komma ein: "`\dots{} kann es angebracht sein, ihn -einzubeziehen."' - -\erroronpage{213}{Abs.\ 2, Z.\-1}{FMi}{2006/09/25}{2} - Ersetze "`muss die ein oder andere Einstellung"' \> - "` müssen die Einstellungen"' - -\erroronpage{215}{Z.1}{ChB}{2006/06/29}{2} - Es sollte wohl "`die ein\u{e} oder andere Einstellung"' hei"sen. - -\erroronpage{218}{Abs.\ 1, Z.\ 6}{RHe}{2006/06/15}{2} - F\"{u}ge Komma ein: "`\dots{} ist es jedoch besser, -\texttt{ignorehead} \dots{} zu verwenden."' - -% Über das nächste Infinitivproblem kann man sich durchaus streiten: -\erroronpage{218}{Abs.\ 2, Z.\ -2}{RHe}{2006/06/15}{2} - F\"{u}ge Komma ein: "`\dots{} liegt es beim Anwender, -sicherzustellen, dass \dots{}"' - -\erroronpage{218}{Abs.\ -1, Z.\ -3}{RHe}{2006/06/15}{2} - F\"{u}ge Komma ein: "`Da diese Option Fonts skaliert, anstatt -Originalfonts \dots{} einzusetzen, \dots{}"' - -\erroronpage{219}{Abs.\ -1, Z.\ -4ff}{RHe}{2006/06/15}{2} - F\"{u}ge "`werden"' ein und streiche Komma vor dem letzten Abschnitt -der Aufz\"{a}hlung: "`Zun\"{a}chst wird das Paket geladen, alle -R\"{a}nder \u{werden} auf einen Zoll gesetzt\_ und die Kolumnentitel \dots{} -festgelegt; \dots{}"' - -\erroronpage{220}{Abs.\ 1, Z.\ 3}{RHe}{2006/06/15}{2} - F\"{u}ge Komma zwischen den Haupts\"{a}tzen ein: "`\dots{} des -Paketes wieder her, und bei \verb"pass" wird das Paket deaktiviert."' - -\erroronpage{221}{Aufz. cam, Z.\ 1}{RHe}{2006/06/15}{2} - F\"{u}ge Komma ein: "`\dots{} welche die Ma{\ss}e der Nettoseite -anzeigen, ohne sie zu ber\"{u}hren (\dots{})."' - -\erroronpage{221}{para 4, l.4}{FMi}{2006/09/09}{2} - Option \texttt{b3} ist zweifach gelistet. - -\erroronpage{221}{Abs.\ -2, Z.\ 1}{RHe}{2006/06/15}{2} - Entferne: - "`Die Beschreibungen \dots{} sollten deutlich machen, dass \u{das} -\textsf{crop} erst \dots{} geladen werden sollte."' - -\erroronpage{221}{Abs.\ -1, Z.\ 3}{RHe}{2006/06/15}{2} - F\"{u}ge Komma ein: "`\dots{} normalerweise ist es n\"{u}tzlich, ihn -beizubehalten."' - -\erroronpage{222}{Abs.\ 1, Z.\ 3}{RHe}{2006/06/15}{2} - F\"{u}ge Komma ein: "`\dots{} versucht das Paket, den Druckertreiber -\dots{} zu bestimmen."' - -\erroronpage{223}{4.3, Abs.\ 1, Z.\ 2}{RHe}{2006/06/17}{2} - Füge Komma ein: "`\dots{} sammelt genug Material, um gut eine Seite -\dots{}"' - -\erroronpage{224}{Abs.\ -1, Z.\ 2}{RHe}{2006/06/17}{2} - Füge Komma ein: "`\dots{} entspricht dem Inhalt von \verb"\thepage", -wie er auf der \dots{}"' - -\erroronpage{225}{Abs.\ 1, Z.\ 1}{RHe}{2006/06/17}{2} - Füge Komma ein: "`\dots{} mithilfe von \verb"\AtEndDocument", um -sicherzugehen, dass \dots{}"' - -\erroronpage{229}{Abs.\ 2, Z.\ 8,10,-1}{RHe}{2006/06/17}{2} - Füge Leerstellen nach der Ellipse ein: "`\dots{} geht weiter"' - -\erroronpage{229}{Bsp.\ 4-3-3}{FMi}{2006/06/17}{2} - Füge Leerstelle nach der Ellipse ein: \verb=\dots geht= - \> \verb=\dots{} geht= - - -\erroronpage{233}{Abs.\ 2, Z.\ 5}{RHe}{2006/06/17}{2} - Füge Komma ein: "`\dots{} um Längenparameter, sondern um Befehle -\dots{}"' - -\erroronpage{234}{Abs.\ 1, Z.\ 7}{RHe}{2006/06/17}{2} - Ersetze Semikolon durch Komma und füge Wort ein: "Der Seitentyp wird mit `\dots{} -ausgewählt\u, der Bereich \u{dagegen} mit \dots{}"' - - - -\CHAPTER{Kapitel 5} - - -\erroronpage{247}{Abs.\ 3, Z.\ 2}{RHe}{2006/06/17}{2} - Füge Komma ein: "`\dots{} dass sie fähig sein müssen, innerhalb des -Textes \dots{}"' - -\erroronpage{249}{Abs.3 in 5.1.1}{JMa}{2006/01/27}{2} -Dieser Satz steht schon am Ende des ersten Absatzes dieses -Abschnitts. - -\erroronpage{251}{Abs.\ -1}{FMi/CBe}{2005/09/02}{2} - Ersetze Absatz: "`Dezimalwert, mit dem die voreingestellte Minimalhöhe von Tabellenzellen - multipliziert wird. Ein Wert von 1.5 würde z.B. normalgroße - Zeilen um 50\% weiter voneinander entfernen. Er wird mit - dem Befehl \verb=\renewcommand= eingestellt (Standardwert \texttt{1.0})."' - -% -check -\erroronpage{252}{Tabelle 5.2}{RHe}{2006/06/17}{2} - Ersetze alle amerikanischen Auslassungszeichen \{..\} durch deutsche -\{\dots{}\}. - -\erroronpage{253}{Z. -2}{JMa}{2006/01/27}{2} -Kein Komma vor "`erzeugt wurden"' - -\erroronpage{267}{Abs.\ 2, Z.\ 2}{RHe}{2006/06/20}{2} - "`Letztere"' ist klein zu schreiben - -\erroronpage{267}{Abs.\ 1, Z.\ 1}{RHe}{2006/06/20}{2} - Füge Komma ein: "`\dots{} üblicher, Farben \dots{} einzusetzen"' - -\erroronpage{269}{Abs.5, Z.1}{JMa}{2006/01/27}{2} -\LaTeX-Trennfehler: Standar-dumgebung. \> Standard-umgebung - -\erroronpage{277}{Abs.\ 1, Z.\ 1}{RHe}{2006/06/20}{2} - Ersetze Anfang durch: "`Eine der Schwierigkeiten, \LaTeX{}-Tabellen mit außergewöhnlich -großen Einträgen zu setzen, ist eine gute Raumverteilung um diese Einträge herum zu erreichen, - \dots"' - -\erroronpage{277}{Abs.\ -2, Z.\ 2}{RHe}{2006/06/20}{2} - Füge Komma ein: "`\dots{} optionales Argument, ähnlich dem von -\verb"\\"\u, erweitert."' - -\erroronpage{277}{Abs.\ -1, Z.\ 1}{RHe}{2006/06/20}{2} - Ersetze Anfang durch: "`Die vertikalen Linien in einer \texttt{tabular}-Umgebung - werden aus einer Reihe von Linienelementen gebildet, jeweils eines pro - Tabellenzelle."' - -\erroronpage{278}{editoral change}{FMi}{2006/06/20}{2} -Änderung auf Seite 277 erzeugt neuen Zeilenverlauf. - - -\CHAPTER{Kapitel 6} - - -\erroronpage{292}{Abs.-1, Z.2}{MSch}{2006/01/04}{2} - Füge hinzu: "`z.B. bedeutet \u{\texttt{0.2}}, dass 20\% von Gleitobjekten - belegt sein darf"' - -\erroronpage{298}{Abs.\ 1, Z.\ 2}{RHe}{2006/08/07}{2} - Füge Komma ein: "Das \textsf{afterpage}-Paket ermöglicht -stattdessen\u{,} \verb"\afterpage{\clearpage}" zu verwenden."' - -\erroronpage{301}{Z.1}{JMa}{2006/02/04}{2} -Fehlendes Komma: "`Hilfsdatei, in der"' - -\erroronpage{301}{Abs.-2,Z.3}{JMa}{2006/02/04}{2} -Falsche Anf"uhrungszeichen bei "`eingerahmt"' - -\erroronpage{302}{exa 6-3-1}{FMi/CBe}{2005/09/02}{} -The Euler constant must be typeset in roman type according -to the ISO rules; $e$ is the charge of the electron. - -\erroronpage{304}{Z.2}{JMa}{2006/02/04}{2} -Es muss "`in den Abschnitte\u{n} 6.2.1 bzw. 6.2.2"' hei\ss{}en. - -\erroronpage{304}{Z.-5}{JMa}{2006/02/04}{2} -Es muss "`{}"uber ein zus"atzliche\u{s} obligatorisches Argument"' -hei\ss{}en. - -\erroronpage{306}{Abs.\ -2, Z.\ 2}{RHe}{2006/08/07}{2} - Füge Komma ein: "\dots{} manchmal günstiger\u{,} nur die Legende zu -drehen."' - -\erroronpage{315}{Abs.-3,Z.-3}{JMa}{2006/02/04}{2} -Streiche den letzten Buchstaben von "`Bed"urfnisse\u{n}"'. - -\erroronpage{315}{Abs.\ -2, Z.\ 2}{RHe}{2006/08/07}{2} - Füge Komma ein: "\dots{} die es ermöglichen\u{,} Gleitobjekte \dots{} -zu untergliedern."' - -\erroronpage{317}{6.5.1, Abs.\ 1, Z.\ 1}{RHe}{2006/08/07}{2} - Füge Komma ein: "\dots{} das Paket \textsf{caption}\u{,} um Legenden -\dots{} anzupassen."' - -\erroronpage{318}{Bsp.6-5-2, Abb.2}{JMa}{2006/02/04}{2} -Fehlendes Komma: "`Eine Legende, die mehrere"' - -\erroronpage{319}{\texttt{font}}{RHe}{2006/06/11}{2} - "`Diese Option legt die Fontcharakteristika \dots{} fest, sofern sie -nicht \dots{} überschrieben \u{werden}."' - -\erroronpage{319}{Bsp.6-5-3, Tab.1}{JMa}{2006/02/04}{2} -Fehlendes Komma: "`Eine Legende, die mehrere"' - -\erroronpage{321}{Option \texttt{position}}{FMi/JS}{2005/09/14}{2} - Beschreibe, dass der Schlüssel \texttt{bottom} die Voreinstellung ist. - -\erroronpage{322}{Abs.-1, Z.2}{JMa}{2006/02/04}{2} -Streiche ein "`es"'. - -\erroronpage{327}{Abs.-1, Z.3 und Z.5}{JMa}{2006/02/04}{2} -Ersetze: \textsl{typ} \> \textsl{klasse} - - - -\CHAPTER{Kapitel 7} - -\erroronpage{337}{Abs.\ 2, Z.\ 2}{RHe}{2006/06/07}{2} - Füge Komma ein: "`\dots{} Erscheinung, nachdem \dots {}"' - -\erroronpage{338}{Abs.\ 1, Z.\ 5}{RHe}{2006/06/07}{2} - Füge Komma ein: "`(\dots{} sehr ähnlich, soweit es \dots {})"' - -\erroronpage{340}{Fußnote 2}{JMa}{2006/02/27}{2} -Fehlendes Komma: "`verwandelt, ist dabei"' - -\erroronpage{344}{Abs.3, Z.4}{JMa}{2006/02/27}{2} -Schließende Klammer nach "`Abbildung 7.3"' fehlt. - -\erroronpage{348}{Abs.-1, Z.3-4}{JMa}{2006/02/27}{2} -Trennfehler: Es muss Pa-ketnamen statt Pak-etnamen hei\ss{}en. - -\erroronpage{349}{}{FMi}{2006/02/27}{2} -Änderung auf Seite 348 ändert Seitenumbruch. - -\erroronpage{352}{Abs.-1, Z.1}{JMa}{2006/02/27}{2} -Fehlendes Komma: "`einnimmt, ist der"' - -% - no, would break the example spacing -%\erroronpage{356}{Bsp.7-3-7}{JMa}{2006/02/27}{} -%Ersetze: NFSS \> \textsf{NFSS} -% - -\erroronpage{358}{Abs.5, Z.6+7}{JS}{2006/11/08}{2} - Ersetze: - "`Die \u{Computer Modern Typewriter und} Computer Modern Sans Fonts - verfügen nicht über \u{breite} sondern nur über breitfette"' - \> - "`Die Computer Modern Sans Fonts - verfügen nicht über \u{fette} sondern nur über breitfette"' - -\erroronpage{361}{Tab 7.4}{AFV}{2008/08/08}{s} -Die Tabelle zeigt |\mathtt| als Sans Serif Typewriter Font. Dies ist -normalerweise nicht der Fall -- fast jede \LaTeX{} Installation verwendet -Computer Modern Typewriter. - -\erroronpage{362}{Abs.-1, Z.4}{JMa}{2006/02/27}{2} -Streiche das mittlere s in Symbol\u{s}fonts. - -\erroronpage{364}{Abs.-2, Z.-1}{JMa}{2006/02/27}{2} -Ersetze: hinzu-f"ugt \> hinzu-\u{ge}f"ugt - -\erroronpage{367}{Ab.-2, Z.-1}{MSch}{2006/01/06}{2} - Der Abstand vor dem Punkt am Satzende ("`T1-Kodierung ."') ist zu - entfernen. - -\erroronpage{369}{Abs.-3, Z.-3}{PEb}{2006/05/12}{2} -Ersetze "`Oktette (von Zahlen)"' \> "`Oktette (acht Bits)"' - -\erroronpage{371}{Abs. \texttt{cp437de}}{JMa}{2006/02/27}{2} -Falsche Anführungszeichen beim \ss - -\erroronpage{371}{Abs \texttt{utf8}}{JMa}{2006/02/27}{2} -Das Leerzeichen vor dem Punkt ist zu entfernen. - -\erroronpage{394}{letzte Z.}{MSch}{2006/01/06}{2} - Der Abstand vor der schlie\ss enden Klammer "`(in Abschnitt 7.5.4\_)"' - ist zu entfernen. - -\erroronpage{399}{Abs.-3, Z.2+3}{FMi}{2006/06/14}{2} - Füge Bindestrich ein: "`AMS-Font"' - -\erroronpage{401}{Abs.-2, Z.4}{FMi}{2006/06/14}{2} - Füge Bindestrich ein: "`AMS-Mathematikfont"' - -\erroronpage{404}{Abs.-1, Z.1}{JMa}{2006/02/27}{2} -Streiche das n aus Name\u{n}. - -\erroronpage{406}{Abs.3, Z.-3}{JMa}{2006/02/27}{2} -Fehlendes Komma: "`werden, normalerweise ohnehin"' - -\erroronpage{407}{Bsp. 7-7-21, 7-7-22}{TNdz}{2006/01/20}{2} - Fehlendes Komma: "`\ldots ist ein Blindtext, an dem sich - verschiedene \ldots"´ - -\erroronpage{416}{Kapitel 7.8.6, Z.8}{RSi}{2005/12/07}{2} - Leerzeichen nach dem kleinen Omega (|\textscomega|) fehlt. - -\erroronpage{420}{Abs.3, Z.-2}{JMa}{2006/02/27}{2} -Ersetze: L"ander \> L"ander\u{n} - -\erroronpage{420}{Abs.4, Z.-1}{JMa}{2006/02/27}{2} -Streiche eines der beiden "`auf"'. - -\erroronpage{422}{Abs.3, Z.2}{JMa}{2006/02/27}{2} -Fehlendes Komma: "`zur Verf"ugung, um auf die"' - -\erroronpage{423}{Abs.1, Z.-2}{JMa}{2006/02/27}{2} -Ersetze: zum \> zu - -\erroronpage{425}{Fu\ss note}{hv}{2008/10/30}{s} -Der Befehl hei\ss t |\pscharpath| [das s fehlt] und |pst-char| existiert zwar -noch, l\"adt aber gleich |pst-text|, dass die Funktionen von |pst-char| -integriert hat. - -\erroronpage{428}{Tabelle 7.27, Z.~1}{MSch}{2005/12/31}{2} - Ersetze: \dq`Cork\dq'-Kodierung durch "`Cork"'-Kodierung - -\erroronpage{428}{Abs1., Z.4-5}{JMa}{2006/02/27}{2} -Trennfehler: Es muss Pro-zent statt Proz-ent hei\ss{}en. - - -\erroronpage{435}{Abs.-2, Z.-1}{JMa}{2006/02/27}{2} -Fehlendes Komma vor "`werden"' - -\erroronpage{445}{Abs.-3, Z.1}{JMa}{2006/02/27}{2} -Streiche das s aus Namen\u{s} - -\erroronpage{445}{Abs.-3, Z.2}{RHe}{2006/06/11}{2} - Füge Bindestrich ein: "`AMS-Font"' - -\erroronpage{454}{Abs.4, Z.-2}{JMa}{2006/02/27}{2} -Ersetze: dass \> das - -\erroronpage{454}{Abs.5, Z.-3}{JMa}{2006/02/27}{2} -Ersetze: dier \> die - -\erroronpage{456}{Abs.2, Z.2}{JMa}{2006/02/27}{2} -Fehlendes Komma: "`Befehle, die"' - -\erroronpage{458}{Abs.2, Z.2}{JMa}{2006/02/27}{2} -Fehlendes Komma: "`Zeichen, die in"' - -\erroronpage{458}{Abs.2, Z.2}{JMa}{2006/02/27}{2} -Fehlendes Komma: "`solchen, die in"' - -\erroronpage{458}{Abs.4, Z.3}{JMa}{2006/02/27}{2} -Fehlendes Komma vor "`wurden"' - -\erroronpage{464}{Abs.1, Z.3-4}{JMa}{2006/02/27}{2} -Trennfehler: Es muss Ak-zentzeichen statt Akz-entzeichen hei\ss{}en. - -\erroronpage{468}{Tab.7.33}{FMi}{2006/05/12}{2} -Die "`Tabellen"uberschrift"' ist nicht im \textsf{sf}-Format. - - -\CHAPTER{Kapitel 8} - -\erroronpage{478}{Abs.\ 2, Z.\ 2}{FMi/RHe}{2008/09/19}{2} -Ersetze: "`gültigen US-Praxis"' \> "`vorherrschenden Praxis"' - -\erroronpage{494}{8.2.12 Abs.\ 1, Z.\ 5}{RHe}{2008/09/19}{2} - Füge Kommata ein: "`Die Schwierigkeit\u{,} eine abgesetzte Formel -korrekt zu gestalten\u{,} kann \dots{}"' - -\erroronpage{496}{Abs.2, Z.1/2}{JMa}{2006/03/05}{2} -Trennfehler: Mark-up sieht deutlich besser aus als Mar-kup. - -\erroronpage{496}{Abs.\ 3 (nach Bsp. 8-2-28), Z.\ 2}{RHe}{2008/09/19}{2} - Füge Komma ein: "`\dots{} allerdings \emph{nur}\u{,} wenn sie \dots{} -verschoben wurde."' - -\erroronpage{503}{8.4.4 Abs.\ 1, Z.\ 3}{RHe}{2008/09/19}{2} - Lösche Komma (Regel §~72.2 "`gleichrangige Wortgruppen oder Wörter in -Aufzählungen (entweder -- oder)"'): "`\dots{} können entweder \dots{} -positioniert werden\u{ } oder \dots{} rechts der Operatoren."' - -\erroronpage{504}{Abs.-2,Z.3}{JMa}{2006/03/05}{2} -Kein Komma vor "`oder"' bei einer Aufz"ahlung. - - -\erroronpage{507}{Abs.-2, Z.1}{JMa}{2006/03/05}{2} -Streiche die beiden letzten Buchstaben von Paket\u{es}. - -\erroronpage{510}{Abs.-1, Z.1}{JMa}{2006/03/05}{2} -Streiche einmal das Wort "`Tabelle"'. - -\erroronpage{512}{Z.1}{FMi}{2006/09/19}{2} -Füge folgenden Satz an: "`Im folgenden Beispiel wird |\sqrtsign| direkt -verwendet:"' - -\erroronpage{515}{Abs.-3, Z.2}{HjG}{2006/10/19}{2} -Ersetze: "`Bei den \u{Hauptversionen} ($D'$,~$T'$~usw.{})"' \> - "`Bei den \u{Versionen mit Strich} ($D'$,~$T'$~usw.{})"' - -\erroronpage{516}{Abs.-3, Z.2}{JMa}{2006/03/05}{2} -Streiche ein "`die"'. - -\erroronpage{518}{8.7.5 Abs.\ 3 , Z.\ 3}{RHe}{2008/09/19}{2} - Füge Komma ein: "`\dots{} und verhält sich somit\u{,} als wären beide -Maße gleich null."' - -\erroronpage{535}{Abs. 1, Z. 5}{RHe}{2008/09/19}{2} -Ersetze: "`\ldots{} existierenden, neu belebten Mediävalschriften."' - \> "\ldots{} existierenden Renaissance-Antiqua-Schriften."' - -\erroronpage{544}{Tab. 8-10/11}{FMi}{2006/08/09}{2} - Fehlende Symbole aus amssymb hinzugef"ugt: |\circledR|, |\yen|, - |\checkmark| und |\maltese|. - -\erroronpage{544}{Tab. 8.11}{LHe}{2008/02/08}{s} - |\dag| und |\ddag| sind |\mathord|s und nicht |\mathbin| wie in Tabelle - 8.13 behauptet. - -\erroronpage{546}{Tab. 8.13}{LHe}{2008/02/08}{s} - |\dag| und |\ddag| sind keine |\mathbin|s. Sie geh"oren deshalb nicht in - diese Tabelle und sind auch nicht (wie behauptet) Synonyme f"ur |\dagger| - und |\ddagger|. - -\erroronpage{552}{8.9.6 Abs.\ 1 , Z.\ 4}{RHe}{2008/09/19}{2} - Füge Komma ein: "`\dots{} nicht der Symbolklasse Punctuation\u{,} -sondern Ordinary \dots{} zugeordnet sind."' - -\erroronpage{554}{Tab. 8-27}{DIs/FMi}{2006/08/09}{2} - Fehlende Symbole aus amssymb hinzugef"ugt: |\llcorner|, |\lrcorner|, - |\ulcorner| und |\urcorner|. Tabbellennotiz und Absatz unter der Tabelle - entsprechend ge"andert. - - -\CHAPTER{Kapitel 9} - -\erroronpage{556}{Nummer 1, Item 1}{RHe}{2008/09/20}{2} -Ersetze: "`Unterstützung für den Satz \ldots{}"' - \> "`Unterstützen des Setzens in` \ldots{}"' - -\erroronpage{560}{2. Snippet}{MSch/FMi}{2006/01/06}{2} - Der vertikale Abstand vor dem Codebeispiel ist im Verh"altnis zum - darauffolgenden Abstand erheblich zu gro\ss. - - Und zudem die Seite eine Zeile zu lang. - -\erroronpage{560}{Z.\ -5}{RHe/FMi}{2006/09/21}{2} -Ersetze: "`der Übersetzungen \u{für} Texte"' \> - "`der Übersetzungen generierter Texte"' - - -\erroronpage{563}{Abs.1, Z.4}{JMa}{2006/03/14}{2} -Die "offnende Klammer fehlt vor "`zum Beispiel"'. - -\erroronpage{565}{Abs.-2, Z.1}{JMa}{2006/03/14}{2} -Streiche den letzten Buchstaben von sprachspezifische\u{n}. - - -\erroronpage{567}{tab 9.3}{FMi/CBe}{2005/09/27}{} - I am surprised that in Russian there is no word for ``Glossary''. - - Frank: It most certainly exits :-), but right now Babel doesn't - know about it---so there is nothing we can do about it at the - moment. Actually the same problem exists with Polish, although here - I got a translation ``s\l ownik termin{\'o}w'' which will eventually - find its way into Babel. - - Tja, so gehts. Auch als das deutsche Buch gesetzt wurde, waren die Begriffe - auch noch nicht bekannt. - -\erroronpage{570}{Abs. -4("`Die Tilde"' , Z. 2}{RHe}{2006/09/20}{2} -Füge Komma ein: "`\dots{} nicht für ein geschütztes Leerzeichen\u{,} -sondern für andere \dots{}"' - -\erroronpage{570}{Abs. -4("`Die Tilde"' , Item 1}{RHe}{2006/09/20}{2} -Füge Komma ein: "`\dots{} niedriger gesetzt werden\u{,} als dies -normalerweise \dots{}"' - -% "`Gemäß"' wird mit dem Dativ verwendet: -\erroronpage{571}{Abs. 2 ("`Doppelpunkt usw."' , Z. -2}{RHe}{2006/09/20}{2} -Ersetze: "`Gemäß der \ldots{} Konventionen \ldots{}"' - \> "`Gemäß den \ldots{} Konventionen \ldots{}"' - -\erroronpage{579}{Abs.3, Z.3}{JMa}{2006/03/14}{2} -Streiche die beiden letzten Buchstaben von ein\u{en}. - -\erroronpage{579}{Abs.2, Z.3}{RHe}{2006/06/11}{2} - Streiche Komma: "Wie der Befehl \verb"\nombre"\_ verfügt er \dots{}"' - -\erroronpage{590}{Abs.1, Z.5/6}{JMa}{2006/03/14}{2} -Wenn "`rumakeindex"' getrennt werden muss, sieht "`rumake-index"' deutlich -besser aus. - -\erroronpage{599}{Abs.2, Z.2}{JMa}{2006/03/14}{2} -Zu der schließenden Klammer gibt es keine "offnende. - - - -\CHAPTER{Kapitel 10} - -\erroronpage{612}{lfd. Nr. 1, Z. 1}{RHe}{2006/10/16}{2} -Ersetze: "`ASCII-Zeichnung"' - \> "`ASCII-Zeichnung\u{en}"' - -\erroronpage{628}{Abs.-3, Z.4}{JMa}{2006/03/23}{2} -Der Bruch $\displaystyle\frac{\pi}{2}$ ragt in die Zeile darunter. - -\erroronpage{633}{Tab.\ 10.1}{FMi}{2006/10/21}{2} -Es fehlt "`vtex"' als wichtiger Treiber; andererseits sind einige der -aufgelisteten Treiber nur von historischer Bedeutung. - -\erroronpage{634}{Abs. 1, Z. 1}{RHe}{2006/10/16}{2} -Füge Komma ein: "`\dots{} reelle Werte haben)\u{,} anstatt nach -\dots{}"' - -\erroronpage{637}{Abs. 1, Z. 1}{RHe}{2006/10/16}{2} -Füge Komma ein: "`Lässt \LaTeX{} nach \dots{} suchen\u{,} anstatt nach -\dots{}"' - -\erroronpage{637}{viewport}{BMo/FMi}{2007/10/20}{s} -Füge am Anfang ein: "` Definiert den Bereich der Graphik für den \LaTeX{} Platz reservieren - soll. Material außerhalb wird auch gedruckt (falls nicht \texttt{clip} - verwendet wird) und überdruckt dann gegebenenalls anderes Material auf der Seite."' - -\erroronpage{638}{}{FMi}{2007/10/20}{s} - Setzer-Kommentar: -Seite mu\ss{} neu gesetzt werden, da sich der Seitenumbruch ge\"andert hat. - -\erroronpage{638}{Abs.3, Z.-1}{JMa}{2006/03/23}{2} -Streiche den letzten Buchstaben von ausf"uhrliche\u{n}. - -\erroronpage{647}{Abs.4, Z.1}{JMa}{2006/03/23}{2} -Streiche den letzten Buchstaben von vertikale\u{r}. - -\erroronpage{649}{Abs.2, Z.8}{FMi/HjG}{2006/10/22}{2} - Ersetze: "`\u{Dieser Punkt} ist in \ldots"' \> - "`\u{Dies} ist in \ldots"' - -\seriouserroronpage{651}{Beispielmatrix}{HjG}{2006/10/21}{2} - The first column shows incorrect output: instead of x=0mm it uses some - internal default. - -\erroronpage{651}{Abs. -1, Z. 1}{RHe}{2006/10/16}{2} -Ersetze: "`Die \dots{} Funktion ähnelt dem des \textsf{rotating}-Paketes -\dots{}"' - \>"`Die \dots{} Funktion ähnelt der des \textsf{rotating}-Paketes -\dots{}"' - -\erroronpage{652}{editoral change}{FMi}{2006/10/21}{2} - Fix on previous page will change page break. - - -\erroronpage{661}{Abs.-3, Z.3}{JMa}{2006/03/23}{2} -Ersetze: "`verf"ugt"' \> "`verf"ugen"' - -\erroronpage{661}{para -2, l.1}{FMi}{2005/11/11}{2} - Leider ist Th\`anhs Name falsch geschrieben. Die korrekte Schreibweise - ist "`H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh"'. - -\erroronpage{672}{letzte Zeile}{BvdW}{2014/02/19}{} -Ersetze ``wir'' durch ``wird''. - - -\CHAPTER{Kapitel 11} - -\erroronpage{686}{Abs.-2, Z.-2}{JMa}{2006/03/23}{2} -Streiche das Komma vor "`und"'. - -\erroronpage{691}{Abs.4, Z.2}{JMa}{2006/03/23}{2} -Ersetze: "`eigene"' \> "`eigenen"' - -\erroronpage{697}{Abs. \texttt{-o} \textsl{ind}}{JMa}{2006/03/23}{2} -Streiche die letzten Buchstaben von Verwendung\u{Index}. - -\erroronpage{703}{Z.2}{AFe}{2006/01/13}{2} - Extra Buchstabe: |\mark|\texttt{\u k}|both| \> - |\markboth| - -\erroronpage{704}{Abs.1, Z.1}{JMa}{2006/03/23}{2} -Streiche den letzten Buchstaben von Teil\u{s}. - - -\CHAPTER{Kapitel 12} - -\erroronpage{709}{Abs.3, Z.-5}{JMa}{2006/03/31}{2} -Entferne das Komma vor l"asst. - -\erroronpage{711}{Abs.2, Z.3/4}{JMa}{2006/03/31}{2} -Trennfehler: Schreibe Layout-richtlinien statt Layou-trichtlinien. - -\erroronpage{717}{Abs.3, Z.2}{JMa}{2006/03/31}{2} -F"uge ein Komma vor "`definieren"' ein. - -\erroronpage{719}{Abs.-1, Z.2}{JMa}{2006/03/31}{2} -F"uge ein Komma vor "`mit dessen Hilfe"' ein. - -\erroronpage{721}{Abs.-1, Z.2}{JMa}{2006/03/31}{2} -F"uge ein Komma vor "`die nicht unterst"utzt"' ein. - -\erroronpage{728}{Abs.2, Z.-1}{JMa}{2006/03/31}{2} -Es hei\ss{}t \u{der} Apostroph, nicht "`das"'. - -\erroronpage{734}{Abs.-3, Z.-3}{JMa}{2006/03/31}{2} -F"uge ein "offnende Klammer vor "`zum Beispiel"' ein. - -\erroronpage{735}{Abs.3, Z.1}{JMa}{2006/03/31}{2} -F"uge ein Komma vor "`wo im"' ein. - -\erroronpage{737}{Abs.-3, Z.-2}{JMa}{2006/03/31}{2} -F"uge ein Komma vor "`die normalerweise"' ein. - -\erroronpage{740}{Abs.-3, Z.2}{JMa}{2006/03/31}{2} -Streiche den letzten Buchstaben von wurde\u{n}. - -\erroronpage{745}{Abs.-1, Z.-2}{JMa}{2006/03/31}{2} -Ersetze: "`ein solche"' \> "`eine solche"' - -\erroronpage{746}{Abs.-4, Z.1}{JMa}{2006/03/31}{2} -F"uge ein Komma vor "`wo im"' ein. - -\erroronpage{752}{Abs.1, Z.-2}{JMa}{2006/03/31}{2} -Zur schlie\ss{}enden Klammer gibt es keine "offnende. - -\erroronpage{752}{Abs.3, Z.-2}{JMa}{2006/03/31}{2} -Streiche die letzten drei Buchstaben von "`aufauf"'. - -\erroronpage{755}{Abs.-1, Z.2}{JMa}{2006/03/31}{2} -Ersetze: "`eine vollst"andigen"' \> "`einen vollst"andigen"' - -\erroronpage{763}{Abs.3, Z.6}{JMa}{2006/03/31}{2} -Streiche das Komma vor "`und"'. - -\erroronpage{767}{Abs.-3, Z.1}{JMa}{2006/03/31}{2} -Ersetze: "`L"adt"' \> "`l"adt"' - -\erroronpage{772}{Tab.12.2}{JMa}{2006/03/31}{2} -F"uge ein Komma vor "`die eine bestimmte Wahl"' ein. - -\erroronpage{777}{Abs.3, Z.-1}{JMa}{2006/03/31}{2} -Füge einen Punkt nach "`zeigt"' ein. - -\erroronpage{781}{Abs.1, Z.1}{JMa}{2006/03/31}{2} -Ersetze: "`Diese"' \> "`Dieses"' - - -\CHAPTER{Kapitel 13} - -\erroronpage{791}{Tab.13.1, \texttt{inbook}}{JMa}{2006/04/11}{2} -Streiche einmal das Wort "'oder"'. - -\erroronpage{792}{Tab13.2, \texttt{crossref}}{JMa}{2006/04/11}{2} -F"uge ein Komma vor "`auf den"' ein. - -\erroronpage{795/796}{mehrere Stellen}{FMi/DAl}{2005/09/12}{2} - Der Name "`Miguel Lopez Fernandez"' sollte durch "`Miguel Parra Benavides"' - ersetzt werden, da der bisher verwendete eigentlich Akzente besitzen würde, - die an der Stelle im Buch noch nicht diskutiert wurden. - -\erroronpage{796}{Abs.-5, Z.-1}{JMa}{2006/04/11}{2} -F"uge einen Punkt nach "`erscheinen"' ein. - -\erroronpage{799}{Abs.-2, Z.3}{JMa}{2006/04/11}{2} -Streiche das Komma vor "'und"'. - -\erroronpage{802}{Abs.-1, Z.-2}{JMa}{2006/04/11}{2} -Streiche das Komma vor "'und"'. - -\erroronpage{819}{Abs.-1, Z.2}{JMa}{2006/04/11}{2} -Ersetze: BibTexMng \> \textsf{BibTexMng} - -\erroronpage{820}{Abs.2, Z.2}{JMa}{2006/04/11}{2} -Streiche das Komma nach \texttt{size}. - -\erroronpage{821}{Tab.13.4, Z.-4}{JMa}{2006/04/11}{2} -F"uge ein Leerzeichen nach "`Fachzeitschriften"' ein. Ferner ist die -"'Tabellen"uberschrift"' nicht im \textsf{sf}-Format. - -\erroronpage{828}{Tab. 13.5, Z. 1-2}{MSch}{2006/01/06}{2} - Donald Ervin Knuths Name ist falsch geschrieben. Ersetze: "`Erwin"' \> - "`Ervin"' - -\erroronpage{830}{Tab.13.6}{JMa}{2006/04/11}{2} -Ersetze: Italienische \> Italienisch - -\erroronpage{832}{Abs.1, Z.2}{JMa}{2006/04/11}{2} -Ersetze: Abschnitte \> Abschnitten - -\erroronpage{839}{Tab.13.8, \texttt{substring}}{JMa}{2006/04/11}{2} -F"uge ein Leerzeichen vor "`hat"' ein. - -\erroronpage{842}{Abs.1, Z.-2}{JMa}{2006/04/11}{2} -Entweder fehlt hier eine "offnende Klammer -- oder die schlie\ss{}ende ist -zu viel. - - -\CHAPTER{Kapitel 14} - -\erroronpage{853}{Tab.14.1}{FMi}{2006/05/12}{2} -Die "`Tabellen"uberschrift"' ist nicht im \textsf{sf}-Format. - -\erroronpage{858}{Abs.4, Z.1}{JMa}{2006/05/03}{2} -F"uge ein "`zu"' zwischen "`Kommentare"' und "`entfernen"' ein. - -\erroronpage{865}{1. Snippet, Z. 2}{MSch}{2006/01/06}{2} - Ersetze: |text/latex/base| \> |tex/latex/base| - -\erroronpage{867}{Abs.5}{FMi}{2007/11/13}{s} - Explain that |\cmd| can't be used with conditionals, e.g., those produced - with |\newif| . - -\erroronpage{865}{l.-7}{FMi/HjG}{2005/09/02}{2} - Underline, as it is command line input. - -\erroronpage{871}{Abs.2, Z.2}{JMa}{2006/05/03}{2} -Ersetze entg"ultig \> endg"ultig - -\erroronpage{870-872}{}{FMi}{2007/01/08}{} - Setzer-Kommentar: - Beispiele m"ussen neu kompiliert werden und - Seiten m"ussen immer dann neu gedruckt werden, wenn etwas am Kapitel ge"andert - wird --- genauer auf \emph{einer} der drei Seiten (da sich das CVS-Tag in - den Beispielen und im "`code"' auf - Seite 871/Mitte "andert). - - -\CHAPTER{Anhang A} - - -\erroronpage{880}{Abs.1, Z.6}{VVo}{2008/09/02}{s} -Ersetze: "`so wird eine Fehlermeldung ausgegeben."' -\> "`so wird eine Warnung ausgegeben."' - - -\erroronpage{882}{Abs.1, Z.2}{FMi}{2006/05/12}{2} -Ersetze: Abschnitte \> Abschnitten - -\erroronpage{888}{fig A.1, l.4}{FMi/JAn}{2005/09/09}{2} - ``Did\^ot'' \> ``Didot'' und entferne Komma nach "`Zoll"' - -\erroronpage{891}{Tab.A.3, Z.1}{JMa}{2006/05/03}{2} -F"uge ein Komma vor "`der eine feste oder"' ein. - -\erroronpage{899}{A.2.3 Abs.\ 2, Z.\ 5}{RHe}{2006/06/10}{2} - Füge Komma ein: "`Diese Struts sind sehr nützlich, um die Höhe oder -\dots{}"' - -\erroronpage{903}{Abs.-2, Z.1}{FMi}{2006/06/14}{2} -Füge Wort ein: "`nach der \u{letzten} Klammer \verb=}= und\ldots"' - -\erroronpage{906}{Abs.1, Z.1}{JMa}{2006/05/03}{2} -Ersetze \textsl{text} \> \textsl{test} - -\erroronpage{909}{Abs.2, Z.1}{JMa}{2006/05/03}{2} -F"uge ein Komma vor "`ob"' ein. - -\erroronpage{918}{Abs.-1, Z.3}{JMa}{2006/05/03}{2} -F"uge ein Komma vor "`wird"' ein. - - -\erroronpage{918}{Abs.-1, Z.4}{FMi}{2006/09/23}{2} -Ersetze: "`und alle Prozesse angehalten. "' -\> "`und \u{die Verarbeitung} angehalten."' - - - -\CHAPTER{Anhang B} - -\erroronpage{925}{Abs.-2, Z.-3}{JMa}{2006/05/28}{2} -F"uge ein Komma vor "`\textit{geben Sie}"' ein. - -\erroronpage{960}{Abs.-2, Z.-1}{JMa}{2006/05/28}{2} -Der Punkt am Ende des Absatzes fehlt. - -\erroronpage{969}{Abs.-3, Z.2}{JMa}{2006/05/28}{2} -Ersetze das \> dass - -\erroronpage{971}{Abs.1, Z.1}{JMa}{2006/05/28}{2} -Ersetze einen \> ein - -\erroronpage{973}{Abs.1, Z.2}{JMa}{2006/05/28}{2} -Ersetze Seite 973 \> dieser Seite - -\erroronpage{973}{Abs.5, Z.1}{JMa}{2006/05/28}{2} -Ersetze \TeX{}war \> \TeX\ war - -\erroronpage{977}{Z.3}{JMa}{2006/05/28}{2} -Entferne das Komma vor "`\textit{wurde}"'. - -\erroronpage{977}{Z.5}{JMa}{2006/05/28}{2} -Entferne das Komma vor "`als"'. - -\erroronpage{980}{Abs.1, Z.2}{JMa}{2006/05/28}{2} -F"uge ein Komma nach "`wird"' ein. - -\erroronpage{987}{Abs.-2, Z.5}{JMa}{2006/05/28}{2} -F"uge ein Komma vor "`wobei"' ein. - -\erroronpage{988}{Abs.-1, Z.-3}{JMa}{2006/05/28}{2} -F"uge ein Komma vor "`gilt"' ein. - - -\CHAPTER{Anhang C} - -\erroronpage{998}{Abs.2, Z.5}{FMi}{2006/09/12}{2} -Ersetze: Abbildung C.\u{2} \> Abbildung C.\u{1} - -\erroronpage{998}{Abs.-1, Z.4}{JMa}{2006/05/28}{2} -Streiche das Komma vor "`ausgew"ahlt"'. - -\erroronpage{1001}{Bsp.1, Z.1}{SNe}{2009/05/10}{s} -Ersetze "\texttt{wgetftp}"' \> "`\texttt{wget ftp}"' - -\erroronpage{1003}{Abs.-1, Z.5/6}{JMa}{2006/05/28}{2} -Streiche eines der beiden Worte "`eingeblendet"'. - -\erroronpage{1004}{\textbf{esc:}}{JMa}{2006/05/28}{2} -Ersetze Kalanien \> Katalonien - -\erroronpage{1005}{\textbf{fra:}}{JMa}{2006/05/28}{2} -Ersetze Orleans \> Orl\'{e}ans - - -\CHAPTER{Bibliographie} - -\erroronpage{1017}{[57]}{RHe}{2006/06/07}{2} -Ersetzte Erl\"auterung durch: "`Die -\u{englische} erste Ausgabe dieses Buches."' - -\erroronpage{1017/1018}{[58]}{FMi}{2009/08/01}{s} -Eintrag sollte auf die zweite (aktuelle) Ausgabe verweisen. -(Ab dem korrigierten Nachdruck von 2010 befindet sich [58] ganz auf seite 1018.) - -\erroronpage{1019}{[67], Z.-2}{JMa}{2006/05/28}{2} -Schreibe "`Sprachengetrennt"' getrennt. - -\erroronpage{1019}{[71]}{RHe}{2006/06/07}{2} - streiche "`international"; ISO ist per se international - -\erroronpage{1020}{[74]}{FMi}{2006/09/18}{2} - Füge ``Lars Hellstr\"om'' als Autor hinzu. Datum ``Dezember 2004'' - -\erroronpage{1025}{[116, Z.\ 2]}{RHe}{2006/06/07}{2} - Vergleich mit "`(eben)so \dots{} setzen kann, wie sonst \dots{}"' -erfordert Komma - -\erroronpage{1026}{[127], Z.1}{JMa}{2006/05/28}{2} -F"uge ein Komma vor "`welche"' ein. - -\erroronpage{1026}{[128]}{FMi}{2005/11/07}{2} - Der Titel lautet: ``E-\TeX: Guidelines for Future \TeX{} Extensions''. - -\erroronpage{1028}{[140], Z.2}{JMa}{2006/05/28}{2} -F"uge ein Komma vor "`die auf"' ein. - -\erroronpage{1028}{[140], Z.-5}{JMa}{2006/05/28}{2} -Ersetze Tinagh \> Tifinagh - - -\erroronpage{1030}{[162]-[163]}{FMi/RKo}{2005/11/11}{2} - - Leider ist Th\`anhs Name falsch geschrieben (Akzente) . Die - korrekte Schreibweise ist "`H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} - Th\`anh"'. - -\erroronpage{1030}{[159]-[163]}{FMi/RKo}{2005/11/11}{} - - "`Han"' ist der Familienname, müsste also korrekterweise unter H - einsortiert werden (letzteres lässt sich aber nur schwer korrigieren, da - wegen der gänderten Nummerierung dann nahezu das gesamte Buch neu gesetzt - werden müsste). - - -\CHAPTER{Index} - - -\erroronpage{1033}{2. Absatz, Z.4}{JMa}{2006/01/05}{2} -Die Abkürzung NFSS sollte \textsf{NFSS} geschrieben werden. - - -\erroronpage{1040}{rechte Spalte, Zeile 8}{BvdW}{2014/02/19}{} -\verb=\AskOption= (ohne das ``s'' am Ende, siehe Errata Seite 2 zu Kapitel 2) - - - -\iffalse Nicht wirklich, aber auch nicht schoen so ... mal sehen - -\erroronpage{1068}{"`Gleichheits- und Relationszeichen"'}{MSch}{2005/12/31}{} - Die beiden Einträge zu Gleichheits- und Relationszeichen sind durch - die Verwendung unterschiedlicher Trennzeichen falsch sortiert; - vertausche "`negierte, mathematische Symbole"' und "`mathematische - Symbole"'. -\fi - - - - - -\CHAPTER{Biographien} - -\erroronpage{1129}{Abs. 2, Z.3}{SZi}{2005/11/24}{2} - l"osche g aus Dok\u{g}umente - -\end{erratalist} - - -\setcounter{collectmore}{3} - -\begin{multicols}{3}[Dank an alle die Fehler oder Auslassungen - gemeldet haben. Gelistet sind jeweils die Personen die ein Problem - zuerst entdeckt haben. Einige Fehler wurden im englischen Original - gefunden, weshalb auch ein paar Namen ohne Fehlerzahl auftauchen.] -\contributor{AFe}{Alfonso Fernandez-Vazquez} -\contributor{BvdW}{Berend G. van der Wall} -\contributor{CBe}{Claudio Beccari} -\contributor{ChB}{Christof B\"ockler} -\contributor{DAl}{Daniel Alonso i Alemany} -\contributor{DIs}{Daniel Isaacson} -\contributor{ESt}{Eckhard Stein} -\contributor{FMi}{Frank Mittelbach} -\contributor{HjG}{Hubert G\"a\ss lein} -\contributor{JAn}{Jacques Andr\'e} -\contributor{JBez}{Javier Bezos} -\contributor{JMa}{Jens Mandavid} -\contributor{JS}{Joachim Schrod} -\contributor{LHe}{Lars Hellstr\"om} -\contributor{MHo}{Morten H\o gholm} -\contributor{MLi}{Martin Liebmann} -\contributor{MSch}{Michael Schutte} -\contributor{PEb}{Paul Ebermann} -\contributor{RHe}{Ralf Heckmann} -\contributor{RKo}{Reinhard Kotucha} -\contributor{RSi}{Roman Sigg} -\contributor{SNe}{Stefan Neuhaus} -\contributor{SZi}{Stefan Ziesemer} -\contributor{TNdz}{Timo Niedenzu} -\contributor{VVo}{Vladimir Volovich} -\contributor{YiL}{Yiannis Lazarides} -\end{multicols} - - -Sollten Sie einen weiteren Fehler entdecken, melden Sie diesen bitte an -\begin{quote}\ttfamily - frank.mittelbach@latex-project.org -\end{quote} -wenn möglich gleich in der für diese Datei benötigte Form, d.h. -\begin{flushleft} -|\erroronpage{|\textit{Seitennummr}|}{|\textit{Zeilenidentifikation}|}{|% - \textit{Initialen}|}{|\textit{JJJJ/MM/DD}|}{}| \\ - \hspace*{2em}\textit{Beschreibung des Fehlers} -\end{flushleft} -Hier ist ein Beispiel: -\begin{verbatim} -\erroronpage{5}{Abs.3, Z.1}{MOs}{2005/09/01}{} - Ersetze: "`LaTeX"' \> "`\LaTeX{}"' -\end{verbatim} -Die Verwendung von Babelkommandos (etwa |"`|) ist möglich, aber Umlaute -sollten möglichst nicht als 8-bit Zeichen eingegeben werden (also besser |"a| -oder |\"a|) um Probleme mit der Kodierung zu verhindern. - -\end{document} diff --git a/Master/texmf-dist/source/latex/base/letter.dtx b/Master/texmf-dist/source/latex/base/letter.dtx index 076d0af3582..f96c693a6fa 100644 --- a/Master/texmf-dist/source/latex/base/letter.dtx +++ b/Master/texmf-dist/source/latex/base/letter.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -189,6 +189,7 @@ % \title{Standard Letter Document Class for \LaTeX{} version 2e} % % +% \MaintainedByLaTeXTeam{latex} % \maketitle % \tableofcontents % diff --git a/Master/texmf-dist/source/latex/base/letter.ins b/Master/texmf-dist/source/latex/base/letter.ins index 4ce7765b05e..91a69fd1dc4 100644 --- a/Master/texmf-dist/source/latex/base/letter.ins +++ b/Master/texmf-dist/source/latex/base/letter.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/lgc2.err b/Master/texmf-dist/source/latex/base/lgc2.err deleted file mode 100644 index 7b79ff91dec..00000000000 --- a/Master/texmf-dist/source/latex/base/lgc2.err +++ /dev/null @@ -1,699 +0,0 @@ -\def\readRCS$#1 #2 #3 #4 #5${\def\erratafiledate{#4}} -\readRCS -$Id: lgc2.err 5886 2008-06-13 09:45:27Z mittelba $ - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% To produce a printed version of this errata file run this file through -% LaTeX. It will unpack a small class file (if not already present) and -% a configuration file with the extension .cfg. You might want to modify -% the setting in this configuration file to print only a partial errata -% suitable for your printed revision of this book, see details in the -% .cfg file. -% -% The current version of this file can be found at: -% -% http://www.latex-project.org/guides/books.html -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - -\begin{filecontents}{ttcterrata.cls} -%% -%% Copyright (C) 1997,2004,2005,2007 Frank Mittelbach -%% This class file is licenced under LPPL latest version; -%% see http://www.latex-project.org/lppl -% -% -% It sets up a few commands used to format the errata entries for books in the -% Addison-Wesley Series: -% -% Tools and Techniques for Computer Typesetting -% -% hence the name. However, anybody who likes to use it is free to apply it for -% errata files of other books. -% -% Changes: -% -% v1.0a - changed name from errata.cls to ttcterrata.cls - -\ProvidesClass{ttcterrata} - [2007/11/10 v1.0a Mini class for errata files; subject to change (FMi)] - -\LoadClass{article} - -\setcounter{secnumdepth}{-1} -\addtolength\textwidth{5cm} -\addtolength\oddsidemargin{-3cm} - -\addtolength\textheight{36pt} - -\RequirePackage{shortvrb} -\MakeShortVerb{\|} - -\RequirePackage{array,longtable} -\RequirePackage{multicol} - - -\newcommand\erratagetnumber{} -\def\erratagetnumber#1/#2/#3\erratagetnumber{#1#2#3} - - -\newcommand\gobbleerrata{% - \setbox\@tempboxa\vbox\bgroup - \let\endgobble\egroup - \let\hideamp\relax - \let\\\relax\let\par\@@par} - -\newcommand*\hideamp{&} - -\let\endgobble\relax - - -\newcommand\erratastartdate{} -\newcommand\myprinting{1} - - -\newcommand\doweprint[2]{% - \ifnum \myprinting < \if!#2!1000 \else \ifx s#2 1000\else#2 \fi\fi - \ifnum \expandafter\erratagetnumber\erratastartdate\erratagetnumber < - \erratagetnumber#1\erratagetnumber \relax - \@tempswatrue - \else - \@tempswafalse - \fi - \else - \@tempswafalse - \fi -} - - - -\newcommand\includedentries{entries after = \erratastartdate} -\newcommand\printedentries{between \erratastartdate\space and} - -\newcommand\showallerrors{% - \renewcommand\includedentries{all errata entries}% - \renewcommand\printedentries{up to} - \renewcommand\doweprint[2]{\@tempswatrue}} - - -\newcommand\displayrevisionfix[2]{% - \if!#2!\textbf{#1}\else\textit{#1}\rlap{\textsuperscript{#2}}\fi} - -\newcommand\norevisionnumbers{% - \renewcommand\displayrevisionfix[2]{\textbf{##1}}} - -\IfFileExists{\jobname.cfg} - { - \input{\jobname.cfg} - \typeout{***************************************************} - \typeout{*} - \typeout{* Configuration file for \jobname.err found } - \typeout{*} - \typeout{***************************************************} - \AtEndDocument{ - \typeout{***************************************************} - \typeout{*} - \typeout{* If you wish to generate an errata listing} - \typeout{* containing only errors found after a certain revision} - \typeout{* and/or only errors found after a certain date} - \typeout{* modify the information stored in \jobname.cfg} - \typeout{*} - \typeout{* Current settings are:} - \typeout{*} - \typeout{* \@spaces printing of your book = \myprinting} - \typeout{* \@spaces include \includedentries} - \typeout{*} - \typeout{***************************************************} - }} - {} - -%% \erroronpage <page> <line info> <contributor> <date> <fixed in revision> - -\newcommand\erroronpage[5]{% - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\newcommand\seriouserroronpage[5]{% - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \fbox{\bfseries !!}\hfill - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\newcommand\CHAPTER[1]{\endgobble - &\\[4pt]% - \multicolumn{4}{l}{\framebox[10cm][l]{\textbf{\normalsize\strut#1}}} \\} - -\newenvironment{erratalist} - {\begin{longtable}{r>{\raggedright}p{2cm}l>{\raggedright}p{10cm}l}} - {\endgobble\end{longtable}} - -\newcommand\erratatitle[2] - {\begin{center}\LARGE\bfseries - Errata list for #1\\[5pt](\myprinting.\ printing)\\[10pt] - \small Includes all entries found \printedentries\space #2\\ - (For other periods/print runs reprocess this document - with different config settings) - \end{center}% - \markright{Errata for #1 (\printedentries\space #2)}% - \thispagestyle{plain}% - \vspace{20pt}} - -\pagestyle{myheadings} - -\AtBeginDocument{\small} - -\setlength\parindent{0pt} -\setlength\parskip{2pt} - -\newcommand\contributor[2]{\makebox[1cm][l]{\sffamily#1} #2\par} - -% some special shortcuts overwriting existing commands: - -\let\u\underline -\renewcommand\>{$\to$} - -%%% some code suggested by Thorsten Hansen to count the number of -%%% contributions by individuals (will work only if we do not get -%%% too many :-) - -\def\count@contributors#1/#2/#3\@nil{ - \@ifundefined{c@#1}{\newcounter{#1}}{}\stepcounter{#1}% -%%% also count secondary: -%%% \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}% -} - -\renewcommand\erroronpage[5]{% - \count@contributors#3/secondary/\@nil - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\renewcommand\seriouserroronpage[5]{% - \count@contributors#3/secondary/\@nil - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \fbox{\bfseries !!}\hfill - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\renewcommand\contributor[2]{\makebox[1cm][l]{% - \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par} - -\end{filecontents} - - -\begin{filecontents}{\jobname.cfg} -% -% -% Configuration file for the errata listing of -% -% The LaTeX Graphics Companion, Second Edition -% -% -% \erratastartdate -% -% Specifies the date from which on errata entries should be listed. -% -% The format is YYYY/MM/DD. -% -% The default below ensures that all entries for a particular -% printing are typeset. -% - -\renewcommand\erratastartdate{2007/06/30} - - -% -% \myprinting -% -% Specifies which (revised) printing you own. For example, if you -% have the second printing set this to 2 so that errors already -% corrected in that printing will not appear in your errata -% listing. -% -% The default below ensures that all entries relevant to the x-th -% printing are typeset. -% -% - -\renewcommand\myprinting{2} - -% -% \norevisionnumbers -% -% Specifies that all page numbers in the errata are shown in the same -% format (bold face) irregardless of whether or not they are fixed -% in some revision. The default is to print corrected errors in -% italic and add the revision number as a superscript. - -% -% \showallerrors -% -% With this command you tell the program that all errata entries are -% supposed to be generated. This makes \myprinting and -% \erratastartdate basically obsolete so this isn't turned on by -% default. -% -% -\endinput -\end{filecontents} - - -\documentclass{ttcterrata}[2005/11/10] % we want new class - -\usepackage[T1]{fontenc} -\let\u\underline % shortcut for this file -\newcommand\meta[1]{$\langle$\textit{#1\/}$\rangle$} - -\usepackage{textcomp} - -\usepackage{url} - -\begin{document} - -\erratatitle{The \LaTeX{} Graphics Companion, Second Edition}{\erratafiledate} - - -\begin{verbatim} -@book(A-W:GMRRV07, - author = {Michel Goossens and Frank Mittelbach and Sebastian Rahtz - and Denis Roegel and Herbert Vo{\ss}}, - title = {The {\LaTeX} Graphics Companion}, - edition = 2, - series = {Tools and Techniques for Computer Typesetting}, - publisher = {Addison-Wesley}, - address = {Boston, Massachusetts}, - year = 2007, - pagenums = {976}, - bibliography = {yes}, - index = {yes}, - isbn = {978-0-321-50892-8}, -) -\end{verbatim} - - -\begin{list}{}{\setlength\leftmargin{0cm}\setlength\rightmargin{3cm}} -\item[] - -This file (\texttt{\jobname.err}) can be found as part of the \LaTeX{} -distribution and its latest version is maintained on the \LaTeX{} -project site at \texttt{http://www.latex-project.org/guides/\jobname.err} -where you will also find extracts of the book. - -The first column in the table shows the page number of the errata -entry. Superscript numbers in the first column refer to the printed -revision in which this entry was corrected (\textit{s} indicates a -correction in the sources only). The second -column gives the precise location (negative line or paragraph numbers -are counted from the bottom of the page). The third column shows the -first finder of the problem. - -You can customize this list to only show errata related to the printing -you own by changing the configuration in the file \texttt{\jobname.cfg}. - -\begin{center} - \Large \bfseries To Err is Human --- Bug Contest -\end{center} - -Any mistake found and reported is a gain for all readers of our book. -For this reason Addison-Wesley and the authors offer a prize (for 6 -periods) to the eligible person who finds the largest -number of bugs during that period (in case of a draw a random choice -will be made between all those with the largest number of findings). -A person can receive at most one prize, ever; errors found by any of -the authors do not count. - -Each prize is a free choice of any single computing book found on the -AW Professional web site \texttt{http://www.awprofessional.com} (that -is, no boxed sets or multiple volume offers). - - -As usual, the authors and publisher reserve the right to make various -decisions such as whether a reported feature is an error for -competitive purposes or whether similar features count as a single or -multiple errors. --- -Good luck! - -\begin{center} -\begin{tabular}{clr} -Contest period ends & Winner \\[4pt] -2008/05 & Milan Vujtek & 16 suggestions\\ -2010/05 & & \\ -\ldots -\end{tabular} -\end{center} -\end{list} - -\newpage - - -%<-------------------------- - -\newcommand\BibTeX{\textsc{Bib}\TeX} - -\begin{erratalist} - -\CHAPTER{General } - -\seriouserroronpage{general}{}{FMi}{2007/07/01}{} - - To help you in assessing this errata document we have placed - exclamation marks in front of each entry that we consider essential - for correctly understanding the book contents. - -\erroronpage{general}{}{FMi}{2007/07/01}{} - - Due to the printing process there may be small alignment problems - between blue and black text on some pages. These can vary from book - to book depending on how the paper was handled between print - runs---such is the analog nature of printing on a press. - -\CHAPTER{Front matter} - -\erroronpage{xxix}{para 4, l.1}{FMi/hv}{2007/08/23}{2} -Add ``In case of \textsf{PSTricks} \u{and, for example, the \textsf{beamer} -class} the syntax \ldots'' - -\erroronpage{xxix}{para 5, code}{FMi}{2007/08/24}{2} -There should be a bit more space in front of the code block - -\CHAPTER{Chapter 1} - -\erroronpage{2}{para 3, l.1}{MiV}{2008/05/22}{2} - ``First.'' \> ``First,'' - -\CHAPTER{Chapter 2} - -\CHAPTER{Chapter 3} - -\CHAPTER{Chapter 4} - -\seriouserroronpage{152}{exa 4-1-15}{HjG}{2007/08/17}{2} - Output of example is missing! Oops \ldots\ it was there honest - -\erroronpage{177}{para 2, l.1}{MiV}{2008/05/22}{2} -Missing interword space: ``Flowcharts\u{ }are'' - -\CHAPTER{Chapter 5} - - -\erroronpage{221}{last line}{RSh}{2008/02/13}{2} -``down'' should be ``up''. - -\erroronpage{223}{}{hv}{2008/02/22}{2} -Changed explanation for example 5-4-1 slightly (since example changed). - -\erroronpage{224}{exa. 5-4-1}{hv}{2008/02/22}{2} -Coding changed to: -\begin{verbatim} -\begin{pspicture}(-1,-1)(2,2) - \psaxes{->}(0,0)(-1,-1)(2,2) - \parabola[linewidth=1.5pt](1,2)(-0.5,-0.5) - \parabola[origin={0.25,-0.5}, - linestyle=dashed](1,2)(-0.5,-0.5) - \psaxes[origin={0.25,-0.5},linestyle=dashed, - linewidth=0.2pt]{->}(0,0)(-1,-1)(2,2) -\end{pspicture} -\end{verbatim} - -\erroronpage{240}{para 4, l.8}{MiV}{2008/05/22}{2} -Remove backslash in: - ``keyword setting \verb/\showpoints=true/'' - -\erroronpage{254}{Ex 5-9-1}{MiV}{2008/05/22}{} -The blue circle shouldn't be visible behind the black circle. This is a -problem due to the printing process used for the book---it does not show up on -all books. - -\erroronpage{290}{Ex 5-13-22}{MSh}{2008/06/11}{2} -Inside |\pscustom| the |\psbezier| macro needs four arguments in case -there exists no current point (always for the first macro) and three -arguments if the bezier curve connects to an existing line -or curve (path). - -\CHAPTER{Chapter 6} - -\erroronpage{335}{para 5, l.4}{JMi}{2008/06/23}{2} -``\ldots{} summarized in \u{Table} 5.2 \ldots" \> ``\ldots{} summarized in -\u{Figure} 5.2 \ldots'' - -\erroronpage{406}{margin}{hv}{2007/08/20}{2} - Missing interword space: - ``The\u{ }plotpoints \ldots''. - -\erroronpage{416}{exa 6-6-34}{hv}{2007/08/20}{2} - The filling (crosshatch) of the example isn't quite correct. - -\erroronpage{458}{para 2, l.1}{HjG}{2007/08/17}{2} - Missing interword space: - ``The\u{ }\textsf{pst-pdf} package \dots'' - - -\CHAPTER{Chapter 7} - -\erroronpage{491}{2nd line}{yhj}{2008/01/06}{2} -The name of author of xytree package should be ``Koaunghi Un'' -but not ``Koaungli Un''. Sorry for the mistake. - -\CHAPTER{Chapter 8} - -\erroronpage{514}{tab. 8.3}{FMi}{2008/012/21}{2} -Slightly increase spacing after hline. - -\erroronpage{515}{tab. 8.4}{MiV}{2008/05/22}{2} -There should be vertical spacing in the first line (superscript $10^{24}$ -touches top line) - -\seriouserroronpage{579}{para 2, l.3}{MiV}{2008/05/22}{2} - \verb=\ln= \> \verb=\nl= (this will also change the index entry) - -\erroronpage{583}{para 4, l.9}{MiV}{2008/05/22}{2} -Replace: ``of the voltage $V_C$'' \> ``of the voltage $v_C$'' - -\CHAPTER{Chapter 9} - -\erroronpage{598/599}{several}{FMi}{2007/08/19}{2} - The text and the displayed logs talk about example 7-2-6 but afterwards two - more chapters got added (without the logs being regenerated), i.e., this - should now be 9-2-6. - -\CHAPTER{Chapter 10} - -\seriouserroronpage{683}{exa. 10-1-22}{FMi}{2007/08/26}{2} -The example unfortunately highlights a bug in the current texmate package: a -linebreak (in contrast to a space) is not recognized as a move separator -resulting in all moves getting scrambled in the output, e.g., you see -\texttt{dxe5 Bxf3 Qxf5} put together under move 4. - -Fix: use \texttt{;} to separate moves on linebreaks or wait for the next -release of the package. - -\CHAPTER{Chapter 11} - -\erroronpage{720}{6th item}{MiV}{2008/05/22}{2} -Replace: ``documentwide'' \> ``\u{D}ocumentwide'' - -\erroronpage{726}{para 2, l.2}{MiV}{2008/05/22}{2} -Extra space after -parenthesis: ``( in practice'' - -\erroronpage{740}{para 2, l.1}{MiV}{2008/05/22}{2} -Replace: ``given -by \textit{start\u{ row}}'' \> ``given by \textit{start} row'' - -\seriouserroronpage{741}{Ex 11-3-5}{MiV}{2008/05/22}{2} -Usage of -\verb=\cellcolor= might introduce extra space in the output (as one can see in -the example). - -This can be argued as being a bug in the \texttt{colortbl} package. Given that the -basic \verb=\color= command ignores spaces after it, \verb=\cellcolor= should -behave similarly. - -\seriouserroronpage{744}{line after Ex 11-3-9}{MiV}{2008/05/22}{2} -Replace: ``This does \u{not}, of course, affect'' \> -``This does, of course, \u{also} affect'' - -\erroronpage{758}{para 3, l.2}{MiV}{2008/05/22}{2} -Add small space between values and units in frame dimension - -\erroronpage{760}{fig. 11.1}{MiV}{2008/05/22}{2} - -why differs section names (``Introduction to encoding'' vs. ``Introduction'' -etc.)? - -Frank: because the author of this section used a real live example where he had -used an optional argument to |\section| to make the toc have special text for -some reason (should be mentioned in the source though). - -\erroronpage{774}{2nd snytax box}{hv}{2009/05/8}{2} -The |\transduration| command takes ``time in seconds'' as mandatory argument -(and not ``key/vals'') - -\erroronpage{779}{para 3, l.1}{MiV}{2008/05/22}{2} -``in not shown''\> -``\u{is} not shown'' - -\erroronpage{794}{exa 11--4-36}{hv}{2009/05/12}{2} -Replace ``pic2e'' \> ``pic\u{t}2e'' in output, corresponding input not -displayed in the book. - - -\CHAPTER{Appendix A} - - -\CHAPTER{Appendix B} - -\erroronpage{809}{para -1, l.-1}{HjG}{2007/08/17}{2} - Missing interword space before opening parenthesis: - ``\dots \texttt{faq}\u{ }(or \dots'' - - -Frank: actually there is nothing missing in the source. It is a deficiency of -the fonts. - -\CHAPTER{Appendix C} - - -\CHAPTER{Bibliography} - -\erroronpage{822}{entry [32]}{MiV}{2008/05/22}{2} -Use capital C in ``Lecture Notes in computer Science'' - -\erroronpage{823}{entry [35]}{JPFD}{2007/09/05}{2} - The author name ``Eitan M. Gurai'' should be ``Eitan M. Gurari''. - -\erroronpage{824}{entry [47]}{GTa}{2010/02/10}{} - An updated version of the manual can be downloaded from - \url{http://www.tug.org/docs/metapost/mpman.pdf} - -\erroronpage{825}{entry [50]}{FMi}{2008/12/21}{2} -Use capital C in ``Lecture Notes in computer Science'' - -\erroronpage{826}{entry [59]}{FMi}{2008/12/21}{2} - Add web url: \url{http://www.dante.de/dante/DTK/PDF/komoedie_2002_1.pdf} - -\erroronpage{826}{entry [60]}{FMi}{2008/12/21}{2} - Add web url: \url{http://www.dante.de/dante/DTK/PDF/komoedie_2002_2.pdf} - - \erroronpage{828}{entry [60]}{FMi}{2008/12/21}{2} - Add web url: ``Sample chapter - at: \url{http://www.latex-project.org/guides/books.html}'' - - \erroronpage{829/830}{editorial change}{FMi}{2008/12/21}{2} - Page breaks changed due to other changes - -\erroronpage{833}{entry [128]}{FMi}{2008/12/21}{2} - Url changed to: \url{obsolete/graphics/pstricks/doc/code/pst-code.pdf} - - -\erroronpage{833}{entry [129]}{FMi}{2008/12/21}{2} - Url changed to: \url{macros/generic/multido/} - - -\erroronpage{833}{entry [135]}{ADo}{2008/01/02}{2} -An ``s'' is missing in ``using'' (end of the first line of comment) - - -\CHAPTER{Index} - - \erroronpage{856/860/866}{editorial change}{FMi}{2008/12/21}{2} - changed index entries due to changes above - -\erroronpage{886}{col.2, l.-7}{GTa}{2010/02/10}{} - image(METAPOST) should also reference example on p.145 - - \erroronpage{891}{editorial change}{FMi}{2008/12/21}{2} - changed index entries due to changes above - - \erroronpage{910/911}{editorial change}{FMi}{2008/12/21}{2} - changed index entries due to changes above - - \erroronpage{925}{editorial change}{FMi}{2008/12/21}{2} - changed index entries due to changes above - -\end{erratalist} - - -\setcounter{collectmore}{3} - -\begin{multicols}{3}[Thanks to all who have found errors or - omissions. Listed are the people who found an errata entry first.] -\contributor{ADo}{Alain Dondelinger} -\contributor{FMi}{Frank Mittelbach} -\contributor{GTa}{Gr\'egoire Taviot} -\contributor{HjG}{Hubert G\"a\ss lein} -\contributor{JPFD}{Jean-Pierre Drucbert} -\contributor{JMi}{John Middlekauff} -\contributor{MSh}{Michael Sharpe} -\contributor{MiV}{Milan Vujtek} -\contributor{RSh}{Richard Shepard} -\contributor{hv}{Herbert Vo\ss} -\contributor{yhj}{You Hyun Jo} -\end{multicols} - - -Other people have sent us corrections for errors already found. -Thanks to all of you! - -If you find -further -errors please report them to one of the authors, e.g., -\begin{quote}\ttfamily - frank.mittelbach@latex-project.org -\end{quote} -preferably in a form usable directly in this file, i.e., -\begin{flushleft} -|\erroronpage{|\textit{page-number}|}{|\textit{line-identification}|}{|% - \textit{your-initials}|}{|\textit{date}|}{}| \\ - \hspace*{2em}\textit{description of the the erratum} -\end{flushleft} -Here is an example: -\begin{verbatim} -\erroronpage{5}{para 3, l.1}{MOs}{2007/07/01}{} - ``LaTeX'' should be typeset ``\LaTeX''. -\end{verbatim} - -\end{document} - - -> > In addition, with regards to content of Section 8.1 it would be nice -> > to use Roman ``d'' in integrands in examples 3-2-3, 3-5-83, 3-5-84, -> > 5-12-21, 6-5-6 and 6-5-11. diff --git a/Master/texmf-dist/source/latex/base/ltalloc.dtx b/Master/texmf-dist/source/latex/base/ltalloc.dtx index 16da34ff2b9..46cbd111593 100644 --- a/Master/texmf-dist/source/latex/base/ltalloc.dtx +++ b/Master/texmf-dist/source/latex/base/ltalloc.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -47,6 +47,7 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} +\MaintainedByLaTeXTeam{latex} \maketitle \DocInput{\filename} \end{document} diff --git a/Master/texmf-dist/source/latex/base/ltbibl.dtx b/Master/texmf-dist/source/latex/base/ltbibl.dtx index 43718f37979..f6e9bbf365d 100644 --- a/Master/texmf-dist/source/latex/base/ltbibl.dtx +++ b/Master/texmf-dist/source/latex/base/ltbibl.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -48,7 +48,8 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltboxes.dtx b/Master/texmf-dist/source/latex/base/ltboxes.dtx index e60716bd856..5f17cc31df7 100644 --- a/Master/texmf-dist/source/latex/base/ltboxes.dtx +++ b/Master/texmf-dist/source/latex/base/ltboxes.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltboxes.dtx} - [2014/09/29 v1.1g LaTeX Kernel (Box Commands)] + [2015/01/08 v1.1h LaTeX Kernel (Box Commands)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltboxes.dtx} @@ -44,13 +44,14 @@ Frank Mittelbach\and Chris Rowley} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{758} +% \CheckSum{846} % % \changes{v1.1e}{1998/08/17}{(RmS) Minor Documentation fixes.} % \section{\LaTeX\ Box commands} @@ -232,12 +233,28 @@ % \changes{v0.1a}{1993/12/03} % {modified} % |\makebox| User level command just looks for optional |[| or |(|. +% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)} % \begin{macrocode} -\def\makebox{% +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\makebox}{Make \makebox robust}% +%<*2ekernel|latexrelease> +\DeclareRobustCommand\makebox{% \leavevmode \@ifnextchar(%) \@makepicbox - {\@ifnextchar[\@makebox\mbox}} + {\@ifnextchar[\@makebox\mbox}}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\makebox}{Make \makebox robust}% +%<latexrelease>\def\makebox{% +%<latexrelease> \leavevmode +%<latexrelease> \@ifnextchar(%) +%<latexrelease> \@makepicbox +%<latexrelease> {\@ifnextchar[\@makebox\mbox}}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -433,10 +450,24 @@ % % \begin{macro}{\savebox} % Save |#1| in a box register. +% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)} % \begin{macrocode} -\def\savebox#1{% +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\savebox}{Make \savebox robust}% +%<*2ekernel|latexrelease> +\DeclareRobustCommand\savebox[1]{% \@ifnextchar(%) - {\@savepicbox#1}{\@ifnextchar[{\@savebox#1}{\sbox#1}}} + {\@savepicbox#1}{\@ifnextchar[{\@savebox#1}{\sbox#1}}}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\savebox}{Make \savebox robust}% +%<latexrelease>\def\savebox#1{% +%<latexrelease> \@ifnextchar(%) +%<latexrelease> {\@savepicbox#1}{\@ifnextchar[{\@savebox#1}{\sbox#1}}}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -615,10 +646,24 @@ % {Merged \cs{fbox} and \cs{framebox}} % \changes{v1.0i}{1994/06/01} % {New version, so \cs{width} is correct in \cs{framebox}} +% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)} % \begin{macrocode} -\def\framebox{% +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\framebox}{Make \framebox robust}% +%<*2ekernel|latexrelease> +\DeclareRobustCommand\framebox{% \@ifnextchar(%) - \@framepicbox{\@ifnextchar[\@framebox\fbox}} + \@framepicbox{\@ifnextchar[\@framebox\fbox}}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\framebox}{Make \framebox robust}% +%<latexrelease>\def\framebox{% +%<latexrelease> \@ifnextchar(%) +%<latexrelease> \@framepicbox{\@ifnextchar[\@framebox\fbox}}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -713,11 +758,26 @@ % \changes{v0.1d}{1993/12/15} % {Changed default from `c' to `s'} % The main vertical-box command for \LaTeX. +% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)} % \begin{macrocode} -\def\parbox{% +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\parbox}{Make \parbox robust}% +%<*2ekernel|latexrelease> +\DeclareRobustCommand\parbox{% \@ifnextchar[%] \@iparbox - {\@iiiparbox c\relax[s]}} + {\@iiiparbox c\relax[s]}}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\parbox}{Make \parbox robust}% +%<latexrelease>\def\parbox{% +%<latexrelease> \@ifnextchar[%] +%<latexrelease> \@iparbox +%<latexrelease> {\@iiiparbox c\relax[s]}}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -995,8 +1055,20 @@ % % \begin{macro}{\rule} % Draw a rule of the specified size. +% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)} % \begin{macrocode} -\def\rule{\@ifnextchar[\@rule{\@rule[\z@]}} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\rule}{Make \rule robust}% +%<*2ekernel|latexrelease> +\DeclareRobustCommand\rule{\@ifnextchar[\@rule{\@rule[\z@]}}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\rule}{Make \rule robust}% +%<latexrelease>\def\rule{\@ifnextchar[\@rule{\@rule[\z@]}}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -1039,10 +1111,24 @@ % \changes{v1.0s}{1995/04/27} % {Move \cs{leavevmode} for graphics/1512} % Raise a box, and change its vertical dimensions. +% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)} % \begin{macrocode} -\def\raisebox#1{% +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\raisebox}{Make \raisebox robust}% +%<*2ekernel|latexrelease> +\DeclareRobustCommand\raisebox[1]{% \leavevmode \@ifnextchar[{\@rsbox{#1}}{\@irsbox{#1}[]}} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\raisebox}{Make \raisebox robust}% +%<latexrelease>\def\raisebox#1{% +%<latexrelease> \leavevmode +%<latexrelease> \@ifnextchar[{\@rsbox{#1}}{\@irsbox{#1}[]}} +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx index 89cca2fb9f2..d9b2b9423c2 100644 --- a/Master/texmf-dist/source/latex/base/ltclass.dtx +++ b/Master/texmf-dist/source/latex/base/ltclass.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -42,7 +42,8 @@ \author{Frank Mittelbach\and Chris Rowley\and Alan Jeffrey\and David Carlisle} \date{\filedate} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltcntrl.dtx b/Master/texmf-dist/source/latex/base/ltcntrl.dtx index fd294c42f5d..bb803bf3478 100644 --- a/Master/texmf-dist/source/latex/base/ltcntrl.dtx +++ b/Master/texmf-dist/source/latex/base/ltcntrl.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -47,7 +47,8 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltcounts.dtx b/Master/texmf-dist/source/latex/base/ltcounts.dtx index 4ccd7e9a043..935f5f4c11b 100644 --- a/Master/texmf-dist/source/latex/base/ltcounts.dtx +++ b/Master/texmf-dist/source/latex/base/ltcounts.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltcounts.dtx} - [1998/05/16 v1.1g LaTeX Kernel (Counters)] + [2015/01/10 v1.1h LaTeX Kernel (Counters)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltcounts.dtx} @@ -49,13 +49,14 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{256} +% \CheckSum{373} % % \changes{v1.0c}{1994/03/29} % {Create file from parts of ltmiscen and ltherest.} @@ -252,8 +253,21 @@ % \end{macro} % % \begin{macro}{\@stpelt} +% \changes{v1.1h}{2015/01/10}{Reset all within counters in one go (latexrelease)} +% +% Rather than resetting the ``within'' counter to zero we set it to +% $-1$ and then run |\stepcounter| that moves it to $0$ and also +% initiates resetting the next level down. % \begin{macrocode} -\def\@stpelt#1{\global\csname c@#1\endcsname \z@} +%</2ekernel> +%<latexrelease>\IncludeInRelease}{2015/01/01}{\@stpelt}{% +%<*2ekernel|latexrelease> +\def\@stpelt#1{\global\csname c@#1\endcsname \m@ne\stepcounter{#1}}% +%</2ekernel|latexrelease> +%<latexrelease>} +%<latexrelease>\def\@stpelt#1{\global\csname c@#1\endcsname \z@}% +%<latexrelease>} +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -418,13 +432,103 @@ % \changes{v1.1b}{1995/05/20}{Allowing both text and math} % Typesetting old fashioned footnote symbols. % This can be done both in text or math mode now. +% +% \changes{v1.1h}{2015/01/10}{Unse \cs{TextOrMath} (latexrelease)} +% This macro is another example of an ever recurring problem in +% \TeX: Determining if something is text-mode or math-mode. It is +% imperative for the decision between text and math to be delayed +% until the actual typesetting is done as the code in question may +% go through an |\edef| or |\write| where an |\ifmmode| test would +% be executed prematurely. Hence in the implementation below, +% |\@fnsymbol| is not robust in itself but the parts doing the +% actual typesetting are. +% +% In the case of |\@fnsymbol| we make use of the robust command +% |\TextOrMath| which takes two arguments and typesets the first if +% in text-mode and the second if in math-mode. Note that in order +% for this command to make the correct decision, it must insert a +% |\relax| token if run under regular \TeX, which ruins any kerning +% between the preceding characters and whatever awaits +% typesetting. If you use e\TeX\ as engine for \LaTeX\ (as +% recommended) this unfortunate side effect is not present. % \begin{macrocode} -\def\@fnsymbol#1{\ensuremath{\ifcase#1\or *\or \dagger\or \ddagger\or - \mathsection\or \mathparagraph\or \|\or **\or \dagger\dagger - \or \ddagger\ddagger \else\@ctrerr\fi}} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}{\@fnsymbol}{Use \TexOrMath}% +%<*2ekernel|latexrelease> +\def\@fnsymbol#1{% + \ifcase#1\or \TextOrMath\textasteriskcentered *\or + \TextOrMath \textdagger \dagger\or + \TextOrMath \textdaggerdbl \ddagger \or + \TextOrMath \textsection \mathsection\or + \TextOrMath \textparagraph \mathparagraph\or + \TextOrMath \textbardbl \|\or + \TextOrMath {\textasteriskcentered\textasteriskcentered}{**}\or + \TextOrMath {\textdagger\textdagger}{\dagger\dagger}\or + \TextOrMath {\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger}\else + \@ctrerr \fi +}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\@fnsymbol}{Use \TexOrMath}% +%<latexrelease>\def\@fnsymbol#1{\ensuremath{% +%<latexrelease> \ifcase#1\or *\or \dagger\or \ddagger\or \mathsection\or +%<latexrelease> \mathparagraph\or \|\or **\or \dagger\dagger +%<latexrelease> \or \ddagger\ddagger \else\@ctrerr\fi}}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % +% \begin{macro}{\TextOrMath} +% \changes{v1.1h}{2015/01/11}{Add command to solve robustness +% issues (pr/3752) (latexrelease)} +% When using regular \TeX, we make this command robust so that it +% always selects the correct branch in an |\ifmmode| switch with +% the usual disadvantage of ruining kerning. For the application we +% use it for here that shouldn't matter. The alternative would be +% to mimic |\IeC| from \textsf{inputenc} but then it wil have the +% disadvantage of choosing the wrong branch if appearing at the +% beginning of an alignment cell. However, users of e\TeX\ will be +% pleasantly surprised to get the best of both worlds and no bad +% side effects. +% +% First some code for checking if we are running e\TeX\ but making +% sure not to permanently turn |\eTeXversion| into |\relax|. +% \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}{\TextOrMath}{\TextOrMath}% +%<*2ekernel|latexrelease> +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname eTeXversion\endcsname\relax +% \end{macrocode} +% In case of ordinary \TeX\ we define |\TextOrMath| as a robust +% command but make sure it always grabs its arguments. If we didn't do +% this it might very well gobble spaces in the input stream. +% \begin{macrocode} +\DeclareRobustCommand\TextOrMath{% + \ifmmode \expandafter\@secondoftwo + \else \expandafter\@firstoftwo \fi} +\protected@edef\TextOrMath#1#2{\TextOrMath{#1}{#2}} +\else +% \end{macrocode} +% For e\TeX\ the situation is similar. The robust macro is a hidden +% one so that we again avoid problems of gobbling spaces in the input. +% \begin{macrocode} +\protected\expandafter\def\csname TextOrMath\space\endcsname{% + \ifmmode \expandafter\@secondoftwo + \else \expandafter\@firstoftwo \fi} +\edef\TextOrMath#1#2{% + \expandafter\noexpand\csname TextOrMath\space\endcsname + {#1}{#2}} +\fi +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\TextOrMath}{\TextOrMath}% +%<latexrelease>\let\TextOrMath\@undefined +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> +% \end{macrocode} +% \end{macro} % % \begin{macrocode} %</2ekernel> diff --git a/Master/texmf-dist/source/latex/base/ltdefns.dtx b/Master/texmf-dist/source/latex/base/ltdefns.dtx index a106bbbb074..e759ae73058 100644 --- a/Master/texmf-dist/source/latex/base/ltdefns.dtx +++ b/Master/texmf-dist/source/latex/base/ltdefns.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltdefns.dtx} - [2014/09/29 v1.3g LaTeX Kernel (definition commands)] + [2015/02/21 v1.4b LaTeX Kernel (definition commands)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltdefns.dtx} @@ -47,13 +47,14 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{746} +% \CheckSum{805} % % \changes{v1.0n}{1994/05/10}{(ASAJ) Added % \cs{DeclareProtectedCommand}.} @@ -88,6 +89,8 @@ % \changes{v1.0g}{1994/11/17} % {\cs{@tempa} to \cs{reserved@a}} % \changes{v1.0p}{1995/07/13}{Updates to documentation} +% \changes{v1.4b}{2015/02/21} +% {Removed autoload support} % % \section{Definitions} % @@ -347,13 +350,36 @@ % % \changes{v1.2r}{1995/10/03} % {Add missing \cs{@typein} for /1710 (from patch file)} +% \changes{v1.4a}{2015/01/03}{use modified definition in luatex} +% \begin{macrocode} +\ifx\directlua\@undefined +% \end{macrocode} +% +% \begin{macrocode} +\def\@xtypein[#1]#2{% + \typeout{#2}% + \advance\endlinechar\@M + \read\@inputcheck to#1% + \advance\endlinechar-\@M + \@typein}% +% \end{macrocode} +% +% \begin{macrocode} +\else +% \end{macrocode} +% % \begin{macrocode} \def\@xtypein[#1]#2{% \typeout{#2}% - \advance\endlinechar\@M + \begingroup \endlinechar\m@ne \read\@inputcheck to#1% - \advance\endlinechar-\@M - \@typein} + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% + \@typein}% +% \end{macrocode} +% +% \begin{macrocode} +\fi % \end{macrocode} % \end{macro} % @@ -488,14 +514,9 @@ % ``Default'' is the contents of the second optional argument of % |(re)newcommand|. % -% The |\aut@global| command below is only used in the autoload -% format. If it is |\global| then a global definition will be made. -% \changes{v1.2q}{1995/10/02} -% {Add \cs{aut@global} in autoload version} % \changes{v1.2z2}{1998/03/04} % {Unnecessary \cs{expandafter} removed: pr/2758} % \begin{macrocode} -%<autoload>\aut@global \expandafter\def\expandafter#1\expandafter{% \expandafter \@protected@testopt @@ -581,8 +602,9 @@ % works. I am not sure this is worth it, as a following % |\newcommand| would over-write the definition of |\reserved@a|. % -% Recall that \LaTeX2.09 goes into an infinite loop with -% |\renewcommand[1]{\@tempa}{foo}| (DPC 6 October 93). +% Recall that \LaTeX2.09 goes into an infinite loop with\\ +% |\renewcommand[1]{\@tempa}{foo}|\\ +% (DPC 6 October 93). % % Reorganised again (DPC 1999). Rather than make a loop to % construct the argument spec by counting, just extract the @@ -608,14 +630,9 @@ } % \end{macrocode} % -% The |\aut@global| command below is only used in the autoload -% format. If it is |\global| then a global definition will be made. -% \changes{v1.2q}{1995/10/02} -% {Add \cs{aut@global} in autoload version} % \begin{macrocode} \long \def \@yargd@f#1#2{% \def \reserved@a ##1#1##2##{% -%<autoload>\aut@global \expandafter\def\expandafter#2\reserved@b ##1#1% }% \l@ngrel@x \reserved@a 0##1##2##3##4##5##6##7##8##9###1% @@ -764,11 +781,6 @@ {\@latex@error{Environment #1 undefined}\@ehc }\relax \expandafter\let\csname#1\endcsname\relax -% \end{macrocode} -% \changes{v1.2q}{1995/10/02} -% {Add \cs{aut@global} in autoload version} -% \begin{macrocode} -%<autoload>\aut@global \expandafter\let\csname end#1\endcsname\relax \new@environment{#1}} % \end{macrocode} @@ -795,26 +807,18 @@ \relax \expandafter\new@command \csname #1\endcsname#2{#3}% -% \end{macrocode} -% \changes{v1.2q}{1995/10/02} -% {Add \cs{aut@global} in autoload version} -% \begin{macrocode} -%<autoload>\aut@global \l@ngrel@x\expandafter\def\csname end#1\endcsname{#4}} % \end{macrocode} % \end{macro} % % \begin{macro}{\newif} % \changes{v1.1l}{1995/05/24}{(DPC) New implementation} -% \changes{v1.2q}{1995/10/02} -% {Add \cs{aut@global} in autoload version} % And here's a different sort of allocation: % For example, % |\newif\iffoo| creates |\footrue|, |\foofalse| to go with |\iffoo|. % \begin{macrocode} \def\newif#1{% \count@\escapechar \escapechar\m@ne -%<autoload>\aut@global \let#1\iffalse \@if#1\iftrue \@if#1\iffalse @@ -822,11 +826,8 @@ % \end{macrocode} % % \begin{macro}{\@if} -% \changes{v1.2q}{1995/10/02} -% {Add \cs{aut@global} in autoload version} % \begin{macrocode} \def\@if#1#2{% -%<autoload>\aut@global \expandafter\def\csname\expandafter\@gobbletwo\string#1% \expandafter\@gobbletwo\string#2\endcsname {\let#1#2}} @@ -1112,11 +1113,6 @@ \edef\reserved@a{\string#1}% \def\reserved@b{#1}% \edef\reserved@b{\expandafter\strip@prefix\meaning\reserved@b}% -% \end{macrocode} -% \changes{v1.2s}{1995/10/06} -% {Add \cs{aut@global} in autoload version} -% \begin{macrocode} -%<autoload>\aut@global \edef#1{% \ifx\reserved@a\reserved@b \noexpand\x@protect @@ -1215,6 +1211,55 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\MakeRobust} +% \changes{v1.4a}{2015/01/08}{Added macro} +% +% The macro firstly checks if the controls sequence in question exists +% at all. +% \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}{\MakeRobust}{\MakeRobust}% +%<*2ekernel|latexrelease> +\def\MakeRobust#1{% + \@ifundefined{\expandafter\@gobble\string#1}{% + \@latex@error{The control sequence `\string#1' is undefined!% + \MessageBreak There is nothing here to make robust}% + \@eha + }% +% \end{macrocode} +% Then we check if the macro is already robust. We do this by testing +% if the internal name for a robust macro is defined, namely +% \verb*=\foo =. If it is already defined do nothing, otherwise set +% \verb*=\foo = equal to \verb*=\foo= and redefine \verb*=\foo= so +% that it acts like a macro defined with \verb=\DeclareRobustCommand=. +% \begin{macrocode} + {% + \@ifundefined{\expandafter\@gobble\string#1\space}% + {% + \expandafter\let\csname + \expandafter\@gobble\string#1\space\endcsname=#1% + \edef\reserved@a{\string#1}% + \def\reserved@b{#1}% + \edef\reserved@b{\expandafter\strip@prefix\meaning\reserved@b}% + \edef#1{% + \ifx\reserved@a\reserved@b + \noexpand\x@protect\noexpand#1% + \fi + \noexpand\protect\expandafter\noexpand + \csname\expandafter\@gobble\string#1\space\endcsname}% + }% + {\@latex@info{The control sequence `\string#1' is already robust}}% + }% +}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\MakeRobust}{\MakeRobust}% +%<latexrelease>\let\MakeRobust\@undefined +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> +% \end{macrocode} +% \end{macro} +% % \subsection{Internal defining commands} % % These commands are used internally to define other \LaTeX{} @@ -1405,51 +1450,6 @@ %</2ekernel> % \end{macrocode} % -% \subsection{Commands for Autoloading} -% -% \begin{macrocode} -%<*autoload> -% \end{macrocode} -% -% \begin{macro}{\aut@global} -% \changes{v1.2q}{1995/10/02} -% {Macro added} -% This command is only defined in the `autoload' format. It is -% normally |\relax| but may be set to |\global|, in which case -% |\newif| and the commands based on |\newcommand| will all make -% global definitions. -% \begin{macrocode} -\let\aut@global\relax -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@autoload} -% \changes{v1.2q}{1995/10/02} -% {Macro added} -% \changes{v1.2t}{1995/10/09} -% {Use \cs{@@input} not \cs{input} to save string space and -% stops autoload files appearing in \cs{listfiles}} -% \changes{v1.2v}{1995/10/24}{ignore end-of-line} -% This macro is only defined in the `autoload' format. It inputs a -% package `|auto#1.sty|' within a local group, and with normalised -% catcodes. |\aut@global| is set to |\global| so that |\newif| -% |\newcommand| and related commands make global definitions. -% \begin{macrocode} -\def\@autoload#1{% - \begingroup - \makeatletter - \let\aut@global\global - \nfss@catcodes - \catcode`\ =10 - \let\@latex@e@error\@gobble - \@@input auto#1.sty\relax - \endgroup} -% \end{macrocode} -% \end{macro} -% -% \begin{macrocode} -%</autoload> -% \end{macrocode} % % \Finale % diff --git a/Master/texmf-dist/source/latex/base/ltdirchk.dtx b/Master/texmf-dist/source/latex/base/ltdirchk.dtx index 9ed32cb1027..11af47cdd7f 100644 --- a/Master/texmf-dist/source/latex/base/ltdirchk.dtx +++ b/Master/texmf-dist/source/latex/base/ltdirchk.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -28,7 +28,7 @@ % \fi % % \ProvidesFile{ltdirchk.dtx} -% [2014/09/29 v1.0y LaTeX Kernel (System Dependent Parts)] +% [2015/01/03 v1.1 LaTeX Kernel (System Dependent Parts)] % % \iffalse %%% From File: ltdirchk.dtx @@ -39,7 +39,7 @@ %<*driver> % \fi \ProvidesFile{ltdirchk.dtx} - [2001/06/04 v1.0y LaTeX Kernel (System Dependent Parts)] + [2015/01/03 v1.1 LaTeX Kernel (System Dependent Parts)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltdirchk.dtx} @@ -49,6 +49,7 @@ \author{David Carlisle} \date{\filedate} \begin{document} + \MaintainedByLaTeXTeam{latex} \maketitle \DocInput{\filename} \end{document} @@ -81,7 +82,7 @@ % {documentation improvements mainly from internal/2520} % \changes{v1.0w}{1998/08/17}{(RmS) Documentation improvements.} % -% \CheckSum{595} +% \CheckSum{606} % % \section{\LaTeX\ System Dependent Initialisations} % @@ -222,6 +223,33 @@ %<initex>\fi \catcode`\{=1 \catcode`\}=2 +% \end{macrocode} +% \changes{v1.1}{2015/01/03}{Enable extra primitives when Lua\TeX{} is used} +% If Lua\TeX{} is in use the extensions and other new primitives +% have to be activated: this is done as early as possible. Older +% versions of Lua\TeX{} do not hide the primitives: a version check is +% not needed as the version itself will be missing in the case where +% action is needed! +% \begin{macrocode} +\ifx\directlua\undefined +\else + \ifx\luatexversion\undefined +% \end{macrocode} +% Enable e-TeX/pdfTeX/Umath primitives with their natural names +% \begin{macrocode} + \directlua{tex.enableprimitives('',% + tex.extraprimitives('etex', 'pdftex', 'umath'))} +% \end{macrocode} +% Enable other primitives with |luatex| prefix +% \begin{macrocode} + \directlua{tex.enableprimitives('luatex', + tex.extraprimitives('core', 'omega', 'aleph', 'luatex')) + } + \fi +\fi +% \end{macrocode} +% That distraction over, back to the basics of a format. +% \begin{macrocode} \catcode`\#=6 \catcode`\^=7 \chardef\active=13 diff --git a/Master/texmf-dist/source/latex/base/lterror.dtx b/Master/texmf-dist/source/latex/base/lterror.dtx index 249c4e5848a..01fb44575ab 100644 --- a/Master/texmf-dist/source/latex/base/lterror.dtx +++ b/Master/texmf-dist/source/latex/base/lterror.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -29,12 +29,10 @@ % % \iffalse %%% From File: lterror.dtx -%<def>\ProvidesFile{autoerr.sty} -%<def> [1995/11/28 v1.2l LaTeX error autoload file] %<*driver> % \fi \ProvidesFile{lterror.dtx} - [2014/09/29 v1.2n LaTeX Kernel (errors)] + [2015/02/21 v1.2o LaTeX Kernel (errors)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{lterror.dtx} @@ -49,13 +47,14 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{442} +% \CheckSum{375} % % \changes{v1.1a}{1994/05/16}{(ASAJ) Split from ltinit.dtx.} % \changes{v1.1a}{1994/05/16}{(ASAJ) Completely new error interface.} @@ -84,6 +83,8 @@ % {Add autoload support} % \changes{v1.2j}{1995/10/09} % {Modify autoload support} +% \changes{v1.2o}{2015/02/21} +% {Removed autoload support} % % \section{Error handling} % @@ -92,17 +93,21 @@ % \StopEventually{} % % +% \begin{macrocode} +%<*2ekernel> +% \end{macrocode} +% % The `2ekernel' code ensures that a |\usepackage{autoerr}| is % essentially ignored if a `full' format is being used that has % the error messages already in the format. -% \begin{macrocode} -%<2ekernel>\expandafter\let\csname ver@autoerr.sty\endcsname\fmtversion -% \end{macrocode} % +% These days we don't support autoloading approach any longer, but +% this part bit is kept in case it is used in old documents. % \begin{macrocode} -%<*2ekernel|autoload> +\expandafter\let\csname ver@autoerr.sty\endcsname\fmtversion % \end{macrocode} % +% % \subsection{General commands} % % \begin{macro}{\MessageBreak} @@ -143,7 +148,6 @@ \immediate\write\@unused{^^J#2\on@line.^^J}% \endgroup } -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % @@ -159,8 +163,6 @@ % \changes{v1.2d}{1994/05/22} % {(DPC) Alternative version added for old TeXs} % \begin{macrocode} -%<autoload>\def\GenericError{\@autoerr\GenericError} -%<*2ekernel|def> \bgroup \lccode`\@=`\ % \lccode`\~=`\ % @@ -257,7 +259,6 @@ Type H <return> for immediate help.}% % % \begin{macrocode} \fi}% -%</2ekernel|def> % \end{macrocode} % \end{macro} % @@ -302,8 +303,6 @@ Type H <return> for immediate help.}% % \end{verbatim} % % \begin{macrocode} -%<autoload>\def\PackageError{\@autoerr\PackageError} -%<*2ekernel|def> \gdef\PackageError#1#2#3{% \GenericError{% (#1)\@spaces\@spaces\@spaces\@spaces @@ -313,11 +312,9 @@ Type H <return> for immediate help.}% See the #1 package documentation for explanation.% }{#3}% } -%</2ekernel|def> % \end{macrocode} % % \begin{macrocode} -%<*2ekernel|autoload> \def\PackageWarning#1#2{% \GenericWarning{% (#1)\@spaces\@spaces\@spaces\@spaces @@ -335,14 +332,9 @@ Type H <return> for immediate help.}% Package #1 Info: #2% }% } -%</2ekernel|autoload> % \end{macrocode} % -% \changes{v1.2l}{1995/11/28} -% {Typo in autoload code /1985} % \begin{macrocode} -%<autoload>\def\ClassError{\@autoerr\ClassError} -%<*2ekernel|def> \gdef\ClassError#1#2#3{% \GenericError{% (#1) \space\@spaces\@spaces\@spaces @@ -352,11 +344,9 @@ Type H <return> for immediate help.}% See the #1 class documentation for explanation.% }{#3}% } -%</2ekernel|def> % \end{macrocode} % % \begin{macrocode} -%<*2ekernel|autoload> \def\ClassWarning#1#2{% \GenericWarning{% (#1) \space\@spaces\@spaces\@spaces @@ -374,7 +364,6 @@ Type H <return> for immediate help.}% Class #1 Info: #2% }% } -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % \end{macro} @@ -393,8 +382,6 @@ Type H <return> for immediate help.}% % \changes{v1.2e}{1994/05/24}{Macro added} % Errors and other info, for use in the \LaTeX{} core. % \begin{macrocode} -%<autoload>\def\@latex@error{\@autoerr\@latex@error} -%<*2ekernel|def> \gdef\@latex@error#1#2{% \GenericError{% \space\space\space\@spaces\@spaces\@spaces @@ -404,11 +391,9 @@ Type H <return> for immediate help.}% See the LaTeX manual or LaTeX Companion for explanation.% }{#2}% } -%</2ekernel|def> % \end{macrocode} % % \begin{macrocode} -%<*2ekernel|autoload> \def\@latex@warning#1{% \GenericWarning{% \space\space\space\@spaces\@spaces\@spaces @@ -500,7 +485,6 @@ Type H <return> for immediate help.}% % \begin{macrocode} \let\@warning\@latex@warning \let\@@warning\@latex@warning@no@line -%</2ekernel|autoload> \global\let\@latexerr\@latex@error % \end{macrocode} % \end{macro} @@ -510,9 +494,7 @@ Type H <return> for immediate help.}% % \begin{macro}{\@spaces} % Four spaces. % \begin{macrocode} -%<*2ekernel|autoload> \def\@spaces{\space\space\space\space} -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % @@ -524,7 +506,6 @@ Type H <return> for immediate help.}% % \begin{macro}{\@ehd} % The more common error help messages. % \begin{macrocode} -%<*2ekernel|def> \gdef\@eha{% Your command was ignored.\MessageBreak Type \space I <command> <return> \space to replace it % @@ -538,28 +519,12 @@ Type H <return> for immediate help.}% If that doesn't work, type \space X <return> \space to quit.} \gdef\@ehd{% You're in trouble here. \space\@ehc} -%</2ekernel|def> -% \end{macrocode} -% As |\latex@error| triggers the autoload, these definitions -% should not be needed in the autoload format, but just to be safe\ldots -% \begin{macrocode} -%<*autoload> -\let\@eha\@empty\let\@ehb\@empty\let\@ehc\@empty\let\@ehd\@empty -%</autoload> % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} % \end{macro} % -% Here are most of the error message-generating commands of \LaTeX. -% \begin{macro}{\@autoerr} -% Make this autoload command robust, as it may be read in at -% unpredictable times. -% \begin{macrocode} -%<autoload>\def\@autoerr{\protect\@autoload{err}\protect} -% \end{macrocode} -% \end{macro} % % \begin{macro}{\@notdefinable} % Error message generated in |\@ifdefinable| from calls @@ -569,12 +534,11 @@ Type H <return> for immediate help.}% % \changes{v1.2n}{1998/05/28}{Added message re `end...' pr/1555} % \begin{macrocode} \gdef\@notdefinable{% -%<!autoload> \@latex@error{% -%<!autoload> Command \@backslashchar\reserved@a\space -%<!autoload> already defined.\MessageBreak -%<!autoload> Or name \@backslashchar\@qend... illegal, -%<!autoload> see p.192 of the manual}\@eha} -%<autoload> \@autoerr\@notdefinable} + \@latex@error{% + Command \@backslashchar\reserved@a\space + already defined.\MessageBreak + Or name \@backslashchar\@qend... illegal, + see p.192 of the manual}\@eha} % \end{macrocode} % \end{macro} % @@ -582,8 +546,7 @@ Type H <return> for immediate help.}% % Generated by |\newline| and |\\| when called in vertical mode. % \begin{macrocode} \gdef\@nolnerr{% -%<!autoload> \@latex@error{There's no line here to end}\@eha} -%<autoload> \@autoerr\@nolnerr} + \@latex@error{There's no line here to end}\@eha} % \end{macrocode} % \end{macro} % @@ -601,8 +564,7 @@ Type H <return> for immediate help.}% % Use |\@nocounterr|\marg{cnt} instead. % \begin{macrocode} \gdef\@nocounterr#1{% -%<!autoload> \@latex@error{No counter '#1' defined}\@eha} -%<autoload> \@autoerr\@nocounterr} + \@latex@error{No counter '#1' defined}\@eha} \gdef\@nocnterr{\@nocounterr?} % \end{macrocode} % \end{macro} @@ -613,8 +575,7 @@ Type H <return> for immediate help.}% % numbered by letters that's greater than 26. % \begin{macrocode} \gdef\@ctrerr{% -%<!autoload> \@latex@error{Counter too large}\@ehb} -%<autoload> \@autoerr\@ctrerr} + \@latex@error{Counter too large}\@ehb} % \end{macrocode} % \end{macro} % @@ -623,8 +584,8 @@ Type H <return> for immediate help.}% % \changes{v1.2m}{1996/11/04}{Always define \cs{@nodocument} % in kernel, so that it can be cleared by \cs{document}.} % \begin{macrocode} -%<!def>\gdef\@nodocument{% -%<!def> \@latex@error{Missing \protect\begin{document}}\@ehd} +\gdef\@nodocument{% + \@latex@error{Missing \protect\begin{document}}\@ehd} % \end{macrocode} % \end{macro} % @@ -635,9 +596,8 @@ Type H <return> for immediate help.}% % FMi 1993/01/14: missing space added. % \begin{macrocode} \gdef\@badend#1{% -%<!autoload> \@latex@error{\protect\begin{\@currenvir}\@currenvline -%<!autoload> \space ended by \protect\end{#1}}\@eha} -%<autoload> \@autoerr\@badend} + \@latex@error{\protect\begin{\@currenvir}\@currenvline + \space ended by \protect\end{#1}}\@eha} % \end{macrocode} % \end{macro} % @@ -645,8 +605,7 @@ Type H <return> for immediate help.}% % Called by |\[|, |\]|, |\(| or |\)| when used in wrong mode. % \begin{macrocode} \gdef\@badmath{% -%<!autoload> \@latex@error{Bad math environment delimiter}\@eha} -%<autoload> \@autoerr\@badmath} + \@latex@error{Bad math environment delimiter}\@eha} % \end{macrocode} % \end{macro} % @@ -655,8 +614,7 @@ Type H <return> for immediate help.}% % deep, or an enumerate or itemize nested more than four levels. % \begin{macrocode} \gdef\@toodeep{% -%<!autoload> \@latex@error{Too deeply nested}\@ehd} -%<autoload> \@autoerr\@toodeep} + \@latex@error{Too deeply nested}\@ehd} % \end{macrocode} % \end{macro} % @@ -665,9 +623,8 @@ Type H <return> for immediate help.}% % occurred, or by |\poptabs| when too many have occurred. % \begin{macrocode} \gdef\@badpoptabs{% -%<!autoload> \@latex@error{\protect\pushtabs\space and \protect\poptabs -%<!autoload> \space don't match}\@ehd} -%<autoload> \@autoerr\@badpoptabs} + \@latex@error{\protect\pushtabs\space and \protect\poptabs + \space don't match}\@ehd} % \end{macrocode} % \end{macro} % @@ -675,14 +632,11 @@ Type H <return> for immediate help.}% % Called by |\>|, |\+| , |\-| or |\<| when stepping to an undefined tab. % \begin{macrocode} \gdef\@badtab{% -%<!autoload> \@latex@error{Undefined tab position}\@ehd} -%<autoload> \@autoerr\@badtab} + \@latex@error{Undefined tab position}\@ehd} % \end{macrocode} % \end{macro} % % \begin{macro}{\@preamerr} -% \changes{v1.2k}{1995/10/24} -% {Modify autoload support} % This error is special: it appears in places where we normally have % to |\protect| expansions. However, to prevent a protection of % the error message itself (which would result in the message @@ -692,12 +646,9 @@ Type H <return> for immediate help.}% \gdef\@preamerr#1{% \begingroup \let\protect\relax -%<*!autoload> \@latex@error{\ifcase #1 Illegal character\or Missing @-exp\or Missing p-arg\fi\space in array arg}\@ehd -%</!autoload> -%<autoload> \@autoerr\@preamerr{#1}% \endgroup} % \end{macrocode} % \end{macro} @@ -707,10 +658,9 @@ Type H <return> for immediate help.}% % argument is encountered. % \begin{macrocode} \gdef\@badlinearg{% -%<!autoload> \@latex@error{% -%<!autoload> Bad \protect\line\space or \protect\vector -%<!autoload> \space argument}\@ehb} -%<autoload> \@autoerr\@badlinearg} + \@latex@error{% + Bad \protect\line\space or \protect\vector + \space argument}\@ehb} % \end{macrocode} % \end{macro} % @@ -719,8 +669,7 @@ Type H <return> for immediate help.}% % encountered in inner vertical mode. % \begin{macrocode} \gdef\@parmoderr{% -%<!autoload> \@latex@error{Not in outer par mode}\@ehb} -%<autoload> \@autoerr\@parmoderr} + \@latex@error{Not in outer par mode}\@ehb} % \end{macrocode} % \end{macro} % @@ -729,8 +678,7 @@ Type H <return> for immediate help.}% % are no more free boxes for storing floats. % \begin{macrocode} \gdef\@fltovf{% -%<!autoload> \@latex@error{Too many unprocessed floats}\@ehb} -%<autoload> \@autoerr\@fltovf} + \@latex@error{Too many unprocessed floats}\@ehb} % \end{macrocode} % \end{macro} % @@ -738,8 +686,7 @@ Type H <return> for immediate help.}% % Occurs in output routine. This is bad news. % \begin{macrocode} \gdef\@latexbug{% -%<!autoload> \@latex@error{This may be a LaTeX bug}{Call for help}} -%<autoload> \@autoerr\@latexbug} + \@latex@error{This may be a LaTeX bug}{Call for help}} % \end{macrocode} % \end{macro} % @@ -756,9 +703,8 @@ Type H <return> for immediate help.}% % vmode. Probably caused by a missing |\item|. % \begin{macrocode} \gdef\@noitemerr{% -%<!autoload> \@latex@error{Something's wrong--perhaps a missing % -%<!autoload> \protect\item}\@ehc} -%<autoload> \@autoerr\@noitemerr} + \@latex@error{Something's wrong--perhaps a missing % + \protect\item}\@ehc} % \end{macrocode} % \end{macro} % @@ -767,8 +713,7 @@ Type H <return> for immediate help.}% % appears after the command |\begin{document}|. % \begin{macrocode} \gdef\@notprerr{% -%<!autoload> \@latex@error{Can be used only in preamble}\@eha} -%<autoload> \@autoerr\@notprerr} + \@latex@error{Can be used only in preamble}\@eha} % \end{macrocode} % \end{macro} % @@ -782,8 +727,7 @@ Type H <return> for immediate help.}% \gdef\@inmatherr#1{% \relax \ifmmode -%<!autoload> \@latex@error{Command \protect#1 invalid in math mode}\@ehc -%<autoload> \@autoerr\@inmatherr#1% + \@latex@error{Command \protect#1 invalid in math mode}\@ehc \fi} % \end{macrocode} % \end{macro} @@ -797,6 +741,7 @@ Type H <return> for immediate help.}% % out, since we decided to use catcode 15 instead. % \begin{macrocode} %\def\@invalidchar{\@latex@error{Invalid character in input}\@ehc} +%</2ekernel> % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/base/ltfiles.dtx b/Master/texmf-dist/source/latex/base/ltfiles.dtx index 09cf8dec943..375fb273212 100644 --- a/Master/texmf-dist/source/latex/base/ltfiles.dtx +++ b/Master/texmf-dist/source/latex/base/ltfiles.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltfiles.dtx} - [1997/10/06 v1.1l LaTeX Kernel (File Handling)] + [2015/02/21 v1.1m LaTeX Kernel (File Handling)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfiles.dtx} @@ -48,18 +48,21 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{572} +% \CheckSum{568} % % \changes{v1.0h}{1994/05/21}{Use new error commands} % \changes{v1.0n}{1994/11/17} % {\cs{@tempa} to \cs{reserved@a}} % \changes{v1.0u}{1995/07/13}{Updates to docu} +% \changes{v1.1m}{2015/02/21} +% {Removed autoload support} % % \section{File Handling} % @@ -104,7 +107,7 @@ % \begin{oldcomments} % % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \message{files,} % \end{macrocode} % @@ -717,9 +720,6 @@ % \changes{v1.0w}{1995/10/06} % {Autoload error} % \begin{macrocode} -%<autoload>\def\@missingfileerror{\@autoerr\@missingfileerror} -%</2ekernel|autoload> -%<*2ekernel|autoerr> \gdef\@missingfileerror#1#2{% \typeout{^^J! LaTeX Error: File `#1.#2' not found.^^J^^J% Type X to quit or <RETURN> to proceed,^^J% @@ -742,8 +742,6 @@ {\filename@area\filename@base}{\filename@ext}}}% \reserved@a \fi} -%</2ekernel|autoerr> -%<*2ekernel|autoload> % \end{macrocode} % \end{macro} % @@ -854,7 +852,7 @@ % \end{macro} % % \begin{macrocode} -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/base/ltfinal.dtx b/Master/texmf-dist/source/latex/base/ltfinal.dtx index 614f4cb73cf..72b09cc8567 100644 --- a/Master/texmf-dist/source/latex/base/ltfinal.dtx +++ b/Master/texmf-dist/source/latex/base/ltfinal.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltfinal.dtx} - [2014/09/29 v1.1e LaTeX Kernel (Final Settings)] + [2015/03/26 v2.0e LaTeX Kernel (Final Settings)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfinal.dtx} @@ -48,13 +48,14 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{ltfinal.dtx} \end{document} %</driver> % \fi % -% \CheckSum{472} +% \CheckSum{558} % % \section{Final settings} % This section contains the final settings for \LaTeX. It initialises @@ -109,6 +110,75 @@ % \end{macro} % \end{macro} % \end{macro} +% +% +%\begin{macro}{\newmarks} +% \changes{v2.0a}{2014/12/30}{macro added} +% \changes{v2.0b}{2015/01/23}{use reserved count 256} +% Allocate extended marks types if etex is active. +% Placed here at the end of the format +% to increase compatibility with count allocations +% in earlier releases. +% \begin{macrocode} +%</2ekernel> +%<*2ekernel|latexrelease> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\newmarks}{Extended Allocation}% +% \end{macrocode} +% +% \begin{macrocode} +\ifx\marks\@undefined\else +\def\newmarks{% + \e@alloc\marks \e@alloc@chardef{\count256}\e@alloc@top\e@alloc@top} +\fi +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\newmarks}{Extended Allocation}% +%<latexrelease>\let\newmarks\@undefined +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> +% \end{macrocode} +% \end{macro} +% +%\begin{macro}{\newXeTeXintercharclass} +% \changes{v2.0a}{2014/12/30}{macro added} +% \changes{v2.0b}{2015/01/23}{use reserved count 257} +% Allocate |\XeTeXintercharclass| types if xetex is active. +% previously defined in |xetex.ini|. +% +% \begin{macrocode} +%</2ekernel> +%<*2ekernel|latexrelease> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\newXeTeXintercharclass}{Extended Allocation}% +% \end{macrocode} +% +% Classes allocatedfrom 4 (1,2 and 3 are used by CJK), up to 254. +% \begin{macrocode} +\ifx\XeTeXcharclass\@undefined +\else +\count257=\thr@@ +\def\newXeTeXintercharclass{% + \e@alloc\XeTeXcharclass\chardef{\count257}\@cclv\@cclv} +\fi +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\newXeTeXintercharclass}{Extended Allocation}% +%<latexrelease>\let\xe@alloc@intercharclass\@undefined +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> +% \end{macrocode} +% \end{macro} +% +% % The default values of the picture and |\fbox| parameters: % \begin{macrocode} \unitlength = 1pt @@ -140,7 +210,44 @@ % \end{macrocode} % % \subsection{Lccodes for hyphenation} -% +% +% \changes{v2.0a}{2015/01/03}{Unicode data loading added} +% \changes{v2.0c}{2015/01/24}{Skip T1-code entirely with Unicode engines} +% \changes{v2.0d}{2015/03/26}{Use renamed +% \texttt{unicode-letters.def}} +% For $7$- and $8$-bit engines the assumption of T1 encodings is the +% basis for the hyphenation patterns. That's not the case for the Unicode +% engines, where the assumption is engine-native working. The file +% |unicode-letters.def| contains data extracted from the +% master Unicode Consortium +% information covering not only |\lccode| but also other related data. The +% |\lccode| part of that at least needs to be loaded before hyphenation is +% tackled: Xe\TeX{} follows the standard \TeX{} route of building patterns +% into the format. Lua\TeX{} doesn't require this data be loaded \emph{here} +% but it does need to be loaded somewhere. Rather than test for the Unicode +% engines by name, the approach here is to look for the extended math mode +% handling both provide: any other engine developed in this area will +% presumably also provide |\Umathcode| (older Xe\TeX{} versions use +% |\XeTeXmathcode| so that is covered too). +% \begin{macrocode} +\ifnum 0% + \ifx\Umathcode\@undefined\else 1\fi + \ifx\XeTeXmathcode\@undefined\else 1\fi + >\z@ + \message{ Unicode character data,} + \input{unicode-letters.def} +% \end{macrocode} +% \changes{v2.0d}{2015/02/03}{Set \cs{lccode} for \texttt{-} with Unicode +% engines} +% There is one over-ride that makes sense here (see below for the same for +% $8$-bit engines): setting the lccode for |-| to itself. +% \begin{macrocode} + \lccode`\- =`\- % default hyphen char +% \end{macrocode} +% The alternative is that a ``traditional'' engine is in use. +% \begin{macrocode} +\else +% \end{macrocode} % \changes{v1.1b}{1998/05/20}{Set up lccodes before loading % hyphenation files: pr/2639} % We set things up so that hyphenation files can assume that the @@ -226,6 +333,21 @@ \lccode 23 =23 % textcompwordmark in T1 % \end{macrocode} % +% End of the conditional to select either Unicode or T1 encoding defaults. +% \begin{macrocode} +\fi +% \end{macrocode} +% +% This is as good a place as any to active a few Xe\TeX{}-specific +% settings +% \begin{macrocode} +\ifx\XeTeXuseglyphmetrics\@undefined +\else + \XeTeXuseglyphmetrics=1 % + \XeTeXdashbreakstate=1 % +\fi +% \end{macrocode} +% % \subsection{Hyphenation} % % \changes{v0.1a}{1994/03/07}{move code here from lhyphen.dtx} @@ -372,7 +494,16 @@ % this for non-ASCII characters. % \changes{v1.0n}{1994/06/09}{For \TeX2, do not set codes for higher % half of character table.} -% \begin{macrocode} +% \changes{v2.0a}{2015/01/03}{Skip resetting codes with Unicode engines} +% For the Unicode engines (Xe\TeX{} and Lua\TeX{}) there is no need to +% do any of this: they use hyphenation data which does not alter any +% of the set up and so this entire block is skipped. +% \begin{macrocode} +\ifnum 0% + \ifx\Umathcode\@undefined\else 1\fi + \ifx\XeTeXmathcode\@undefined\else 1\fi + >\z@ +\else \def\reserved@c#1{% \count@=#1\advance\count@ by -"20 \uccode#1=\count@ @@ -419,6 +550,7 @@ % {Added extra \cs{lcode}, hoping it does no harm in T1 (pr/1969)} % \begin{macrocode} \lccode`\^^[=`\^^[ % oe in OT1 +\fi % End of reset block for 8-bit engines % \end{macrocode} % % \begin{macro}{\MakeUppercase} diff --git a/Master/texmf-dist/source/latex/base/ltfloat.dtx b/Master/texmf-dist/source/latex/base/ltfloat.dtx index e9458651d03..88ed6cba08e 100644 --- a/Master/texmf-dist/source/latex/base/ltfloat.dtx +++ b/Master/texmf-dist/source/latex/base/ltfloat.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -31,7 +31,7 @@ % %<*driver> % \fi -\ProvidesFile{ltfloat.dtx}[2014/09/29 v1.1v LaTeX Kernel (Floats)] +\ProvidesFile{ltfloat.dtx}[2015/02/21 v1.2c LaTeX Kernel (Floats)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfloat.dtx} @@ -47,13 +47,14 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{636} +% \CheckSum{869} % % \section{Floats} % @@ -369,6 +370,10 @@ % \changes{v1.1p}{1996/10/24}{Added \cs{@nodocument} to trap % floats in the preamble} % \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\@xfloat}{Check float options}% +%<*2ekernel|latexrelease> \def\@xfloat #1[#2]{% \@nodocument \def \@captype {#1}% @@ -397,28 +402,35 @@ \expandafter \@tfor \expandafter \reserved@a \expandafter :\expandafter =\@fps \do +% \end{macrocode} +% \changes{v1.2b}{2015/01/11}{Check for valid option (latexrelease)} +% Start of changes, use a nested if structure, ending in an error. +% \begin{macrocode} {% \if \reserved@a h% \ifodd \@tempcnta \else \advance \@tempcnta \@ne \fi - \fi - \if \reserved@a t% + \else\if \reserved@a t% \@setfpsbit \tw@ - \fi - \if \reserved@a b% + \else\if \reserved@a b% \@setfpsbit 4% - \fi - \if \reserved@a p% + \else\if \reserved@a p% \@setfpsbit 8% - \fi - \if \reserved@a !% + \else\if \reserved@a !% \ifnum \@tempcnta>15 \advance\@tempcnta -\sixt@@n\relax \fi - \fi + \else + \@latex@error{Unknown float option `\reserved@a'}% + {Option `\reserved@a' ignored and `p' used.}% + \@setfpsbit 8% + \fi\fi\fi\fi\fi }% +% \end{macrocode} +% End of changes +% \begin{macrocode} \@tempcntb \csname ftype@\@captype \endcsname \multiply \@tempcntb \@xxxii \advance \@tempcnta \@tempcntb @@ -461,7 +473,78 @@ \hsize\columnwidth \@parboxrestore \@floatboxreset -} +}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\@xfloat}{Check float options}% +%<latexrelease>\def\@xfloat #1[#2]{% +%<latexrelease> \@nodocument +%<latexrelease> \def \@captype {#1}% +%<latexrelease> \def \@fps {#2}% +%<latexrelease> \@onelevel@sanitize \@fps +%<latexrelease> \def \reserved@b {!}% +%<latexrelease> \ifx \reserved@b \@fps +%<latexrelease> \@fpsadddefault +%<latexrelease> \else +%<latexrelease> \ifx \@fps \@empty +%<latexrelease> \@fpsadddefault +%<latexrelease> \fi +%<latexrelease> \fi +%<latexrelease> \ifhmode +%<latexrelease> \@bsphack +%<latexrelease> \@floatpenalty -\@Mii +%<latexrelease> \else +%<latexrelease> \@floatpenalty-\@Miii +%<latexrelease> \fi +%<latexrelease> \ifinner +%<latexrelease> \@parmoderr\@floatpenalty\z@ +%<latexrelease> \else +%<latexrelease> \@next\@currbox\@freelist +%<latexrelease> {% +%<latexrelease> \@tempcnta \sixt@@n +%<latexrelease> \expandafter \@tfor \expandafter \reserved@a +%<latexrelease> \expandafter :\expandafter =\@fps +%<latexrelease> \do +%<latexrelease> {% +%<latexrelease> \if \reserved@a h% +%<latexrelease> \ifodd \@tempcnta +%<latexrelease> \else +%<latexrelease> \advance \@tempcnta \@ne +%<latexrelease> \fi +%<latexrelease> \fi +%<latexrelease> \if \reserved@a t% +%<latexrelease> \@setfpsbit \tw@ +%<latexrelease> \fi +%<latexrelease> \if \reserved@a b% +%<latexrelease> \@setfpsbit 4% +%<latexrelease> \fi +%<latexrelease> \if \reserved@a p% +%<latexrelease> \@setfpsbit 8% +%<latexrelease> \fi +%<latexrelease> \if \reserved@a !% +%<latexrelease> \ifnum \@tempcnta>15 +%<latexrelease> \advance\@tempcnta -\sixt@@n\relax +%<latexrelease> \fi +%<latexrelease> \fi +%<latexrelease> }% +%<latexrelease> \@tempcntb \csname ftype@\@captype \endcsname +%<latexrelease> \multiply \@tempcntb \@xxxii +%<latexrelease> \advance \@tempcnta \@tempcntb +%<latexrelease> \global \count\@currbox \@tempcnta +%<latexrelease> }% +%<latexrelease> \@fltovf +%<latexrelease> \fi +%<latexrelease> \global \setbox\@currbox +%<latexrelease> \color@vbox +%<latexrelease> \normalcolor +%<latexrelease> \vbox \bgroup +%<latexrelease> \hsize\columnwidth +%<latexrelease> \@parboxrestore +%<latexrelease> \@floatboxreset +%<latexrelease>}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -560,26 +643,74 @@ % \changes{v1.0f}{1994/05/03}{\cs{@largefloatcheck} added} % \changes{v1.1n}{1995/10/25}{(CAR) unify code for double and % single versions} +% \changes{v1.2b}{2015/01/11}{float order in 2-column (latexrelease)} % \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\end@dblfloat}{float order in 2-column}% +%<*2ekernel|latexrelease> \def\end@dblfloat{% -\if@twocolumn - \@endfloatbox - \ifnum\@floatpenalty <\z@ + \if@twocolumn + \@endfloatbox + \ifnum\@floatpenalty <\z@ + \@largefloatcheck +% \end{macrocode} +% +% Force the depth of two column float boxes. +% \begin{macrocode} + \global\dp\@currbox1sp % +% \end{macrocode} +% What follows is essentially |\end@float| without a starting +% |\@endfloatbox|. +% \changes{v1.2b}{2000/09/24}{FMi: use output routine to +% defer float} +% \changes{v1.2b}{2014/04/27}{Inline the code to allow some +% coexistence with packages that hook into \cs{end@float} and do not +% know about the algorithm change} +% \begin{macrocode} + \@cons\@currlist\@currbox + \ifnum\@floatpenalty <-\@Mii + \penalty -\@Miv + \@tempdima\prevdepth + \vbox{}% + \prevdepth\@tempdima + \penalty\@floatpenalty + \else + \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack + \fi +% \end{macrocode} +% \changes{v1.2b}{2014/06/10}{missing \cs{fi} added} +% \begin{macrocode} + \fi + \else + \end@float + \fi +}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\end@dblfloat}{float order in 2-column}% +%<latexrelease>\def\end@dblfloat{% +%<latexrelease>\if@twocolumn +%<latexrelease> \@endfloatbox +%<latexrelease> \ifnum\@floatpenalty <\z@ % \end{macrocode} % We make sure that we never exceed |\textheight|, otherwise float % will never get typeset (91/03/15 FMi). % \begin{macrocode} - \@largefloatcheck - \@cons\@dbldeferlist\@currbox - \fi +%<latexrelease> \@largefloatcheck +%<latexrelease> \@cons\@dbldeferlist\@currbox +%<latexrelease> \fi % \end{macrocode} % RmS 92/03/18 changed |\@esphack| to |\@Esphack|. % \begin{macrocode} - \ifnum \@floatpenalty =-\@Mii \@Esphack\fi -\else - \end@float -\fi -} +%<latexrelease> \ifnum \@floatpenalty =-\@Mii \@Esphack\fi +%<latexrelease>\else +%<latexrelease> \end@float +%<latexrelease>\fi +%<latexrelease>}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -667,6 +798,7 @@ %\newcount\c@totalnumber % \end{macrocode} % +% \begin{macro}{\@dblfloatplacement} % An analysis of |\@floatplacement|: % % This should be called whenever |\@colht| has been set. @@ -679,7 +811,9 @@ \global\@colnum \c@totalnumber % Floatpage bit, local: \@fpmin \floatpagefraction\@colht} +%</2ekernel> % \end{macrocode} +% \end{macro} % % \begin{macro}{\@dblfloatplacement} % \changes{LaTeX2e}{1993/12/05}{Command changed} @@ -688,27 +822,59 @@ % provide extra checks in |\@addtodblcol|, needed when processing a % BANG float. % +% \changes{v1.2b}{2015/01/11}{float order in 2-column (latexrelease)} % \begin{macrocode} -\def \@dblfloatplacement {% +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\@dblfloatplacement}{float order in 2-column}% +%<*2ekernel|latexrelease> +% \end{macrocode} +% When making two column float area, look for floats with 1sp +% depth. +% \begin{macrocode} +\def\@dblfloatplacement{\global\@dbltopnum\c@dbltopnumber + \global\@dbltoproom \dbltopfraction\@colht + \@textmin \@colht + \advance \@textmin -\@dbltoproom + \@fpmin \dblfloatpagefraction\textheight + \@fptop \@dblfptop + \@fpsep \@dblfpsep + \@fpbot \@dblfpbot +% \end{macrocode} +% |\f@depth| is used in |\@testwrongwidth| to look for either +% column or dbl-column floats. A value of |1sp| signals the +% latter. Because of this setting here, |\@dblfloatplacment| needs to +% be called inside a group which is a questionable design. +% \begin{macrocode} + \def\f@depth{1sp}}% +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\@dblfloatplacement}{float order in 2-column}% +%<latexrelease>\def \@dblfloatplacement {% % \end{macrocode} % Textpage bit: global, but need not be. % \begin{macrocode} - \global \@dbltopnum \c@dbltopnumber - \global \@dbltoproom \dbltopfraction\@colht +%<latexrelease> \global \@dbltopnum \c@dbltopnumber +%<latexrelease> \global \@dbltoproom \dbltopfraction\@colht % \end{macrocode} % This new bit uses |\@textmin| to locally store the amount of extra % room in the column. % \begin{macrocode} - \@textmin \@colht - \advance \@textmin -\@dbltoproom +%<latexrelease> \@textmin \@colht +%<latexrelease> \advance \@textmin -\@dbltoproom % \end{macrocode} % Floatpage bit: must be local. % \begin{macrocode} - \@fpmin \dblfloatpagefraction\textheight - \@fptop \@dblfptop - \@fpsep \@dblfpsep - \@fpbot \@dblfpbot -} +%<latexrelease> \@fpmin \dblfloatpagefraction\textheight +%<latexrelease> \@fptop \@dblfptop +%<latexrelease> \@fpsep \@dblfpsep +%<latexrelease> \@fpbot \@dblfpbot +%<latexrelease>}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -1165,10 +1331,51 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\textsubscript} +% \changes{v1.2a}{2014/12/30}{Command added (latexrelease)} +% \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\textsubscript}{\textsubscript}% +%<*2ekernel|latexrelease> +% \end{macrocode} +% +% \begin{macrocode} +\DeclareRobustCommand*\textsubscript[1]{% + \@textsubscript{\selectfont#1}}% +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@textsubscript} +% \changes{v1.2a}{2014/12/30}{Command added (latexrelease)} +% +% \begin{macrocode} +\def\@textsubscript#1{% + {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}% +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\textsubscript}{\textsubscript}% +%<latexrelease>\let\textsubscript\@undefined +%<latexrelease>\let\@textsubscript\@undefined +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> +% \end{macrocode} +% +% \begin{macrocode} +\def\@textsubscript#1{% + {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}} +% \end{macrocode} +% % \begin{macro}{\footnotesep} % \begin{macrocode} \newdimen\footnotesep % \end{macrocode} +% % \end{macro} % % \begin{macro}{\footnote} diff --git a/Master/texmf-dist/source/latex/base/ltfntcmd.dtx b/Master/texmf-dist/source/latex/base/ltfntcmd.dtx index 012f8dfbc20..de612e00dc7 100644 --- a/Master/texmf-dist/source/latex/base/ltfntcmd.dtx +++ b/Master/texmf-dist/source/latex/base/ltfntcmd.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltfntcmd.dtx} - [2014/09/29 v3.4a LaTeX Kernel (Font commands)] + [2015/03/11 v3.4b LaTeX Kernel (Font commands)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfntcmd.dtx} @@ -40,7 +40,8 @@ \date{\filedate} \author{Frank Mittelbach, Chris Rowley} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> @@ -48,21 +49,21 @@ % % \CheckSum{258} % -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} % % \iffalse % Copyright (C) 1994-1995 Frank Mittelbach and Chris Rowley diff --git a/Master/texmf-dist/source/latex/base/ltfssbas.dtx b/Master/texmf-dist/source/latex/base/ltfssbas.dtx index 5766fb2a93f..502f22f6fda 100644 --- a/Master/texmf-dist/source/latex/base/ltfssbas.dtx +++ b/Master/texmf-dist/source/latex/base/ltfssbas.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -30,17 +30,12 @@ %%% From File: ltfssbas.dtx %% Copyright (C) 1989-2002 Frank Mittelbach and Rainer Sch\"opf % -%<def1>\ProvidesFile{autofss1.sty} -%<def1> [2002/10/02 v3.0x NFSS autoload file 1] -%<def2>\ProvidesFile{autofss2.sty} -%<def2> [2002/10/02 v3.0x NFSS autoload file 2] -% %<*driver> % \fi % % \ProvidesFile{ltfssbas.dtx} - [2014/09/29 v3.0x LaTeX Kernel (NFSS Basic Macros)] + [2015/04/07 v3.1a LaTeX Kernel (NFSS Basic Macros)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -56,7 +51,7 @@ %<+checkmem>\CHECKMEM % \fi % -% \CheckSum{1089} +% \CheckSum{1155} % % % \GetFileInfo{ltfssbas.dtx} @@ -67,6 +62,7 @@ % % \author{Frank Mittelbach \and Rainer Sch\"opf} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % This file contains the main implementation of the `low level' font @@ -152,18 +148,10 @@ % \cs{ifmmode} added in \cs{math@group}} % \changes{v2.1w}{1994/11/17} % {\cs{@tempa} to \cs{reserved@a}} +% \changes{v3.0z}{2015/02/21} +% {Removed autoload code} % % -% \section{Autoloading parts of NFSS} -% -% This code is set up in a way that some parts of it can be kept -% separate and will only be loaded if needed. -% -% If we are producing an autoload version of \LaTeXe{} then all those -% parts with \textsf{def1} or \textsf{def2} docstrip guards will be -% placed into the autoloadable files \texttt{autofss1.sty} and -% \texttt{autofss2.sty}. -% % The `2ekernel' code ensures that a |\usepackage{autofss1}| is % essentially ignored if a `full' format is being used that has % picture mode already in the format. @@ -174,9 +162,6 @@ %<2ekernel>\expandafter\let\csname ver@autofss1.sty\endcsname\fmtversion % \end{macrocode} % -% The autoload file \texttt{autofss2} is a specialty because it -% contains -% code which will be completely local, ie loaded every time again. % % \section{Preliminary macros} % @@ -188,10 +173,9 @@ % |\@nomath| is used by most macros that will have no effect % in math mode. It issues a warning message. % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def\@nomath#1{\relax\ifmmode \@font@warning{Command \noexpand#1invalid in math mode}\fi} -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % @@ -212,7 +196,6 @@ % The |\relax| at the beginning is necessary to prevent % \TeX{} from scanning too far in certain situations. % \begin{macrocode} -%<*2ekernel|def1> \gdef\no@alphabet@error#1{\relax \ifmmode \@latex@error{Math\space alphabet\space identifier\space \noexpand#1is\space undefined\space in\space math\space @@ -223,11 +206,6 @@ or\space use\space the\space \noexpand\SetMathAlphabet\space command.} \fi} -%</2ekernel|def1> -%<*autoload> -\gdef\no@alphabet@error{\relax \ifmmode - \expandafter\try@sizes\expandafter\no@alphabet@error \fi} -%</autoload> % \end{macrocode} % \end{macro} % @@ -248,11 +226,12 @@ % {(DPC) No need to redefine \cs{newfam} as not outer} % \changes{v3.0b}{1995/05/27} % {(FMi) But a need to define \cs{new@mathgroup}} +% \changes{v3.0y}{2014/12/30} +% {move allocation to ltplain.} % \begin{macrocode} -%<*2ekernel|autoload> -\def\new@mathgroup{\alloc@8\mathgroup\chardef\sixt@@n} +%\def\new@mathgroup{\alloc@8\mathgroup\chardef\sixt@@n} \let\mathgroup\fam -\let\newfam\new@mathgroup +%\let\newfam\new@mathgroup \@onlypreamble\new@mathgroup % \end{macrocode} % \end{macro} @@ -323,7 +302,6 @@ \global\expandafter\let\expandafter#1\the\font \endgroup } -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % @@ -333,7 +311,6 @@ % \begin{macro}{\do@subst@correction} % % \begin{macrocode} -%<*2ekernel|autoload> \def\do@subst@correction{% \xdef\subst@correction{% \font@name @@ -672,21 +649,55 @@ % % \begin{macro}{\@DeclareMathSizes} % \changes{v3.0p}{1996/07/26}{use faster \cs{if} test} +% This modification by Michael J. Downes on comp.text.tex on 2002/10/17 +% allows the user to have settings such as\\ +% |\DeclareMathSizes{9.5dd}{9.5dd}{7.4dd}{6.6dd}|. +% \changes{v3.0y}{2015/01/11}{Allow arbitrary units (latexrelease)} +% \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}{\@DeclareMathSizes}% +%<latexrelease> {Arbitrary units in \DeclareMathSizes}% +%<*2ekernel|latexrelease> +\def\@DeclareMathSizes #1#2#3#4#5{% + \@defaultunits\dimen@ #2pt\relax\@nnil + \if $#3$% + \expandafter\let\csname S@\strip@pt\dimen@\endcsname\math@fontsfalse + \else + \@defaultunits\dimen@ii #3pt\relax\@nnil + \@defaultunits\@tempdima #4pt\relax\@nnil + \@defaultunits\@tempdimb #5pt\relax\@nnil + \toks@{#1}% + \expandafter\xdef\csname S@\strip@pt\dimen@\endcsname{% + \gdef\noexpand\tf@size{\strip@pt\dimen@ii}% + \gdef\noexpand\sf@size{\strip@pt\@tempdima}% + \gdef\noexpand\ssf@size{\strip@pt\@tempdimb}% + \the\toks@ + }% + \fi +}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\@DeclareMathSizes}% +%<latexrelease> {Arbitrary units in \DeclareMathSizes}% +%<latexrelease>\def\@DeclareMathSizes#1#2#3#4#5{% +%<latexrelease> \@defaultunits\dimen@#2pt\relax\@nnil +%<latexrelease> \if$#3$% +%<latexrelease> \expandafter \let +%<latexrelease> \csname S@\strip@pt\dimen@\endcsname +%<latexrelease> \math@fontsfalse +%<latexrelease> \else +%<latexrelease> \expandafter \gdef +%<latexrelease> \csname S@\strip@pt\dimen@\endcsname +%<latexrelease> {\gdef\tf@size{#3}\gdef\sf@size{#4}% +%<latexrelease> \gdef\ssf@size{#5}% +%<latexrelease> #1% +%<latexrelease> }% +%<latexrelease> \fi}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> +% \end{macrocode} +% % \begin{macrocode} -\def\@DeclareMathSizes#1#2#3#4#5{% - \@defaultunits\dimen@#2pt\relax\@nnil - \if$#3$% - \expandafter \let - \csname S@\strip@pt\dimen@\endcsname - \math@fontsfalse - \else - \expandafter \gdef - \csname S@\strip@pt\dimen@\endcsname - {\gdef\tf@size{#3}\gdef\sf@size{#4}% - \gdef\ssf@size{#5}% - #1% - }% - \fi} \@onlypreamble\@DeclareMathSizes % \end{macrocode} % \end{macro} @@ -1088,7 +1099,6 @@ % \changes{v1.9a}{1992/07/26}{} % \begin{macrocode} \def\curr@fontshape{\f@encoding/\f@family/\f@series/\f@shape} -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % @@ -1096,7 +1106,6 @@ % Now we can tackle the problem of defining a new font. % \changes{v1.9a}{1992/07/26}{} % \begin{macrocode} -%<*2ekernel|def2|autoload> \def\define@newfont{% % \end{macrocode} % We have already mentioned that the \textsf{token} list that @@ -1156,62 +1165,10 @@ % |\escapechar| by closing the group. % \begin{macrocode} \endgroup} -%</2ekernel|def2|autoload> -% \end{macrocode} -% -% -% As |autofss2.sty| only makes local definitions it is re-loaded -% for each font, to save some string memory in the kernel, and to -% speed up the loading of some packages which may load fonts -% The code is actually pre-loaded into the kernel and removed -% at |\begin{document}|. The |\ifx| test below ensures that -% if |\usepackage{autofss2}| appears in the preamble, then the code -% is not removed at this time. Can not use |\AtBeginDocument| here -% as it is not defined yet! Listing all the commands like this -% is not ideal as any changes to the |autofss2.sty| need to be -% reflected here, but this seems the most memory efficient mechanism -% as it avoids the use of an extra csname to store the list. -% -% This is currently disabled, so the `autofss2' code remains -% in the kernel, and |autofss2.sty| is not generated in the current -% public release. -% \changes{v3.0l}{1995/10/26} -% {(DPC) disable autofss2 for now} -% \begin{macrocode} -%<*autoloadxxx> -\expandafter\def\expandafter\@begindocumenthook\expandafter{% - \expandafter\ifx\csname ver@autofss2.sty\endcsname\relax - \gdef\define@newfont{% - \begingroup - \makeatletter\nfss@catcodes - \catcode`\#6\relax - \@@input autofss2.sty\relax\define@newfont - \endgroup}% - \begingroup - \def\do##1{\global\let##1\@undefined}% - \do\extract@sizefn - \do\try@simple@size - \do\set@simple@size@args - \do\extract@rangefontinfo - \do\is@range - \do\check@range - \do\check@single - \do\set@size@funct@args - \do\set@size@funct@args@ - \do\try@size@range - \do\empty@sfcnt - \do\gen@sfcnt - \do\genb@sfcnt - \do\sub@sfcnt - \do\subf@sfcnt - \do\fixed@sfcnt - \endgroup - \fi} -%</autoloadxxx> -% \end{macrocode} -% -% \begin{macrocode} -%<*2ekernel|autoload> +% \end{macrocode} +% +% +% \begin{macrocode} \def\try@load@fontshape{% \expandafter \ifx\csname \f@encoding+\f@family\endcsname\relax @@ -1369,6 +1326,10 @@ % But if the defaults are set incorrectly one deserves nothing else! % \changes{v1.9a}{1992/07/26}{} % \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}{\wrong@fontshape}% +%<latexrelease> {Font substituation in preamble}% +%<*2ekernel|latexrelease> \def\wrong@fontshape{% \csname D@\f@encoding\endcsname % install defaults if in math % \end{macrocode} @@ -1398,10 +1359,23 @@ % If this is still undefined, try the default \emph{family}. % Otherwise give up. We never try to change the encoding scheme! % \changes{v1.9a}{1992/07/26}{} +% \changes{v3.1a}{2015/04/07}{Try loading fd file if family has changed} % \begin{macrocode} \expandafter \ifx\csname\curr@fontshape\endcsname\relax \let\f@family\default@family +% \end{macrocode} +% If we change the font family and we are in the preamble then the +% corresponding \texttt{.fd} file may not been loaded +% yet. Therefore we try this now. Otherwise equating the requested +% font shape with the finally selected fontshape below will fail +% and can result in ``NFSS tables corruped''. After begin document +% that will not happen as all \texttt{.fd} files involved in +% substituation are loaded at |\begin{document}|. +% \begin{macrocode} + \begingroup + \try@load@fontshape + \endgroup \fi \fi \fi % \end{macrocode} @@ -1473,6 +1447,40 @@ % the defaults are not well defined. % \begin{macrocode} \pickup@font} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\wrong@fontshape}% +%<latexrelease> {Font substituation in preamble}% +%<latexrelease>\def\wrong@fontshape{% +%<latexrelease> \csname D@\f@encoding\endcsname % install defaults if in math +%<latexrelease> \edef\reserved@a{\csname\curr@fontshape\endcsname}% +%<latexrelease> \ifx\last@fontshape\reserved@a +%<latexrelease> \errmessage{Corrupted NFSS tables}% +%<latexrelease> \error@fontshape +%<latexrelease> \else +%<latexrelease> \let\f@shape\default@shape +%<latexrelease> \expandafter\ifx\csname\curr@fontshape\endcsname\relax +%<latexrelease> \let\f@series\default@series +%<latexrelease> \expandafter +%<latexrelease> \ifx\csname\curr@fontshape\endcsname\relax +%<latexrelease> \let\f@family\default@family +%<latexrelease> \fi \fi +%<latexrelease> \fi +%<latexrelease> \@font@warning{Font shape `\expandafter\string\reserved@a' +%<latexrelease> \expandafter\@gobble\string\@undefined\MessageBreak +%<latexrelease> using `\curr@fontshape' instead\@wrong@font@char}% +%<latexrelease> \global\let\last@fontshape\reserved@a +%<latexrelease> \gdef\@defaultsubs{% +%<latexrelease> \@font@warning{Some font shapes were not available, defaults +%<latexrelease> substituted.\@gobbletwo}}% +%<latexrelease> \global\expandafter\expandafter\expandafter\let +%<latexrelease> \expandafter\reserved@a +%<latexrelease> \csname\curr@fontshape\endcsname +%<latexrelease> \xdef\font@name{% +%<latexrelease> \csname\curr@fontshape/\f@size\endcsname}% +%<latexrelease> \pickup@font} +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -1733,7 +1741,6 @@ % \begin{macrocode} \let\math@bgroup\bgroup \def\math@egroup#1{#1\egroup} -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % \end{macro} @@ -1745,7 +1752,6 @@ % a more elaborate interface % is under testing in mthscale.sty. % \begin{macrocode} -%<*2ekernel|def1> \gdef\calculate@math@sizes{% \@font@info{Calculating\space math\space sizes\space for\space size\space <\f@size>}% @@ -1757,10 +1763,6 @@ \gdef\noexpand\sf@size{\strip@pt\@tempdimb}% \gdef\noexpand\ssf@size{\strip@pt\dimen@}% \noexpand\math@fontstrue}} -%</2ekernel|def1> -%<*autoload> -\def\calculate@math@sizes{\try@sizes\calculate@math@sizes} -%</autoload> % \end{macrocode} % \end{macro} % @@ -1773,7 +1775,6 @@ % 1 to |\defaultscriptratio| to |\defaultscriptscriptratio|.\\ % By default this is 1 to .7 to .5. % \begin{macrocode} -%<*2ekernel|autoload> \def\defaultscriptratio{.7} \def\defaultscriptscriptratio{.5} % \end{macrocode} @@ -1801,8 +1802,6 @@ % \texttt{plain.tex} uses |\tenrm|. We have also made some further % adjustments for its use in \LaTeX. % \begin{macrocode} -%</2ekernel|autoload> -%<*2ekernel|autoerr> \gdef\showhyphens#1{% \setbox0\vbox{% \color@begingroup @@ -1811,9 +1810,6 @@ \normalfont \pretolerance\m@ne\tolerance\m@ne\hbadness\z@\showboxdepth\z@\ #1% \color@endgroup}} -%</2ekernel|autoerr> -%<autoload>\def\showhyphens{\@autoerr\showhyphens} -%<*2ekernel|autoload> % \end{macrocode} % \end{macro} % @@ -1903,7 +1899,7 @@ % \end{macro} % % \begin{macrocode} -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % % \Finale diff --git a/Master/texmf-dist/source/latex/base/ltfsscmp.dtx b/Master/texmf-dist/source/latex/base/ltfsscmp.dtx index 6600111aca1..755a8837b6e 100644 --- a/Master/texmf-dist/source/latex/base/ltfsscmp.dtx +++ b/Master/texmf-dist/source/latex/base/ltfsscmp.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -36,7 +36,7 @@ % % \ProvidesFile{ltfsscmp.dtx} - [1995/08/26 v3.0c LaTeX Kernel (NFSS1 Compatibility)] + [2015/02/22 v3.0e LaTeX Kernel (NFSS1 Compatibility)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -52,7 +52,7 @@ %<+checkmem>\CHECKMEM % \fi % -% \CheckSum{235} +% \CheckSum{259} % % % \GetFileInfo{ltfsscmp.dtx} @@ -63,6 +63,7 @@ % % \author{Frank Mittelbach \and Rainer Sch\"opf} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % This file contains the implementation of commands giving @@ -72,10 +73,16 @@ % \begin{quote} % \textbf{Warning:} % The macro documentation is still basically the documentation from the -% first NFSS release and therefore in some cases probably not +% first NFSS release and therefore in some cases probably not % completely accurate. % \end{quote} % +% Version 1 of NFSS is obsolete now for about 20 years (and was +% ``current'' only for a short intermediate time) so with the 2015 +% release these internal interface commands are removed from the +% kernel and made available via \textsf{latexrelease} package so that +% backward compatibility remains ensured for very old documents. +% % \StopEventually{} % % @@ -83,78 +90,42 @@ % {(DPC) minor documentation edits} % \changes{v3.0a}{1995/05/24} % {(DPC) Make file from previous file, fam.dtx 1995/05/20 v2.2d} +% \changes{v3.0d}{2015/02/21} +% {Removed autoload code} +% \changes{v3.0e}{2015/02/22} +% {Moved all code into latexrelease - obsolete commands are no +% longer automatically part of the kernel} % % -% -% \section{Compatibility code for NFSS release 1} -% -% There have been a couple of commands which became obsolete with NFSS2. -% In the past they have been still part of the kernel code to make it -% possible to process old packages using those commands but since they -% take up valuable space we decided to remove them and instead -% auto-load their definitions if they are actually encountered in some -% file. -% -% Thus the following code doesn't really belong to this file but I put -% it here for the moment until finally a documented version of -% \texttt{ltfss.dtx} is available. -% -% [ auto-loading not activated ] -% -% \begin{macro}{\new@fontshape} -% \begin{macro}{\subst@fontshape} -% \begin{macro}{\extra@def} -% \begin{macro}{\default@mextra} -% \begin{macro}{\define@mathalphabet} -% \begin{macro}{\define@mathgroup} -% These macros are the interfaces in NFSS1 which shouldn't be used -% any longer. We all define them to call the macro -% |\scan@fontshape| which is an internal macro that loads the real -% definitions and then to execute themselves again. Once this -% auto-loading has happened they have the definition shown below and -% thus execute their real code directly. % \begin{macrocode} -%<*autoload> -\def\new@fontshape{\scan@fontshape\new@fontshape} -\def\subst@fontshape{\scan@fontshape\subst@fontshape} -\def\extra@def{\scan@fontshape\extra@def} -\def\default@mextra{\scan@fontshape\default@mextra} -\def\define@mathalphabet{\scan@fontshape\define@mathalphabet} -\def\define@mathgroup{\scan@fontshape\define@mathgroup} +%<*latexrelease> +\IncludeInRelease{2015/01/01}{\new@fontshape}% + {NFSS version1 commands}% +\let\new@fontshape\@undefined +\let\warn@rel@i\@undefined +\let\scan@fontshape\@undefined +\let\scan@@fontshape\@undefined +\let\subst@fontshape\@undefined +\let\extra@def\@undefined +\let\default@mextra\@undefined +\let\preload@sizes\@undefined +\let\err@rel@i\@undefined +\let\newmathalphabet\@undefined +\let\newmathalphabet@\@undefined +\let\newmathalphabet@@@\@undefined +\let\if@no@font@opt\@undefined +\let\@no@font@optfalse\@undefined +\let\define@mathalphabet\@undefined +\let\define@mathgroup\@undefined +\let\addtoversion\@undefined +\EndIncludeInRelease % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% -% -% \begin{macro}{\scan@fontshape} -% Here is the kernel definition for |\scan@fontshape| which loads -% the actual definitions from the file \texttt{nfsscmp.def}. -% \begin{macrocode} -\def\scan@fontshape{\input{nfsscmp.def}} -% \end{macrocode} -% \end{macro} % +% In older releases we provide the original definitions. % -% The following definitions are now placed into the auto-load file. % \begin{macrocode} -% \end{macrocode} -% -% Since we don't know when this file will be read in we need to -% provide ourselves with standard |\catcode| settings. This is done -% by placing all definitions in a group and calling -% |\nfss@catcodes|. But this macro will also disable spaces which -% isn't very appropriate for the following code because it contains -% a lot of helper messages. Therefore we change this back. -% \begin{macrocode} -\begingroup -\nfss@catcodes -\catcode`\ =10\relax -%</autoload> -%<*compat> +\IncludeInRelease{2014/05/01}{\new@fontshape}% + {NFSS version1 commands}% % \end{macrocode} % % \begin{macro}{\new@fontshape} @@ -163,7 +134,7 @@ \gdef\new@fontshape#1#2#3#4{% \warn@rel@i\new@fontshape\DeclareFontShape \expandafter\scan@fontshape\@gobble#4<\@nil><<% - \DeclareFontShape U{#1}{#2}{#3}\reserved@f} + \DeclareFontShape U{#1}{#2}{#3}\reserved@f}% \@onlypreamble\new@fontshape % \end{macrocode} % \end{macro} @@ -178,7 +149,7 @@ *** Update by using release 2 command \string#2.\MessageBreak *** Recovery is probably possible}% -} +}% \@onlypreamble\warn@rel@i % \end{macrocode} % \end{macro} @@ -192,7 +163,7 @@ \let\reserved@f\@empty \let\reserved@e\@empty % holds last info \scan@@fontshape -} +}% \@onlypreamble\scan@fontshape % \end{macrocode} % \end{macro} @@ -240,7 +211,7 @@ \fi \expandafter\scan@@fontshape \fi -} +}% \@onlypreamble\scan@@fontshape % \end{macrocode} % \end{macro} @@ -253,7 +224,7 @@ % \begin{macrocode} \gdef\subst@fontshape#1#2#3#4#5#6{% \warn@rel@i\subst@fontshape\DeclareFontShape - \DeclareFontShape{U}{#1}{#2}{#3}{<->sub*#4/#5/#6}{}} + \DeclareFontShape{U}{#1}{#2}{#3}{<->sub*#4/#5/#6}{}}% \@onlypreamble\subst@fontshape % \end{macrocode} % \end{macro} @@ -266,7 +237,7 @@ \gdef\extra@def#1#2#3{% \warn@rel@i\extra@def\DeclareFontFamily \DeclareFontFamily{U}{#1}{}% -} +}% \@onlypreamble\extra@def % \end{macrocode} % \end{macro} @@ -285,7 +256,7 @@ % the second argument of |\DeclareFontEncodingDefaults|. % \begin{macrocode} \DeclareFontEncodingDefaults\relax -} +}% \@onlypreamble\default@mextra % \end{macrocode} % \end{macro} @@ -298,7 +269,7 @@ \gdef\preload@sizes{% \warn@rel@i\preload@sizes\DeclarePreloadSizes \DeclarePreloadSizes U% -} +}% \@onlypreamble\preload@sizes % \end{macrocode} % \end{macro} @@ -319,7 +290,7 @@ % Let's die. % \begin{macrocode} \batchmode\input.\relax -} +}% \@onlypreamble\err@rel@i % \end{macrocode} % \end{macro} @@ -344,10 +315,10 @@ \warn@rel@i\newmathalphabet\DeclareMathAlphabet \fi \@ifstar\newmathalphabet@@@ - \newmathalphabet@@} -\gdef\newmathalphabet@@#1{\DeclareMathAlphabet#1{U}{}{}{}} + \newmathalphabet@@}% +\gdef\newmathalphabet@@#1{\DeclareMathAlphabet#1{U}{}{}{}}% \gdef\newmathalphabet@@@#1#2#3#4{% - \DeclareMathAlphabet{#1}{U}{#2}{#3}{#4}} + \DeclareMathAlphabet{#1}{U}{#2}{#3}{#4}}% \@onlypreamble\newmathalphabet \@onlypreamble\newmathalphabet@@ \@onlypreamble\newmathalphabet@@@ @@ -360,7 +331,7 @@ % \begin{macro}{\@no@font@optfalse} % \begin{macrocode} \global\let\if@no@font@opt\iftrue -\gdef\@no@font@optfalse{\let\if@no@font@opt\iffalse} +\gdef\@no@font@optfalse{\let\if@no@font@opt\iffalse}% % \end{macrocode} % \end{macro} % \end{macro} @@ -370,7 +341,7 @@ % \begin{macrocode} \gdef\define@mathalphabet{% \err@rel@i\define@mathalphabet\DeclareMathAlphabet -} +}% \@onlypreamble\define@mathalphabet % \end{macrocode} % \end{macro} @@ -383,31 +354,25 @@ % \begin{macrocode} \gdef\define@mathgroup{% \err@rel@i\define@mathgroup\DeclareSymbolFont -} +}% \@onlypreamble\define@mathgroup -%</compat> % \end{macrocode} % \end{macro} % -% % \begin{macro}{\addtoversion} % |\addtoversion| is the old form. % \begin{macrocode} \def\addtoversion#1#2{% \warn@rel@i\addtoversion\SetMathAlphabet - \SetMathAlphabet#2{#1}{U}} + \SetMathAlphabet#2{#1}{U}}% \@onlypreamble\addtoversion % \end{macrocode} % \end{macro} % -% -% -% That finishes the definitions for the old interfaces --- but first -% we better finish the group. +% Finishing off this huge |\IncludeInRelease| argument: % \begin{macrocode} -%<*autoload> -\endgroup -%</autoload> +\EndIncludeInRelease +%</latexrelease> % \end{macrocode} % % \Finale diff --git a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx index 223d90ce3dd..5d5ee12b8cf 100644 --- a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx +++ b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -36,7 +36,7 @@ % % \ProvidesFile{ltfssdcl.dtx} - [2014/09/29 v3.0o LaTeX Kernel (NFSS Declarative Interface)] + [2015/03/18 v3.0q LaTeX Kernel (NFSS Declarative Interface)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -52,7 +52,7 @@ %<+checkmem>\CHECKMEM % \fi % -% \CheckSum{1885} +% \CheckSum{1887} % % % \GetFileInfo{ltfssdcl.dtx} @@ -63,6 +63,7 @@ % % \author{Frank Mittelbach \and Rainer Sch\"opf} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % This file contains the main implementation of the font selection @@ -87,6 +88,8 @@ % {(DPC) minor documentation changes} % \changes{v3.0a}{1995/05/24} % {(DPC) Make file from previous file, latint.dtx 1995/05/21 v2.1t} +% \changes{v3.0p}{2015/02/21} +% {Removed autoload code} % % % \changes{v2.1o}{1994/11/22} @@ -119,7 +122,7 @@ % contain braces nor |#| (more precisely, tokens of category % code 1,~2, or~6). % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def\in@#1#2% {% \begingroup @@ -330,12 +333,13 @@ % \changes{v3.0g}{1997/11/20} % {(DPC) inline use of \cs{stepcounter} (faster, and saves a csname % per math version as no reset list)} +% \changes{v3.0q}{2015/03/18}{Introduce \cs{e@mathgroup@top}} % \begin{macrocode} \def\select@group#1#2#3#4{% \ifx\math@bgroup\bgroup\else\relax\expandafter\@firstofone\fi {% \ifmmode - \ifnum\csname c@mv@\math@version\endcsname<\sixt@@n + \ifnum\csname c@mv@\math@version\endcsname<\e@mathgroup@top \begingroup \escapechar\m@ne \getanddefine@fonts{\csname c@mv@\math@version\endcsname}#3% @@ -381,17 +385,12 @@ % \changes{v3.0j}{2005/07/27} % {(MH) Change because command is now properly robust} % \begin{macrocode} -%</2ekernel|autoload> -%<*2ekernel|autoerr> \gdef\non@alpherr#1{\@latex@error{% % \end{macrocode} % The command here will have a space at the end of its name, so we make % sure not to insert an extra one. % \begin{macrocode} \string#1allowed only in math mode}\@ehd} -%</2ekernel|autoerr> -%<autoload>\def\non@alpherr{\@autoerr\non@alpherr} -%<*2ekernel|autoload> % \end{macrocode} % \end{macro} % @@ -426,12 +425,13 @@ % \changes{v3.0g}{1997/11/20} % {(DPC) inline use of \cs{stepcounter} (faster, and saves a csname % per math version as no reset list)} +% \changes{v3.0q}{2015/03/18}{Introduce \cs{e@mathgroup@top}} % \begin{macrocode} \def\document@select@group#1#2#3#4{% \ifx\math@bgroup\bgroup\else\relax\expandafter\@firstofone\fi {% \ifmmode - \ifnum\csname c@mv@\math@version\endcsname<\sixt@@n + \ifnum\csname c@mv@\math@version\endcsname<\e@mathgroup@top \begingroup \escapechar\m@ne \getanddefine@fonts{\csname c@mv@\math@version\endcsname}#3% @@ -613,10 +613,16 @@ \@ifundefined{sym#1}{% % \end{macrocode} % +% \changes{v3.0q}{2015/03/18}{Restrict Symbol fonts to 0-15} % \begin{macrocode} - \expandafter\new@mathgroup\csname sym#1\endcsname - \expandafter\new@symbolfont\csname sym#1\endcsname - {#2}{#3}{#4}{#5}}% + \ifnum\count18<15 % + \expandafter\new@mathgroup\csname sym#1\endcsname + \expandafter\new@symbolfont\csname sym#1\endcsname + {#2}{#3}{#4}{#5}% + \else + \@latex@error{Too many symbol fonts declared}\@eha + \fi + }% {% % \end{macrocode} % @@ -1538,7 +1544,7 @@ \fi } \@onlypreamble\DeclareSymbolFontAlphabet@ -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/base/ltfssini.dtx b/Master/texmf-dist/source/latex/base/ltfssini.dtx index aa89af6432f..9db6199988c 100644 --- a/Master/texmf-dist/source/latex/base/ltfssini.dtx +++ b/Master/texmf-dist/source/latex/base/ltfssini.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -36,7 +36,7 @@ % % \ProvidesFile{ltfssini.dtx} - [2014/09/29 v3.0k LaTeX Kernel (NFSS Initialisation)] + [2015/01/09 v3.1a LaTeX Kernel (NFSS Initialisation)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -52,7 +52,7 @@ %<+checkmem>\CHECKMEM % \fi % -% \CheckSum{298} +% \CheckSum{325} % % % \GetFileInfo{ltfssini.dtx} @@ -63,6 +63,7 @@ % % \author{Frank Mittelbach \and Rainer Sch\"opf} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % This file contains the top level \LaTeX\ interface to the font @@ -138,6 +139,9 @@ % \changes{v2.1i}{1994/05/12}{Moved \cs{selectfont} to tracefnt.dtx} % % +% \begin{macrocode} +%<*2ekernel> +% \end{macrocode} % % \subsection{Providing math \emph{versions}} % @@ -191,16 +195,38 @@ % % % +% \begin{macro}{\em} +% \changes{v1.2b}{1990/01/28}{Call to \cs{@nomath} added.} +% \changes{v3.1a}{2015/01/09}{Allow \cs{emph} to produce small caps (latexrelease)} +% \begin{macro}{\eminnershape} +% \changes{v3.1a}{2015/01/09}{macro added (latexrelease)} % We also have to define the {\em emphasize\/} font change command % (i.e.\ |\em|). This command will look is the current font is % sloped (i.e.\ has a positive |\fontdimen1|) and will then % select either |\upshape| or |\itshape|. -% \changes{v1.2b}{1990/01/28}{Call to \cs{@nomath} added.} % \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}{\eminnershape}{\eminnershape}% +%<*2ekernel|latexrelease> \DeclareRobustCommand\em {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \upshape \else \itshape \fi} + \eminnershape \else \itshape \fi}% +% \end{macrocode} +% +% \begin{macrocode} +\def\eminnershape{\upshape}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\eminnershape}{\eminnershape}% +%<latexrelease>\DeclareRobustCommand\em +%<latexrelease> {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ +%<latexrelease> \upshape \else \itshape \fi}% +%<latexrelease>\let\eminnershape\@undefined +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} +% \end{macro} +% \end{macro} % % % \begin{macro}{\not@math@alphabet} @@ -579,5 +605,9 @@ %<+checkmem>\CHECKMEM % \fi % +% \begin{macrocode} +%</2ekernel> +% \end{macrocode} +% % \Finale % diff --git a/Master/texmf-dist/source/latex/base/ltfsstrc.dtx b/Master/texmf-dist/source/latex/base/ltfsstrc.dtx index 4e57e28fc30..69fa94a34ff 100644 --- a/Master/texmf-dist/source/latex/base/ltfsstrc.dtx +++ b/Master/texmf-dist/source/latex/base/ltfsstrc.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -34,16 +34,16 @@ % %<package>\NeedsTeXFormat{LaTeX2e}[1995/05/16] %<package>\ProvidesPackage{tracefnt} -%<package> [2014/09/29 v3.0j Standard LaTeX package (font tracing)] +%<package> [2015/02/21 v3.0k Standard LaTeX package (font tracing)] % \fi % \ProvidesFile{ltfsstrc.dtx} -% [2014/09/29 v3.0j LaTeX Kernel (NFSS tracing)] +% [2015/02/21 v3.0k LaTeX Kernel (NFSS tracing)] % % \iffalse %<+checkmem>\CHECKMEM % \fi % -% \CheckSum{1041} +% \CheckSum{1034} % % % @@ -59,6 +59,8 @@ % {(DPC) Fix \cs{ProvidesFile} usage} % \changes{v3.0a}{1995/05/24} % {(DPC) Make file from previous file, tracefnt 1995/05/16 v2.3o} +% \changes{v3.0k}{2015/02/21} +% {Removed autoload code} % % \changes{v2.3m}{1994/11/18} % {\cs{next} to \cs{reserved@f}} @@ -97,6 +99,7 @@ % \author{Frank Mittelbach \and Rainer Sch\"opf} % % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \section{Introduction} @@ -209,13 +212,13 @@ % \changes{v1.0o}{1990/04/01} % {Check if \cs{tracingfonts} defined removed again.} % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def\tracingfonts{% \@font@warning{Command \noexpand\tracingfonts not provided.\MessageBreak Use the `tracefnt' package.\MessageBreak Command found:}% \count@} -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % The |\count@| in the line above will remove the number after % |\tracingfonts|. Note that this definition will be overwritten be @@ -308,14 +311,14 @@ % % We also need a default definition inside the kernel: % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def\@font@info#1{% \GenericInfo{(Font)\@spaces\@spaces\@spaces\space\space}% {LaTeX Font Info: \space\space\space#1}}% \def\@font@warning#1{% \GenericWarning{(Font)\@spaces\@spaces\@spaces\space\space}% {LaTeX Font Warning: #1}}% -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % % @@ -343,7 +346,7 @@ % font file (the \texttt{.tfm}) as it was determined by the NFSS % tables. % \begin{macrocode} -%<*2ekernel|package|autoload> +%<*2ekernel|package> \def\extract@font{% \get@external@font % \end{macrocode} @@ -375,7 +378,7 @@ \csname\curr@fontshape\endcsname \relax } -%</2ekernel|package|autoload> +%</2ekernel|package> % \end{macrocode} % The |\relax| at the end needs to be explained. % This is inserted to prevent \TeX{} from scanning too far @@ -390,7 +393,7 @@ % |\external@font|. If no font is found it will return the one % that was defined via |\DeclareErrorFont|. % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def\get@external@font{% % \end{macrocode} % We don't know the external font name at the beginning. @@ -414,7 +417,7 @@ \get@external@font \fi\fi } -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % @@ -430,7 +433,7 @@ % The macro |\selectfont| is called whenever a font change must % take place. % \begin{macrocode} -%<*2ekernel|package|autoload> +%<*2ekernel|package> \DeclareRobustCommand\selectfont {% % \end{macrocode} @@ -691,7 +694,7 @@ %</trace> \fi } -%</2ekernel|package|autoload> +%</2ekernel|package> % \end{macrocode} % \end{macro} % \end{macro} @@ -703,7 +706,7 @@ % a factor when assigning a value to |\baselineskip|. % We use 1 as a default (i.e.\ no stretch). % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def\baselinestretch{1} % \end{macrocode} % \end{macro} @@ -718,7 +721,7 @@ % \begin{macrocode} \newtoks\every@math@size \every@math@size={} -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % @@ -803,7 +806,7 @@ % \ref{it:everymath} to \ref{it:everymathend} except that instead % of a switch the macro |\init@restore@glb@settings| is used. % \begin{macrocode} -%<*2ekernel|package|autoload> +%<*2ekernel|package> \def\check@mathfonts{% \ifx \glb@currsize \f@size %<*trace> @@ -1031,7 +1034,7 @@ % \begin{macrocode} %<+debug> \poptracing } -%</2ekernel|package|autoload> +%</2ekernel|package> % \end{macrocode} % \end{macro} % @@ -1046,7 +1049,7 @@ % reproduces it argument. % \changes{v2.3n}{1995/05/08}{Use \cs{@firstofone}} % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def\ifnot@nil#1{\def\reserved@a{#1}% \ifx\reserved@a\@nnil \expandafter\@gobble \else \expandafter\@firstofone\fi} @@ -1066,7 +1069,6 @@ \def\remove@to@nnil#1\@nnil{} \def\remove@angles#1>{\set@simple@size@args} \def\remove@star#1*{#1} -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % \end{macro} @@ -1077,7 +1079,6 @@ % This macro takes a size specification and parses it into size % function and the optional and mandatory arguments. % \begin{macrocode} -%<*2ekernel|def2|autoload> \def\extract@sizefn#1*#2\@nil{% \if>#2>\set@size@funct@args#1\@nil \let\sizefn@info\@empty @@ -1342,7 +1343,6 @@ \fi \fi \reserved@f}} -%</2ekernel|def2|autoload> % \end{macrocode} % \end{macro} % @@ -1351,10 +1351,8 @@ % We use two dimen registers |\lower@bound| and |\upper@bound| % to store the lower and upper endpoints of the range we found. % \begin{macrocode} -%<*2ekernel|autoload> \newdimen\lower@bound \newdimen\upper@bound -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % \end{macro} @@ -1366,7 +1364,6 @@ % that there is always something in the pipeline since the very % last entry is a faked range (see above). % \begin{macrocode} -%<*2ekernel|def2|autoload> \def\check@single#1>#2<#3\@nnil{% % \end{macrocode} % We start by assuming that @@ -1415,7 +1412,7 @@ \def\set@size@funct@args@[#1]#2\@nil{% \def\mandatory@arg{#2}% \def\optional@arg{#1}} -%</2ekernel|def2|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % \end{macro} @@ -1428,10 +1425,10 @@ % mandatory argument that may follow the size specification |<...>|. % \changes{v2.1c}{1993/03/18}{Added all args to avoid blanks problems} % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def\DeclareSizeFunction#1#2{\@namedef{s@fct@#1}{#2}} \@onlypreamble\DeclareSizeFunction -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % @@ -1441,8 +1438,8 @@ % is that calling an undefined size function will do nothing % (actually execute a |\relax|). % \begin{macrocode} -%<*2ekernel|package|autoload> -\def\execute@size@function#1{% %%% could be added to autoload as well +%<*2ekernel|package> +\def\execute@size@function#1{% %<*trace> \@ifundefined{s@fct@#1}% {\errmessage{Undefined font size function #1}% @@ -1451,7 +1448,7 @@ %</trace> %<-trace> \csname s@fct@#1\endcsname } -%</2ekernel|package|autoload> +%</2ekernel|package> % \end{macrocode} % \end{macro} % @@ -1467,11 +1464,10 @@ % Note the |<-*\@nil><| token at the end to stop scanning. % \changes{v2.0b}{1992/07/26}{} % \begin{macrocode} -%<*2ekernel|def2|autoload> +%<*2ekernel> \def\try@size@range{% \expandafter\extract@rangefontinfo\font@info <-*>\@nil<\@nnil } -%</2ekernel|def2|autoload> % \end{macrocode} % \end{macro} % @@ -1483,7 +1479,6 @@ % of the ranges the whole list of size specifications is searched for % a nearby simple size. % \begin{macrocode} -%<*2ekernel|def1> \gdef\try@size@substitution{% % \end{macrocode} % First we do some initializations. |\@tempdimb| @@ -1499,10 +1494,6 @@ % \begin{macrocode} \expandafter \try@simples \font@info <\number\@M>\@nil<\@nnil } -%</2ekernel|def1> -%<*autoload> -\def\try@size@substitution{\try@simples\try@size@substitution} -%</autoload> % \end{macrocode} % \end{macro} % @@ -1517,10 +1508,9 @@ % |\fontsubfuzz| contains the amount that will not cause terminal % warnings (warnings still go into the transcript file). % \begin{macrocode} -%<*2ekernel|autoload> \def\font@submax{0pt} \def\fontsubfuzz{.4pt} -%</2ekernel|autoload> +%</2ekernel> %<+package>\def\fontsubfuzz{0pt} % \end{macrocode} % \end{macro} @@ -1535,13 +1525,9 @@ % It looks for simple sizes to determine the two closest sizes. % It is assumed that simple sizes are in increasing order. % \begin{macrocode} -%<*2ekernel|def1> +%<*2ekernel> \gdef\try@simples#1<#2>{% \tryif@simple#2->\tryif@simple} -%</2ekernel|def1> -%<*autoload> -\def\try@simples{\@autoload{fss1}} -%</autoload> % \end{macrocode} % \end{macro} % @@ -1557,7 +1543,6 @@ % First it checks whether it is finished already, then whether the % size specification in question is a simple one. % \begin{macrocode} -%<*2ekernel|def1> \gdef\tryif@simple#1-#2\tryif@simple{% % \end{macrocode} % Most common case for |\reserved@f| first: @@ -1646,7 +1631,6 @@ % If it's a range iterate also. % \begin{macrocode} \reserved@f} -%</2ekernel|def1> % \end{macrocode} % \end{macro} % @@ -1665,14 +1649,11 @@ % |\f@size| multiplied by the optional argument otherwise. % \changes{v2.0b}{1992/07/26}{} % \begin{macrocode} -%<*2ekernel|autoload> \DeclareSizeFunction{}{\empty@sfcnt\@font@warning} \DeclareSizeFunction{s}{\empty@sfcnt\@font@info} -%</2ekernel|autoload> % \end{macrocode} % % \begin{macrocode} -%<*2ekernel|def2|autoload> \def\empty@sfcnt#1{% \@tempdimb \f@size\p@ \ifx\optional@arg\@empty @@ -1683,7 +1664,6 @@ scaled\space to\space size\space \the\@tempdimb}% \fi \edef\external@font{\mandatory@arg\space at\the\@tempdimb}} -%</2ekernel|def2|autoload> % \end{macrocode} % \end{macro} % @@ -1698,18 +1678,14 @@ % if no optional argument is present, and to |\f@size| multiplied % by the optional argument otherwise. % \begin{macrocode} -%<*2ekernel|autoload> \DeclareSizeFunction{gen}{\gen@sfcnt\@font@warning} \DeclareSizeFunction{sgen}{\gen@sfcnt\@font@info} -%</2ekernel|autoload> % \end{macrocode} % % \begin{macrocode} -%<*2ekernel|def2|autoload> \def\gen@sfcnt{% \edef\mandatory@arg{\mandatory@arg\f@size}% \empty@sfcnt} -%</2ekernel|def2|autoload> % \end{macrocode} % \end{macro} % \end{macro} @@ -1724,18 +1700,14 @@ % if no optional argument is present, and to |\f@size| multiplied % by the optional argument otherwise. % \begin{macrocode} -%<*2ekernel|autoload> \DeclareSizeFunction{genb}{\genb@sfcnt\@font@warning} \DeclareSizeFunction{sgenb}{\genb@sfcnt\@font@info} -%</2ekernel|autoload> % \end{macrocode} % % \begin{macrocode} -%<*2ekernel|def2|autoload> \def\genb@sfcnt{% \edef\mandatory@arg{\mandatory@arg\expandafter\genb@x\f@size..\@@}% \empty@sfcnt} -%</2ekernel|def2|autoload> % \end{macrocode} % \end{macro} % \end{macro} @@ -1746,10 +1718,8 @@ % The auxiliary macros |\genb@x| and |\genb@y| are used to convert % the |\f@size| into centipoints. % \begin{macrocode} -%<*2ekernel|def2|autoload> \def\genb@x#1.#2.#3\@@{\two@digits{#1}\genb@y#200\@@} \def\genb@y#1#2#3\@@{#1#2} -%</2ekernel|def2|autoload> % \end{macrocode} % \end{macro} % \end{macro} @@ -1764,14 +1734,11 @@ % prepend the encoding scheme. % \changes{v2.0b}{1992/07/26}{} % \begin{macrocode} -%<*2ekernel|autoload> \DeclareSizeFunction{sub}{\sub@sfcnt\@font@warning} \DeclareSizeFunction{ssub}{\sub@sfcnt\@font@info} -%</2ekernel|autoload> % \end{macrocode} % % \begin{macrocode} -%<*2ekernel|def2|autoload> \def\sub@sfcnt#1{% \edef\mandatory@arg{\f@encoding/\mandatory@arg}% % \end{macrocode} @@ -1818,7 +1785,6 @@ % \begin{macrocode} \do@subst@correction } -%</2ekernel|def2|autoload> % \end{macrocode} % \end{macro} % @@ -1831,21 +1797,17 @@ % The main difference to the default size function is the warning % message. % \begin{macrocode} -%<*2ekernel|autoload> \DeclareSizeFunction{subf}{\subf@sfcnt\@font@warning} \DeclareSizeFunction{ssubf}{\subf@sfcnt\@font@info} -%</2ekernel|autoload> % \end{macrocode} % % \begin{macrocode} -%<*2ekernel|def2|autoload> \def\subf@sfcnt#1{% #1{Font\space shape\space `\curr@fontshape'\space in\space size\space \f@size\space not\space available\MessageBreak external\space font\space `\mandatory@arg'\space used}% \empty@sfcnt#1% } -%</2ekernel|def2|autoload> % \end{macrocode} % \end{macro} % @@ -1857,14 +1819,11 @@ % If an optional argument is present it is used as the `at' % size for the font. Otherwise the font is loaded at its design size. % \begin{macrocode} -%<*2ekernel|autoload> \DeclareSizeFunction{fixed}{\fixed@sfcnt\@font@warning} \DeclareSizeFunction{sfixed}{\fixed@sfcnt\@font@info} -%</2ekernel|autoload> % \end{macrocode} % % \begin{macrocode} -%<*2ekernel|def2|autoload> \def\fixed@sfcnt#1{% \ifx\optional@arg\@empty \let\external@font\mandatory@arg @@ -1875,7 +1834,7 @@ for\space size\MessageBreak <\f@size>}% } -%</2ekernel|def2|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/base/lthyphen.dtx b/Master/texmf-dist/source/latex/base/lthyphen.dtx index 65a0bd5bb3e..a6cbd3d4a43 100644 --- a/Master/texmf-dist/source/latex/base/lthyphen.dtx +++ b/Master/texmf-dist/source/latex/base/lthyphen.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -70,6 +70,7 @@ % \setcounter{StandardModuleDepth}{1} % % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % This file contains the code for loading hyphenation patterns into diff --git a/Master/texmf-dist/source/latex/base/ltidxglo.dtx b/Master/texmf-dist/source/latex/base/ltidxglo.dtx index 2b61bb2c4a6..48683ca46f2 100644 --- a/Master/texmf-dist/source/latex/base/ltidxglo.dtx +++ b/Master/texmf-dist/source/latex/base/ltidxglo.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -48,7 +48,8 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltlength.dtx b/Master/texmf-dist/source/latex/base/ltlength.dtx index 374e383f1b0..bec13a60875 100644 --- a/Master/texmf-dist/source/latex/base/ltlength.dtx +++ b/Master/texmf-dist/source/latex/base/ltlength.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltlength.dtx} - [1995/08/11 v1.1b LaTeX Kernel (Lengths)] + [2015/01/08 v1.1c LaTeX Kernel (Lengths)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltlength.dtx} @@ -49,13 +49,14 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{40} +% \CheckSum{53} % % \changes{v1.0c}{1994/03/29} % {Create file ltcntlen from parts of ltmiscen and ltherest.} @@ -98,8 +99,23 @@ % \end{macro} % % \begin{macro}{\setlength} +% \changes{v1.1c}{2015/01/08}{add = to ensure first length argument is terminated. +% (latexrelease)} % \begin{macrocode} -\def\setlength#1#2{#1#2\relax} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\setlength}{Using \setlength with \dimen0}% +%<*2ekernel|latexrelease> +% \end{macrocode} +% \begin{macrocode} +\def\setlength#1#2{#1 #2\relax} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\setlength}{Using \setlength with \dimen0}% +%<latexrelease>\def\setlength#1#2{#1#2\relax} +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/base/ltlists.dtx b/Master/texmf-dist/source/latex/base/ltlists.dtx index 7cdfd5242fc..6841bafa40a 100644 --- a/Master/texmf-dist/source/latex/base/ltlists.dtx +++ b/Master/texmf-dist/source/latex/base/ltlists.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -49,7 +49,8 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltlogos.dtx b/Master/texmf-dist/source/latex/base/ltlogos.dtx index 82487d092c7..1d9614a7bd5 100644 --- a/Master/texmf-dist/source/latex/base/ltlogos.dtx +++ b/Master/texmf-dist/source/latex/base/ltlogos.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -47,7 +47,8 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltmath.dtx b/Master/texmf-dist/source/latex/base/ltmath.dtx index 8f776d71c9a..4453b4809c9 100644 --- a/Master/texmf-dist/source/latex/base/ltmath.dtx +++ b/Master/texmf-dist/source/latex/base/ltmath.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -31,14 +31,14 @@ % %<leqno>\ProvidesFile{leqno.clo} %<fleqn>\ProvidesFile{fleqn.clo} -%<leqno,fleqn> [1998/08/17 v1.1c Standard LaTeX option +%<leqno,fleqn> [2015/03/31 v1.1i Standard LaTeX option %<leqno> (left equation numbers)] %<fleqn> (flush left equations)] % %<*driver> % \fi \ProvidesFile{ltmath.dtx} - [2005/11/10 v1.1g LaTeX Kernel (Math Setup)] + [2015/03/11 v1.1i LaTeX Kernel (Math Setup)] % \iffalse %</driver> % @@ -56,13 +56,14 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} - \maketitle - \DocInput{\filename} + \MaintainedByLaTeXTeam{latex} + \maketitle + \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{1101} +% \CheckSum{1208} % % \changes{v1.1b}{1996/07/26}{Removed \cs{global} before % \cs{@ignoretrue} in various places.} @@ -82,22 +83,22 @@ % \end{macrocode} % % -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% % % \subsection{Math commands based on plain \TeX} % @@ -539,9 +540,24 @@ % \begin{macro}{\)} % Produces |$...$| with checks that |\(| isn't used in math mode, and % that |\)| is only used in math mode begun with |\(|. +% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)} % \begin{macrocode} -\def\({\relax\ifmmode\@badmath\else$\fi} -\def\){\relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}{\(}{Make \( robust}% +%<*2ekernel|latexrelease> +\DeclareRobustCommand\({% + \relax\ifmmode\@badmath\else$\fi}% +\DeclareRobustCommand\){% + \relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\(}{Make \( robust}% +%<latexrelease>\def\({% +%<latexrelease> \relax\ifmmode\@badmath\else$\fi}% +%<latexrelease>\def\){% +%<latexrelease> \relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % \end{macro} @@ -551,9 +567,14 @@ % {(MH) Fixed potential problem in \cs{[} (pr/3399).} % \begin{macro}{\]} % Produces |$$...$$| with checks that |\[| isn't used in math mode, -% and that |\]| is only used in math mode begun with |\]|. +% and that |\]| is only used in display math mode (though there is no +% real test that this display math started with |\[| and not with |$$|). +% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)} % \begin{macrocode} -\def\[{% +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}{\[}{Make \[ robust}% +%<*2ekernel|latexrelease> +\DeclareRobustCommand\[{% \relax\ifmmode \@badmath \else @@ -563,11 +584,11 @@ \fi $$%%$$ BRACE MATCH HACK \fi -} +}% % \end{macrocode} % % \begin{macrocode} -\def\]{% +\DeclareRobustCommand\]{% \relax\ifmmode \ifinner \@badmath @@ -578,7 +599,41 @@ \@badmath \fi \ignorespaces -} +}% +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\[}{Make \[ robust}% +%<latexrelease>\def\[{% +%<latexrelease> \relax\ifmmode +%<latexrelease> \@badmath +%<latexrelease> \else +%<latexrelease> \ifvmode +%<latexrelease> \nointerlineskip +%<latexrelease> \makebox[.6\linewidth]{}% +%<latexrelease> \fi +%<latexrelease> $$%%$$ BRACE MATCH HACK +%<latexrelease> \fi +%<latexrelease>}% +% \end{macrocode} +% +% \begin{macrocode} +%<latexrelease>\def\]{% +%<latexrelease> \relax\ifmmode +%<latexrelease> \ifinner +%<latexrelease> \@badmath +%<latexrelease> \else +%<latexrelease> $$%%$$ BRACE MATCH HACK +%<latexrelease> \fi +%<latexrelease> \else +%<latexrelease> \@badmath +%<latexrelease> \fi +%<latexrelease> \ignorespaces +%<latexrelease>}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % \end{macro} @@ -906,6 +961,22 @@ % \begin{macro}{\[} % Begin display math; % \begin{macrocode} +\IncludeInRelease{2015/01/01}{\[}{Make \[ robust}% +\DeclareRobustCommand\[{\relax + \ifmmode\@badmath + \else + \begin{trivlist}% + \@beginparpenalty\predisplaypenalty + \@endparpenalty\postdisplaypenalty + \item[]\leavevmode + \hb@xt@\linewidth\bgroup $\m@th\displaystyle %$ + \hskip\mathindent\bgroup + \fi} +\EndIncludeInRelease +% \end{macrocode} +% +% \begin{macrocode} +\IncludeInRelease{0000/00/00}{\[}{Make \[ robust}% \renewcommand\[{\relax \ifmmode\@badmath \else @@ -916,12 +987,26 @@ \hb@xt@\linewidth\bgroup $\m@th\displaystyle %$ \hskip\mathindent\bgroup \fi} +\EndIncludeInRelease % \end{macrocode} % \end{macro} % % \begin{macro}{\]} % end display math; % \begin{macrocode} +\IncludeInRelease{2015/01/01}{\]}{Make \] robust}% +\DeclareRobustCommand\]{\relax + \ifmmode + \egroup $\hfil% $ + \egroup + \end{trivlist}% + \else \@badmath + \fi} +\EndIncludeInRelease +% \end{macrocode} +% +% \begin{macrocode} +\IncludeInRelease{0000/00/00}{\]}{Make \] robust}% \renewcommand\]{\relax \ifmmode \egroup $\hfil% $ @@ -929,6 +1014,7 @@ \end{trivlist}% \else \@badmath \fi} +\EndIncludeInRelease % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/base/ltmiscen.dtx b/Master/texmf-dist/source/latex/base/ltmiscen.dtx index aa11eb9b364..d923e5330f7 100644 --- a/Master/texmf-dist/source/latex/base/ltmiscen.dtx +++ b/Master/texmf-dist/source/latex/base/ltmiscen.dtx @@ -48,7 +48,8 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltnews01.tex b/Master/texmf-dist/source/latex/base/ltnews01.tex index d10a0e858cd..92090e17d01 100644 --- a/Master/texmf-dist/source/latex/base/ltnews01.tex +++ b/Master/texmf-dist/source/latex/base/ltnews01.tex @@ -2,62 +2,62 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews01.tex - + % This is issue 1 of LaTeX News. \documentclass % [type1fonts] {ltnews} - + \publicationmonth{June} \publicationyear{1994} \publicationissue{1} - + \begin{document} - + \maketitle - + \section{Welcome to \LaTeXNews} - -An issue of \emph{\LaTeXNews} will accompany every future release of -\LaTeX. It will tell you about important events, such as major bug + +An issue of \emph{\LaTeXNews} will accompany every future release of +\LaTeX. It will tell you about important events, such as major bug fixes, newly available packages, or any other \LaTeX{} news. - + \section{\LaTeXe---the new \LaTeX{} release} - + The most important news is the release of \LaTeXe, the new version of the \LaTeX{} software. This version has better support for fonts, graphics and colour, and will be actively maintained by the \LaTeX3 -project team. Upgrades will be issued every six months, in June and +project team. Upgrades will be issued every six months, in June and December. - + \section{Why a new \LaTeX?} - + Over the years many extensions have been developed for \LaTeX. This is, of course, a sure sign of its continuing popularity but it has had one unfortunate result: incompatible \LaTeX{} formats came into use at @@ -65,7 +65,7 @@ different sites. Thus, to process documents from various places, a site maintainer was forced to keep \LaTeX{} (with and without \NFSS), \SLiTeX, \AmSLaTeX, and so on. In addition, when looking at a source file it was not always clear for which format the document was written. - + To put an end to this unsatisfactory situation a new release of \LaTeX{} was produced. It brings all such extensions back under a single format and thus @@ -73,15 +73,15 @@ prevents the proliferation of mutually incompatible dialects of \LaTeX~2.09. The new release was available for several months as a test version, and the final release of 1~June officially replaces the old version. - + \section{Processing documents with \LaTeXe} - + Documents written for \LaTeX~2.09 will still be read by \LaTeXe. Any such document is run in \emph{\LaTeX~2.09 compatibility mode}. - -Unfortunately, compatibility mode comes with a price: it can run -up to 50\% slower than \LaTeX~2.09 did. If you want to run your document + +Unfortunately, compatibility mode comes with a price: it can run +up to 50\% slower than \LaTeX~2.09 did. If you want to run your document in the faster \emph{native mode}, you should try replacing the line: \begin{verbatim} \documentstyle[<options>,<packages>]{<class>} @@ -91,17 +91,17 @@ with: \documentclass[<options>]{<class>} \usepackage{latexsym,<packages>} \end{verbatim} -Unfortunately, this will not always work, because some \LaTeX~2.09 -packages will only work in \LaTeXe{} compatibility mode. You should find +Unfortunately, this will not always work, because some \LaTeX~2.09 +packages will only work in \LaTeXe{} compatibility mode. You should find out if there is a \LaTeXe{} version of the package available. - -\LaTeXe{} native mode also gives access to the new features of \LaTeXe, + +\LaTeXe{} native mode also gives access to the new features of \LaTeXe, described in \emph{\LaTeXe{} for authors}. - + \section{New packages} - -\LaTeXe{} has much better support for graphics, colour, fonts, and -multi-lingual typesetting. The following software should be available + +\LaTeXe{} has much better support for graphics, colour, fonts, and +multi-lingual typesetting. The following software should be available from the distributor who brought you \LaTeXe: \begin{citations} @@ -112,12 +112,12 @@ from the distributor who brought you \LaTeXe: \item[psnfss] for using Type~1 fonts. \item[tools] other packages by the \LaTeX3 team. \end{citations} -The packages come with full documentation, and are also described in -\emph{\LaTeX: A Document Processing System} or +The packages come with full documentation, and are also described in +\emph{\LaTeX: A Document Processing System} or \emph{The \LaTeX{} Companion}. - + \section{Further information} - + More information about \LaTeXe{} is to be found in: \begin{citations} @@ -126,11 +126,11 @@ More information about \LaTeXe{} is to be found in: \item[The \LaTeX{} Companion] Goossens, Mittelbach and Samarin, \AW, 1994. \end{citations} -The \LaTeX{} distribution comes with documentation on the new features of +The \LaTeX{} distribution comes with documentation on the new features of \LaTeX: \begin{citations} -\item[\LaTeXe{} for authors] +\item[\LaTeXe{} for authors] describes the new features of \LaTeX{} documents, in the file \verb|usrguide.tex|. \item[\LaTeXe{} for class and package writers] @@ -141,12 +141,12 @@ The \LaTeX{} distribution comes with documentation on the new features of class and package writers, in the file \verb|fntguide.tex|. \end{citations} -For more information on \TeX{} and \LaTeX, get in touch with your local -\TeX{} Users Group, or the international \TeX{} Users Group, -P.~O.~Box~869, Santa~Barbara, CA~93102-0869, USA, Fax:~+1~805~963~8358, +For more information on \TeX{} and \LaTeX, get in touch with your local +\TeX{} Users Group, or the international \TeX{} Users Group, +P.~O.~Box~869, Santa~Barbara, CA~93102-0869, USA, Fax:~+1~805~963~8358, EMail:~tug@tug.org. - + \end{document} - + diff --git a/Master/texmf-dist/source/latex/base/ltnews02.tex b/Master/texmf-dist/source/latex/base/ltnews02.tex index e263733a8b8..d46cb1b52f5 100644 --- a/Master/texmf-dist/source/latex/base/ltnews02.tex +++ b/Master/texmf-dist/source/latex/base/ltnews02.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews02.tex @@ -99,28 +99,28 @@ be upwardly compatible with the test version. information structure and superior printed output for mathematical documents. - There are far too many features of AMS-\LaTeX{} to list here. + There are far too many features of AMS-\LaTeX{} to list here. AMS-\LaTeX{} is described in the accompanying documentation, and in \emph{The \LaTeX{} Companion}. Version 1.2beta of AMS-\LaTeX{} was released for testing by intrepid - users in October 1994. The full release of AMS-\LaTeX{}~1.2 is expected + users in October 1994. The full release of AMS-\LaTeX{}~1.2 is expected in early January 1995. - + It will be divided into two bundles: \begin{itemize} - + \item the \verb|amsfonts| packages, which give access to hundreds of new mathematical symbols, and new math fonts such as blackboard bold and fraktur. - - \item the \verb|amsmath| packages, which provide finer control over + + \item the \verb|amsmath| packages, which provide finer control over mathematical typesetting, such as multi-line subscripts, - enhanced theorem and proof environments, - and improved displayed equations, - + enhanced theorem and proof environments, + and improved displayed equations, + \end{itemize} - For compatibility with older documents, an \verb|amstex| package will be + For compatibility with older documents, an \verb|amstex| package will be provided. \section{\LaTeX{} on the internet} diff --git a/Master/texmf-dist/source/latex/base/ltnews03.tex b/Master/texmf-dist/source/latex/base/ltnews03.tex index 552832c515b..d7c8ff0b205 100644 --- a/Master/texmf-dist/source/latex/base/ltnews03.tex +++ b/Master/texmf-dist/source/latex/base/ltnews03.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews03.tex @@ -56,7 +56,7 @@ June. In the last \emph{\LaTeXNews}, we said ``we don't expect so much activity in the next six months,'' which has turned out not to be -true! +true! \section{Additional input encodings} @@ -106,7 +106,7 @@ One topic of discussion that has kept us busy is the distribution and modification conditions of \LaTeX. We are committed to keeping \LaTeX{} as free reliable software, and ensuring that (as far as possible) \LaTeX{} documents will produce the same results on all -systems. +systems. The modification conditions are currently under discussion, and we would like to hear from anyone interested. Please read diff --git a/Master/texmf-dist/source/latex/base/ltnews04.tex b/Master/texmf-dist/source/latex/base/ltnews04.tex index dba8d9f159c..15e95999521 100644 --- a/Master/texmf-dist/source/latex/base/ltnews04.tex +++ b/Master/texmf-dist/source/latex/base/ltnews04.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews04.tex @@ -80,7 +80,7 @@ This release of the dc fonts fixes many bugs (including the missing many other ways. It is strongly recommended that you upgrade as soon as possible if currently you are using the old dc fonts, release 1.1 or earlier. The new fonts are available from the CTAN archives, in -\texttt{tex-archive/fonts/dc}. +\texttt{tex-archive/fonts/dc}. The names of the font files are \emph{different}. This does not affect \LaTeX\ documents but \emph{does} affect the installation procedure as @@ -123,18 +123,18 @@ of input of accented and other characters. Three new input encodings are now supported. \begin{itemize} -\item \texttt{ansinew} the Windows ansi encoding, +\item \texttt{ansinew} the Windows ansi encoding, as used in Microsoft Windows 3.x. \item \texttt{cp437de} a variant of \texttt{cp437}, which uses \ss\ rather than $\beta$ in the appropriate slot. -\item \texttt{next} the encoding used on Next computers. +\item \texttt{next} the encoding used on Next computers. \end{itemize} \section{Further information} For more information on \TeX{} and \LaTeX, get in touch with your local \TeX{} Users Group, or the international \TeX{} Users Group, -1850 Union Street, \#1637, San Francisco, CA~94123, USA, +1850 Union Street, \#1637, San Francisco, CA~94123, USA, Fax:~+1~415~982~8559, EMail:~tug@tug.org. The \LaTeX{} home page is \verb|http://www.tex.ac.uk/ctan/latex/| diff --git a/Master/texmf-dist/source/latex/base/ltnews05.tex b/Master/texmf-dist/source/latex/base/ltnews05.tex index 87cbdbaacc8..9416f0e4ed3 100644 --- a/Master/texmf-dist/source/latex/base/ltnews05.tex +++ b/Master/texmf-dist/source/latex/base/ltnews05.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews05.tex @@ -54,7 +54,7 @@ Most \LaTeX\ sectioning commands are defined using For example, the \textsf{article} class defines: \begin{small} \begin{verbatim} -\newcommand\section{\@startsection +\newcommand\section{\@startsection {section}{1}{0pt}{-3.5ex plus-1ex minus-.2ex}% {2.3ex plus.2ex}{\normalfont\Large\bfseries}} \end{verbatim} @@ -69,7 +69,7 @@ For example, one could use the \verb|\MakeUppercase| command to produce uppercase headings. A package or class file could contain: \begin{small} \begin{verbatim} -\renewcommand\section{\@startsection +\renewcommand\section{\@startsection {section}{1}{0pt}{-3.5ex plus-1ex minus-.2ex}% {2.3ex plus.2ex}{\normalfont\Large\MakeUppercase}} \end{verbatim} diff --git a/Master/texmf-dist/source/latex/base/ltnews06.tex b/Master/texmf-dist/source/latex/base/ltnews06.tex index 22cbe3a6e69..b5c7a28a245 100644 --- a/Master/texmf-dist/source/latex/base/ltnews06.tex +++ b/Master/texmf-dist/source/latex/base/ltnews06.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews06.tex @@ -54,7 +54,7 @@ such as \texttt{T1cmr.fd} and \texttt{T1enc.def}. These file names cause problems on some systems (in particular they are illegal on the ISO 9660 CDROM format) and so in this release -all file names have been made lowercase (for example +all file names have been made lowercase (for example \texttt{t1cmr.fd} and \texttt{t1enc.def}). This change should \emph{not} affect any document. Within \LaTeX, @@ -69,7 +69,7 @@ should still work with this new release. The change \emph{does} affect the configuration files that may be used to make the \LaTeX\ format with initex. For example, the file \texttt{fonttext.ltx} previously specified \verb|\input{T1cmr.fd}|. -It now has \verb|\input{t1cmr.fd}|. +It now has \verb|\input{t1cmr.fd}|. If you use a local file \texttt{fonttext.cfg} you will need to make similar changes, as \verb|\input{T1cmr.fd}| will not work as \texttt{T1cmr.fd} is no longer in the distribution. @@ -109,7 +109,7 @@ you can use to avoid this problem; it should be inserted as shown here: \end{verbatim} \section{Docstrip improvements} -The \textsf{docstrip} program that is used to unpack the \LaTeX\ +The \textsf{docstrip} program that is used to unpack the \LaTeX\ sources has undergone further development. The new version should be able to process all old `batchfiles' but it allows a simpler syntax in new `batchfiles' (no need to define \verb|\def\batchfile{|\ldots). diff --git a/Master/texmf-dist/source/latex/base/ltnews07.tex b/Master/texmf-dist/source/latex/base/ltnews07.tex index def5df07bd2..81d0ed3143c 100644 --- a/Master/texmf-dist/source/latex/base/ltnews07.tex +++ b/Master/texmf-dist/source/latex/base/ltnews07.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews07.tex diff --git a/Master/texmf-dist/source/latex/base/ltnews08.tex b/Master/texmf-dist/source/latex/base/ltnews08.tex index de069efa81b..b43c4f53f9e 100644 --- a/Master/texmf-dist/source/latex/base/ltnews08.tex +++ b/Master/texmf-dist/source/latex/base/ltnews08.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews08.tex @@ -69,7 +69,7 @@ some of the internal names for the characters have changed. These additions to the \textsf{inputenc} package are \texttt{decmulti} (the DEC Multinational -Character Set, contributed by M.~Y.~Chartoire) +Character Set, contributed by M.~Y.~Chartoire) and \texttt{cp1250} (an MS-Windows encoding for Central and Eastern Europe, contributed by Marcin Woli\'nski). There is also a \texttt{cp1252} encoding that is identical to \texttt{ansinew}. @@ -123,7 +123,7 @@ of syntax conventions and basic data-types that might form the basis for programming large scale projects in \TeX. They will be located in\\ this CTAN directory: -\begin{verbatim} +\begin{verbatim} CTAN:macros/latex/packages/expl3 \end{verbatim} The documentation of this material is as follows: individual package diff --git a/Master/texmf-dist/source/latex/base/ltnews09.tex b/Master/texmf-dist/source/latex/base/ltnews09.tex index 21a9807618f..c4f8b43ec87 100644 --- a/Master/texmf-dist/source/latex/base/ltnews09.tex +++ b/Master/texmf-dist/source/latex/base/ltnews09.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews09.tex @@ -48,7 +48,7 @@ \section{New math font encodings} A joint working group of the \TeX{} Users Group and the \LaTeX3 -Project is developing a new 8-bit math font encoding for \TeX{}. +Project is developing a new 8-bit math font encoding for \TeX{}. It is designed to overcome several limitations and implementation problems of the old math font encodings and to simplify switching between different sets of math fonts, much as the \LaTeX{} font @@ -62,7 +62,7 @@ integrate it into the main \LaTeX{} distribution for the next release. Documents using only standard \LaTeX{} commands for math symbols -should not be affected by switching to the new math font encodings +should not be affected by switching to the new math font encodings However, documents, classes or packages making specific assumptions about the encoding of math symbol fonts are likely to break. @@ -73,7 +73,7 @@ the World Wide Web at \texttt{http://www.tug.org/twg/mfg/}. \section{A new math accent} A new math accent, \verb|\mathring|, has been added. This is a math mode -version of the ring accent (\r{}) which is available in text +version of the ring accent (\r{}) which is available in text mode with the command \verb|\r|. \section{Extended \cs{DeclareMathDelimiter}} @@ -111,19 +111,19 @@ environment and the \verb|\rule| command. For many other standard \section{Support for Cyrillic encodings} - + We are very pleased that, after a lengthy period of development, a set of fonts, encodings and support files for using \LaTeX\ with Cyrillic characters will soon be available. - + Test versions of the `LH' fonts for these Cyrillic encodings, based on the Computer Modern design, are available from CTAN archives in the directory \texttt{fonts/cyrillic/lh-test}. The \LaTeX\ support files (by Werner Lemberg and Vladimir Volovich) are also available from CTAN archives in\\ \texttt{macros/latex/contrib/supported/t2} - - + + \section{Default docstrip header} Many \LaTeX\ users now distribute packages in documented source form diff --git a/Master/texmf-dist/source/latex/base/ltnews10.tex b/Master/texmf-dist/source/latex/base/ltnews10.tex index c75a011c722..d9e0d4de530 100644 --- a/Master/texmf-dist/source/latex/base/ltnews10.tex +++ b/Master/texmf-dist/source/latex/base/ltnews10.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews10.tex 12/01/1998 @@ -61,13 +61,13 @@ quote (somewhat censored to protect the guilty) well reflects some of our feelings about working on \LaTeX{} over the years: \textit{the mere existence of \LaTeXe{} is a great miracle}. - + \section{Restructuring the \LaTeX{} distribution} - + Since the (once) `new' standard \LaTeX{} has reached such a venerable age, we are reviewing the way in which the system is presented to the world. - + An early intention is to define, given the wide variety of good packages now available, what now constitutes a useful installation of \LaTeX{}. We also hope that such a definition will help document @@ -75,14 +75,14 @@ existence of \LaTeXe{} is a great miracle}. designer can reasonably assume that a known list of facilities will be there for all users (so that each class need not supply them). - + As a first small step towards this definition, we shall replace the \texttt{latex/packages} subdirectory on \ctan{}. This directory was a curious mixture of the important, such as the \LaTeX{} \texttt{tools}, that any self-respecting \LaTeX{} installation ought to have, and the esoteric or experimental. - The esoterica from \texttt{packages} will be moved to + The esoterica from \texttt{packages} will be moved to new locations, as follows: \begin{quote} \texttt{expl3} to \texttt{latex/exptl/project}\\ @@ -98,7 +98,7 @@ existence of \LaTeXe{} is a great miracle}. \section{\LaTeX\ Project on the Internet} A new \texttt{latex-project.org} domain has been registered. -The web site is not yet fully functional but the old \LaTeX\ pages from +The web site is not yet fully functional but the old \LaTeX\ pages from \ctan\ are available at \texttt{http://www.latex-project.org/} and the \LaTeX\ bug reporting address has been changed to \texttt{latex-bugs@latex-project.org}. @@ -129,7 +129,7 @@ including commonly used variants and Mongolian Cyrillic encodings). This provides platform independent and sophisticated basic support for high-quality typesetting in various Cyrillic-based languages. - + For further information see the file \texttt{cyrguide.tex}. \section{Tools distribution} diff --git a/Master/texmf-dist/source/latex/base/ltnews11.tex b/Master/texmf-dist/source/latex/base/ltnews11.tex index 0ed866a0c77..6587a691af9 100644 --- a/Master/texmf-dist/source/latex/base/ltnews11.tex +++ b/Master/texmf-dist/source/latex/base/ltnews11.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews11.tex 01/06/1999 % This is issue 11 of LaTeX News. @@ -108,7 +108,7 @@ loaded, and with which options, do not work for the \pkg{fontenc} package. \section{New math font encodings} - + As we announced in \LaTeX{} News~9, a joint working group of the \TeX{} Users Group and the \LaTeX3 Project has developed a new \mbox{8-bit} math font encoding for \TeX{}. diff --git a/Master/texmf-dist/source/latex/base/ltnews12.tex b/Master/texmf-dist/source/latex/base/ltnews12.tex index 5c225d15d41..47609689cea 100644 --- a/Master/texmf-dist/source/latex/base/ltnews12.tex +++ b/Master/texmf-dist/source/latex/base/ltnews12.tex @@ -2,31 +2,31 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi -% Filename: ltnews12.tex +% Filename: ltnews12.tex % % This is issue 12 of LaTeX News. @@ -131,7 +131,7 @@ on the list \texttt{LATEX-L}. You can join this list, which is intended solely for discussing ideas and concepts for future versions of \LaTeX, by sending mail to %\begin{quote} - \email{listserv@URZ.UNI-HEIDELBERG.DE} + \email{listserv@URZ.UNI-HEIDELBERG.DE} %\end{quote} containing the line \begin{quote} diff --git a/Master/texmf-dist/source/latex/base/ltnews13.tex b/Master/texmf-dist/source/latex/base/ltnews13.tex index 7f091737246..ae08f3d90d1 100644 --- a/Master/texmf-dist/source/latex/base/ltnews13.tex +++ b/Master/texmf-dist/source/latex/base/ltnews13.tex @@ -2,31 +2,31 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi -% Filename: ltnews13.tex +% Filename: ltnews13.tex % % This is issue 13 of LaTeX News. @@ -36,7 +36,7 @@ % \usepackage[T1]{fontenc} -\publicationmonth{June} +\publicationmonth{June} \publicationyear{2000} \publicationissue{13} @@ -45,7 +45,7 @@ \maketitle -\raisefirstsection +\raisefirstsection \section{Yearly release cycle} We announced in \textit{\LaTeX{} News~11} that we intended to switch @@ -72,7 +72,7 @@ to release patches as needed to fix significant bugs. \end{quote} \begin{latexonly} - \vspace{-\baselineskip} + \vspace{-\baselineskip} \end{latexonly} \noindent @@ -88,7 +88,7 @@ and the distribution has been `cleaned up'. The file The documentation (in \file{psnfss2e.pdf}) has been completely rewritten to provide a comprehensive introduction to the use -of PostScript fonts. +of PostScript fonts. Notice that the new \PSNFSS{} needs updated files for font metrics, virtual fonts and font definitions. If you received the new @@ -163,16 +163,16 @@ these support higher quality \emph{automated}\footnote page-breaking and page make-up\latex{\\} for complex pages---the best yet achieved with \TeX{}! -A paper describing the new output routine is +A paper describing the new output routine is \begin{latexonly} at\\ \file{http://www.latex-project.org/papers/xo-pfloat.pdf% \hspace*{-16pt}}\\ \end{latexonly} \begin{htmlonly} - at \url{http://www.latex-project.org/papers/xo-pfloat.pdf}. + at \url{http://www.latex-project.org/papers/xo-pfloat.pdf}. \end{htmlonly} -All code examples and documentation are available +All code examples and documentation are available \begin{latexonly} at\\ \file{http://www.latex-project.org/code/experimental/% diff --git a/Master/texmf-dist/source/latex/base/ltnews14.tex b/Master/texmf-dist/source/latex/base/ltnews14.tex index a25cb37ecdf..84440dd7d35 100644 --- a/Master/texmf-dist/source/latex/base/ltnews14.tex +++ b/Master/texmf-dist/source/latex/base/ltnews14.tex @@ -2,32 +2,32 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi -% Filename: ltnews14.tex -% +% Filename: ltnews14.tex +% % This is issue 14 of LaTeX News. \documentclass @@ -36,7 +36,7 @@ % \usepackage[T1]{fontenc} -\publicationmonth{June} +\publicationmonth{June} \publicationyear{2001} \publicationissue{14} @@ -128,10 +128,10 @@ page-breaking and page make-up\latex{\\} for complex pages---the best yet achieved with \TeX{}! More recently we have added material to handle the complex front -matter requirements of journal articles; this was presented at +matter requirements of journal articles; this was presented at Gutenberg\,2001 in Metz. -A paper describing the new output routine is +A paper describing the new output routine is \begin{latexonly} at\\ \begin{small} @@ -139,9 +139,9 @@ A paper describing the new output routine is \end{small} \end{latexonly} \begin{htmlonly} - at \url{http://www.latex-project.org/papers/xo-pfloat.pdf}. + at \url{http://www.latex-project.org/papers/xo-pfloat.pdf}. \end{htmlonly} -All code examples and documentation are available +All code examples and documentation are available \begin{latexonly} at\\ \begin{small} diff --git a/Master/texmf-dist/source/latex/base/ltnews15.tex b/Master/texmf-dist/source/latex/base/ltnews15.tex index 358f1aaadfe..389ed6334d9 100644 --- a/Master/texmf-dist/source/latex/base/ltnews15.tex +++ b/Master/texmf-dist/source/latex/base/ltnews15.tex @@ -2,32 +2,32 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi -% Filename: ltnews15.tex -% +% Filename: ltnews15.tex +% % This is issue 15 of LaTeX News. \documentclass @@ -36,7 +36,7 @@ % \usepackage[T1]{fontenc} -\publicationmonth{December} +\publicationmonth{December} \publicationyear{2003} \publicationissue{15} @@ -85,7 +85,7 @@ Jeff Licquia and Branden Robinson. The English has been corrected in \verb|\reftextbefore| (an incompatible change). There are other extensions -such as \verb|\labelformat|, \verb|\Ref|, \verb|\Vref| and \verb|\vpagerefnum|. +such as \verb|\labelformat|, \verb|\Ref|, \verb|\Vref| and \verb|\vpagerefnum|. Some Dutch text has also been changed and two\newline new options added: \package{slovak} and \package{slovene}. @@ -113,8 +113,8 @@ A number of options have been added to the \package{textcomp} package, enabling only available glyphs to be used. Also, the `NFSS font families' are now divided into five different groups according to the subset of glyphs each provides from the full -collection of symbols in the TS1 encoding. -Given sufficient information about a font family +collection of symbols in the TS1 encoding. +Given sufficient information about a font family \package{textcomp} will use this in order to limit the\newline typesetting to those glyphs that are available. @@ -133,7 +133,7 @@ tables in batch mode by providing a suitable input file. \section{New input encodings} -The \package{inputenc} package has been extended as follows: +The \package{inputenc} package has been extended as follows: \package{macce} input encoding (Apple Central European), thanks to Radek Tryc and Marcin Wolinski; \package{cp1257}\newline @@ -161,7 +161,7 @@ of standard \LaTeX{} Latin encodings. \section{And finally \ldots\ pict2e} -The old, non-functional version of this package has been removed +The old, non-functional version of this package has been removed as there is now a fully working version from Hubert G\"a{\ss}lein and Rolf Niepraschk. It is described in \textit{The \LaTeX{} Manual}. diff --git a/Master/texmf-dist/source/latex/base/ltnews16.tex b/Master/texmf-dist/source/latex/base/ltnews16.tex index afff9a0f915..69e05973a8e 100644 --- a/Master/texmf-dist/source/latex/base/ltnews16.tex +++ b/Master/texmf-dist/source/latex/base/ltnews16.tex @@ -2,32 +2,32 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi -% Filename: ltnews16.tex -% +% Filename: ltnews16.tex +% % This is issue 16 of LaTeX News. \documentclass @@ -36,7 +36,7 @@ % \usepackage[T1]{fontenc} -\publicationmonth{December} +\publicationmonth{December} \publicationyear{2003} \publicationissue{16} @@ -72,16 +72,16 @@ and intellectual) by using it to discover masses of invaluable `insider information' about: \begin{itemize} \item the latest release of Standard \LaTeX{}; -\item over~200~extension packages; +\item over~200~extension packages; \item plus related software and systems. \end{itemize} For more information on this all new (??\ldots OK,\newline not \emph{all}, but over 90\%!!), all accurate (we hope!)\newline -10th~Anniversary Edition, check out\newline +10th~Anniversary Edition, check out\newline \mbox{\url{http://www.awprofessional.com/titles/0201362996}}. - - + + \section{Future maintenance} We are currently exploring how best to support the very large and @@ -105,7 +105,7 @@ in getting involved. \section{LPPL certification} There are still some outstanding diplomatic tasks around the -\LaTeX{} Project Public Licence: these include +\LaTeX{} Project Public Licence: these include e.g.,~getting it `OSF certified' and ensuring that it gains more support and wider use, even in the FSF world\newline where it has long been tolerated. @@ -121,7 +121,7 @@ making a definite announcement yet. Although the current release does not \emph{require} \eTeX{} features, we certainly recommend using an extended \TeX{}, especially if you -need to debug macros. +need to debug macros. \section{End of `autoload' support} @@ -144,7 +144,7 @@ and Since then a very large proportion of the The Team's efforts have been diverted to provide the core author team for TLC2, which provides over 1000 pages of carefully researched and tested documentation of -many aspects of the vast world of \LaTeX{} related software that +many aspects of the vast world of \LaTeX{} related software that was developed over that same time period and that continues to grow and improve prodigiously. diff --git a/Master/texmf-dist/source/latex/base/ltnews17.tex b/Master/texmf-dist/source/latex/base/ltnews17.tex index 4848cf014cb..99267429bc4 100644 --- a/Master/texmf-dist/source/latex/base/ltnews17.tex +++ b/Master/texmf-dist/source/latex/base/ltnews17.tex @@ -2,36 +2,36 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews17.tex % % This is issue 17 of LaTeX News. \documentclass - [lw35fonts] % uncomment this line to get Palatino +% [lw35fonts] % uncomment this line to get Palatino {ltnews}[2004/02/28] % \usepackage[T1]{fontenc} @@ -115,7 +115,7 @@ that. Note also that \package{fixltx2e} will make use of the facilities in \eTeX{} whenever these are present (see below). The \package{calc} package has also been given an update with a few -extra commands. +extra commands. The commands \verb|\maxof| and \verb|\minof|, each with two brace-delimited arguments, provide the usual numeric $\max$ and $\min$ operations. The commands \verb|\settototalheight| and @@ -125,7 +125,7 @@ operations. The commands \verb|\settototalheight| and \verb|\ifcase|. The \package{varioref} package has acquired a few more default -strings but there are still a number of languages for +strings but there are still a number of languages for which good strings are still missing. The \package{showkeys} package has also been updated slightly to work @@ -140,21 +140,21 @@ command \verb|\textsubscript| has been added as a complement to the command \verb|\textsuperscript| in the kernel. Secondly, a new form of \verb|\DeclareMathSizes| that allows all of its arguments to have a dimension suffix. This means you can now use expressions such as -\verb|\DeclareMathSizes{9.5dd}{9.5dd}{7.4dd}{6.6dd}|. +\verb|\DeclareMathSizes{9.5dd}{9.5dd}{7.4dd}{6.6dd}|. The third new addition is the robust command \verb|\TextOrMath| which takes two arguments and executes one of them when typesetting in text or math mode respectively. This command also takes advantage of \eTeX{} -extensions if available; more specifically, +extensions if available; more specifically, %% %%\pagebreak %% when the \eTeX{} extensions are available, it does not -destroy kerning between previous letters and the text to be typeset. +destroy kerning between previous letters and the text to be typeset. The command is also used internally in \package{fixltx2e} to resolve a problem with -\verb|\fnsymbol|. +\verb|\fnsymbol|. Also, further work has been done on reimplementing the command \verb|\addpenalty|, which is used internally in several @@ -166,23 +166,23 @@ The \package{graphics} bundle now supports the \package{dvipdfmx} post-processor and Jonathan Kew's XE\TeX\ program. By support we mean that the graphics packages recognize the new options \texttt{xetex} and \texttt{dvipdfmx} but we do not -distribute the respective driver files. +distribute the respective driver files. -This leads elegantly to a description of the +This leads elegantly to a description of the new policy concerning such driver files in the \package{graphics} bundle. Most driver files for our graphics packages are maintained by the -developers of the associated post-processor or \TeX\ programs. +developers of the associated post-processor or \TeX\ programs. The teams developing these packages are working very hard: their rapid development offers a stark contrast to the current schedule of \LaTeX\ releases. It is therefore no longer practical for the \LaTeX\ Team to be responsible for distributing the -latest versions of these driver files. +latest versions of these driver files. Therefore the installation files for \package{graphics} have been split: there is now \file{graphics.ins} to install the package files and \file{graphics-drivers.ins} for the driver files (located in -\file{drivers.dtx}). -There is no need +\file{drivers.dtx}). +There is no need to install all those provided in the file \file{drivers.dtx}. Please also note that, as requested by the maintainers of @@ -203,28 +203,28 @@ programming environment. These packages have been lying dormant for some time while the \LaTeX\ Project Team were preoccupied by other things such as developing the experimental packages \package{xor}, \package{template}, etc., (and also writing that indispensable -and encyclopaedic volume,\\ +and encyclopaedic volume,\\ The \LaTeX{} Companion -- 2nd edition). In October 2004 work on this code base was resumed with the goal of some day turning it into a kernel for \LaTeX3. This work can now also make full use of the widely accepted \eTeX\ extensions. Currently -two areas are central to this work. +two areas are central to this work. -\begin{itemize} +\begin{itemize} \item Extending the - kernel code of \LaTeX3. + kernel code of \LaTeX3. \item Converting the experimental packages such as \package{xor}, \package{template} to use the new - syntax internally. -\end{itemize} + syntax internally. +\end{itemize} Beware! Development of \package{expl3} is happening so fast that the descriptions above might be out of date when you read this! If you wish to see what's going on then go to \url{http://www.latex-project.org/code.html} where you can download - fully working code (we hope!). + fully working code (we hope!). \end{document} diff --git a/Master/texmf-dist/source/latex/base/ltnews18.tex b/Master/texmf-dist/source/latex/base/ltnews18.tex index 94481d7f11b..4e6090c02b8 100644 --- a/Master/texmf-dist/source/latex/base/ltnews18.tex +++ b/Master/texmf-dist/source/latex/base/ltnews18.tex @@ -2,29 +2,29 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % Filename: ltnews18.tex % diff --git a/Master/texmf-dist/source/latex/base/ltnews21.tex b/Master/texmf-dist/source/latex/base/ltnews21.tex index 635aa890d55..b7c87d6f324 100644 --- a/Master/texmf-dist/source/latex/base/ltnews21.tex +++ b/Master/texmf-dist/source/latex/base/ltnews21.tex @@ -31,7 +31,7 @@ % This is issue 21 of LaTeX News. \documentclass{ltnews} - +\def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} \usepackage[T1]{fontenc} \usepackage{lmodern,url,hologo} @@ -45,10 +45,6 @@ \maketitle -\tableofcontents - -\bigskip - \section{Scheduled \LaTeX\ bug-fix release} This issue of \LaTeX~News marks the second bug-fix release of @@ -103,7 +99,7 @@ For this release we made the following changes to this package: single and double-column floats (as they are placed independently of each other). This was corrected in \textsf{fixltx2e} a few years ago but the fix was not perfect as one situation using - \verb=\enlargethispage= generated a low-level \TeX{} error. + \verb=\enlargethispage= generated a low-level \TeX{} error. This behaviour of the package is now improved. \end{itemize} @@ -134,7 +130,7 @@ The \textsf{inputenc} package allows different input encodings for \LaTeX\ documents to be specified including the important \texttt{utf8} option used to specify the Unicode UTF-8 encoding. A common mistake in documents has been to also include this option when -using the Unicode-based TeX engines \hologo{LuaTeX} and \hologo{XeTeX} +using the Unicode-based \TeX\ engines \hologo{LuaTeX} and \hologo{XeTeX} producing strange errors as these engines natively deal with UTF-8 characters. @@ -163,7 +159,7 @@ is now saved and restored when reading them instead of always using In the past each of the sub-directories in the ``required'' section of the \LaTeX{} distribution contained a single \texttt{.ins} file to generate the code files from the source files. We have now -started to provide individual \texttt{.ins} files for each those +started to provide individual \texttt{.ins} files for each of those packages that are likely to require updates outside a major \LaTeX{} release. @@ -207,7 +203,7 @@ at the start of list items, and to work if brace groups (\verb|{| and \paragraph{\textsf{color} updates} -The \verb|\nopagecolor| command suggested by Heiko Oberdiek, +The \verb|\nopagecolor| command suggested by Heiko Oberdiek, available for some years in the \textsf{pdftex} option, has been added to the core package as suggested in graphics/3873. Currently this is supported in the driver files for \textsf{dvips} and @@ -215,7 +211,7 @@ this is supported in the driver files for \textsf{dvips} and \paragraph{\textsf{graphicx} updates} -The \textsf{graphicx} version of \verb|\rotatebox| now allows +The \textsf{graphicx} version of \verb|\rotatebox| now allows \verb|\par| (and blank lines) in values, to match the change made to the \textsf{graphics} version some years ago. See graphics/4296. @@ -238,7 +234,7 @@ See graphics/3446. The substantial collection of innovative code in \textsf{expl3} implements a new programming language that has for a while now been used by some writers of \LaTeXe\ packages. This code has recently -also been made available for use on top of plain \TeX\ or {Context}, +also been made available for use on top of plain \TeX\ or {\ConTeXt}, largely to support generic packages that are supposed to work with different flavours of \TeX. These uses in no way affect authors of \LaTeX\ documents and such \LaTeXe\ packages will continue to work as @@ -247,13 +243,13 @@ advertised by their authors with standard \LaTeX. This code base will also become an important foundation for the kernel of \LaTeX3 and so the new programming language can be described as `The \LaTeX3 Programming Language'. However, if you see or hear that a -package `uses \LaTeX3' then it is remains very unlikely (yet) to mean +package `uses \LaTeX3' then it remains very unlikely (as yet) to mean that the package is part of some `new version of \LaTeX'. News about the development and use of \textsf{expl3} and about other developments in the \LaTeX3 code base is reported regularly in the \LaTeX3~News series (\url{http://latex-project.org/l3news/}), the most -recent issue of which was published in March of this year. +recent issue of which was published in March 2014. \end{document} diff --git a/Master/texmf-dist/source/latex/base/ltnews22.tex b/Master/texmf-dist/source/latex/base/ltnews22.tex new file mode 100644 index 00000000000..8d4151beac6 --- /dev/null +++ b/Master/texmf-dist/source/latex/base/ltnews22.tex @@ -0,0 +1,244 @@ +% \iffalse meta-comment +% +% Copyright 2015 +% The LaTeX3 Project and any individual authors listed elsewhere +% in this file. +% +% This file is part of the LaTeX base system. +% ------------------------------------------- +% +% It may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3c +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This file has the LPPL maintenance status "maintained". +% +% The list of all files belonging to the LaTeX base distribution is +% given in the file `manifest.txt'. See also `legal.txt' for additional +% information. +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with +% extension .ins) which are part of the distribution. +% +% \fi +% Filename: ltnews22.tex +% +% This is issue 22 of LaTeX News. + +\documentclass{ltnews} +\usepackage[T1]{fontenc} + +\usepackage{lmodern,url,hologo} + +\publicationmonth{January} +\publicationyear{2015} + +\publicationissue{22} + +\begin{document} + +\maketitle + +\section{New \LaTeXe\ bug-fix policy} + +\subsection{Introduction} + +For some years we have supplied bug fixes to the \LaTeXe\ kernel via the +\textsf{fixltx2e} package. This +kept the kernel stable, but at the expense of meaning that most users did not +benefit from bug fixes, and that some compromises +which were made to save space in the +machines of the time are still affecting most users today. + +In this release we have started a new update policy. All the fixes previously +available via \textsf{fixltx2e} are now enabled \emph{by default} in the +format, as are some further extensions for extended \TeX\ engines, \eTeX, +\hologo{XeTeX} and \hologo{LuaTeX}. Compatibility and stability are still +important considerations, and while most users will not notice these +improvements, or will want to benefit from them, a new \textsf{latexrelease} +package is provided that will revert all the changes and re-instate the +definitions from earlier releases. The package can also be used with older +releases to effectively \emph{update} the kernel to be equivalent to this 2015 +release. + +A new document, \textsf{latexchanges}, is distributed with the release +that documents all the changes to documented commands since the 2014 +\LaTeX\ release, and will be updated in future releases if further +changes have been made. + +\subsection{The \textsf{latexrelease} package} + +As noted above a new package is available to manage differences between \LaTeX\ +releases. If you wish to revert all changes back to the definitions as they +were in previous releases you may start your document requesting the \LaTeX{} release from May~2014: +\begin{verbatim} +\RequirePackage[2014/05/01]{latexrelease} +\documentclass{article} +\end{verbatim} +Conversely if you start a large project now and want to protect yourself +against possible future changes, you may start your document +\begin{verbatim} +\RequirePackage[2015/01/01]{latexrelease} +\documentclass{article} +\end{verbatim} +Then the version of \textsf{latexrelease} distributed with any future \LaTeX\ +release will revert any changes made in that format, and revert to the +definitions as they where at the beginning of 2015. + +If you wish to share a document using the latest features with a +user restricted to use an older +format, you may use the form above and make the \textsf{latexrelease} package +available on the older institution. The package will then update the format +definitions as needed to enable the older format to work as if dated on the date +specified in the package option. + +\subsection{The \cs{IncludeInRelease} command} + +The mechanism used in the \textsf{latexrelease} package is available for use in +package code. If in your \textsf{zzz} package you have +\begin{verbatim} +\RequirePackage{latexrelease} +\IncludeInRelease{2015/06/01} + {\zzz}{\zzz definition} + \def\zzz......new code +\EndIncludeInRelease +\IncludeInRelease{0000/00/00} + {\zzz}{\zzz definition} + \def\zzz....original +\EndIncludeInRelease +\end{verbatim} +then in a document using a format dated 2015/06/01 or later, the ``new code'' +will be used, and for documents being processed with an older format, the +``original'' code will be used. Note the format date here may be the original +format date as shown at the start of every \LaTeX\ run, or a format date +specified as a package option to the \textsf{latexrelease} package. + +So if the document has +\begin{verbatim} +\RequirePackage[2014/05/01]{latexrelease} +\documentclass{article} +\usepackage{zzz} +\end{verbatim} +then it will use the \emph{original} definition of \verb|\zzz| even if +processed with the current format, as the format acts as if dated 2014/05/01. + + +\subsection{Limitations of the approach} + +The new concept provides full backward and forward compatibility for +the \LaTeX{} format, i.e., with the help of a current +\textsf{latexrelease} package the kernel can emulate all released +formats (starting with 2014/06/01\footnote{Patching an older format + most likely works too, given that the changes in the past have been + minimal, though this isn't guaranteed and hasn't been tested.}). + + +However, this is not necessarily true for all packages. + Only if a package makes use of the \cs{IncludeInRelease} +functionality will it adjust to the +requested \LaTeX{} release date. Initially this will only be true for +a few selected package and in general it may not even be advisable for packages +that have their own well-established release cycles and methods. + +Thus, to regenerate a document with 100\,\% compatible behavior +it will still be necessary +to archive it together with all its inputs, for example, by archiving +the base distribution trees (and any modifications made). However, the +fact that a document requests a specific \LaTeX{} release date should +help identifying what release tree to use to achieve perfect accuracy. + + +\section{Updates to the kernel} + +\subsection{Updates incorporated from \textsf{fixltx2e}} + +The detailed list of changes incorporated from \textsf{fixltx2e} is +available in the new \textsf{latexchanges} document that is +distributed with this release. The main changes are that $2$-column +floats are kept in sequence with one column floats, corrections are +made to the \verb|\mark| system to ensure correct page headings in +$2$-column documents, several additional commands are made robust. + +\subsection{\eTeX\ register allocation} + +\LaTeX\ has traditionally used allocation routines inherited from plain \TeX\ +that allocated registers in the range $0$--$255$. Almost all distributions have +for some years used \eTeX\ based formats (or \hologo{XeTeX} or \hologo{LuaTeX}) +which have $2^{15}$ registers of each type ($2^{16}$ in the case of +\hologo{LuaTeX}). The \textsf{etex} package has been available to provided an +allocation mechanism for these extended registers but now the format will by +default allocate in a range suitable for the engine being used. The new +allocation mechanism is different to the \textsf{etex} package mechanism, and +supports \hologo{LuaTeX}'s full range and an allocation mechanism for \LaTeX\ +floats as described below. + +On \eTeX\ based engines, an additional command, \verb|\newmarks| is available +(as with the \textsf{etex} package) that allocates extended \eTeX\ marks, and +similarly if \hologo{XeTeX} is detected a new command +\verb|\newXeTeXintercharclass| is available, this is similar to the command +previously defined in the \texttt{xelatex.ini} file used to build the +\texttt{xelatex} format. + +\subsection{Additional \LaTeX{} float storage} + +\LaTeX's float placement algorithm needs to store floats (figures and tables) +until it finds a suitable page to output them. It allocates $18$ registers for +this storage, but this can often be insufficient. + The contributed \textsf{morefloats} package has +been available to extend this list, however it also only allocates from the +standard range $0$--$255$ so can not take advantage of the extended registers. +The new allocation mechanism in this release incorporates a new command +\verb|\extrafloats|. If you get the error: +\mbox{\texttt{Too many unprocessed floats.}} +then you can add (say) \verb|\extrafloats{500}| to the document preamble to +make many more boxes available to hold floats. + + +\subsection{Built-in support for Unicode engines} + +The kernel sources now detect the engine being used and adjust definitions +accordingly, this reduces the need for the ``\texttt{.ini}'' files used to make +the formats to patch definitions defined in \texttt{latex.ltx}. + +As noted above the format now includes extended allocation routines. + +The distribution includes a file \textsf{unicode-letters.def} derived from the +Unicode Consortium's Unicode Character Data files that details the upper and +lower case transformation data for the full Unicode range. This is used to set +the \verb|lccode| and \verb|uccode| values if a Unicode engine is being used, +rather than the values derived from the T1 font encoding which are used with +8-bit engines. + +Finally \verb|\typein| is modified if \hologo{LuaTeX} is detected +such that it works with this engine. + +\section{l3build} + +This release has been tested and built using a new build system implemented in +\textsf{lua} intended to be run on the \textsf{texlua} interpreter distributed +with modern \TeX\ distributions. It is already separately available +from CTAN. This replaces earlier build systems (based at various times on +\textsf{make}, \textsf{cons}, and Windows \textsf{bat} files). It allows the +sources to be tested and packaged on a range of platforms (within the team, +OS X, Windows, Linux and and cygwin platforms are used). It also allows the +format to be tested on \hologo{XeTeX} and \hologo{LuaTeX} as well as the +standard \hologo{pdfTeX}/\eTeX\ engines. + +\section{Hyperlinked documentation and TDS zip files} + +As well as updating the build system, the team have looked again at exactly +what gets released to \textsc{ctan}. Taking inspiration from Heiko Oberdiek's +\textsf{latex-tds} bundle, the PDF documentation provided now includes +hyperlinks where appropriate. This has been done without modifying the sources +such that users without \textsf{hyperref} available can still typeset the +documentation using only the core distribution. At the same time, the release +now includes ready-to-install TDS-style zip files. This will be of principal +interest to \TeX\ system maintainers, but end users with older machines who +wish to manually update \LaTeX\ will also benefit. + +\end{document} diff --git a/Master/texmf-dist/source/latex/base/ltoutenc.dtx b/Master/texmf-dist/source/latex/base/ltoutenc.dtx index 2a112fffd78..889567794cc 100644 --- a/Master/texmf-dist/source/latex/base/ltoutenc.dtx +++ b/Master/texmf-dist/source/latex/base/ltoutenc.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -44,7 +44,7 @@ %<*driver> % \fi \ProvidesFile{ltoutenc.dtx} - [2014/09/29 v1.99l LaTeX Kernel (font encodings)] + [2015/02/21 v1.99n LaTeX Kernel (font encodings)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltoutenc.dtx} @@ -59,13 +59,14 @@ Rainer Sch\"opf} \usepackage{textcomp} \begin{document} - \maketitle - \DocInput{\filename} + \MaintainedByLaTeXTeam{latex} + \maketitle + \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{2802} +% \CheckSum{2799} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -202,6 +203,8 @@ % \changes{v1.1}{1993/12/07}{Made all character numbers decimal.} % \changes{v1.1}{1993/12/07}{Removed a lot of equal signs and the % like.} +% \changes{v1.99m}{2015/02/21} +% {Removed autoload code} % % % \section{Font encodings} @@ -515,8 +518,6 @@ % |package| & generates |fontenc.sty| for % selecting encodings. \\ % |2ekernel| & for the kernel commands.\\ -% |autoload| & for the `autoload' kernel commands.\\ -% |autoerr| & for the autoerr.sty error message autoload file. % \end{tabular} % \end{center} % \changes{1.0d}{1993/07/17}{changed \cs{catcoding} @} @@ -564,7 +565,7 @@ % in |.def| files, for example |ot1enc.def| contains the definitions % for the |OT1| encoding. % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \message{font encodings,} % \end{macrocode} % @@ -720,15 +721,10 @@ % \changes{v1.7m}{1995/10/09}{Autoload error} % \changes{v1.7v}{1995/12/05}{Changed \cs{TextSymbolUnavailable} text} % \begin{macrocode} -%</2ekernel|autoload> -%<*2ekernel|autoerr> \gdef\TextSymbolUnavailable#1{% \@latex@error{% Command \protect#1 unavailable in encoding \cf@encoding% }\@eha} -%</2ekernel|autoerr> -%<autoload>\gdef\TextSymbolUnavailable{\@autoerr\TextSymbolUnavailable} -%<*2ekernel|autoload> % \end{macrocode} % The command |\@inmathwarn| produces a warning message if we are % currently in math mode. Note that since this command is used @@ -1427,7 +1423,7 @@ % \begin{macrocode} %\DeclareTextCommandDefault{\textregistered}{\textcircled{\scshape r}} \DeclareTextCommandDefault{\textregistered}{\textcircled{% - \check@mathfonts\fontsize\sf@size\z@\math@fontsfalse\selectfont R}} + \check@mathfonts\fontsize\sf@size\z@\math@fontsfalse\selectfont R}} \DeclareTextCommandDefault{\texttrademark}{\textsuperscript{TM}} \DeclareTextCommandDefault{\SS}{SS} % \end{macrocode} @@ -1476,7 +1472,7 @@ % % \begin{macrocode} \let\ldots\dots -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % % \changes{v1.6d}{1994/10/30}{Moved math commands here from ltmath.} @@ -1774,7 +1770,8 @@ \DeclareTextCommand{\k}{T1}[1] {\hmode@bgroup\ooalign{\null#1\crcr\hidewidth\char12}\egroup} \DeclareTextCommand{\textogonekcentered}{T1}[1] - {\hmode@bgroup\ooalign{\null#1\crcr\hidewidth\char12\hidewidth}\egroup} + {\hmode@bgroup\ooalign{% + \null#1\crcr\hidewidth\char12\hidewidth}\egroup} % \end{macrocode} % % Some symbols are constructed. @@ -2764,11 +2761,14 @@ % And here a summary to go in the transcript file: % \begin{macrocode} \PackageInfo{textcomp}{Sub-encoding information:\MessageBreak - \space\space 5 = only ISO-Adobe without \string\textcurrency\MessageBreak + \space\space 5 = only ISO-Adobe without + \string\textcurrency\MessageBreak \space\space 4 = 5 + \string\texteuro\MessageBreak \space\space 3 = 4 + \string\textohm\MessageBreak - \space\space 2 = 3 + \noexpand\textestimated+ \string\textcurrency\MessageBreak - \space\space 1 = TS1 - \noexpand\textcircled- \string\t\MessageBreak + \space\space 2 = 3 + \noexpand\textestimated+ + \string\textcurrency\MessageBreak + \space\space 1 = TS1 - \noexpand\textcircled- + \string\t\MessageBreak \space\space 0 = TS1 (full)\MessageBreak Font families with sub-encoding setting implement\MessageBreak only a restricted character set as indicated.\MessageBreak @@ -2778,7 +2778,7 @@ % % \begin{macro}{\DeclareEncodingSubset} % An encoding subset to which a font family belongs is declared by -% |\DeclareEncodingSubset| that take the major encoding as the +% the command |\DeclareEncodingSubset| that takes the major encoding as the % first argument (e.g., |TS1|), the family name as the second % argument (e.g., |cmr|), and the subset encoding id as a third, % (e.g., |0| for |cmr|). @@ -2980,7 +2980,8 @@ \valign{##\cr \vfil\hbox to 0.07em{\dimen@\f@size\p@ \math@fontsfalse - \fontsize{.7\dimen@}\z@\selectfont=\hss}\vfil\cr% + \fontsize{.7\dimen@}\z@\selectfont=\hss}% + \vfil\cr% \hbox{C}\crcr }% } @@ -3096,67 +3097,124 @@ % The |\textestimated| and |\textcurrency| are only provided for % fonts with subset encoding with id 2 or less. % \begin{macrocode} -\DeclareTextCommandDefault{\textestimated}{\tc@check@symbol3\textestimated} -\DeclareTextCommandDefault{\textcurrency}{\tc@check@symbol3\textcurrency} +\DeclareTextCommandDefault{\textestimated}% + {\tc@check@symbol3\textestimated} +\DeclareTextCommandDefault{\textcurrency}% + {\tc@check@symbol3\textcurrency} % \end{macrocode} % Nearly all of the remaining glyphs are provided only with fonts % with id 1 or 0, i.e., are essentially complete. % \begin{macrocode} -\DeclareTextCommandDefault{\capitaltie}{\tc@check@accent2\capitaltie} -\DeclareTextCommandDefault{\newtie}{\tc@check@accent2\newtie} -\DeclareTextCommandDefault{\capitalnewtie}{\tc@check@accent2\capitalnewtie} -\DeclareTextCommandDefault{\textleftarrow}{\tc@check@symbol2\textleftarrow} -\DeclareTextCommandDefault{\textrightarrow}{\tc@check@symbol2\textrightarrow} -\DeclareTextCommandDefault{\textblank}{\tc@check@symbol2\textblank} -\DeclareTextCommandDefault{\textdblhyphen}{\tc@check@symbol2\textdblhyphen} -\DeclareTextCommandDefault{\textzerooldstyle}{\tc@check@symbol2\textzerooldstyle} -\DeclareTextCommandDefault{\textoneoldstyle}{\tc@check@symbol2\textoneoldstyle} -\DeclareTextCommandDefault{\texttwooldstyle}{\tc@check@symbol2\texttwooldstyle} -\DeclareTextCommandDefault{\textthreeoldstyle}{\tc@check@symbol2\textthreeoldstyle} -\DeclareTextCommandDefault{\textfouroldstyle}{\tc@check@symbol2\textfouroldstyle} -\DeclareTextCommandDefault{\textfiveoldstyle}{\tc@check@symbol2\textfiveoldstyle} -\DeclareTextCommandDefault{\textsixoldstyle}{\tc@check@symbol2\textsixoldstyle} -\DeclareTextCommandDefault{\textsevenoldstyle}{\tc@check@symbol2\textsevenoldstyle} -\DeclareTextCommandDefault{\texteightoldstyle}{\tc@check@symbol2\texteightoldstyle} -\DeclareTextCommandDefault{\textnineoldstyle}{\tc@check@symbol2\textnineoldstyle} -\DeclareTextCommandDefault{\textlangle}{\tc@check@symbol2\textlangle} -\DeclareTextCommandDefault{\textrangle}{\tc@check@symbol2\textrangle} -\DeclareTextCommandDefault{\textmho}{\tc@check@symbol2\textmho} -\DeclareTextCommandDefault{\textbigcircle}{\tc@check@symbol2\textbigcircle} -\DeclareTextCommandDefault{\textuparrow}{\tc@check@symbol2\textuparrow} -\DeclareTextCommandDefault{\textdownarrow}{\tc@check@symbol2\textdownarrow} -\DeclareTextCommandDefault{\textborn}{\tc@check@symbol2\textborn} -\DeclareTextCommandDefault{\textdivorced}{\tc@check@symbol2\textdivorced} -\DeclareTextCommandDefault{\textdied}{\tc@check@symbol2\textdied} -\DeclareTextCommandDefault{\textleaf}{\tc@check@symbol2\textleaf} -\DeclareTextCommandDefault{\textmarried}{\tc@check@symbol2\textmarried} -\DeclareTextCommandDefault{\textmusicalnote}{\tc@check@symbol2\textmusicalnote} -\DeclareTextCommandDefault{\textdblhyphenchar}{\tc@check@symbol2\textdblhyphenchar} -\DeclareTextCommandDefault{\textdollaroldstyle}{\tc@check@symbol2\textdollaroldstyle} -\DeclareTextCommandDefault{\textcentoldstyle}{\tc@check@symbol2\textcentoldstyle} -\DeclareTextCommandDefault{\textcolonmonetary}{\tc@check@symbol2\textcolonmonetary} -\DeclareTextCommandDefault{\textwon}{\tc@check@symbol2\textwon} -\DeclareTextCommandDefault{\textnaira}{\tc@check@symbol2\textnaira} -\DeclareTextCommandDefault{\textguarani}{\tc@check@symbol2\textguarani} -\DeclareTextCommandDefault{\textpeso}{\tc@check@symbol2\textpeso} -\DeclareTextCommandDefault{\textlira}{\tc@check@symbol2\textlira} -\DeclareTextCommandDefault{\textrecipe}{\tc@check@symbol2\textrecipe} -\DeclareTextCommandDefault{\textinterrobang}{\tc@check@symbol2\textinterrobang} -\DeclareTextCommandDefault{\textinterrobangdown}{\tc@check@symbol2\textinterrobangdown} -\DeclareTextCommandDefault{\textdong}{\tc@check@symbol2\textdong} -\DeclareTextCommandDefault{\textpertenthousand}{\tc@check@symbol2\textpertenthousand} -\DeclareTextCommandDefault{\textpilcrow}{\tc@check@symbol2\textpilcrow} -\DeclareTextCommandDefault{\textbaht}{\tc@check@symbol2\textbaht} -\DeclareTextCommandDefault{\textnumero}{\tc@check@symbol2\textnumero} -\DeclareTextCommandDefault{\textdiscount}{\tc@check@symbol2\textdiscount} -\DeclareTextCommandDefault{\textopenbullet}{\tc@check@symbol2\textopenbullet} -\DeclareTextCommandDefault{\textservicemark}{\tc@check@symbol2\textservicemark} -\DeclareTextCommandDefault{\textlquill}{\tc@check@symbol2\textlquill} -\DeclareTextCommandDefault{\textrquill}{\tc@check@symbol2\textrquill} -\DeclareTextCommandDefault{\textcopyleft}{\tc@check@symbol2\textcopyleft} -\DeclareTextCommandDefault{\textcircledP}{\tc@check@symbol2\textcircledP} -\DeclareTextCommandDefault{\textreferencemark}{\tc@check@symbol2\textreferencemark} -\DeclareTextCommandDefault{\textsurd}{\tc@check@symbol2\textsurd} +\DeclareTextCommandDefault{\capitaltie}% + {\tc@check@accent2\capitaltie} +\DeclareTextCommandDefault{\newtie}% + {\tc@check@accent2\newtie} +\DeclareTextCommandDefault{\capitalnewtie}% + {\tc@check@accent2\capitalnewtie} +\DeclareTextCommandDefault{\textleftarrow}% + {\tc@check@symbol2\textleftarrow} +\DeclareTextCommandDefault{\textrightarrow}% + {\tc@check@symbol2\textrightarrow} +\DeclareTextCommandDefault{\textblank}% + {\tc@check@symbol2\textblank} +\DeclareTextCommandDefault{\textdblhyphen}% + {\tc@check@symbol2\textdblhyphen} +\DeclareTextCommandDefault{\textzerooldstyle}% + {\tc@check@symbol2\textzerooldstyle} +\DeclareTextCommandDefault{\textoneoldstyle}% + {\tc@check@symbol2\textoneoldstyle} +\DeclareTextCommandDefault{\texttwooldstyle}% + {\tc@check@symbol2\texttwooldstyle} +\DeclareTextCommandDefault{\textthreeoldstyle}% + {\tc@check@symbol2\textthreeoldstyle} +\DeclareTextCommandDefault{\textfouroldstyle}% + {\tc@check@symbol2\textfouroldstyle} +\DeclareTextCommandDefault{\textfiveoldstyle}% + {\tc@check@symbol2\textfiveoldstyle} +\DeclareTextCommandDefault{\textsixoldstyle}% + {\tc@check@symbol2\textsixoldstyle} +\DeclareTextCommandDefault{\textsevenoldstyle}% + {\tc@check@symbol2\textsevenoldstyle} +\DeclareTextCommandDefault{\texteightoldstyle}% + {\tc@check@symbol2\texteightoldstyle} +\DeclareTextCommandDefault{\textnineoldstyle}% + {\tc@check@symbol2\textnineoldstyle} +\DeclareTextCommandDefault{\textlangle}% + {\tc@check@symbol2\textlangle} +\DeclareTextCommandDefault{\textrangle}% + {\tc@check@symbol2\textrangle} +\DeclareTextCommandDefault{\textmho}% + {\tc@check@symbol2\textmho} +\DeclareTextCommandDefault{\textbigcircle}% + {\tc@check@symbol2\textbigcircle} +\DeclareTextCommandDefault{\textuparrow}% + {\tc@check@symbol2\textuparrow} +\DeclareTextCommandDefault{\textdownarrow}% + {\tc@check@symbol2\textdownarrow} +\DeclareTextCommandDefault{\textborn}% + {\tc@check@symbol2\textborn} +\DeclareTextCommandDefault{\textdivorced}% + {\tc@check@symbol2\textdivorced} +\DeclareTextCommandDefault{\textdied}% + {\tc@check@symbol2\textdied} +\DeclareTextCommandDefault{\textleaf}% + {\tc@check@symbol2\textleaf} +\DeclareTextCommandDefault{\textmarried}% + {\tc@check@symbol2\textmarried} +\DeclareTextCommandDefault{\textmusicalnote}% + {\tc@check@symbol2\textmusicalnote} +\DeclareTextCommandDefault{\textdblhyphenchar}% + {\tc@check@symbol2\textdblhyphenchar} +\DeclareTextCommandDefault{\textdollaroldstyle}% + {\tc@check@symbol2\textdollaroldstyle} +\DeclareTextCommandDefault{\textcentoldstyle}% + {\tc@check@symbol2\textcentoldstyle} +\DeclareTextCommandDefault{\textcolonmonetary}% + {\tc@check@symbol2\textcolonmonetary} +\DeclareTextCommandDefault{\textwon}% + {\tc@check@symbol2\textwon} +\DeclareTextCommandDefault{\textnaira}% + {\tc@check@symbol2\textnaira} +\DeclareTextCommandDefault{\textguarani}% + {\tc@check@symbol2\textguarani} +\DeclareTextCommandDefault{\textpeso}% + {\tc@check@symbol2\textpeso} +\DeclareTextCommandDefault{\textlira}% + {\tc@check@symbol2\textlira} +\DeclareTextCommandDefault{\textrecipe}% + {\tc@check@symbol2\textrecipe} +\DeclareTextCommandDefault{\textinterrobang}% + {\tc@check@symbol2\textinterrobang} +\DeclareTextCommandDefault{\textinterrobangdown}% + {\tc@check@symbol2\textinterrobangdown} +\DeclareTextCommandDefault{\textdong}% + {\tc@check@symbol2\textdong} +\DeclareTextCommandDefault{\textpertenthousand}% + {\tc@check@symbol2\textpertenthousand} +\DeclareTextCommandDefault{\textpilcrow}% + {\tc@check@symbol2\textpilcrow} +\DeclareTextCommandDefault{\textbaht}% + {\tc@check@symbol2\textbaht} +\DeclareTextCommandDefault{\textnumero}% + {\tc@check@symbol2\textnumero} +\DeclareTextCommandDefault{\textdiscount}% + {\tc@check@symbol2\textdiscount} +\DeclareTextCommandDefault{\textopenbullet}% + {\tc@check@symbol2\textopenbullet} +\DeclareTextCommandDefault{\textservicemark}% + {\tc@check@symbol2\textservicemark} +\DeclareTextCommandDefault{\textlquill}% + {\tc@check@symbol2\textlquill} +\DeclareTextCommandDefault{\textrquill}% + {\tc@check@symbol2\textrquill} +\DeclareTextCommandDefault{\textcopyleft}% + {\tc@check@symbol2\textcopyleft} +\DeclareTextCommandDefault{\textcircledP}% + {\tc@check@symbol2\textcircledP} +\DeclareTextCommandDefault{\textreferencemark}% + {\tc@check@symbol2\textreferencemark} +\DeclareTextCommandDefault{\textsurd}% + {\tc@check@symbol2\textsurd} % \end{macrocode} % The |\textcircled| and |\t| are handled specially, unless the % current font has a subset id of 0 (i.e. full \texttt{TS1}) we @@ -3165,9 +3223,11 @@ % get them from there. % \begin{macrocode} \DeclareTextCommandDefault{\textcircled} - {\CheckEncodingSubset\UseTextAccent{TS1}{\UseTextAccent{OMS}}1\textcircled} + {\CheckEncodingSubset\UseTextAccent{TS1}% + {\UseTextAccent{OMS}}1\textcircled} \DeclareTextCommandDefault{\t} - {\CheckEncodingSubset\UseTextAccent{TS1}{\UseTextAccent{OML}}1\t} + {\CheckEncodingSubset\UseTextAccent{TS1}% + {\UseTextAccent{OML}}1\t} % \end{macrocode} @@ -3302,12 +3362,14 @@ % Latin Modern and TeX Gyre: % \changes{v1.99k}{2009/10/28}{Added Latin Modern and TeX Gyre subsets} % \changes{v1.99l}{2009/11/04}{Added more Latin Modern and TeX Gyre subsets} +% \changes{v1.99m}{2015/02/16}{Added lmtt (Heiko Oberdiek) latex/4415} % \begin{macrocode} \DeclareEncodingSubset{TS1}{lmr} {0} \DeclareEncodingSubset{TS1}{lmdh} {0} \DeclareEncodingSubset{TS1}{lmss} {0} \DeclareEncodingSubset{TS1}{lmssq} {0} \DeclareEncodingSubset{TS1}{lmvtt} {0} +\DeclareEncodingSubset{TS1}{lmtt} {0} % \end{macrocode} % % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/base/ltoutenc.ins b/Master/texmf-dist/source/latex/base/ltoutenc.ins index fa7ea8af01c..88721d3d429 100644 --- a/Master/texmf-dist/source/latex/base/ltoutenc.ins +++ b/Master/texmf-dist/source/latex/base/ltoutenc.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/ltoutput.dtx b/Master/texmf-dist/source/latex/base/ltoutput.dtx index 5e2e7d6efb7..05bf6819e8b 100644 --- a/Master/texmf-dist/source/latex/base/ltoutput.dtx +++ b/Master/texmf-dist/source/latex/base/ltoutput.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -28,18 +28,16 @@ % \fi % \iffalse %%% From File: ltoutput.dtx -%<def1>\ProvidesFile{autoout1.sty} %<flafter>\ProvidesPackage{flafter} %<fltrace>\ProvidesPackage{fltrace} -%<def1,flafter,fltrace> [2014/04/24 v1.2n -%<def1> Output Routine autoload file] +%<flafter,fltrace> [2015/03/12 v1.2m %<flafter> Standard LaTeX floats after reference (FMi)] %<fltrace> Tracing LaTeX floats algorithm (FMi)] % %<*driver> % \fi \ProvidesFile{ltoutput.dtx} - [2014/09/29 v1.2n LaTeX Kernel (Output Routine)] + [2015/03/12 v1.2m LaTeX Kernel (Output Routine)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltoutput.dtx} @@ -47,13 +45,14 @@ \date{\filedate} \author{Leslie Lamport, Frank Mittelbach, Chris Rowley} \begin{document} -\maketitle -\DocInput{\filename} + \MaintainedByLaTeXTeam{latex} + \maketitle + \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{2799} +% \CheckSum{3696} % % % \iffalse @@ -119,6 +118,8 @@ % \changes{v1.1h}{1994/11/17} % {\cs{@tempa} to \cs{reserved@a}.} % \changes{v1.1m}{1995/05/07}{Use \cs{hb@xt@}.} +% \changes{v1.2n}{2015/02/21} +% {Removed autoload code} % % \StopEventually{} % @@ -142,7 +143,7 @@ % % \begin{oldcomments} % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \message{output,} % \end{macrocode} % **************************************** @@ -725,6 +726,15 @@ \gdef\@currlist{} \gdef\@deferlist{} \gdef\@dbltoplist{} +% \begin{macrocode} +% \changes{v1.2m}{2015/03/12} +% {initialise \cs{@dbldeferlist} again} +% The new algorithm stores page wide floats together with column floats +% in a single |\@deferlist| list. We keep |\@dbldeferlist| +% initialised as empty so that packages that are testing for +% deferred floats can use the same code for old or new float +% handling. +% \end{macrocode} \gdef\@dbldeferlist{} % \end{macrocode} % @@ -908,14 +918,14 @@ % \begin{macrocode} \def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page\else \hbox{}\newpage\if@twocolumn\hbox{}\newpage\fi\fi\fi} -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % % \begin{macro}{\onecolumn} % \changes{v1.0n}{1994/04/30}{Added setting of \cs{col@number}} % \begin{macrocode} -%<*2ekernel|autoload|fltrace> +%<*2ekernel|fltrace> \def\onecolumn{% \clearpage \global\columnwidth\textwidth @@ -1231,7 +1241,6 @@ \global \vsize \maxdimen \fi } -%</2ekernel|autoload|fltrace> % \end{macrocode} % % \begin{oldcomments} @@ -1246,7 +1255,6 @@ % \end{oldcomments} % % \begin{macrocode} -%<*2ekernel|def1|autoload|fltrace> \gdef\@specialoutput{% \ifnum \outputpenalty>-\@Mii \@doclearpage @@ -1304,7 +1312,6 @@ \advance \@pageht \skip\footins \advance \@pageht \dp\footins \fi -%<*2ekernel|def1> \ifvbox \@kludgeins % \end{macrocode} % We want to make the adjustment due to this insert only if the @@ -1319,7 +1326,6 @@ %</trace> \fi \fi -%</2ekernel|def1> % \end{macrocode} % This version puts the inserts back just before the additional % material; it could be moved earlier, before unboxing the @@ -1354,11 +1360,62 @@ \fi \fi } -%</2ekernel|def1|autoload|fltrace> +%</2ekernel|fltrace> % \end{macrocode} % \end{macro} % \end{macro} % +% \begin{macro}{\@testwrongwidth} +% \begin{macro}{\f@depth} +% \changes{v1.2n}{2015/02/21}{macro added(latexrelease)} +% +% Test if the float box has the wrong width when trying to place it +% into some area. (Actually +% the test is for a conventional depth setting rather than for the +% width of the float. For that reason the box depth was explicitly +% tailored when the float was created). +% \begin{macrocode} +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\@testwrongwidth}{float order in 2-column}% +%<*2ekernel|latexrelease|fltrace> +% \end{macrocode} +% +% \begin{macrocode} +\def\@testwrongwidth #1{% + \ifdim\dp#1=\f@depth +%<*trace> + \fl@trace{\string#1 + \ifdim\f@depth=\z@ single \else double \fi + column float -- ok}% +%</trace> + \else + \global\@testtrue +%<*trace> + \fl@trace{\string#1 + \ifdim\f@depth=\z@ double \else single \fi + column float -- wrong}% +%</trace> + \fi}% +% \end{macrocode} +% +% Normally looking for single column floats, which have zero depth. +% \begin{macrocode} +\let\f@depth\z@ +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease|fltrace> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\@testwrongwidth}{float order in 2-column}% +%<latexrelease>\let\@testwrongwidth\@undefined +%<latexrelease>\let\f@depth\@undefined +%<latexrelease>\EndIncludeInRelease +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% % \begin{macro}{\@doclearpage} % \task{CAR/FMi}{Investigate better float clearance} % \task{CAR/FMi}{Put non-boxes back in the `right place', or nowhere?} @@ -1372,16 +1429,18 @@ % for example, a kludge insert will be in quite the wrong place % and, worse, be irremovable and uncancelable. % +% \changes{v1.2n}{2015/01/14}{float order in 2-column (latexrelease)} +% All the remaining changes are replacing the double column defer list +% or inserting the extra test |\@testwrongwidth|\marg{box} at suitable +% places. That is at places where a box is taken off the deferlist. % \begin{macrocode} -%<*2ekernel|autoload> +%<latexrelease>\IncludeInRelease{2015/01/01}{\@doclearpage}% +%<latexrelease> {float order in 2-column}% +%<*2ekernel|latexrelease> \def \@doclearpage {% \ifvoid\footins % \end{macrocode} -% \changes{v1.2l}{2004/02/07}{Empty kludgeins box if necessary, pr/3528} -% We empty any left over kludge insert box here; this is a temporary fix. -% It should perhaps be applied to one page of cleared floats, but -% who cares? The whole of this stuff needs completely redoing for -% many such reasons. +% \changes{v1.2n}{2015/01/14}{Empty kludgeins box if necessary, pr/3528} % \begin{macrocode} \ifvbox\@kludgeins {\setbox \@tempboxa \box \@kludgeins}% @@ -1392,47 +1451,121 @@ \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa \setbox\@tempboxa\box\@cclv \xdef\@deferlist{\@toplist\@botlist\@deferlist}% -% \end{macrocode} -% \changes{v1.0h}{1993/12/12}{defs changed to lets} -% \begin{macrocode} \global \let \@toplist \@empty \global \let \@botlist \@empty \global \@colroom \@colht \ifx \@currlist\@empty \else \@latexerr{Float(s) lost}\@ehb -% \end{macrocode} -% \changes{v1.0h}{1993/12/12}{defs changed to lets} -% \begin{macrocode} \global \let \@currlist \@empty \fi \@makefcolumn\@deferlist \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% \if@twocolumn \if@firstcolumn - \xdef\@dbldeferlist{\@dbltoplist\@dbldeferlist}% % \end{macrocode} -% \changes{v1.0h}{1993/12/12}{defs changed to lets} +% +% \begin{macrocode} + \xdef\@deferlist{\@dbltoplist\@deferlist}% +% \end{macrocode} +% % \begin{macrocode} \global \let \@dbltoplist \@empty \global \@colht \textheight \begingroup \@dblfloatplacement - \@makefcolumn\@dbldeferlist +% \end{macrocode} +% +% \begin{macrocode} + \@makefcolumn\@deferlist \@whilesw\if@fcolmade \fi{\@outputpage - \@makefcolumn\@dbldeferlist}% + \@makefcolumn\@deferlist}% +% \end{macrocode} +% +% \begin{macrocode} \endgroup \else \vbox{}\clearpage \fi \fi +% \end{macrocode} +% the next line is needed to avoid losing floats in certain +% circumstances a single call to the original |\doclearpage| +% will now no longer output all floats. +% \changes{v1.2b}{2000/09/24}{FMi: ensure \cs{doclearpage} +% is called again until all floats are output.} +% \begin{macrocode} + \ifx\@deferlist\@empty \else\clearpage \fi \else \setbox\@cclv\vbox{\box\@cclv\vfil}% \@makecol\@opcol \clearpage \fi -} -%</2ekernel|autoload> +}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\@doclearpage}% +%<latexrelease> {float order in 2-column}% +%<latexrelease>\def \@doclearpage {% +%<latexrelease> \ifvoid\footins +% \end{macrocode} +% \changes{v1.2l}{2004/02/07}{Empty kludgeins box if necessary, pr/3528} +% We empty any left over kludge insert box here; this is a temporary fix. +% It should perhaps be applied to one page of cleared floats, but +% who cares? The whole of this stuff needs completely redoing for +% many such reasons. +% \begin{macrocode} +%<latexrelease> \ifvbox\@kludgeins +%<latexrelease> {\setbox \@tempboxa \box \@kludgeins}% +%<*trace> +%<latexrelease> \fl@trace {kludgeins box made void}% +%</trace> +%<latexrelease> \fi +%<latexrelease> \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa +%<latexrelease> \setbox\@tempboxa\box\@cclv +%<latexrelease> \xdef\@deferlist{\@toplist\@botlist\@deferlist}% +% \end{macrocode} +% \changes{v1.0h}{1993/12/12}{defs changed to lets} +% \begin{macrocode} +%<latexrelease> \global \let \@toplist \@empty +%<latexrelease> \global \let \@botlist \@empty +%<latexrelease> \global \@colroom \@colht +%<latexrelease> \ifx \@currlist\@empty +%<latexrelease> \else +%<latexrelease> \@latexerr{Float(s) lost}\@ehb +% \end{macrocode} +% \changes{v1.0h}{1993/12/12}{defs changed to lets} +% \begin{macrocode} +%<latexrelease> \global \let \@currlist \@empty +%<latexrelease> \fi +%<latexrelease> \@makefcolumn\@deferlist +%<latexrelease> \@whilesw\if@fcolmade \fi +%<latexrelease> {\@opcol\@makefcolumn\@deferlist}% +%<latexrelease> \if@twocolumn +%<latexrelease> \if@firstcolumn +%<latexrelease> \xdef\@dbldeferlist{\@dbltoplist\@dbldeferlist}% +% \end{macrocode} +% \changes{v1.0h}{1993/12/12}{defs changed to lets} +% \begin{macrocode} +%<latexrelease> \global \let \@dbltoplist \@empty +%<latexrelease> \global \@colht \textheight +%<latexrelease> \begingroup +%<latexrelease> \@dblfloatplacement +%<latexrelease> \@makefcolumn\@dbldeferlist +%<latexrelease> \@whilesw\if@fcolmade \fi +%<latexrelease> {\@outputpage\@makefcolumn\@dbldeferlist}% +%<latexrelease> \endgroup +%<latexrelease> \else +%<latexrelease> \vbox{}\clearpage +%<latexrelease> \fi +%<latexrelease> \fi +%<latexrelease> \else +%<latexrelease> \setbox\@cclv\vbox{\box\@cclv\vfil}% +%<latexrelease> \@makecol\@opcol +%<latexrelease> \clearpage +%<latexrelease> \fi +%<latexrelease> }% +%<latexrelease>\EndIncludeInRelease % \end{macrocode} % \end{macro} % @@ -1443,7 +1576,7 @@ % Several changes in detail here. % % \begin{macrocode} -%<*2ekernel|autoload|fltrace> +%<*2ekernel|fltrace> \def \@opcol {% \if@twocolumn \@outputdblcol @@ -1466,7 +1599,7 @@ \global \@mparbottom \z@ \global \@textfloatsheight \z@ \@floatplacement } -%</2ekernel|autoload|fltrace> +%</2ekernel|fltrace> % \end{macrocode} % \end{macro} % @@ -1481,7 +1614,7 @@ % produced. % % \begin{macrocode} -%<*2ekernel|def1|autoload> +%<*2ekernel> \gdef \@makecol {% \ifvoid\footins \setbox\@outputbox \box\@cclv @@ -1542,11 +1675,9 @@ % The variations start here in case |\enlargethispage| has % been used. % \begin{macrocode} -%<*2ekernel|def1> \ifvbox\@kludgeins \@makespecialcolbox \else -%</2ekernel|def1> % \end{macrocode} % This extra reboxing is only needed to add the % |\@texttop| and |\@textbotttom| but this could be done earlier, @@ -1588,12 +1719,9 @@ \vskip -\dimen@ \@textbottom }% -%<*2ekernel|def1> \fi -%</2ekernel|def1> \global \maxdepth \@maxdepth } -%</2ekernel|def1|autoload> % \end{macrocode} % \end{macro} % @@ -1604,13 +1732,12 @@ % page. % It has been put into a separate macro to expedite experimentation. % \begin{macrocode} -%<*2ekernel|def1|autoload> \gdef \@reinserts{% \ifvoid\footins\else\insert\footins{\unvbox\footins}\fi -%<+2ekernel|def1> \ifvbox\@kludgeins\insert\@kludgeins -%<+2ekernel|def1> {\unvbox\@kludgeins}\fi + \ifvbox\@kludgeins\insert\@kludgeins + {\unvbox\@kludgeins}\fi } -%</2ekernel|def1|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % @@ -1620,7 +1747,7 @@ % \changes{v1.0b}{1993/11/29}{Command added} % This implements certain variations in page-makeup. % \begin{macrocode} -%<*2ekernel|def1|fltrace> +%<*2ekernel|fltrace> \gdef \@makespecialcolbox {% %<*trace> \fl@trace{Kludgeins ht \the\ht\@kludgeins\space @@ -1731,7 +1858,7 @@ \fl@trace {kludgeins box made void}% %</trace> } -%</2ekernel|def1|fltrace> +%</2ekernel|fltrace> % \end{macrocode} % \end{macro} % @@ -1739,7 +1866,7 @@ % \begin{macro}{\@textbottom} % These do nothing as a default. % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \let \@texttop \relax \let \@textbottom \relax % \end{macrocode} @@ -2147,7 +2274,7 @@ }% \fi } -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % \end{macro} @@ -2168,7 +2295,7 @@ % The empty-list test has been moved to |\@tryfcolumn|. % % \begin{macrocode} -%<*2ekernel|autoload|fltrace> +%<*2ekernel|fltrace> \def \@startcolumn {% \global \@colroom \@colht \@tryfcolumn \@deferlist @@ -2193,29 +2320,53 @@ % % This one does not need to set |\@colht|. % +% \changes{v1.2n}{2015/01/14}{float order in 2-column (latexrelease)} % \begin{macrocode} +%</2ekernel|fltrace> +%<latexrelease|fltrace>\IncludeInRelease{2015/01/01}% +%<latexrelease|fltrace> {\@startdblcolumn}{float order in 2-column}% +%<*2ekernel|latexrelease|fltrace> \def \@startdblcolumn {% + \@tryfcolumn \@deferlist + \if@fcolmade +%<fltrace> \fl@trace{PAGE: double float page completed}% + \else + \begingroup + \let \reserved@b \@deferlist + \global \let \@deferlist \@empty + \let \@elt \@sdblcolelt + \reserved@b + \endgroup + \fi +}% +%</2ekernel|latexrelease|fltrace> +%<latexrelease|fltrace>\EndIncludeInRelease +%<latexrelease|fltrace>\IncludeInRelease{0000/00/00}% +%<latexrelease|fltrace> {\@startdblcolumn}{float order in 2-column}% +%<latexrelease|fltrace>\def \@startdblcolumn {% % \end{macrocode} % Not needed since this always comes after |\@outputpage|: % \begin{macrocode} -% \global \@colht \textheight - \@tryfcolumn \@dbldeferlist - \if@fcolmade +%<latexrelease|fltrace>% \global \@colht \textheight +%<latexrelease|fltrace> \@tryfcolumn \@dbldeferlist +%<latexrelease|fltrace> \if@fcolmade %<*trace> - \fl@trace{PAGE: double float page completed}% +%<latexrelease|fltrace> \fl@trace{PAGE: double float page completed}% %</trace> - \else +%<latexrelease|fltrace> \else % \end{macrocode} % \changes{v1.0h}{1993/12/12}{defs changed to lets} % \begin{macrocode} - \begingroup - \let \reserved@b \@dbldeferlist - \global \let \@dbldeferlist \@empty - \let \@elt \@sdblcolelt - \reserved@b - \endgroup - \fi -} +%<latexrelease|fltrace> \begingroup +%<latexrelease|fltrace> \let \reserved@b \@dbldeferlist +%<latexrelease|fltrace> \global \let \@dbldeferlist \@empty +%<latexrelease|fltrace> \let \@elt \@sdblcolelt +%<latexrelease|fltrace> \reserved@b +%<latexrelease|fltrace> \endgroup +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace>}% +%<latexrelease|fltrace>\EndIncludeInRelease +%<*2ekernel|fltrace> % \end{macrocode} % \end{macro} % \end{macro} @@ -2247,13 +2398,13 @@ \fi \fi } -%</2ekernel|autoload|fltrace> +%</2ekernel|fltrace> % \end{macrocode} % % \end{macro} % % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> % \end{macrocode} % % \begin{macro}{\@scolelt} @@ -2298,7 +2449,12 @@ % % \begin{macro}{\@xtryfc} % \changes{v1.1v}{1996/07/26}{remove \cs{global} before \cs{@test...}} +% \changes{v1.2n}{2015/01/14}{float order in 2-column (latexrelease)} % \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}{\@xtryfc}% +%<latexrelease> {float order in 2-column}% +%<*2ekernel|latexrelease> \def\@xtryfc #1{% \@next\reserved@a\@trylist{}{}% \@currtype \count #1% @@ -2306,14 +2462,42 @@ \multiply\@currtype\@xxxii \@bitor \@currtype \@failedlist \@testfp #1% +% \end{macrocode} +% +% \begin{macrocode} + \@testwrongwidth #1% +% \end{macrocode} +% +% \begin{macrocode} \ifdim \ht #1>\@colht - \@testtrue + \@testtrue \fi \if@test \@cons\@failedlist #1% \else \@ytryfc #1% - \fi} + \fi}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\@xtryfc}% +%<latexrelease> {float order in 2-column}% +%<latexrelease>\def\@xtryfc #1{% +%<latexrelease> \@next\reserved@a\@trylist{}{}% +%<latexrelease> \@currtype \count #1% +%<latexrelease> \divide\@currtype\@xxxii +%<latexrelease> \multiply\@currtype\@xxxii +%<latexrelease> \@bitor \@currtype \@failedlist +%<latexrelease> \@testfp #1% +%<latexrelease> \ifdim \ht #1>\@colht +%<latexrelease> \@testtrue +%<latexrelease> \fi +%<latexrelease> \if@test +%<latexrelease> \@cons\@failedlist #1% +%<latexrelease> \else +%<latexrelease> \@ytryfc #1% +%<latexrelease> \fi}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -2340,15 +2524,28 @@ % % \begin{macro}{\@ztryfc} % \changes{v1.1v}{1996/07/26}{remove \cs{global} before \cs{@test...}} +% \changes{v1.2n}{2015/01/14}{float order in 2-column (latexrelease)} % \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}{@ztryfc}% +%<latexrelease> {float order in 2-column}% +%<*2ekernel|latexrelease> \def\@ztryfc #1{% - \@tempcnta \count#1% + \@tempcnta\count #1% \divide\@tempcnta\@xxxii \multiply\@tempcnta\@xxxii \@bitor \@tempcnta {\@failedlist \@flfail}% \@testfp #1% +% \end{macrocode} +% +% not in fixfloats? +% \begin{macrocode} + \@testwrongwidth #1% +% \end{macrocode} +% +% \begin{macrocode} \@tempdimb\@tempdima - \advance\@tempdimb \ht#1% + \advance\@tempdimb\ht #1% \advance\@tempdimb\@fpsep \ifdim \@tempdimb >\@colht \@testtrue @@ -2358,13 +2555,33 @@ \else \@cons\@flsucceed #1% \@tempdima\@tempdimb - \fi} + \fi}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{@ztryfc}% +%<latexrelease> {float order in 2-column}% +%<latexrelease>\def\@ztryfc #1{% +%<latexrelease> \@tempcnta \count#1% +%<latexrelease> \divide\@tempcnta\@xxxii +%<latexrelease> \multiply\@tempcnta\@xxxii +%<latexrelease> \@bitor \@tempcnta {\@failedlist \@flfail}% +%<latexrelease> \@testfp #1% +%<latexrelease> \@tempdimb\@tempdima +%<latexrelease> \advance\@tempdimb \ht#1% +%<latexrelease> \advance\@tempdimb\@fpsep +%<latexrelease> \ifdim \@tempdimb >\@colht +%<latexrelease> \@testtrue +%<latexrelease> \fi +%<latexrelease> \if@test +%<latexrelease> \@cons\@flfail #1% +%<latexrelease> \else +%<latexrelease> \@cons\@flsucceed #1% +%<latexrelease> \@tempdima\@tempdimb +%<latexrelease> \fi}% +%<latexrelease>\EndIncludeInRelease % \end{macrocode} % \end{macro} % -% \begin{macrocode} -%</2ekernel|autoload> -% \end{macrocode} % % The major changes for float suppression and the changes to the float % mechanism to make it conform to the documentation are in these next @@ -2375,7 +2592,7 @@ % Lots of changes. % % \begin{macrocode} -%<*2ekernel|autoload|fltrace> +%<*2ekernel|fltrace> \def \@addtobot {% %<*trace> \fl@trace{***Start addtobot}% @@ -2449,7 +2666,7 @@ %</trace> \if@test %<*trace> - \fl@trace{type already on list: mid or bot---sent to addtobot}% + \fl@trace{type already on list: mid or bot---sent to addtobot}% %</trace> \else \@flupdates \@topnum \@toproom \@toplist @@ -2480,7 +2697,7 @@ \@addtobot \fi } -%</2ekernel|autoload|fltrace> +%</2ekernel|fltrace> % \end{macrocode} % \end{macro} % @@ -2490,8 +2707,11 @@ % \task{CAR}{Investigate pagebreak option possibilities} % Lots of changes. % +% \changes{v1.2n}{2015/01/14}{float order in 2-column (latexrelease)} % \begin{macrocode} -%<*2ekernel|autoload|fltrace|flafter> +%<latexrelease|fltrace|flafter>\IncludeInRelease{2015/01/01}% +%<latexrelease|fltrace|flafter> {\@addtocurcol}{float order in 2-column}% +%<*2ekernel|latexrelease|fltrace|flafter> \def \@addtocurcol {% %<*trace> \fl@trace{***Start addtocurcol}% @@ -2546,6 +2766,16 @@ \@flsetnum \@colnum \ifnum \@colnum>\z@ \@bitor\@currtype\@deferlist +% \end{macrocode} +% We need to defer the float also if its width +% doesn't fit. +% \changes{v1.2n}{2000/09/24}{FMi: test for wide float was +% in wrong place} +% \begin{macrocode} + \@testwrongwidth\@currbox +% \end{macrocode} +% +% \begin{macrocode} %<*trace> \fl@trace{deferlist: \@deferlist: (addtocurcol-before)}% %</trace> @@ -2579,10 +2809,10 @@ \global \advance \@textfloatsheight 2\intextsep \@cons \@midlist \@currbox %<*trace> - \fl@trace{***Success: here}% - \fl@trace{textfloatsheight (after-here) = - \the \@textfloatsheight}% - \fl@trace{colnum (after-here) = \the \@colnum}% + \fl@trace{***Success: here}% + \fl@trace{textfloatsheight (after-here) = + \the \@textfloatsheight}% + \fl@trace{colnum (after-here) = \the \@colnum}% %</trace> % \end{macrocode} % @@ -2649,18 +2879,18 @@ % \texttt{flafter} package. Guess that could have been done a bit % more obvious :-) % \begin{macrocode} -%<*2ekernel|autoload|fltrace> +%<*2ekernel|fltrace|latexrelease> %<*trace> \fl@trace{not here: sent to addtotoporbot}% %</trace> \@addtotoporbot -%</2ekernel|autoload|fltrace> -%<*!2ekernel&!autoload&!fltrace> +%</2ekernel|fltrace|latexrelease> +%<*!2ekernel&!fltrace> %<*trace> \fl@trace{not here: sent to addtobot}% %</trace> \@addtobot -%</!2ekernel&!autoload&!fltrace> +%</!2ekernel&!fltrace> \fi \fi \fi @@ -2692,8 +2922,234 @@ \fl@trace{deferlist: \@deferlist: (addtocurcol-after)}% %</trace> \fi -} -%</2ekernel|autoload|fltrace|flafter> +}% +%</2ekernel|latexrelease|fltrace|flafter> +%<latexrelease|fltrace|flafter>\EndIncludeInRelease +%<latexrelease|fltrace|flafter>\IncludeInRelease{0000/00/00}% +%<latexrelease|fltrace|flafter> {\@addtocurcol}{float order in 2-column}% +%<latexrelease|fltrace|flafter>\def \@addtocurcol {% +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{***Start addtocurcol}% +%</trace> +%<latexrelease|fltrace|flafter> \@insertfalse +%<latexrelease|fltrace|flafter> \@setfloattypecounts +%<latexrelease|fltrace|flafter> \ifnum \@fpstype=8 +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{fpstype !p only (addtocurcol): +%<latexrelease|fltrace|flafter> \the \@fpstype = 8?}% +%</trace> +%<latexrelease|fltrace|flafter> \else +%<latexrelease|fltrace|flafter> \ifnum \@fpstype=24 +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{fpstype p only (addtocurcol): +%<latexrelease|fltrace|flafter> \the \@fpstype = 24?}% +%</trace> +%<latexrelease|fltrace|flafter> \else +%<latexrelease|fltrace|flafter> \@flsettextmin +% \end{macrocode} +% This is a new adjustment which is quite a major change in +% functionality; but it implements the documentation. +% Note that |\@reqcolroom| will include the whole of the +% page-so-far, and hence includes |\@textfloatsheight| of floats, +% so before comparing it with |\@textmin|, we add this to +% |\@textmin| also. +% \begin{macrocode} +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{textfloatsheight (before) = +%<latexrelease|fltrace|flafter> \the \@textfloatsheight}% +%</trace> +%<latexrelease|fltrace|flafter> \advance \@textmin \@textfloatsheight +%<latexrelease|fltrace|flafter> \@reqcolroom \@pageht +% \end{macrocode} +% This line must be removed since |\@specialoutput| changed. +% \begin{macrocode} +% \advance \@reqcolroom \@pagedp +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{textmin + textfloatsheight: +%<latexrelease|fltrace|flafter> \the \@textmin}% +%<latexrelease|fltrace|flafter> \fl@trace{page-so-far: \the \@reqcolroom}% +%<latexrelease|fltrace|flafter> +%</trace> +%<latexrelease|fltrace|flafter> \ifdim \@textmin>\@reqcolroom +%<latexrelease|fltrace|flafter> \@reqcolroom \@textmin +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{ORD? textmin being used}% +%</trace> +%<latexrelease|fltrace|flafter> \fi +%<latexrelease|fltrace|flafter> \advance \@reqcolroom \ht\@currbox +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{float size = +%<latexrelease|fltrace|flafter> \the \ht \@currbox (addtocurcol)}% +%<latexrelease|fltrace|flafter> \fl@trace{colroom = +%<latexrelease|fltrace|flafter> \the \@colroom (addtocurcol)}% +%<latexrelease|fltrace|flafter> \fl@trace{reqcolroom = +%<latexrelease|fltrace|flafter> \the \@reqcolroom (addtocurcol)}% +%</trace> +%<latexrelease|fltrace|flafter> \ifdim \@colroom>\@reqcolroom +%<latexrelease|fltrace|flafter> \@flsetnum \@colnum +%<latexrelease|fltrace|flafter> \ifnum \@colnum>\z@ +%<latexrelease|fltrace|flafter> \@bitor\@currtype\@deferlist +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{deferlist: +%<latexrelease|fltrace|flafter> \@deferlist: (addtocurcol-before)}% +%</trace> +%<latexrelease|fltrace|flafter> \if@test +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{type already on list: +%<latexrelease|fltrace|flafter> defer (addtocurcol)}% +%</trace> +%<latexrelease|fltrace|flafter> \else +%<latexrelease|fltrace|flafter> \@bitor\@currtype\@botlist +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{botlist: \@botlist: +%<latexrelease|fltrace|flafter> (addtocurcol-before)}% +%</trace> +%<latexrelease|fltrace|flafter> \if@test +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{type already on list: +%<latexrelease|fltrace|flafter> bot---sent to addtobot}% +%</trace> +%<latexrelease|fltrace|flafter> \@addtobot +%<latexrelease|fltrace|flafter> \else +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{fpstype +%<latexrelease|fltrace|flafter> \ifodd \@tempcnta OK \else not \fi +%<latexrelease|fltrace|flafter> here: \the \@fpstype}% +%</trace> +%<latexrelease|fltrace|flafter> \ifodd \count\@currbox +%<latexrelease|fltrace|flafter> \advance \@reqcolroom \intextsep +%<latexrelease|fltrace|flafter> \ifdim \@colroom>\@reqcolroom +%<latexrelease|fltrace|flafter> \global \advance \@colnum \m@ne +%<latexrelease|fltrace|flafter> \global \advance +%<latexrelease|fltrace|flafter> \@textfloatsheight\ht\@currbox +% \end{macrocode} +% This may sometimes give an overestimate. +% \begin{macrocode} +%<latexrelease|fltrace|flafter> \global \advance +%<latexrelease|fltrace|flafter> \@textfloatsheight 2\intextsep +%<latexrelease|fltrace|flafter> \@cons \@midlist \@currbox +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{***Success: here}% +%<latexrelease|fltrace|flafter> \fl@trace{textfloatsheight +%<latexrelease|fltrace|flafter> (after-here) = +%<latexrelease|fltrace|flafter> \the \@textfloatsheight}% +%<latexrelease|fltrace|flafter> \fl@trace{colnum (after-here) = +%<latexrelease|fltrace|flafter> \the \@colnum}% +%</trace> +% \end{macrocode} +% +% CHANGE TO |\@addtocurcol|: +% +% |\penalty\z@| changed to |\penalty\interlinepenalty| so |\samepage| +% works properly with figure and table environments. +% (Changed 23 Oct 86) +% +% There is also an |\addpenalty\interlinepenalty| above. +% +% Since in 2e |\samepage| is no longer supported, these could be +% removed. +% +% Although it is best to use |\addvspace| in case two h floats come +% together, this makes other spacing more difficult to adjust; whereas +% if a user specifies two h floats together then they can more easily +% get the spacing correct by ad hoc commands. +% +% It is necessary to adjust for the addition of |\parskip| here in +% case the float is added between paragraphs (\ie when in vertical +% mode). +% +% If the nobreak switch is true we need to reset it and clear +% |\everypar| since the float may not reset the flag and cannot reset +% the |\everypar| globally. +% \changes{v1.0l}{1994/03/15}{Changed \cs{addvspace} to \cs{vskip}} +% \changes{v1.1i}{1994/11/21} +% {Added \cs{if@nobreak} test before float box} +% \changes{v1.1z}{1996/10/24}{Added \cs{nobreak}, etc as appropriate} +% +% Typesetting starts here (we are in vertical mode). +% \begin{macrocode} +%<latexrelease|fltrace|flafter> \if@nobreak +%<latexrelease|fltrace|flafter> \nobreak +%<latexrelease|fltrace|flafter> \@nobreakfalse +%<latexrelease|fltrace|flafter> \everypar{}% +%<latexrelease|fltrace|flafter> \else +%<latexrelease|fltrace|flafter> \addpenalty\interlinepenalty +%<latexrelease|fltrace|flafter> \fi +%<latexrelease|fltrace|flafter> \vskip \intextsep +%<latexrelease|fltrace|flafter> \box\@currbox +%<latexrelease|fltrace|flafter> \penalty\interlinepenalty +%<latexrelease|fltrace|flafter> \vskip\intextsep +%<latexrelease|fltrace|flafter> \ifnum\outputpenalty +%<latexrelease|fltrace|flafter> <-\@Mii \vskip +%<latexrelease|fltrace|flafter> -\parskip\fi +% \end{macrocode} +% Typesetting ends here. +% \begin{macrocode} +%<latexrelease|fltrace|flafter> \outputpenalty \z@ +%<latexrelease|fltrace|flafter> \@inserttrue +%<*trace> +%<latexrelease|fltrace|flafter> \else +%<latexrelease|fltrace|flafter> \fl@trace{Fail---no room at 2nd test of colroom +%<latexrelease|fltrace|flafter> (addtocorcol \string\intextsep)}% +%</trace> +%<latexrelease|fltrace|flafter> \fi +%<latexrelease|fltrace|flafter> \fi +%<latexrelease|fltrace|flafter> \if@insert +%<latexrelease|fltrace|flafter> \else +% \end{macrocode} +% Next set of docstrip guards are a bit weird, essentially +% |\@addtotoporbot| ends up inside the kernel and the +% \texttt{fltrace} package and |\@addtotoporbot| shows up in the +% \texttt{flafter} package. Guess that could have been done a bit +% more obvious :-) +% \begin{macrocode} +%<*2ekernel|fltrace> +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{not here: sent to addtotoporbot}% +%</trace> +%<latexrelease|fltrace|flafter> \@addtotoporbot +%</2ekernel|fltrace> +%<*!2ekernel&!autoload&!fltrace> +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{not here: sent to addtobot}% +%</trace> +%<latexrelease|fltrace|flafter> \@addtobot +%</!2ekernel&!autoload&!fltrace> +%<latexrelease|fltrace|flafter> \fi +%<latexrelease|fltrace|flafter> \fi +%<latexrelease|fltrace|flafter> \fi +%<*trace> +%<latexrelease|fltrace|flafter> \else +%<latexrelease|fltrace|flafter> \fl@trace{Fail: colnum = \the \@colnum: +%<latexrelease|fltrace|flafter> fpstype \the \@fpstype=ORD?}% +%<latexrelease|fltrace|flafter> \ifnum \@fpstype<\sixt@@n +%<latexrelease|fltrace|flafter> \fl@trace{ERROR: BANG float not successful +%<latexrelease|fltrace|flafter> (addtocurcol)}% +%<latexrelease|fltrace|flafter> \fi +%</trace> +%<latexrelease|fltrace|flafter> \fi +%<*trace> +%<latexrelease|fltrace|flafter> \else +%<latexrelease|fltrace|flafter> \fl@trace{Fail---no room: fl box ht: +%<latexrelease|fltrace|flafter> \the \ht \@currbox (addtocurcol)}% +%</trace> +%<latexrelease|fltrace|flafter> \fi +%<latexrelease|fltrace|flafter> \fi +%<latexrelease|fltrace|flafter> \fi +%<latexrelease|fltrace|flafter> \if@insert +%<latexrelease|fltrace|flafter> \else +%<latexrelease|fltrace|flafter> \@resethfps +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{put on deferlist (addtocurcol)}% +%</trace> +%<latexrelease|fltrace|flafter> \@cons\@deferlist\@currbox +%<*trace> +%<latexrelease|fltrace|flafter> \fl@trace{deferlist: \@deferlist: +%<latexrelease|fltrace|flafter> (addtocurcol-after)}% +%</trace> +%<latexrelease|fltrace|flafter> \fi +%<latexrelease|fltrace|flafter> }% +%<latexrelease|fltrace|flafter>\EndIncludeInRelease % \end{macrocode} % \end{macro} % @@ -2701,8 +3157,11 @@ % \changes{v1.0f}{1993/12/05}{Command changed} % Lots of changes. % +% \changes{v1.2n}{2015/01/14}{float order in 2-column (latexrelease)} % \begin{macrocode} -%<*2ekernel|autoload|fltrace> +%<latexrelease|fltrace>\IncludeInRelease{2015/01/01} +%<latexrelease|fltrace> {\@addtonextcol}{float order in 2-column}% +%<*2ekernel|fltrace> \def\@addtonextcol{% \begingroup %<*trace> @@ -2740,6 +3199,13 @@ %<*trace> \fl@trace{deferlist: \@deferlist: (addtonextcol-before)}% %</trace> +% \end{macrocode} +% +% \begin{macrocode} + \@testwrongwidth\@currbox +% \end{macrocode} +% +% \begin{macrocode} \if@test %<*trace> \fl@trace{type already on list: defer (addtonextcol)}% @@ -2770,23 +3236,124 @@ %</trace> \fi %<*trace> - \fl@trace{End of addtonextcol -- locally counts:}% - \fl@trace{ col: \the \@colnum. top: \the \@topnum. bot: \the \@botnum.}% + \fl@trace{End of addtonextcol -- locally counts:}% + \fl@trace{col: \the\@colnum. top: \the \@topnum. bot: \the \@botnum.}% %</trace> \endgroup %<*trace> - \fl@trace{End of addtonextcol -- globally counts:}% - \fl@trace{col: \the \@colnum. top: \the \@topnum. bot: \the \@botnum.}% + \fl@trace{End of addtonextcol -- globally counts:}% + \fl@trace{col: \the\@colnum. top: \the \@topnum. bot: \the \@botnum.}% %</trace> -} +}% +%</2ekernel|fltrace> +%<latexrelease|fltrace>\EndIncludeInRelease +%<latexrelease|fltrace>\IncludeInRelease{0000/00/00}% +%<latexrelease|fltrace> {\@addtonextcol}{float order in 2-column}% +%<latexrelease|fltrace>\def\@addtonextcol{% +%<latexrelease|fltrace> \begingroup +%<*trace> +%<latexrelease|fltrace> \fl@trace{***Start addtonextcol}% +%</trace> +%<latexrelease|fltrace> \@insertfalse +%<latexrelease|fltrace> \@setfloattypecounts +%<latexrelease|fltrace> \ifnum \@fpstype=8 +%<*trace> +%<latexrelease|fltrace> \fl@trace{fpstype not curcol: +%<latexrelease|fltrace> \the \@fpstype = 8?}% +%</trace> +%<latexrelease|fltrace> \else +%<latexrelease|fltrace> \ifnum \@fpstype=24 +%<*trace> +%<latexrelease|fltrace> \fl@trace{fpstype not curcol: +%<latexrelease|fltrace> \the \@fpstype = 24?}% +%</trace> +%<latexrelease|fltrace> \else +%<latexrelease|fltrace> \@flsettextmin +%<*trace> +%<latexrelease|fltrace> \fl@trace{text-so-far: 0pt (top of col)}% +%</trace> +%<latexrelease|fltrace> \@reqcolroom \ht\@currbox +%<*trace> +%<latexrelease|fltrace> \fl@trace{float size: +%<latexrelease|fltrace> \the \@reqcolroom (addtonextcol)}% +%<latexrelease|fltrace> +%</trace> +%<latexrelease|fltrace> \advance \@reqcolroom \@textmin +%<*trace> +%<latexrelease|fltrace> \fl@trace{colroom = +%<latexrelease|fltrace> \the \@colroom (addtonextcol)}% +%<latexrelease|fltrace> \fl@trace{reqcolroom = +%<latexrelease|fltrace> \the \@reqcolroom (addtonextcol)}% +%</trace> +%<latexrelease|fltrace> \ifdim \@colroom>\@reqcolroom +%<latexrelease|fltrace> \@flsetnum \@colnum +%<latexrelease|fltrace> \ifnum\@colnum>\z@ +%<latexrelease|fltrace> \@bitor\@currtype\@deferlist +%<*trace> +%<latexrelease|fltrace> \fl@trace{deferlist: \@deferlist: +%<latexrelease|fltrace> (addtonextcol-before)}% +%</trace> +%<latexrelease|fltrace> \if@test +%<*trace> +%<latexrelease|fltrace> \fl@trace{type already on list: +%<latexrelease|fltrace> defer (addtonextcol)}% +%</trace> +%<latexrelease|fltrace> \else +%<*trace> +%<latexrelease|fltrace> \fl@trace{sent to addtotoporbot +%<latexrelease|fltrace> (addtonextcol)}% +%</trace> +%<latexrelease|fltrace> \@addtotoporbot +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace> \fi +%<*trace> +%<latexrelease|fltrace> \else +%<latexrelease|fltrace> \fl@trace{Fail---no room: fl box ht: +%<latexrelease|fltrace> \the \ht \@currbox (addtonextcol)}% +%</trace> +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace> \if@insert +%<latexrelease|fltrace> \else +%<*trace> +%<latexrelease|fltrace> \fl@trace{put back on deferlist +%<latexrelease|fltrace> (addtonextcol)}% +%</trace> +%<latexrelease|fltrace> \@cons\@deferlist\@currbox +%<*trace> +%<latexrelease|fltrace> \fl@trace{deferlist: \@deferlist: +%<latexrelease|fltrace> (addtonextcol-after)}% +%</trace> +%<latexrelease|fltrace> \fi +%<*trace> +%<latexrelease|fltrace> \fl@trace{End of addtonextcol -- +%<latexrelease|fltrace> locally counts:}% +%<latexrelease|fltrace> \fl@trace{col: \the \@colnum. +%<latexrelease|fltrace> top: \the \@topnum. bot: \the \@botnum.}% +%</trace> +%<latexrelease|fltrace> \endgroup +%<*trace> +%<latexrelease|fltrace> \fl@trace{End of addtonextcol -- +%<latexrelease|fltrace> globally counts:}% +%<latexrelease|fltrace> \fl@trace{col: \the \@colnum. +%<latexrelease|fltrace> top: \the \@topnum. bot: \the \@botnum.}% +%</trace> +%<latexrelease|fltrace>}% +%<latexrelease|fltrace>\EndIncludeInRelease % \end{macrocode} +% % \end{macro} % % \begin{macro}{\@addtodblcol} % \changes{v1.0f}{1993/12/05}{Command changed} % Lots of changes. % +% \changes{v1.2n}{2015/01/14}{float order in 2-column (latexrelease)} % \begin{macrocode} +%<latexrelease|fltrace>\IncludeInRelease{2015/01/01}% +%<latexrelease|fltrace> {\@addtodblcol}{float order in 2-column}% +%<*2ekernel|latexrelease|fltrace> \def\@addtodblcol{% \begingroup %<*trace> @@ -2833,8 +3400,8 @@ \ifdim \@dbltoproom>\ht\@currbox \@tempswatrue %<*trace> - \fl@trace{Space OK BANG: space on page = \the \@dbltoproom > - \the \ht \@currbox}% + \fl@trace{Space OK BANG: space on page = + \the \@dbltoproom > \the \ht \@currbox}% \else \fl@trace{fpstype: \the \@fpstype}% \fl@trace{Fail---no room dbltoproom-BANG?:}% @@ -2853,13 +3420,21 @@ \fi \fi \if@tempswa - \@bitor \@currtype \@dbldeferlist + \@bitor \@currtype \@deferlist %<*trace> - \fl@trace{dbldeferlist: \@dbldeferlist: (before)}% + \fl@trace{(dbl)deferlist: \@deferlist: (before)}% %</trace> +% \end{macrocode} +% +% not in fixfloats? +% \begin{macrocode} + \@testwrongwidth\@currbox +% \end{macrocode} +% +% \begin{macrocode} \if@test %<*trace> - \fl@trace{type already on list: dbldefer}% + \fl@trace{type already on list: (dbl)defer}% %</trace> \else \@tempdima -\ht\@currbox @@ -2890,11 +3465,11 @@ \if@insert \else %<*trace> - \fl@trace{put on dbldeferlist}% + \fl@trace{put on deferlist}% %</trace> - \@cons\@dbldeferlist\@currbox + \@cons\@deferlist\@currbox %<*trace> - \fl@trace{dbldeferlist: \@dbldeferlist: (after)}% + \fl@trace{(dbl)deferlist: \@deferlist: (after)}% %</trace> \fi %<*trace> @@ -2906,8 +3481,140 @@ \fl@trace{End of addtodblcol -- globally count:}% \fl@trace{dbltop: \the \@dbltopnum.}% %</trace> -} -%</2ekernel|autoload|fltrace> +}% +%</2ekernel|latexrelease|fltrace> +%<latexrelease|fltrace>\EndIncludeInRelease +%<latexrelease|fltrace>\IncludeInRelease{0000/00/00}% +%<latexrelease|fltrace> {\@addtodblcol}{float order in 2-column}% +%<latexrelease|fltrace>\def\@addtodblcol{% +%<latexrelease|fltrace> \begingroup +%<*trace> +%<latexrelease|fltrace> \fl@trace{***Start addtodblcol}% +%</trace> +%<latexrelease|fltrace> \@insertfalse +%<latexrelease|fltrace> \@setfloattypecounts +%<latexrelease|fltrace> \@getfpsbit \tw@ +%<*trace> +%<latexrelease|fltrace> \fl@trace{fpstype \ifodd \@tempcnta OK +%<latexrelease|fltrace> \else not \fi dbltop: \the \@fpstype}% +%</trace> +%<latexrelease|fltrace> \ifodd\@tempcnta +%<latexrelease|fltrace> \@flsetnum \@dbltopnum +%<latexrelease|fltrace> \ifnum \@dbltopnum>\z@ +%<latexrelease|fltrace> \@tempswafalse +%<latexrelease|fltrace> \ifdim \@dbltoproom>\ht\@currbox +%<latexrelease|fltrace> \@tempswatrue +%<*trace> +%<latexrelease|fltrace> \fl@trace{Space OK: \@dbltoproom = +%<latexrelease|fltrace> \the \@dbltoproom > \the \ht \@currbox +%<latexrelease|fltrace> (dbltoproom)}% +%</trace> +%<latexrelease|fltrace> \else +%<*trace> +%<latexrelease|fltrace> \fl@trace{fpstype: \the \@fpstype (addtodblcol)}% +%</trace> +%<latexrelease|fltrace> \ifnum \@fpstype<\sixt@@n +%<*trace> +%<latexrelease|fltrace> \fl@trace{BANG float ignoring \@dbltoproom}% +%<latexrelease|fltrace> \fl@trace{\@spaces \@dbltoproom = +%<latexrelease|fltrace> \the \@dbltoproom. +%<latexrelease|fltrace> Ht float: \the \ht \@currbox-BANG}% +%</trace> +% \end{macrocode} +% Need to check that there is room on the page, using the local value +% of |\@textmin| to make the necessary adjustment to |\@dbltoproom|. +% \begin{macrocode} +%<latexrelease|fltrace> \advance \@dbltoproom \@textmin +%<*trace> +%<latexrelease|fltrace> \fl@trace{Local value of texmin: \the\@textmin}% +%<latexrelease|fltrace> \fl@trace{\@spaces space on page = +%<latexrelease|fltrace> \the \@dbltoproom. +%<latexrelease|fltrace> Ht float: \the \ht \@currbox-BANG}% +%</trace> +%<latexrelease|fltrace> \ifdim \@dbltoproom>\ht\@currbox +%<latexrelease|fltrace> \@tempswatrue +%<*trace> +%<latexrelease|fltrace> \fl@trace{Space OK BANG: space on page = +%<latexrelease|fltrace> \the\@dbltoproom > \the\ht\@currbox}% +%<latexrelease|fltrace> \else +%<latexrelease|fltrace> \fl@trace{fpstype: \the \@fpstype}% +%<latexrelease|fltrace> \fl@trace{Fail---no room dbltoproom-BANG?:}% +%<latexrelease|fltrace> \fl@trace{\@spaces space on page = +%<latexrelease|fltrace> \the \@dbltoproom. +%<latexrelease|fltrace> Ht float: \the \ht \@currbox}% +%</trace> +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace> \advance \@dbltoproom -\@textmin +%<*trace> +%<latexrelease|fltrace> \else +%<latexrelease|fltrace> \fl@trace{fpstype: \the \@fpstype}% +%<latexrelease|fltrace> \fl@trace{Fail---no room dbltoproom-ORD?:}% +%<latexrelease|fltrace> \fl@trace{\@spaces \@dbltoproom = +%<latexrelease|fltrace> \the \@dbltoproom. +%<latexrelease|fltrace> Ht float: \the \ht \@currbox}% +%</trace> +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace> \if@tempswa +%<latexrelease|fltrace> \@bitor \@currtype \@dbldeferlist +%<*trace> +%<latexrelease|fltrace> \fl@trace{dbldeferlist: +%<latexrelease|fltrace> \@dbldeferlist: (before)}% +%</trace> +%<latexrelease|fltrace> \if@test +%<*trace> +%<latexrelease|fltrace> \fl@trace{type already on list: dbldefer}% +%</trace> +%<latexrelease|fltrace> \else +%<latexrelease|fltrace> \@tempdima -\ht\@currbox +%<latexrelease|fltrace> \advance\@tempdima +%<latexrelease|fltrace> -\ifx \@dbltoplist\@empty +%<latexrelease|fltrace> \dbltextfloatsep +%<latexrelease|fltrace> \else \dblfloatsep \fi +%<latexrelease|fltrace> \global \advance \@dbltoproom \@tempdima +%<latexrelease|fltrace> \global \advance \@colht \@tempdima +%<latexrelease|fltrace> \global \advance \@dbltopnum \m@ne +%<latexrelease|fltrace> \@cons \@dbltoplist \@currbox +%<*trace> +%<latexrelease|fltrace> \fl@trace{dbltopnum (after) = +%<latexrelease|fltrace> \the \@dbltopnum}% +%<latexrelease|fltrace> \fl@trace{***Success: dbltop}% +%</trace> +%<latexrelease|fltrace> \@inserttrue +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace> \fi +%<*trace> +%<latexrelease|fltrace> \else +%<latexrelease|fltrace> \fl@trace{Fail: dbltopnum = \the \@dbltopnum: +%<latexrelease|fltrace> fpstype \the \@fpstype=ORD?}% +%<latexrelease|fltrace> \ifnum \@fpstype<\sixt@@n +%<latexrelease|fltrace> \fl@trace{ERROR: !t float not successful +%<latexrelease|fltrace> (addtodblcol)}% +%<latexrelease|fltrace> \fi +%</trace> +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace> \if@insert +%<latexrelease|fltrace> \else +%<*trace> +%<latexrelease|fltrace> \fl@trace{put on dbldeferlist}% +%</trace> +%<latexrelease|fltrace> \@cons\@dbldeferlist\@currbox +%<*trace> +%<latexrelease|fltrace> \fl@trace{dbldeferlist: \@dbldeferlist: (after)}% +%</trace> +%<latexrelease|fltrace> \fi +%<*trace> +%<latexrelease|fltrace> \fl@trace{End of addtodblcol -- locally count:}% +%<latexrelease|fltrace> \fl@trace{ dbltop: \the \@dbltopnum.}% +%</trace> +%<latexrelease|fltrace> \endgroup +%<*trace> +%<latexrelease|fltrace> \fl@trace{End of addtodblcol -- globally count:}% +%<latexrelease|fltrace> \fl@trace{dbltop: \the \@dbltopnum.}% +%</trace> +%<latexrelease|fltrace>}% +%<latexrelease|fltrace>\EndIncludeInRelease % \end{macrocode} % \end{macro} % @@ -2915,7 +3622,7 @@ % % \begin{macro}{\@addmarginpar} % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def\@addmarginpar{\@next\@marbox\@currlist{\@cons\@freelist\@marbox \@cons\@freelist\@currbox}\@latexbug\@tempcnta\@ne \if@twocolumn @@ -2970,7 +3677,6 @@ % \begin{macrocode} \nointerlineskip \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}} -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % @@ -3012,11 +3718,9 @@ % All we need to put into it is the amount by which the pagegoal % should be changed. % \begin{macrocode} -%<*2ekernel|def1> \newinsert \@kludgeins \global\dimen\@kludgeins \maxdimen \global\count\@kludgeins 1000 -%</2ekernel|def1> % \end{macrocode} % \end{macro} % @@ -3026,7 +3730,6 @@ % \changes{v0.1c}{1993/11/23}{Commands added} % The user command. % \begin{macrocode} -%<*2ekernel|def1> \gdef \enlargethispage {% \@ifstar {% @@ -3040,10 +3743,6 @@ %</trace> \@enlargepage\@empty}% } -%</2ekernel|def1> -%<*autoload> -\def\enlargethispage{\@autoload{out1}\enlargethispage} -%</autoload> % \end{macrocode} % \end{macro} % \end{macro} @@ -3054,7 +3753,6 @@ % This actually inserts the insert, after checking for extreme % values of the change. % \begin{macrocode} -%<*2ekernel|def1> \gdef\@enlargepage#1#2{% %<*trace> \fl@trace{\@spaces\@spaces by #2}% @@ -3086,7 +3784,7 @@ \fi \fi } -%</2ekernel|def1> +%</2ekernel> % \end{macrocode} % \end{macro} % @@ -3157,7 +3855,15 @@ \def \tracefloatsoff {\let \fl@trace \@gobble} \tracefloatsoff \def \fl@traceval #1{\fl@trace{\string #1 = \the #1}} +\IncludeInRelease{2015/01/01}{\tracefloatvals}% + {trace float vals}% \def \tracefloatvals{% +% \end{macrocode} +% As |\@dblfloatplacement| sets |\f@depth| it needs to be run +% inside a group, otherwise the float placement will test for the +% wrong value.\footnote{This is a somewhat questionable design.} +% \begin{macrocode} + \begingroup \@dblfloatplacement \@floatplacement \fl@trace{***Float placement parameters:}% @@ -3177,34 +3883,56 @@ \fl@trace{midlist: \@midlist}% \fl@trace{deferlist: \@deferlist}% \fl@trace{dbltoplist: \@dbltoplist}% +%FMi \fl@trace{dbldeferlist: \@dbldeferlist}% + \endgroup +} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}{\tracefloatvals}% + {trace float vals}% +\def \tracefloatvals{% + \begingroup + \@dblfloatplacement + \@floatplacement + \fl@trace{***Float placement parameters:}% + \fl@traceval\@colnum + \fl@traceval\@colroom + \fl@traceval\@topnum + \fl@traceval\@toproom + \fl@traceval\@botnum + \fl@traceval\@botroom + \fl@traceval\@fpmin + \fl@trace{\string\textfraction = \textfraction}% + \fl@traceval\@dbltopnum + \fl@traceval\@dbltoproom + \fl@trace{\string\textfraction = \textfraction}% + \fl@trace{toplist: \@toplist}% + \fl@trace{botlist: \@botlist}% + \fl@trace{midlist: \@midlist}% + \fl@trace{deferlist: \@deferlist}% + \fl@trace{dbltoplist: \@dbltoplist}% +% next line only in old releases \fl@trace{dbldeferlist: \@dbldeferlist}% + \endgroup } +\EndIncludeInRelease % \end{macrocode} % We need to make sure that \texttt{fltrace} comes before % \texttt{flafter} to make the tracing work. % \begin{macrocode} \@ifpackageloaded{flafter} - {\PackageWarning{fltrace}{Load 'fltrace' before 'flafter'\MessageBreak - Attempting to recover by reloading 'flafter'}% + {\PackageWarningNoLine{fltrace}{Load 'fltrace' before 'flafter'\MessageBreak + Attempting to recover by reloading 'flafter'}% % \end{macrocode} % Hide the fact that \texttt{flafter} was already loaded and then % request it anew. +% \changes{v1.2m}{2015/01/20}{Reset \cs{IncludeInRelease} flags} % \begin{macrocode} \expandafter\let\csname ver@flafter.sty\endcsname\relax + \def\reserved@a#1{% + \expandafter\let\csname\string#1+flafter+IIR\endcsname\relax}% + \reserved@a\@addtocurcol + \reserved@a\@addtonextcol \RequirePackage{flafter}}{} -% \end{macrocode} -% With the changed algorithm in \texttt{fixltx2e} the situation is -% less good, right now the only option is to abort (but that could -% change in the future). -% \begin{macrocode} -\AtBeginDocument{\@ifpackageloaded{fixltx2e}{% - \PackageError{fltrace}{'fltrace' can't be used together with - 'fixltx2e'}% - {The 'fixltx2e' package has a corrected float algorithm that - currently \MessageBreak - can't be traced using 'fltrace'. Please remove - 'fltrace' if you want\MessageBreak - to make use of the corrections in 'fixltx2e'.}\stop}{}} %</fltrace> % \end{macrocode} % As the code for \texttt{flafter} will contain tracing calls so @@ -3230,7 +3958,7 @@ % by an ! specifier. % % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def \suppressfloats {% \@ifnextchar [% \@flstop @@ -3275,7 +4003,7 @@ \newcount \@fpstype \newdimen \@reqcolroom \newdimen \@textfloatsheight -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % \end{macro} @@ -3297,7 +4025,7 @@ % \end{verbatim} % % \begin{macrocode} -%<*2ekernel|autoload|fltrace> +%<*2ekernel|fltrace> \def \@fpsadddefault {% %<*trace> \fl@trace{fps changed from: \@fps}% @@ -3345,7 +4073,7 @@ \fi %</trace> } -%</2ekernel|autoload|fltrace> +%</2ekernel|fltrace> % \end{macrocode} % \end{macro} % @@ -3357,7 +4085,7 @@ % Sets |\@tempcnta| to required bit of |\count\@currbox|. % % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def \@getfpsbit {% \@boxfpsbit \@currbox } @@ -3406,7 +4134,7 @@ \advance \@tempcnta #1\relax \fi } -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % @@ -3424,7 +4152,7 @@ % originally 1, this does not matter since it is the last thing in % |\@addtocurcol|. % \begin{macrocode} -%<*2ekernel|autoload|fltrace> +%<*2ekernel|fltrace> \def \@resethfps {% \let\reserved@a\@empty \ifnum \@fpstype=\@ne @@ -3525,7 +4253,8 @@ \advance \@reqcolroom \ifx #2\@empty \textfloatsep \else \floatsep \fi %<*trace> - \fl@trace{colroom = \the \@colroom (flcheckspace \string#1 \string#2)}% + \fl@trace{colroom = \the \@colroom + (flcheckspace \string#1 \string#2)}% \fl@trace{reqcolroom = \the \@reqcolroom (flcheckspace \string#1 \string#2)}% %</trace> @@ -3565,7 +4294,7 @@ %</trace> \fi } -%</2ekernel|autoload|fltrace> +%</2ekernel|fltrace> % \end{macrocode} % \end{macro} % @@ -3575,7 +4304,7 @@ % This updates everything when a float is placed. % % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \def \@flupdates #1#2#3{% \global \advance #1\m@ne \global \advance \@colnum \m@ne @@ -3586,7 +4315,7 @@ \global \advance \@colroom \@tempdima \@cons #3\@currbox } -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % @@ -3721,7 +4450,7 @@ % Only tracing has been added to these. % % \begin{macrocode} -%<*2ekernel|autoload|fltrace> +%<*2ekernel|fltrace> \def\@makefcolumn #1{% \begingroup \@fpmin \z@ @@ -3730,7 +4459,8 @@ \endgroup %<*trace> \if@fcolmade - \fl@trace{PAGE: in \string\clearpage \if@twocolumn ---twocolumn\fi---}% + \fl@trace{PAGE: in \string\clearpage + \if@twocolumn ---twocolumn\fi---}% \fl@trace{----- float column/page completed from \string#1}% \fi %</trace> @@ -3743,52 +4473,158 @@ % % Thus again it is essential for |\@textbottom| to have depth 0pt. % \changes{1.2g}{2000/07/12}{Ensure that rule is in \cs{normalcolor}} +% \changes{v1.2m}{2014/12/30}{Command updated (latexrelease)} +% \begin{macrocode} +%</2ekernel|fltrace> +%<latexrelease|fltrace>\IncludeInRelease{2015/01/01}% +%<latexrelease|fltrace> {\@outputdblcol}{2 column marks}% +%<*2ekernel|fltrace|latexrelease> +% \end{macrocode} +% +% +% This is just a change to the single command |\@outputdblcol| +% so that it saves mark information for the first column and restores +% it in the second column. % \begin{macrocode} \def\@outputdblcol{% \if@firstcolumn - \global \@firstcolumnfalse - \global \setbox\@leftcolumn \box\@outputbox -%<*trace> - \fl@trace{PAGE: first column boxed}% -%</trace> + \global\@firstcolumnfalse +% \end{macrocode} +% Save the left column +% \begin{macrocode} + \global\setbox\@leftcolumn\copy\@outputbox +%<fltrace> \fl@trace{PAGE: first column boxed}% +% \end{macrocode} +% +% Remember the marks from the first column +% \begin{macrocode} + \splitmaxdepth\maxdimen + \vbadness\maxdimen +% \end{macrocode} +% In case of |\enlargethispage| we will have infinite negative glue +% at the bottom of the page (coming from |\vss|) and that will earn +% us an error message if we |\vsplit| to get at the marks. So we +% need to remove thek last glue (if any) at the end of |\@outputbox| +% as we are only interested in marks that change doesn't matter. +% \changes{v1.1o}{2014/04/18}{Handle infinite glue from +% \cs{enlargethispage} (pr/4023)} +% \begin{macrocode} + \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}% + \setbox\@outputbox\vsplit\@outputbox to\maxdimen +% \end{macrocode} +% +% One minor difference from the current |fixmarks| package, pass the +% marks through a token register to stop any |#| tokens causing an +% error in a |\def|. +% \begin{macrocode} + \toks@\expandafter{\topmark}% + \xdef\@firstcoltopmark{\the\toks@}% + \toks@\expandafter{\splitfirstmark}% + \xdef\@firstcolfirstmark{\the\toks@}% +% \end{macrocode} +% +% This test does not work if truly empty marks have been inserted, but +% \LaTeX\ marks should always have (at least) two brace groups. +% (Except before the first mark is used, when the marks are empty, +% but that is OK here.) +% \begin{macrocode} + \ifx\@firstcolfirstmark\@empty + \global\let\@setmarks\relax + \else + \gdef\@setmarks{% + \let\firstmark\@firstcolfirstmark + \let\topmark\@firstcoltopmark}% + \fi +% \end{macrocode} +% +% End of change +% \begin{macrocode} \else - \global \@firstcolumntrue - \setbox\@outputbox \vbox {% - \hb@xt@\textwidth {% - \hb@xt@\columnwidth {% - \box\@leftcolumn \hss}% - \hfil - {\normalcolor\vrule \@width\columnseprule}% - \hfil - \hb@xt@\columnwidth {% - \box\@outputbox \hss}% - }% - }% -%<*trace> - \fl@trace{PAGE: second column also boxed}% -%</trace> - \@combinedblfloats + \global\@firstcolumntrue + \setbox\@outputbox\vbox{% + \hb@xt@\textwidth{% + \hb@xt@\columnwidth{\box\@leftcolumn \hss}% + \hfil +% \end{macrocode} +% \changes{v1.1m}{2006/09/13}{Ensure that rule is in \cs{normalcolor}} +% The color of the \cs{vrule} should be \cs{normalcolor} as to not +% inherit the color from the column. +% \begin{macrocode} + {\normalcolor\vrule \@width\columnseprule}% + \hfil + \hb@xt@\columnwidth{\box\@outputbox \hss}}}% +%<fltrace> \fl@trace{PAGE: second column also boxed}% + \@combinedblfloats +% \end{macrocode} +% Override current first and top with those of first column if necessary +% \begin{macrocode} + \@setmarks +% \end{macrocode} +% End of change +% \begin{macrocode} \@outputpage -%<*trace> - \fl@trace{PAGE: two column page completed}% -%</trace> +%<fltrace> \fl@trace{PAGE: two column page completed}% \begingroup \@dblfloatplacement \@startdblcolumn + \@whilesw\if@fcolmade \fi{\@outputpage +%<fltrace> \fl@trace{PAGE: double float page completed}% + \@startdblcolumn}% + \endgroup + \fi}% +% \end{macrocode} +% +% \begin{macrocode} +%<latexrelease|fltrace>\EndIncludeInRelease +%<latexrelease|fltrace>\IncludeInRelease{0000/00/00}% +%<latexrelease|fltrace> {\@outputdblcol}{2 column marks}% +%<latexrelease|fltrace>\def\@outputdblcol{% +%<latexrelease|fltrace> \if@firstcolumn +%<latexrelease|fltrace> \global \@firstcolumnfalse +%<latexrelease|fltrace> \global \setbox\@leftcolumn \box\@outputbox +%<*trace> +%<latexrelease|fltrace> \fl@trace{PAGE: first column boxed}% +%</trace> +%<latexrelease|fltrace> \else +%<latexrelease|fltrace> \global \@firstcolumntrue +%<latexrelease|fltrace> \setbox\@outputbox \vbox {% +%<latexrelease|fltrace> \hb@xt@\textwidth {% +%<latexrelease|fltrace> \hb@xt@\columnwidth {% +%<latexrelease|fltrace> \box\@leftcolumn \hss}% +%<latexrelease|fltrace> \hfil +%<latexrelease|fltrace> {\normalcolor\vrule +%<latexrelease|fltrace> \@width\columnseprule}% +%<latexrelease|fltrace> \hfil +%<latexrelease|fltrace> \hb@xt@\columnwidth {% +%<latexrelease|fltrace> \box\@outputbox \hss}% +%<latexrelease|fltrace> }% +%<latexrelease|fltrace> }% +%<*trace> +%<latexrelease|fltrace> \fl@trace{PAGE: second column also boxed}% +%</trace> +%<latexrelease|fltrace> \@combinedblfloats +%<latexrelease|fltrace> \@outputpage +%<*trace> +%<latexrelease|fltrace> \fl@trace{PAGE: two column page completed}% +%</trace> +%<latexrelease|fltrace> \begingroup +%<latexrelease|fltrace> \@dblfloatplacement +%<latexrelease|fltrace> \@startdblcolumn % \end{macrocode} % This loop could be replaced by an |\expandafter| tail % recursion in\\ |\@startdblcolumn|. % \begin{macrocode} - \@whilesw\if@fcolmade \fi - {\@outputpage +%<latexrelease|fltrace> \@whilesw\if@fcolmade \fi +%<latexrelease|fltrace> {\@outputpage %<*trace> - \fl@trace{PAGE: double float page completed}% +%<latexrelease|fltrace> \fl@trace{PAGE: double float page completed}% %</trace> - \@startdblcolumn}% - \endgroup - \fi -} -%</2ekernel|autoload|fltrace> +%<latexrelease|fltrace> \@startdblcolumn}% +%<latexrelease|fltrace> \endgroup +%<latexrelease|fltrace> \fi +%<latexrelease|fltrace>}% +%<latexrelease|fltrace>\EndIncludeInRelease +%</2ekernel|fltrace|latexrelease> % \end{macrocode} % % \subsubsection{Float placement parameters} @@ -3806,7 +4642,7 @@ % This counter holds the maximum number of % floats that can appear at the top of a text page or column. % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \newcount\c@topnumber \setcounter{topnumber}{2} % \end{macrocode} @@ -4002,7 +4838,7 @@ \let\topfigrule=\relax \let\botfigrule=\relax \let\dblfigrule=\relax -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/base/ltpage.dtx b/Master/texmf-dist/source/latex/base/ltpage.dtx index 11490ca6b53..710bbcc2cf6 100644 --- a/Master/texmf-dist/source/latex/base/ltpage.dtx +++ b/Master/texmf-dist/source/latex/base/ltpage.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -49,7 +49,8 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltpageno.dtx b/Master/texmf-dist/source/latex/base/ltpageno.dtx index a76efad7b66..c2b2f0ea69b 100644 --- a/Master/texmf-dist/source/latex/base/ltpageno.dtx +++ b/Master/texmf-dist/source/latex/base/ltpageno.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -49,7 +49,8 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltpar.dtx b/Master/texmf-dist/source/latex/base/ltpar.dtx index e8f67a988ce..bd8ff1baaa8 100644 --- a/Master/texmf-dist/source/latex/base/ltpar.dtx +++ b/Master/texmf-dist/source/latex/base/ltpar.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -49,8 +49,9 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} - \maketitle - \DocInput{\filename} + \MaintainedByLaTeXTeam{latex} + \maketitle + \DocInput{\filename} \end{document} %</driver> % \fi diff --git a/Master/texmf-dist/source/latex/base/ltpictur.dtx b/Master/texmf-dist/source/latex/base/ltpictur.dtx index 47e3eba9bec..b847743e5f5 100644 --- a/Master/texmf-dist/source/latex/base/ltpictur.dtx +++ b/Master/texmf-dist/source/latex/base/ltpictur.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -29,12 +29,10 @@ % % \iffalse %%% From File: ltpictur.dtx -%<def>\ProvidesFile{autopict.sty} -%<def> [2001/08/27 v1.1k Picture mode autoload file] %<*driver> % \fi \ProvidesFile{ltpictur.dtx} - [2014/09/29 v1.1j LaTeX Kernel (Picture Mode)] + [2015/02/21 v1.1k LaTeX Kernel (Picture Mode)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltpictur.dtx} @@ -49,13 +47,14 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{1528} +% \CheckSum{1505} % % \changes{v1.0g}{1995/05/07}{Use \cs{hb@xt@}} % \changes{v1.1a}{1995/05/19}{Support autoloading feature} @@ -63,6 +62,7 @@ % \changes{v1.1d}{1995/07/12}{allow 2e commands in 209 mode. latex/1737} % \changes{v1.1e}{1995/10/03}{New autoload code} % \changes{v1.1h}{1999/04/15}{Replaced octal numbers, CAR} +% \changes{v1.1k}{2015/02/21}{Removed autoload code} % % \section{Picture Mode} % Picture mode commands. In addition to the commands available in @@ -168,7 +168,7 @@ % \begin{macro}{\@wholewidth} % \begin{macro}{\@halfwidth} % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \newdimen\@wholewidth \newdimen\@halfwidth % \end{macrocode} @@ -186,7 +186,6 @@ % \begin{macrocode} \newbox\@picbox \newdimen\@picht -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % \end{macro} @@ -198,22 +197,15 @@ % \changes{v1.0h}{1995/05/12}{Macro added for latex/1355} % |#1| should be a |(| (eating any white space before the bracket), % \begin{macrocode} -%<*2ekernel|def> \long\gdef\picture#1{\pictur@#1} \gdef\pictur@(#1){% \@ifnextchar({\@picture(#1)}{\@picture(#1)(0,0)}} -%</2ekernel|def> -%<*autoload> -\def\pictur@{\@autoload{pict}} -\def\picture{\pictur@\picture} -%</autoload> % \end{macrocode} % \end{macro} % \end{macro} % % \begin{macro}{\@picture} % \begin{macrocode} -%<*2ekernel|def> \gdef\@picture(#1,#2)(#3,#4){% \@picht#2\unitlength \setbox\@picbox\hb@xt@#1\unitlength\bgroup @@ -276,41 +268,28 @@ % \begin{macro}{\@killglue} % \begin{macrocode} \gdef\@killglue{\unskip\@whiledim \lastskip >\z@\do{\unskip}} -%</2ekernel|def> % \end{macrocode} % \end{macro} % % \begin{macro}{\thinlines} % \begin{macro}{\thicklines} % \begin{macrocode} -%<*2ekernel|def> \gdef\thinlines{\let\@linefnt\tenln \let\@circlefnt\tencirc \@wholewidth\fontdimen8\tenln \@halfwidth .5\@wholewidth} \gdef\thicklines{\let\@linefnt\tenlnw \let\@circlefnt\tencircw \@wholewidth\fontdimen8\tenlnw \@halfwidth .5\@wholewidth} -%</2ekernel|def> -%<*autoload> -\def\thinlines{\pictur@\thinlines} -\def\thicklines{\pictur@\thicklines} -%</autoload> % \end{macrocode} % \end{macro} % \end{macro} % % \begin{macro}{\linethickness} % \begin{macrocode} -%<*2ekernel|def> \gdef\linethickness#1{\@wholewidth #1\relax \@halfwidth .5\@wholewidth} -%</2ekernel|def> -%<*autoload> -\def\linethickness{\pictur@\linethickness} -%</autoload> % \end{macrocode} % \end{macro} % % \begin{macro}{\ishortstack} % \begin{macrocode} -%<*2ekernel|def> \gdef\shortstack{\@ifnextchar[\@shortstack{\@shortstack[c]}} % \end{macrocode} % \end{macro} @@ -717,7 +696,7 @@ % \changes{v1.1h}{1999/04/15}{Replaced octal number, CAR} % \changes{v1.1i}{2000/01/15}{Removed space at end-of-line, CAR} % \begin{macrocode} -\gdef\@upvector{\@upline\setbox\@tempboxa\hbox{\@linefnt\char 54}% % '66 +\gdef\@upvector{\@upline\setbox\@tempboxa\hbox{\@linefnt\char 54}% '66 \raise \@linelen \hb@xt@\z@{\lower \ht\@tempboxa\box\@tempboxa\hss}} % \end{macrocode} % \end{macro} @@ -1071,10 +1050,6 @@ % \end{macro} % \end{macro} % -% \begin{macrocode} -%</2ekernel|def> -%<*2ekernel|autoload> -% \end{macrocode} % % \begin{macro}{\@ovxx} % \begin{macro}{\@ovyy} @@ -1097,18 +1072,12 @@ % \end{macro} % \end{macro} % -% \begin{macrocode} -%</2ekernel|autoload> -% \end{macrocode} % % |\advance\@tempdima 2pt\relax| added 1 Nov 88 to fix bug in which % size of drawn circle not monotonic function of argument of |\circle|, % caused by different rounding for dimensions of large and small % circles. % -% \begin{macrocode} -%<*2ekernel|def> -% \end{macrocode} % % \begin{macro}{\@getcirc} % \changes{v1.1j}{2003/12/30}{issue warning if circle size can't be met pr/3473} @@ -1247,13 +1216,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macrocode} -%</2ekernel|def> -% \end{macrocode} -% -% \begin{macrocode} -%<*2ekernel|autoload> -% \end{macrocode} % % \begin{macro}{\@xarg} % \begin{macro}{\@yarg} @@ -1332,9 +1294,6 @@ \@halfwidth .5\@wholewidth % \end{macrocode} % -% \begin{macrocode} -%</2ekernel|autoload> -% \end{macrocode} % % % \subsection{Curves} @@ -1384,10 +1343,7 @@ % \begin{macro}{\qbeziermax} % The maximum number of points to plot. % \begin{macrocode} -%<*2ekernel|def> -%<def>\ifx\qbeziermax\@undefined \gdef\qbeziermax{500} -%<def>\fi % \end{macrocode} % \end{macro} % @@ -1478,7 +1434,7 @@ \hb@xt@\z@{\kern\@xdim \unhcopy\@tempboxa\hss}% \advance\count@\@ne}}} -%</2ekernel|def> +%</2ekernel> % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/base/ltplain.dtx b/Master/texmf-dist/source/latex/base/ltplain.dtx index b12f44a725c..da1398c4538 100644 --- a/Master/texmf-dist/source/latex/base/ltplain.dtx +++ b/Master/texmf-dist/source/latex/base/ltplain.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltplain.dtx} - [2014/09/29 v1.1y LaTeX Kernel (Plain TeX)] + [2015/03/10 v2.0g LaTeX Kernel (Plain TeX)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltplain.dtx} @@ -43,13 +43,14 @@ Leslie Lamport, Frank Mittelbach,\\ Rainer Sch\"opf, David Carlisle} \date{\filedate} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{764} +% \CheckSum{1204} % % \changes{v1.0a}{1994/03/08} % {Remove need for a driver file.} @@ -72,6 +73,7 @@ % \changes{v1.1o}{1995/09/14}{Moved \cs{multispan} to lttab.dtx} % \changes{v1.1r}{1995/10/10}{Autoload tracing code} % \changes{v1.1u}{1996/10/28}{(CAR) More doc changes} +% \changes{v2.0e}{2015/02/21}{Removed autoload code} % % \section{Plain \TeX} % @@ -101,27 +103,9 @@ % % \StopEventually{} % -% \iffalse -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% -% \fi % % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \catcode`\{=1 % left brace is begin-group character \catcode`\}=2 % right brace is end-group character \catcode`\$=3 % dollar sign is math shift @@ -329,8 +313,9 @@ % \begin{macro}{\newskip} % \begin{macro}{\newmuskip} % \begin{macro}{\newbox} -% \begin{macro}{\newhelp} -% \begin{macro}{\newtoks} +% \begin{macro}{\newread} +% \begin{macro}{\newwrite} +% \begin{macro}{\newlanguage} % \changes{v1.0c}{1994/03/28} % {Remove some \cs{outer} declarations.} % \changes{v1.1h}{1995/04/24} @@ -349,15 +334,58 @@ % This is necessary to use |\newcount| inside |\if...| % later on. Also remove from |\newskip|, |\newbox| % |\newwrite| and |\newfam| (DPC) to save later redefinition. +% \changes{v2.0a}{2014/12/30}{New engine-specific allocation scheme (latexrelease)} +% \changes{v2.0f}{2015/03/02}{allow 255 math groups in Unicode engines} % \begin{macrocode} -\def\newcount{\alloc@0\count\countdef\insc@unt} -\def\newdimen{\alloc@1\dimen\dimendef\insc@unt} -\def\newskip{\alloc@2\skip\skipdef\insc@unt} -\def\newmuskip{\alloc@3\muskip\muskipdef\@cclvi} -\def\newbox{\alloc@4\box\chardef\insc@unt} -\def\newhelp#1#2{\newtoks#1#1\expandafter{\csname#2\endcsname}} -\def\newtoks{\alloc@5\toks\toksdef\@cclvi} +%</2ekernel> +%<*2ekernel|latexrelease> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\newcount}{Extended Allocation}% +% \end{macrocode} +% +% \begin{macrocode} +\def\newcount {\e@alloc\count \countdef {\count10}\insc@unt\float@count} +\def\newdimen {\e@alloc\dimen \dimendef {\count11}\insc@unt\float@count} +\def\newskip {\e@alloc\skip \skipdef {\count12}\insc@unt\float@count} +\def\newmuskip + {\e@alloc\muskip\muskipdef{\count13}\e@alloc@top\e@alloc@top} +% \end{macrocode} +% For compatibility use |\chardef| in the classical range. +% \begin{macrocode} +\def\newbox {\e@alloc\box + {\ifnum\allocationnumber<\@cclvi + \expandafter\chardef + \else + \expandafter\e@alloc@chardef + \fi} + {\count14}\insc@unt\float@count} +\def\newtoks {\e@alloc\toks \toksdef{\count15}\e@alloc@top\e@alloc@top} +\def\newread {\e@alloc\read \chardef{\count16}\sixt@@n\sixt@@n} +\def\newwrite {\e@alloc\write \chardef{\count17}\sixt@@n\sixt@@n} +\def\new@mathgroup + {\e@alloc\mathgroup\chardef{\count18}\e@mathgroup@top\e@mathgroup@top} +\def\newlanguage {\e@alloc\language \chardef{\count19}\@cclvi\@cclvi} +\let\newfam\new@mathgroup +%</2ekernel|latexrelease> % \end{macrocode} +% +% \begin{macrocode} +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\newcount}{Extended Allocation}% +%<latexrelease>\def\newcount{\alloc@0\count\countdef\insc@unt} +%<latexrelease>\def\newdimen{\alloc@1\dimen\dimendef\insc@unt} +%<latexrelease>\def\newskip{\alloc@2\skip\skipdef\insc@unt} +%<latexrelease>\def\newmuskip{\alloc@3\muskip\muskipdef\@cclvi} +%<latexrelease>\def\newbox{\alloc@4\box\chardef\insc@unt} +%<latexrelease>\def\newread{\alloc@6\read\chardef\sixt@@n} +%<latexrelease>\def\newwrite{\alloc@7\write\chardef\sixt@@n} +%<latexrelease>\def\new@mathgroup{\alloc@8\fam\chardef\sixt@@n} +%<latexrelease>\def\newlanguage{\alloc@9\language\chardef\@cclvi} +%<latexrelease>\let\newfam\new@mathgroup +%<latexrelease>\EndIncludeInRelease +% \end{macrocode} +% \end{macro} % \end{macro} % \end{macro} % \end{macro} @@ -366,28 +394,231 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\newread} -% \begin{macro}{\newwrite} +%\begin{macro}{\e@alloc@chardef} +% \changes{v2.0a}{2014/12/30}{macro added} +%\begin{macro}{\e@alloc@top} +% \changes{v2.0a}{2014/12/30}{macro added} +% The upper limit of extended registers, which leaves +% this number (eg |\dimen32767|) always unallocated +% by these macros. +% cf traditional |\dimen255|. +% \begin{macrocode} +%<*2ekernel|latexrelease> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\e@alloc@chardef}{Extended Allocation}% +% \end{macrocode} +% +% \begin{macrocode} +\ifx\directlua\@undefined + \ifx\widowpenalties\@undefined +% \end{macrocode} +% classic tex has $2^8$ registers. +% \begin{macrocode} + \mathchardef\e@alloc@top=255 + \let\e@alloc@chardef\chardef + \else +% \end{macrocode} +% etex and xetex have $2^{15}$ registers. +% \begin{macrocode} + \mathchardef\e@alloc@top=32767 + \let\e@alloc@chardef\mathchardef + \fi +\else +% \end{macrocode} +% luatex has $2^{16}$ registers. % \begin{macrocode} -\def\newread{\alloc@6\read\chardef\sixt@@n} -\def\newwrite{\alloc@7\write\chardef\sixt@@n} + \chardef\e@alloc@top=65535 + \let\e@alloc@chardef\chardef +\fi +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\e@alloc@chardef}{Extended Allocation}% +%<latexrelease>\let\e@alloc@top\@undefined +%<latexrelease>\let\e@alloc@chardef\@undefined +%<latexrelease>\EndIncludeInRelease % \end{macrocode} % \end{macro} % \end{macro} % -% \LaTeX\ defines |\newfam| in |ltfss.dtx|. -%\begin{verbatim} -%\def\newfam{\alloc@8\fam\chardef\sixt@@n} -%\end{verbatim} +%\begin{macro}{\e@mathgroup@top} +% \changes{v2.0f}{2015/03/02}{macro added} +% The upper limit of extended math groups (|\fam|) +% 16 in classic \TeX\ and e-\TeX, but 256 in Unicode TeX variants. +% \begin{macrocode} +%<*2ekernel|latexrelease> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\e@mathgroup@top}{Extended Allocation}% +% \end{macrocode} +% +% \begin{macrocode} +\ifx\Umathcode\@undefined +% \end{macrocode} +% classic and e tex have 16 fam (0--15). +% \begin{macrocode} + \chardef\e@mathgroup@top=16 +\else +% \end{macrocode} +% xetex and luatex have 256 fam (0--255). +% \begin{macrocode} + \chardef\e@mathgroup@top=256 +\fi +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\e@mathgroup@top}{Extended Allocation}% +%<latexrelease>\let\e@mathgroup@top\@undefined +%<latexrelease>\EndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\e@alloc} +% \changes{v2.0a}{2014/12/30}{macro added} +% A modified version of |\alloc@| that +% takes the count register rather than just the final digit of its number +% (assuming |\count|$1x$). +% It also has an extra argument to give the top of the extended range. +% +% | #1 #2 #3 #4 #5 #6 | +% +% | \e@alloc type defcmd current top extended-top newname| +% +% \begin{macrocode} +%<*2ekernel|latexrelease> +%<latexrelease>\IncludeInRelease{2015/01/01}{\e@alloc}{Extended Allocation}% +% \end{macrocode} +% +% \begin{macrocode} +\def\e@alloc#1#2#3#4#5#6{% + \global\advance#3\@ne + \e@ch@ck{#3}#4#5#1% + \allocationnumber#3\relax + \global#2#6\allocationnumber + \wlog{\string#6=\string#1\the\allocationnumber}}% +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\e@alloc}{Extended Allocation}% +%<latexrelease>\let\e@alloc\@undefined +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> +% \end{macrocode} +% \end{macro} +% +%\begin{macro}{\e@ch@ck} +% \changes{v2.0a}{2014/12/30}{macro added} +% Extended check command. +% If the first range is exceeded, bump to 256 (or 266 for counts) +% and try again, testing the extended range. +%\begin{macro}{\extrafloats} +% \changes{v2.0a}{2014/12/30}{macro added} +% \changes{v2.0c}{2015/01/23}{reserve counts 256--265} +% Allocate matching registers from the top of the extended range +% and add to |\@freelist|. +% \begin{macrocode} +%</2ekernel> +%<*2ekernel|latexrelease> +%<latexrelease>\IncludeInRelease{2015/01/01}{\e@ch@ck}{Extended Allocation}% +% \end{macrocode} +% +% \begin{macrocode} +\gdef\e@ch@ck#1#2#3#4{% + \ifnum#1<#2\else +% \end{macrocode} +% +% If we've reached the classical top limit, bump to 256 +% or 266 for counts (count 256--265 are reserved by the allocation +% system). +% \begin{macrocode} + \ifnum#1=#2\relax + #1\@cclvi + \ifx\count#4\advance#1 10 \fi + \fi +% \end{macrocode} +% Check we are below the extended limit. +% \begin{macrocode} + \ifnum#1<#3\relax + \else + \errmessage{No room for a new #4}% + \fi + \fi}% + +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\let\float@count\e@alloc@top +% \end{macrocode} +% +% \begin{macro}{\extrafloats} +% \begin{macrocode} +\ifx\numexpr\@undefined +% \end{macrocode} +% In classic TeX use |\newinsert| to allocate float boxes. +% \begin{macrocode} +\def\extrafloats#1{% +\count@#1\relax +\ifnum\count@>\z@ +\newinsert\reserved@a +\expandafter\chardef + \csname bx@\the\allocationnumber\endcsname\allocationnumber +\@cons\@freelist{\csname bx@\the\allocationnumber\endcsname}% +\advance\count@\m@ne +\expandafter\extrafloats +\expandafter\count@ +\fi +}% +% \end{macrocode} +% +% \begin{macrocode} +\else +% \end{macrocode} +% In e-tex take float boxes from the top of the extended range. +% \begin{macrocode} +\def\extrafloats#1{% +\ifnum#1>\z@ +\count@\numexpr\float@count-1\relax + \ch@ck0\count@\count + \ch@ck1\count@\dimen + \ch@ck2\count@\skip + \ch@ck4\count@\box +\e@alloc@chardef\float@count\count@ +\expandafter\e@alloc@chardef + \csname bx@\the\float@count\endcsname\float@count +\@cons\@freelist{\csname bx@\the\float@count\endcsname}% +\expandafter +\extrafloats\expandafter{\numexpr#1-1\relax}% +\fi}% +% \end{macrocode} +% +% \begin{macrocode} +\fi +% \end{macrocode} % -% \begin{macro}{\newlanguage} % \begin{macrocode} -\def\newlanguage{\alloc@9\language\chardef\@cclvi} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\e@ch@ck}{Extended Allocation}% +%<latexrelease>\let\e@ch@ck\@undefined +%<latexrelease>\let\float@count\@undefined +%<latexrelease>\let\extrafloats\@undefined +%<latexrelease>\EndIncludeInRelease % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\alloc@} % \begin{macrocode} +%<*2ekernel> \def\alloc@#1#2#3#4#5{\global\advance\count1#1\@ne \ch@ck#1#4#2% make sure there's still room \allocationnumber\count1#1% @@ -411,18 +642,22 @@ % % \begin{macro}{\ch@ck} % \begin{macrocode} -%</2ekernel|autoload> -%<*2ekernel|autoload|autoerr> \gdef\ch@ck#1#2#3{% \ifnum\count1#1<#2\else -%<!autoload> \errmessage{No room for a new #3}% -%<autoload> \@autoerr\ch@ck#1#2#3% + \errmessage{No room for a new #3}% \fi} -%</2ekernel|autoload|autoerr> -%<*2ekernel|autoload> % \end{macrocode} % \end{macro} % +% \begin{macro}{\newhelp} +% \begin{macro}{\newtoks} +% \begin{macrocode} +\def\newhelp#1#2{\newtoks#1#1\expandafter{\csname#2\endcsname}} +\def\newtoks{\alloc@5\toks\toksdef\@cclvi} +% \end{macrocode} +% \end{macro} +% \end{macro} +% % \begin{macro}{\maxdimen} % \begin{macro}{\hideskip} % Here are some examples of allocation. @@ -1041,8 +1276,9 @@ % \begin{macrocode} \def\hrulefill{\leavevmode\leaders\hrule\hfill\kern\z@} % \end{macrocode} -% The box in |\dotfill| originally contained (in plain.tex): -% |\mkern 1.5mu .\mkern 1.5mu|; the width of .44em differs from this +% The box in |\dotfill| originally contained (in plain.tex):\\ +% |\mkern 1.5mu .\mkern 1.5mu|;\\ +% the width of .44em differs from this % by .04pt which is probably an acceptable difference within leaders. % \changes{v1.1u}{1996/10/28}{Removed math mode} % \changes{v1.1v}{1996/10/29}{Got arithmetic correct (CAR)} @@ -1095,13 +1331,10 @@ % \begin{macro}{\loggingoutput} % \changes{v1.1x}{2002/02/24}{Macro added} % \begin{macrocode} -%</2ekernel|autoload> -%<*2ekernel|autoerr> \gdef\loggingoutput{\tracingoutput\@ne \showboxbreadth\maxdimen\showboxdepth\maxdimen\errorstopmode} \gdef\showoutput{\loggingoutput\showoverfull} -%</2ekernel|autoerr> -%<autoload>\def\showoutput{\@autoerr\showoutput} +%</2ekernel> % \end{macrocode} % \end{macro} % \end{macro} @@ -1114,26 +1347,132 @@ % \changes{v1.1x}{2002/02/24}{Use newly added \cs{loggingoutput}} % \begin{macro}{\loggingall} % \changes{v1.1x}{2002/02/24}{Macro added} +% \changes{v2.0b}{2012/01/20}{etex tracing if available} +% \changes{v2.0d}{2015/02/20}{Spell commands correctly :-)} +% \changes{v2.0g}{2015/03/10}{Reorganise to be less noisy} +% \begin{macrocode} +%<latexrelease>\IncludeInRelease{2015/01/20}{\loggingall}{etex tracing}% +%<*2ekernel|latexrelease> +\ifx\tracingscantokens\@undefined +\gdef\loggingall{% + \tracingstats\tw@ + \tracingpages\@ne + \tracinglostchars\@ne + \tracingparagraphs\@ne + \errorcontextlines\maxdimen + \loggingoutput + \tracingmacros\tw@ + \tracingcommands\tw@ + \tracingrestores\@ne + }% +\else +\gdef\loggingall{% + \tracingstats\tw@ + \tracingpages\@ne + \tracinglostchars\tw@ + \tracingparagraphs\@ne + \tracinggroups\@ne + \tracingifs\@ne + \tracingscantokens\@ne + \tracingnesting\@ne + \errorcontextlines\maxdimen + \loggingoutput + \tracingmacros\tw@ + \tracingcommands\thr@@ + \tracingrestores\@ne + \tracingassigns\@ne +}% +\fi +\gdef\tracingall{\showoverfull\loggingall} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\loggingall}{etex tracing}% +%<latexrelease>\gdef\loggingall{\tracingcommands\tw@\tracingstats\tw@ +%<latexrelease> \tracingpages\@ne\tracinglostchars\@ne +%<latexrelease> \tracingmacros\tw@\tracingparagraphs\@ne\tracingrestores\@ne +%<latexrelease> \errorcontextlines\maxdimen\loggingoutput} +%<latexrelease> \gdef\tracingall{\loggingall\showoverfull} +%<latexrelease>\EndIncludeInRelease +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% +% \begin{macro}{\tracingnone} +% \changes{v2.0g}{2015/03/10}{macro added} +% \begin{macro}{\hideoutput} +% \changes{v2.0g}{2015/03/10}{macro added} +% \begin{macrocode} +%<latexrelease>\IncludeInRelease{2015/01/20}{\tracingnone}% +%<latexrelease> {turn off etex tracing}% +%<*2ekernel|latexrelease> +\ifx\tracingscantokens\@undefined +\def\tracingnone{% + \tracingonline\z@ + \tracingcommands\z@ + \showboxdepth\m@ne + \showboxbreadth\m@ne + \tracingoutput\z@ + \errorcontextlines\m@ne + \tracingrestores\z@ + \tracingparagraphs\z@ + \tracingmacros\z@ + \tracinglostchars\@ne + \tracingpages\z@ + \tracingstats\z@ +}% +\else +\def\tracingnone{% + \tracingassigns\z@ + \tracingrestores\z@ + \tracingonline\z@ + \tracingcommands\z@ + \showboxdepth\m@ne + \showboxbreadth\m@ne + \tracingoutput\z@ + \errorcontextlines\m@ne + \tracingnesting\z@ + \tracingscantokens\z@ + \tracingifs\z@ + \tracinggroups\z@ + \tracingparagraphs\z@ + \tracingmacros\z@ + \tracinglostchars\@ne + \tracingpages\z@ + \tracingstats\z@ +}% +\fi +% \end{macrocode} +% % \begin{macrocode} -%<*2ekernel|autoerr> -\gdef\loggingall{\tracingcommands\tw@\tracingstats\tw@ - \tracingpages\@ne\tracinglostchars\@ne - \tracingmacros\tw@\tracingparagraphs\@ne\tracingrestores\@ne - \errorcontextlines\maxdimen\loggingoutput} -\gdef\tracingall{\loggingall\showoverfull} -%</2ekernel|autoerr> -%<autoload>\def\tracingall{\@autoerr\tracingall} +\def\hideoutput{% + \tracingoutput\z@ + \showboxbreadth\m@ne + \showboxdepth\m@ne + \tracingonline\m@ne +}% +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\tracingnone}% +%<latexrelease> {turn off etex tracing}% +%<latexrelease>\let\tracingnone\@undefined +%<latexrelease>\let\hideoutput\@undefined +%<latexrelease>\EndIncludeInRelease % \end{macrocode} % \end{macro} % \end{macro} % +% % \LaTeX\ change: |\showhyphens| Defined later. % % Punctuation affects the spacing. % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \nonfrenchspacing -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % % diff --git a/Master/texmf-dist/source/latex/base/ltsect.dtx b/Master/texmf-dist/source/latex/base/ltsect.dtx index 4b7bca05c6e..b267daaf8b2 100644 --- a/Master/texmf-dist/source/latex/base/ltsect.dtx +++ b/Master/texmf-dist/source/latex/base/ltsect.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -49,7 +49,8 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltspace.dtx b/Master/texmf-dist/source/latex/base/ltspace.dtx index 55fdf5a91a2..84ec4431dfa 100644 --- a/Master/texmf-dist/source/latex/base/ltspace.dtx +++ b/Master/texmf-dist/source/latex/base/ltspace.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltspace.dtx} - [2014/09/29 v1.3a LaTeX Kernel (spacing)] + [2015/01/14 v1.3e LaTeX Kernel (spacing)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltspace.dtx} @@ -47,13 +47,14 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{459} +% \CheckSum{578} % % \changes{v1.1a}{1994/05/16}{(ASAJ) Split from ltinit.dtx.} % \changes{v1.2f}{1995/05/25}{Macros moved to ltlists.dtx} @@ -548,15 +549,35 @@ % % \begin{macro}{\@esphack} % Companion to |\@bsphack|. +% \changes{v1.3d}{2015/01/11}{Allow hyphenation (Donald Arseneau pr/3498) (latexrelease)} % \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\@esphack}{hyphenation after space hack}% +%<*2ekernel|latexrelease> \def\@esphack{% \relax \ifhmode \spacefactor\@savsf \ifdim\@savsk>\z@ + \nobreak \hskip\z@skip \ignorespaces \fi - \fi} + \fi}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\@esphack}{hyphenation after space hack}% +%<latexrelease>\def\@esphack{% +%<latexrelease> \relax +%<latexrelease> \ifhmode +%<latexrelease> \spacefactor\@savsf +%<latexrelease> \ifdim\@savsk>\z@ +%<latexrelease> \ignorespaces +%<latexrelease> \fi +%<latexrelease> \fi}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -565,16 +586,37 @@ % true (as |\@esphack| used to do previously). % This is currently used only for floats and similar environments. % \changes{v1.2s}{1996/08/02}{Remove \cs{global} before \cs{@ignore...}} +% \changes{v1.3d}{2015/01/11}{Allow hyphenation (Donald Arseneau pr/3498) (latexrelease)}w % \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\Eesphack}{hyphenation after space hack}% +%<*2ekernel|latexrelease> \def\@Esphack{% \relax \ifhmode \spacefactor\@savsf \ifdim\@savsk>\z@ + \nobreak \hskip\z@skip \@ignoretrue \ignorespaces \fi - \fi} + \fi}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\@Esphack}{hyphenation after space hack}% +%<latexrelease>\def\@Esphack{% +%<latexrelease> \relax +%<latexrelease> \ifhmode +%<latexrelease> \spacefactor\@savsf +%<latexrelease> \ifdim\@savsk>\z@ +%<latexrelease> \@ignoretrue +%<latexrelease> \ignorespaces +%<latexrelease> \fi +%<latexrelease> \fi}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -701,6 +743,18 @@ % \begin{macro}{\addpenalty} % \changes{v1.2b}{1994/11/12}{Corrected error message} % \changes{v1.2c}{1994/11/13}{Recorrected error message} +% \changes{v1.1h}{2015/01/09}{Donald Arseneau's fix from PR/377703 (latexrelease)} +% \begin{macrocode} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\addpenalty}{\addpenalty}% +%<*2ekernel|latexrelease> +% \end{macrocode} +% Fix provided by Donald (though the original fix was not good +% enough). In 2005 Plamen Tanovski discovered that this fix wasn't +% good enough either as the \cs{vskip} kept getting bigger if +% several \cs{addpenalty} commands followed each other. Donald +% kindly send a new fix. % \begin{macrocode} \def\addpenalty#1{% \ifvmode @@ -712,15 +766,75 @@ \penalty#1\relax \else \@tempskipb\lastskip - \vskip -\lastskip - \penalty#1% - \vskip\@tempskipb +% \end{macrocode} +% We have to make sure the final \cs{vskip} seen by \TeX\ is the +% correct one, namely \cs{@tempskipb}. However we may have to +% adjust for \cs{prevdepth} when placing the penalty but that +% should not affect the skip we pass on to \TeX. +% \changes{v1.3e}{2015/01/14}{Avoid adding redundant skips (DPC)} +% \begin{macrocode} + \begingroup + \@tempskipa\@tempskipb + \advance \@tempskipb + \ifdim\prevdepth>\maxdepth\maxdepth\else +% \end{macrocode} +% If |\prevdepth| is -1000pt due to |\nointerlineskip| we better +% not add it! +% \begin{macrocode} + \ifdim \prevdepth = -\@m\p@ \z@ \else \prevdepth \fi + \fi + \vskip -\@tempskipb + \penalty#1% + \ifdim\@tempskipa=\@tempskipb +% \end{macrocode} +% Do nothing if the |\prevdepth| check made no adjustment. +% \begin{macrocode} + \else +% \end{macrocode} +% Combine the prevdepth adjustment into a single skip. +% \begin{macrocode} + \advance\@tempskipb -\@tempskipa + \vskip \@tempskipb + \fi +% \end{macrocode} +% The final skip is always the specified length. +% \begin{macrocode} + \vskip \@tempskipa + \endgroup \fi \fi \fi \else \@noitemerr - \fi} + \fi}% +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\addpenalty}{\addpenalty}% +%<latexrelease>\def\addpenalty#1{% +%<latexrelease> \ifvmode +%<latexrelease> \if@minipage +%<latexrelease> \else +%<latexrelease> \if@nobreak +%<latexrelease> \else +%<latexrelease> \ifdim\lastskip=\z@ +%<latexrelease> \penalty#1\relax +%<latexrelease> \else +%<latexrelease> \@tempskipb\lastskip +%<latexrelease> \vskip -\lastskip +%<latexrelease> \penalty#1% +%<latexrelease> \vskip\@tempskipb +%<latexrelease> \fi +%<latexrelease> \fi +%<latexrelease> \fi +%<latexrelease> \else +%<latexrelease> \@noitemerr +%<latexrelease> \fi}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % @@ -896,8 +1010,23 @@ % Placed before a '.', makes it a sentence-ending period. Does the % right thing for other punctuation marks as well. Does this by % setting spacefactor to 1000. +% \changes{v1.3b}{2014/12/30}{\cs{@} discards spaces when moving +% (pr3039)(latexrelease)} % \begin{macrocode} -\def\@{\spacefactor\@m} +%</2ekernel> +%<latexrelease>\IncludeInRelease{2015/01/01}% +%<latexrelease> {\@}{Space after \@}% +%<*2ekernel|latexrelease> +% \end{macrocode} +% \begin{macrocode} +\def\@{\spacefactor\@m{}}% +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\@}{Space after \@}% +%<latexrelease>\def\@{\spacefactor\@m}% +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/base/lttab.dtx b/Master/texmf-dist/source/latex/base/lttab.dtx index 596937d623b..3735baa2b03 100644 --- a/Master/texmf-dist/source/latex/base/lttab.dtx +++ b/Master/texmf-dist/source/latex/base/lttab.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -29,11 +29,9 @@ % % \iffalse %%% From File: lttab.dtx -%<def>\ProvidesFile{autotabg.sty} -%<def> [1998/11/13 v1.1m tabbing autoload file] %<*driver> % \fi -\ProvidesFile{lttab.dtx}[2014/09/29 v1.1m LaTeX Kernel (Columns)] +\ProvidesFile{lttab.dtx}[2015/02/21 v1.1n LaTeX Kernel (Columns)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{lttab.dtx} @@ -49,14 +47,15 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % % -% \CheckSum{1131} +% \CheckSum{1127} % % \changes{v1.0l}{1995/05/07}{Use \cs{hb@xt@}} % \changes{v1.1a}{1995/05/22}{Support autoloading feature} @@ -64,6 +63,7 @@ % \changes{v1.1d}{1995/10/04}{Modify autoload support} % \changes{v1.1k}{1998/06/18}{Small addition to documentation} % \changes{v1.1l}{1998/07/06}{Small correction to documentation} +% \changes{v1.1n}{2015/02/21}{Removed autoload code} % % \section{Tabbing, Tabular and Array Environments} % This section deals with `Lining It Up in Columns'. First the @@ -329,7 +329,7 @@ % \changes{v1.0c}{1994/05/07}{Changed \cs{@firsttab} to \cs{chardef}} % \changes{v1.0c}{1994/05/07}{Changed \cs{@maxtab} to \cs{chardef}} % \begin{macrocode} -%<*2ekernel|autoload> +%<*2ekernel> \newdimen\@gtempa \chardef\@firsttab=\the\allocationnumber \newdimen\@gtempa\newdimen\@gtempa\newdimen\@gtempa\newdimen\@gtempa @@ -372,10 +372,6 @@ % \end{macro} % \end{macro} % -% \begin{macrocode} -%</2ekernel|autoload> -%<*2ekernel|def> -% \end{macrocode} % % \begin{macro}{\if@rjfield} % \begin{macrocode} @@ -641,25 +637,13 @@ % \end{macrocode} % \end{macro} % -% \begin{macrocode} -%</2ekernel|def> -% \end{macrocode} % % \begin{macro}{\tabbingsep} % \begin{macrocode} -%<*2ekernel|autoload> \newdimen\tabbingsep -%</2ekernel|autoload> % \end{macrocode} % \end{macro} % -% \begin{macro}{\tabbing} -% \begin{macrocode} -%<*autoload> -\def\tabbing{\@autoload{tabg}\tabbing} -%</autoload> -% \end{macrocode} -% \end{macro} % % % \subsection{array and tabular environments} @@ -799,9 +783,6 @@ % except without the extra $'s. % \end{oldcomments} % -% \begin{macrocode} -%<*2ekernel|autoload> -% \end{macrocode} % % \begin{macro}{\extracolsep} % \begin{macrocode} @@ -1614,7 +1595,7 @@ % \end{macro} % % \begin{macrocode} -%</2ekernel|autoload> +%</2ekernel> % \end{macrocode} % % \Finale diff --git a/Master/texmf-dist/source/latex/base/ltthm.dtx b/Master/texmf-dist/source/latex/base/ltthm.dtx index c25f36787ae..d7543daec41 100644 --- a/Master/texmf-dist/source/latex/base/ltthm.dtx +++ b/Master/texmf-dist/source/latex/base/ltthm.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -48,7 +48,8 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/ltunicode.dtx b/Master/texmf-dist/source/latex/base/ltunicode.dtx new file mode 100644 index 00000000000..aa8366cfe93 --- /dev/null +++ b/Master/texmf-dist/source/latex/base/ltunicode.dtx @@ -0,0 +1,791 @@ +% \iffalse meta-comment +% +% Copyright 2014-2015 +% The LaTeX3 Project and any individual authors listed elsewhere +% in this file. +% +% This file is part of the LaTeX base system. +% ------------------------------------------- +% +% It may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3c +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This file has the LPPL maintenance status "maintained". +% +% The list of all files belonging to the LaTeX base distribution is +% given in the file `manifest.txt'. See also `legal.txt' for additional +% information. +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with +% extension .ins) which are part of the distribution. +% +% ----------------------------------------------------------------------------- +% +% The same approach as used in \pkg{DocStrip}: if \cs{documentclass} +% is undefined then skip the driver, allowing the file to be used directly. +% This works as the \cs{fi} is only seen if \LaTeX{} is not in use. The odd +% \cs{jobname} business allows the extraction to work with \LaTeX{} provided +% an appropriate \texttt{.ins} file is set up. +%<*gobble> +\ifx\jobname\relax + \let\documentclass\undefined +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname documentclass\endcsname\relax +\else + \csname fi\endcsname +%</gobble> +% +%<*driver> +\ProvidesFile{ltunicode.dtx} + [2015/03/26 v1.0g LaTeX Kernel (Unicode data)] +\documentclass{ltxdoc} +\begin{document} +\DocInput{\jobname.dtx} +\end{document} +%<*gobble> +\fi +%</gobble> +%</driver> +% \fi +% +% \GetFileInfo{ltunicode.dtx} +% \title{The \texttt{ltunicode.dtx} file\thanks +% {This file has version number \fileversion, dated \filedate.}\\ +% for use with \LaTeXe} +% \author{The \LaTeX3 Project} +% +% \MaintainedByLaTeXTeam{latex} +% \maketitle +% +% This script extracts data from the Unicode Consortium files +% |UnicodeData.txt|, |EastAsianWidth.txt| and |LineBreak.txt| to be used for +% setting up \LaTeXe{} (or plain \TeX{}) with sane default settings when using +% the Xe\TeX{} and Lua\TeX{} engines. Details of the process are included in +% the code comments. +% +% To create the extracted file, run this file in a location containing +% the three input data files using \texttt{pdftex}. (The code requires +% \cs{pdfmdfivesum} and the e-\TeX{} extensions: it could be adapted for +% Lua\TeX{}). +% +% \StopEventually{} +% +% \begin{macrocode} +%<*script> +% \end{macrocode} +% +% \section{General set up} +% +% The script is designed to work with plain \TeX{} and so |@| is made into +% a `letter' using the primitive approach. +% \begin{macrocode} +\catcode`\@=11 % +% \end{macrocode} +% +% \begin{macro}{\gobble} +% \begin{macro}{\firsttoken} +% Standard utilities. +% \begin{macrocode} +\long\def\gobble#1{} +\long\def\firsttoken#1#2\relax{#1} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\storedpar} +% A simple piece of test set up: the final line of the read file will be +% tokenized by \TeX{} as \cs{par} which can be tested by \cs{ifx} provided +% we have an equivalent available. +% \begin{macrocode} +\def\storedpar{\par} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\return} +% A stored |^^M| for string comparisons. +% \begin{macrocode} +\begingroup + \catcode`\^^M=12 % + \gdef\return{^^M}% +\endgroup% +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\sourceforhex} +% \begin{macro}{\sethex} +% \begin{macro}{\dohex} +% \begin{macro}{\hexdigit} +% Some parts of the code here will need to be able to convert integers +% to their hexadecimal equivalent. That is easiest to do for the requirements +% here using a modified version of some code from Appendix~D of \emph{The +% \TeX{}book}. +% \begin{macrocode} +\newcount\sourceforhex +\def\sethex#1#2{% + \def#1{}% + \sourceforhex=#2\relax + \ifnum\sourceforhex=0 % + \def#1{0}% + \else + \dohex#1% + \fi +} +\def\dohex#1{% + \begingroup + \count0=\sourceforhex + \divide\sourceforhex by 16 % + \ifnum\sourceforhex>0 % + \dohex#1% + \fi + \count2=\sourceforhex + \multiply\count2 by -16 % + \advance\count0 by\count2 + \hexdigit#1% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% +} +\def\hexdigit#1{% + \ifnum\count0<10 % + \edef#1{#1\number\count0}% + \else + \advance\count0 by -10 % + \edef#1{#1\ifcase\count0 A\or B\or C\or D\or E\or F\fi}% + \fi +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\unicoderead, \unicodewrite} +% Set up the streams for data. +% \begin{macrocode} +\newread\unicoderead +\newwrite\unicodewrite +% \end{macrocode} +% \end{macro} +% +% \section{Verbatim copying} +% +% \begin{macro}{\verbatimcopy} +% \begin{macro}{\endverbatimcopy} +% \begin{macro}{\verbatimcopy@auxii} +% \begin{macro}{\verbatimcopy@auxii} +% \begin{macro}{\verbatim@endmarker} +% Set up to read some material verbatim and write it to the output stream. +% There needs to be a dedicated `clean up first line' macro, but other than +% that life is simple enough. +% \begin{macrocode} +\begingroup + \catcode`\^^M=12 % + \gdef\verbatimcopy{% + \begingroup% + \catcode`\^^M=12 % + \catcode`\\=12 % + \catcode`\{=12 % + \catcode`\}=12 % + \catcode`\#=12 % + \catcode`\%=12 % + \catcode`\ =12 % + \endlinechar=`\^^M % + \verbatimcopy@auxi + }% + \gdef\verbatimcopy@auxi#1^^M{% + \expandafter\verbatimcopy@auxii\gobble#1^^M% + }% + \gdef\verbatimcopy@auxii#1^^M{% + \def\temp{#1}% + \ifx\temp\verbatim@endmarker% + \expandafter\endgroup% + \else% + \ifx\temp\empty\else% + \immediate\write\unicodewrite{#1}% + \fi% + \expandafter\verbatimcopy@auxii% + \fi% + }% +\endgroup% +\edef\verbatim@endmarker{\expandafter\gobble\string\\} +\edef\verbatim@endmarker{\verbatim@endmarker endverbatimcopy} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \section{File header section} +% +% \changes{v1.0d}{2015/03/26}{Renamed data file to +% \texttt{unicode-letters.def}} +% With the mechanisms set up, open the data file for writing. +% \begin{macrocode} +\immediate\openout\unicodewrite=unicode-letters.def % +% \end{macrocode} +% There are various lines that now need to go at the start of the file. +% First, there is some header information. Parts of it are auto-generated, +% so there is some interspersing of verbatim and non-verbatim parts. +% \begin{macrocode} +\verbatimcopy +%% This is the file `unicode-letters.def', +%% generated using the script ltunicode.dtx. +%% +%% The data here are derived from the files +\endverbatimcopy +% \end{macrocode} +% +% \changes{v1.0b}{2015/03/25}{Include Unicode version data in generated +% file} +% \changes{v1.0c}{2015/03/25}{Include MD5 sums for sources in generated +% file} +% \changes{v1.0f}{2015/03/26}{Include dates for sources in generated +% file} +% \begin{macro}{\parseunicodedata} +% \begin{macro}{\parseunicodedata@auxi} +% \begin{macro}{\parseunicodedata@auxii} +% \begin{macro}{\mdfiveinfo} +% To ensure that there is a full audit trail for the data, we record +% both the reported file version (if available) and the checksum for each +% of the source files. This is done by reading the first line of each file +% and parsing for the version string and if found reading the second line +% for a date/time, and then `catching' the entire files inside a macro to +% work out the checksums. +% \begin{macrocode} +\def\parseunicodedata#1{% + \openin\unicoderead=#1.txt % + \ifeof\unicoderead + \errmessage{Data file missing: #1.txt}% + \fi + \immediate\write\unicodewrite{% + \expandafter\gobble\string\%\expandafter\gobble\string\% + - #1.txt + }% + \readline\unicoderead to \unicodedataline + \edef\unicodedataline{\unicodedataline\detokenize{-.txt}}% + \expandafter\parseunicodedata@auxi\unicodedataline\relax{#1}% +} +\begingroup +\catcode`\T=12 % +\catcode`\X=12 % +\lowercase{% + \endgroup + \def\parseunicodedata@auxi#1-#2.TXT#3\relax#4}% +{% + \ifx\relax#2\relax + \else + \readline\unicoderead to \unicodedataline + \expandafter\parseunicodedata@auxii\unicodedataline\relax + \fi + \closein\unicoderead + \begingroup + \everyeof{\noexpand}% + \catcode`\#=12 % + \edef\mdfiveinfo{\input#4.txt\space}% + \expandafter\endgroup + \expandafter\def\expandafter\mdfiveinfo\expandafter{\mdfiveinfo}% + \immediate\write\unicodewrite{% + \expandafter\gobble\string\%\expandafter\gobble\string\% + \space\space + \ifx\relax#2\relax + \else + Version #2 dated \temp^^J% + \expandafter\gobble\string\%\expandafter\gobble\string\% + \space\space + \fi + MD5 sum \pdfmdfivesum\expandafter{\mdfiveinfo}% + }% +} +\def\parseunicodedata@auxii#1: #2, #3 #4\relax{% + \def\temp{#2, #3}% +} +\parseunicodedata{UnicodeData} +\parseunicodedata{EastAsianWidth} +\parseunicodedata{LineBreak} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macrocode} +\verbatimcopy +%% which are maintained by the Unicode Consortium. +%% +\endverbatimcopy +% \end{macrocode} +% +% Automatically include the current date. +% \begin{macrocode} +\immediate\write\unicodewrite{% + \expandafter\gobble\string\%\expandafter\gobble\string\% + Generated on \the\year + -\ifnum\month>9 \else 0\fi \the\month + -\ifnum\day>9 \else 0\fi \the\day. +} +% \end{macrocode} +% +% Back to simple text copying +% \begin{macrocode} +\verbatimcopy +%% +%% Copyright 2014-2015 +%% The LaTeX3 Project and any individual authors listed elsewhere +%% in this file. +%% +%% This file is part of the LaTeX base system. +%% ------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This file has the LPPL maintenance status "maintained". +%% +%% The list of all files belonging to the LaTeX base distribution is +%% given in the file `manifest.txt'. See also `legal.txt' for additional +%% information. +\endverbatimcopy +% \end{macrocode} +% +% \section{Unicode character data} +% +% \changes{v1.0e}{2015/03/26}{Correctly parse ranges in +% \texttt{UnicodeData.txt}} +% \begin{macro}{\parseunicodedata} +% \begin{macro}{\parseunicodedata@auxi} +% \begin{macro}{\parseunicodedata@auxii} +% \begin{macro}{\parseunicodedata@auxiii} +% \begin{macro}{\parseunicodedata@auxiv} +% \begin{macro}{\parseunicodedata@auxv} +% \begin{macro}{\parseunicodedata@auxvi} +% The first step of parsing a line of data is to check that it's not come +% from a blank in the source, which will have been tokenized as \cs{par}. +% Assuming that is not the case, there are lots of data items separated by +% |;|. Of those, only a few are needed so they are picked out and everything +% else is dropped. There is one complication: there are a few cases in the +% data file of ranges which are marked by the descriptor |First| and a +% matching |Last|. A separate routine is used to handle these cases. +% \begin{macrocode} +\def\parseunicodedata#1{% + \ifx#1\storedpar + \else + \expandafter\parseunicodedata@auxi#1\relax + \fi +} +\def\parseunicodedata@auxi#1;#2;#3;#4;#5;#6;#7;#8;#9;{% + \parseunicodedata@auxii#1;#3;#2 First>\relax +} +\def\parseunicodedata@auxii#1;#2;#3 First>#4\relax{% + \ifx\relax#4\relax + \expandafter\parseunicodedata@auxiii + \else + \expandafter\parseunicodedata@auxv + \fi + #1;#2;% +} +\def\parseunicodedata@auxiii#1;#2;#3;#4;#5;#6;#7;#8\relax{% + \parseunicodedata@auxiv{#1}{#2}{#6}{#7}% +} +% \end{macrocode} +% At this stage we have only four pieces of data +% \begin{enumerate} +% \item The code value +% \item The general class +% \item The uppercase mapping +% \item The lowercase mapping +% \end{enumerate} +% where both one or both of the last two may be empty. Everything here could +% be done in a single conditional within a \cs{write}, but that would be +% tricky to follow. Instead, a series of defined auxiliaries are used to +% show the flow. Notice that combining marks are treated as letters here +% (the second `letter' test). +% \begin{macrocode} +\def\parseunicodedata@auxiv#1#2#3#4{% + \if L\firsttoken#2?\relax + \expandafter\unicodeletter + \else + \if M\firsttoken#2?\relax + \expandafter\expandafter\expandafter\unicodeletter + \else + \expandafter\expandafter\expandafter\unicodenonletter + \fi + \fi + {#1}{#3}{#4}% +} +% \end{macrocode} +% In the case where the first code point for a range was found, we +% assume the next line is the last code point (it always is). It's then +% a question of checking if the range is a set of letters or not, and if +% so going though them all and adding to the data file. +% \begin{macrocode} +\def\parseunicodedata@auxv#1;#2;#3\relax{% + \read\unicoderead to \unicodedataline + \expandafter\parseunicodedata@auxvi\unicodedataline\relax#1;#2\relax +} +\def\parseunicodedata@auxvi#1;#2\relax#3;#4\relax{% + \if L\firsttoken#4?\relax + \count@="#3 % + \begingroup + \loop + \ifnum\count@<"#1 % + \advance\count@\@ne + \sethex\temp{\count@}% + \unicodeletter\temp\temp\temp + \repeat + \endgroup + \fi +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \changes{v1.0g}{2015/03/26}{Add missing \cs{global} in definition of \cs{C}} +% \begin{macro}{\unicodeletter, \unicodenonletter} +% \begin{macro}{\writeunicodedata} +% For `letters', we always want to write the data to file, and the only +% question here is if the character has case mappings or these point back +% to the character itself. +% \begin{macrocode} +\def\unicodeletter#1#2#3{% + \writeunicodedata\L{#1}{#2}{#3}% +} +% \end{macrocode} +% Cased non-letters can also exist: they can be detected as they have at +% least one case mapping. Write these in much the same way as letters. +% \begin{macrocode} +\def\unicodenonletter#1#2#3{% + \ifx\relax#2#3\relax + \else + \writeunicodedata\C{#1}{#2}{#3}% + \fi +} +% \end{macrocode} +% Actually write the data. In all cases both upper- and lower-case mappings +% are given, so there is a need to test that both were actually available and +% if not set up to do nothing. +% \begin{macrocode} +\def\writeunicodedata#1#2#3#4{% + \immediate\write\unicodewrite{% + \space\space + \string#1\space + #2 % + \ifx\relax#3\relax + #2 % + \else + #3 % + \fi + \ifx\relax#4\relax + #2 % + \else + #4 % + \fi + \expandafter\gobble\string\% + }% +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% There is now a lead-in section which creates the macros which take the +% processed data and do the code assignments. Everything is done within a +% group so that there is no need to worry about names. +% \begin{macrocode} +\verbatimcopy +\begingroup +\endverbatimcopy +% \end{macrocode} +% Cased non-letters simply need to have the case mappings set. +% For letters, there are a few things to sort out. First, the case mappings are +% defined as for non-letters. Category code is then set to $11$ before a check +% to see if this is an upper case letter. If it is then the \cs{sfcode} is set +% to $999$. Finally there is a need to deal with Unicode math codes, where base +% plane letters are class $7$ but supplementary plane letters are class~$1$. +% Older versions of Xe\TeX{} used a different name here: easy to pick up as +% we know that this primitive must be defined in some way. There is also an issue +% with the supplementary plane and older Xe\TeX{} versions, which is dealt with +% using a check at run time. +% \begin{macrocode} +\verbatimcopy + \def\C#1 #2 #3 {% + \XeTeXcheck{#1}% + \global\uccode"#1="#2 % + \global\lccode"#1="#3 % + } + \def\L#1 #2 #3 {% + \C #1 #2 #3 % + \global\catcode"#1=11 % + \ifnum"#1="#3 % + \else + \global\sfcode"#1=999 % + \fi + \ifnum"#1<"10000 % + \global\Umathcode"#1="7"01"#1 % + \else + \global\Umathcode"#1="0"01"#1 % + \fi + } + \ifx\Umathcode\undefined + \let\Umathcode\XeTeXmathcode + \fi + \def\XeTeXcheck#1{} + \ifx\XeTeXversion\undefined + \else + \def\XeTeXcheck.#1.#2-#3\relax{#1} + \ifnum\expandafter\XeTeXcheck\XeTeXrevision.-\relax>996 % + \def\XeTeXcheck#1{} + \else + \def\XeTeXcheck#1{% + \ifnum"#1>"FFFF % + \long\def\XeTeXcheck##1\endgroup{\endgroup} + \expandafter\XeTeXcheck + \fi + } + \fi + \fi +\endverbatimcopy +% \end{macrocode} +% Read the data and write the resulting code assignments to the file. +% \begin{macrocode} +\openin\unicoderead=UnicodeData.txt % +\loop\unless\ifeof\unicoderead + \read\unicoderead to \unicodedataline + \parseunicodedata\unicodedataline +\repeat +% \end{macrocode} +% End the group for setting character codes and assign a couple of special +% cases. +% \begin{macrocode} +\verbatimcopy +\endgroup +\global\sfcode"2019=0 % +\global\sfcode"201D=0 % +\endverbatimcopy +% \end{macrocode} +% Lua\TeX{} and older versions of Xe\TeX{} stop here: character classes are a +% Xe\TeX{}-only concept. +% \begin{macrocode} +\verbatimcopy +\ifx\XeTeXchartoks\XeTeXcharclass + \expandafter\endinput +\fi +\endverbatimcopy +% \end{macrocode} +% +% \section{Xe\TeX{} Character classes} +% +% The Xe\TeX{} engine includes the concept of character classes, which allow +% insertion of tokens into the input stream at defined boundaries. Setting +% up this data requires a two-part process as the information is split over +% two input files. +% +% \begin{macro}{\parseunicodedata} +% \begin{macro}{\parseunicodedata@auxi} +% \begin{macro}{\parseunicodedata@auxii} +% The parsing system is redefined to parse a detokenized input line which +% may be a comment starting with |#|. Assuming that is not the case, the +% data line with start with a code point potentially forming part of a range. +% The range is extracted and the width stored for each code point. +% \begin{macrocode} +\def\parseunicodedata#1{% + \ifx#1\return + \else + \if\expandafter\gobble\string\#\expandafter\firsttoken#1?\relax + \else + \expandafter\parseunicodedata@auxi#1\relax + \fi + \fi +} +\def\parseunicodedata@auxi#1;#2 #3\relax{% + \parseunicodedata@auxii#1....\relax{#2}% +} +\def\parseunicodedata@auxii#1..#2..#3\relax#4{% + \expandafter\gdef\csname EAW@#1\endcsname{#4}% + \ifx\relax#2\relax + \else + \count@="#1 % + \begingroup + \loop + \ifnum\count@<"#2 % + \advance\count@\@ne + \sethex\temp{\count@}% + \expandafter\gdef\csname EAW@\temp\endcsname{#4}% + \repeat + \endgroup + \fi +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% With the right parser in place, read the data file. +% \begin{macrocode} +\openin\unicoderead=EastAsianWidth.txt % +\loop\unless\ifeof\unicoderead + \readline\unicoderead to \unicodedataline + \parseunicodedata\unicodedataline +\repeat +% \end{macrocode} +% +% \begin{macro}{\parseunicodedata@auxii} +% \begin{macro}{\parseunicodedata@auxiii} +% \begin{macro}{\parseunicodedata@auxiv} +% \begin{macro}{\ID} +% \begin{macro}{\OP} +% \begin{macro}{\CL} +% \begin{macro}{\EX} +% \begin{macro}{\IS} +% \begin{macro}{\NS} +% \begin{macro}{\CM} +% The final file to read, |LineBreak.txt|, uses the same format as\\ +% |EastAsianWidth.txt|. As such, only the final parts of the parser have to be +% redefined. +% \begin{macrocode} +\def\parseunicodedata@auxii#1..#2..#3\relax#4{% + \parseunicodedata@auxiii{#1}{#4}% + \ifx\relax#2\relax + \else + \count@="#1 % + \begingroup + \loop + \ifnum\count@<"#2 % + \advance\count@\@ne + \sethex\temp{\count@}% + \expandafter\parseunicodedata@auxiii\expandafter{\temp}{#4}% + \repeat + \endgroup + \fi +} +% \end{macrocode} +% Adding data to the processed file depends on two factors: the +% classification in the line-breaking file and (possibly) the width data +% too. Any characters of class \texttt{ID} (ideograph) are stored: they +% always need special treatment. For characters of classes \texttt{OP} +% (opener), \texttt{CL} (closer), \texttt{EX} (exclamation), \texttt{IS} +% (infix sep) and \texttt{NS} (non-starter) the data is stored if the +% character is full, half or wide width. The same is true for +% \texttt{CM} (combining marks) characters, which need to be transparent +% to the mechanism. +% \begin{macrocode} +\def\parseunicodedata@auxiii#1#2{% + \ifcsname #2\endcsname + \ifnum\csname #2\endcsname=1 % + \parseunicodedata@auxiv{#1}{#2}% + \else + \ifnum 0% + \if F\csname EAW@#1\endcsname 1\fi + \if H\csname EAW@#1\endcsname 1\fi + \if W\csname EAW@#1\endcsname 1\fi + >0 % + \parseunicodedata@auxiv{#1}{#2}% + \fi + \fi + \fi +} +\def\parseunicodedata@auxiv#1#2{% + \immediate\write\unicodewrite{% + \space\space + \expandafter\string\csname #2\endcsname + \space + #1 % + \expandafter\gobble\string\% + }% +} +\def\ID{1} +\def\OP{2} +\def\CL{3} +\let\EX\CL +\let\IS\CL +\let\NS\CL +\def\CM{256} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% Before actually reading the line breaking data file, the appropriate +% temporary code is added to the output. As described above, only a limited +% number of classes need to be covered: they are hard-coded as classes +% $1$, $2$ and $3$ following the convention adopted by plain Xe\TeX{}. +% \begin{macrocode} +\verbatimcopy +\begingroup + \def\ID#1 {\global\XeTeXcharclass"#1=1 \global\catcode"#1=11 } + \def\OP#1 {\global\XeTeXcharclass"#1=2 } + \def\CL#1 {\global\XeTeXcharclass"#1=3 } + \def\EX#1 {\global\XeTeXcharclass"#1=3 } + \def\IS#1 {\global\XeTeXcharclass"#1=3 } + \def\NS#1 {\global\XeTeXcharclass"#1=3 } + \def\CM#1 {\global\XeTeXcharclass"#1=256 } +\endverbatimcopy +% \end{macrocode} +% +% Read the line breaking data and save to the output. +% \begin{macrocode} +\openin\unicoderead=LineBreak.txt % +\loop\unless\ifeof\unicoderead + \readline\unicoderead to \unicodedataline + \parseunicodedata\unicodedataline +\repeat +% \end{macrocode} +% +% \changes{v1.0a}{2015/03/25}{Use \cs{hskip} rather than \cs{hspace} +% in glue settings} +% Set up material to be inserted between character classes. +% that provided by plain Xe\TeX{}. Using \cs{hskip} here means the code will +% work with plain as well as \LaTeXe{}. +% \begin{macrocode} +\verbatimcopy +\endgroup +\gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax} +\gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax} +\global\XeTeXinterchartoks 0 1 = {\xtxHanSpace} +\global\XeTeXinterchartoks 0 2 = {\xtxHanSpace} +\global\XeTeXinterchartoks 0 3 = {\nobreak\xtxHanSpace} +\global\XeTeXinterchartoks 1 0 = {\xtxHanSpace} +\global\XeTeXinterchartoks 2 0 = {\nobreak\xtxHanSpace} +\global\XeTeXinterchartoks 3 0 = {\xtxHanSpace} +\global\XeTeXinterchartoks 1 1 = {\xtxHanGlue} +\global\XeTeXinterchartoks 1 2 = {\xtxHanGlue} +\global\XeTeXinterchartoks 1 3 = {\nobreak\xtxHanGlue} +\global\XeTeXinterchartoks 2 1 = {\nobreak\xtxHanGlue} +\global\XeTeXinterchartoks 2 2 = {\nobreak\xtxHanGlue} +\global\XeTeXinterchartoks 2 3 = {\xtxHanGlue} +\global\XeTeXinterchartoks 3 1 = {\xtxHanGlue} +\global\XeTeXinterchartoks 3 2 = {\xtxHanGlue} +\global\XeTeXinterchartoks 3 3 = {\nobreak\xtxHanGlue} +\endverbatimcopy +% \end{macrocode} +% +% Done: end the script. +% \begin{macrocode} +\bye +% \end{macrocode} +% +% \begin{macrocode} +%</script> +% \end{macrocode} diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index 2ee57caced8..44f437c64c8 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltvers.dtx} - [2014/04/24 v1.0n LaTeX Kernel (Version Info)] + [2015/02/21 v1.0r LaTeX Kernel (Version Info)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltvers.dtx} @@ -48,13 +48,14 @@ Chris Rowley\and Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> % \fi % -% \CheckSum{48} +% \CheckSum{110} % % \section{Version Identification} % First we identify the date and version number of this release of @@ -78,13 +79,20 @@ % {Have version info generated automatically.} % \changes{v1.0a}{1994/03/04} % {Initial version, split from latex.dtx} +% \changes{v1.0r}{2015/02/21}{Removed autoload code} % % \begin{macro}{\fmtname} % \begin{macro}{\fmtversion} % \begin{macrocode} %<*2ekernel> \def\fmtname{LaTeX2e} -\edef\fmtversion{2014/05/01} +\edef\fmtversion +%</2ekernel> +%<latexrelease>\edef\latexreleaseversion +%<*2ekernel|latexrelease> + {2015/01/01} +%</2ekernel|latexrelease> +%<*2ekernel> % \end{macrocode} % \end{macro} % \end{macro} @@ -130,18 +138,64 @@ \fi % \end{macrocode} % +% \changes{v1.0p}{2015/01/22}{Preserve any \cs{everyjob} material inserted +% by a loader (\texttt{.ini} file)} % This startup banner may be further modified by the code in % |ltfinal.dtx| if a patch file is present. % \begin{macrocode} -\everyjob{\typeout{\fmtname -%<autoload>\space(autoload version)% - \space<\fmtversion>}} -\immediate\write16{\fmtname -%<autoload>\space(autoload version)% - \space<\fmtversion>} +\everyjob\expandafter{% + \the\everyjob + \typeout{\fmtname \space<\fmtversion>}} +\immediate\write16{\fmtname \space<\fmtversion>} %</2ekernel> % \end{macrocode} % +% \begin{macro}{\IncludeInRelease} +% \changes{v1.0n}{2015/01/07}{macro added} +% \changes{v1.0m}{2015/01/17}{modified with \cs{@currname}} +% \changes{v1.0o}{2015/01/19}{Optional argument} +% \changes{v1.0q}{2015/02/19}{Swap argument order} +% \begin{macrocode} +%<*2ekernel|latexrelease> +\def\IncludeInRelease#1{\kernel@ifnextchar[% + {\@IncludeInRelease{#1}} + {\@IncludeInRelease{#1}[#1]}} +% \end{macrocode} +% +% If a specific date has not been specified in |latexrelease| +% use `|#1|`. +% \begin{macrocode} +\def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#2}} +% \end{macrocode} +% +% \begin{macrocode} +\def\@IncludeInRele@se#1#2#3{% + \toks@{[#1] #3}% + \expandafter\ifx\csname\string#2+\@currname+IIR\endcsname\relax + \ifnum\expandafter\@parse@version#1//00\@nil + >\expandafter\@parse@version\fmtversion//00\@nil + \GenericInfo{}{Skipping: \the\toks@}% + \expandafter\expandafter\expandafter\@gobble@IncludeInRelease + \else + \GenericInfo{}{Applying: \the\toks@}% + \expandafter\let\csname\string#2+\@currname+IIR\endcsname\@empty + \fi + \else + \GenericInfo{}{Already applied: \the\toks@}% + \expandafter\@gobble@IncludeInRelease + \fi +} +% \end{macrocode} +% +% \begin{macrocode} +\long\def\@gobble@IncludeInRelease#1\EndIncludeInRelease{} +\let\EndIncludeInRelease\relax +% \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +% \end{macrocode} +% \end{macro} % \Finale % \endinput diff --git a/Master/texmf-dist/source/latex/base/ltx3info.tex b/Master/texmf-dist/source/latex/base/ltx3info.tex deleted file mode 100644 index 85faeeb5e24..00000000000 --- a/Master/texmf-dist/source/latex/base/ltx3info.tex +++ /dev/null @@ -1,474 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% -% This file is part of the LaTeX base system. -% ------------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This file has the LPPL maintenance status "maintained". -% -% The list of all files belonging to the LaTeX base distribution is -% given in the file `manifest.txt'. See also `legal.txt' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% -% \fi -\documentclass[a4paper]{article} - -% Commands and environments: - -\newcommand{\eg}{e.g.~} -\newcommand{\ie}{i.e.~} - - -\newenvironment{citations}{% - \list{}{% - \renewcommand{\makelabel}[1]{\normalfont\itshape ##1}% - }% -}{% - \endlist -} - -% Some logos: - -\newcommand{\NFSS}{NFSS} - -\newcommand{\LaTeXNews}{\LaTeX~News} - -\newcommand{\AW}{Addison Wesley} - -\newcommand{\SGML}{{\sc SGML}} -\newcommand{\DSSSL}{{\sc DSSSL}} -\newcommand{\HTML}{{\sc HTML}} -\newcommand{\XML}{{\sc XML}} -\newcommand{\PDF}{{\sc PDF}} - -\newcommand{\PS}{{\sc Post\-Script}} - -\newcommand{\AmSTeX}{$\mathcal A$\lower.4ex\hbox{$\!\mathcal - M\!$}$\mathcal S$-\TeX} -\newcommand{\AmSLaTeX}{$\mathcal A$\lower.4ex\hbox{$\!\mathcal - M\!$}$\mathcal S$-\LaTeX} -\newcommand{\MF}{{\sc Meta\-font}} - -% sections - -\setcounter{secnumdepth}{-2} - -% Front matter: - -\title{\Large The \LaTeX3 Project} - -\author{\copyright 1995--1999 \ -Frank Mittelbach and -Chris Rowley} - -\date{12 January 1999} - -\begin{document} - -\thispagestyle{empty} - -\maketitle - -\begin{abstract} - This article describes the motivation, achievements and future of - the \LaTeX3 Project, which was established to produce a new version - of \LaTeX{}, the widely-used and highly-acclaimed document - preparation system. It also describes how you can help us to - achieve our aims.\\[2pt] - \textbf{For Archive maintainers, Authors, Publishers and - Distributors:}\\ - The project team request that, whenever possible, you include this - article in any of the following: - \begin{itemize} - \item Books about \TeX{} and \LaTeX{}. - \item Instructions for authors on using \LaTeX{}. - \item The printed documentation of CD-ROM collections that contain - \LaTeX. - \item On-line collections that include a significant proportion of - documents encoded in \LaTeX. -\end{itemize} -\end{abstract} - -\section{Outline} - -The purposes of the \LaTeX3 system can be summarized thus: it will -greatly increase the range of documents which can be processed; and it -will provide a flexible interface for typographic designers to easily -specify the formatting of a class of documents. - -The \LaTeX3 Project Team is a small group of volunteers whose aim is -to produce this major new document processing system based on the -principles pioneered by Leslie Lamport in the current \LaTeX. - -The major visible work of the team before 1997 was the development of -the current \emph{standard} version of \LaTeX{}. This was first -released in 1994 and has since then been actively maintained and -enhanced by extensions to that core system. They will continue to -develop and maintain this system, releasing updated versions every six -months and recording these activities in the \LaTeX{} bugs database -(see below). - -Although \LaTeX{} may be distributed freely, the production and -maintenance of the system does require expenditure of reasonably large -sums of money. The \LaTeX3 Project Fund has therefore been set up to -channel money into this work. We know that some users are -aware of this fund as they have already contributed to it---many -thanks to all of them! If you want to know more about how you can -help the project, see Page \pageref{fund}---and thanks in advance for -your generosity in the future. - - -\section{Background} - -With \TeX{}, Knuth designed a formatting system that is able to -produce a large range of documents typeset to extremely high quality -standards. For various reasons (\eg quality, portability, stability -and availability) \TeX{} spread very rapidly and can nowadays be best -described as a world-wide de facto standard for high quality -typesetting. Its use is particularly common in specialized areas, such -as technical documents of various kinds, and for multi-lingual -requirements. - -The \TeX{} system is fully programmable. This allows the development -of high-level user interfaces whose input is processed by \TeX{}'s -interpreter to produce low-level typesetting instructions; these are -input to \TeX{}'s typesetting engine which outputs the format of each -page in a device-independent page-description language. The \LaTeX{} -system is such an interface; it was designed to support the needs of -long documents such as textbooks and manuals. It separates content and -form as much as possible by providing the user with a generic (\ie -logical rather than visual) mark-up interface; this is combined with -style sheets which specify the formatting. - -Recent years have shown that the concepts and approach of \LaTeX{} are -now widely accepted. Indeed, \LaTeX{} has become the standard method -of communicating and publishing documents in many academic -disciplines. This has led to many publishers accepting \LaTeX{} -source for articles and books; and the American Mathematical Society -now provides a \LaTeX{} package making the features of \AmSTeX{} -available to all users of \LaTeX{}. Its use has also spread into many -other commercial and industrial environments, where the technical -qualities of \TeX{} together with the concepts of \LaTeX{} are -considered a powerful combination of great importance to such areas as -corporate documentation and publishing. This has also extended to -on-line publishing using, for example, \PDF{} output incorporating -hypertext and other active areas. - -With the spreading use of \SGML{}-compliant systems (\eg Web-based -publishing using \HTML{} or \XML{}) \TeX{} again is a common choice as -the formatting engine for high quality typeset output: a widely used -such system is {\em The Publisher\/} from ArborText, whilst a more -recent development is the object-oriented document editor Grif. The -latter is used for document processing in a wide range of industrial -applications; it has also been adopted by the Euromath consortium as -the basis of their mathematician's workbench, one of the most advanced -of the emerging project-oriented user environments. Typeset output -from \SGML{}-coded documents in these systems is obtained by -translation into \LaTeX{}, which will therefore soon also be a natural -choice for the output of \DSSSL-compliant systems. - -Because a typical \SGML{} Document Type Definition (DTD) uses concepts -similar to those of \LaTeX{}, the formatting is often implemented by -simply mapping document elements to \LaTeX{} constructs rather than -directly to `raw \TeX'. -This enables the -sophisticated analytical techniques built into the \LaTeX{} -software to be exploited; and it avoids the need to program in \TeX{}. - -\section{Motivation} - -This increase in the range of applications of \LaTeX{} has highlighted -certain limitations of the current system, both for authors of -documents and for designers of formatting styles. - -In addition to the need to extend the variety of classes of document -which can be processed by \LaTeX{}, substantial enhancements are -necessary in, at least, the following areas: - \begin{itemize} - \item - the command syntax (attributes, short references, etc); - \item - the layout specification interface (style design); - \item - the level of robustness (error recovery, omitted tags); - \item - the extendibility (package interface); - \item - the layout specification of tabular material; - \item - the specification and inclusion of graphical material; - \item - the positioning of floating material, and other aspects of page - layout; - \item - the requirements of hypertext systems. - \end{itemize} - - Further analysis of these deficiencies has shown that some of the - problems are to be found in \LaTeX{}'s internal concepts and design. - This project to produce a new version therefore involves thorough - research into the challenges posed by new applications and by the use - of \LaTeX{} as a formatter for a wide range of documents, \eg \SGML{} - documents; on-line \PDF{} documents with hypertext links. - - This will result in a major re-implementation of large parts of the - system. Some of the results of such rethinking of the fundamentals - are already available in Standard \LaTeX{}, notably in the following - areas: - -\begin{itemize} -\item Font declaration and selection; -\item Font and glyph handling within mathematical formulas; -\item Handling multiple font glyph encodings within a document; -\item Allowing multiple input character encodings within a document; -\item A uniform interface for graphics inclusion; -\item Support for coloured text; -\item Building and interfacing new classes and extension packages. -\end{itemize} - - -\section{Description} - -The strengths of the present version of \LaTeX{} are -as follows: - \begin{itemize} - \item excellent standard of typesetting for text, technical -formulas\\ -and tabular material; - \item separation of generic mark-up from visual formatting; - \item ease of use for authors; - \item portability of documents over a wide range of platforms; - \item adaptability to many languages; - \item widespread and free availability; - \item reliable support and maintenance by the \LaTeX3 project team. - \end{itemize} - These will be preserved and in many cases greatly enhanced by the new - version which is being developed to fulfill the following requirements. - \begin{itemize} - \item - It will provide a syntax that allows highly automated translation - from popular \SGML{} DTDs into \LaTeX{} document classes (these - will be provided as standard with the new version). - - The syntax of the new \LaTeX{} user-interface will, for example, - support the \SGML{} concepts of `entity', `attribute' and `short - reference' in such a way that these can be directly linked to the - corresponding \SGML{} features. - - \item - It will support hypertext links and other features required for - on-line structured documents using, for example, \HTML{} and \XML{}. - -\item - It will provide a straightforward style-designer interface to support - both the specification of a wide variety of typographic requirements - and the linking of entities in the generic mark-up of a document to - the desired formatting. These two parts of the design process will - be clearly separated so that it is possible to specify different - layouts for the same DTD. - - The language and syntax of this interface will be as natural as - possible for a typographic designer. As a result, this language - could easily be interfaced to a visually-oriented, menu-driven - specification system. - - This interface will also support \DSSSL{} specifications and - style-sheet concepts such as those used with \HTML{} and \XML{}. - - \item - It will provide an enhanced user-interface that allows expression of - the typesetting requirements from a large range of subject areas. Some - examples are listed here. - - \begin{itemize} - \item The requirements of technical documentation (\eg offset layout,\\ - change bars, etc). - \item The requirements of academic publishing in the humanities\\ - (critical text editions, etc). - \item The requirements of structural formulas in chemistry. - \item Advanced use of the mathematical-typesetting features of \TeX{}. - \item The integration of graphical features, such as shading, - within text. - \item the integration of hypertext and other links in on-line - documents using systems such as \HTML{}, \XML{} and \PDF{}. - - \end{itemize} - - Special care will be taken to ensure that this interface is - extensible: this will be achieved by use of modular designs. - - - \item - It will provide a more robust author-interface. For example, - artificial restrictions on the nesting of commands will be removed. - Error handling will be improved by adding - a more effective, interactive help system. - - \item - It will provide access to arbitrary fonts from any family (such as - the \PS{} and TrueType fonts) including a wide range of fonts for - multi-lingual documents and the specialist glyphs required by - documents in various technical and academic areas. - - \item - The new interfaces will be documented in detail and the - system will provide extensive catalogues of examples, carefully - designed to make the learning time for new users (both designers and - authors) as short as possible. - - \item - The code itself will be thoroughly documented and it will be - designed on modular principles. Thus the system will be easy to - maintain and to enhance. -\end{itemize} - -The resulting new \LaTeX{} will, like the present version, be usable -with any standard \TeX{} system (or whatever replaces it) and so will -be freely available on a wide range of platforms. - - -\section{\LaTeX{} documentation} - -\begingroup -\setlength{\parindent}{0pt} - -A complete description of Standard \LaTeX{} can be found in: -\begin{citations} -\item[\LaTeX: A Document Preparation System] - Leslie Lamport,\\ \AW, 2nd ed, 1994. -\item[The \LaTeX{} Companion] - Mittelbach, Goossens with Braams, Carlisle and Rowley,\\ \AW, 2nd ed, 2004. -\end{citations} - -A recent addition to the publications closely associated with the -project is: -\begin{citations} -\item[The \LaTeX{} Graphics Companion] - Goossens, Mittelbach and Rahtz,\\ \AW, 1997. -\end{citations} - -This \LaTeX{} distribution comes with documentation on several aspects -of of the system. The newer features of the system are described in -the following documents: -\begin{citations} -\item[\LaTeXe{} for authors] - describes the new features of \LaTeX{} documents, - in the file \texttt{usrguide.tex}; -\item[\LaTeXe{} for class and package writers] - describes how to produce \LaTeX{} classes and packages, - in the file \texttt{clsguide.tex}; -\item[\LaTeXe{} font selection] - describes the new features of \LaTeX{} fonts for - class and package writers, - in the file \texttt{fntguide.tex}. -\end{citations} - -For further contacts and sources of information on \TeX{} and -\LaTeX{}, see the addresses on Page~\pageref{contacts}. - -\endgroup -\pagebreak - - -\section{The \LaTeX3 Project Fund} -\label{fund} - -Although \LaTeX{} may be distributed freely, the production and -maintenance of the system does require expenditure of reasonably large -sums of money. There are many necessities that need substantial -financing: examples are new or enhanced computing equipment and travel -to team meetings (the volunteers come from many different countries, -so getting together occasionally is a non-trivial exercise). - -This is why we are appealing to you for contributions to the fund. -Any sum will be much appreciated; the amount need not be large as -small contributions add up to very useful amounts. Contributions of -suitable equipment and software will also be of great value. This -appeal is both to you as an individual author and to you as a member -of a group or as an employee: please encourage your department or your -employer to contribute towards sustaining our work. - -We should like to see funded projects that make considerable use of -\LaTeX{} (\eg conferences and research teams who use it to publish -their work, and electronic research archives using it) include -contributions to this fund in their budgets. %% e-print systems - -We are also asking commercial organisations to assess the benefits -they gain from using, or distributing, a well-supported \LaTeX{} and -to make appropriate contributions to the fund in order that we can -continue to maintain and improve the product. If you work for, or do -business with, such an organisation, please bring to the attention of -the relevant people the existence and needs of the project. - -In particular, we ask that all the large number of organisations and -businesses that distribute \LaTeX{}, within other software or as part -of a CD-ROM collection, should consider pricing all products containing -\LaTeX{} at a level that enables them to make regular donations to the -fund from the profit on these items. We also ask all authors and -publishers of books about \LaTeX{} to consider donating part of the -royalties to the fund. - -Contributions should be sent to one of the following addresses: -\begin{quote}\small\label{addrs} - \TeX{} Users Group, P.O. Box 2311, Portland, OR~97208-2311 USA\\ - Fax:~+1~503~223~3960 \ Email: \texttt{tug@tug.org} - - \noindent - UK TUG, 1 Eymore Close, Selly Oak, Birmingham B29~4LB UK\\ - Fax: +44 121 476 2159 \ Email: \texttt{uktug-enquiries@tex.ac.uk} -\end{quote} - -Cheques should be payable to the user group (TUG or UKTUG) and be -clearly marked as contributions to the \LaTeX3 fund. -Many thanks to all of you who have contributed in the past and thanks -in advance for your generosity in the future. - -\section{Contacts and information} -\label{contacts} - -In addition to the sources mentioned above, \LaTeX{} has its home page -on the World Wide Web at: -\begin{verbatim} - http://www.latex-project.org/ -\end{verbatim} -This page describes \LaTeX{} and the \LaTeX3 project, and contains -pointers to other \LaTeX{} resources, such as the user guides, the -\TeX{} Frequently Asked Questions, and the \LaTeX{} bugs database. - -More general information, including contacts for local User Groups, -can be accessed via: -\begin{verbatim} - http://www.tug.org/ -\end{verbatim} - -The electronic home of anything \TeX-related is the Comprehensive -\TeX{} Archive Network (CTAN). This is a network of cooperating ftp -sites, with over a gigabyte of \TeX{} material: -\begin{verbatim} - ftp://cam.ctan.org/tex-archive/ - ftp://dante.ctan.org/tex-archive/ - ftp://tug.ctan.org/tex-archive/ -\end{verbatim} - -For more information, see the \LaTeX{} home page. - - -\end{document} - - - diff --git a/Master/texmf-dist/source/latex/base/ltxdoc.dtx b/Master/texmf-dist/source/latex/base/ltxdoc.dtx index ffe42ed4feb..c3ba6a64f8b 100644 --- a/Master/texmf-dist/source/latex/base/ltxdoc.dtx +++ b/Master/texmf-dist/source/latex/base/ltxdoc.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -30,7 +30,7 @@ % %<class>\NeedsTeXFormat{LaTeX2e} %<class>\ProvidesClass{ltxdoc} -%<class> [2014/09/29 v2.0u Standard LaTeX documentation class] +%<class> [2015/03/26 v2.0w Standard LaTeX documentation class] % %<*driver> \documentclass{ltxdoc} @@ -43,14 +43,15 @@ \date{\filedate} \author{David Carlisle} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{ltxdoc.dtx} \end{document} %</driver> % % \fi % -% \CheckSum{415} +% \CheckSum{472} % % \changes{v2.0i}{1994/04/29}{Update the documentation.} % \changes{v2.0s}{1998/08/17}{(RmS) Documentation fixes.} @@ -225,7 +226,7 @@ \DisableCrossrefs % \end{macrocode} % -% Increase the text width slightly so that width the standard fonts +% Increase the text width slightly so that with the standard fonts % 72 columns of code may appear in a |macrocode| environment. % \changes{v2.0c}{1994/03/15}{Set \cs{textwidth}.} % \begin{macrocode} @@ -256,7 +257,7 @@ % ``|\outer|'' nor is it possible to use it on conditionals such as % |\iftrue| or defined by |\newif|. % |\cs{foo}| also prints |\foo|, for those who prefer that -% syntax. (This second form can be used to record all type of commends so the +% syntax. (This second form can be used to record all types of command so the % above restrictions do not apply. % \begin{macro}{\cmd} % \changes{v2.0k}{1994/05/21}{New definition, so \cmd\{ works.} @@ -314,7 +315,7 @@ % \changes{v2.0e}{1994/03/18}{Use a fixed font.} % % Scan control names and put them in tt. -% will actually (incorrectly) scan past |\\| but this does not matter as +% Will actually (incorrectly) scan past |\\| but this does not matter as % this is almost never followed by a letter in practice. % (ie |\\foo|) would put |foo| in |\ttfamily|. % \begin{macrocode} @@ -424,7 +425,9 @@ \relax \clearpage \docincludeaux - \IfFileExists{#1.fdd}{\def\currentfile{#1.fdd}}{\def\currentfile{#1.dtx}}% + \IfFileExists{#1.fdd}% + {\def\currentfile{#1.fdd}}% + {\def\currentfile{#1.dtx}}% \ifnum\@auxout=\@partaux \@latexerr{\string\include\space cannot be nested}\@eha \else \@docinclude#1 \fi} @@ -513,6 +516,58 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\MaintainedByLaTeXTeam} +% \changes{v2.0v}{2015/03/25}{macro added} +% \changes{v2.0w}{2015/03/25}{use display block not footnote text} +% Generate boilerplate reference to bug database. +% \begin{macrocode} +\def\MaintainedBy#1{\gdef\@maintainedby{#1}} +% \end{macrocode} +% +% \begin{macrocode} +\let\@maintainedby\@empty +% \end{macrocode} +% +% \begin{macrocode} +\def\MaintainedByLaTeXTeam#1{% +{\gdef\@maintainedby{% +This file is maintained by the \LaTeX{} Project team.\\% +Bug reports can be opened (category \texttt{#1}) at\\% +\url{http://latex-project.org/bugs.html}.}}} +% \end{macrocode} +% +% \begin{macrocode} +\def\@maketitle{% + \newpage + \null + \vskip 2em% + \begin{center}% + \let \footnote \thanks + {\LARGE \@title \par}% + \vskip 1.5em% + {\large + \lineskip .5em% + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par}% + \vskip 1em% + {\large \@date}% + \ifx\@maintainedby\@empty + \else + \vskip 1em% + \fbox{\fbox{\begin{tabular}{@{}l@{}}\@maintainedby\end{tabular}}}% + \fi + \end{center}% + \par + \vskip 1.5em} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\url} +% \begin{macrocode} +\providecommand\url{\texttt} +% \end{macrocode} +% \end{macro} % % \begin{macrocode} \def\task#1#2{} diff --git a/Master/texmf-dist/source/latex/base/ltxref.dtx b/Master/texmf-dist/source/latex/base/ltxref.dtx index 541172b2f82..9dffd5a51a5 100644 --- a/Master/texmf-dist/source/latex/base/ltxref.dtx +++ b/Master/texmf-dist/source/latex/base/ltxref.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -49,7 +49,8 @@ Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{\filename} \end{document} %</driver> diff --git a/Master/texmf-dist/source/latex/base/makeindx.dtx b/Master/texmf-dist/source/latex/base/makeindx.dtx index 7bf84a7f537..9175f892c9d 100644 --- a/Master/texmf-dist/source/latex/base/makeindx.dtx +++ b/Master/texmf-dist/source/latex/base/makeindx.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -57,6 +57,7 @@ % Rainer Sch\"opf} % % \date{2014/09/29} +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \section{Description} diff --git a/Master/texmf-dist/source/latex/base/makeindx.ins b/Master/texmf-dist/source/latex/base/makeindx.ins index cb24526ef95..6ec8addb0d3 100644 --- a/Master/texmf-dist/source/latex/base/makeindx.ins +++ b/Master/texmf-dist/source/latex/base/makeindx.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/manual.err b/Master/texmf-dist/source/latex/base/manual.err deleted file mode 100644 index 084ae599f2d..00000000000 --- a/Master/texmf-dist/source/latex/base/manual.err +++ /dev/null @@ -1,350 +0,0 @@ -\documentclass{article} - -\newcommand{\reportedby}[2]{{\small [First reported by #1 on \mbox{#2}.]}} -\newcommand{\erratum}[1]{\subsubsection*{#1}} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% MODIFICATION DATE % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% Defines \moddate to expand to modification date such as % -% % -% 5 Aug 1991 % -% % -% and \prdate to print it in a large box. Assumes editor % -% updates modification date in standard SRC Gnu Emacs style. % -% (should work for any user name). % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\ypmd{% % -% % -% % - Last modified on Mon 22 Aug 2005 at 1:21:28 UT by lamport % - endypmd} % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newcommand{\moddate}{\expandafter\xpmd\ypmd} % -\def\xpmd Last modified % -on #1 #2 #3 #4 at #5:#6:#7 #8 by #9 endypmd{#3 #2 #8} % -\newcommand{\prdate}{\noindent\fbox{\Large\moddate}} % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\newcommand{\mytt}{\normalfont\ttfamily} -\newcommand{\cindex}{\index} -\newcommand\bs{\char '134 } % A backslash character for \tt font - -\title{Errata to the Second Edition of the \LaTeX\ Manual} -\author{Leslie Lamport} -\date{\moddate} - -\begin{document} -\maketitle - -\noindent These are all the errors and omissions to the manual, -\LaTeX: {\em A Document Preparation System}, second edition, published -by Addison-Wesley, reported as of \moddate. Positions in the book are -indicated by page and line number, where the top line of a page is -number 1 and the bottom line is number $-1$. A running head and a -page number are not considered to be lines, but all other lines are. -Please report any additional errors to me. My current email address -can be found at -{\tt http://lamport.org}. - - -\subsection*{Errors Corrected in the First Printing} - -\erratum{page 25, example of \texttt{verse} environment} -Replace \verb|{\em all\/}| by \verb|\emph{all}|. - \reportedby{Rosemary Bailey}{29 Aug 1994} - -\erratum{page 28, first paragraph} -Not an error, but it would be -helpful to add the following sentence to the end of that paragraph: - ``(If a declaration has arguments, they become additional -arguments of the corresponding environment's \verb|\begin| command.)'' - - -\erratum{page 33, line 10} -Add \verb|\]| to the list of fragile commands. - \reportedby{Rosemary Bailey}{29 Aug 1994} - -\erratum{page 43, table 3.5} -Add an entry for \verb|\notin| ($\notin$). - \reportedby{Rosemary Bailey}{29 Aug 1994} - -\erratum{page 72, two examples} -Change \verb|{\em ...}| to \verb|\emph{...}| - \reportedby{Rosemary Bailey}{29 Aug 1994} - -\erratum{page 101} -This is not an error, but some readers will find it helpful if, in the -descriptions of \verb|\setlength| and \verb|\addtolength|, -\verb|\gnat| were replaced by \verb|\parskip|. - \reportedby{Ellen Gilkerson}{9 Aug 1994} - -\erratum{page 108, lines 7 and 10} -This is not an error, but it might be easier to understand -the example if \verb|\len| were replaced by something like \verb|\saved|. - \reportedby{Rosemary Bailey}{29 Aug 1994} - -\erratum{page 139, lines $-8$ and $-9$} - -The funny break between these two lines should be eliminated. -\reportedby{Malcolm Clark}{9 Aug 1994} - -\erratum{page 177, line $-12$} - -The \verb|twocolumn| option cannot be used with the \verb|letters| -class. - -\erratum{page 197, lines 7 and 9} - -The \verb|figure*| environment is ended by \verb|\end{figure*}|, and -the \verb|table*| environment is ended by \verb|\end{table*}|. -\reportedby{Malcolm Clark}{9 Aug 1994} - -\erratum{page 228} - -Add a note that, before running a LaTeX2.09 file in compatibility mode -in LaTeX2e, you should delete the old versions of the auxiliary files. - -\subsection*{Errors Corrected in the Second Printing} - -\erratum{page xv, line 10} -``Chris Rowley'' should come after ``Sebastian Rahtz''. -\reportedby{Martin Schr\"{o}der}{24 April 1995} - - - -\erratum{page 29, line $-10$} -Change ``error indicator line'' to ``error locator line''. -\reportedby{Xavier Perramon}{2 Jan 1995} - -\erratum{page 37, lines 26--28} -Change the two sentences ``None of these \ldots formula.'' to: -\begin{quote} -These text-producing commands can be used in math mode to put ordinary -text in a formula. (When the command is used in math mode, its -argument is processed in LR mode.) The declarations cannot be used in -math mode. Section 3.3.8 explains how to change the type style of a -formula's math-mode symbols. -\end{quote} -\reportedby{Mike Piff}{7 Mar 1995} - -\erratum{page 39, line 6} -Replace ``any mode'' with ``paragraph and LR mode''. Also, -after line 8, add: -\begin{quote} -The commands \verb|\dag|, \verb|\ddag|, \verb|\S|, and \verb|\P| -can also be used in math mode. -\end{quote} - -\erratum{page 53, line 24} -Change ``are needed in the'' to ``are used in the'' -\reportedby{Mike Piff}{21 Oct 1994} - -\erratum{page 80, line 1} -The section heading should not be outdented. -\reportedby{Martin Schr\"{o}der}{23 Jan 1995} - -\erratum{page 83, line $-8$} -Change ``\verb|\resettime|'' to ``\verb|\settime|''. - -\erratum{page 84, after line $11$} Add the following sentence: ``The -\hbox{\verb|\onlyslides|} and \hbox{\verb|\onlynotes|} commands may -not work right if a \texttt{slide}, \texttt{overlay}, or \texttt{note} -environment appears in the argument of any command.'' -\reportedby{Eike Ritter}{May 1996} - -\erratum{page 153, line 1} -Add ``or subentry'' after ``entry''. -\reportedby{Martin Schr\"{o}der}{22 Feb 1995} - -\erratum{page 171} -Add the following before line $-4$: -\begin{description} -\item[\mytt \bs columnwidth] -Normal width - \cindex{columnwidth}% -of a column; -% \index{column!width}% - \index{width!of column}% -equals \verb|\textwidth| except for multiple-column styles. -Its value should not be changed with the length-setting commands. -\end{description} -Also, in line $-4$, change \verb|\textwidth| to \verb|\columnwidth|. -%\reportedby{Volker Kuhlmav}{20 Jan 1995} -\reportedby{Rosemary Bailey}{9 Sep 1994} - -\erratum{page 180, lines 15--19} -% -Replace these five lines (which begin ``These commands are overridden'') -with: -\begin{itemize} \item[] -To override a heading on a right-hand page (any page for one-sided -printing), put a \verb|\markright| after the sectioning command and in -its mandatory argument, and add an optional argument without the -\verb|markright|, as in -\begin{itemize} -\item[] - \verb|\chapter[Gnu Scents]{Gnu Scents\markright{|\textit{right\_head}\verb|}}|\\ - \verb|\markright{|\textit{right\_head}\verb|}| -\end{itemize} -To change the heading on a left-hand page, put a \verb|\markboth| -command immediately after the sectioning command. -\end{itemize} -\reportedby{Jerome Breitenbach}{14 Dec 1995} - -\erratum{page 182} -The dimensions -\verb|\pageheight| and \verb|\pagewidth| -should be \verb|\paperheight| and \verb|\paperwidth|, -respectively. (The index entries on page 260 should also be changed.) -\reportedby{Alan Jeffrey, on behalf of a user}{12 Sep 1995} -\erratum{page 192, line 19} -Change ``\emph{cmd}'' to ``\emph{def}''. -\reportedby{Martin Schr\"{o}der}{9 Mar 1995} - - -\erratum{page 195, line 14} -Change ``numbered `within' it'' to ``numbered directly `within' it''. -\reportedby{Martin Schr\"{o}der}{5 Dec 1994} - -\erratum{page 197, line 14} -After ``\verb|\textwidth|'' add ``or \verb|\columnwidth|'' -\reportedby{Volker Kuhlmann}{22 Jan 1995} - -\erratum{page 226} - -After line 7, add -\begin{quote} -These declarations may not be used in math mode. -\end{quote} -Replace lines 16-19 (beginning ``None of these commands'') with -\begin{quote} -When these commands are used in math mode, the \emph{text} -argument is processed in LR mode. - -These commands and declarations are robust. Words typeset in -typewriter style are not hyphenated except where permitted by \verb|\-| -commands. -\end{quote} -\reportedby{Marc Lavine}{22 Aug 1995} - -\erratum{page 228} -To the section ``Type Styles and Sizes'', add the following sentence: -A few mathematical symbols now require the \texttt{latexsym} package---see -Tables 3.4--3.7. - -\subsection*{Errors Corrected in the Sixteenth Printing} - -\erratum{page 42, line 14} -Change ``through a symbol'' by ``through a relation symbol''. -\reportedby{Frank Mittelbach}{15 Nov 1996} - -\erratum{page 42, Table 3.4} -\verb|\land| should be listed as a synonym for \verb|\wedge|, and -\verb|\lor| should be listed as a synonym for \verb|\vee|. -\reportedby{Chris Rowley}{28 Oct 1998} - -\erratum{page 43, Table 3.7} -\verb|\lnot| should be listed as a synonym for \verb|\neg|. -\reportedby{Chris Rowley}{15 Oct 1998} - -\erratum{page 137} This is not an error, but it would be better to -change lines 23 and 24 to: -\begin{quote} -\LaTeX\ - \index{file!not found error}% - \index{file!nonexistent}% -is trying to read a file that apparently doesn't exist. If the missing -file has the extension \texttt{tex}, then \LaTeX\ is trying to - \index{input)@\verb+\input+!of nonexistent file}% - \index{include)@\verb+\include+!of nonexistent file}% -\verb|\input| or \verb|\include| it; if it -\end{quote} - -\erratum{page 171, line 19} -Change the description of \verb|\indent| to: -\begin{description} -\item[\mytt \bs indent] -Produces a -% \cindex{indent}% -% \index{paragraph!indentation}% -horizontal space whose width equals the width of the -paragraph indentation. It can be used to add a paragraph indentation -where one would otherwise be suppressed. (If it doesn't work, -try typing \verb|\indent\indent|.) Robust. -\end{description} -\reportedby{Chris Rowley}{15 Oct 1998} - -\erratum{page 179, line 19} -% -Change to: -\begin{quote} -page style for the \texttt{article} and \texttt{report} document classes. -\end{quote} -\reportedby{Stephen J. Alter}{17 Sep 1997} - -\erratum{page 195, line 28} -Replace ``\textit{num}$_1$ and \textit{num}$_1$ are numbers'' -with ``\textit{num}$_1$ and \textit{num}$_2$ are numbers''. -\reportedby{Magnus Lewis-Smith}{14 Jan 1999} - -\erratum{page 196, line $-5$} -Change \verb|\newboolean{|\emph{name}\verb|}| to -\verb|\newboolean{|\emph{nam}\verb|}|. -\reportedby{Christopher von B\"{u}low}{28 Aug 2000} - - -\erratum{page 198, line 14} -Change ``it will not be printed'' to ``it will usually not be printed''. - -\erratum{page 218, line $-14$} -Change ``\texttt{tabular}'' to ``\texttt{tabbing}''. -\reportedby{Carlos Pita}{27 Aug 2001} - -\erratum{foldout, column 3, line 3} -Replace \emph{style} with \emph{class}. \reportedby{Christopher von B\"{u}low}{28 Aug 2000} - -\subsection*{Errors Corrected in the Seventeenth Printing} - -\erratum{page 51, line 8} -Change ``The \verb|\,| command'' to ``The \verb|\,| and \verb*|\ | commands''. -\reportedby{Phillip J Shelton}{2 Jul 1999} - -\erratum{page 61, second example (middle of page)} -Remove the \verb|\mbox{}| following the \texttt{tabbing} environment. -\reportedby{Marcin Wolinski}{17 Sep 2003} - -\erratum{page 210, line 20} -Add a space after ``bibliography''. -\reportedby{Marcin Wolinski}{17 Sep 2003} - -\subsection*{Error Corrected in the Twenty-First Printing} -\erratum{page 198, line $-11$} -The sentence beginning ``The last three rules'' is hard to read. Better -would be: -\begin{quote} -\noindent The last three rules are suspended when a - \verb|\clearpage|,\linebreak - \verb|\cleardoublepage|, or - \verb|\end{document}| command occurs, -at which point all unprocessed figures and tables are allowed a -\hbox{\mytt p} option and printed. -\end{quote} -\reportedby{Paul Stanford}{9 Oct 2004} - -\subsection*{Errors in All Printings} - -\erratum{page 253, column 2, lines $-5$ and $-6$} - -The two index entries for \verb|\ldots| should be combined. - - -\reportedby{Christopher Dutchyn}{22 July 2005} - -\end{document} - -%try -%try diff --git a/Master/texmf-dist/source/latex/base/modguide.tex b/Master/texmf-dist/source/latex/base/modguide.tex deleted file mode 100644 index 67eaa9b30f2..00000000000 --- a/Master/texmf-dist/source/latex/base/modguide.tex +++ /dev/null @@ -1,412 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% -% This file is part of the LaTeX base system. -% ------------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This file has the LPPL maintenance status "maintained". -% -% The list of all files belonging to the LaTeX base distribution is -% given in the file `manifest.txt'. See also `legal.txt' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% -% \fi -% Filename: modguide.tex - -\NeedsTeXFormat{LaTeX2e}[1995/12/01] - -\documentclass{ltxguide}[1995/11/28] - -\newcommand{\reasonsection}[1]{\subsubsection*{\it #1}} - -\newcommand{\nstex}{\textsf{NS-TeX}} - -\setcounter{secnumdepth}{-1} - -\title{Modifying \LaTeX} - -\author{\copyright~Copyright 1995, \LaTeX3 Project Team.\\ - All rights reserved.} - -\date{12 December 1995} - -\begin{document} - -\maketitle - -\tableofcontents - -\begin{abstract} - This document was produced in response to suggestions that the - modification and distribution conditions for the files constituting - the New Standard \LaTeX{} system should be similar to those implied - by Version~2 of the \textsc{GNU} General Public Licence, as - published by the Free Software Foundation. -\end{abstract} - -\section{Introduction} -\label{sec:intro} - -This article describes the principles underlying our policy on -distribution and modification of the files comprising the \LaTeX{} -system. It has been produced as a result of detailed discussions of -the issues involved in the support and maintenance of a widely -distributed document processing system used by diverse people for many -applications. These discussions have involved users, maintainers of -installations that support \LaTeX{} and various types of organisations -that distribute it. The discussions are continuing and we hope that -the ideas in this article will make a useful contribution to the -debate. - -Our aim is that \LaTeX{} should be a system which can be trusted by -users of all types to fulfill their needs. Such a system must be -stable and well-maintained. This implies that it must be reasonably -easy to maintain (otherwise it will simply not get maintained at -all). So here is a summary of our basic philosophy: -\begin{quote} - We believe that the freedom to rely on a widely-used standard for - document interchange and formatting is as important as the freedom to - experiment with the contents of files. - - We are therefore adopting a policy similar to that which Donald - Knuth applies to modifications of the underlying \TeX{} system: that - certain files, together with their names, are part of the system and - therefore the contents of these files should not be changed unless - the following conditions are met: - \begin{itemize} - \item they are clearly marked as being no longer part of the - standard system; - \item the name of the file is changed. - \end{itemize} -\end{quote} - - -\section{The system} -\label{sec:sys} - -In developing this philosophy, and the consequent limitations on how -modifications of the system should be carried out, we were heavily -influenced by the following facts concerning the current widespread -and wide-ranging uses of the \LaTeX{} system. -\begin{enumerate} -\item \LaTeX{} is not just a document processing system; - it also defines a language for document exchange. - -\item The standard document class files, and some other files, also - define a particular formatting of a document. - -\item The packages that we maintain define a particular document - interface and, in some cases, particular formatting of parts of a - document. - -\item The interfaces between different parts of the \LaTeX{} system - are very complex and it is therefore very difficult to check that a - change to one file does not affect the functionality of both that - file and also other parts of the system not obviously connected to - the file that has been changed. -\end{enumerate} - -This leads us to the general principle that: -\begin{quote} - with certain special exceptions, if you change the contents of a - file then the changed version should have a different file name. -\end{quote} - -We certainly do not wish to prevent people from experimenting with the -code in different ways and adapting it to their purposes. However, we -are concerned that any distribution of modifications to the code -should be very clearly identified as not being a part of the standard -distribution. The exact wording and form of the distribution -conditions is thus something that is flexible, but only within the -constraint of keeping \LaTeX{} as a standardised, reliable product for -the purposes described above: the exchange and formatting of -documents. - - -\section{Some examples} -\label{sec:expl} - -Here we elaborate the arguments that have led us to the above -conclusion. - - -\reasonsection{Separate development considered harmful!} -\label{sec:ja} - -In many fields, the use of \LaTeX{} as a language for communication -is just as important as its capacity for fine typesetting; this is a -very important consideration for a large population of authors, -journal editors, archivists, etc. - -Related to this issue of portability is the fact that the file names -are part of the end-user syntax. - -As a real example, the \LaTeX{} `tools' collection contains the -package `array.sty'. A new user-level feature was added to this file -at the end of 1994 and a document using this feature can contain the -line: -\begin{verbatim} - \usepackage{array}[1994/10/16] -\end{verbatim} - -By supplying the optional argument, the document author is indicating -that a version of the file \texttt{array.sty} dated no earlier than -that date is required to run this document without error. - -This feature would be totally worthless if we were to allow an -alternative version of the array package to be distributed under the -same name since it would mean that there would be in circulation files -of a later date, but without the new feature. If the document -were processed using this `alternative array' then it would certainly -produce `undefined command' errors and would probably not be -processable at all. - - -\reasonsection{What's in a file-name?} -\label{sec:jb} - -In a pure markup language, such as SGML, it is reasonably clear that -control over the final presentation lies with the receiver of a -document and not with the author. - -However, the way that \LaTeX{} is often used in practice means that -most people (at least when using the standard classes and packages) -expect the formatting to be preserved when they send the document to -another site. - -For example, suppose, as is still the most common use of \LaTeX{} in -publishing, you produce a document for `camera-ready-copy' using the -class `article' and that you carefully tune the formatting by, for -example, adding some explicit line breaks etc, to ensure that it fits -the 8 page limit set by the editor a journal or proceedings. - -It then gets sent to the editor or a referee who, without anyone -knowing, has a non-standard version of the class file `article' and so -it then runs to 9 pages. The consequence of this will, at the least, -be a lot of wasted time whilst everyone involved works out what has -gone wrong; it will probably also lead to everyone blaming each other -for something which was in fact caused by a misguided distribution -policy. - -It should also be noted that, for most people, the version of the -class file `article' that gets used is decided by a site maintainer -or the compilers of a CD-ROM distribution. To most users, -the symbols \texttt{a\,r\,t\,i\,c\,l\,e} in: -\begin{verbatim} - \documentclass{article} -\end{verbatim} -are just as much part of \LaTeX{}'s syntax as are the symbols -\texttt{1\,2\,p\,t} in: -\begin{verbatim} - \hspace{12pt} -\end{verbatim} -Thus they should both define a standard formatting rather than -sometimes producing 1 more page or a 5pt larger space. - -Users rely on the fact that the command (or menu item) `LaTeX' -produces a completely standard \LaTeX, including the fact that -`article' is the `standard article'. They would not be at all happy -if the person who installed and maintains \LaTeX{} for them were -allowed to customise `article' every second day so as (in her or his -opinion) to improve the layout; or because another user wanted to write -a document in a different language or typeset one with different fonts. - -\reasonsection{\TeX{} itself} -\label{sec:tex} - -We have modelled our policies on those of the \TeX{} system since this -has for some time now been widely acknowledged as a very stable and -high quality typesetting system. - -The distribution policy set up by Donald Knuth for \TeX{} has the -following features: -\begin{itemize} -\item There is a clearly specified method for changing parts of the - software by the use of `change files'. -\item Although arbitrary changes are allowed, the resulting program - can be called \TeX{} only if its functionality is precisely the same - as that of \TeX{} (i.e.~neither less nor more) in all important - areas. -\item There are many files in the system that cannot be changed at all - (without changing the name): examples are the file - \texttt{plain.tex} and the files associated with fonts, including - the Metafont source files. -\end{itemize} - - -\reasonsection{Maintaining complexity} -\label{sec:compl} - -Our experience of maintaining \LaTeX{} has shown us just how complex -are the interactions between different parts of the system. - -We have therefore, with lots of help from the bug reports you send in, -developed a large suite of test files which we run to check the -effects of every change we make. A non-negligible percentage of these -test runs give unexpected results and hence show up some unexpected -dependency in the system. - - -\section{Some assurances} -\label{sec:conc} - -We are certainly not attempting to stop people reformatting \LaTeX{} -documents in any way they wish. There are many ways of customising -incoming documents to your personal style that do not involve changing -the contents of \LaTeX{}'s standard files; indeed, this freedom is one -of the system's many advantages. -The simplest way to achieve this is to replace -\begin{quote} -\verb|\documentclass{article}|\quad by\quad -\verb|\documentclass{myart}| -\end{quote} - -Nor do we wish to discourage the production of new packages improving -on the functionality or implementation of those we distribute. All we -ask is that, in the best interests of all \LaTeX{} users, you give -your superbly improved class or package file some other name. - -\section{Configuration possibilities} -\label{sec:conposs} - -The standard \LaTeX{} system format can be configured in several ways -to suit the needs and resources of an installation. For example, the -loading of fonts and font tables can be customised to match the font -shapes, families and encodings normally used in text mode. Also, by -producing the appropriate font definition files, the font tables -themselves can be set up to take advantage of the available fonts and -sizes. The loading of hyphenation patterns can be adjusted to cover -the languages used; this has to be done as part of making the format -since this is the only stage at which patterns can be loaded. - -A complete list of these configuration possibilities can be found in -the distributed guide \emph{Configuration options for} \LaTeXe{} -(\texttt{cfgguide.tex}). However, as it says there, the number of -configuration possibilities is strictly limited; we hope that having -read this far you will appreciate the reasons for this decision. One -consequence of this is that there is no provision for a general -purpose configuration file, or for adding extra code just before the -|\dump| of the format file. - -This was a deliberate decision and we hope that everyone (yes, that -includes you!) will support its intent. Otherwise there will be a -rapid return to the very situation, of several incompatible versions -of \LaTeX~2.09, that originally prompted us to produce \LaTeXe{}: the -new, and \emph{only}, `Standard \LaTeX'. This will make \LaTeX{} -unmaintainable and, hence, unmaintained (by us, at least). - -\begin{quote} - Therefore you should not misuse the configuration files or other - parts of the distribution to produce non-standard versions of - \LaTeX{}. -\end{quote} - -Some of the allowed configurations can result in a system that can produce -documents that are no longer `formatting compatible'; for example, the -use of different default fonts will most likely produce different line -and page breaks. If you do produce a system that is configured in -such a way that it is not `formatting compatible' then you should -consider carefully the needs of users who need to create portable -documents. A good way to provide for their needs is to make -available, in addition, a standard form of \LaTeX{} without any -`formatting incompatible' customisations. - - -\section{Modification conditions} -\label{sec:modcon} - -It is possible that you need to produce a document processing system -based on standard \LaTeX{} but with functionality that cannot be -implemented by using the approved configuration files and complying -with the restriction on the code that is allowed in them. In other -words, you may need a system which is sufficiently distinct from -Standard \LaTeX{} that it is not feasible to do this simply by using -the configuration options we provide or by producing new classes and -packages. - -If you do produce such a system then, for the reasons described -above, you should ensure that your system is clearly distinguished -from Standard \LaTeX{} in every possible way, including the following. - - -\begin{enumerate} -\item - Give your system a distinguished name, such as \nstex, which clearly - distinguishes it from \LaTeX{}. - -\item - Ensure that it contains no file with a name the same as that of - a file in the standard distribution but with different contents. - (If this is not possible then you must: - \begin{itemize} - \item - ensure that files from the non-\LaTeX{} system cannot be - accidentally accessed whilst using a standard \LaTeX{}; - \item ensure that each file from the non-\LaTeX{} system clearly - identifies itself as a non-\LaTeX{} file on the terminal and in the - log file.) - \end{itemize} - -\item - Ensure that the method used to run your system is clearly -\label{mcon:command} - distinct from that used to run Standard \LaTeX; e.g.~by using a - command name or menu entry that is clearly not \texttt{latex} - (or \texttt{LaTeX} etc). - -\item - Ensure that, when a file is being processed by your system, the - use of non-standard \LaTeX{} is clearly proclaimed to the user by - whatever means is appropriate. - -\item Ensure that what is written at the beginning of the log file - clearly shows that your system has been used, and that it is - not Standard \LaTeX{}. - See the file \texttt{cfgguide.tex} for how to achieve this. - -\item - Clearly explain to users that bug reports concerning your - system should not be sent to the maintainers of Standard - \LaTeX{}. -\end{enumerate} - -\subsection*{Note to system administrators} - -If you install a non-standard (modified) version of \LaTeX{} on a -multi-user site then please, in addition, install Standard \LaTeX{} -and observe the conditions enumerated above, particularly -\ref{mcon:command}. - - -\section{What do you think?} -\label{sec:you} - -We are interested in your views on the issues raised in this document. -The best way to let us know what you think, and to discuss your ideas -with others, is to join the \texttt{LaTeX-L} mailing list and send your -comments there. -To subscribe to this list, mail to: -\begin{verbatim} - listserv@urz.uni-heidelberg.de -\end{verbatim} -the following one line message: -\begin{verbatim} - subscribe LATEX-L <your-first-name> <your-second-name> -\end{verbatim} - -\end{document} diff --git a/Master/texmf-dist/source/latex/base/newdc.ins b/Master/texmf-dist/source/latex/base/newdc.ins index c64968c8723..1fd459fd483 100644 --- a/Master/texmf-dist/source/latex/base/newdc.ins +++ b/Master/texmf-dist/source/latex/base/newdc.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX @@ -76,7 +81,7 @@ of this file under its original name. \Msg{*** Generating font defs for Cork encoded and Text Companion fonts ***} - + \generate{ \file{t1cmfib.fd}{ \from{cmfonts.fdd}{fd,T1cmfib,new}} @@ -101,7 +106,7 @@ of this file under its original name. \file{ts1cmvtt.fd}{ \from{cmfonts.fdd}{fd,TS1cmvtt,new,tt}} } - + \ifToplevel{ \Msg{***********************************************************} @@ -117,6 +122,6 @@ of this file under its original name. \Msg{* Happy TeXing} \Msg{***********************************************************} } - + \endbatchfile diff --git a/Master/texmf-dist/source/latex/base/newlfont.dtx b/Master/texmf-dist/source/latex/base/newlfont.dtx index 7648bd9a9eb..3494a590146 100644 --- a/Master/texmf-dist/source/latex/base/newlfont.dtx +++ b/Master/texmf-dist/source/latex/base/newlfont.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -90,6 +90,7 @@ % % \author{Frank Mittelbach} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \section{Introduction} diff --git a/Master/texmf-dist/source/latex/base/nfssfont.dtx b/Master/texmf-dist/source/latex/base/nfssfont.dtx index 54a305e0f17..17adf275061 100644 --- a/Master/texmf-dist/source/latex/base/nfssfont.dtx +++ b/Master/texmf-dist/source/latex/base/nfssfont.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -26,10 +26,10 @@ % extension .ins) which are part of the distribution. % % \fi -\def\nfssfontfileversion{v2.2c} -\def\nfssfontfiledate{2014/09/29} +\def\nfssfontfileversion{v2.2d} +\def\nfssfontfiledate{2015/02/01} -% \CheckSum{1226} +% \CheckSum{1228} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -64,6 +64,7 @@ % \setcounter{StandardModuleDepth}{1} % % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \section{Introduction} @@ -429,7 +430,7 @@ and you can use ordinary TeX commands (e.g., to \input a file).}}} \def\endchart{\cr\noalign{\hrule} \raise11.5pt\null&&&\hex 8&&\hex 9&&\hex A&&\hex B& &\hex C&&\hex D&&\hex E&&\hex F&\cr\egroup$$\par} -\def\:{\setbox0=\hbox{\char\n}% +\def\:{\setbox0=\hbox{\noboundary\char\n\noboundary}% \ifdim\ht0>7.5pt\reposition \else\ifdim\dp0>2.5pt\reposition\fi\fi \box0\global\advance\n 1 } diff --git a/Master/texmf-dist/source/latex/base/nfssfont.ins b/Master/texmf-dist/source/latex/base/nfssfont.ins index d8594e3946e..28f1c915a2d 100644 --- a/Master/texmf-dist/source/latex/base/nfssfont.ins +++ b/Master/texmf-dist/source/latex/base/nfssfont.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/olddc.ins b/Master/texmf-dist/source/latex/base/olddc.ins index 45fa7935caa..03ae76d94a2 100644 --- a/Master/texmf-dist/source/latex/base/olddc.ins +++ b/Master/texmf-dist/source/latex/base/olddc.ins @@ -3,46 +3,51 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% \input docstrip - + \preamble This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX @@ -75,7 +80,7 @@ of this file under its original name. \usedir{tex/latex/base} \Msg{*** Generating font defs for Cork encoded fonts ***} - + \generate{ \file{t1cmfib.fd}{ \from{cmfonts.fdd}{fd,T1cmfib,old}} @@ -92,9 +97,9 @@ of this file under its original name. \file{t1cmvtt.fd}{ \from{cmfonts.fdd}{fd,T1cmvtt,old}} } - - - + + + \ifToplevel{ \Msg{***********************************************************} \Msg{*} @@ -109,5 +114,5 @@ of this file under its original name. \Msg{* Happy TeXing} \Msg{***********************************************************} } - + \endbatchfile diff --git a/Master/texmf-dist/source/latex/base/oldlfont.dtx b/Master/texmf-dist/source/latex/base/oldlfont.dtx index 3511c92d830..5d6baba0aab 100644 --- a/Master/texmf-dist/source/latex/base/oldlfont.dtx +++ b/Master/texmf-dist/source/latex/base/oldlfont.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -84,6 +84,7 @@ % % \author{Frank Mittelbach} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \section{Introduction} diff --git a/Master/texmf-dist/source/latex/base/preload.dtx b/Master/texmf-dist/source/latex/base/preload.dtx index 29d3e11d33b..e2b3f652f72 100644 --- a/Master/texmf-dist/source/latex/base/preload.dtx +++ b/Master/texmf-dist/source/latex/base/preload.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -87,6 +87,7 @@ % % \setcounter{StandardModuleDepth}{1} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \section{Overview} diff --git a/Master/texmf-dist/source/latex/base/proc.dtx b/Master/texmf-dist/source/latex/base/proc.dtx index 3b5418dc1e2..2796268516c 100644 --- a/Master/texmf-dist/source/latex/base/proc.dtx +++ b/Master/texmf-dist/source/latex/base/proc.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -127,6 +127,7 @@ % % \date{\filedate} % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % \section{Description} diff --git a/Master/texmf-dist/source/latex/base/proc.ins b/Master/texmf-dist/source/latex/base/proc.ins index f7bd757800c..7d7e94e8ea1 100644 --- a/Master/texmf-dist/source/latex/base/proc.ins +++ b/Master/texmf-dist/source/latex/base/proc.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/slides.dtx b/Master/texmf-dist/source/latex/base/slides.dtx index 683821c5a98..4d24c97b3a9 100644 --- a/Master/texmf-dist/source/latex/base/slides.dtx +++ b/Master/texmf-dist/source/latex/base/slides.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -152,6 +152,7 @@ % \date{\filedate} % % \maketitle +% \MaintainedByLaTeXTeam{latex} % % \section{Introduction} % diff --git a/Master/texmf-dist/source/latex/base/slides.ins b/Master/texmf-dist/source/latex/base/slides.ins index d9123b7fdd6..5d528f5a8cb 100644 --- a/Master/texmf-dist/source/latex/base/slides.ins +++ b/Master/texmf-dist/source/latex/base/slides.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble @@ -86,11 +91,11 @@ extension .ins) which are part of the distribution. \preamble -This is a generated file. +This is a generated file. -Copyright 1993-2014 +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -100,7 +105,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX @@ -125,9 +130,14 @@ the system are in the document `cfgguide.tex'. This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -137,7 +147,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX diff --git a/Master/texmf-dist/source/latex/base/slifonts.fdd b/Master/texmf-dist/source/latex/base/slifonts.fdd index 320a12a000b..9b116247264 100644 --- a/Master/texmf-dist/source/latex/base/slifonts.fdd +++ b/Master/texmf-dist/source/latex/base/slifonts.fdd @@ -1,30 +1,30 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the LaTeX base system. % ------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This file has the LPPL maintenance status "maintained". -% +% % The list of all files belonging to the LaTeX base distribution is % given in the file `manifest.txt'. See also `legal.txt' for additional % information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with +% +% The list of derived (unpacked) files belonging to the distribution +% and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. -% +% % \fi % %\iffalse This is a META comment @@ -51,13 +51,14 @@ \documentclass{ltxdoc} \GetFileInfo{sfonts.drv} \providecommand\dst{\expandafter{\normalfont\scshape docstrip}} -\title{The file \texttt{slifonts.fdd} for use with +\title{The file \texttt{slifonts.fdd} for use with \LaTeXe.\thanks{This file has version number \fileversion, dated \filedate.}} \date{\filedate} \author{Frank Mittelbach \and Rainer Sch\"opf} \begin{document} -\maketitle + \MaintainedByLaTeXTeam{latex} + \maketitle \DocInput{slifonts.fdd} \end{document} %</driver> @@ -133,7 +134,7 @@ % % The next bit of code contains the documentation driver file for % \TeX{}, i.e., the file that will produce the documentation you are -% currently reading. It will be extracted from this file by the +% currently reading. It will be extracted from this file by the % \dst{} program. % \changes{v2.1b}{1993/12/14}{Corrected \cs{documentclass}.} % \begin{macrocode} @@ -198,7 +199,7 @@ }{} %</lccr> % \end{macrocode} -% +% % \subsection{Computer Modern Sans} % % \begin{macrocode} @@ -206,7 +207,7 @@ %<!ec> \DeclareFontFamily{OT1}{lcmss}{\hyphenchar\font45 } %<ec> \DeclareFontFamily{T1}{lcmss}{} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{n}{% %<ec> \DeclareFontShape{T1}{lcmss}{m}{n}{% @@ -215,7 +216,7 @@ %<ec> eclq8% }{} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{In}{% %<ec> \DeclareFontShape{T1}{lcmss}{m}{In}{% @@ -224,7 +225,7 @@ %<ec> ieclq8% }{} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{sl}{% %<ec> \DeclareFontShape{T1}{lcmss}{m}{sl}{% @@ -233,7 +234,7 @@ %<ec> ecli8% }{} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{Isl}{% %<ec> \DeclareFontShape{T1}{lcmss}{m}{Isl}{% @@ -242,19 +243,19 @@ %<ec> iecli8% }{} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{it}{% %<ec> \DeclareFontShape{T1}{lcmss}{m}{it}{% <->sub*lcmss/m/sl}{} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{Iit}{% %<ec> \DeclareFontShape{T1}{lcmss}{m}{Iit}{% <->sub*lcmss/m/Isl}{} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmss}{bx}{n}{% %<ec> \DeclareFontShape{T1}{lcmss}{bx}{n}{% @@ -263,7 +264,7 @@ %<ec> eclb8% }{} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmss}{bx}{In}{% %<ec> \DeclareFontShape{T1}{lcmss}{bx}{In}{% @@ -281,7 +282,7 @@ eclo8% }{} % \end{macrocode} -% +% % \begin{macrocode} \DeclareFontShape{T1}{lcmss}{bx}{Isl}{% <13.82><16.59><19.907><23.89><28.66><34.4><41.28>% @@ -292,7 +293,7 @@ \DeclareFontShape{T1}{lcmss}{bx}{it}{% <->sub*lcmss/bx/sl}{} % \end{macrocode} -% +% % \begin{macrocode} \DeclareFontShape{T1}{lcmss}{bx}{Iit}{% <->sub*lcmss/bx/Isl}{} @@ -315,7 +316,7 @@ %</!ec> %</lcmss> % \end{macrocode} -% +% % \subsection{Computer Modern Typewriter} % % \begin{macrocode} @@ -323,7 +324,7 @@ %<!ec> \DeclareFontFamily{OT1}{lcmtt}{\hyphenchar\font\m@ne} %<ec> \DeclareFontFamily{T1}{lcmtt}{\hyphenchar\font\m@ne} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmtt}{m}{n}{% %<ec> \DeclareFontShape{T1}{lcmtt}{m}{n}{% @@ -332,7 +333,7 @@ %<ec> ecltt8% }{} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmtt}{m}{In}{% %<ec> \DeclareFontShape{T1}{lcmtt}{m}{In}{% @@ -341,7 +342,7 @@ %<ec> iecltt8% }{} % \end{macrocode} -% +% % \begin{macrocode} %<!ec> \DeclareFontShape{OT1}{lcmtt}{m}{it}{% %<ec> \DeclareFontShape{T1}{lcmtt}{m}{it}{% @@ -363,47 +364,47 @@ %</!ec> %</lcmtt> % \end{macrocode} -% +% % \subsection{Computer Modern Math} % % \begin{macrocode} %<*lcmm> \DeclareFontFamily{OML}{lcmm}{\skewchar\font'177} % \end{macrocode} -% +% % \begin{macrocode} \DeclareFontShape{OML}{lcmm}{m}{it}{% <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>cmmi8% }{} % \end{macrocode} -% +% % \begin{macrocode} \DeclareFontShape{OML}{lcmm}{m}{Iit}{% <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>icmmi8% }{} %</lcmm> % \end{macrocode} -% +% % \subsection{Computer Modern Symbol} % % \begin{macrocode} %<*lcmsy> \DeclareFontFamily{OMS}{lcmsy}{\skewchar\font'60} % \end{macrocode} -% +% % \begin{macrocode} \DeclareFontShape{OMS}{lcmsy}{m}{n}{% <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>cmsy8% }{} % \end{macrocode} -% +% % \begin{macrocode} \DeclareFontShape{OMS}{lcmsy}{m}{In}{% <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>icmsy8% }{} %</lcmsy> % \end{macrocode} -% +% % \subsection{Computer Modern large symbols} % % \changes{v2.1g}{1994/03/01}{Removed extra pair of curly braces @@ -415,14 +416,14 @@ <->sfixed*[17.28]cmex10% }{} % \end{macrocode} -% +% % \begin{macrocode} \DeclareFontShape{OMX}{lcmex}{m}{In}{% <->sfixed*[17.28]icmex10% }{} %</lcmex> % \end{macrocode} -% +% % \subsection{\LaTeX{} symbols} % % \changes{v2.2d}{1997/10/20}{Removed superfluous pair of braces at @@ -434,14 +435,14 @@ <12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>lasy8% }{} % \end{macrocode} -% +% % \begin{macrocode} \DeclareFontShape{U}{llasy}{m}{In}{% <13.82><16.59><19.907><23.89><28.66><34.4><41.28>ilasy8% }{} %</llasy> % \end{macrocode} -% +% % \section{Setting defaults} % % The following statements go into the file \texttt{sfonts.def} diff --git a/Master/texmf-dist/source/latex/base/source2e.tex b/Master/texmf-dist/source/latex/base/source2e.tex deleted file mode 100644 index c54bf328325..00000000000 --- a/Master/texmf-dist/source/latex/base/source2e.tex +++ /dev/null @@ -1,483 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1993-2014 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% -% This file is part of the LaTeX base system. -% ------------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This file has the LPPL maintenance status "maintained". -% -% The list of all files belonging to the LaTeX base distribution is -% given in the file `manifest.txt'. See also `legal.txt' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% -% \fi - -% This document will typeset the LaTeX sources as a single document. -% This will produce quite a large file (roughly 555 pages) and may -% take a long time. -% -% Some notes on processing this document are contained at the end -% of this document, after \end{document} -% -% DPC 1997/11/17 -% -% First a special index style for makeindex -% - -\begin{filecontents}{source2e.ist} -actual '=' -quote '!' -level '>' -preamble -"\n \\begin{theindex} \n \\makeatletter\\scan@allowedfalse\n" -postamble -"\n\n \\end{theindex}\n" -item_x1 "\\efill \n \\subitem " -item_x2 "\\efill \n \\subsubitem " -delim_0 "\\pfill " -delim_1 "\\pfill " -delim_2 "\\pfill " -% The next lines will produce some warnings when -% running Makeindex as they try to cover two different -% versions of the program: -lethead_prefix "{\\bfseries\\hfil " -lethead_suffix "\\hfil}\\nopagebreak\n" -lethead_flag 1 -heading_prefix "{\\bfseries\\hfil " -heading_suffix "\\hfil}\\nopagebreak\n" -headings_flag 1 - -% and just for source2e: -% Remove R so I is treated in sequence I J K not I II III -page_precedence "rnaA" -\end{filecontents} - - - -\documentclass{ltxdoc} - -\listfiles - -% Do not index some TeX primitives, and some common plain TeX commands. - -\DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global} -\DoNotIndex{\if,\ifnum,\ifdim,\ifcat,\ifmmode,\ifvmode,\ifhmode,% - \iftrue,\iffalse,\ifvoid,\ifx,\ifeof,\ifcase,\else,\or,\fi} -\DoNotIndex{\box,\copy,\setbox,\unvbox,\unhbox,\hbox,% - \vbox,\vtop,\vcenter} -\DoNotIndex{\@empty,\immediate,\write} -\DoNotIndex{\egroup,\bgroup,\expandafter,\begingroup,\endgroup} -\DoNotIndex{\divide,\advance,\multiply,\count,\dimen} -\DoNotIndex{\relax,\space,\string} -\DoNotIndex{\csname,\endcsname,\@spaces,\openin,\openout,% - \closein,\closeout} -\DoNotIndex{\catcode,\endinput} -\DoNotIndex{\jobname,\message,\read,\the,\m@ne,\noexpand} -\DoNotIndex{\hsize,\vsize,\hskip,\vskip,\kern,\hfil,\hfill,\hss} -\DoNotIndex{\m@ne,\z@,\z@skip,\@ne,\tw@,\p@} -\DoNotIndex{\dp,\wd,\ht,\vss,\unskip} - -% Set up the Index and Change History to use \part -\IndexPrologue{\part*{Index}% - \markboth{Index}{Index}% - \addcontentsline{toc}{part}{Index}% - The italic numbers denote the pages where the - corresponding entry is described, - numbers underlined point to the definition, - all others indicate the places where it is used.} - -\GlossaryPrologue{\part*{Change History}% -% Allow control names to be hyphenated here... - {\GlossaryParms\ttfamily\hyphenchar\font=`\-}% - \markboth{Change History}{Change History}% - \addcontentsline{toc}{part}{Change History}} - -% The standard \changes command modified slightly to better cope with -% this multiple file document. -\makeatletter -\def\changes@#1#2#3{% - \let\protect\@unexpandable@protect - \edef\@tempa{\noexpand\glossary{#2\space\currentfile\space#1\levelchar - \ifx\saved@macroname\@empty - \space - \actualchar - \generalname - \else - \expandafter\@gobble - \saved@macroname - \actualchar - \string\verb\quotechar*% - \verbatimchar\saved@macroname - \verbatimchar - \fi - :\levelchar #3}}% - \@tempa\endgroup\@esphack} -\makeatother - -% Produce a Change Log and (2 column) Index. -\RecordChanges -\CodelineIndex -\EnableCrossrefs -\setcounter{IndexColumns}{2} - -% Needed for documentation in ltoutenc.dtx -\usepackage{textcomp} - -\begin{document} - \title{The \LaTeXe\ Sources} - \author{% - Johannes Braams\\ - David Carlisle\\ - Alan Jeffrey\\ - Leslie Lamport\\ - Frank Mittelbach\\ - Chris Rowley\\ - Rainer Sch\"opf} - -% This command will be used to input the patch file -% if that file exists. -\newcommand{\includeltpatch}{% - \def\currentfile{ltpatch.ltx} - \part{ltpatch} - {\let\ttfamily\relax - \xdef\filekey{\filekey, \thepart={\ttfamily\currentfile}}}% - Things we did wrong\ldots - \IndexInput{ltpatch.ltx}} - - - -% Get the date from ltvers.dtx -\makeatletter -\let\patchdate=\@empty -\begingroup - \def\ProvidesFile#1\fmtversion#2{\date{#2}\endinput} - \input{ltvers.dtx} -\global\let\X@date=\@date - -% Add the patch version if available. - \long\def\Xdef#1#2#3\def#4#5{% - \xdef\X@date{#2}% - \xdef\patchdate{#5}% - \endinput}% - \InputIfFileExists{ltpatch.ltx} - {\let\def\Xdef}{\global\let\includeltpatch\relax} -\endgroup - -\ifx\@date\X@date - \def\Xpatch{0} - \ifx\patchdate\Xpatch\else - \edef\@date{\@date\space Patch level \patchdate} - \fi -\else - \@warning{ltpatch.ltx does not match ltvers.dtx!} - \let\includeltpatch\relax -\fi -\makeatother - - \pagenumbering{roman} - \maketitle - \renewcommand\maketitle{} - - \tableofcontents - - \clearpage - - \pagenumbering{arabic} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Each of the following \DocInclude lines includes a file with extension -% .dtx. Each of these files may be typeset separately. For instance -% latex ltboxes.dtx -% will typeset the source of the LaTeX box commands. -% -% If this file is processed, each of these separate dtx files will be -% contained as a part of a single document. Using ltxdoc.cfg you can -% then optionally produce a combined index and/or change history for -% the entire source of the format file. Note that such a document will -% be quite large (about 555 pages). -% - - \DocInclude{ltdirchk} % System dependent initialisation - - \DocInclude{ltplain} % LaTeX version of Knuth's plain.tex - - \DocInclude{ltvers} % Current version date - - \DocInclude{ltdefns} % Initial definitions. - - \DocInclude{ltalloc} % Allocation of counters and others. - - \DocInclude{ltcntrl} % Program control macros. - - \DocInclude{lterror} % Error handling. - - \DocInclude{ltpar} % Paragraphs. - - \DocInclude{ltspace} % Spacing, line and page breaking. - - \DocInclude{ltlogos} % Logos. - - \DocInclude{ltfiles} % \input files and related commands - - \DocInclude{ltoutenc} % Output encoding interface - - \DocInclude{ltcounts} % Counters - - \DocInclude{ltlength} % Lengths - - \DocInclude{ltfssbas} % NFSS Base macros - - \DocInclude{ltfsstrc} % NFSS Tracing (and tracefnt.sty) - - \DocInclude{ltfsscmp} % NFSS1 Compatibility - - \DocInclude{ltfssdcl} % NFSS Declarative interface - - \DocInclude{ltfssini} % NFSS Initialisation - - \DocInclude{fontdef} % fonttext.ltx/fontmath.ltx - - \DocInclude{preload} % preload.ltx - - \DocInclude{ltfntcmd} % \textrm etc - - \DocInclude{ltpageno} % Page numbering - - \DocInclude{ltxref} % Cross referencing - - \DocInclude{ltmiscen} % Miscellaneous environment definitions. - - \DocInclude{ltmath} % Mathematics set up. - - \DocInclude{ltlists} % List and related environments - - \DocInclude{ltboxes} % Parbox and friends - - \DocInclude{lttab} % Tabbing tabular and array - - \DocInclude{ltpictur} % Picture mode - - \DocInclude{ltthm} % Theorem environments - - \DocInclude{ltsect} % Sectioning - - \DocInclude{ltfloat} % Floats - - \DocInclude{ltidxglo} % Index and Glossary - - \DocInclude{ltbibl} % Bibliography - - \DocInclude{ltpage} % \pagestyle \raggedbottom \sloppy - - \DocInclude{ltoutput} % Output routine - - \DocInclude{ltclass} % Package & Class interface - - \DocInclude{lthyphen} % Hyphenation (hyphen.ltx). - - \DocInclude{ltfinal} % Last minute initialisations and dump - - \includeltpatch % Corrections distributed after the full release - -% Stop here if ltxdoc.cfg says \AtEndOfClass{\OnlyDescription} -\StopEventually{\end{document}} - -\clearpage -\pagestyle{headings} - -% Make TeX shut up. -\hbadness=10000 -\newcount\hbadness -\hfuzz=\maxdimen - -\typeout{% - \string # Produce change log with^^J% - makeindex -s gglo.ist -o source2e.gls source2e.glo} - - -\PrintChanges - -\clearpage - -% makeindex needs a symbol between the parts of composite page numbers -% but we dont want one, so: -\typeout{% - \string # Produce index with^^J% - makeindex -s source2e.ist source2e.idx} - -\begingroup -\def\endash{--} -\catcode`\-\active -\def-{\futurelet\temp\indexdash} -\def\indexdash{\ifx\temp-\endash\fi} - -\PrintIndex -\endgroup - -% Make sure that the index is not printed twice -% (ltxdoc.cfg might have a second \PrintIndex command) -\let\PrintChanges\relax -\let\PrintIndex\relax - -\end{document} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -To use this file to produce a fully indexed source code -you need to execute the following (or equivalent) commands: - - latex source2e.tex - - makeindex -s source2e.ist source2e.idx - makeindex -s gglo.ist -o source2e.gls source2e.glo - - latex source2e.tex - latex source2e.tex - - -The makeindex style source2e.ist is used in place of the usual -doc gind.ist to ensure that I is used in the sequence I J K -not I II II, which would be the default makeindex behaviour. - -The third run with latex is only required to get the table of -contents entries for the change log and index. You may speed things up -by using the \includeonly mechanism so as not to typeset the source -files on the second run. This involves changing the file -ltxdoc.cfg -between the latex runs. - -The following unix script automates this. - (It could easily be ported to scripts for DOS or VMS, - rm is ReMove a file, and echo "..." > file writes ... to "file".) - - -After this script (after the second ==============) is a similar script -that will produce the documentation for all the files in the base -distribution that are *not* included in source2e.dvi. This second script -was requested, but before using it, beware it will take a long time! -It may however be modified as required, eg to not typeset the fdd files -or whatever... - -============== -#!/bin/sh - -rm -f source2e.gls source2e.ind source2e.toc - -# First run: -# Create new standard ltxdoc.cfg file -# Pass the (possibly empty) list of arguments supplied on the -# command line to article class. -# -# If you use A4 paper, running this script with argument -# a4paper -# may save about 30 pages. -# -echo "\PassOptionsToClass{$*}{article}" > ltxdoc.cfg - - -# Now LaTeX the file with this cfg file. -# -latex source2e.tex - - -# Make the Change log and Glossary. -# -makeindex -s source2e.ist source2e.idx -makeindex -s gglo.ist -o source2e.gls source2e.glo - - -# Second run: append \includeonly{} to ltxdoc.cfg to speed up things -# (this run needed only to get changes and index listed in .toc file) -# -# Note that the index will not be made incorrect by the insertion -# of the table of contents as the front matter uses a different page -# numbering scheme. -# -echo "\includeonly{}" >> ltxdoc.cfg - -latex source2e.tex - - -# Third and final run, to put everything together. -# First restore the cfg file: -# -echo "\PassOptionsToClass{$*}{article}" > ltxdoc.cfg -latex source2e.tex - - -============== -#!/bin/sh - -# Running this script will process all the dtx fdd and *guide.tex -# and ltnews*.tex files in the LaTeX distribution, except the dtx -# files included in source2e.tex. -# (The shell first script in the comments of source2e.tex will -# process those.) - -# Any command line arguments (eg a4paper) are taken as options to the -# article class. - -# This script is likely to take ages! - -echo "\PassOptionsToClass{$*}{article}" > ltxdoc.cfg -echo "\batchmode" >> ltxdoc.cfg - -# The next four lines produce full indexes and change logs -# you may not want those. -echo "\AtBeginDocument{\RecordChanges}" >> ltxdoc.cfg -echo "\AtEndDocument{\PrintChanges}" >> ltxdoc.cfg -echo "\AtBeginDocument{\CodelineIndex\EnableCrossrefs}" >> ltxdoc.cfg -echo "\AtEndDocument{\PrintIndex}" >> ltxdoc.cfg - -# If you do not want any code listings, just documentation, then instead -# of the above four lines, uncomment the following: -# echo "\AtBeginDocument{\OnlyDescription}" >> ltxdoc.cfg - -echo "\PassOptionsToClass{$*}{article}" > ltxguide.cfg -echo "\batchmode" >> ltxguide.cfg - -cp ltxguide.cfg ltnews.cfg - - -for i in *dtx *fdd *guide.tex ltnews*.tex -do -B=`basename $i .dtx` - -if (grep "Include{$B}" source2e.tex >/dev/null ; ) -then -echo In source2e: $i -else -echo latex $i - if (latex $i > /dev/null) - then - echo latex $i - latex $i > /dev/null - echo makeindex -s gind.ist $B.idx - makeindex -s gind.ist $B.idx > /dev/null 2> /dev/null - echo makeindex -s gglo.ist -o $B.gls $B.glo - makeindex -s gglo.ist -o $B.gls $B.glo > /dev/null 2> /dev/null - echo latex $i - latex $i > /dev/null - else - echo "!!! LaTeX ERROR: $i. (See $B.log.)" - fi -fi - -done diff --git a/Master/texmf-dist/source/latex/base/syntonly.dtx b/Master/texmf-dist/source/latex/base/syntonly.dtx index 7479b121e7c..785cb45e5b7 100644 --- a/Master/texmf-dist/source/latex/base/syntonly.dtx +++ b/Master/texmf-dist/source/latex/base/syntonly.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -64,6 +64,7 @@ % \author{Frank Mittelbach \and Rainer Sch\"opf} % % +% \MaintainedByLaTeXTeam{latex} % \maketitle % % This package implements the |\syntaxonly| declaration for \LaTeXe. diff --git a/Master/texmf-dist/source/latex/base/syntonly.ins b/Master/texmf-dist/source/latex/base/syntonly.ins index 0eb43d415e8..bcfc653e71c 100644 --- a/Master/texmf-dist/source/latex/base/syntonly.ins +++ b/Master/texmf-dist/source/latex/base/syntonly.ins @@ -3,33 +3,33 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3b %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3b or later is part of all distributions of LaTeX +%% and version 1.3b or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -40,9 +40,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the LaTeX base system. -------------------------------------------------------------- @@ -52,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". @@ -65,8 +70,8 @@ The list of all files belonging to the LaTeX base distribution is given in the file `manifest.txt'. See also `legal.txt' for additional information. -The list of derived (unpacked) files belonging to the distribution -and covered by LPPL is defined by the unpacking scripts (with +The list of derived (unpacked) files belonging to the distribution +and covered by LPPL is defined by the unpacking scripts (with extension .ins) which are part of the distribution. \endpreamble diff --git a/Master/texmf-dist/source/latex/base/tlc2.err b/Master/texmf-dist/source/latex/base/tlc2.err deleted file mode 100644 index 8c26088bf38..00000000000 --- a/Master/texmf-dist/source/latex/base/tlc2.err +++ /dev/null @@ -1,4627 +0,0 @@ -\def\readRCS$#1 #2 #3 #4 #5${\def\erratafiledate{#4}} -\readRCS -$Id: tlc2.err 207 2013-07-12 11:04:05Z mittelba $ - -\def\comando#1{\texttt{\string#1}} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% To produce a printed version of this errata file run this file through -% LaTeX. It will unpack a small class file (if not already present) and -% a configuration file with the extension .cfg. You might want to modify -% the setting in this configuration file to print only a partial errata -% suitable for your printed revision of this book, see details in the -% .cfg file. -% -% The current version of this file can be found at: -% -% http://www.latex-project.org/guides/books.html -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - -\begin{filecontents}{ttcterrata.cls} -%% -%% Copyright (C) 1997,2004,2005,2007 Frank Mittelbach -%% This class file is licenced under LPPL latest version; -%% see http://www.latex-project.org/lppl -% -% -% It sets up a few commands used to format the errata entries for books in the -% Addison-Wesley Series: -% -% Tools and Techniques for Computer Typesetting -% -% hence the name. However, anybody who likes to use it is free to apply it for -% errata files of other books. -% -% Changes: -% -% v1.0a - changed name from errata.cls to ttcterrata.cls - -\ProvidesClass{ttcterrata} - [2007/11/10 v1.0a Mini class for errata files; subject to change (FMi)] - -\LoadClass{article} - -\setcounter{secnumdepth}{-1} -\addtolength\textwidth{5cm} -\addtolength\oddsidemargin{-3cm} - -\addtolength\textheight{36pt} - -\RequirePackage{shortvrb} -\MakeShortVerb{\|} - -\RequirePackage{array,longtable} -\RequirePackage{multicol} - - -\newcommand\erratagetnumber{} -\def\erratagetnumber#1/#2/#3\erratagetnumber{#1#2#3} - - -\newcommand\gobbleerrata{% - \setbox\@tempboxa\vbox\bgroup - \let\endgobble\egroup - \let\hideamp\relax - \let\\\relax\let\par\@@par} - -\newcommand*\hideamp{&} - -\let\endgobble\relax - - -\newcommand\erratastartdate{} -\newcommand\myprinting{1} - - -\newcommand\doweprint[2]{% - \ifnum \myprinting < \if!#2!1000 \else \ifx s#2 1000\else#2 \fi\fi - \ifnum \expandafter\erratagetnumber\erratastartdate\erratagetnumber < - \erratagetnumber#1\erratagetnumber \relax - \@tempswatrue - \else - \@tempswafalse - \fi - \else - \@tempswafalse - \fi -} - - - -\newcommand\includedentries{entries after = \erratastartdate} -\newcommand\printedentries{between \erratastartdate\space and} - -\newcommand\showallerrors{% - \renewcommand\includedentries{all errata entries}% - \renewcommand\printedentries{up to} - \renewcommand\doweprint[2]{\@tempswatrue}} - - -\newcommand\displayrevisionfix[2]{% - \if!#2!\textbf{#1}\else\textit{#1}\rlap{\textsuperscript{#2}}\fi} - -\newcommand\norevisionnumbers{% - \renewcommand\displayrevisionfix[2]{\textbf{##1}}} - -\IfFileExists{\jobname.cfg} - { - \input{\jobname.cfg} - \typeout{***************************************************} - \typeout{*} - \typeout{* Configuration file for \jobname.err found } - \typeout{*} - \typeout{***************************************************} - \AtEndDocument{ - \typeout{***************************************************} - \typeout{*} - \typeout{* If you wish to generate an errata listing} - \typeout{* containing only errors found after a certain revision} - \typeout{* and/or only errors found after a certain date} - \typeout{* modify the information stored in \jobname.cfg} - \typeout{*} - \typeout{* Current settings are:} - \typeout{*} - \typeout{* \@spaces printing of your book = \myprinting} - \typeout{* \@spaces include \includedentries} - \typeout{*} - \typeout{***************************************************} - }} - {} - -%% \erroronpage <page> <line info> <contributor> <date> <fixed in revision> - -\newcommand\erroronpage[5]{% - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\newcommand\seriouserroronpage[5]{% - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \fbox{\bfseries !!}\hfill - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\newcommand\CHAPTER[1]{\endgobble - &\\[4pt]% - \multicolumn{4}{l}{\framebox[10cm][l]{\textbf{\normalsize\strut#1}}} \\} - -\newenvironment{erratalist} - {\begin{longtable}{r>{\raggedright}p{2cm}l>{\raggedright}p{10cm}l}} - {\endgobble\end{longtable}} - -\newcommand\erratatitle[2] - {\begin{center}\LARGE\bfseries - Errata list for #1\\[5pt](\myprinting.\ printing)\\[10pt] - \small Includes all entries found \printedentries\space #2\\ - (For other periods/print runs reprocess this document - with different config settings) - \end{center}% - \markright{Errata for #1 (\printedentries\space #2)}% - \thispagestyle{plain}% - \vspace{20pt}} - -\pagestyle{myheadings} - -\AtBeginDocument{\small} - -\setlength\parindent{0pt} -\setlength\parskip{2pt} - -\newcommand\contributor[2]{\makebox[1cm][l]{\sffamily#1} #2\par} - -% some special shortcuts overwriting existing commands: - -\let\u\underline -\renewcommand\>{$\to$} - -%%% some code suggested by Thorsten Hansen to count the number of -%%% contributions by individuals (will work only if we do not get -%%% too many :-) - -\def\count@contributors#1/#2/#3\@nil{ - \@ifundefined{c@#1}{\newcounter{#1}}{}\stepcounter{#1}% -%%% also count secondary: -%%% \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}% -} - -\renewcommand\erroronpage[5]{% - \count@contributors#3/secondary/\@nil - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\renewcommand\seriouserroronpage[5]{% - \count@contributors#3/secondary/\@nil - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \fbox{\bfseries !!}\hfill - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\renewcommand\contributor[2]{\makebox[1cm][l]{% - \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par} - -\end{filecontents} - - -\begin{filecontents}{\jobname.cfg} -% -% -% Configuration file for the errata listing of -% -% The LaTeX Companion, Second Edition -% -% -% \erratastartdate -% -% Specifies the date from which on errata entries should be listed. -% -% The format is YYYY/MM/DD. -% -% The default below ensures that all entries for a particular -% printing are typeset. -% - -\renewcommand\erratastartdate{2004/04/22} - - -% -% \myprinting -% -% Specifies which (revised) printing you own. For example, if you -% have the second printing set this to 2 so that errors already -% corrected in that printing will not appear in your errata -% listing. -% -% The default below ensures that all entries relevant to the x-th -% printing are typeset. -% -% - -\renewcommand\myprinting{1} -\renewcommand\myprinting{2} % 3rd printing was without corrections -\renewcommand\myprinting{4} % September 2005 - -% -% \norevisionnumbers -% -% Specifies that all page numbers in the errata are shown in the same -% format (bold face) irregardless of whether or not they are fixed -% in some revision. The default is to print corrected errors in -% italic and add the revision number as a superscript. - -% -% \showallerrors -% -% With this command you tell the program that all errata entries are -% supposed to be generated. This makes \myprinting and -% \erratastartdate basically obsolete so this isn't turned on by -% default. -% -% -\endinput -\end{filecontents} - - -\documentclass{ttcterrata}[2005/11/10] % we want new class - -\usepackage[T1]{fontenc} -\let\u\underline % shortcut for this file -\newcommand\meta[1]{$\langle$\textit{#1\/}$\rangle$} - -\usepackage{textcomp} - -\usepackage{url} - -\begin{document} - -\erratatitle{The \LaTeX{} Companion, Second Edition}{\erratafiledate} - - -\begin{verbatim} -@book(A-W:MG04, - author = {Frank Mittelbach and Michel Goossens}, - title = {The {\LaTeX} Companion}, - edition = 2, - note = {With Johannes Braams, David Carlisle, and Chris Rowley}, - series = {Tools and Techniques for Computer Typesetting}, - publisher = {Addison-Wesley}, - address = {Boston, Massachusetts}, - year = 2004, - pagenums = {1120}, - bibliography = {yes}, - index = {yes}, - isbn = {0-201-36299-6}, -) -\end{verbatim} - - -\begin{list}{}{\setlength\leftmargin{0cm}\setlength\rightmargin{3cm}} -\item[] - -This file (\texttt{\jobname.err}) can be found as part of the \LaTeX{} -distribution and its latest version is maintained on the \LaTeX{} -project site at \texttt{http://www.latex-project.org/guides/\jobname.err} -where you will also find extracts of the book. - -The first column in the table shows the page number of the errata -entry. Superscript numbers in the first column refer to the printed -revision in which this entry was corrected (\textit{s} indicates a -correction in the sources only). The second -column gives the precise location (negative line or paragraph numbers -are counted from the bottom of the page). The third column shows the -first finder of the problem. - -You can customize this list to only show errata related to the printing -you own by changing the configuration in the file \texttt{\jobname.cfg}. - -\begin{center} - \Large \bfseries To Err is Human --- Bug Contest -\end{center} - -Any mistake found and reported is a gain for all readers of our book. -For this reason Addison-Wesley and the authors offer a prize (for 6 -periods) to the eligible person who finds the largest -number of bugs during that period (in case of a draw a random choice -will be made between all those with the largest number of findings). -A person can receive at most one prize, ever; errors found by any of -the authors do not count. - -Each prize is a free choice of any single computing book found on the -AW Professional web site \texttt{http://www.awprofessional.com} (that -is, no boxed sets or multiple volume offers). - - -As usual, the authors and publisher reserve the right to make various -decisions such as whether a reported feature is an error for -competitive purposes or whether similar features count as a single or -multiple errors. --- -Good luck! - -\begin{center} -\begin{tabular}{clr} -Contest period ends & Winner \\[4pt] -2004/10 & Hubert G\"a\ss lein & 287 suggestions\\ -2005/04 & Ulrich Dirr & 11 suggestions\\ -2005/10 & Daniel Alonso i Alemany & 13 suggestions\\ -2006/04 & Michael Schutte & 2 suggestions\\ -2008/05 & Brooks Moses & 1 suggestion \\ -\ldots & -- final draw eventually -- -\end{tabular} -\end{center} -\end{list} - -\newpage - - -%<-------------------------- - -\newcommand\BibTeX{\textsc{Bib}\TeX} - -\begin{erratalist} - -\CHAPTER{General } - -\seriouserroronpage{general}{}{FMi}{2004/06/12}{} - - To help you in assessing this errata document we have placed - exclamation marks in front of each entry that we consider essential - for correctly understanding the book contents. - -\erroronpage{general}{}{FMi}{2004/05/14}{} - - Due to the printing process there may be small alignment problems - between blue and black text on some pages. These can vary from book - to book depending on how the paper was handled between print - runs---such is the analog nature of printing on a press. - - - -\erroronpage{general}{}{FMi}{2004/07/28}{} - Slightly updated examples matching the second printing will be made - available at CTAN: \texttt{info/examples/tlc2}. The book CD will - have the original examples from the first printing. - - - -\CHAPTER{Front matter} - -\erroronpage{iv}{bottom}{FMi}{2004/04/23}{2} - Some updates indicating second printing (with corrections) - -\erroronpage{v}{l.7}{FMi}{2004/04/23}{} - For the record: the term ``for ever'' is the British spelling and a - conscious decision. - -\erroronpage{xiii}{\S 8.6.2}{FMi}{2004/06/21}{2} - Change section heading: ``Operator \u{and function} names'' - -\erroronpage{xxiii}{11.2}{FMi}{2004/07/26}{2} - Change table caption: ``Languages supported by \u{\texttt{texindy}}'' - -\erroronpage{xxvii}{para 1, l.1+6+7}{CAR}{2004/05/20}{2} - Each time a space is missing between package names in parentheses. - -\erroronpage{xxvii}{para 1, l.-2}{THa}{2004/06/21}{2} - Add: ``Thorsten Hansen (\textsf{bibunits}\u{, \textsf{multibib}}) - -\erroronpage{xxvii}{para 4, l.2}{NBe}{2004/04/23}{2} - Replace ``Wai Wing'' with ``Wai Wong'' (very sorry for this typo). - -\erroronpage{xxvii}{para 4, l.2}{MHCL/CAR}{2004/06/09}{2} - Kai Tek airport is correctly named Kai Tak airport but the photo - was actually taken at Hong Kong International Airport - -\erroronpage{xxvii}{after para 4}{FMi}{2004/06/09}{2} - Add following paragraph: -``Any mistake found and reported is a gain for all readers of our -book. We would therefore like to thank those readers who reported -any of the mistakes which had been overlooked so far. -The latest version of the errata file can -be found on the \LaTeX{} project site at -\texttt{http://www.latex-project.org/guides/tlc2.err} where you will also -find an on-line version of the index and other extracts from the book.'' - -\CHAPTER{Chapter 1} - -\erroronpage{2}{para 5, l.1}{MSc}{2004/06/03}{2} - Replace: LaTeX \> \LaTeX{} - -\erroronpage{7}{para 5, l.-2}{HjG}{2004/05/20}{2} - Missing word and wrong designation of acronym: - ``\ldots\ - languages such \u{as} the \u{Portable Document} Format (PDF) - \ldots'' - - -\erroronpage{7}{para 5, l.-2}{MSc/CAR}{2004/06/06}{2} -Replace: ``\ldots produce other device-independent - output forms in proprietary languages such as the Portable Document - Format~(PDF) (extension~\texttt{.pdf}).'' \> \\ - ``\ldots produce device-independent - file formats including the Portable Document Format~(PDF) - (extension~\texttt{.pdf}), which is the native file format of Adobe - Acrobat.'' - - -\erroronpage{13}{para -2, l.5}{FMi}{2004/04/23}{2} - Replace ``writes'' with ``write''. - -%\erroronpage{13}{last para, l.1}{MSc}{2004/06/08}{} -% ``blue notes`` vertically misaligned - -\erroronpage{14}{para 2, l.2}{FMi}{2004/06/12}{2} - Bug in \texttt{url.sty} generated extra space. - -\erroronpage{14}{para 2, l.6}{FMi}{2004/04/23}{2} - Printing problem: ``or'' only half visible. - -\erroronpage{14}{para 3, l.3}{HjG}{2004/05/20}{2} - Printing problem: ``d'' in ``document'' only half visible. - -\erroronpage{14}{exa 1-3-5, l.6}{DHL}{2004/05/14}{2} - Printing problem: ``i'' in ``\verb=\section='' not visible. - - -\CHAPTER{Chapter 2} - -\erroronpage{16}{para 4,ll.2--4}{HjG}{2005/04/03}{4} - Nitpicking? Code for class options will not be in a package file!\\ - ``Code for \u{class} options is sometimes stored in files - (in \u{this case} with the extension \texttt{.clo}) but is normally - directly specified in the class or package file (\dots).'' - \>\\ - ``Code for options is sometimes stored in files - (in \u{the case of classes} with the extension \texttt{.clo}) but - is normally - directly specified in the class or package file (\dots).'' - -\erroronpage{16}{para 4, l.-2}{HjG}{2004/10/10}{4} - Although not wrong, better: - ``For example, - the option \texttt{11pt} \u{might be} related to - \u{\texttt{art11.clo}} when\ldots'' - \> - ``For example, - the option \texttt{11pt} \u{is} related to - \u{\texttt{size11.clo}} when\ldots'' - -\erroronpage{20}{para 1, l.-2}{BMo}{2004/05/14}{2} - Words need to be swapped: ``\ldots can achieve \u{this effect} by - \ldots'' - -\erroronpage{20}{footnote, l.2}{MSc/FMi}{2004/06/10}{2} - Replace ``e.g.,'' with ``i.e.,'' - -\erroronpage{21}{para 1 of 2.1.4, l.-1}{HjG}{2004/05/20}{2} - Words need to be swapped: - ``\ldots package \u{created by} Donald Arseneau.'' - -\erroronpage{21}{para -2, l.2}{MLi}{2013/07/12}{} - The command is called \verb=\AskOption= (without ``s'') - -\erroronpage{24}{para -2,ll.-3\slash -2}{HjG}{2005/04/03}{4} - \LaTeX{}nically not correct:\\ - ``\u{all} lower-level counter\u{s} (i.e., \u{those} with - higher-level number\u{s}) \u{are} reset.''\>\\ - ``\u{the next} lower-level counter (i.e., \u{that} with \u{the next} - higher-level number) \u{is} reset.'' - -\seriouserroronpage{26}{footnote}{HjG}{2004/05/20}{2} - Misplaced closing brace (see example 2-2-3):\\ - \verb=\fbox{\csname thesection\endcsname\hspace{0.5em}=% - \u{\texttt{\textbraceright}} - \> - \verb=\fbox{\csname thesection\endcsname=% - \u{\texttt{\textbraceright}}\verb=\hspace{0.5em}= - -\erroronpage{27}{exa 2-2-4}{MBr}{2004/08/01}{2} - Rewrite example text to avoid overfull hbox. - -\erroronpage{27}{para -2, l.4}{HjG}{2004/05/20}{2} - Missing italic correction: - \verb=\=\emph{name}\verb=mark= - - -\seriouserroronpage{28}{afterskip item, ll.3--4}{HjG}{2005/04/03}{4} - \LaTeX{}nically not correct (cf.\ latex/3463):\\ - ``\dots\ whether a display heading (\textit{afterskip}${}\geq0$) or a - run-in heading (\textit{afterskip}${}<0$) is produced.''\>\\ - ``\dots\ whether a display heading (\textit{afterskip}${}>0$) or a - run-in heading (\textit{afterskip}${}\leq0$) is produced.'' - -\seriouserroronpage{32}{para -1,l.4--7}{HjG/FMi}{2004/05/20}{2} - Replace: ``The modified |\section| command -also starts a new page, which is typeset with a special page style -(see Chapter~4) and with -top floats suppressed. -The indentation of the first paragraph in a -section is also suppressed by using the low-level kernel command - |\@afterheading| and setting -the Boolean switch \texttt{@afterindent} to \texttt{false}. -For details on the use of these commands see the |\chapter| implementation in -the standard classes (file \texttt{classes.dtx}).'' - -\seriouserroronpage{33}{code}{FMi}{2004/05/20}{2} - Replace code as follows to make statement on p.32 true:\\ -\hspace{0pt minus\linewidth}\begin{minipage}{1.35\linewidth} -\begin{verbatim} -\makeatletter - \renewcommand\appendix{% - \renewcommand\section{% % Redefinition of \section... - \newpage\thispagestyle{plain}% % new page, folio bottom - \suppressfloats[t]\@afterindentfalse % no top floats, no indent - \secdef\Appendix\sAppendix}% % call \Appendix or \sAppendix - \setcounter{section}{0}\renewcommand\thesection{\Alph{section}}} - - \newcommand\Appendix[2][?]{% % Complex form: - \refstepcounter{section}% % step counter/ set label - \addcontentsline{toc}{appendix}% % generate toc entry - {\protect\numberline{\appendixname~\thesection}#1}% - {\raggedleft\large\bfseries \appendixname\ % typeset the title - \thesection\par \centering#2\par}% % and number - \@afterheading % prepare indentation handling - \sectionmark{#1}% % add to running header - \addvspace{\baselineskip}} % space after heading - - \newcommand\sAppendix[1]{% % Simplified (starred) form - {\raggedleft\large\bfseries\appendixname\par \centering#1\par}% - \@afterheading\addvspace{\baselineskip}} -\makeatother -\end{verbatim} -\end{minipage} - -\erroronpage{30}{para-3, l.-2}{RPa}{2004/09/14}{4} - ``page 426'' should be ``page 428'' - -\seriouserroronpage{33}{code}{HjG}{2004/05/20}{2} - Definitions of \verb=\Appendix= and \verb=\sAppendix= use - \verb=\flushright= instead of \verb=\raggedleft=! - - Editorial note: already addressed in previous major change. - -\erroronpage{33}{exa 2-2-11}{MBr}{2004/08/01}{2} - Text contains two spaces after period (not wrong but unnecessary). - -\erroronpage{33}{exa 2-2-11}{FMi}{2004/04/23}{2} - Comment only needs one \% not two. - -% not really a bug but ... -\erroronpage{35}{para 1}{hajk}{2005/09/29}{} - Package fncychap also makes unwanted ``Chapter 0'' heading for - |\chapter{Preface}| in |\frontmatter| of book. - - Comment: I don't really consider this a bug (as it is not surprising - with such designs) but will see if it can be explicitly mentioned. - -\seriouserroronpage{45}{para 2, l.13}{DHL}{2004/05/27}{2} - In the displayed code, the second occurrence of - ``\verb=\renewcommand\theBhead=\dots'' \> - ``\verb=\renewcommand\theChead=\dots'' - -\erroronpage{37}{para 3, l.-2}{FMi}{2004/10/21}{4} - Replace: ``\ldots title in lowercase'' \> - ``\ldots title in \u{small capitals}'' - -\erroronpage{46}{para -2,l.3}{HjG}{2005/04/03}{4} - Delete: ``need\u{ed}'' \> ``need'' - -\erroronpage{48}{para 2, l.5}{HjG}{2004/05/20}{2} - Delete doubled word: - ``(\ldots\ to the \u{the} table of contents)'' - -\erroronpage{49}{para 3, l.2}{DHL/CAR}{2004/05/27}{2} - Replace: ``Thereby, the result of'' \> - ``The exact effect of'' - -\erroronpage{50}{para -4, l.3}{HjG}{2004/05/20}{2} - Add remark: - ``\ldots, so that the standard document classes have definitions - for \verb=\l@part= and \verb=\l@chapter= - \u{(or \texttt{\char`\\l@section} with \textsf{article})} - that do not use \verb=\@dottedtocline=.'' - -\erroronpage{50}{para --1}{FMi}{2004/10/22}{4} - Replace para with: - The nesting level of the entry. - With the help of the counter \texttt{tocdepth} the user can - control how many nesting levels will be displayed. - Levels greater than the value of this counter - will not appear in the table of contents. - - -\erroronpage{51}{fig.~2.3}{HjG}{2004/05/20}{2} - The lines of the ``heading text'' are wrapped at a place different - from that indicated by the \verb=|<- \@tocrmarg ->|=. - -\seriouserroronpage{51}{descr. of - \texttt{\textbackslash - @pnumwidth}}{CBa}{2005/04/04}{4} - Needs changing with |\renewcommand|! - -\seriouserroronpage{51}{descr. of - \texttt{\textbackslash @tocrmarg}}{HjG/FMi}{2004/05/20}{2} - Add additional sentence: - ``It can be set to a rubber length, which results in the TOC being set - unjustified.'' - -\erroronpage{51}{footnote}{FMi}{2004/09/19}{4} - Add: ``\ldots See Section 7.10.3 \u{on page 428} for more\ldots'' - -\seriouserroronpage{52}{para 2, exa}{CBa}{2005/04/04}{4} - As |\@pnumwidth| is actually a macro the assignment using - |\settowidth| unfortunately doesn't work at all. - Instead a value needs to be assigned via |\renewcommand|. - -\erroronpage{52}{para 3, l.1}{HjG}{2004/05/20}{2} - Printing problem: ``w'' in ``down'' only half visible. - -\erroronpage{52}{middle}{HjG}{2004/05/21}{2} - Add after code line: - ``When adjusting \verb=\@pnumwidth= this way it is likely that the - value of \verb=\@tocrmarg= needs to be changed as well to keep the - layout of the table of contents consistent.'' - -\seriouserroronpage{52}{para 3, l.-1}{JJN}{2004/08/17}{4} - Replace ``and section'' with ``section, and subsection''. - (or replace code above to use |\setcounter{tocdepth}{1}| and speak - of "first" level) - -\erroronpage{55}{ll.-8/-7}{HjG}{2004/05/21}{2} - Missing word: ``\ldots\ is defined by \u{the} second argument.'' - -\erroronpage{56}{footnote}{CBe}{2004/07/27}{2} -Remove: ``\ldots are limited to three characters, like MS-DOS \u{or Windows}.'' - -\seriouserroronpage{57}{tab.~2.3}{HjG}{2004/05/21}{2} - \verb=\mtcPSfont= \> \verb=\mtcSPfont=\\ - \verb=\nomtcrules= \> \verb=\nomtcrule=\\ - \verb=\mtcrules= \> \verb=\mtcrule= - -\seriouserroronpage{57}{para-2, l.-3}{HjG}{2004/05/21}{2} - \verb=\partoc= \> \verb=\parttoc= - - \erroronpage{58}{exa 2-3-8}{CBe}{2004/07/27}{2} - km2 appears two times in the code and in the printed output; - it should be \verb=km\textsuperscript={2} in the code - and km\textsuperscript{2} in the output. - -\erroronpage{62}{l.-11}{HjG}{2004/05/21}{2} - ``recourse'' \> ``recur'' - -\erroronpage{63}{para 1, l.1}{FMi}{2004/11/11}{4} - Typo: ``This artific\u{i}al example shows how'' - -\erroronpage{65}{para 2, l.-1}{CKr}{2004/10/15}{4} - Correct: ``formated'' \> ``format\u{t}ed'' - -\erroronpage{66}{marginal note}{FMi}{2004/04/23}{2} - Restrictions on keys deserve a dangerous bend sign. - -\erroronpage{68}{exa 2-4-3}{HjG}{2004/05/21}{2} - The box in the margin ``\fbox{2-4-3}'' is shifted right - (with respect to other such boxes). - -\erroronpage{72}{para 3, l.-3}{HjG/FMi}{2004/05/21}{2} - Change/add: - ``\ldots by comparing \u{the number of the chapter} in which the -|\label| \u{occurred} with the current\ldots'' - -\erroronpage{75}{para -1, l.2}{CKr}{2004/10/17}{4} - Change: ``provided the \textit{keys}'' \> - ``provided the \textit{key}\u{s}'' - -\seriouserroronpage{76}{para -2, l.5--8}{DAr/FMi}{2004/07/24}{2} -Change marginal to ``{\itshape Unnumbered sections get moving -arguments}'' - -Change text to: ``As a consequence, \u{the -arguments of unnumbered sectioning commands} are turned into -moving arguments, \ldots'' - -\erroronpage{77}{para -1, l.-4}{DAr}{2004/07/24}{2} - Add: ``In addition, no \u{unrelated} |\addcontentsline| command is -allowed to intervene between heading and label.'' - -\erroronpage{78}{\S 2.4.5, l.1}{HjG}{2004/05/24}{2} - Add: ``Sebastian - Rahtz \u{(with contributions by Heiko Oberdiek and - David Carlisle)} has developed\ldots'' - -\erroronpage{78}{para 3, l.3}{UFi}{2004/06/01}{2} - Program name changed: ``Acrobat Reader'' \> ``Adobe Reader'' - - -\CHAPTER{Chapter 3} - -\erroronpage{84}{}{DAr}{2004/07/23}{2} -Change: ``For example, if the current size is \u{\ttfamily\textbackslash Large} then -\verb=\relsize{-2}= would change to \u{\ttfamily\textbackslash normalsize}\,. - -\seriouserroronpage{84}{exa 3-1-7}{FMi}{2004/04/23}{2} - To avoid extra space in the output, second line should read:\\ - \verb*= {\relsize{-2}small words} inside.= - -\erroronpage{85}{para -1, l.5}{WaS/FMi}{2004/06/16}{2} - Change: ``ON 28TH \u{OF} JULY 2003'' \> ``ON 2ND AUGUST 2004'' - (no OF generated) - -\seriouserroronpage{87}{para 3, l.1}{DAr}{2004/07/24}{2} - Replace: |\uuline| \> |\uline| - -\erroronpage{87}{exa. 3-1-15}{V-Li}{2004/08/14}{} - \verb+\-+ should be used on a word that is actually hyphenated. - - Well, would be nice but not easy to find one. - -\erroronpage{87}{exa. 3-1-16}{DHL}{2004/06/07}{2} - The solid band produced by |\xout| is actually supposed to come - out as a series of separated ``/'' symbols. With the - \texttt{ulem} package used for the first printing that works well - for most text fonts, but - with Times Roman (used in the example) you get the result shown. - The new package version fixes this defect. - -\erroronpage{92}{para 3, l.1+4}{UFi}{2004/07/31}{2} -Change: ``The position and the \u{height} of the line -produced by the |\ul| command can be customized using either -|\setul| or |\setuldepth|\,. The command |\setul| takes two -dimensions as arguments: the position of the line in relation to the -baseline and the \u{height} of the line. - -\erroronpage{92}{para -1}{FMi}{2004/07/31}{2} -Add: ``\ldots can use colored rules instead and, if desired, modify the -highlighting color\u{ as demonstrated below}: - -\erroronpage{95}{exa 3-1-33}{MHo/FMi}{2004/05/17}{2} - Replace: ``setup'' by ``set-up'' for consistency. - -\erroronpage{102}{para 1, l.-3}{CBC}{2004/05/18}{2} - Replace: ``in great \u{of} detail'' with ``in great detail''. - -\erroronpage{103}{l.8}{HjG}{2004/05/23}{2} - Replace: ``arbitrary bad lines'' \> ``arbitrar\u{il}y bad lines'' - -\erroronpage{105}{para -3, l.1}{HjG}{2004/05/23}{2} - Replace: ``typesetting'' \> ``typing'' - - - -\erroronpage{107}{l.3--7}{CBe}{2004/07/27}{4} - |\linespread| is the \LaTeXe\ command for - setting up the value of \comando{\baselinestretch}; it is not necessary - to use |\renewcommand| and in particular it is not necessary to - activate the new interline spacing by changing font; it suffices the command - |\selectfont|; the procedure described in this paragraph, - although still possible, was the one to use with \LaTeX\,209 and with the - early versions of \LaTeXe, and it was the only way when the First Edition was - published. The command |\linespread| is introduced the first - time on page~204, but section 3.1.13 was the right place to do it. - - -\erroronpage{107}{para 4, l.3}{HjG}{2004/05/25}{2} - Delete word: ``\ldots\ single\u{ (default)}, \ldots'' - -\erroronpage{107}{para -1, l.3--5}{DHL/FMi}{2004/06/07}{2} - Add/change: - ``\ldots leading is increased twice---once by |\baselineskip| (where - \LaTeX{} already adds about 20\% space between baselines)\ldots'' \> -``\ldots leading is \u{effectively} increased twice---once by |\baselineskip| (\u{which - \LaTeX{} already sets to about 20\% above the font size})\ldots'' - - -\erroronpage{116}{Footnote 1, line 1}{CBC}{2004/05/18}{2} - Replace: ``I managed to confuse'' with ``we managed to confuse''. - -\erroronpage{117}{para 2, l.2}{HjG}{2004/05/25}{2} - Missing letter: ``It take\u{s} two \ldots'' - -\erroronpage{117}{para 3, l.3}{CBC}{2004/05/18}{2} - Tense correction: ``\ldots they did not change when the text font - \u{was} modified''. - -\erroronpage{117}{para 3,l.-3}{FMi}{2004/05/31}{2} - Change: ``your list consist of'' \> ``your list\u{s} consist of''. - -\erroronpage{117}{para 3,l.-2}{CBC}{2004/05/18}{2} - Change: ``lists consist\u{s} of'' \> ``lists consist of''. - -\erroronpage{117}{footnote}{HjG}{2004/05/26}{2} - Missing word: ``See, \ldots, the \textsf{ledmac} package [171] - \u{for} the kinds of \ldots'' - -\erroronpage{119}{para 2, l.1}{DHL}{2004/06/07}{2} - Replace word: ``By default, the footnote text is \u{justified}\ldots'' - -\erroronpage{121}{para 2, l.4}{HjG}{2004/05/25}{2} - Missing word: ``the \texttt{symbol*} \u{option}'' - -\erroronpage{124}{middle para, ll. -3/-2}{HjG}{2004/05/26}{2} - Missing word: ``It is even possible \u{to} use \ldots'' - -\iffalse -%% only do if real error on page -\erroronpage{125}{para 3 of \S 3.2.7, ll.-2/-1}{HjG}{2004/05/26}{} - Word position: ``\ldots\ whenever |\endnote| or |\endnotemark| - \u{is used} without an optional argument.'' -\fi - -\erroronpage{127}{para 3, l.last}{PYu}{2004/07/01}{2} - Replace: ``ragged left'' \> ``ragged right''. - -\erroronpage{131}{footnote, l.1}{CBC}{2004/05/19}{2} - Change: ``is not producing'' \> ``does not produce''. - -\seriouserroronpage{141}{syntax box}{HjG}{2004/05/26}{2} - Replace: - \emph{body-font} \> \emph{body-style}\\ - \emph{head-font} \> \emph{head-style}\\ - \emph{head-after-format} \> \emph{head-after-space} - -\erroronpage{142}{exa 3-3-21/22}{UZi}{2005/03/15}{} - With the newest version of \texttt{amsthm} the font setting for the headline - is ignored for the optional description of the theorem (looks like a - bug in amsthm). - -\erroronpage{142}{exa 3-3-21}{FMi}{2005/08/15}{4} - There is an incompatibility between \texttt{amsthm} and - \texttt{ragged2e}. If the latter is used then the use of |\newline| - in a theorem declaration doesn't work. - -\erroronpage{142}{para -2, l.1}{DHL}{2004/06/07}{2} - Missing word: ``make'' \> ``\u{to} make''. - -\seriouserroronpage{148}{exa 3-3-26}{HjG}{2004/05/26}{2} - In the example, |\hfil| is used; the text immediately before says: - ``By using |\hfill| \ldots'' - -\erroronpage{150}{exa 3-3-28}{HjG}{2004/05/27}{2} - Nit-picking :-)\\ - Comment should read: ``|%|\quad\texttt{term <\u{=} labelwidth}''\\ - And in ll.2/3 of the text following the example: - ``If the label is \u{smaller} than |\labelwidth|, \ldots'' \> - ``\ldots\ \u{not wider} \ldots'' - -\erroronpage{150}{Example 3-3-28, line 7}{UF}{2004/06/27}{2} -In the code of the parbox there should be a |\mbox{}| or something -similar after the |\\| to prevent an underfull hbox-warning. - -\erroronpage{150}{exa 3-3-28}{JBez}{2004/07/20}{} - The vertical space above "Return values" is too small. - -\erroronpage{151}{para 3, l.2}{DHL}{2004/06/07}{2} - Wrong word: to match the example, - ``\textsc{Notes}'' should be ``\textsc{Note}'' - -\erroronpage{152}{l.-1 before exa 3-4-2}{HjG}{2004/05/31}{2} - Replace: ``(see page 167)'' \> ``(see page 168)'' - -\erroronpage{155}{para 3, l.2}{HjG}{2004/05/31}{2} - Replace: ``behaves similarly to'' - \> ``is much like'' - -\erroronpage{155}{para -2, l.5}{HjG}{2004/05/31}{2} - Replace: ``behave in similar fashion to'' - \> ``\ldots in \u{a fashion similar} to'' - -\erroronpage{156}{para -1, l.4}{CBC}{2004/05/20}{2} - Change: ``There is also the possibility to operate'' \> ``It is also - possible to operate''. - -\erroronpage{157}{para 2, l.-4}{CBC}{2004/05/20}{2} - Change: ``\ldots discussed below) are potentially'' \> ``\ldots - discussed below) \u{is} potentially''. - -\erroronpage{158}{para3, l.3}{DHL/FMi}{2004/06/07}{2} - Change word: ``tiny white rules \u{behind} the lines'' \> ``tiny white - rules \u{between} the lines''. - -\erroronpage{166}{syntax box}{CAR}{2004/06/02}{2} - Remove extra space: ``\ldots\verb*/}=/\u{~}\emph{data}\texttt='' - -\erroronpage{167}{para 1, l.2}{DAl}{2005/01/11}{4} - Missing letter: ``\ldots bold italic face exi\u{s}ts.'' - -\erroronpage{168}{para 3, l.2}{MLa}{2004/05/10}{2} - Letter missing: ``While on\u{e} can successfully deploy a - package\ldots'' - -\erroronpage{169}{tab.~3.7}{HjG}{2004/05/26}{2} - Spurious space: ``Pascal (\u{ \strut}Borland, \ldots)'' - -\erroronpage{169}{tab.~3.7}{THa/FMi}{2004/06/21}{2} - Move the information about blue entries to a separate table note. - -\erroronpage{173}{para 2, l.2}{FMi}{2004/11/11}{4} - Typo: ``to indicate that the line was artific\u{i}ally broken'' - -\erroronpage{175}{para 1, l.6}{FMi}{2005/02/22}{4} - Replace: \textsf{inputenclistings} \> \textsf{inputenc} - -\erroronpage{177}{exa 3-5-1}{HjG/FMi}{2004/05/31}{2} - In the first paragraph, the ``\ldots \verb*=.\para='' yields a - single (sentence ending) interword space; but in the following - three, ``\ldots \verb*=. \para='' yields doubled space. - (Due to the leading space in the definition of |\para|.) - The same problem is in exa 3-5-2 except that there is does not show - in the output due to a linebreak. - -\seriouserroronpage{177/178}{ll.-2/-1/1}{HjG/FMi}{2004/06/01}{2} - Missing word and references to wrong paragraphs of exa 3-5-2:\\ - ``The line numbers in the second |\marginpar| continue the - numbering on the main vertical list (the last line of \u{first} - paragraph was~5) and the \u{second} paragraph then continues with - line number~9.'' - \\ \> - ``\ldots\ (the last line of \u{the} \u{preceding} paragraph was~5) and - the \u{third} paragraph \ldots'' - -\erroronpage{179}{exa 3-5-5}{HjG}{2004/05/31}{2} - In the first paragraph, the two instances of - ``|\linelabel{|\ldots|}|\verb*= \sample='' - yield double (sentence ending) interword space. - (Due to the leading space in the definition of |\sample|.) - -\erroronpage{179}{Example 3-5-5, l.-2}{CBC}{2004/05/20}{2} - Change: ``we see to refer to'' \> ``we see references to''. - -\erroronpage{182}{para 2, l.-2}{CBC}{2004/05/20}{2} - Change: ``of an \verb=\Parallel..Text='' \> ``of \u{a} - \verb=\Parallel..Text=. - -\erroronpage{182}{para 3, l.1}{HjG/FMi}{2004/05/31}{2} - ``computer \u{lingua}'' \> ``computer \u{jargon}'' - -\erroronpage{182}{exa 3-5-11}{HjG/FMi}{2004/05/31}{2} - Small improvement:\\ - |\setlength\parindent{|\u{\texttt{-10pt}}|}| \> - \ldots \u{\texttt{\char`\{-\char`\\leftskip\char`\}}} - -\iffalse only on some books -\erroronpage{183}{exa 3-5-13}{HjG}{2004/05/31}{} - Printing problem: - ``|[|'' in ``|\begin{Parallel}[v]{}{}|'' only half visible. -\fi - -\erroronpage{184}{footnote 1, l.1--2}{BMo}{2004/05/16}{2} - Rewrite beginning: ``Although the \textsf{multicol} package is - distributed under LPPL (\LaTeX{} Project Public License)~[111], for - historical reasons its copyright contains an additional ``moral - obligation'' clause\ldots'' - -\erroronpage{189}{para 3, l.2}{MHo}{2004/05/08}{2} - Spurious extra letter: ``If this is a - possibility, \texttt{multicols}\u{t} produces a warning.'' - -\erroronpage{189}{para -2, ll.2/3}{HjG}{2004/05/31}{2} - Extra word: ``bars in the margin, \u{the} known as \ldots'' - -\erroronpage{189}{par -1, l.4/5}{HjG}{2004/05/31}{2} - Add comma: ``However, if \ldots\ another\u{,} the \ldots'' - -\erroronpage{190}{}{FMi}{2004/06/13}{2} - Editorial comment: changes for page 189 affect page break position - so 190 has to be retypeset for second printing. - - -\CHAPTER{Chapter 4} - -\erroronpage{196}{table 4.2}{YiL}{2012/05/07}{} - The values shown in the table aren't any quite correct. These days - some of them are calculated depending on the chosen paper size option - and so have slightly different values from what is listed in the table. - The values listed are those that have been used in 2.09 (i.e., they - would be fully correct in compatibility mode, that is for documents - starting with |\documentstyle|). - -\erroronpage{199}{code block}{UFi}{2004/07/31}{2} - Change: - \texttt{\u{1in}+}|\oddsidemargin+\textwidth+\evensidemargin|\texttt{\u{+1in}} - - -\erroronpage{202}{para 3, l.4}{CBC}{2004/05/21}{2} - Change: ``list-related parameter'' \> ``list-related parameters''. - -\erroronpage{202}{para 3, l.4}{PYu}{2004/07/07}{2} - Remove surplus word: ``in \u{in} figure 3.3'' - -\erroronpage{203}{para 3, l.3}{HjG}{2004/05/31}{2} - ``one or the other criteri\u{a}'' - \> ``\ldots\ criteri\u{on}'' (singular) - -\seriouserroronpage{205}{para 2, l.2}{HjG}{2004/05/31}{2} - Delete backslash: ``an option of the type - \u{\texttt{\char`\\}}\emph{num}|headlines|'' - -\erroronpage{205}{para 3, l.1}{CBC}{2004/05/21}{2} - Swap words: ``header \u{is size} enlarged'' \> ``header \u{size is} - enlarged''. - -\erroronpage{205}{para 4, l.4}{CAR}{2004/06/06}{2} - Delete word: ``\ldots taken up by the binding\u{ method}. For - example,\ldots'' - -\erroronpage{205}{para 5, l.2}{CBC}{2004/05/21}{2} -Omitted word: ``one can \u{perform} the parameter calculations''. - -\seriouserroronpage{205}{para 5}{FMi}{2004/06/06}{2} -Append: For details see the KOMA-Script documentation. - -\seriouserroronpage{205}{Example 4-2-6, 1.3}{CBC}{2004/05/21}{2} -Add a comment line: ``\verb=% syntax: \typearea[<binding corr.>]{<slices>}='' - -\erroronpage{206}{para 2, l.6}{FMi}{2004/06/06}{2} - - Replace: ``\ldots shows a layout \u{identical} to the one - produced\ldots'' \> - ``\ldots shows a layout \u{very similar} to the one produced\ldots'' - -\seriouserroronpage{206}{para 2, l.6}{HjG}{2004/05/31}{2} - Wrong references:\\ - ``Example \u{4-2-4} on page \u{204}'' \> - ``Example \u{4-2-5} on page \u{205}'' - -\erroronpage{209}{para 1, l.1--2}{BMo}{2004/05/16}{2} - Replace: - ``\ldots and does not leave sufficient space for marginal notes - that fall outside the page.'' - \> - ``\ldots but does not adjust the size of the marginal boxes to fit - in the remaining margin.'' - - -\erroronpage{210}{para -1, l.3}{CBC}{2004/05/21}{2} - Omitted word: ``allow you \u{to} set several values''. - -\erroronpage{211}{para 4, l.6}{FMi}{2004/08/30}{4} - Add: ``\ldots be called multiple times \u{in the preamble}, - each time overwriting the previous settings.'' - -\erroronpage{212}{para -1, l.2}{CKr}{2004/11/11}{4} - Remove surplus: ``the \emph{logical} page - \u{you} you want to produce.'' - -\seriouserroronpage{213}{para 1, l.2}{BMo}{2004/05/16}{2} - Option \texttt{executive} is listed twice, replace once with - \texttt{letter}. - -\erroronpage{213}{para 2, l.1}{CKr}{2004/11/11}{4} - Typo: ``The following example sets up an artific\u{i}ally small logical page'' - -\erroronpage{213}{para 1, l.1--2}{FMi}{2006/09/09}{4} - Option \texttt{b3} is listed twice. - -\erroronpage{213/214}{exa 4-2-11/13}{FMi}{2004/06/05}{2} - The picture (|rosette.ps|) is clipped a tiny bit at the left side. - That's actually an error in the |.ps| file itself and can be seen - in all other examples where the file is used. - -\seriouserroronpage{214}{para 1, l.6}{BMo}{2004/05/16}{2} - ``\ldots\ \texttt{notext} \ldots'' should be ``\ldots\ - \texttt{nographics} \ldots''. - -\erroronpage{217}{para -2, l.1}{HjG}{2005/05/08}{4} - Replace (since the package's default is different):\\ - Finally the \u{en dash} between the prefix and the page number \dots\ \>\\ - Finally the \u{separator} between the prefix and the page number \dots - -\erroronpage{219}{l.4}{HjG}{2004/06/03}{2} - Missing italic correction: - \verb=\=\emph{name}\verb=mark= - -\erroronpage{219}{para -1,l.2}{HjG}{2005/05/09}{4} - Reference to wrong section:\\ - ``Table~9.2 on page~547 in Section~\u{9.1.3}'' \>\\ - ``Table~9.2 on page~547 in Section~\u{9.2.1}'' - (or omit section refence completely) - -\erroronpage{223}{tab 4.3}{THa}{2004/06/22}{2} - Spurious space after superscript \textsuperscript{a} in footnote. - -\erroronpage{226}{para. 5, l.2}{PYu}{2004/07/05}{2} - Change to plural: ``The headers and footers are typeset \u{in boxes} - that, by default, \u{have} the same width as |\textwidth|\,. The - \u{boxes} can be made wider (or narrower)\ldots'' - - -\erroronpage{227}{para 2,l.1}{HjG}{2005/05/09}{4} - Replace: - ``running \u{heading}'' \> - ``running \u{header}'' - -\erroronpage{227}{para 3,l.1}{HjG}{2005/05/09}{4} - Replace: - ``the \u{heading} is extended'' \> - ``the \u{header} is extended'' \> - -\erroronpage{229}{2.-1}{CBC}{2004/05/24}{2} - Change: ``if the first B-head\ldots would have already been'' \> ``if - the first B-head\ldots had already been''. - -\erroronpage{229}{para -2,l.-2}{HjG}{2005/05/09}{4} - Replace: - ``the \u{heading}'' \> - ``the \u{header}'' - -\erroronpage{230}{exa 4-4-3}{HjG}{2005/05/09}{4} - Add |%| character: - ``|\fancyfoot[R]{\scriptsize\today}|\texttt{\u{\char`\%}}'' - -% not a bug, but heh ho -\erroronpage{232}{ll.1/2}{HjG}{2004/06/03}{2} - Add words: ``With a similar mechanism we prepared \u{the running - headers of} the index for this book.'' - -\erroronpage{232}{ll.1/2}{CKr}{2004/11/17}{4} - Remove surplus: ``With a similar mechanism we prepared \u{the} the running\ldots'' - -\seriouserroronpage{234}{First boxed command}{CBC}{2004/05/24}{2} - Change: ``\verb=\enlargethispage*{=size\verb=}='' \> - ``\verb=\enlargethispage{=size\verb=}=''. - -\erroronpage{237}{para 1, l.3}{MKo}{2004/08/06}{2} - Change: ``\textsf{scrpage}'' \> ``\textsf{scrpage2}'' - -\erroronpage{237}{para 4, l.3}{DAl}{2005/01/11}{4} - Change: ``also works as \u{an} replacement'' \> ``also works as - \u{a} replacement'' - -\erroronpage{237}{para 5, l.2}{CBe}{2004/07/27}{2} - Change: ``14pt'' \> ``17pt'' - - -\CHAPTER{Chapter 5} - -\erroronpage{239}{para -1, l.1}{HjG}{2004/06/03}{2} - Extra word: ``After \u{a} taking a quick look \ldots'' - -\erroronpage{241}{Example 5-1-1}{CBC}{2004/05/24}{2} - - Change: ``esprit trouble'' \> ``esprit troubl\'e''. - -The whole example has been changed to better demonstrate -the \verb|\kill| command. - -\erroronpage{242}{para -2}{DSch/FMi}{2005/09/19}{4} - Replace para with: -``The \texttt{tabular*} environment has an additional width argument that -specifies the required total width of the table. -It needs stretchable spaces between columns, that have to be added using -|\extracolsep| (see page~246).'' - -\iffalse -%% check, maybe (if other error -\erroronpage{243}{para 1, l.3/4}{HjG}{2004/06/03}{} - Change: ``Their scope can be \u{general} or local.'' - \> ``\u{global}'' -\fi - -\erroronpage{243}{}{CBe}{2004/07/27}{4} - The explanation of the command \comando{\arraystretch} is - wrong; in fact it does not multiply the inter-row space by the specified - factor, so that a factor of 1.5 would move the rows 50\% farther apart. - \comando{\arraystretch} scales by the specified factor the height and depth of - the invisible strut that is in the first cell of every row of tabular and array - environments. If all the cells of the row are smaller than the strut the effect - is more or less similar to an enlargement of the inter-row space, while if at - least one cell in the row is larger than the strut no spreading apart takes - place other than that required by the largest cell. - - - -\erroronpage{243/244}{tab.~5.1/5.2}{HjG}{2004/06/03}{2} - In the left columns of these tables, typewriter font should be used - for the braces, to better match the appearance in the syntax boxes. - -\erroronpage{244}{tab.~5.2}{HjG}{2004/06/03}{2} - 1. In the |m| row, the braces in |\parbox|\u{\{}\emph{width}\u{\}} - are not from the typewriter font, as they are in the |b| row.\\ - 2. In the |>| and |<| rows, the |p|, |m|, and |b| options are - listed once without and once with their |{..}| arguments. - -\seriouserroronpage{244}{para -1, l.3--4}{FMi/DCa}{2005/02/05}{4} - Replace: ``the sum of its value, - added to the product - |\baselineskip|${}\times{}$|\arraystretch}|'' - \> - `` $|\arraystretch| \times (|\extrarowheight| + 0.7 |\baselineskip|)$'' - - -\erroronpage{246}{para 3}{FMi}{2005/09/19}{4} - Add blue marginal note: ``Making \texttt{tabular*} stretch to the - required width'' - -\erroronpage{246}{para 3, l.3/4}{HjG}{2004/06/03}{2} - Change: - ``The use \ldots\ is subject\u{ed} to two restrictions: \ldots'' - \> ``\ldots~subject \ldots'' - -\erroronpage{247}{exa 5-2-9}{CBe}{2004/07/27}{2} - Add hyphenation points for |Possibi\-li\-t\'es| - -\erroronpage{248}{para 1}{FMi}{2005/09/19}{4} - Replace para with: ``A - common use of |@{}| is to remove the space equal to -the value of |\tabcolsep| (for \texttt{tabular}) that, by default, -appears on each side of the table, -except when the column specification starts or ends in a \verb=|=.'' - - -\erroronpage{249}{exa 5-2-11}{FMi}{2004/07/27}{2} - Add hyphenation points for |Possibi\-li\-t\'es| - -\seriouserroronpage{249}{l.-2}{HjG}{2004/06/03}{2} - Change: - ``\ldots\ the \textsf{array} package \texttt{m} and \u{\texttt{t}} - types, \ldots'' - \> ``\ldots\ \u{\texttt{b}} \ldots'' - -\erroronpage{252}{para 2, l.3}{HjG}{2004/06/03}{2} - Missing word: ``\ldots\ the last entry in \u{a} row \ldots''\\ - Missing word: ``This specification may \u{be} saved \ldots'' - -\erroronpage{252}{para 3, l.1}{HjG}{2004/06/03}{2} - Either add: ``The |X| columns are set using the |p| column - \u{type}, \ldots''\\ - or change (cf.~l.2: an |m| column): ``\ldots\ using \u{a} |p| - column \ldots'' - -\seriouserroronpage{257}{syntax box~2}{HjG}{2004/06/03}{2} - Typo: ``\texttt{\char`\\botto\u{m}caption}'' - -\erroronpage{261}{para 3, l.3}{HPB/FMi}{2004/07/16}{2} -Add: ``\ldots may be typeset using - \u{the packages \textsf{array} and} \textsf{longtable} \ldots'' - -\erroronpage{262}{para -1, l.2}{HjG/FMi}{2004/06/04}{2} - Missing characters: - ``in standard \LaTeX{}\u{'s} \textsf{article} class'' - -\erroronpage{270}{exa 5-6-7}{DCa}{2004/07/22}{2} - Spurious `` d'' after ``Beef'' should be deleted. - -\seriouserroronpage{270}{para 3 l.1}{UFi}{2004/07/31}{2} - Change: |\botrule| \> |\bottomrule| - -\seriouserroronpage{271}{para 3}{FMi}{2004/12/17}{4} - Replace para by: ``By default, the rule extends all the way to the left, but is - ``trimmed'' from the rightmost column by the length specified in the - length parameter |\cmidrulekern|. The optional (\emph{trim}) - \u{argument may contain the characters - \texttt{l} and \texttt{r}, - indicating that the rule} - \u{is to be trimmed from the left or right, respectively.} - Each \texttt{l} and \texttt{r} may optionally be followed by a width - argument \u{specified using \texttt{\{}\emph{widths}\texttt{\}}}, - in which case the rule is trimmed by this amount rather than by the default - |\cmidrulekern|. - - -\seriouserroronpage{271}{syntax box~1}{HjG}{2004/06/04}{2} - Argument is optional, not mandatory: - |\addlinespace|\texttt{\u[}\emph{width}\texttt{\u]} - -\erroronpage{273}{para 3, l.3}{HjG}{2004/05/26}{2} - Missing word: ``not accounted for \u{by} |\multirow|'' - -\seriouserroronpage{278}{para 2, l.-1}{HjG}{2004/05/26}{2} - Replace: ``Section 6-3-4'' \> ``Example 6-3-4'' - -\erroronpage{279}{list, item 1}{CKr}{2004/11/30}{4} - Correct typo: ``forced line b\u{r}eaks.'' - - - -\CHAPTER{Chapter 6} - -\erroronpage{283}{para 2, l.5--8}{FMi}{2005/01/15}{4} -Replace with: ``We then continue by - explaining how you can define and use your own floating environments (Section~6.3.1), - or, conversely, how captioning commands can be used to enter - information into the list of figures and tables for nonfloating - material (Section~6.3.2). - Then methods for rotating the content of a float are described - (Section~6.3.3). - -\erroronpage{284}{}{FMi}{2005/01/15}{4} - Editorial comment: needs reprinting since one line moved from - 283 to the current page. - -\erroronpage{285}{item 3, l.3}{FMi}{2005/02/13}{4} - Use typewriter: ``the default is \texttt{12pt} - \texttt{plus} \texttt{2pt} \u{\texttt{minus}} - \texttt{2pt} for 10\,pt'' - -\erroronpage{285}{item 3, l.3}{HjG}{2005/02/06}{4} - Default for 12pt document size is given wrong:\\ - ``\texttt{\u{14pt} plus 2pt minus 4pt}'' \> - ``\texttt{\u{12pt} plus 2pt minus 4pt}'' - -\erroronpage{285}{item 3, l.4}{HjG}{2004/06/05}{2} - Should be singular: ``for 12pt document size\u{s}).'' - -\erroronpage{285}{item 7, l.3}{HjG/FMi}{2005/02/06}{4} - Replace (as it is rubbish): - ``(the default is like |\textfloatsep| on a text page, - but is |8pt plus 2fil| on a page that contains only floats)'' \>\\ - ``(the default is like |\textfloatsep|)'' - -\erroronpage{288}{para -1, l.4--7}{DAr/FMi}{2004/07/23}{2} - Replace part with: -``However, by itself this option -forces all floats to appear \emph{before} the next section material is -typeset, since the |\FloatBarrier| prevents a float from a current - section from appearing below -the start of the new section, even if some material of the current -section is present on the same page. '' - -\erroronpage{292}{para 4, ll.1/2}{HjG}{2004/06/05}{2} - Replace: ``combination \u{to}'' \> ``combination \u{of}'' - -\seriouserroronpage{292}{para -1, l-2}{FMi}{2005/01/08}{4} -Add sentence: - ``Because the float styles define the placement of the caption, -floats can contain only a single \verb=\caption= command which is a -restriction compared to standard \LaTeX's behavior.'' - -Also add marginal warning: ``Only one \verb=\caption= supported'' - - -\erroronpage{293}{para 1, l.3}{J-CCh}{2005/06/01}{4} -Remove surplus char: ``package documentation in -\texttt{float\u{s}.dtx}.'' - -\seriouserroronpage{293}{exa 6-3-1}{HjG/FMi}{2004/06/05}{2} - Wrong command used (or misplaced opening brace) in preamble code:\\ - |\newcommand\xmlcode[1]{\|\u{\ttfamily ttfamily}|{#1}}| - \>\\ - |\newcommand\xmlcode[1]{\|\u{\ttfamily texttt}|{#1}}| \\ - only by chance this doesn't do any harm in the example! - -\erroronpage{293}{exa 6-3-1}{CBe}{2004/07/27}{4} -The Euler constant must be typeset in roman type according -to the ISO rules; $e$ is the charge of the electron. - -\erroronpage{294}{exa 6-3-3}{HjG/FMi}{2004/06/05}{2} - The picture (|rosette.ps|) is clipped a tiny bit at the left side. - That's actually an error in the |.ps| file itself and can be seen - in all other examples where the file is used. - -\erroronpage{295}{para -2, l.3}{HjG}{2004/06/05}{2} - Missing word: ``The |[H]| \u{float} is \ldots'' - - -\erroronpage{298}{para 1, l.4}{AMa}{2005/01/13}{4} - The word ``caption'' should be should typeset in sans serif. - -\seriouserroronpage{298}{para 3, l.5}{HjG}{2004/06/06}{2} - Missing argument: ``|\newfloat{XMLexa}|% - \u{\texttt{\textbraceleft\meta{placement}\textbraceright}}|{lox}|'' - -\erroronpage{299}{para 2, ll.-2/-1}{HjG}{2004/06/06}{2} - Missing word: ``so that it \u{is} not worth'' - -\erroronpage{301}{exa 6-4-2}{HjG}{2004/06/06}{2} - Misspelled word (both in source and output):\\ - ``\texttt{ex-\u{s}ample}'' \> ``\texttt{ex-ample}'' - -\seriouserroronpage{302}{para 2, l.4}{HjG}{2004/06/06}{2} - Missing argument: ``|\newfloat{XML}|% - \u{\texttt{\textbraceleft\meta{placement}\textbraceright}}|{lox}|'' - -\erroronpage{304/305}{exa 6-4-4}{HjG}{2004/06/06}{2} - The |\FIG| command is different from the one from - exa 6-4-3 (p.303). - Add a line:\\ - |\newcommand\FIG{\includegraphics[width=10mm]{elephant}}|\\ - in the preamble part of the example's source.\\ - (But that will probably spoil your hand-optimized page breaks. --- - Actually it will improve them: by getting the example larger on - line will carry over from 304 to 305 avoiding the widow there - without changing that page otherwise) - -\erroronpage{307}{l.-4}{HjG}{2005/02/12}{4} - Surplus closing brace:\\ - ``|\makebox[\linewidth][c]{\usebox\@tempboxa}|% - |\par|\texttt{\u\textbraceright}|% single line|'' - -\iffalse -\erroronpage{307}{l.3--4}{CBe}{2004/07/27}{} -The Runaway error may be explained in a better way: the - \emph{short-text} cannot exceed one paragraph; the \emph{long-text} may be - several paragraphs long; if the optional argument \emph{short-text} is missing - the \emph{long-text} replaces it, therefore the macros that should process the - single paragraph \emph{short-text} get terribly shaken and produce the Runaway - argument error. A reference to Appendix~B and the long\slash short definition - of commands should be helpful. -\fi - -\erroronpage{309}{para 4, l.3}{DAl}{2005/06/29}{4} - Missing comma: ``\ldots you will get a typical ``standard \LaTeX'' - format\u{,} that is, \ldots'' - -\erroronpage{312}{\texttt{position} option}{JS/FMi}{2005/09/14}{4} - State that key \texttt{bottom} is the default. - -\erroronpage{312}{para 2, l.2}{DAl}{2005/06/29}{4} - Word in wrong position: ``for example, ``above'' the caption if - caption is \u{the} placed at the bottom.'' - \> - ``for example, ``above'' the caption if \u{the} caption is \ldots'' - -\erroronpage{317}{para -4, l.1}{HjG}{2004/06/06}{2} - Extra letter: ``The \textsf{subfig} package\u{s} \ldots'' - -\erroronpage{319}{para 1, l.5}{C-JCh}{2005/06/10}{4} - Incorrect right quote: ``numbers like ``11.3\u{''}\ldots'' - -\erroronpage{319}{para 2, l.3}{C-JCh}{2005/06/10}{4} - Incorrect right quote: ``such as ``Figure 1(a-c)\u{''}.'' - -\erroronpage{321}{exa 6-5-13, l.2}{HjG/FMi}{2004/06/06}{2} - Change value: - ``|listofindent=4em|'' \> ``|listofindent=5em|''.\\ - Looks better and also makes description on page 320 correct. - -\erroronpage{321}{para 3, l.2}{UFi}{2004/07/31}{2} -Remove: ``approach is to \u{to} specify\ldots'' - -\erroronpage{326}{para -1, l.4}{DAl}{2005/07/14}{4} - Missing letter: ``floats appear to\u{o} close to each other\ldots'' - - - -\CHAPTER{Chapter 7} - -\erroronpage{332}{para -2,l.2}{THa}{2004/07/21}{2} - SinCE SEriFS arE noT alwayS horizonTaL: ``Serifs are the tiny - horizontal strokes\dots'' \> ``Serifs are the tiny strokes\dots'' - -\erroronpage{338}{para -1, l.3}{HjG}{2004/06/29}{2} - Missing word: ``command \u{and} declarative forms'' - -\erroronpage{341}{para -2, l.-2}{HjG}{2004/06/29}{2} - Missing comma: ``such as |\OE|\u, to lowercase).'' - -\erroronpage{342}{tab 7.1}{CBe/FMi}{2004/07/27}{2} - Add footnote: ``\textit{The actual sizes shown above are those specially - tailored for use in this book}'' - -\erroronpage{347}{para 2, l.5+6}{JS/FMi}{2006/11/08}{s} -Replace: ``\u{Computer Modern Typewriter and} -Computer Modern Sans \u{have} only bold extended variants.'' -\> - ``\u{In contrast} Computer Modern Sans \u{has} only bold extended variants.'' - -\erroronpage{349}{Table 7.4}{AFV}{2008/08/08}{} -The font associated with the command |\mathtt| is a sans typewriter font. This -differs from nearly all TeX set ups where the math typewriter font is Computer -Modern Typewriter. - -\erroronpage{349}{para -1, l.2}{HjG}{2004/06/29}{2} - Missing comma: - ``\ldots\ where commands, such as |\rm|\u, would cause \ldots'' - -\erroronpage{351}{para -2, l.5}{HjG}{2004/06/29}{2} - Surplus word: - ``\ldots\ belongs to the text \u{the} surrounding the formula.'' - -\erroronpage{353}{para 4, l.2}{HjG}{2004/06/29}{2} - Replace: - ``\u{Extended} Computer Modern'' \> - ``\u{European} Computer Modern'' - -\erroronpage{354/355}{marginal 3}{FMi}{2004/04/23}{2} - Should be on top of page 355. - -\erroronpage{354}{table caption}{AFV/FMi}{2009/01/5}{} - Replace: ``Classification of the Computer Modern font families'' \> - ``Classification of \u{most} Computer Modern font families'' - as not all fonts are listed. - -\erroronpage{355}{para 4, l.2}{HjG}{2004/06/29}{2} - Missing character: ``on\u{e} can simply exchange'' - -\erroronpage{356}{para 2, l.2}{HjG}{2004/06/30}{2} - Correct: ``\u{ZE}-fonts'' \> ``\u{EZ}-fonts'' - (Index entry is OK!) - -\erroronpage{357}{exa 7-5-5, last line}{RSt}{2004/05/26}{2} - Reference [174] instead of [175]. - -\erroronpage{357}{exa 7-5-5}{HjG}{2004/06/30}{2} - Add page entries for ``Clasen, Matthias'', ``Vieth, Ulrik'', and - ``Ziegler, Justin'' to ``People'' index (pp.1080+1082) - -\erroronpage{357}{l.-2}{HjG}{2004/06/30}{2} - Add word: - ``Clearly, no one wants to type \u{text} like this \ldots'' - -\erroronpage{358}{para -1, l.1}{HjG}{2004/06/30}{2} - Change word order:\\ - ``The list of \u{currently} \u{supported encodings} by - \textsf{inputenc} \ldots'' \>\\ - ``The list of \u{encodings} \u{currently supported} by - \textsf{inputenc} \ldots'' - -\erroronpage{359}{several places}{MKu/FMi}{2004/06/24}{2} - Replace: ISO-8859 \> ISO 8859 - -\erroronpage{360}{item 8}{CKr}{2004/12/30}{4} - Replace: Next Computer encoding \> Ne\u{XT} Computer encoding - -\erroronpage{360}{item 9}{MKu/FMi}{2004/06/24}{2} - Replace: UTF8 \> UTF-8 - -\erroronpage{360}{para -1}{MKu/FMi}{2004/06/24}{2} - Replace: UTF8 \> UTF-8 (several times) - -\erroronpage{361}{para 2+3}{MKu/FMi}{2004/06/24}{2} - Replace: UTF8 \> UTF-8 (several times) - -\erroronpage{361}{l.-14}{CBe/FMi}{2004/07/27}{2} - Replace: ``preamble or the document class'' \> - ``document class, a package, or in the preamble'' - - -\erroronpage{362}{l.1}{HjG}{2004/06/30}{2} - Swap phrases:\\ - ``\ldots\ the user \u{in the preamble} \u{to load still - more encodings}.'' \\\>\\ - ``\ldots\ the user \u{to load still more encodings} - \u{in the preamble}.'' - -\erroronpage{362}{para 1, l.1}{SCo}{2004/05/17}{2} - Printing problem in some books: ``still'', second `l' only half visible. - -\erroronpage{367}{para 2, l.3}{CKr}{2005/01/03}{4} - Wrong font: ``old-style numerals by simply switching to the \u{\texttt{TS1}}'' - -\erroronpage{368}{para -4, l.3}{HjG}{2004/07/01}{2} - Change:\\ - ``\ldots\ only. \u{Only} real errors will be shown.'' \>\\ - ``\ldots\ only. \u{However,} real errors will be shown - \u{on the terminal}.'' - -\erroronpage{370}{para 2, l.-1}{RSt}{2004/05/26}{2} - Replace: ``ran run'' with ``\u{you ran}''. - -\erroronpage{370}{para 4, l.5}{HjG}{2004/07/06}{2} - Add: ``\ldots\ in one of the three \u{text font} categories.'' - -\erroronpage{371}{para 1, l.4}{HjG}{2004/07/06}{2} - Add: ``\ldots, such as via a call to |\usefont|\u{ (see Example - 7-6-1 below)}.'' - -\erroronpage{373}{first line of 7.6.1}{UFi}{2004/07/31}{2} - Remove ``the \u{the} fonts'' - -\erroronpage{373}{first para, l.-1}{BeB}{2004/06/28}{2} - ``collection'' is (at least seems to me) singular:\\ - Typo: ``appear'' \> ``appears'' - -\erroronpage{374}{`Bookman', l.1}{HjG}{2004/07/08}{2} - Typo: ``Bookman was originally design\u{ed} \ldots'' - -\seriouserroronpage{380}{para 1, l.4--5}{BMo}{2004/05/16}{2} - Better show octal numbers: ``\ldots starting positions like - \texttt{'254}, \texttt{'266}, \texttt{'300}, and \texttt{'312} - (i.e., in octal notation) in\ldots'' - -\erroronpage{380}{exa. 7-6-10}{J-CCh}{2005/07/06}{4} - Replace: AGEWMET\u{P}HTOS \> AGEWMET\u{R}HTOS - -\erroronpage{386}{para -1, l.2}{RWa}{2004/05/31}{2} - Replace ``the X Window\u{s} system'' with ``the X Window \u{S}ystem''. - -\erroronpage{387}{para -1, ll.3/4}{HjG}{2004/07/09}{2} - Missing word: ``\texttt{0.87478} should \u{be} used''\\ - -\iffalse -% no idea if we can fit that in: -\erroronpage{387}{para -1, ll.3/4}{HjG}{2004/07/09}{} - Value for 12\,pt? -\fi - -\erroronpage{388}{tab. 7.14}{HjG}{2004/07/09}{2} - Row~1: Thickness of vertical line between first two columns too - wide (printing problem). - -\erroronpage{388}{tab 7.14, l.-2}{RPa}{2004/09/14}{4} - Missing space between ``m,'' and ``bx'' in the middle column. - -\erroronpage{391}{tab. 7.15}{FMi}{2004/07/09}{2} - Row~1: Thickness of vertical line between first two columns too - wide (printing problem). - -\erroronpage{391}{tab 7.15, l.-2}{RPa}{2004/09/14}{4} - Missing space between ``m,'' and ``bx'' in the middle column. - -\erroronpage{392}{tab 7.16, l.3}{RPa}{2004/09/14}{4} - ``(bx)'' should be moved to the second column. - -\erroronpage{393}{tab 7.17, l.3}{RPa}{2004/09/14}{4} - Missing space between ``(it),'' and ``sc'' in the third column. - -\erroronpage{395}{exa 7-7-20}{HjG}{2004/06/22}{2} - Commands need to be swapped to match text:\\ - ``|\gothfamily| Swab'' \> ``|\swabfamily| Swab''\\ - ``|\swabfamily| Gothic'' \> ``|\gothfamily| Gothic'' - -\erroronpage{395}{exa 7-7-21}{TSS}{2004/05/25}{2} - The ``s'' in word ``dies'' should be the ``short s'' (ligature - ``s:'') since it occurs in a syllable-final position. -% others wrong??? -%According to page 765 of "The World's Writing Systems" (edited by P.T. -%Daniels and W. Bright, ISBN 0-19-507993-0, Oxford University Press, -%1996), a syllable-final "s" in fraktur text should be the "short s". - -\erroronpage{396}{para 3, l.5}{FMi}{2004/04/23}{2} - Should be: ``\ldots on the \u{third} line.'' - -\erroronpage{396}{exa 7-7-22}{TSS}{2004/05/25}{2} - The ``s'' in word ``dies'' should be the ``short s'' (ligature - ``s:'') since it occurs in a syllable-final position. - -\erroronpage{403}{para 1, ll.1/2}{HjG}{2004/07/09}{2} - Change: ``by using \u{G}lyph \u{C}hart'' - \> ``by using \u{the} \u{g}lyph \u{c}hart''\\ - (cf.\ para 3, l.1) - -\erroronpage{405}{para 3, l.4}{HjG}{2004/06/22}{2} - Missing word: - ``of \u{the} International Phonetic Alphabet (IPA)'' - -\erroronpage{405/406}{ll.-1/1/2}{HjG}{2004/06/22}{2} - Move closing parenthesis:\\ - ``\ldots (based on \ldots\ by Donald Knuth, \ldots \u).'' \> \\ - ``\ldots (based on \ldots\ by Donald Knuth\u), \ldots \,.'' - -\erroronpage{406}{exa 7-8-11}{HjG}{2004/07/09}{2} - Add comma (?): ``|k\ae{}t|\texttt{\u,}'' - -\erroronpage{407}{para -2, l.1}{BMo}{2004/05/16}{2} - Missing word: ``With popular fonts designed for use with \TeX{}, - the euro symbol \u{is} usually available\ldots'' - -\erroronpage{413}{para -2, l-1}{CBe}{2004/07/27}{4} - ``local guide''; I believe this is an obsolete concept, dating back to - the times when \TeX\ and \LaTeX\ were used on multitasking mainframes; - commercial distributions might still have a ``local guide'', but I have never - seen one. - - -\erroronpage{414}{footnote}{hv}{2008/10/30}{} -Replace: |\pcharpath| \> |\pscharpath|. - -These days the package |pst-char| has been integrated into |pst-text|. - -\erroronpage{416}{tab. 7.27}{HjG}{2004/07/09}{2} - Uppercase vs.\ lowercase in entries for \texttt{T3} and - \texttt{TS3}:\\ - ``\LaTeX{} \u{P}honetic \u{A}lphabet encoding'' $\leftrightarrow$\\ - ``\LaTeX{} \u{p}honetic \u{a}lphabet encoding'' - -\erroronpage{417}{para 4, l.6}{HjG}{2004/07/10}{2} - Correct case: - ``\ldots\ in front of it. \u For example,'' - -\erroronpage{418}{para 2, l.-2}{HjG}{2004/07/10}{2} - Add: - ``a typewriter font \u{in medium series} with italic shape'' - -\erroronpage{420}{table 7.28}{CKr}{2005/04/08}{4} - For consistency: ``narrow'' \> ``\u{N}arrow'' - -\erroronpage{420}{para 1, l.6}{FMi}{2004/06/24}{2} - Replace: ISO-9660 \> ISO 9660 - -\erroronpage{426}{para 1, l.-2}{CKr}{2005/01/17}{4} - Remove surplus: ``\ldots---other declarations that use this \u{the} - font will benefit automatically.'' - -\erroronpage{426}{para 1, last sentence}{CAR}{2005/01/22}{4} - Replace with following sentence: - ``This may seem like a strange usage but it has the advantage that when - such additional - fonts become available you will need to change - only one font shape group declaration---all declarations that - refer indirectly to these fonts will then benefit automatically.'' - - -\erroronpage{426}{para 5}{HjG}{2004/07/10}{2} - Surplus word: ``\ldots, this function \u{it} writes \ldots'' - -\erroronpage{426}{l.-2}{HjG}{2004/07/10}{2} - Add word: ``The \u{third} argument'' - -\erroronpage{428}{item 6}{CKr}{2005/01/18}{4} - Replace: ``Specified the quad width'' \> ``Specifie\u{s} the quad - width'' - -\erroronpage{432}{para 4, l.9}{HjG}{2004/07/11}{2} - Not plural: ``\ldots: the outer text size\u{s} and the three math - sizes for this text size.'' - -\erroronpage{433}{l.-10}{HjG}{2004/07/11}{2} - Not start of a sentence, hence \> lowercase: - ``\u{a}nd are usually placed in an \texttt{.fd} file.'' - -\erroronpage{441}{para 5, l.1}{MKu/FMi}{2004/06/24}{2} - Replace: UTF8 \> UTF-8 - -\erroronpage{442}{footnote, l.2}{usw}{2005/01/11}{4} - Sentence begins with lowercase 's'. - -\erroronpage{443}{para 1, l.1--2}{FMi}{2005/06/10}{4} -Replace the parentheses with: ``(for the latter people sometimes use -the single character \verb="=\,, but this is incorrect as it may -produce a straight double quote, i.e., ")'' - -\erroronpage{443}{para 3, l.4}{CKr}{2005/01/21}{4} - Correct order: ``Instead, these commands have been implemented in - \u{such a} way that \ldots'' - -\erroronpage{444}{para 2, l.4}{DAl}{2005/08/01}{4} - Missing word: ``\ldots associates the number 224 \u{with} the -command |\alpha|.'' - -\erroronpage{445}{para 4, ll.3--5}{HjG}{2004/07/12}{2} - Move closing parenthesis:\\ - ``\ldots, which normally denote certain accents (i.e., - are encoding-specific commands, but \ldots\ environment\u).'' - \\ \> \\ - ``\ldots, which normally denote certain accents (i.e., - are encoding-specific commands\u), but \ldots\ environment.'' - -\erroronpage{446}{footnote, l.1}{CKr}{2005/01/21}{4} - Correct order: \ldots ``\textthreesuperior'' \u{was a} - math glyph---comprehensible? - -\erroronpage{447}{Heading}{MKu/FMi}{2004/06/24}{2} - Replace: UTF8 \> UTF-8 - -\erroronpage{451}{para 4, l.2}{HjG}{2004/07/12}{2} - Wrong number: - ``\texttt{\u{'240}} octal'' \> ``\texttt{\u{'344}} octal'' - -\erroronpage{453}{para 2, l.2}{DAl}{2005/08/01}{4} - Missing word : ``\ldots an \emph{LICR-object} that is \u{to} be -used whenever\ldots'' - -\erroronpage{455}{para 3, l.-1}{JCh}{2004/07/17}{2} - Typo (characters need to be swapped): - ``L\u{CI}R'' \> ``L\u{IC}R'' - -\erroronpage{457}{tab. 7.33}{HjG}{2004/07/12}{2} - Wrong sort order (table rows need to be swapped):\\ - |\OE| $\leftrightarrow$ |\O| -- cf.\ |\o| and |\oe| on p.459 - -\erroronpage{457}{tab. 7.33}{HjG}{2004/07/12}{2} - Entry |\`i|: ``(\u{avail})'' \> ``(\u{alias})'' - -\erroronpage{458}{\texttt{\string\copyright}}{FMi/usw}{2005/01/11}{4} - Natively available in LY1 encoding - -\seriouserroronpage{458}{l. 27--30}{JLV}{2005/05/31}{4} - Unfortunately |\guillemotleft|, |\guillemotright|, |\guilsinglleft|, and - |\guilsinglright| have no ``default'' and only function in |OT1| if - \textsf{babel} is loaded - - -\erroronpage{458}{\texttt{\string\k} entries}{usw}{2005/01/11}{4} - All |\k| entries should be |<constr.>| in LY1 encoding - -\erroronpage{459}{\texttt{\string\r A}}{FMi}{2005/04/09}{4} - |\r A| is |<constr.>| in OT1 encoding - -\erroronpage{459}{\texttt{\string\r} entries}{usw}{2005/01/11}{4} - All |\r| entries should be |<constr.>| in LY1 encoding - -\erroronpage{459}{\texttt{\string\textcelsius}}{usw}{2005/01/11}{4} - Default from |constr./TS1|. - -\erroronpage{460}{\texttt{\string\textcopyright}}{usw}{2005/01/11}{4} - Natively available in LY1 encoding - -\erroronpage{460}{\texttt{\string\textdiv}}{usw}{2005/01/11}{4} - Natively available in LY1 encoding - -\erroronpage{460}{\texttt{\string\texteuro}}{usw}{2005/01/11}{4} - Defined in the newer versions of the encoding (but not available in - all fonts!) - -\erroronpage{460}{tab. 7.33}{HjG}{2004/07/12}{2} - Wrong sort order (table rows need to be swapped):\\ - |\textdblhyphenchar| $\leftrightarrow$ |\textdblhyphen| - -\erroronpage{461}{\texttt{\string\textlnot}}{usw}{2005/01/11}{4} - Natively available in LY1 encoding - -\erroronpage{461}{\texttt{\string\textpertenthousand}}{DAl}{2005/08/01}{4} - Constructed in T1 encoding - -\erroronpage{461}{\texttt{\string\textperthousand}}{DAl}{2005/08/01}{4} - Constructed in T1 encoding - -\erroronpage{461}{\texttt{\string\textpm}}{usw}{2005/01/11}{4} - Natively available in LY1 encoding - -\erroronpage{461}{table, l. -12}{usw}{2004/05/24}{2} - ``\verb=\textquotedblleft=" is indented by accident. - -\erroronpage{462}{\texttt{\string\texttimes}}{usw}{2005/01/11}{4} - Natively available in LY1 encoding - -\erroronpage{462}{tab. 7.33}{HjG}{2004/07/12}{2} - Wrong sort order (table rows need to be swapped):\\ - |\textthreequartersemdash| $\leftrightarrow$ |\textthreequarters| - -\erroronpage{463}{para 1, ll.1/2}{HjG}{2004/06/28}{2} - Add: ``prior \u{to} 1990'' - -\erroronpage{463}{para 1, l.2}{HjG}{2004/06/28}{2} - Change: - ``\ldots integrated in \u{1993})'' \> - ``\ldots integrated in \u{1994})'' - - -\CHAPTER{Chapter 8} - -\erroronpage{465}{para 4, ll.2+4}{HjG}{2004/06/20}{2} - Add page entry for ``Swanson, Ellen'' to ``People'' index - (p.1082). \\ - Add page entry for ``Knuth, Donald'' to ``People'' index - (p.1081). - - Editorial comment: no need for reprinting this page. - - -\erroronpage{466}{para 2, ll.3+6}{HjG}{2004/06/20}{2} - Add page entry for ``Spivak, Michael'' to ``People'' index - (p.1082).\\ - Add page entry for ``Jones, David'' to ``People'' index - (p.1081). - -\erroronpage{466}{para 3 l.1}{UFi}{2004/06/04}{2} - Remove comma: ``Michael\u, would have been\ldots'' - -\seriouserroronpage{468}{para 3, ll.10+11}{JTa}{2004/08/31}4{} - Extra closing brace after the second argument of - \texttt{\textbackslash newenvironment} on both lines. - -\erroronpage{471}{para 2, l.4}{VPe}{2004/06/02}{2} - Extra word: ``\ldots this change \u{can} are discussed\ldots'' - -\erroronpage{478}{exa 8-2-19}{CBe}{2004/07/27}{2} -Poor Maxwell's equations! No doubt there are mathematical - physicists or physical mathematicians that write Maxwell's equations that way. - This is a good example for showing some capabilities of the - \textsf{amsmath} package and its possible extensions by means of the - \comando{\newenvironment} command, but it is an example where all possible ISO - rules are violated! Physical equations deal with quantities, not with - mathematical variables; and quantities have dimensions; as such they have to - comply with the rules established by the Sisth\`{e}me International (SI) and the - various obsolete ``cgm'' systems are officially deprecated; the partial - derivative sign $\partial$ has exactly that meaning and it cannot substitute - the ``nabla'' $\nabla$ sign; finally the $j$ symbol probably indicates the - current density, but in an equation that does not comply with the ISO rules it - might indicate the imaginary unit (which, on the opposite, is prescribed to be - typeset in roman or upright shape as well as $\pi$); treating with vectorial - quantities these should be well marked either with a vector math accent or - must be set in bold italic; with variables depending from four quantities the - apex for indicating the derivative is not univocal for specifying the quantity - with respect to which the derivative is taken. I repeat: the example is good - for describing the math extension capabilities but it could induce the casual - reader to believe that this is the correct form for writing down the Maxwell's - equations; unfortunately it is not. - -\erroronpage{480}{para -2, ll.8/9}{HjG}{2004/06/20}{2} - ``(there must be no space before the \texttt[)'' --- why?\\ - (Would be ignored by \TeX{} as the end of the cs-name!) - - Deleted this text. - -\erroronpage{484}{para 3, ll.1/2}{HjG}{2004/06/20}{2} - Add word: ``\ldots\ the \texttt{equation} \u{environment} is -\ldots'' - -\erroronpage{488}{para 1, l.2}{HjG}{2004/06/20}{2} - Add word: ``\ldots\ as a subscript \u{or} superscript.'' - -\erroronpage{488}{para 1, l.1}{FMi}{2005/04/23}{4} - Replace word: ``Note that both \u{environments} \ldots'' - \> ``Note that both \u{structures} \ldots'' (as one is a command) - -\erroronpage{489}{para -2, l.3}{HjG}{2004/06/20}{2} - Missing closing parenthesis: ``(see Section 8.5.3\u)'' - -\erroronpage{489}{exa. 8-3-9.1}{DAl}{2005/08/21}{4} - The third array actually only needs \texttt{c} as preamble even - though \texttt{cc} is not wrong. as empty columns on the right are ignored - -\erroronpage{491}{para -2, l.3}{BMo}{2004/05/21}{2} - Replace: ``aside'' \> ``at the side'' - -\erroronpage{493--95}{ll.-1/-2}{HjG}{2004/06/21}{2} - Perhaps a note regarding the defaults should be added:\\ - ``The first two parameters, \emph{ldelim} and \emph{rdelim}, are - the left and right delimiters, respectively. - \u{They must be either both empty or both non-empty;} - \u{to place a single delimiter, use a period ``\texttt.'' on the - ``empty'' side.}'' - - Editorial comment: affects pagebreaks for 494/95 as well - -\iffalse % more blue align stuff -\erroronpage{498}{page}{FMi}{2004/04/23}{} - Printing problem: blue color not properly aligned. -\fi - -\erroronpage{499}{\S 8.6.2}{HjG}{2004/06/21}{2} - Change section heading: ``Operator \u{and function} names'' - -\iffalse % more blue align stuff -\erroronpage{500}{page}{FMi}{2004/04/23}{} - Printing problem: blue color not properly aligned. -\fi - -\erroronpage{501}{exa 8-6-4}{HjG}{2004/06/21}{2} - Surplus word (in source comment):\\ - ``\texttt{\% the old \u{the} definition of \textbackslash csc}'' - -\erroronpage{507}{footnote}{CKr}{2005/02/16}{4} - Good try but wrong word: ``Technically this is due to the denominator being - wider than the \u{numerator} in this case\ldots'' - -\seriouserroronpage{508}{table 8.6, col.5}{FMi}{2004/04/23}{2} - The bad alignment (in some books) of the blue color probably makes - the illustrations in this column useless. - -\iffalse % more blue align stuff -\erroronpage{510}{page}{FMi}{2004/04/23}{} - Printing problem: blue color not properly aligned. -\fi - -\erroronpage{511}{marginal note}{MHe}{2004/05/22}{2} - Swap words: ``\ldots change \u{the existing} math font - set-up'' - -\erroronpage{512}{para 3, l.6}{HjG}{2004/06/22}{2} - Surplus closing brace: - ``|\bm{\alpha}|\texttt{\u\textbraceright}'' - -\seriouserroronpage{513}{Figure 8.1}{LSchu}{2004/05/22}{2} - Text font is Times, but should be Computer Modern (rather - embarrassing that). - -\erroronpage{513}{para 3, l.1}{HjG}{2004/06/22}{2} - Change: ``In this section show a sample text'' \>\\ - ``In this section \u{we} show a sample text'' - -\iffalse % more blue align stuff -\erroronpage{513}{page}{FMi}{2004/04/23}{} - Printing problem: blue color not properly aligned. -\fi - -\erroronpage{515}{para 1, l.3}{HjG}{2004/06/22}{2} - Wrong reference: ``Figure~8.3'' \> ``Figure~8.2'' - -\erroronpage{515}{para -1, l.1}{BMo/CAR}{2004/05/21}{2} - Replace: ``The Metafont versions of Concrete Roman and Math\ldots'' - \> ``The Metafont versions of Concrete, both Roman and Math,\ldots'' - -\seriouserroronpage{516}{fig.~8.6}{CKr/FMi}{2005/02/18}{4} - The txfonts have the symbols |\succapprox| and |\precapprox| in the - wrong position in the fonts. - Until the fonts are corrected one can manually fix the problem by - redeclaring them after loading the \texttt{txfonts} package, i.e., -\begin{verbatim} -\usepackage{txfonts} -\DeclareMathSymbol{\succapprox}{\mathrel}{AMSb}{119} -\DeclareMathSymbol{\precapprox}{\mathrel}{AMSb}{118} -\end{verbatim} - -\erroronpage{517}{footnote}{FMi}{2005/06/03}{4} - Y\&Y has unfortunately folded and their domain was taking over by a - seller for ``latex'' clothing (interesting isnt it?). - Some information about Y\&Y can be found at - \texttt{http://www.tug.org/yandy}. - -\seriouserroronpage{518}{fig.~8.9}{CKr/FMi}{2005/02/18}{4} - The pxfonts have the symbols |\succapprox| and |\precapprox| in the - wrong position in the fonts. - Until the fonts are corrected one can manually fix the problem by - redeclaring them after loading the \texttt{pxfonts} package, i.e., -\begin{verbatim} -\usepackage{pxfonts} -\DeclareMathSymbol{\succapprox}{\mathrel}{AMSb}{119} -\DeclareMathSymbol{\precapprox}{\mathrel}{AMSb}{118} -\end{verbatim} - -\erroronpage{521}{para 2, l.3}{HjG}{2004/06/26}{2} - Missing interword space: ``Section\u~7.6.1'' - -\erroronpage{521}{footnote}{FMi}{2005/06/03}{4} - Y\&Y has unfortunately folded and their domain was taking over by a - seller for ``latex'' clothing (interesting isnt it?). - Some information about Y\&Y can be found at - \texttt{http://www.tug.org/yandy}. - -\seriouserroronpage{523}{figure 8.16}{MHe}{2004/05/22}{2} - The symbols to the left and right of ``Q(t)'' in the middle of - the figure are wrong (this is - actually a bug in the informal math set-up which has now been - corrected). - -\erroronpage{523}{figure 8.16, caption}{BMo}{2004/05/21}{2} - Replace: ``Info Math fonts'' with ``Informal Math fonts''. - -\erroronpage{523}{para 3, l.2}{HjG}{2004/06/26}{2} - Change:\\ - ``The HV math fonts \u{are} designed at MicroPress'' \>\\ - ``The HV math fonts \u{have been} designed at MicroPress'' - -\erroronpage{524}{para 1, ll.4--6}{HjG}{2004/06/27}{2} - Change:\\ - ``This \u{package} extends the \ldots\ font collections\u{ and} - should normally be loaded \ldots'' \>\\ - ``This \u{font} extends the \ldots\ font collections\u{; the - corresponding \textsf{stmaryrd} package} should normally be loaded - \ldots'' - -\erroronpage{524}{para 2, l.7}{HjG}{2004/06/27}{2} - The text states: ``\u{\raisebox{1ex}{\scriptsize(\emph{kernel})}} - identifies symbols \ldots''. However, later on only - ``\u{\raisebox{1ex}{\scriptsize(\emph{ker})}}'' is used. - [E.g., Table~8.10 on page~527 (|\hbar|) - and Table~8.11 on page~528 (|\angle|).] - -\erroronpage{524}{para 2, l.-3}{HjG}{2004/06/27}{2} - The text speaks of ``Alphabetic symbols'' -- but the referenced - Table~7.30 on page~435 calls it ``Alphabet character''~!? - -\erroronpage{524}{exa 8-9-1}{HjG}{2004/06/27}{2} - The |fleqn| option is used, but in the output, the two equations - seem to be right aligned rather than left aligned!\\ - Indeed true: this is because in \textsf{amsmath} the |\mathindent| - added on the left is - actually a rubber length (see page 471) that is automatically - shortend if there is not enough space. - -\iffalse % more blue align stuff -\erroronpage{524}{page}{FMi}{2004/04/23}{} - Printing problem: blue color not properly aligned. - -\erroronpage{525}{page}{FMi}{2004/04/23}{} - Printing problem: blue color not properly aligned. -\fi - - -\erroronpage{526}{para -1, l.1}{CKr/FMi}{2005/02/20}{4} -Change: ``The unaccented ASCII Latin letters and Arabic - numeral digits (see Table~8.8) \u{all} referred to\ldots'' - \> ``\ldots \u{are} referred to\ldots'' - -\erroronpage{527}{para 2, l.1}{HjG}{2005/05/21}{4} - Replace:\\ - ``in the first \u{columns} of Table~8.9'' \> - ``in the first \u{rows} of Table~8.9'' - -\erroronpage{527}{para 2, l.5}{HjG}{2004/06/27}{2} - Change: - ``Similarly, the list of lowercase Greek letters \u{there is} - no omicron'' \>\\ - ``Similarly, the list of lowercase Greek letters \u{contains} - no omicron'' - -\iffalse % more blue align stuff -\erroronpage{528}{page}{FMi}{2004/04/23}{} - Printing problem: blue color not properly aligned. -\fi - - \erroronpage{527}{table 8.10}{BMo/CAR}{2004/05/21}{2} - This table would be - better if reordered, in particular so that the first row - contains: \verb=\aleph \beth \gimmel \daleth=. This would - make the this text correct: ``The first four [entries in - table 8.10] are Hebrew letters.'' - - -\erroronpage{527,528}{table 8-10/11}{FMi}{2006/08/09}{s} - Added the missing symbol from amssymb: |\circledR|, |\yen|, - |\checkmark|, and |\maltese|. - - The general distribution of symbols between the two tables is a bit - questionable, but this will stay as it is. - -\erroronpage{528}{table 8-11}{HjG}{2004/07/13}{2} - Various deviations from alphabetical sort order of the table - entries. - -\erroronpage{528}{table 8.11}{LHe}{2008/02/08}{} - |\dag| and |\ddag| are |\mathord|s not |\mathbin| as claimed in table - 8.13. - - -\seriouserroronpage{529}{table 8.12, l.3}{JGr}{2004/06/10}{2} - \verb=\mathring{x}= is missing its accent. - -\erroronpage{529}{para 1, l.2}{CKr}{2005/04/24}{4} - Replace: ``looked up |\neq|'' \> ``looked up |\ne|\u{\texttt{g}}'' - -\erroronpage{530}{table 8-13}{HjG}{2004/07/13}{2} - Various deviations from alphabetical sort order of the table - entries. - -\erroronpage{530}{table 8.13}{LHe}{2008/02/08}{} - |\dag| and |\ddag| are not |\mathbin|s, hence don't belong in this table - and they - aren't (as claimed in legend) synonyms of |\dagger| - and |\ddagger| respectively. - -\erroronpage{531}{table 8.15}{BMo/FMi}{2004/05/21}{2} - The commands starting with |\var...| are only partially in blue to - indicate their relationship with those commands missing the ``var'' in their - names. But this is more confusing than helpful, so they are now made - fully blue. - -\seriouserroronpage{531}{table 8.15}{CAR/FMi}{2004/06/05}{2} - |\obar| is listed twice while |\obslash| (also from stmaryrd) is missing - -\erroronpage{531}{table 8-15}{HjG}{2004/07/13}{2} - Various deviations from alphabetical sort order of the table - entries. - -\seriouserroronpage{532}{tables 8-16, 8-17}{HjG}{2004/07/13}{2} - Since |\precsim| is not a negated symbol, it should be moved from - Table~8-17 to Table~8-16, where its sibling |\succsim| already - lives. - -\erroronpage{532}{tables 8-16/17}{HjG}{2004/07/13}{2} - Various deviations from alphabetical sort order of the table - entries. - -\erroronpage{532}{table 8.17}{CKr}{2005/02/22}{4} - Add: ``\ldots or, \u{if} flagged\ldots'' - -\iffalse % more blue align stuff -\erroronpage{533}{page}{FMi}{2004/04/23}{} - Printing problem: blue color not properly aligned. -\fi - -\erroronpage{533}{tables 8-18/19}{HjG}{2004/07/13}{2} - Various deviations from alphabetical sort order of the table - entries. - -\iffalse % more blue align stuff -\erroronpage{534}{page}{FMi}{2004/04/23}{} - Printing problem: blue color not properly aligned (horizontally). -\fi - -\erroronpage{534}{table 8-20}{HjG}{2004/07/13}{2} - Various deviations from alphabetical sort order of the table - entries. - -\erroronpage{534}{tab. 8.20}{HjG}{2004/06/28}{2} - 1. |\hookleftarrow| is listed twice.\\ - 2. Some ``compound'' symbols have different line widths in their - ``head'' and ``tail'' parts: - |\Longleftarrow|, |\Longmapsfrom|, |\Longmapsto|, |\Longrightarrow|. - - -\erroronpage{534}{table 8-21}{MBr}{2004/08/02}{2} - Various deviations from alphabetical sort order of the table - entries. - -\erroronpage{535}{table 8-22/23}{HjG}{2004/07/13}{2} - Various deviations from alphabetical sort order of the table - entries. - -\erroronpage{537}{table 8-27}{DIs/FMi}{2006/08/09}{s} - Added the four missing delimiters from amssymb: |\llcorner|, |\lrcorner|, - |\ulcorner|, and |\urcorner|. Updated the table note and galley text accordingly. - - -\CHAPTER{Chapter 9} - -\erroronpage{540}{para -2, l.6}{MKu/FMi}{2004/06/24}{2} - Replace: ISO-8859-x \> ISO 8859-x - -\erroronpage{540}{para -1, l.4}{FMi}{2004/07/20}{2} -Plural: ``Clearly, 8 bits \u{are} not sufficient\ldots'' - -\erroronpage{541}{para 1, l.-2}{MKu/FMi}{2004/06/24}{2} - Replace: UTF8 \> UTF-8 - -\seriouserroronpage{543}{table 9.1}{MHe/JBr}{2004/06/10}{} - The Babel implementation on the CD is missing the australian and - newzealand - options. If you need them, download a new version of Babel. - -\erroronpage{543}{table 9.1}{JBr/WaS}{2004/07/31}{2} - Replace: ``\texttt{english}, \texttt{USenglish} - (\texttt{\itshape american}, \texttt{\itshape canadian}), \texttt{UKenglish} - (\texttt{\itshape british}), \texttt{australian} (\texttt{\itshape - newzealand})'' - - Add footnote: ``\textit{The option \texttt{\upshape english} - combines American hyphenation patterns - with a British date format.}'' - - -\erroronpage{545}{exa 9-2-1}{JAn}{2005/09/09}{4} - The quotes surrounding R\'ef\'erences and Chapitre - should be the french ones: use |\og| and |\fg{}|. And similar those - around German words should use |"`| and |"'|. - - -\erroronpage{546}{para 3, l.4}{HjG}{2004/06/17}{2} - Typo: ``pattern\u{s}'' - -\seriouserroronpage{548}{para 2, l.4}{UFi}{2004/06/03}{2} - Replace: |\aliasshorthand{"}{/}| should be \verb=\aliasshorthand{"}{|}= - -\erroronpage{549}{para 1, l.5}{HjG}{2004/06/17}{2} - Characters should be in `typewriter font' (as in l.2):\\ - ``\,``;'' and ``?''\,'' \> ``\,``|;|'' and ``|?|''\,'' - -\erroronpage{550}{para -2, l.1--2}{CKr}{2005/02/28}{4} - Correct: ``Some are - meant to ease typing, wher\u{e}as others\ldots'' - - -\erroronpage{551}{tab 9.3}{CBe}{2004/07/27}{} - I am surprised that in Russian there is no word for ``Glossary''. - - Frank: It most certainly exits :-), but right now Babel doesn't - know about it---so there is nothing we can do about it at the - moment. Actually the same problem exists with Polish, although here - I got a translation ``s\l{}ownik termin\'ow'' which will eventually - find its way into Babel. - -\erroronpage{552}{exa 9-3-4}{CBe}{2004/07/27}{2} - The words \texttt{i"lusio} and il$\cdot$lusio in the example are - incorrect. They should be \texttt{i"lusi\string\'o} and il$\cdot$lusi\'{o} - respectively %(ref: TB 14-3-252-259) - - -\seriouserroronpage{553}{para 4}{UFi}{2004/06/03}{2} - - Replace with: ``Another popular shorthand is |"-|, which indicates a - hyphenation point (like |\-|), but without supressing - hyphenation in the remainder of the word:'' - -\erroronpage{553}{exa 9-3-8}{FMi}{2004/06/03}{2} - Replace the example body with: -\begin{verbatim} -\fbox{\parbox[t]{1cm}{minister"-president}} \quad -\fbox{\parbox[t]{1cm}{minister\-president}} \quad -\fbox{\parbox[t]{1cm}{ministerpresident}} -\end{verbatim} -to show the differences between |"-|, |\-|, and no hyphen. - -\erroronpage{553}{exa 9-3-9}{FMi}{2004/06/03}{2} - Replace the example body with: -\begin{verbatim} -1. \present{Gutenberg-Universit"at} -2. \present{Gutenberg"-Universit"at} -3. \present{Gutenberg""Universit"at} -4. \present{Gutenberg"=Universit"at} -5. \present{Gutenberg"~Universit"at} -\end{verbatim} - -\erroronpage{554}{para 4, l.2}{HjG}{2004/06/17}{2} - Replace: ``|~n~|\meta{letter}'' \> ``|~n|'' - and ``|~N~|\meta{letter}'' \> ``|~N|'' - -\erroronpage{554}{exa 9-3-11}{UFi/MGo}{2004/06/03}{2} - Replace body with: - ``|En fran\c{c}ais on doit mettre un \fg petit espace\fg\| - |devant la ponctuation double: comme cela!| - \ldots'' - -\erroronpage{556}{item 2, l.3}{HjG}{2004/06/17}{2} - Remove: - ``\ldots\u{, with the addition that also \texttt{'u} and - \texttt{'U} are made available}.'' -\iffalse -auf s.556 unten (1. item) steht, dass der ' fuer Catalan mit allen -vokalen verwendet werden kann; das gilt auch fuer Galician (2. item); -deswegen macht der u.g. nebensatz wenig sinn, denn U gehoert ja zu den -vokalen! -- war vielleicht 'N gemeint? (aber auch das wird bei -Galician schon erwaehnt!) -\fi - -\erroronpage{556}{para 4, l.2}{UFi}{2004/06/03}{2} - Correct spelling: ``\ldots optional \u{because} the acute accent has\ldots'' - -\erroronpage{557}{exa 9-3-19}{FMi/JBe}{2005/03/20}{4} - Replaced the example text with a spanish example showing 3 levels of - quotations. - -\erroronpage{558}{para -1, l.2}{UFi}{2004/06/03}{2} - Add comma: ``day, month\u, year'' - -\iffalse % alternative (but needs to change two pages) - Replace: - ``\ldots |\hebdate| to translate any Gregorian date, given \u{the three - arguments \emph{day}, \emph{month}, - and \emph{year},} - into a Gregorian date in Hebrew.'' -\fi - -\erroronpage{561--562}{para 2, l.-1; para 2, l.1}{BMo}{2004/05/16}{2} - The number 999999 (and 1000, in the second instance) should not - be written with a period as thousands-separator as this is - confusing for readers used to a different convention. - -\erroronpage{562}{para 2, l.1+2}{FMi/DPa}{2004/07/24}{2} - Change: ``digits \u{before the decimal point} are expressed'' \> - ``digits \u{denoting multiples of a thousand} are expressed'' - -\erroronpage{563}{l -18/-17}{CBe}{2004/07/27}{4} -The non zero \texttt{lccode} for the apostrophe is not - a speciality of the Italian language; this non null assignment is made at least - also for Catalan and for French; it should be done for all languages that use - the apostrophe for replacing an elided vowel. - -\seriouserroronpage{564}{table 9.5}{FMi}{2004/04/23}{2} - Add a note that the definition of \verb=\th= conflicts with its standard - definition as the LICR object ``\th{}'' (thorn). - -\erroronpage{564}{tab. 9.5}{HjG/FMi}{2004/06/18}{2} - In the `Serbian' column, ``|\sh| sh'' is listed twice; - replace the second instance with ``|\arsh| arsh''. - -\erroronpage{564}{para -1, l.5}{ERy}{2004/08/06}{2} - Change: ``helpfull'' \> ``helpful'' - -\erroronpage{565}{line 1}{JGr}{2004/06/16}{2} - Missing space in: Anotherlayout - -\erroronpage{569}{l.-2}{HjG}{2004/06/18}{2} - Misspelled name: - ``Andrew Janishe\u{w}sky'' \> ``Andrew Janishe\u{v}sky'' - (This affects p.1081, too!) - -\erroronpage{571}{l.1}{HjG}{2004/06/18}{2} - Replace: ``UNIX-like'' \> ``UN*X-like'' - (to match spelling elsewhere in the book) - -\erroronpage{571}{ll.3+4}{MKu/FMi}{2004/08/03}{2} - Change: ``ISO-IR-111'' \> ``ISO-IR~111'' \\ - and ``ISO-IR-144'' \> ``ISO-IR~144'' - -\erroronpage{571}{para 4}{HjG}{2004/06/18}{2} - Code page ``|mnk|'' listed twice. - -%\erroronpage{572}{page}{FMi}{2004/04/23}{} -% Printing problem: blue color not properly aligned. - -\erroronpage{573}{descr. env.}{HjG}{2004/06/18}{2} - Items \texttt{T2B:} and \texttt{T2C:} ``Crimean~Tatar'' \> ``Crimean-Tatar'' - -\erroronpage{573}{para 3, l.4}{HjG}{2004/06/18}{2} - Typo: ``pac\u{ak}ge'' \> ``pac\u{ka}ge'' - -\erroronpage{574}{para 6, l.1}{HjG}{2004/06/18}{2} - Replace: ``The |cb| font use\u{s} \ldots'' - \> ``The |cb| font\u{s} use \ldots'' - -\erroronpage{574}{para 7, l.2}{HjG}{2004/06/18}{2} - Replace: ``translation'' \> ``transliteration'' - -\erroronpage{575}{tab 9.7}{CBe}{2004/07/27}{2} - I do not recognize my \texttt{grmn1000} font table; at least - it is incomplete compared with the one that has been uploaded on CTAN in 2002, - well ahead of the publication of this Second Edition. - - (Unfortunately an older tfm file was used so that some glyphs do not - show up in the table) - -\erroronpage{576}{tab. 9.9}{HjG}{2004/06/18}{2} - Replace: ``Diaresis'' \> ``Dia\u{e}resis'' - -\erroronpage{576}{tab 9.9}{CBe}{2004/07/27}{2} -|<'otan| does not produce the Greek word on its right, - which was by mistake obtained with |<'o|\texttt{\'otan} - -\erroronpage{576}{tab 9.10}{CBe}{2004/07/27}{2} - In the first line all the examples with upper case letters - are wrong in the sence that these glyphs cannot appear in real text, - hence they are removed. - The last two lines are wrong with both lower and upper case - letters. The former error implies a hiatus between an initial capital letter - and a preceding vowel that by definition of ``initial'' is missing. The latter - error is related to the fact that spirit and accent are separated, the former - to the left of the vowel, the latter over the vowel. - - Part of the problems are due to a missing |\languageattribute{greek}{polutoniko}|. - -\erroronpage{579}{table 9.12, l.7}{HjG}{2005/06/02}{4} - Remove extra right brace: ``|\fontfamily{fr}|\u{\texttt{\textbraceright}}'' - -\seriouserroronpage{580}{example file \texttt{language.dat}}{WaS}{2004/06/14}{2} - \u{\texttt{us}}\texttt{english} \> \texttt{\u{US}english}\\ - \u{\texttt{uk}}\texttt{english} \> \texttt{\u{UK}english} - -\seriouserroronpage{580}{\texttt{language.dat} on CD}{WaS}{2004/06/14}{} -The language name problem, i.e., - - \u{\texttt{us}}\texttt{english} \> \texttt{\u{US}english}\\ - \u{\texttt{uk}}\texttt{english} \> \texttt{\u{UK}english} - -is also present in the language.dat file on -the book CD. - -\erroronpage{581}{para 2, l.2}{UFi}{2004/06/04}{2} - Six "languages" are loaded ...: seven? - -\erroronpage{581}{para 1, l.2}{WaS/FMi}{2004/06/14}{2} - Change: ``\ldots loaded first by INI\TeX{}; English in the example - above).'' - \> ``\ldots loaded first by INI\TeX{}); for compatibility reasons this language - should contain US-English hyphenation patterns.'' - -\erroronpage{581}{para 2, l.2}{WaS}{2004/06/14}{2} - Language names are to be corrected according to p.580. - -\iffalse -% no space. do what? probably nothing right now -\erroronpage{581}{para 2, l.3}{HjG}{2004/06/18}{} - Add a footnote to explain the meaning of the term - ``hyphenation trie''? -\fi - -\erroronpage{583}{para 1, l.1}{HjG}{2004/06/18}{2} - Wrong number: ``(line 32)'' \> ``(line 34)'' - -\erroronpage{583}{para 1, l.3}{HjG}{2004/06/18}{2} - Replace: ``\texttt{welsh.\u{sty}}'' \> ``\texttt{welsh.\u{ldf}}'' - -\seriouserroronpage{585}{}{CBe}{2004/07/27}{2} -The line:\\ - \comando{\adddialect\{austrian\}\{german\}}\\ - and the following one correspond neither to lines 102\textendash 103 of the language - skeleton, nor to the grammar of the \comando{\adddialect} on page 584; this - description as well as the skeleton file apparently require that the language - name be preceded by \comando{\l@}; in facts, for example, - the \texttt{germanb.ldf} contains the line:\\ - \comando{\adddialect}\comando{\l@austrian}\comando{\l@german} - -\seriouserroronpage{586}{code line 2}{TSS}{2004/05/26}{2} - Extra closing brace after \verb|\def\germanhyphenmins|. - -\seriouserroronpage{589}{syntax box}{UFi}{2004/06/04}{2} - Change: |\addto\csname[code]| \> |\addto\csname{code}| (wrong braces) - -\erroronpage{591}{para 1, l.5}{UFi}{2004/06/04}{2} - Extra character: ``The third argument, \emph{ex\u{c}ec}, contains\ldots'' - -\erroronpage{592}{para 3, l.2+4}{PPN}{2004/05/25}{2} - Replace: ``Panday'' \> ``Pand\u{e}y'' (sorry) - -\seriouserroronpage{592}{para 3, l.3}{PPN}{2004/05/25}{2} - Replace ``\textsf{bang}'' with ``\textsf{bengali}''. This - package is available on CTAN in the \textsf{languages/bengali/pandey}. - -\seriouserroronpage{592}{para 3, l.4 }{PPN}{2004/05/25}{2} - Replace ``\textsf{denag}'' with ``\textsf{devnag}''. - This package is on CTAN \texttt{languages/devanagari/velthuis}. - -\erroronpage{592}{para 5, l.1}{CKr}{2004/10/15}{4} - Replace: ``E\u{hit}opian'' \> ``E\u{thi}opian'' - -\erroronpage{592}{general remarks}{PPn}{2004/05/25}{} -Additional remarks not for inclusion in the book: For \TeX{}, \LaTeX{} -in languages of India, -there are several nice packages. An overview can be found in the -following {\sc TUGboat} Articles; - -\begin{enumerate} -\item Anshuman Pandey, \textsl{An overview of Indic Fonts for \TeX{}}, -{\sc TUGboat} Volume 19, Number 2 / June 1998 115---119 -\item Anshuman Pandey, \textsl {Typesetting Bengali in \TeX{}}, {\sc -TUGboat} Volume 20, Number 2, June 1999 119---126 -\item C. V. Radhakrishnan, \textsl{A case for \TeX{} in India}, {\sc -TUGboat} Volume 19, Number 1, March 1998, 6---9. -\item Karel P\'{\i}\v{s}ka, \textsl{A conversion of public Indic fonts -from METAFONT into Type I format with} {\sc TeX{}TRACE}, Volume -23, Number 1, 2002, 70---73 -\item -Yannis Haralambous and John Plaice, \textsl{Low-level Devan\=agari -support for Omega-- Adapting {\sf devnag}}, i -Volume 23, Number 1, 2002, 50---56 -\end{enumerate} - -In addition to these articles, TUGIndia has uploaded two -\LaTeXe{} packages (i) Malayalam for \LaTeXe{}, and (ii) Kannada -\LaTeX{}, both available from www.sarovar.org. - -A remark on {\sf devnag} package:-- Originally developed by Frans -Velthuis in 1991, it was upgraded for use with \LaTeXe{} (made -NFSS-complaint), and maintained by a team consisting of Dominik -Wujastyk, John Smith, Anshuman Pandey, Fran\c{c}ois Patte, and -Zden\v{e}k Wagner. Very recently, the project has -been handed over to TUGIndia, for further development, -and as of May 2004, it has moved from sourceforge.net to -sarovar.org. - - - -\CHAPTER{Chapter 10} - -\erroronpage{chap.10}{boxed texts}{HjG}{2004/06/08}{2} - In addition to what has been reported elsewhere, here's an overview - of some more inconsistencies in (some of) the ``syntax boxes'' of - this chapter. \\ - With parenthesized arguments, commas are part of the syntax; - hence they should be set in `typewriter font' (???). \\ - The space after these commas should also be uniform. - \\ \vspace{.5\baselineskip} - % - \begin{tabular}{@{}rrllp{44mm}@{}} \hline - page(s) & box(es) & comma & space & remark \\ \hline - 599 & & |\rm| & no & asterisk should be in |\tt| \\ - 602/3 & all & |\rm| & yes & ``...'' vs.\ ``\ldots'' \\ - 606 & 1 & |\rm| & no & ``...'' vs.\ ``\ldots'' \\ - 606 & 2 & |\it| & no & \\ - 607 & & |\rm| & yes & \\ - 608 & all & |\it| & no & \\ - 610 & 1--2 & |\rm| & yes & ``...'' vs.\ ``\ldots'' \\ - 616 & & |\it| & no & \raggedright - also in text after box! \\ - (ll.1+5 in first para) - \tabularnewline - 639 & & |\it| & no & \\ - 641 & 1--2 & $^*$ & no & \raggedright - $^*$various flaws; \\ - see separate error entry. - \tabularnewline \hline - \end{tabular} - - -\erroronpage{596}{para 4, l.2}{HjG}{2004/06/07}{2} - Replace: ``is the same as \u{those} produced'' - \> ``\ldots \u{that} \ldots'' - -\erroronpage{597}{para -1, l.-4/-3}{HjG}{2004/06/07}{2} - Replace: ``\ldots, in case \u{they are} changed'' - \> ``\ldots, in case \u{it is} changed'' - -\erroronpage{597/598}{para -1, l.-2}{HjG}{2004/06/07}{2} - Delete word: ``which again \u{that} expects one argument.'' - -\erroronpage{599}{boxed text}{CAR}{2004/05/26}{2} - The asterisk after |\fancyput| should be centred and the `(' and `)' - should be in typewriter. - -\seriouserroronpage{599}{boxed text}{HjG}{2004/06/08}{2} - Replace brackets by braces. (The \emph{horizontal-material} - argument is not an optional, but a mandatory one.) - -\erroronpage{600}{para 2, l.4}{HjG}{2004/06/07}{2} - Replace: ``\u{don't} work'' \> ``\u{does not} work'' - -\erroronpage{600}{exa 10-1-12}{GBa}{2004/07/28}{2} - The optional parameter ``[t]'' in the second example is printed as text -in line (1). - - Remove in code: ``\texttt{[t]}'' - - Append to previous paragraph: ``An optional position argument is not supported.'' - -\erroronpage{601}{l.-17}{CBe}{2004/07/27}{2} -Add word: Calculating the horizontal and vertical \u{distance} - -\erroronpage{602--603}{all boxed texts}{CAR}{2004/05/26}{2} - All the parentheses `(' and `)' (9 pairs in total) - should be in `typewriter font'. - -\erroronpage{604,605,609}{}{HjG}{2004/06/07}{2} - On p.604 (l. -2) and p.605 (ll. 1, 2) we have ``|join| - environment(s)''.\\ - On p.605 (ll. -6, -1) these are called ``|..join| environments''.\\ - On p.609 (para 3, l.5) it's ``|join| environments'' again. - -\erroronpage{606}{para 2, l.1}{HjG}{2005/05/16}{4} - ``The \textsf{epic} \ldots'' \> - either: ``\textsf{epic} \ldots'' - or: ``The \textsf{epic} package \ldots'' - -\erroronpage{606}{para 3, l.1}{HjG}{2004/06/07}{2} - Delete comma and move word:\\ - ``This command\u{, which} is a variant \ldots\ command, allows - \ldots'' \>\\ - ``This command is a variant \ldots\ command, \u{which} allows - \ldots'' - -\erroronpage{606}{second boxed text}{CAR}{2004/05/26}{2} - Brackets should also be in `typerwriter font'. - -\erroronpage{606}{para -1}{HjG/FMi}{2005/05/19}{4} - The arguments ``\textit{$\Delta$width}'' and - ``\textit{$\Delta$height}'' are mistakenly used in math mode. In - the book that means a differnt font and different kerning. - -\erroronpage{606--608}{all boxed texts}{CAR}{2004/05/26}{2} - All the parentheses `(' and `)' (9 pairs in total) - should be in `typewriter font'. - -\erroronpage{609}{}{FMi}{2004/06/07}{2} - Editorial comment: reprinted see earlier summary entries. - -\erroronpage{610}{first two boxed texts}{CAR}{2004/05/26}{2} - All the parentheses `(' and `)' (6 pairs in total) - should be in `typewriter font'. - -\erroronpage{612}{exa 10-1-25}{PYu/FMi}{2004/07/05}{2} - The |\protect| in front of |\footnotesize| (twice) is not necessary. - -\erroronpage{613}{para 1, ll.2/3}{HjG}{2004/06/21}{2} - Citations disrupt sentence!\\ - ``\ldots\ bundle [48,49] or [57, Chapter~6] for \ldots'' \> \\ - ``\ldots\ bundle \u{(see }[48,49] or [57, Chapter~6]\u)''\\ - and move the parenthesised citations to the end of the sentence. - -\erroronpage{614}{para 1, l.4}{HjG}{2004/06/07}{2} - Missing closing quotes: - ``the ``extended\u{\strut''} or ``enhanced'' \ldots'' - -\erroronpage{615}{Tab.\ 10.1}{FMi}{2006/10/21}{s} -The important driver ``vtex'' is missing. On the other hand -some of the listed drivers are only of historical interest. - -\erroronpage{616}{boxed texts}{FMi}{2004/05/26}{2} - Corrections as outlined in summary entry above. - -\erroronpage{618}{boxed text}{CAR}{2004/05/26}{2} - Replace: ``\textit{key val list}'' \> ``\textit{key/val-list}'' - (also in following text). - -\erroronpage{619}{viewport}{BMo/FMi}{2007/10/20}{s} - Explanation of \texttt{viewport} key changed to better explain that it only - changes the space reserved but doesn't prevent printing the whole graphic - (unless \texttt{clip} is used additionally) - -\erroronpage{620}{editorial change}{FMi}{2007/10/20}{s} - Text changes on previous page results in different page break. - -\erroronpage{620}{para 1, l.1; para 2, l.1}{HjG}{2004/06/07}{2} - Replace: - ``the first \u{seven} keys'' \> ``the first \u{eight} keys''\\ - ``The first \u{nine} keys'' \> ``The first \u{ten} keys'' - -\erroronpage{620}{para 5, l.2}{FMi}{2005/04/27}{4} - Replace: - ``\ldots in the \u{optional arguments}.'' \> - ``\ldots in the \textit{key/val-list}.'' - -%\erroronpage{621}{page}{FMi}{2004/04/23}{} -% Printing problem: blue color not properly aligned. - -\erroronpage{623}{para 1, l.7}{HjG}{2004/06/07}{2} - Delete word: ``some \u{of} key combinations'' - -\erroronpage{623}{boxed text}{CAR}{2004/05/26}{2} - Replace: ``\textit{key val list}'' \> ``\textit{key/val-list}'' - (also in following text). - -\erroronpage{630}{para 3, l.3}{UFi}{2004/06/01}{2} - Replace: ``the next |\parbox| examples'' \> ``the next - \u{\texttt{tabular}} examples'' - -\erroronpage{631}{para.2, l.6}{FMi/HjG}{2006/10/22}{s} - Ersetze: "`\u{This point} is shown \ldots"' \> - "`\u{This} is shown \ldots"' - -\erroronpage{631}{para -1, l.-1}{JBr}{2004/08/02}{2} - Replace: ``\textit{key val}'' \> ``\textit{key/val}'' - -\erroronpage{632}{fig. 10.2}{HjG}{2004/06/07}{2} - The horizontal extent of the box is called ``|length|'' \> - probably better: ``|width|''.\\ - Missing standalone horizontal specs: - ``|[l]|'' $\equiv$ ``|[lc]|''; - ``|[r]|'' $\equiv$ ``|[rc]|''. - -\erroronpage{632}{boxed text}{CAR}{2004/05/26}{2} - Replace: ``\textit{key val list}'' \> ``\textit{key/val-list}'' - -\erroronpage{633}{para 1, ll.4/5}{HjG}{2005/05/16}{4} - Add character: ``A matrix \ldots\ appear\u{s} below.'' - -\erroronpage{633}{l.-2}{HjG/DPa}{2004/06/07}{2} - Replace: ``The material in the section can be compared to - Sebastian\ldots'' \> - ``The material in this section is similar to that of Sebastian\ldots'' - -\seriouserroronpage{633}{example}{HjG}{2006/10/21}{s} - The first column shows incorrect output: instead of x=0mm it uses some - internal default. - -\erroronpage{634}{editorial change}{FMi}{2006/10/21}{s} - Fix on previous page will change page break. - - -\erroronpage{637}{footnote 2}{FMi}{2004/06/12}{2} - Bug in \texttt{url.sty} generated extra space. - -\erroronpage{639}{boxed text}{HjG}{2004/06/08}{2} - The parentheses `(' and `)' should be in `typewriter font'. - -\erroronpage{640}{para -1, l.-2}{HjG}{2004/06/07}{2} - ``the second |\vector| is truncated'' \> - ``the second |\vector| is not rendered correctly'' - -\erroronpage{641}{first two boxed texts}{HjG}{2004/06/08}{2} - The parentheses `(' and `)' around ``x1,y1'' (3 pairs in total) - should be in `typewriter font'.\\ - All coordinates should be in (math) italic with subscripts - (cf., e.g., pp.607/610): $x_1$, $y_1$, $x_2$, $y_2$. - -\seriouserroronpage{641}{para 2 l.1}{UFi}{2004/06/01}{2} - Replace: ``between points (x1,y2)'' \> ``between points (x1,\u{y1})'' - -\erroronpage{641}{syntax boxes}{FMi}{2004/06/01}{2} - The variable parts do not show the right fonts. - -\erroronpage{641}{para 3, l.1}{ReSt}{2005/04/17}{4} - Remove: ``The |\Curve| command\u{s} is similar\ldots'' - -\erroronpage{641}{para 3, l.2}{HjG}{2004/06/07}{2} - Second occurrence of mandatory argument should use the same font as - the first one, i.e., ``\textit{m}'' instead of ``\texttt{m}''. - -\seriouserroronpage{641}{para 4, ll.2/3}{HjG}{2004/06/07}{2} - Change sentence:\\ - ``Like |\linethickness|, it is an absolute value \u{in points} - (i.e., not affected by |\unitlength|)\u{ with the unit omitted}.'' - \>\\ - ``Like |\linethickness|, it is an absolute value (i.e., not - affected by |\unitlength|)\u{, given in any of \LaTeX's units}.'' - -\erroronpage{642}{item 6, l.2}{ReSt}{2005/04/28}{4} - Remove: ``font information \u{information} to allow\ldots'' - -\seriouserroronpage{643}{para 4, l.3}{MSc}{2004/06/04}{2} - delete ``,and .gif'' - -\erroronpage{643}{para 3, l.1}{FMi}{2005/11/11}{s} - Unfortunately Th\`anh's name is mispelled. The correct spelling - is ``H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh''. - -\erroronpage{643}{para 4, l.5}{CBe}{2004/07/27}{2} -Add: ``\ldots can be converted to PDF by -ImageMagick's \texttt{convert} utility\u{, \texttt{eps2pdf}} (\u{both -of} which call \texttt{ghostscript} -internally), \texttt{Acrobat Distiller}, or\ldots'' - -\erroronpage{646}{l.1}{HjG/FMi}{2004/06/08}{2} -Add: - ``(If the \texttt{dvi} file contains more than one -page several output files are generated.)'' - - -\CHAPTER{Chapter 11} - -\erroronpage{651}{1st example}{PYu}{2004/07/01}{2} - ``Page 9 :'' should be typeset ``Page 9:''. - -\erroronpage{652}{2nd example}{HjG}{2004/06/10}{2} - Missing colon: ``Page 22\u{\strut:}'' - -\erroronpage{652}{l.-3}{HjG}{2004/06/10}{2} - Surplus words: ``The latter case \u{is for} allows for \ldots'' - -\seriouserroronpage{654}{para 2 l.7}{UFi}{2004/06/01}{2} - Missing |}|: ``like - |\index{\texttt{|\emph{key}|}|\u{\texttt{\textbraceright}} and'' - - - -%That's a nice one: somehow the copy-editor has but the output is one -%of the few remaining graphics in the book, sigh - -\seriouserroronpage{656}{figs. 11.3+4}{HjG}{2004/06/10}{2} - The text on p.649, l.1 claims: - ``Figures 11.3 and 11.4 on page 656 show the input and generated - output of a small \LaTeX{} document, \ldots, together with the - result of including the \textsf{showidx} package \ldots'' - This does not quite hold: There are some differences in the text - and the output of \textsf{showidx} contains some index entries not - present in the source. - -\vspace{.5\baselineskip} - % -\hspace*{-100pt}\begin{minipage}[b]{\linewidth} - \begin{tabular}{@{}lll@{}} \hline - \multicolumn{3}{c}{Differences in the text} \\ \hline - & source (fig. 11.3) & output (fig. 11.4) \\ \hline - \S1 & \ldots actually written into that file \u{only} \ldots - & \ldots actually \u{only} written into that file \ldots \\ - \S2 & \u{To} prepare the index \ldots - & \u{In order to} prepare the index \ldots\\ - \S2 & \ldots, \u {such as} \ldots - & \ldots, \u{like} \ldots \\ - \S3 & \ldots by \u{the index processor} \ldots - & \ldots by \u{\texttt{makeindex}} \ldots \\ \hline - \multicolumn{3}{c}{Missing index entries} \\ \hline - & \multicolumn{2}{l}{include index} \\ - & \multicolumn{2}{l}{Final production run} \\ - & \multicolumn{2}{l}{makeindex@\texttt{makeindex} program - \emph{(2nd instance)}} \\ \hline - \end{tabular} -\end{minipage} - -\vspace{.5\baselineskip} -The source has now been edited to match the printed output. - - -\erroronpage{656}{}{CBe}{2004/07/27}{s} - How horrible the page rotated counterclockwise! - -\erroronpage{657}{\texttt{-p} item, l.-1}{HjG}{2004/06/10}{2} - Add word: ``\ldots the three \u{special} cases \ldots'' - -\erroronpage{660}{tab 11.1, note}{JMH}{2005/08/06}{4} - Swap the words ``single'' and ``double'' - -\iffalse -% not a bug make it look nicer -\erroronpage{661}{tab. 11.2, right col.}{HjG}{2004/06/10}{} - Inter-line spacing in multiple-line entries ???\\(Keywords: - |headings_flag|, |item_x1|, |delim_0|, |page_precedence|) -\fi - -\erroronpage{661}{tab. 11.2, l.12}{JMH}{2005/08/06}{4} - The identifier referred is ``\texttt{heading\_flag}'', but the - desciption uses the word ``\texttt{flag}''. - - -\erroronpage{662}{l.6}{RPa}{2004/09/14}{4} - The |-p| option is described on page 657. - - -% in short rnaRA is correct -\seriouserroronpage{664/665}{para -2/-1}{HjG}{2004/06/10}{2} - Confusion: default value of |page_precedence|:\\ - In para~\mbox{-2}, l.\mbox{-1}: - ``\ldots; the default is |rRnaA|, as noted in Table~11.2 on - page~661.'' - But in that table, ``|"rnaRA"|'' is given!\\ - In para~\mbox{-1}, l.\mbox{-2}: - ``\ldots\ default |page_precedence| of |rnaRA| \ldots''!\\ - (Also note that the remarks on p.666, para~2, suggest |rRnaA|, - referring to the same table as above.) - -Changed to consistently refer to rnaRA. - -page 666 changed to reflect rnaRA:\\ -`` \ldots\ assumes that pages numbered with lowercase Roman -numerals precede those numbered with Arabic numerals, which in turn -precede those numbered with the lowercase alphabet, uppercase Roman -numerals and finally the uppercase alphabet. - - -\seriouserroronpage{661/664-5}{}{FMi}{2005/08/14}{4} - - Confusion: the changes made in the second printing were wrong! The - default for |page_precedence| is |rRnaA| after all. (Or more - precisely: the program code shows |rnaRA| as the default but that - value is never used and the program logic implements |rRnaA| -- what - a mess.) - - Most of that section rewriten to better explain the limitations of - MakeIndex in the area of ``funny'' page numbers. - - -\seriouserroronpage{666}{para 4 l.5 and l.6}{UFi}{2004/06/01}{2} - Add extra visual space in second index: ``Likewise, - \verb*=\index{a space}= and - \verb*=\index{a space}= produce\ldots'' - -\erroronpage{668}{boxed text}{HjG}{2004/06/10}{2} - Slight inconsistency (also in subsequent text: para~\mbox{-2}): - File arguments named ``\emph{idx1 idx2 \ldots}'' -- as opposed to - pp.~655 and~674, where they're named ``\emph{idx0 idx1 \ldots}''. - -\erroronpage{669}{para 3}{JS}{2004/07/24}{2} - Since xindy ignores all macros, it has no problems at all with - formatting macros, but more problems with macros producing text. - Substituted this paragraph with: - - ``\texttt{texindy} ignores unknown - \TeX{} commands by default under the assumption that they do not - produce text. It also knows about typical text-producing commands - like \verb=\LaTeX= and \verb=\BibTeX= and handles them correctly. - If you have your own command definition that produces text, or if you - use one supplied by a package, then the entry is sorted - incorrectly. You will either need to specify an explicit sort key - in your index entry, as in \verb=\index{prog@\Prog}=, or write a - \texttt{xindy} style file with a merge rule, as explained in - Section~11.3.4. - - Be aware that producing index entries in arguments of commands has - its own pitfalls, e.g., in - \verb=\command{Properties of \Prog\index{\Prog}}=. - Then \LaTeX{} commands might be expanded - before they are written to the \texttt{idx} file and the placement - in the index will depend on the expansion of \verb=\Prog=.'' - -\erroronpage{669}{para -2, l.3}{MKu/FMi}{2004/07/01}{2}% already done by fmi - Add: ``\ldots \verb|\usepackage[latin1]{inputenc}| to all her - documents \u{(or on recent Linux distributions the - option \texttt{utf8})}, while\ldots'' - -\erroronpage{669}{section 11.3.2, para 2, L.3}{JMH}{2005/08/06}{4} -"*her* documents": why a female *her*? - -\erroronpage{670}{table 11.3}{TMW/JS}{2004/06/07}{2} - texindy can only work with Latin scripts out of the box. Removed - all other languages, and checked list of supported languages with - current xindy ``\LaTeX{} Companion Release''. - -\erroronpage{671}{para 2}{JS}{2004/06/07}{2} -Replace with: ``There are about 50 predefined languages available, 35 of them are -readily usable with \texttt{texindy}. They are listed in -Table~11.3 on the facing page; you select one of them with the -\texttt{texindy} option~\texttt{-L}. The other predefined -languages have non-Latin scripts, their usage is described in the -\texttt{xindy} documentation. - - -\erroronpage{672}{table 11.4}{TSS/JS/CAR}{2004/05/26}{2} - The \verb|word-order| module has two essentially equivalent - descriptions. The |letter-order| module doesn't mention that - it's turned on by texindy option \texttt{-l}. Use ``so-called'' as - an example for |ignore-hyphen|. Add table footnote ``When two - entries are identical except for ignored characters, those - characters are not ignored any more.'' - -\erroronpage{673}{para 5, ll.2/3}{HjG}{2004/06/10}{2} - Words need to be swapped: - ``multiple \u{characters may} form a unit'' - -\erroronpage{674}{para 1 l.1}{UFi}{2004/06/01}{2} - Extra word: ``those \u{of} available'' - -\erroronpage{674/675}{boxed text and item list below}{JS}{2004/07/24}{2} - Add option |[-C codepage]|. Add explanation between option |-L| - and |-q|: ``Use \textit{codepage} as internal base - encoding for sorting. This is used for fine-grained control of language - module selection, needed only for non-Latin scripts.'' - -\erroronpage{675}{example code}{JS}{2004/07/24}{2} - Exchange xindy example style file with one that works. (Half of the - lines were problematic in subtle ways.) - -\erroronpage{679}{example 3, para after the source}{JMH}{2005/08/06}{4} - \texttt{:define-attributes} \> \texttt{define-attributes} - -\seriouserroronpage{679}{descr of theindex}{DSch}{2005/05/23}{4} - Comparing the code in TLC2 with \texttt{book.cls} made me realize -that the |\columnsep| command must come \emph{before} |\twocolumn| in -order to have the desired effect. - -\seriouserroronpage{680}{descr of theindex}{DSch}{2005/05/23}{4} - Comparing the code in TLC2 with \texttt{book.cls} made me realize -that the |\columnsep| command must come \emph{before} |\twocolumn| in -order to have the desired effect. - -\erroronpage{680}{First code block}{AFV}{2006/01/13}{s} - Correct: |\mark|\texttt{\u k}|both| \> - |\markboth| - -\erroronpage{681}{para 1 of \S 11.4.3, l.2}{HjG}{2004/05/26}{2} - Extra word: ``augments \u{the} \LaTeX's indexing mechanism'' - - -\CHAPTER{Chapter 12} - -\erroronpage{general}{several pages}{HVo/FMi}{2004/05/21}{} - The German word ``Schuldrecht'' is incorrectly hyphenated as - ``Schul\-drecht'' in several examples due to the fact that English - hyphenation patterns are used unless the language is - explicitly marked. This is a deliberate effect, see pages 719 and - 733--734. - -\erroronpage{683}{para 3, l.1}{HjG}{2004/06/12}{2} - Missing word: - ``The chapter begins \u{with} a short introduction \ldots'' - - -\erroronpage{684/685}{exa 12-1-2, l.-2 of source}{BMo/FMi}{2004/05/16}{2} - ``But then it might not'' should be ``But then they might not'' - for parallelism with the ``Multiple authors'' to which it is - referring. - - Also changed: ``Multiple authors'' \> ``Entries with multiple - authors'' - so that it is clear that not the authors are a problem (though - come to think of it: given the example's authors\ldots) - -\erroronpage{685}{exa 12-1-1/2}{FMi}{2004/06/20}{2} - Editorial comment: due to the modification of the \BibTeX{} data - base \texttt{tex.bib} on page 690 the example output will change - slightly in a reprint. - - -\erroronpage{687}{para 1}{FMi}{2004/08/03}{2} -Add: ``Depending on the layout produced by the class, -it may result in \u{a normal space,} some extra space\u, or in starting a new line.'' - -\erroronpage{688}{figure 12.1}{JMH}{2005/07/18}{4} - Replace in first item: |\cite| \> |\citation| - -\erroronpage{690}{entry test97}{HjG/FMi}{2004/06/18}{2} - Add ``\texttt{and others}'' to the author field. Otherwise the - example explanations in chapter 13 (pages 793--797) are - partially wrong. - - Editorial comment: This change will affect the output of a - number of examples in chapter 12 as well. - -\erroronpage{691}{syntax box}{HjG}{2004/06/13}{2} - Set commas in `typewriter font' - -\erroronpage{694}{para 3, l.2}{HjG}{2004/06/13}{2} - Missing comma: `\,``see [2--3,7\u,13]''\,' - -\erroronpage{696}{para 1, l.1}{DAl}{2005/08/21}{4} - Missing word: ``\ldots option \u{is} shown in Example 12-2-9\ldots'' - -\erroronpage{697}{para 3, l.5}{HjG}{2004/06/13}{2} - Move period: `\,``Ref\u{''.}\,' \> `\,``Ref\u{.''}\,' - -%%\erroronpage{702}{para 2, l.2}{BMo}{2004/05/16}{} -%% ``Evidently'' does not seem to me to be quite the right word here. -% -% not convinced yet /FMi - -\erroronpage{705}{exa 12-3-17/18}{FMi}{2004/06/20}{2} - Editorial comment: due to the modification of the \BibTeX{} data - base \texttt{tex.bib} on page 690 the example output will change - slightly in a reprint. - -\erroronpage{705}{para 3, l.5}{TMi}{2004/08/27}{4} - Replace ``Geophysics'' with ``Geophysical''. - -\erroronpage{707}{exa 12-3-22}{FMi}{2004/06/20}{2} - Editorial comment: due to the modification of the \BibTeX{} data - base \texttt{tex.bib} on page 690 the example output will change - slightly in a reprint. - -\erroronpage{707}{exa 12-3-22, l.-2 of source}{BMo}{2004/05/16}{2} - ``But then it might not'' should be ``But then they might not'' - for parallelism with the ``Multiple authors'' to which it is - referring. - - Also changed: ``Multiple authors'' \> ``Entries with multiple - authors'' - - -\erroronpage{708}{para 3, l.6}{UFi}{2004/05/27}{2} - Replace: ``situati\u{ui}n'' \> ``situation'' - -\erroronpage{708}{para 4, l.1}{HjG}{2004/06/14}{2} - Add: ``when using \u{the} \texttt{chicago} \u{\BibTeX\ style}.'' - -\seriouserroronpage{710}{para 4, l.2}{BMo}{2004/05/16}{2} - Replace: - ``locate the printed version.'' \> ``locate the - article within the journal.'' - -\erroronpage{713}{para 1, l.3}{HjG}{2004/06/14}{2} - Replace: ``|\citep|'' \> ``|\citealp|'' - -\erroronpage{717}{para 1, l.4}{JMH}{2005/07/18}{4} -Add word: ``If you \u{only} want to specify an \textit{annotator}, -\ldots'' - -\seriouserroronpage{719}{para 4, l.-2/-1}{UFi}{2004/05/27}{2} - Extra word: ``the \u{the} journal'' \\ - Correct explanation: ``\ldots the journal name\u{, volume number,} - and year of publication, which is why we got ``TUGboat \u{10 - [}1989\u]''.'' - -\seriouserroronpage{719}{syntax box}{HjG/FMi}{2004/06/14}{2} - Order of optional arguments are like |\cite| (i.e., swapped):\\ - |\citetitle[|\emph{post-note}|]{|\emph{key(s)}|}| or - |\citetitle[|\emph{annotator}|][|\emph{post-note}|]{|\emph{key(s)}|}|\\ - |\cite*[|\emph{post-note}|]{|\emph{key(s)}|}| or - |\cite*[|\emph{annotator}|][|\emph{post-note}|]{|\emph{key(s)}|}| - -\seriouserroronpage{722}{para 2, ll.2/3}{HjG}{2004/06/14}{2} - Correct explanation: ``\ldots is always ``author name, journal, - \u{volume,} and year''.'' - -\seriouserroronpage{723}{syntax box}{HjG/FMi}{2004/06/14}{2} - Order of optional arguments are like with |\cite|:\\ - |\fullcite[|\emph{post-note}|]{|\emph{key(s)}|}| or - |\fullcite[|\emph{annotator}|][|\emph{post-note}|]{|\emph{key(s)}|}| - -\erroronpage{726}{para 3, l.2}{HjG}{2004/06/14}{2} - Delete comma: - ``\ldots\ when used together\u, with \ldots'' - -\seriouserroronpage{727}{para 3, l.-3}{JBe}{2004/06/01}{2} - Replace: \texttt{\textbackslash jbnovarioref} \> - \texttt{\textbackslash jbignorevarioref} - -\erroronpage{727}{examples 12-5-21/22}{FMi}{2004/06/03}{2} - Not wrong, but it looks funny: due to the chosen example height the - footnote from the previous page (not shown) is partially carried - over so we get ``43311-7'' as the first item in the footnote. That - is the last part of the ISBN number see example 12-5-20. - - Previous page enlarged by one line to avoid this. - \verb|\AtBeginDocument{\enlargethispage*{\baselineskip}}| - added to (hidden) preamble commands. - -\erroronpage{729}{para 1, l.-1}{HjG}{2004/06/14}{2} - Correct: ``to ``Ibid.\u{, \S\,3}''.'' - -\seriouserroronpage{730}{example 12-5-28}{UFi}{2004/05/27}{2} - Citation 7 and 8 are similar, but the description above says - something else... - - To correct this mistake and to better show what happens, the example - was changed to contain a slightly different set of citations (same - change was made to example 12-5-27): -\begin{verbatim} - Full citations: \cite{aschur} \cite{bschur} - not shown on the left! -\newpage - text \cite[\S\,7]{aschur} text - \cite[\S\,8]{aschur} \cite[\S\,16]{zpo} - text \cite[\S\,7]{bschur} \cite{aschur} - text \cite[\S\,3]{zpo} -\end{verbatim} -And the text above the example was changed as follows: - - ``If \texttt{name\&title\&auto} was selected (either implicitly or -explicitly), then the following happens: the first citation of a -publication automatically displays the full entry (citation~5 in the -next example). In case of repeated citations to unambiguous works -only the name of the author(s) are shown (citation~8). For ambiguous citations -this will be done only for immediately following citations -(citation~4). However, if there are -intervening citations, then the name(s) and short titles are shown -(citations~3, 6, and~7).'' - -\erroronpage{731}{para 1, l.4}{HjG/FMi}{2004/06/15}{2} - Correct/change to: ``that \u{two} - citation\u{s} \ldots\ \u{are} actually wrong:'' - -\erroronpage{732}{para 3. l.2}{JMH}{2005/07/18}{4} -Replace: ``in which case \u{the first} cross-reference \ldots'' -\> ``in which case \u{a} cross-reference \ldots'' - -\erroronpage{734}{para 1, l.2}{CKr}{2005/05/7}{4} - Correct: |\bibgerman| \> |\bib|\u{\texttt s}|german| - -\erroronpage{734}{para 2, l.-1}{CKr}{2005/03/24}{4} - Remove surplus letters: ``get the correct\u{ion} hyphenation.'' - -\seriouserroronpage{741}{l.-5}{HjG}{2004/06/15}{2} - Missing closing brace: - |\renewcommand\opcit{\textit{supra}|\u{\texttt{\textbraceright}} - -\seriouserroronpage{743}{item 3}{UFi}{2004/05/27}{2} - Equal sign missing: \texttt{sortkey\u{ = }"Bismarck, Otto von"}. - -\erroronpage{744}{exa 12-5-48/49}{HjG}{2004/06/15}{} - There's a spurious space before all occurrences of - ``\textsc{D. E. Knuth}''! \\ This is (partly, ie in the footnote) - due to a missing percent in the definition of |\@realcite| and - |\@printbibliography| in the camel package. Seems that a problem - with the volume parsing in camel is the reason for the surplus - spaces showing up in the bibliography output. Reported to the - author. - -\erroronpage{745}{ll.3/4}{HjG}{2004/06/15}{2} - Missing metaness:\\ - ``\ldots\ \texttt{jobname.tts}'' \> - ``\ldots\ \meta{jobname}\texttt{.tts}''\\ - ``\ldots\ \texttt{jobname.lts}'' \> - ``\ldots\ \meta{jobname}\texttt{.lts}'' - -\erroronpage{746}{tab 12.2}{HjG}{2004/06/15}{2} - Replace (`bibtopic' column, row 4; `multibib' column, row 7):\\ - ``no'' \> ``No'' - -\erroronpage{746}{Tab. 12.2}{THa}{2004/06/21}{2} - Change ``Requires tailored .bib files'' \> ``Works with standard - .bib files'' - (and change matching row entries) - -\erroronpage{746}{Tab. 12.2}{THa}{2004/06/21}{2} - Change: ``Above typeset together somewhere'' \> - ``Group bibliographies together'' - -\erroronpage{749}{para -1, l.1}{THa}{2004/06/22}{2} - Missing accents: ``Jose Alberto Fernandez'' \> ``Jos\'e Alberto - Fern\'andez'' - -\erroronpage{750}{para -3, l.-2}{CKr}{2005/03/31}{4} - Delete surplus word: ``\ldots as \u{the} the auxiliary files would be - overwritten.'' - -\erroronpage{752}{para 1, l.-1}{HjG}{2004/06/15}{2} - Delete backslash: - ``\ldots in an \texttt{\u\textbackslash article} class).'' - -\erroronpage{753}{para 4, l.5}{HjG}{2004/06/15}{2} - Replace: ``|\bibliography|'' \> ``|\bibliographystyle|'' - -\seriouserroronpage{755/756}{}{THa}{2004/06/21}{2} - Wrong limitation of multibib: The whole passage from ``A final - difference'' up to ``|nocite|.'' should be replaced with something - like: ``The multibib package (since version 2.3 of 2004/01/24) is - compatible with most other packages that provide extensions to the - cite mechanisms, including \textsf{cite}, \textsf{natbib}, and - {jurabib}. Moreover, the package provides a general interface which - allows to add arbitrary extensions of cite commands to be recognized - by \textsf{multibib}.'' - - Editorial comment: change affects pagebreak position. - -\erroronpage{756}{Ex. 12-6-10}{THa/FMi}{2004/06/21}{2} - Replace source text with: - |\LaTeX{} offers an interface to include|\\ - |graphics \citelatex{LGC97}. \LaTeX's|\\ - |default citation scheme is| \\ - |number-only \cite{vLeunen:92}.|\\ - i.e., move/remove the sentence periods. This should not affect the - output as the superscript is moved and double periods are removed. - - -\CHAPTER{Chapter 13} - -% perhaps -\erroronpage{758}{para 3, ll.1/2}{HjG}{2004/06/16}{2} - Delete word: ``\ldots\ to look for - \u{management} tools that help in managing such databases.'' - -\erroronpage{758}{para 4}{HjG/FMi}{2004/06/16}{2} - Add+change: ``Once everything is under control, we return in - \u{Section~13.5} to the task of typesetting -and look at how different \BibTeX{} styles can be used to produce -different bibliography layouts from the same input. As there may not -be a suitable style for a particular set of layout requirements -available, Section~\u{13.5.2} discusses how to -generate\ldots'' - -\erroronpage{763}{tab. 13.1}{HjG/FMi}{2004/06/16}{2} - In the explanation for \texttt{misc}, replace:\\ - ``(i.e., the entire field is empty)'' \> - ``(i.e., the entire entry is empty or has only ignored fields).'' - -\erroronpage{764}{para -3, l.-1}{HjG}{2004/06/16}{2} - Add: ``following a field \u{name (and \texttt= sign)}'' - -\erroronpage{765}{tab. 13.2}{HjG}{2004/06/16}{2} - In the explanation for \texttt{type}:\\ - l.2: Add word: - ``For the \u{entry} type \texttt{phdthesis} \ldots''\\ - l.3: Punctuation is not part of string: - ``|type = "{Ph.D.} dissertation|\texttt{\u.}|"|'' \> - ``|type = "{Ph.D.} dissertation"|\u.''\\ - l.5: Punctuation is not part of strings:\\ - ``\texttt{chapter = "1.2\u," type = "Section\u."}'' \> \\ - ``\texttt{chapter = "1.2"}\u{ and} \texttt{type = "Section"}\u.'' - -\erroronpage{765}{`key's description, l.1}{JMH}{2005/06/29}{4} -Remove ``cross-referencing'': cross-referencing just uses key appearing in -|\cite| commands. - -\erroronpage{766/767}{several places}{DAl}{2005/09/12}{4} - Replaced ``Miguel Lopez Fernandez'' by ``Miguel Parra Benavides'' - as the original name would really require accents that are not yet - discussed at this point. - -\erroronpage{766}{para 6, l.1 }{UFi}{2004/05/27}{2} - Move comma: Fernandez\u{,''} should be Fernandez\u{'',} - -\erroronpage{767}{l.7}{SPe}{2007/05/21}{s} -``Miguel Parra Benavides'' is missing closing quotes. - -\erroronpage{767}{l.10}{SPe}{2007/05/21}{s} -``Parra'' and ``Benavides'' are missing closing quotes. - -\erroronpage{768}{para 4, l.4}{UFi}{2004/05/27}{2} - Replace: ``(see Section 13.2.2)'' \> ``(see below)'' \\ - After all we are in 13.2.2 :-) - -\erroronpage{770}{para 1, l.1}{HjG}{2004/06/16}{2} - Replace: ``text \u{field} of \BibTeX\ \u{entries}'' \> - ``text \u{part} of \BibTeX\ \u{fields}'' - -\seriouserroronpage{771}{verb. text}{HjG}{2004/06/16}{2} - Surplus closing brace: - ``|"\providecommand\url[1]{\texttt{#1}}|\texttt{\u\textbraceright}|"|'' - -\erroronpage{771}{l.-3}{HjG}{2004/06/16}{2} - Change: ``different sorting rules from English'' \> - ``sorting rules different from those of English'' - -\erroronpage{772}{l.-5}{HjG}{2004/06/16}{2} - Shell command line should be underlined (as on pp.~775--778). - -\erroronpage{773}{para 3, ll.2/3}{HjG}{2004/06/16}{2} - Change: ``put \u{from \BibTeX}\ into the \texttt{.bbl} file'' \> - ``put into the \texttt{.bbl} file \u{by \BibTeX}'' - -\seriouserroronpage{773}{para 3, ll.-1}{HjG}{2004/06/16}{2} - Change: ``and \u{an} additional \LaTeX\ run'' \> - ``and \u{two} additional \LaTeX\ run\u{s}'' - -\erroronpage{773}{para -2, l.3}{HjG}{2004/06/16}{2} - Add: ``articles and book\u{s}'' - -\erroronpage{775}{para -2, l.1}{HjG}{2004/06/16}{2} - Change font: ``in the \texttt{\u{string}} parameter'' \> - ``in the \emph{\u{string}} parameter'' - -\erroronpage{777}{program output}{FMi}{2004/08/03}{2} -After changing the bib file this line comes out as: -\begin{verbatim} -%% "EX/tex.bib", line 92: Unexpected value in ``year = "1980ff"''. -\end{verbatim} - -\erroronpage{777}{para -1, l.-3}{HjG}{2004/06/16}{2} - Change: ``all \u{entries} are examined'' \> - ``all \u{fields of an entry} are examined'' - -\erroronpage{777}{para -1, l.-2}{HjG}{2004/06/16}{2} - Change: ``value part of the \u{entries}'' \> - ``value part of the \u{fields}'' - -\erroronpage{778}{para 4,l.2}{JMH}{2005/07/18}{4} - Replace: ``\texttt{year=1980ff}'' \> ``|year={1980ff}|'' - -\erroronpage{779--784}{throughout}{HjG}{2004/06/16}{2} - Shell command lines should be underlined (as on pp.~775--778). - -\erroronpage{779}{para 3, l.2/3}{HjG}{2004/06/16}{2} - Add: ``one ore more \BibTeX\ databases as its argument\u{(s)}'' - -\erroronpage{779}{footnote 2}{HjG}{2004/06/16}{2} - Add second hyphen: ``after the \texttt{-} option.'' - \> ``after the \texttt{-\u-} option.'' - -\erroronpage{780}{top}{FMi}{2004/08/03}{2} - Spurious space on top of page. - -\erroronpage{784}{para 1, l.-1}{HjG}{2004/06/16}{2} - Typo (forgotten backslash!?): - ``Progpybliographer'' \> ``\textsf{pybliographer}'' - -\erroronpage{787}{l.2}{HjG}{2004/06/16}{2} - Shell command line should be underlined (as on pp.~775--778). - -\erroronpage{787}{para -2, l.1}{CKr}{2005/04/20}{4} - Remove surplus letter: ``The \textsf{JBibtexManager} program - develop\u{p}ed by Nizar Batada'' - -\erroronpage{788}{fig. caption}{FMi}{2004/05/14}{2} - Add: The \textsf{JBibtexManager} workspace with the \u{(German locale)} - -\erroronpage{788}{footnote}{FMi}{2004/04/23}{2} - Replace: ``Most of these restrictions have been lifted in the - new version of JBibtexManager.'' - -\erroronpage{789}{para 2, l.1}{FMi}{2004/04/23}{2} - Replace: ``\ldots are kept unchanged but they are - neither visible nor modifiable from within the program.'' \\ - \> - ``\ldots are neither visible nor modifiable - except when using the ``raw \BibTeX'' mode in the newest version of - the program. '' - - -\erroronpage{789}{para 3}{FMi}{2005/06/02}{4} -Replace whole paragraph with: -``The program is not available on CTAN. Its current home is -\texttt{http://jabref.sourceforge.net/}, where it was merged -with a similar project called \textsf{BibKeeper} -under the new name \textsf{JabRef}.'' - -\erroronpage{789}{para 5, l.3}{FMi}{2004/05/14}{2} - Small rewrite: - The only ``foreign'' export formats supported are \texttt{.bbl} files - \u{and \texttt{.htm} files} (i.e., processing a selection of entries with - \BibTeX{} or \BibTeX8 from within the program and producing HTML - from a selection of entries\u{)}. - -\erroronpage{791--793}{tab 13.4}{HjG}{2004/06/16}{2} - \texttt{apa.bst} -- add: - ``American Psychology Association \u{\BibTeX\ style}'' \\ - \texttt{jmb.bst} -- add: - ``\emph{Journal of Molecular Biology} \u{\BibTeX}\ style''\\ - Some journal names are written in italic, other's aren't: - Astronomy; Behavioral and Brain Sciences; Human Biology. - - -\erroronpage{793}{para 1, l.2}{SN}{2004/06/11}{2} - Remove surplus word: ``using another \u{the} \BibTeX{} style''. - -\erroronpage{793}{para 2,l.5}{DAl}{2005/09/03}{4} - Remove comma: ``\ldots wich will show us\u{,} how different\ldots'' - -\erroronpage{794}{exa 13-5-1/2}{FMi}{2004/06/20}{2} - Editorial comment: due to the modification of the \BibTeX{} data - base \texttt{tex.bib} on page 690 the example output will change - slightly in a reprint. - -\erroronpage{795}{exa 13-5-3/4}{FMi}{2004/06/20}{2} - Editorial comment: due to the modification of the \BibTeX{} data - base \texttt{tex.bib} on page 690 the example output will change - slightly in a reprint. - -\erroronpage{795}{para 2, l.2}{JMH}{2005/07/18}{4} - Replace: ``author's name'' \> ``authors' names'' - -\seriouserroronpage{795}{para 2, ll.4/5}{HjG}{2004/06/18}{2} - The text states: ``Also note the interesting label produced for the - reference with more than three authors.'' \\ - However, example 13-5-4 cannot show this, as there are only three - authors (item~[GUD97]). - -\erroronpage{796}{exa 13-5-5/6}{FMi}{2004/06/20}{2} - Editorial comment: due to the modification of the \BibTeX{} data - base \texttt{tex.bib} on page 690 the example output will change - slightly in a reprint. - -\seriouserroronpage{796}{para 1, ll.-2/-1}{HjG}{2004/06/18}{2} - The text states: ``Note that the entry with more than three authors - has now been collapsed, showing only the first one.'' \\ - Again, example 13-5-5 does not show this, as there are only three - authors, and all three are shown (item~[5]). - -\seriouserroronpage{797}{para 3, l.3}{HjG}{2004/06/18}{2} - Replace: - ``\ldots; as a result, we get an incomplete \u{first} entry.'' \> - ``\ldots; as a result, we get an incomplete \u{second} entry.'' \\ - (Obviously, the citation of \texttt{LGC97} has been added to - example 13-5-7 \emph{after} this text was written.) - -\erroronpage{797}{exa 13-5-7}{FMi}{2004/06/20}{2} - Editorial comment: due to the modification of the \BibTeX{} data - base \texttt{tex.bib} on page 690 the example output will change - slightly in a reprint. - -\erroronpage{798}{tab 13.5, l. 1-2}{MSch}{2006/01/06}{s} - Replace: ``Erwin'' \> - '`Ervin'' - -\erroronpage{798}{para 1, l.3}{CKr}{2005/04/23}{4} - Remove surplus word: ``\ldots, then it is all that \u{it} is necessary.'' - -\erroronpage{800}{Citation scheme,l.2}{DAl}{2005/09/03}{4} - Replace letter: ``\ldots different questions th\u{a}n if you - choose\ldots'' - -\erroronpage{802}{para 2, l.4}{HjG}{2004/06/17}{2} - Replace: ``derivation'' \> ``deviation'' - -\erroronpage{802}{para -1, l.3}{FMi}{2005/06/02}{4} - Replace wrong braces: - ``|\urlprefix\url[|\textit{field-value}|]|'' \> - ``|\urlprefix\url{|\textit{field-value}|}|'' - -\erroronpage{803}{para -2, l.2}{HjG}{2004/06/17}{2} - Replace: ``in the second phase of the \u{formatting}'' \> - ``in the second phase of the \u{processing}'' - - -\erroronpage{806}{list, item 3}{UFi}{2004/06/01}{2} - Extra character: ``Printed in the order in which the\u{e} - references\ldots'' - -\erroronpage{806}{para -3}{FMi}{2005/06/02}{4} - Move this paragraph to the bottom of the page since it is really an - explanation about the functions defined for each publication type. - -\erroronpage{808}{table 13.8}{JMH}{2005/07/18}{4} - Replace description for |int.to.chr$| with: - ``Translates integers into a characters using the ASCII mapping'' - -\erroronpage{810}{\texttt{fin.entry} example}{HjG}{2004/06/17}{2} - Replace in ``\emph{After Modification}'' part (2~times): - ``|\sc|'' \> ``|\scshape|'' - -\erroronpage{811}{para 2, l.3}{HjG}{2004/06/17}{2} - Replace: ``at the beginning of this section'' \> - ``on the facing page'' - - - -\CHAPTER{Chapter 14} - -\erroronpage{814}{para 6, l.1}{HjG}{2004/06/08}{2} - Delete doubled word: - ``The most important \u{important} commands \ldots'' - -%% not really a bug but inconsistent -\erroronpage{814}{para -1, l.-2}{HOb}{2004/05/28}{2} - Explicitly show spaces: \verb*=% \iffalse= \ldots\ \verb*=% \fi= - -\erroronpage{815}{syntax boxes 2+3}{HOb}{2004/05/28}{2} - For clarification the argument of |\DescribeMacro| and that of - |\begin{macro}| should both start with a |\|. - -\erroronpage{816}{para -3, l.4+}{HOb}{2004/05/28}{2} - Change sentence: - Note that \u{such short forms for \texttt{\textbackslash verb}, - just} like \texttt{\textbackslash verb} itself, - cannot appear in the argument of another command, but - \u{the characters} may be used - freely inside \texttt{verbatim} and \texttt{macrocode} environments. - -\seriouserroronpage{820}{para 2, last line}{DHL}{2004/05/16}{2} - Change to: ``lines 1, 2, and \u{4} if \texttt{Bname} is also -asked for, and lines 1, \u{3}, and 4 otherwise.'' - -\erroronpage{820}{para 3, l.5}{HOb}{2004/05/29}{2} - Remove surplus space: ``behind \%\u{~} signs\ldots'' - -\erroronpage{820}{table 14.1}{HOb}{2004/05/29}{2} - Entries not sorted correctly: swap |\CheckSum| and |\CheckModules| - -\seriouserroronpage{821}{descr.\ of - \ttfamily\textbackslash DeleteShortVerb}{UFi}{2004/05/23}{2} - \verb=\MakeshortVerb= should be \verb=\Make=\u{S}\texttt{hortVerb}\\ - \verb=\MakeshortVerb*= should be \verb=\Make=\u{S}\texttt{hortVerb*} - -\erroronpage{821}{table 14.1}{HjG}{2004/06/08}{2} - As suggested by HOb (p.815): - ``|\DescribeMacro{\|\emph{cmd}|}|'' and - ``|\begin{macro}{\|\emph{cmd}|}|''. - -\erroronpage{822}{table 14.1, entry 2}{HjG}{2004/06/08}{2} - |\meta{|\emph{arg}|}| ``Print \u{the} argument \ldots'' - -\erroronpage{822}{table 14.1, entry 3}{HOb}{2004/05/29}{2} - Replace with: \verb=\SpecialEscapechar{\=\emph{char\/}\verb=}= - -\seriouserroronpage{822}{table 14.1, entry -2}{HOb}{2004/05/29}{2} - Wrong default: ``(default |*|)'' \> ``(default |!|)'' - -\erroronpage{823}{table 14.1}{HjG}{2004/06/08}{2} - As suggested by HOb (p.815): - ``|\SpecialIndex{\|\emph{cmd}|}|'', - ``|\SpecialMainIndex{\|\emph{cmd}|}|'', and - ``|\SpecialUsageIndex{\|\emph{cmd}|}|''. - -\seriouserroronpage{824}{table 14.1, entry 6}{HOb}{2004/05/29}{2} - Typo: |\MakePercentCommand| \> |\MakePercentComment| - -\erroronpage{825}{para 3, l.1}{THa}{2004/06/25}{2} - ``\% sign'' \> ``|%| sign'' - -\erroronpage{825}{para 5, l.1}{THa}{2004/06/25}{2} - ``target'' \> ``target machine'' - -% making the syntax box bigger affects next page as well: -\seriouserroronpage{826/827}{code box}{UFi/FMi}{2004/05/24}{2} - Closing brace of \verb=\generate{...}= is missing. Also it would be - better if the box shows that several |\file| commands can be used. - -\erroronpage{826/827}{para -1\slash para 2}{HjG}{2005/05/15}{4} - The descriptions referring to the syntax box do not characterize - the changed contents of that box (due to a previous error report). - - Not only a single \textit{result-file} is possible:\\ - ``Within the argument to |\generate| you specify the - \textit{result-file} you want to produce by using a |\file| - declaration.'' - - The text ``as given above'' does no longer hold:\\ - ``With the syntax specification for |\generate| as given above, - you can produce one \textit{result-file} from one or more - \textit{source-files}.'' - -\erroronpage{826}{l.2}{HjG}{2005/02/26}{4} - Replace: LaTeX \> \LaTeX{} - -\erroronpage{826}{para -2, l.-3}{HjG}{2004/06/08}{2} - Add: ``only the code piece\u{s}'' - -\erroronpage{827}{para 2, l.-1}{HjG}{2005/05/15}{4} - ``source files'' \> ``\emph{source-files}'' - -\erroronpage{827}{}{FMi}{2004/06/08}{2} - Editorial comment: reprinted because of pagebreak changes. - -\erroronpage{828}{para 3, l.2}{DHL}{2004/05/16}{2} - Extra word: ``If so, \u{case}'' \> ``If so,'' - -\seriouserroronpage{829}{syntax box}{HOb}{2004/05/29}{2} - |\preamble|, |\endpreamble|, |\postamble|, and |\endpostamble| all - have to be on lines by themselves, so the displayed syntax is a bit - misleading (to say it nicely). - -\erroronpage{829}{para -2, l.-2/-1}{HjG}{2004/06/08}{2} - Add word: ``in \u{the} \textsc{docstrip} package documentation'' - -\erroronpage{830}{para 4, ll.5/6}{HjG}{2004/06/08}{2} - Change: - ``In addition, the user \u{has configured} the \textsc{docstrip} - program \ldots'' \> - ``\ldots\ \u{has to configure} \ldots'' - -\erroronpage{830}{para 5, l.4}{HjG}{2004/06/08}{2} - Add: ``in the \textsc{docstrip} \u{script}'' - -\erroronpage{831}{ll. 4 to 15}{UFi/FMi}{2004/05/27}{2} - The |\usedir| declarations in the example are not in accordance - with the TDS set-up. They show what \textsf{jurabib} - currently implements in its \texttt{.ins} files. - However, the correct set-up would be: -\begin{verbatim} - \usedir{tex/latex/jurabib} - \file{jurabib.sty}{\from{jurabib.dtx}{package}} - \file{dejbbib.ldf}{\from{jurabib.dtx}{german}} - ... - \usedir{bibtex/bst/jurabib} - \file{jurabib.bst}{\from{jurabib.dtx}{jurabst}} - ... - \usedir{doc/latex/jurabib} - \file{jbtest.tex}{\from{jurabib.dtx}{test}} - ... -\end{verbatim} - This also requires to change the text following. - -\erroronpage{831}{ll.16/17}{HjG}{2004/06/09}{2} - Double interword space? - (if so: 2x visible, 1x vanished in line break)\\ - ``in \ |tex/...|'' \qquad yes, bug in \texttt{url}. - -\seriouserroronpage{831/832}{general}{HjG}{2004/06/09}{2} - Replace throughout: |\DeclareDirectory| \> |\DeclareDir|.\\ - Unfortunately, \texttt{docstrip} is not consistent in its command names. - -\seriouserroronpage{832}{l. 5}{UFi}{2004/05/27}{2} - Missing \texttt{*}: |\DeclareDir|\u{\texttt{*}}|{tex/bibtex/...| - -\erroronpage{832}{code blocks}{DPa}{2004/08/04}{2} - Three instances of |tex/bibtex| in |\DeclareDir| should lose the |tex/| to - conform to TDS and change made on page 831 - -\erroronpage{832}{2. code block}{MSch}{2006/01/06}{s} - Replace: |text/latex/base| \> |tex/latex/base| - -\erroronpage{832}{para 4, l.-2}{HOb}{2004/05/29}{2} - Change: ``\ldots a single |\UseTDS| in\ldots'' \> - ``a |\UseTDS| and a |\BaseDirectory| declaration in\ldots'' - -\erroronpage{832}{para 5, l. -3}{UFi}{2004/05/23}{2} - The ``\TeX{} Live CD'' is spelled incorrectly as - ``\TeX{} live'' or ``\TeX live'' - -\erroronpage{832}{l.-2}{HjG}{2005/05/15}{4} - Underline, as it is command line input. - -\erroronpage{833}{para -1, l.1}{J-CCh}{2005/07/17}{4} - Spurious extra blank between ``Another potential''. - - -\erroronpage{834}{para 4, l.2}{HjG}{2004/06/09}{2} - Change: ``These command\u{s}'' - -\erroronpage{834}{para 5, l.-1}{HjG}{2004/06/09}{2} - Closing parenthesis should not be in `typewriter font':\\ - ``(after |\begin{document}|\u)'' - -\erroronpage{834}{para 5}{FMi}{2007/11/13}{} - Explain that |\cmd| can't be used with conditionals, e.g., those produced - with |\newif| . - -\erroronpage{835}{para 6, l.2}{DHL}{2004/05/16}{2} -Missing letter: ``the source files into a -``user'' documentation and a\u{n} ``implementation'' part.'' - -\erroronpage{835}{para 6, l.5}{DHL}{2004/05/16}{2} -Missing word: ``as the \textsf{doc} package \u{is} loaded'' - -\erroronpage{835}{ll.-6/-4}{HjG}{2004/06/09}{2} - Replace: - ``\ldots\ \u{and no} configuration file.'' \> - ``\ldots\ \u{without a} configuration file.'' - -\erroronpage{837}{exa 14-4-1}{FMi}{2004/06/12}{} - Editoral comment: example has to be reprocessed whenever this chapter is modified to - show correct rcs checkin (otherwise input and output will not match). - -\erroronpage{837}{para 2,l.3}{DAl}{2005/09/03}{4} - Replace: - ``running \u{heading}'' \> - ``running \u{header}'' - -\erroronpage{838}{code box}{UFi}{2004/05/27}{2} - \texttt{\$Id\$}: first |$| uses wrong font (2 times) - -\erroronpage{839}{exa 14-4-2}{FMi}{2004/06/12}{} - Editorial comment: example has to be reprocessed whenever this chapter is modified to - show correct rcs checkin (otherwise input and output will not match). - -\seriouserroronpage{839}{item 1, l.1 and l.3}{AHo}{2004/09/02}{4} - Replace: \texttt{nottoday} \> \texttt{notoday} - -\seriouserroronpage{839}{item 2, l.4}{HjG}{2004/06/09}{2} - Replace brackets with braces: ``\texttt{% - \char`\\pagestyle\u\textbraceleft fancy\u\textbraceright}'' - - -\CHAPTER{Appendix A} - -\erroronpage{842}{para 2, l.5}{PYu/FMi}{2004/07/03}{2} - Remove: ``\ldots - \texttt{A}\ldots\texttt{Z})\u{ in case of command names prefixed with a - backslash}.'' - -\erroronpage{842}{para 3, marginal}{FMi}{2004/08/01}{2} - Change: ``Environments and command names'' \> ``Environments'' - -\erroronpage{842}{para 3}{PYu/FMi}{2004/08/01}{2} - Remove: ``On - the other hand, names of environments \u{and counters} - are different.'' - -Add: ``In this case the -\texttt{*} is part of the name \u{and spaces preceding it are not ignored}. Thus, when writing -\verb*=\begin{figure *}=, the space would become part of the name \u{and -is not recognized as the start of a \texttt{figure*} environment}.'' - - -\erroronpage{843}{para 3, l.2}{YvH}{2004/05/28}{2} - Missing word: ``and |\z@| contain |@| \u{in} their name'' - -\erroronpage{843}{para 4, l.3}{PYu}{2004/07/03}{2} - Change: ``to do: the difficult'' \> ``to do\u; the difficult'' - -\erroronpage{844}{para 4, l.4}{PYu/FMi}{2004/07/04}{2} - Replace: ``Thus, the above example could be shortened to'' \> - ``Thus, the definition in the above example should be - replaced as follows:'' - -\erroronpage{846}{para 1, l.2}{ARi}{2004/07/02}{2} - A period should follow the right parenthesis and ``without'' - should be capitalized. - -\iffalse -% maybe -\erroronpage{845/846/847}{syntax boxes and text}{FMi}{2004/07/04}{} - Replace: ``\textit{command definition}'' \> - ``\textit{command-definition}'' -\fi - -\erroronpage{847}{para. 5, ll. 2-3}{PYu}{2004/07/04}{2} - For consistency replace \meta{cmd}with \textit{cmd} -and \meta{command definition} with \textit{command definition}. - - -\erroronpage{847}{para -2, l.3}{VVo}{2008/09/02}{} -Replace: ``An error is raised if the definitions differ, ldots'' -\> ``A warning is shown if the definitions differ, \ldots'' - - -\erroronpage{851}{para 5, l.-2}{FMi}{2004/07/20}{2} - Add + change font: ``It also defines \u{the command} - |\the|\u{\textit{newctr}} to\ldots'' - -\erroronpage{852}{code block 1, l.2}{JGr}{2004/06/10}{2} - Second \verb=\makeatletter= should be \verb=\makeatother= - -\erroronpage{852}{para 3, l.-3}{FMi}{2004/06/23}{2} - ``\u{For that reason} the next example'' \> ``\u{As a result} the next example'' - -\erroronpage{852}{para -1, l.3}{FMi}{2004/07/24}{2} -Move word: ``|\setcounter| or |\addtocounter| \u{command} or when\ldots'' \> - ``\u{command} |\setcounter| or |\addtocounter| or when\ldots'' - -\erroronpage{852}{para -1, l.-3}{THa/FMi}{2004/06/23}{2} -Change: - ``It is \emph{not} suitable to print that number! For that reason a - set\ldots'' \> - ``However, the command cannot be used to typeset the value of the - counter! For that purpose a set\ldots'' - - -\erroronpage{853}{l.6}{THa/FMi}{2004/06/23}{2} - Missing space: ``c,\u{~}\dots, z'' - -\erroronpage{853}{para 4,ll.2+3}{HjG}{2004/05/25}{2} - Add word: ``\ldots definitions for sectioning \u{counters}'' - -\erroronpage{853}{counter code block}{FMi}{2005/06/09}{4} -The order of declarations of the counters is incorrect; they have to be -\begin{verbatim} -\newcounter{part} -\newcounter{section} -\newcounter{subsection}[section] -\newcounter{subsubsection}[subsection] -\end{verbatim} -or you will receive a ``counter not defined'' error. - -\iffalse -\erroronpage{853}{general}{THa/FMi}{2004/06/23}{} - Perhaps ``|\the|\meta{ctr}'' should be written without the meta - braces to match the form used on p.~852. \\ - Then again, perhaps not. -\fi - -\erroronpage{854}{ll. 1+2}{FMi}{2004/05/25}{2} - Add word and commata: ``Only the representation\u{, prefix,} and - label field commands - are defined \ldots'' - -\seriouserroronpage{854}{code block 1}{HjG/FMi}{2004/05/25}{2} -Replace with approx:\\[6pt] -\hspace*{-140pt}\begin{minipage}[b]{\linewidth} -\begin{verbatim} -\renewcommand\theenumi {\arabic{enumi}} \renewcommand\theenumii{\alph{enumii}} -\renewcommand\theenumiii{\roman{enumiii}} \renewcommand\theenumiv{\Alph{enumiv}} -\end{verbatim} -\begin{verbatim} - \renewcommand\p@enumii{\theenumi} -\renewcommand\p@enumiii{\theenumi(\theenumii)} \renewcommand\p@enumiv{\p@enumiii\theenumiii} -\end{verbatim} -\begin{verbatim} -\newcommand\labelenumi {\theenumi.} \newcommand\labelenumii{(\theenumii)} -\newcommand\labelenumiii{\theenumiii.} \newcommand\labelenumiv{\theenumiv.} -\end{verbatim} -\end{minipage} - - -\erroronpage{855}{fig A.1, l.4}{JAn}{2005/09/09}{4} - Change ``Did\^ot'' \> ``Didot'' (no caret); and delete the -comma after inch - - -\erroronpage{855}{fig A.1}{CBe/FMi}{2004/07/27}{2} -Add: \texttt{ex} \quad Height of a small ``x'' in the current font \u{(approximately)} -\\ -Add: \texttt{em} \quad Width - of capital ``M'' in current font \u{(approximately)} - - - -\erroronpage{856}{tab A.2, ll.1-3}{YvH}{2004/05/28}{2} - Correct: ``horizonal'' \> ``horizon\u{t}al'' (three times) - -\erroronpage{856}{tab A.2, l.6}{PYu}{2004/07/05}{2} - Add: ``a \u{solid} horizontal line'' - -\erroronpage{857}{table A.3}{V-Li}{2004/09/14}{4} - |\vspace{len}| is missing - -\erroronpage{858}{l.-8}{HjG/FMi}{2004/05/26}{2} - Add: ``\u{missing or} misplaced |\item|'' - -\erroronpage{858}{syntax box}{PYu}{2004/07/03}{2} - |\addvspace{|\textit{space}|}| should be typeset in a smaller font. - -\erroronpage{859}{para -4, l.1}{HjG}{2004/05/20}{2} - Typo: ``ar\u{r}ises'' \> ``arises'' - -\erroronpage{860}{para 1 of \S A.2, l.5}{CAR}{2004/05/26}{2} - Replace: ``that behaves similarly to a\ldots'' - \> ``that behaves \u{much like} a\ldots'' - -\erroronpage{861}{l.-2}{HjG}{2004/05/26}{2} - The \(\Longleftrightarrow\) in the margin seems to sport a tiny - gap in the middle (seems to be a lucida set-up problem). - -\erroronpage{866}{para 2 of \S A.2.3, l.5}{HjG}{2004/05/26}{2} - Words need to be swapped: ``height of a \u{box framed} with - |\fbox| or |\framebox|'' - -\seriouserroronpage{867}{ll.1/2 after exa A-2-17}{HjG}{2004/05/26}{2} - \(2 \times 5.3\,\mathrm{pt} + 0.4\,\mathrm{pt} = 11\,\mathrm{pt} - \ne 12\,\mathrm{pt}\) so skip should be $5.8\,\mathrm{pt}$. - -\seriouserroronpage{868}{Table A4.}{UFi}{2004/05/22}{2} - Default value of depth of \verb=\hrule= should be 0.0pt (not 0.4pt). - -\seriouserroronpage{871}{para 2, l.2}{UFi}{2004/05/21}{2} - ``binary operators (, , , )'' should be typeset - ``binary operators (\texttt{+}, \texttt{-}, \texttt{*}, \texttt{/})''. - - -\erroronpage{875/876}{tab. A.5}{FMi}{2004/07/28}{2} - Add: ``\TeX{} switches \u{(can only be queried)}'' \\ - Add: ``\LaTeX{} switches \u{(last two can be set)}'' \\ \qquad (these are - |@afterindent| and |@tempswa|)\\ - Add row:\\ - |@afterindent| \quad \parbox[t]{7cm}{Switch checked by command - |\@afterheading| (usually used in headings) to - prevent (if |false|) indentation of next - paragraph.} - - Editorial comment: change moves pagebreak. - -\seriouserroronpage{878}{codeline 4 (?)}{UFi}{2004/05/22}{2} - |\usepackage[german]{varioref}[2001/09/0]:| day number is missing - (test for version doesn't work then anymore!) - -\erroronpage{886}{fig.~A.1}{HjG}{2004/05/21}{2} - Add: \verb=\ProcessOptions= \u{\texttt{\char`\\relax}} - (cf. hint on p.~882!) - - -\CHAPTER{Appendix B} - -\erroronpage{891}{para 1, l.7}{DHL}{2004/05/16}{2} -Missing letter: ``\verb=l.167 \par=\u{\texttt{t}}\verb={Text}='' - -\seriouserroronpage{892}{para 1, l.-2}{HjG}{2004/05/22}{2} - ``\verb=\romen= (lines 1 and~2)'' - \> - ``\verb=\romen= (lines 2 and~3)'' - -\erroronpage{892}{para -1, ll.2--4}{HOb/FMi}{2004/05/22}{2} - Add: ``Technically, a moving argument is an argument - that is internally expanded by \LaTeX{} without typesetting it - directly\u{ (e.g.}, by using the internal \LaTeX{} construct - |\protected@edef|\textsuperscript{1}\u).'' - -\erroronpage{893}{para 2, l.8}{MHo/FMi}{2004/10/05}{4} - Replace: - ``On the other hand, |\cong| is fragile\ldots'' - \> - ``On the other hand, |\[...\]| is fragile\ldots'' - - -\erroronpage{894}{l.-7}{FMi}{2004/04/23}{2} - Add word: \ldots still open) \u{or} will be swallowed\ldots - -\erroronpage{896}{item 1}{UFi}{2004/05/23}{2} - Not in alphabetical order: move one item down. - -\erroronpage{896}{item 4}{UFi}{2004/05/23}{2} - Not in alphabetical order: move four items down. - -\erroronpage{896}{item -1}{HOb}{2004/05/29}{2} - Whether or not the image size can be automatically determined - depends on the graphics driver. Last sentence rewritten as follows:\\ - ``It usually does this automatically, for example, for -\texttt{.eps} files by reading the bounding box -information. However, depending on the graphics driver, it may be -unable to extract this information from binary -bitmap images such as \texttt{.jpg}, \texttt{.gif}, and \texttt{.png} files.'' - -\erroronpage{897}{item 5}{UFi}{2004/05/23}{2} - Not in alphabetical order: move one item down. - -\erroronpage{899}{item 1}{JGr}{2004/06/10}{2} - The extra \verb=\or= could result from bad use of \verb=\ifthenelse= - -\erroronpage{899}{item 5}{UFi}{2004/05/23}{2} - The ``\TeX{} Live CD'' is spelled incorrectly as - ``\TeX{} live'' or ``\TeX live'' - -\erroronpage{901}{item 3}{UFi}{2004/05/23}{2} - The ``\TeX{} Live CD'' is spelled incorrectly as - ``\TeX{} live'' or ``\TeX live'' - -\seriouserroronpage{902}{l.5}{HjG}{2004/05/22}{2} - Missing letter: ``\texttt{\char`\\dis\u{c}retionary}'' - -\erroronpage{907}{item 5, l.2}{CKr}{2005/05/30}{4} - Add missing word: ``\ldots or \texttt{figure}, \u{is} encountered\ldots'' - -\erroronpage{907--909}{item 2}{UFi/FMi}{2004/07/31}{2} - \TeX{} error message missing: ``\texttt{No room for a new ...}'' - - The packages loaded in your document require more internal registers -(|\count|, |\dimen|, \ldots) than there are available in \TeX. Try -processing your document with e\TeX{} and additionally load the -\textsf{etex} package. - - Editorial comment: affects pagebreaks for 908/909 as well. - - - -\erroronpage{909}{middle}{HjG}{2004/05/22}{2} - In the sample output, the lines ``\texttt{<*> samplefile.tex}'' and - ``\texttt{? }'' should be indented by the same amount as the first - four lines. - -\erroronpage{909}{l.-2}{HjG}{2004/05/22}{2} - Missing interword space: ``an\u{ }\verb=\addvspace= command'' - -%%check (that's me) -\iffalse -\erroronpage{911}{item 5}{HjG}{2004/05/22}{} - ``To the author's knowledge, \ldots'' - \> - ``To the authors' knowledge, \ldots'' -\fi - -\erroronpage{913}{item 1}{MKu/FMi}{2004/06/24}{2} - Replace: UTF8 \> UTF-8 - -\erroronpage{913}{item 1}{UFi}{2004/05/23}{2} - Not in alphabetical order: move four items down. - -\erroronpage{913}{item -3, l.-3/-1}{HjG}{2004/05/22}{2} - Replace word: ``\ldots commands \u{and}, if necessary, masking a line - break in the source with a \verb=%= sign.'' - -\erroronpage{914}{l.8}{HjG}{2004/05/22}{2} - Missing interword space: ``\verb=\spacefactor=\u{ }only'' - -\erroronpage{917}{footnote}{HOb}{2004/05/29}{2} - Replace footnote with: ``In modern distributions \LaTeX{} is automatically - using the e\TeX{} program. On older installations you may have to - call a different program (e.g., \texttt{elatex} instead of - \texttt{latex}) when processing a - document.'' - - -\erroronpage{918}{l.-13}{HjG}{2004/05/22}{2} - Misplaced comma:\\ - ``\ldots\ arguments thereby, using up \ldots'' - \>\\ - ``\ldots\ arguments, thereby using up \ldots'' - -\erroronpage{920}{item 2}{UFi}{2004/05/23}{2} - Not in alphabetical order: move one item down. - -\erroronpage{921}{item -2}{MBr}{2004/08/03}{2} - Not in alphabetical order: move item to top. - -\erroronpage{923}{item 1}{UFi}{2004/05/23}{2} - Not in alphabetical order: move one item down. - -\erroronpage{924}{item 2, para 2, l.1}{HjG}{2004/05/22}{2} - Typo: ``th\u{r}ough'' \> ``though'' - -\erroronpage{925}{l.1}{HjG}{2004/05/22}{2} - Missing interword space: ``the command\u{ }\verb=\symbol='' - -\erroronpage{925}{item -2, l.-2}{HjG}{2004/05/22}{2} - Extra word: ``are \u{the} those'' \> ``are those''\\ - Surplus space: `` register~\u~0'' \> ``register~0'' - -\erroronpage{925}{item -2}{MBr}{2004/08/03}{2} - Not in alphabetical order: move item one up. - -\seriouserroronpage{926}{item 4, title}{UFi}{2004/05/23}{2} - ``\verb=Overfull \hbox (badness= \meta{number}\texttt)'' should be - ``\verb=Overfull \hbox (=\meta{number}\texttt{pt too wide)}'' - -\erroronpage{926}{item 5, l.1}{HjG}{2004/05/23}{2} - Typo: ``built'' \> ``build'' - -\seriouserroronpage{926}{item 5, title}{UFi}{2004/05/23}{2} - ``\verb=Overfull \vbox (badness= \meta{number}\texttt)'' should be - ``\verb=Overfull \vbox (=\meta{number}\texttt{pt too wide)}'' - -\seriouserroronpage{928}{item 6, title}{UFi}{2004/05/23}{2} - ``\verb=Tight \hbox='' should be ``\verb=Tight \vbox='' - -\erroronpage{930}{item 1, l.1}{HjG}{2004/05/23}{2} - Omit paragraph indentation! - -\erroronpage{930}{item 4, l.2}{UFi}{2004/05/23}{2} - Typo: ``i\u{t}entify'' \> ``identify'' - -\erroronpage{931}{item 4, l.-1}{HjG}{2004/05/23}{2} - Add: ``\ldots\ package \u{or class} in question.'' - -\erroronpage{931}{item 4}{JGr}{2004/06/10}{2} - The warning also happens if you give absolute or relative - pathnames like \verb=\documentclass{base/article}= - -\erroronpage{931}{item 6}{MBr/FMi}{2004/08/03}{2} - Order here is debatable but a ``,'' may not be good for visual - sorting, so move this item one up (placeholder are always sorted to - top so it doesn't pass ``package-or-class''. - -\erroronpage{932}{para 4, l.1}{UFi}{2004/05/23}{2} - Typo: ``\u{t}which \> ``which'' - -\seriouserroronpage{935}{ll.3--5}{HjG}{2004/05/23}{2} - The text claims:\\ - ``The output is slightly different: the name \u{and the type} of a - token are not shown by |\meaning|; instead, only its ``meaning'' is - presented.''\\ - However, as example B-3-1 depicts, the type \emph{is} shown; hence, - the sentence should be changed to:\\ - ``The output is slightly different: the name - of the token \u{is} not shown by - |\meaning|; instead, only \u{its type and} its ``meaning'' - \u{are} presented.'' - -\erroronpage{936}{para 1, l.3}{UFi}{2004/05/23}{2} - Closing brace should be after ``19'' and not at end of line. - -\erroronpage{938}{para -1, l.3}{UFi/FMi}{2004/05/23}{2} - Difficult to understand; replace: - ``\ldots a large \u{increase in} \texttt{t=} between'' - -\erroronpage{939}{para 3, l.2}{HjG}{2004/05/23}{2} - Words need to be swapped: - ``\ldots\ \TeX{} indicates \u{this fact} with \ldots'' - -\erroronpage{941}{l.19/20}{HjG}{2004/05/24}{2} - Add: ``so-called demerits \u{(\texttt{d=})}'' - -\erroronpage{942}{l.22}{HjG}{2004/05/24}{2} - Change: ``several ways to reach \u{\texttt{@@2}};'' - \> ``several ways to reach \u{\texttt{@@6}};'' - -\erroronpage{943}{para -1 of \S B.3.3, l.-6}{HjG}{2004/05/24}{2} - Typo: ``shinkability'' \> ``shrinkability'' - - - -\CHAPTER{Appendix C} - -\erroronpage{general}{several pages}{FMi}{2005/07/01}{4} - Appendix was partially rewritten to reflect changes in the layout - of the web sites. More importantly: CTAN changed their ftp - software and stopped supporting the generation of directory - archives on the fly. Instead they now offer precompiled - \texttt{zip} files that can be downloaded. - -\erroronpage{947}{ll.-2/-1}{HjG}{2004/05/24}{2} - Missing word: ``it is best \u{to} access'' - -\erroronpage{947}{para -1, l.5}{FMi}{2004/06/12}{2} - Bug in \texttt{url.sty} generated extra space. - -\erroronpage{948}{para -1, l.5}{UFi}{2004/05/23}{2} - Show short name: ``\ldots\ \TeX{} Users Group (\u{TUG}, United States)'' - -\erroronpage{950}{para 1, l.2}{FMi}{2006/09/12}{s} - Replace: Figure C.\u{2} \> Figure C.\u{1} - -\erroronpage{950}{para 3, l.2}{HjG}{2004/05/24}{2} - Typo: ``a site that i\u{s} not too distant'' - -\seriouserroronpage{953}{l.11}{HjG}{2004/05/24}{2} - Replace line: ``\verb=>>>>>>> 1.6='' \> - ``\texttt{200-index graphicx}'' - (probably due to an incomplete merge with CVS) - -\erroronpage{954}{para 3, l.1}{HjG}{2005/05/09}{4} - ``\TeX live'' \> ``\TeX{} Live'' - -\erroronpage{955}{para 2, l.4}{HjG}{2005/05/09}{4} - Remove surplus word: - ``in \u{the} Thomas Esser's \texttt{tetex} distribution'' - -\erroronpage{955}{para -2, l.-4}{MHe}{2004/05/22}{2} - Letters need to be swapped: ``eig\u{ht}eenth'' - -\erroronpage{956}{cn: entry}{HjG}{2005/05/09}{4} - Replace: - ``\u{name}: Hong Feng'' \> ``\u{contact}: Hong Feng'' - -\erroronpage{957}{col. 2, l.15}{TMW}{2004/06/07}{2} - This should read ``Lietuvos \TeX'o Vartotoj\k{u} Grup\.{e}''. - -\erroronpage{958}{col. 1, l.19}{TMW}{2004/06/07}{2} - An acute accent should be added: ``Toru\'n'' - - - -\CHAPTER{Bibliography} - -\erroronpage{963}{[1]}{CKr}{2005/06/20}{4} - Url changed: \url{http://partners.adobe.com/public/developer/en/font/T1_SPEC.PDF} - -\erroronpage{963}{[2]}{CKr}{2005/06/20}{4} - Url changed: \url{http://partners.adobe.com/public/developer/en/ps/5001.DSC_Spec.pdf} - -\erroronpage{963}{[3]}{CKr}{2005/06/20}{4} - Url changed: - \url{http://partners.adobe.com/public/developer/en/ps/5002.EPSF_Spec.pdf} - -\erroronpage{964}{[5]}{CKr}{2005/06/20}{4} - Url changed: - \url{http://partners.adobe.com/public/developer/en/pdf/PDFReference.pdf} - - -\erroronpage{965}{[17], l.-1}{HjG}{2004/06/18}{2} - Delete character: ``in a\u{n} multi-language setting'' - -\erroronpage{966}{[25]}{HjG}{2004/05/20}{2} - First line of online resources is not flush right but centered. - -\erroronpage{971}{[74]}{FMi}{2006/09/18}{s} - Add ``Lars Hellstr\"om'' as author. Change date to December 2004. - Change comment to ``Documentation for - the fontinst utility package that supports \ldots'' - -\erroronpage{973}{[88]}{TSS}{2004/05/26}{2} - The bibliography entry for "The Art of Computer Programming" lacks - ISBN numbers: 0-201-89683-4, 0-201-03822-6, and 0-201-03803-X. - -\erroronpage{973}{[90], l.2}{HjG}{2004/06/07}{2} - Words need to be swapped: - ``\ldots do not look as \u{beautiful now} as they did in the past.'' - -\erroronpage{973}{[91]}{HjG}{2004/05/20}{2} - First line of online resources is not flush right but centered. - -\erroronpage{975}{[107], [109], [110], [111]}{HjG}{2004/06/21}{2} - Incomplete URLs:\\ - \texttt{http://www.latex-project.org\u{/ltnews/}}\\ - \texttt{http://www.latex-project.org\u{/guides/fntguide.pdf}}\\ - \texttt{http://www.latex-project.org\u{/guides/cfgguide.pdf}}\\ - \texttt{http://www.latex-project.org\u{/lppl/}} - -\erroronpage{976}{[117]}{FMi}{2005/11/07}{s} - The title is ``E-\TeX: Guidelines for Future \TeX{} Extensions''. - -\erroronpage{977}{[124]}{HjG}{2004/05/20}{2} - First line of online resources is not flush right but centered. - -\erroronpage{977}{[124]}{FMi}{2005/07/09}{4} - Link is missing a period: - \url{http://www.latex-project.org/papers/tug99}\texttt{\u.pdf} - -\erroronpage{978}{[138]}{FMi}{2005/06/25}{4} - Now has appeared: 24\#1, pp.~105--114, 2004. URL: - \url{http://www.tug.org/TUGboat/Articles/tb24-1/plaice.pdf} - -\erroronpage{979}{[143]}{HjG}{2004/05/20}{2} - Missing period: Robert M\u. Ritter - -\erroronpage{979}{entry 146, l.3}{RWa}{2004/06/01}{2} - Missing word: ``for \LaTeX\ \u{and} a possible'' - -\erroronpage{980}{[151]}{THa}{2004/06/25}{2} - Remove: ``\LaTeX\u{Joachim Schrod}.'' - -\erroronpage{980}{[153]}{THa}{2004/06/25}{2} - Swap words: ``often are'' \> ``are often'' - -\erroronpage{980}{[155]}{THa}{2004/06/25}{2} - Missing word: ``For \u{the} \textsf{kuvio} system\ldots'' - -\erroronpage{980}{[157]}{HjG}{2004/05/20}{2} - First line of online resources is not flush right (stray space?). - -\erroronpage{981}{[158]-[162]}{RKo}{2005/11/11}{s} - Unfortunately Th\`anh's name is mispelled (accents in [161/2]). The correct spelling - is ``H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh''. - - Furthermore, the surename is H\`an so the entries should have been sorted - under H (something that can't be corrected easily). - -\erroronpage{981}{[161]}{CKr}{2005/07/06}{4} - Remove surplus name in text: ``User\u{Sebastian Rahtz} manual \ldots'' - -\erroronpage{981}{[162/3], title}{THa}{2004/06/25}{2} - Change: ``Makeindex'' \> ``makeindex'' - -\erroronpage{982}{[168]}{HjG}{2004/05/20}{2} - First line of online resources should be:\\ - \texttt{http://www.tug.org/TUGboat/Articles/\u{tb11-3/tb29vulis.pdf}} - - -\CHAPTER{Index} - -\erroronpage{983--1082}{index}{FMi}{2004/06/11}{} - I do not list changes to the index that are results of other errata - entries as they are too dificult to track. Instead I will put an - updated index on the web at - \url{http://www.latex-project.org/guides/tlc2-ap4.pdf} once in a while. - -\erroronpage{general}{}{FMi}{2004/06/08}{2} - Editorial comment: the whole index has been reprinted. - -\erroronpage{general}{}{FMi}{2005/09/08}{4} - Editorial comment: the whole index has been reprinted. - -\erroronpage{general}{}{FMi}{2004/06/08}{2} - Add index entries into production notes, e.g., for example setup, - hanging punctuation, \ldots - -\erroronpage{983}{para 1, l.3}{UFi}{2004/05/23}{2} - Remove surplus word: ``\ldots one of \u{the} the following'' - -\seriouserroronpage{983}{para -2}{HjG}{2004/05/20}{2} - The text explains the meaning of bold and blue page numbers, - but fails to point out the significance of slanted (italic) - ones---there is none: blue italic indicates normal example blue bold - indicates example and also important info. - -\erroronpage{988,1009}{}{CKr}{2004/10/10}{4} - Replace: ``alphabetical document headings'' - \> ``alphabetically numbered document headings'' - -and - - ``document headings / alphabetical'' - \> - ``document headings / alphabetically numbered'' - -\erroronpage{990}{}{J-CCh}{2005/07/17}{s} - Correct range: author-date citations / history of (699, 700) - -\erroronpage{992}{}{J-CCh}{2005/07/17}{s} - Correct: ``B\u{\'e}zier'' - -\erroronpage{993}{}{SEg}{2005/04/26}{4} - bibliographies/authors/name,formatting shows 798--1092 but should be - just 798 - -\erroronpage{1000}{}{J-CCh}{2005/07/17}{s} - Correct range: Citation systems / - author-date / - history of (699, 700) - -\erroronpage{1007}{}{HjG}{2004/07/12}{2} - Add page entry for |\DeclareFontSubstitution| - back to 431 (para~2). - - -\erroronpage{1014}{secound col., l.8}{MSc}{2004/06/04}{2} - missing index entry for ``eTeX, TeX extension'' - -\erroronpage{1017}{}{FHa}{2004/10/05}{4} - The index entry for "floats / placement control" lists pages 286-983 - for information. I think that is a bit too much. It should probably - end at page 291. - - -\erroronpage{1019}{}{J-CCh}{2005/07/17}{s} - Correct range: fonts / - oblique (333) - -\erroronpage{1020}{}{CKr}{2005/01/09}{4} - Replace ``fonts / URW Antigua'' \> ``fonts / URW Anti\u{q}ua'' - -\erroronpage{1034}{first col.}{FMi}{2004/05/15}{2} - Add entry: ``lists / enumerated / user-defined, 151'' - -\erroronpage{1035}{}{THa}{2004/07/02}{2} - ``\textsf{makeindex}'' \> ``\textsl{MakeIndex}'' - -\erroronpage{1041}{}{FMi}{2004/08/02}{2} - ``\texttt{NACRO} \BibTeX{} command'' \> - ``\texttt{MACRO} \BibTeX{} command'' - -\erroronpage{1051}{secound col., l.14}{MSc}{2004/06/04}{2} - missing index entries for ``pdftex'' on p.7 and p.643 - -\erroronpage{1069}{}{FMi}{2004/11/07}{4} - Replace: ``text symbols / setting-up'' \> - ``\u{math} symbols / setting-up'' - - -\erroronpage{1076}{}{CKr}{2005/01/09}{4} - Replace ``URW Antigua'' \> ``URW Anti\u{q}ua'' - - -\CHAPTER{People} - -\erroronpage{1080}{page}{FMi}{2004/07/26}{4} - Editorial comment: Needs manual breaking in index output file for - second and fourth printing. - -\erroronpage{1081}{col 1}{FMi}{2004/06/22}{2} - Missing accents: ``Fernandez, Jose Alberto '' \> `Fern\'andez, Jos\'e Alberto'' - -\erroronpage{1081}{col 1}{HjG}{2004/06/22}{2} - Change page number in entry: - ``Fukui, Rei, xxvii, 405, \u{969}'' \> ``\ldots, \u{968}'' - -\erroronpage{1081}{col 1}{LMa}{2004/05/14}{2} - The name ``M\o ller Neergaard, Peter'' should be sorted as - ``Neergaard, Peter M\o ller''. - -\erroronpage{1081}{col 2}{HjG}{2004/06/16}{2} - Change page number in entry: - ``Hufflen, Jean-Michel, 761, \u{971}'' \> ``\ldots, \u{970}'' - -\erroronpage{1081}{}{HjG}{2004/07/08}{2} - Add page entries for ``Kettler, Howard'' and ``Frutiger, Adrian'' - to ``People'' index back to 374. - -\erroronpage{1082}{}{HjG}{2004/07/08}{2} - Add page entry for ``Smith, Ralph'' to ``People'' index back to 376. - - -\erroronpage{1082}{col 1, l.19 }{PPn}{2004/05/25}{2} - Replace ``Panday'' with ``Pandey'' (very sorry for the typo). - -\erroronpage{1082}{col 1}{FMi}{2004/04/23}{2} - Replace ``Wing, Wai'' with ``Wong, Wai'' (very sorry for the typo). - -\erroronpage{1082}{col 1}{HjG}{2004/07/13}{2} - Change page numbers in entry: - ``Mittelbach, Frank, \ldots, 976--\u{978, 980}, \ldots'' - \> ``\ldots, 976--\u{979}, \ldots'' - -\erroronpage{1082}{}{HjG}{2004/07/13}{2} - Add page entry for ``Rahtz, Sebastian'' - back to 981 (bib-item [161]). - - - - - - -\CHAPTER{Biographies} - -\erroronpage{1084}{Goossens image}{THa}{2004/06/23}{2} - Spurious gray square in upper right corner of framed image of Michel - Goossens. - -\erroronpage{1085}{para 3, l.6}{MSc}{2004/05/19}{2} - Replace ``TeX'' with ``\TeX''. - - -\CHAPTER{Production Notes} - -\erroronpage{1089}{para 4, l.4}{FMi}{2004/07/21}{2} - Add: ``\ldots this typographical icing \u{(package - \textsf{pdfcprot})} was\ldots'' - -\erroronpage{1089}{l.-5}{HjG}{2004/05/20}{2} - Missing period: \ldots files\u. It \ldots - -\erroronpage{1090}{para -3, l.-4}{HjG}{2004/05/23}{2} - Change/add: ``paragraphs ending \u{with a} single word \u{line}'' - -\erroronpage{1091}{top}{WAd}{2004/05/08}{2} - The series title in the box does not use a real caps and small caps - font but a faked one (compare with the front cover where - the font \emph{Christiana} designed by Gudrun Zapf-von Hesse is used). - -\end{erratalist} - - -\setcounter{collectmore}{3} - -\begin{multicols}{3}[Thanks to all who have found errors or - omissions. Listed are the people who found an errata entry first.] -\contributor{AFV}{Alfonso Fernandez-Vazquez} -\contributor{AHo}{Antti Honkela} -\contributor{AMa}{Arni Magnusson} -\contributor{ARi}{Alan Ristow} -\contributor{BMo}{Brooks Moses} -\contributor{BeB}{Bernd Burghardt} -\contributor{CAR}{Chris A. Rowley} -\contributor{CBC}{Charles B. Cameron} -\contributor{CBa}{Cristian Battaglia} -\contributor{CBe}{Claudio Beccari} -\contributor{CKr}{Claudia Krysztofiak} -\contributor{DAl}{Daniel Alonso i Alemany} -\contributor{DAr}{Donald Arseneau} -\contributor{DCa}{David Carlisle} -\contributor{DHL}{Dan Luecking} -\contributor{DIs}{Daniel Isaacson} -\contributor{DSch}{Dirk Schlimm} -\contributor{ERy}{Elizabeth Ryan} -\contributor{FHa}{Ferdy Hanssen} -\contributor{FMi}{Frank Mittelbach} -\contributor{GBa}{Gerhard Bachmaier} -\contributor{HOb}{Heiko Oberdiek} -\contributor{HPB}{Harold P. Boas} -\contributor{HVo}{Herbert Voss} -\contributor{HjG}{Hubert G\"a\ss lein} -\contributor{J-CCh}{Jean-C\^ome Charpentier} -\contributor{JAn}{Jacques Andr\'e} -\contributor{JBez}{Javier Bezos} -\contributor{JBe}{Jens Berger} -\contributor{JBr}{Johannes Braams} -\contributor{JCh}{Joel Chan} -\contributor{JGr}{Jose Grimm} -\contributor{JJN}{Jarmo Niemel\"a} -\contributor{JLV}{Juan Luis Varona} -\contributor{JMH}{Jean-Michel Hufflen} -\contributor{JS}{Joachim Schrod} -\contributor{JTa}{Juhani Takkinen} -\contributor{LHe}{Lars Hellstr\"om} -\contributor{LMa}{Lars Madsen} -\contributor{LSchu}{Lothar Schumacher} -\contributor{MBr}{Marion Braams} -\contributor{MGo}{Michel Goossens} -\contributor{MHCL}{Martin Hiu Chung Law} -\contributor{MHe}{Martin Hensel} -\contributor{MHo}{Morten H\o gholm} -\contributor{MKo}{Markus Kohm} -\contributor{MKu}{Markus Kuhn} -\contributor{MLa}{Mark Laplante} -\contributor{MLi}{Martin Liebmann} -\contributor{MSc}{Martin Schr\"oder} -\contributor{MSch}{Michael Schutte} -\contributor{NBe}{Nelson Beebe} -\contributor{PPN}{P.P. Narayanaswami} -\contributor{PYu}{Peng Yu} -\contributor{RKo}{Reinhard Kotucha} -\contributor{RPa}{Reimo Palm} -\contributor{RSt}{Ralf Stubner} -\contributor{RWa}{Richard Walker} -\contributor{ReSt}{Rebecca Stiels} -\contributor{SCo}{Steven Douglas Cochran} -\contributor{SEg}{Stephen Eglen} -\contributor{SPe}{Sa\v sa Petrovi\' c} -\contributor{THa}{Thorsten Hansen} -\contributor{TMW}{Thomas Widmann} -\contributor{TMi}{Tom Micevski} -\contributor{TSS}{Tommi Syrj\"anen} -\contributor{UFi}{Ulrike Fischer} -\contributor{UZi}{Uwe Ziegenhagen} -\contributor{V-Li}{Christian Faulhammer} -\contributor{VPe}{Vivi Petersen} -\contributor{VVo}{Vladimir Volovich} -\contributor{WAd}{William Adams} -\contributor{WaS}{Walter Schmidt} -\contributor{YiL}{Yiannis Lazarides} -\contributor{YvH}{Yvon Henel} -\contributor{hajk}{Henk Koster} -\contributor{usw}{Ulrich Dirr} -\end{multicols} - - -Other people have sent us corrections for errors already found. -Thanks to all of you! - -If you find further errors please report them to one of the authors, e.g., -\begin{quote}\ttfamily - frank.mittelbach@latex-project.org -\end{quote} -preferably in a form usable directly in this file, i.e., -\begin{flushleft} -|\erroronpage{|\textit{page-number}|}{|\textit{line-identification}|}{|% - \textit{your-initials}|}{|\textit{date}|}{}| \\ - \hspace*{2em}\textit{description of the the erratum} -\end{flushleft} -Here is an example: -\begin{verbatim} -\erroronpage{5}{para 3, l.1}{MOs}{1997/06/01}{} - ``LaTeX'' should be typeset ``\LaTeX''. -\end{verbatim} - -\end{document} - - diff --git a/Master/texmf-dist/source/latex/base/unpack.ins b/Master/texmf-dist/source/latex/base/unpack.ins index b5c068f7d06..02a7630d9bb 100644 --- a/Master/texmf-dist/source/latex/base/unpack.ins +++ b/Master/texmf-dist/source/latex/base/unpack.ins @@ -5,31 +5,31 @@ %% %% Copyright 1993-2014 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the LaTeX base system. %% ------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This file has the LPPL maintenance status "maintained". -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.txt'. See also `legal.txt' for additional %% information. -%% -%% -%% +%% +%% +%% %% %% --------------- start of bootstrap commands ------------------ %% @@ -80,7 +80,7 @@ \batchinput{ltoutenc.ins} -%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% other classes and packages \batchinput{classes.ins} @@ -115,7 +115,9 @@ \batchinput{nfssfont.ins} -\batchinput{fixltx2e.ins} +\batchinput{fix-cm.ins} + +\batchinput{latexrelease.ins} \Msg{} diff --git a/Master/texmf-dist/source/latex/base/usrguide.tex b/Master/texmf-dist/source/latex/base/usrguide.tex deleted file mode 100644 index 5f7a9404d53..00000000000 --- a/Master/texmf-dist/source/latex/base/usrguide.tex +++ /dev/null @@ -1,1815 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1993-2014 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% -% This file is part of the LaTeX base system. -% ------------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This file has the LPPL maintenance status "maintained". -% -% The list of all files belonging to the LaTeX base distribution is -% given in the file `manifest.txt'. See also `legal.txt' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% -% \fi -% Filename: usrguide.tex - -\NeedsTeXFormat{LaTeX2e}[1995/12/01] - -\documentclass{ltxguide}[2001/05/28] - -\title{\LaTeXe~for authors} - -\author{\copyright~Copyright 1995--2014, \LaTeX3 Project Team.\\ - All rights reserved.} - -\date{29 September 2014} - - -\begin{document} - -\maketitle - -\tableofcontents - -\section{Introduction} - -Welcome to \LaTeXe, the new standard version of the \LaTeX{} Document -Preparation System. - -This document describes how to take advantage of the new features of -\LaTeX, and how to process your old \LaTeX{} documents with -\LaTeXe. However, this document is only a brief introduction to the -new facilities and is intended for authors who are already familiar -with the old version of \LaTeX{}. It is \emph{not} a reference manual -for \LaTeXe{} nor is it a complete introduction to \LaTeX. - -It is somewhat of an historical document now, since \LaTeXe{} came into -existence in 1994. - -\subsection[\LaTeXe---The new \LaTeX~release] - {\LaTeXe---The new \LaTeX~release\\ (well, for more than 10 years now)} - -The previous version of \LaTeX{} was known as \LaTeX~2.09. Over the -years many extensions have been developed for \LaTeX. This is, of -course, a sure sign of its continuing popularity but it has had one -unfortunate result: incompatible \LaTeX{} formats came into use at -different sites. This included `standard \LaTeX~2.09', \LaTeX{} built -with the \emph{New Font Selection Scheme}~(\NFSS), \SLiTeX, \AmSLaTeX, -and so on. Thus, to process documents from various places, a site -maintainer was forced to keep multiple versions of the \LaTeX{} -program. In addition, when looking at a source file it was not always -clear for which format the document was written. - -To put an end to this unsatisfactory situation, \LaTeXe{} has been -produced; it brings all such extensions back under a single format and -thus prevents the proliferation of mutually incompatible dialects of -\LaTeX~2.09. With \LaTeXe{} the `new font selection scheme' is -standard and, for example, \textsf{amsmath} (formerly the \AmSLaTeX{} -format) or \textsf{slides} (formerly the \SLiTeX{} format) are simply -extensions, which may be loaded by documents using the same base format. - -The introduction of a new release also made it possible to add a small -number of often-requested features and to make the task of writing -packages and classes simpler. - -\subsection{\LaTeX3---The long-term future of \LaTeX} -\label{Sec:ltx3} - -\LaTeXe{} is the consolidation step in a comprehensive -reimplementation of the \LaTeX{} system. The next major release of -\LaTeX{} will be \LaTeX3, which will include a radical overhaul of the -document designers' and package writers' interface to \LaTeX. - -\LaTeX3 is a long-term research project but, until it is completed, -the project team are committed to the active maintenance of \LaTeXe{}. -Thus the experience gained from the production and maintenance of -\LaTeXe{} will be a major influence on the design of \LaTeX3. -A brief description of the project can be found in the document -|ltx3info.tex|. - -If you would like to support the project then you are welcome to send -donations to the \LaTeX3 Project Fund; this has been set up to help -the research team by financing various expenses associated with this -voluntary work of maintaining the current \LaTeX{} and developing -\LaTeX3. - -The fund is administered by The \TeX{} Users Group and by various -local user groups. Information about making donations and joining -these groups is available from: -\begin{quote}\small\label{addrs} - \texttt{http://www.tug.org/lugs.html} -\end{quote} - -The \LaTeX3{} project has its home page -on the World Wide Web at: -\begin{verbatim} - http://www.latex-project.org/ -\end{verbatim} -This page describes \LaTeX{} and the \LaTeX3 project, and contains -pointers to other \LaTeX{} resources, such as the user guides, the -\TeX{} Frequently Asked Questions, and the \LaTeX{} bugs database. - -Older articles covering aspects of the \LaTeX3 project are also -available for anonymous ftp from the Comprehensive \TeX{} Archive, in -the directory: -\begin{verbatim} - tex-archive/info/ltx3pub -\end{verbatim} -The file |ltx3pub.bib| in that directory contains an abstract of each -of the files. - -\subsection{Overview} - -This document contains an overview of the new structure and features -of \LaTeX. It is \emph{not} a self-contained document, as it contains -only the features of \LaTeX{} which have changed since version 2.09. -You should read this document in conjunction with an introduction to -\LaTeX{}. - -\begin{description} - -\item[Section~\ref{Sec:class+packages}] - contains an overview of the new structure of - \LaTeX{} documents. It describes how classes and packages work and - how class and package options can be used. It lists the standard - packages and classes which come with \LaTeX. - -\item[Section~\ref{Sec:commands}] describes the new commands available - to authors in \LaTeXe. - -\item[Section~\ref{Sec:209}] shows how to process old \LaTeX{} - documents with \LaTeXe. - -\item[Section~\ref{Sec:problems}] contains advice on dealing with - problems you may encounter in running \LaTeXe. - It lists some error messages which are new in \LaTeXe{} and - it describes some of the more common problems and how to cure them, - or where to find further information. - -\end{description} - -\subsection{Further information} - -For a general introduction to \LaTeX, including the new features of -\LaTeXe, you should read \emph{\LaTeXbook} -by Leslie Lamport~\cite{A-W:LLa94}. - -A more detailed description of the new features of \LaTeX, including an -overview of more than 200 packages and nearly 1000 ready to run examples, is -to be found in \emph{\LaTeXcomp second edition} by Frank Mittelbach and -Michel Goossens~\cite{A-W:MG2004}. - -Packages and programs for producing and manipulating graphics are -discussed at length in \emph{\LaTeXGcomp} by Michel Goossens, -Sebastian Rahtz and Frank Mittelbach~\cite{A-W:GRM97}. - -Solutions for publishing with \LaTeX{} on the World Wide Web are given -in \emph{\LaTeXWcomp} by Michel Goossens and Sebastian -Rahtz~\cite{A-W:GR99}. - -For more information about the many new \LaTeX{} packages you should -read the package documentation, which should be available from the -same source as your copy of \LaTeX. - -There are a number of documentation files which accompany every copy -of \LaTeX. A copy of \emph{\LaTeX{} News} will come out with each -six-monthly release of \LaTeX; it will be found in the files -|ltnews*.tex|. The class- and package-writer's guide \emph{\clsguide} -describes the new \LaTeX{} features for writers of document classes -and packages; it is in |clsguide.tex|. The guide \emph{\fntguide} -describes the \LaTeX{} font selection scheme for class- and -package-writers; it is in |fntguide.tex|. Support for Cyrillic languages -in \LaTeX{} is described in \emph{\cyrguide}. - -The documented source code (from the files used to produce the kernel -format via |latex.ltx|) is now available as -\emph{The \LaTeXe\ Sources}. ] -This very large document also includes an index of -\LaTeX{} commands. It can be typeset from the \LaTeX{} file -|source2e.tex| in the |base| directory, using the source files and -the class file |ltxdoc.cls| from this directory. - -For more information about \TeX{} and \LaTeX{}, please contact your -local \TeX{} Users Group, or the international \TeX{} Users Group (see -page \pageref{addrs}). - - -\section{Classes and packages} -\label{Sec:class+packages} - -This section describes the new structure of \LaTeX{} documents and the -new types of file: \emph{classes} and \emph{packages}. - -\subsection{What are classes and packages?} - -The main difference between \LaTeX~2.09 and \LaTeXe{} is in the -commands before |\begin{document}|. - -In \LaTeX~2.09, documents had \emph{styles}, -such as \textsf{article} or \textsf{book}, and \emph{options}, -such as \textsf{twoside} or \textsf{epsfig}. -These were indicated by the |\documentstyle| command: -\begin{quote} - |\documentstyle|\oarg{options}\arg{style} -\end{quote} -For example, to specify a two-sided article with encapsulated -PostScript figures, you said: -\begin{verbatim} - \documentstyle[twoside,epsfig]{article} -\end{verbatim} -However, there were two different types of document style option: -\emph{built-in options} such as |twoside|; and \emph{packages} such as -|epsfig.sty|. These were very different, since any \LaTeX{} document -style could use the \textsf{epsfig} package but only document styles -which declared the \textsf{twoside} option could use that option. - -To avoid this confusion, \LaTeXe{} differentiates between built-in -options and packages. These are given by the new |\documentclass| and -|\usepackage| commands: -\begin{quote} - |\documentclass|\oarg{options}\arg{class} \\ - |\usepackage|\oarg{options}\arg{packages} -\end{quote} -For example, to specify a two-sided article with encapsulated -PostScript figures, you now write: -\begin{verbatim} - \documentclass[twoside]{article} - \usepackage{epsfig} -\end{verbatim} -You can load more than one package with a single |\usepackage| -command; for example, rather than writing: -\begin{verbatim} - \usepackage{epsfig} - \usepackage{multicol} -\end{verbatim} -you can specify: -\begin{verbatim} - \usepackage{epsfig,multicol} -\end{verbatim} -Note that \LaTeXe{} still understands the \LaTeX~2.09 |\documentstyle| -command. This command causes \LaTeXe{} to enter \emph{\LaTeX~2.09 -compatibility mode}, which is described in Section~\ref{Sec:209}. - -You should not, however, use the |\documentstyle| command for new -documents because this compatibility mode is very slow and the new -features of \LaTeXe{} are not available in this mode. - -To help differentiate between classes and packages, document classes -now end with |.cls| rather than |.sty|. Packages still end with -|.sty|, since most \LaTeX~2.09 packages work well with \LaTeXe. - -\subsection{Class and package options} - -In \LaTeX~2.09, only document styles could have options such as -|twoside| or |draft|. In \LaTeXe{}, both classes and packages are -allowed to have options. For example, to specify a two-sided article -with graphics using the |dvips| driver, you write: - -\begin{verbatim} - \documentclass[twoside]{article} - \usepackage[dvips]{graphics} -\end{verbatim} -It is possible for packages to share common options. For example, -you could, in addition, load the \textsf{color} package by specifying: -\begin{verbatim} - \documentclass[twoside]{article} - \usepackage[dvips]{graphics} - \usepackage[dvips]{color} -\end{verbatim} -But because |\usepackage| allows more than one package to be listed, -this can be shortened to: -\begin{verbatim} - \documentclass[twoside]{article} - \usepackage[dvips]{graphics,color} -\end{verbatim} -In addition, packages will also use each option given to -the |\documentclass| command (if they know what to do with it), so you -could also write: -\begin{verbatim} - \documentclass[twoside,dvips]{article} - \usepackage{graphics,color} -\end{verbatim} -Class and package options are covered in more detail in -\emph{\LaTeXcomp} and in \emph{\clsguide}. - -\subsection{Standard classes} - -The following classes are distributed with \LaTeX: -\begin{description} - -\item[article] The |article| class described in \emph{\LaTeXbook}. -\item[book] The |book| class described in \emph{\LaTeXbook}. -\item[report] The |report| class described in \emph{\LaTeXbook}. -\item[letter] The |letter| class described in \emph{\LaTeXbook}. -\item[slides] The |slides| class described in \emph{\LaTeXbook}, - formerly \SLiTeX. -\item[proc] A document class for proceedings, based on |article|. - Formerly the |proc| package. -\item[ltxdoc] The document class for documenting the \LaTeX{} - program, based on |article|. -\item[ltxguide] The document class for \emph{\usrguide} and - \emph{\clsguide}, based on |article|. The document you are reading - now uses the |ltxguide| class. The layout for this class is likely - to change in future releases of \LaTeX. -\item[ltnews] The document class for the \emph{\LaTeX{} News} - information sheet, based on |article|. The layout for this class - is likely to change in future releases of \LaTeX. -\item[minimal] -\NEWfeature{1995/12/01} - This class is the bare minimum (3 lines) that is needed in a - \LaTeX\ class file. It just sets the text width and height, and - defines |\normalsize|. It is principally intended for debugging - and testing \LaTeX\ code in situations where you do not need to - load a `full' class such as |article|. If, however, you are - designing a completely new class that is aimed for documents with - structure radically different from the structure supplied by the - article class, then it may make sense to use this as a base and add - to it code implementing the required structure, rather than - starting from |article| and modifying the code there. -\end{description} - -\subsection{Standard packages} -\label{Sec:st-pack} - -The following packages are distributed with \LaTeX: -\begin{description} -\item[alltt] -\NEWfeature{1994/12/01} - This package provides the |alltt| environment, which is like - the |verbatim| environment except that |\|, |{|, and |}| - have their usual meanings. It is described in |alltt.dtx| and - \emph{\LaTeXbook}. -\item[doc] This is the basic package for typesetting the documentation - of \LaTeX{} programs. It is described in |doc.dtx| and in - \emph{\LaTeXcomp}. -\item[exscale] This provides scaled versions of the math extension - font. It is described in |exscale.dtx| and \emph{\LaTeXcomp}. - \item[fontenc] This is used to specify which font encoding \LaTeX{} - should use. It is described in |ltoutenc.dtx|. -\item[graphpap] -\NEWfeature{1994/12/01} - This package defines the |\graphpaper| command; this - can be used in a |picture| environment. -\item[ifthen] Provides commands of the form `if\dots then do\dots - otherwise do\dots'. - It is described in |ifthen.dtx| and \emph{\LaTeXcomp}. -\item[inputenc] -\NEWfeature{1994/12/01} - This is used to specify which input encoding \LaTeX{} should use. - It is described in |inputenc.dtx|. -\item[latexsym] \LaTeXe{} no longer loads the \LaTeX{} symbol font by - default. To access it, you should use the |latexsym| package. It - is described in |latexsym.dtx| and in \emph{\LaTeXcomp}; see also - Section~\ref{Sec:problems}. - \item[makeidx] This provides commands for producing indexes. It is - described in \emph{\LaTeXbook} and in \emph{\LaTeXcomp}. - \item[newlfont] This is used to emulate the font commands of - \LaTeX~2.09 with the New Font Selection Scheme. It is described in - \emph{\LaTeXcomp}. - \item[oldlfont] This is used to emulate the font commands of - \LaTeX~2.09. It is described in \emph{\LaTeXcomp}. - \item[showidx] - This causes the argument of each |\index| command to - be printed on the page where it occurs. - It is described in \emph{\LaTeXbook}. - \item[syntonly] This is used to process a document without - typesetting it. It is described in |syntonly.dtx| and in - \emph{\LaTeXcomp}. - \item[tracefnt] This allows you to control how much information about - \LaTeX's font loading is displayed. It is described in - \emph{\LaTeXcomp}. -\end{description} - -\subsection{Related software} - -\NEWdescription{1998/12/01} -The following software should be available from the same distributor -as your copy of \LaTeXe. You should obtain at least the -\textsf{graphics} and \textsf{tools} collections in order to have all -the files described in \emph{\LaTeXbook}. The |amsmath| package (part -of \textsf{amslatex} and formerly known as |amstex|) -and \textsf{babel} are also mentioned in the list -of `standard packages' in section C.5.2 of that book. -\begin{description} -\item[amslatex] Advanced mathematical typesetting from the American - Mathematical Society. This includes the |amsmath| package; it - provides many commands for typesetting mathematical formulas of - higher complexity. It is produced and supported by the American - Mathematical Society and it is described in \emph{\LaTeXcomp}. -\item[babel] This package and related files support typesetting in - many languages. It is described in \emph{\LaTeXcomp}. -\item[cyrillic] -\NEWfeature{1998/12/01} - Everything you need (except the fonts themselves) for - typesetting with Cyrillic fonts. -\item[graphics] This includes the |graphics| package which - provides support for the inclusion and transformation of graphics, - including files produced by other software. Also included, is the - |color| package which provides support for typesetting in colour. - Both these packages are described in \emph{\LaTeXbook}. -\item[psnfss] Everything you need (except the fonts themselves) for - typesetting with a large range of Type~1 (PostScript) fonts. -\item[tools] Miscellaneous packages written by the \LaTeX3 - project team. -\end{description} -These packages come with documentation and each of them is also -described in at least one of the books \emph{\LaTeXcomp} and -\emph{\LaTeXbook}. - -\subsubsection{Tools} - -This collection of packages includes, at least, the following (some -files may have slightly different names on certain systems): - -\begin{description} -\item[array] - Extended versions of the environments |array|, |tabular| - and |tabular*|, with many extra features. -\item[calc] -\NEWfeature{1996/12/01} - Enables the use of certain algebraic notation when specifying - values for lengths and counters. -\item[dcolumn] - Alignment on `decimal points' in tabular entries. Requires the - |array| package. -\item[delarray] - Adds `large delimiters' around arrays. Requires |array|. -\item[hhline] - Finer control over horizontal rules in tables. Requires |array|. -\item[longtable] - Multi-page tables. (Does not require |array|, but it uses the - extended features if both are loaded.) -\item[tabularx] - Defines a |tabularx| environment that is similar to |tabular*| - but it modifies the column widths, rather than the inter-column - space, to achieve the desired table width. -\item[afterpage] - Place text after the current page. -\item[bm] - Access bold math symbols. -\item[enumerate] - Extended version of the |enumerate| environment. -\item[fontsmpl] - Package and test file for producing `font samples'. -\item[ftnright] - Place all footnotes in the right-hand column in two-column mode. -\item[indentfirst] - Indent the first paragraph of sections, etc. -\item[layout] - Show the page layout defined by the current document class. -\item[multicol] - Typeset text in columns, with the length of the columns - `balanced'. -\item[rawfonts] - Preload fonts using the old internal font names of \LaTeX~2.09. - See Section~\ref{Sec:oldinternals}. -\item[somedefs] - Selective handling of package options. (Used by the rawfonts - package.) -\item[showkeys] - Prints the `keys' used by |\label|, |\ref|, |\cite| etc.; useful - whilst drafting. -\item[theorem] - Flexible declaration of `theorem-like' environments. -\item[varioref] - `Smart' handling of page references. -\item[verbatim] - Flexible extension of the verbatim environment. -\item[xr] - Cross reference other `external' documents. -\item[xspace] - `Smart space' command that helps you to avoid the common mistake - of missing spaces after command names. -\end{description} - - -\section{Commands} -\label{Sec:commands} - -This section describes the new commands available in \LaTeXe. -They are covered in more detail in \emph{\LaTeXbook} and in -\emph{\LaTeXcomp}. - -\subsection{Initial commands} - -Initial commands can appear only before the |\documentclass| -line. - -\begin{decl} -|\begin{filecontents}| \arg{file-name} \\ - \m{file-contents} \\ -|\end{filecontents}| -\end{decl} - -The |filecontents| environment is intended for bundling within a -single document file the contents of packages, options, or other -files. When the document file is run through \LaTeXe{} the body of -this environment is written verbatim (preceded by a comment line) to a -file whose name is given as the environment's only argument. However, -if that file already exists then nothing happens except for an -information message. - -Only normal ASCII text characters (7-bit visible text) should be -included in a |filecontents| environment. Anything else, such as tab -characters, form-feeds or 8-bit characters, should not be included in a -|filecontents| environment. - -Tabs and form feeds produce a warning, explaining that they are turned -into spaces or blank lines, respectively. -What happens to 8-bit characters depends on the \TeX{} installation and -is in general unpredictable. - -The |filecontents| environment is used for including \LaTeX{} files. -For other plain text files (such as Encapsulated PostScript files), -you should use the |filecontents*| environment which does not add a -comment line. - -These environments are allowed only before |\documentclass|. This -ensures that any packages that have been bundled in the document are -present when needed. - -\subsection{Preamble commands} -\label{Sec:pre} - -The changes to the preamble commands are intentionally designed to make -\LaTeXe{} documents look clearly different from old documents. The -commands should be used only before |\begin{document}|. - -\begin{decl} -|\documentclass| \oarg{option-list} \arg{class-name} - \oarg{release-date} -\end{decl} - -This command replaces the -\LaTeX~2.09 command |\documentstyle|. - -There must be exactly one |\documentclass| command in a document; and -it must come after the |filecontents| environments, if any, but before -any other commands. - -The \m{option-list} is a list of options, each of which may modify the -formatting of elements which are defined in the \m{class-name} file, -as well as those in all following |\usepackage| commands (see -below). - -The optional argument \m{release-date} can be used to specify the -earliest desired release date of the class file; it should contain a -date in the format \textsc{yyyy/mm/dd}. If a version of the class -older than this date is found, a warning is issued. - -For example, to specify a two-column article, using a version of -|article.cls| released after June 1994, you specify: -\begin{verbatim} - \documentclass[twocolumn]{article}[1994/06/01] -\end{verbatim} - -\begin{decl} -|\documentstyle| \oarg{option-list} \arg{class-name} -\end{decl} - -This command is still supported for compatibility with old files. It -is essentially the same as |\documentclass| except that it invokes -\emph{\LaTeX~2.09 compatibility mode}. It also causes any options in -the \m{option-list} that are not processed by the class file to be -loaded as packages after the class has been loaded. See -Section~\ref{Sec:209} for more details on \LaTeX~2.09 compatibility -mode. - -\begin{decl} -|\usepackage| \oarg{option-list} \arg{package-name} \oarg{release-date} -\end{decl} - -Any number of |\usepackage| commands is allowed. Each package file -(as denoted by \m{package-name}) defines new elements (or modifies -those defined in the class file loaded by the \m{class-name} argument -of the |\documentclass| command). A package file thus extends the -range of documents which can be processed. - -The \m{option-list} argument can contain a list of options, each of -which can modify the formatting of elements which are defined in this -\m{package-name} file. - -As above, \m{release-date} can contain the earliest desired release -date of the package file in the format \textsc{yyyy/mm/dd}; if an -older version of the package is found, a warning is issued. - -For example, to load the |graphics| package for the |dvips| driver, -using a version of |graphics.sty| released after June 1994, you write: -\begin{verbatim} - \usepackage[dvips]{graphics}[1994/06/01] -\end{verbatim} -Each package is loaded only once. If the same package is requested -more than once, nothing happens in the second or following attempt -unless the package has been requested with options that were not given -in the original |\usepackage|. If such extra options are specified -then an error message is produced. See Section~\ref{Sec:problems} how -to resolve this problem. - -As well as processing the options given in the \m{option-list} of the -|\usepackage| command, each package processes the -\m{option-list} of the |\documentclass| command as well. This -means that any option which should be processed by every package (to -be precise, by every package that specifies an action for it) can be -specified just once, in the |\documentclass| command, rather than -being repeated for each package that needs it. - -\begin{decl} -|\listfiles| -\end{decl} - -If this command is placed in the preamble then a list of the files -read in (as a result of processing the document) will be displayed -on the terminal (and in the log file) at the end of the run. Where -possible, a short description will also be produced. - -\NEWdescription{1995/12/01} -\emph{Warning}: this command will list only files which were read -using \LaTeX{} commands such as |\input|\arg{file} or -|\include|\arg{file}. If the file was read using the primitive \TeX{} -syntax |\input |\emph{file} (without |{ }| braces around the file name) -then it will not be listed; failure to use the \LaTeX{} form with the -braces can cause more severe problems, possibly leading to overwriting -important files, so \textbf{always put in the braces}. - - -\begin{decl} -|\setcounter{errorcontextlines}| \arg{num} -\end{decl} - -\TeX~3 introduced a new primitive |\errorcontextlines| which controls -the format of error messages. \LaTeXe\ provides an interface to this -through the standard |\setcounter| command. As most \LaTeX\ users do -not want to see the internal definitions of \LaTeX\ commands each time -they make an error, \LaTeXe{} sets this to $-1$ by default. - -\subsection{Document structure} - -The |book| document class introduces new commands to indicate -document structure. -\begin{decl} -|\frontmatter| \\ |\mainmatter| \\ |\backmatter| -\end{decl} -These commands indicate the beginning of the front matter (title page, -table of contents and prefaces), main matter (main text) and back -matter (bibliography, indexes and colophon). - -\subsection{Definitions} - -In \LaTeX, commands can have both mandatory and optional arguments, -for example in: -\begin{verbatim} - \documentclass[11pt]{article} -\end{verbatim} -the |11pt| argument is optional, whereas the |article| class name is -mandatory. - -In \LaTeX~2.09 users could define commands with arguments, but these -had to be mandatory arguments. With \LaTeXe, users can now define -commands and environments which also have one optional argument. - -\begin{decl} -|\newcommand| \arg{cmd} \oarg{num} \oarg{default} \arg{definition} \\ -|\newcommand*| \arg{cmd} \oarg{num} \oarg{default} \arg{definition} \\ -|\renewcommand| \arg{cmd} \oarg{num} \oarg{default} \arg{definition} \\ -|\renewcommand*| \arg{cmd} \oarg{num} \oarg{default} \arg{definition} -\end{decl} - -These commands have a new, second, optional argument; this is used for -defining commands which themselves take one optional argument. This -new argument is best introduced by means of a simple (and hence not -very practical) example: -\begin{verbatim} - \newcommand{\example}[2][YYY]{Mandatory arg: #2; - Optional arg: #1.} -\end{verbatim} -This defines |\example| to be a command with two arguments, referred -to as |#1| and |#2| in the \arg{definition}---nothing new so far. But -by adding a second optional argument to this |\newcommand| (the -|[YYY]|) the first argument (|#1|) of the newly defined command -|\example| is made optional with its default value being |YYY|. - -Thus the usage of |\example| is either: -\begin{verbatim} - \example{BBB} -\end{verbatim} -which prints: -\begin{quote} - Mandatory arg: BBB; - Optional arg: YYY. -\end{quote} -or: -\begin{verbatim} - \example[XXX]{AAA} -\end{verbatim} -which prints: -\begin{quote} - Mandatory arg: AAA; - Optional arg: XXX. -\end{quote} - -The default value of the optional argument is \texttt{YYY}. -This value is specified as the \oarg{default} argument of the -|\newcommand| that created |\example|. - -As another more useful example, the definition: -\begin{verbatim} - \newcommand{\seq}[2][n]{\lbrace #2_{0},\ldots,\,#2_{#1} \rbrace} -\end{verbatim} -means that the input |$\seq{a}$| produces -the formula $\lbrace a_{0},\ldots,\,a_{n} \rbrace$, -whereas the input |$\seq[k]{x}$| produces the formula -$\lbrace x_{0},\ldots,\,x_{k} \rbrace$. - -In summary, the command: -\begin{quote} - |\newcommand| \arg{cmd} \oarg{num} \oarg{default} \arg{definition} -\end{quote} -defines \m{cmd} to be a command with \m{num} arguments, the first of -which is optional and has default value \m{default}. - -Note that there can only be one optional argument but, as before, -there can be up to nine arguments in total. - -\begin{decl} -|\newenvironment| - \arg{cmd} \oarg{num} \oarg{default} \arg{beg-def} \arg{end-def} \\ -|\newenvironment*| - \arg{cmd} \oarg{num} \oarg{default} \arg{beg-def} \arg{end-def} \\ -|\renewenvironment| - \arg{cmd} \oarg{num} \oarg{default} \arg{beg-def} \arg{end-def} \\ -|\renewenvironment*| - \arg{cmd} \oarg{num} \oarg{default} \arg{beg-def} \arg{end-def} -\end{decl} - -\LaTeXe\ also supports the creation of environments that have one -optional argument. Thus the syntax of these two commands has -been extended in the same way as that of |\newcommand|. - -\begin{decl} -|\providecommand| \arg{cmd} \oarg{num} \oarg{default} \arg{definition} \\ -|\providecommand*| \arg{cmd} \oarg{num} \oarg{default} \arg{definition} -\end{decl} - -This takes the same arguments as |\newcommand|. If \m{cmd} is already -defined then the existing definition is kept; but if it is currently -undefined then the effect of |\providecommand| is to define \m{cmd} -just as if |\newcommand| had been used. - -\NEWfeature{1994/12/01} - All the above five `defining commands' now have \texttt{*}-forms that - are usually the better form to use when defining commands with - arguments, unless any of these arguments is intended to contain - whole paragraphs of text. Moreover, if you ever do find yourself - needing to use the non-star form then you should ask whether - that argument would not better be treated as the contents of a - suitably defined environment. - -\NEWfeature{1995/12/01} - The commands produced by the above five `defining commands' are - now robust. - -\subsection{Boxes} - -These next three commands for making LR-boxes all existed in -\LaTeX~2.09. They have been enhanced in two ways. - -\begin{decl} -|\makebox| \oarg{width} \oarg{pos} \arg{text} \\ -|\framebox| \oarg{width} \oarg{pos} \arg{text} \\ -|\savebox| \arg{cmd} \oarg{width} \oarg{pos} \arg{text} -\end{decl} - -One small but far-reaching change for \LaTeXe\ is that, within the -\m{width} argument only, four special lengths can be used. These are -all dimensions of the box that would be produced by using simply -|\mbox|\arg{text}: -\begin{itemize} -\item [] |\height|\quad its height above the baseline; -\item [] |\depth|\quad its depth below the baseline; -\item [] |\totalheight|\quad the sum of |\height| and |\depth|; -\item [] |\width|\quad its width. -\end{itemize} -Thus, to put `hello' in the centre of a box of twice its natural -width, you would use: -\begin{verbatim} - \makebox[2\width]{hello} -\end{verbatim} -Or you could put \textit{f} into a square box, like -this: - \framebox{\makebox[\totalheight]{\itshape f\/}} -\begin{verbatim} - \framebox{\makebox[\totalheight]{\itshape f\/}} -\end{verbatim} -Note that it is the total width of the framed box, including the -frame, which is set to |\totalheight|. - -The other change is a new possibility for \m{pos}: |s| has been added -to |l| and |r|. If \m{pos} is |s| then the text is stretched the full -length of the box, making use of any `rubber lengths' (including any -inter-word spaces) in the contents of the box. If no such `rubber -length' is present, an `underfull box' will probably be produced. - -\begin{decl} -|\parbox| \oarg{pos} \oarg{height} \oarg{inner-pos} \arg{width} - \arg{text} \\ -|\begin{minipage}| - \oarg{pos} \oarg{height} \oarg{inner-pos} \arg{width}\\ -\m{text}\\ -|\end{minipage}| -\end{decl} - -As for the box commands above, |\height|, |\width|, etc.~may be used -in the \oarg{height} argument to denote the natural dimensions of the -box. - -The \m{inner-pos} argument is new in \LaTeXe. It is the vertical -equivalent to the \m{pos} argument for |\makebox|, etc, determining -the position of \m{text} within the box. The \m{inner-pos} may be any -one of |t|, |b|, |c|, or |s|, denoting top, bottom, centered, or -`stretched' alignment respectively. When the \m{inner-pos} argument -is not specified, \LaTeX\ gives it same value as \m{pos} (this could be -the latter's default value). - - -\begin{decl} -|\begin{lrbox}| \arg{cmd}\\ -\m{text}\\ -|\end{lrbox}| -\end{decl} - -This is an environment which does not directly print anything. -Its effect is to save the typeset \m{text} in the bin \m{cmd}. Thus -it is like |\sbox| \arg{cmd} \arg{text}, except that any white space -before or after the contents \m{text} is ignored. - -This is very useful as it enables both the |\verb| command and the -\texttt{verbatim} environment to be used within \m{text}. - -It also makes it possible to define, for example, a `framed box' -environment. This is done by first using this environment to save -some text in a bin \m{cmd} and then calling -|\fbox{\usebox{|\m{cmd}|}}|. - -The following example defines an environment, called |fmpage|, that is -a framed version of |minipage|. -\begin{verbatim} - \newsavebox{\fmbox} - \newenvironment{fmpage}[1] - {\begin{lrbox}{\fmbox}\begin{minipage}{#1}} - {\end{minipage}\end{lrbox}\fbox{\usebox{\fmbox}}} -\end{verbatim} - - -\subsection{Measuring things} - -The first of these next commands was in \LaTeX~2.09. The two new -commands are the obvious analogues. - -\begin{decl} -|\settowidth| \arg{length-cmd} \arg{lr text} \\ -|\settoheight| \arg{length-cmd} \arg{lr text} \\ -|\settodepth| \arg{length-cmd} \arg{lr text} -\end{decl} - -\subsection{Line endings} - -\NEWdescription{1994/12/01} -The command |\\|, which is used to indicate a line-end in various -places, is now a robust command when used within arguments such as -section titles. - -Also, because it is often necessary to distinguish which type of line -is to be ended, we have introduced the following new command; it -has the same argument syntax as that of |\\|. -\begin{decl}[1994/12/01] -|\tabularnewline| \oarg{vertical-space} -\end{decl} -One example of its use is when the text in the last -column of a |tabular| environment is set with |\raggedright|; then -|\tabularnewline| can be used to indicate the end of a row of the -|tabular|, whilst |\\| will indicate the end of a line of text in a -paragraph within the column. This command can be used in the |array| -environment as well as |tabular|, and also the extended versions of -these environments offered by the \textsf{array} and \textsf{longtable} -packages in the tools collection. - -\subsection{Controlling page breaks} - -Sometimes it is necessary, for a final version of a document, to -`help' \LaTeX\ break the pages in the best way. \LaTeX~2.09 had a -variety of commands for this situation: |\clearpage|, |\pagebreak| -etc. \LaTeXe\ provides, in addition, commands which can produce -longer pages as well as shorter ones. - - -\begin{decl} -|\enlargethispage| \arg{size} \\ -|\enlargethispage*| \arg{size} -\end{decl} - -These commands increase the height of a page (from its normal value of -|\textheight|) by the specified amount \m{size}, a rigid length. This -change affects \emph{only} the current page. - -This can be used, for example, to allow an extra line to be fitted -onto the page or, with a negative length, to produce a page -shorter than normal. - -The star form also shrinks any vertical white space on the page as -much as possible, so as to fit the maximum amount of text on the -page. - -\NEWdescription{1995/12/01} -These commands do not change the position of the footer text; thus, if -a page is lengthened too far, the main text may overprint the footer. - -\subsection{Floats} - -There is a new command, |\suppressfloats|, and a new `float -specifier'. These will enable people to gain better -control of \LaTeX's float placement algorithm. - -\begin{decl} -|\suppressfloats| \oarg{placement} -\end{decl} - -This command stops any further floating environments from being placed -on the current page. With an optional argument, which should be either -|t| or |b| (not both), this restriction applies only to putting -further floats at the top or at the bottom. Any floats which would -normally be placed on this page are placed on the next page instead. - -\begin{decl} -The extra float location specifier: \ \texttt{!} -\end{decl} - -This can be used, along with at least one of \texttt{h}, \texttt{t}, -\texttt{b} and \texttt{p}, in the location optional argument of a -float. - -If a \texttt{!} is present then, just for this particular float, -whenever it is processed by the float mechanism the following are -ignored: -\begin{itemize} -\item all restrictions on the number of floats which can appear; -\item all explicit restrictions on the amount of space on a text page -which may be occupied by floats or must be occupied by text. -\end{itemize} -The mechanism will, however, still attempt to ensure that pages are -not overfull and that floats of the same type are printed in the -correct order. - -Note that its presence has no effect on the production of float pages. - -A \texttt{!} specifier overrides the effect of any |\suppressfloats| -command for this particular float. - -\subsection{Font changing: text} - -The font selection scheme used in \LaTeXe{} differs a lot from that -used in \LaTeX~2.09. In this section, we give a brief description of -the new commands. A more detailed description with examples is given -in \emph{\LaTeXcomp}, and the interface for class- and package-writers -is described in \emph{\fntguide}. - -\begin{decl} -|\rmfamily|\\ -|\sffamily|\\ -|\ttfamily|\\ -|\mdseries|\\ -|\bfseries|\\ -|\upshape|\\ -|\itshape|\\ -|\slshape|\\ -|\scshape| -\end{decl} - -These are font commands whose use is the same as the commands |\rm|, -|\bf|, etc. The difference is that each command changes just one -attribute of the font (the attribute changed is part of the name). -One result of this is that, for example, |\bfseries\itshape| produces -both a change of series and a change of shape, to give a bold italic -font. - -\begin{decl} -|\textrm|\arg{text}\\ -|\textsf|\arg{text}\\ -|\texttt|\arg{text}\\ -|\textmd|\arg{text}\\ -|\textbf|\arg{text}\\ -|\textup|\arg{text}\\ -|\textit|\arg{text}\\ -|\textsl|\arg{text}\\ -|\textsc|\arg{text}\\ -|\emph|\arg{text} -\end{decl} - -These are one-argument commands; they take as an argument the -text which is to be typeset in the particular font. They also -automatically insert italic corrections where appropriate; if you do -not like the result, you can add an italic correction with |\/| or -remove it with |\nocorr|. The |\nocorr| should always be the first or -last thing within the \arg{text} argument. - -\subsection{Font changing: math} - -Most of the fonts used within math mode do not need to be explicitly -invoked; but to use letters from a range of fonts, the following -class of commands is provided. - -\begin{decl} -|\mathrm| \arg{letters}\\ -|\mathnormal| \arg{letters}\\ -|\mathcal| \arg{letters}\\ -|\mathbf| \arg{letters}\\ -|\mathsf| \arg{letters}\\ -|\mathtt| \arg{letters}\\ -|\mathit| \arg{letters} -\end{decl} - -These are also one-argument commands which take as an argument the -letters which are to be typeset in the particular font. The argument -is processed in math mode so spaces within it will be ignored. Only -letters, digits and accents have their font changed, for example -|$\mathbf{\tilde A \times 1}$| produces $\mathbf{\tilde A \times 1}$. - -\subsection{Ensuring math mode} - -\begin{decl} -|\ensuremath| \arg{math commands} -\end{decl} - -In \LaTeX~2.09, if you wanted a command to work both in math mode and -in text mode, the suggested method was to define something like: -\begin{verbatim} - \newcommand{\Gp}{\mbox{$G_p$}} -\end{verbatim} -Unfortunately, the |\mbox| stops |\Gp| changing size correctly in (for -instance) subscripts or a fraction. - -In \LaTeXe{} you can define it thus: -\begin{verbatim} - \newcommand{\Gp}{\ensuremath{G_p}} -\end{verbatim} -Now |\Gp| will work correctly in all contexts. - -This is because the |\ensuremath| does nothing, producing simply -|G_p|, when |\Gp| is used within math mode; but it ensures that math -mode is entered (and exited) as required when |\Gp| is used in text -mode. - - -\subsection{Setting text superscripts} - -\begin{decl} -|\textsuperscript| \arg{text} -\end{decl} - -\NEWfeature{1995/06/01} In \LaTeX~2.09 textual superscripts such as -footnote markers were produced by internally entering math mode and -typesetting the number as a math superscript. This normally looked -fine since the digits in math fonts are the same as those in text -fonts when Computer Modern fonts are used. But when a different -document font (such as Times) is selected, the results look rather -strange. For this reason the command |\textsuperscript| has been -introduced which typesets its argument in the current text font, in a -superscript position and in the correct size. - -\subsection{Text commands: all encodings} - -\NEWdescription{1994/12/01} - One of the main differences between \LaTeXe{} and \LaTeX~2.09 is - that \LaTeXe{} can deal with fonts in arbitrary \emph{encodings}. - (A font encoding is the sequence of characters in the font---for - example a Cyrillic font would have a different encoding from a Greek - font.) - - The two major font encodings that are used for Latin languages such - as English or German are |OT1| (Donald Knuth's 7-bit encoding, which - has been used during most of \TeX's lifetime) and |T1| (the new - 8-bit `Cork' encoding). - - \LaTeX~2.09 only supported the |OT1| encoding, whereas \LaTeXe{} has - support for both |OT1| and |T1| built-in. The next section will - cover the new commands which are available if you have |T1|-encoded - fonts. This section describes new commands which are available in - all encodings. - - Most of these commands provide characters which were available in - \LaTeX~2.09 already. For example |\textemdash| gives an `em dash', - which was available in \LaTeX~2.09 by typing |---|. However, some - fonts (for example a Greek font) may not have the |---| ligature, - but you will still be able to access an em dash by typing - |\textemdash|. - -\begin{decl}[1994/12/01] - |\r{<text>}| -\end{decl} - This command gives a `ring' accent, for example `\r{o}' can be typed - |\r{o}|. - -\begin{decl}[1994/12/01] - |\SS| -\end{decl} - This command produces a German `SS', that is a capital `\ss'. This - letter can hyphenate differently from `SS', so is needed for entering - all-caps German. - -\begin{decl}[1994/12/01] - |\textcircled{<text>}| -\end{decl} - This command is used to build `circled characters' such as - |\copyright|. For example |\textcircled{a}| produces - \textcircled{a}. - -\begin{decl}[1994/12/01] - |\textcompwordmark| -\end{decl} - This command is used to separate letters which would normally - ligature. For example `f\textcompwordmark i' is produced with - |f\textcompwordmark i|. Note that the `f' and `i' have not - ligatured to produce `fi'. This is rarely useful in English - (`shelf\textcompwordmark ful' is a rare example of where it might be - used) but is used in languages such as German. - -\begin{decl}[1994/12/01] - |\textvisiblespace| -\end{decl} - This command produces a `visible space' character - `\textvisiblespace'. This is sometimes used in computer listings, - for example `type \textsf{hello\textvisiblespace world}'. - -\begin{decl}[1994/12/01] - |\textemdash| - |\textendash| - |\textexclamdown| - |\textquestiondown| \\ - |\textquotedblleft| - |\textquotedblright| - |\textquoteleft| - |\textquoteright| -\end{decl} - These commands produce characters which would otherwise be - accessed via ligatures: - \begin{center} - \begin{tabular}{ccl} - \emph{ligature} & \emph{character} & \emph{command} \\ - |---| & --- & |\textemdash| \\ - |--| & -- & |\textendash| \\ - |!`| & !` & |\textexclamdown| \\ - |?`| & ?` & |\textquestiondown| \\ - |``| & `` & |\textquotedblleft| \\ - |''| & '' & |\textquotedblright| \\ - |`| & ` & |\textquoteleft| \\ - |'| & ' & |\textquoteright| - \end{tabular} - \end{center} - The reason for making these characters directly accessible is so - that they will work in encodings which do not have these characters. - -\begin{decl}[1994/12/01] - |\textbullet| - |\textperiodcentered| -\end{decl} - These commands allow access to characters which were previously only - available in math mode: - \begin{center} - \begin{tabular}{lcl} - \emph{math command} & \emph{character} & \emph{text command} \\ - |\bullet| & $\bullet$ & |\textbullet| \\ - |\cdot| & $\cdot$ & |\textperiodcentered| - \end{tabular} - \end{center} - -\begin{decl}[1995/12/01] - |\textbackslash| - |\textbar| - |\textless| - |\textgreater| -\end{decl} - These commands allow access to ASCII characters which were - only available in verbatim or math mode: - \begin{center} - \begin{tabular}{lcl} - \emph{math command} & \emph{character} & \emph{text command} \\ - |\backslash| & $\backslash$ & |\textbackslash| \\ - |\mid| & $\mid$ & |\textbar| \\ - |<<| & $<$ & |\textless| \\ - |>>| & $>$ & |\textgreater| - \end{tabular} - \end{center} - -\begin{decl}[1995/12/01] - |\textasciicircum| - |\textasciitilde| -\end{decl} - These commands allow access to ASCII characters which were - previously only available in verbatim: - \begin{center} - \begin{tabular}{cl} - \emph{verbatim} & \emph{text command} \\ - |^| & |\textasciicircum| \\ - |~| & |\textasciitilde| - \end{tabular} - \end{center} - -\begin{decl}[1995/12/01] - |\textregistered| - |\texttrademark| -\end{decl} - These commands provide the `registered trademark' (R) and - `trademark' (TM) symbols. - -\subsection{Text commands: the T1 encoding} - -\NEWdescription{1994/12/01} - The |OT1| font encoding is fine for typesetting in English, but has - problems when typesetting other languages. The |T1| encoding solves - some of these problems, by providing extra characters (such as `eth' - and `thorn'), and it allows words containing accented letters to be - hyphenated (as long as you have a package like |babel| which allows - for non-American hyphenation). - - This section describes the commands you can use if you have the |T1| - fonts. To use them, you need to get the `ec fonts', or the - |T1|-encoded PostScript fonts, as used by \textsf{psnfss}. - All these fonts are - available by anonymous ftp in the Comprehensive \TeX{} Archive, and - are also available on the CD-ROMs \emph{4all \TeX} and - \emph{\TeX{} Live} (both available from the \TeX{} Users Group). - - You can then select the |T1| fonts by saying: -\begin{verbatim} - \usepackage[T1]{fontenc} -\end{verbatim} - This will allow you to use the commands in this section. - - \emph{Note:} Since this document must be processable on any site - running an up-to-date \LaTeX, it does not contain any characters - that are present only in |T1|-encoded fonts. This means that this - document cannot show you what these glyphs look like! If you want - to see them then run \LaTeX{} on the document |fontsmpl| and - respond `|cmr|' when it prompts you for a family name. - -\begin{decl}[1994/12/01] - |\k{<text>}| -\end{decl} - This command produces an `ogonek' accent. - -\begin{decl}[1994/12/01] - |\DH| - |\DJ| - |\NG| - |\TH| - |\dh| - |\dj| - |\ng| - |\th| -\end{decl} - These commands produce characters `eth', `dbar', `eng', and `thorn'. - -\begin{decl}[1994/12/01] - |\guillemotleft| - |\guillemotright| - |\guilsinglleft| - |\guilsinglright| \\ - |\quotedblbase| - |\quotesinglbase| - |\textquotedbl| -\end{decl} - % A local hack (could be improved): - \newcommand{\fauxguillemet}[1]{$\vcenter{\hbox{$\scriptscriptstyle#1$}}$} - These commands produce various sorts of quotation mark. - Rough representations of them are: - \fauxguillemet\ll a\fauxguillemet\gg{} - \fauxguillemet<a\fauxguillemet> - ,\kern -0.1em,\kern 0.05em a\kern -0.05em`` - ,\kern 0.05em a\kern -0.05em` and |"|a|"|. - -\NEWdescription{2001/06/01} - There are therefore some extra short-form ligatures available for - use in documents that will only be used with |T1|-encoded fonts. - - The guillemets |\guillemotleft| and |\guillemotright|% - \footnote{We apologise once again for maintaining Adobe's - enormous solipsism~(sic) of confusing a diving bird with - punctuation marks!} - can be obtained by typing |<<<<| and |>>>>| and |\quotedblbase| - by typing |,,|\,. - - Also, unlike the unexpected results with - |OT1|-encoded fonts, |<<| and |>>| will produce \textless{} and - \textgreater{}. - - Note also that the single character |"| will no longer produce '' - but rather |\textquotedbl|. - -\subsection{Logos} - -\begin{decl} -|\LaTeX|\\ -|\LaTeXe| -\end{decl} - -|\LaTeX| (producing `\LaTeX') is still the `main' logo command, -but if you need to refer to the new features, you can write -|\LaTeXe| (producing `\LaTeXe'). - -\subsection{Picture commands} - -\begin{decl} - |\qbezier[<N>](<AX>,<AY>)(<BX>,<BY>)(<CX>,<CY>)| \\ - | \bezier{<N>}(<AX>,<AY>)(<BX>,<BY>)(<CX>,<CY>)| -\end{decl} -The |\qbezier| command can be used in |picture| mode to draw a -quadratic Bezier curve from position |(<AX>,<AY>)| to |(<CX>,<CY>)| with -control point |(<BX>,<BY>)|. The optional argument \m{N} gives the -number of points on the curve. - -For example, the diagram: -\begin{center} - \begin{picture}(50,50) - \thicklines - \qbezier(0,0)(0,50)(50,50) - \qbezier[20](0,0)(50,0)(50,50) - \thinlines - \put(0,0){\line(1,1){50}} - \end{picture} -\end{center} -is drawn with: -\begin{verbatim} - \begin{picture}(50,50) - \thicklines - \qbezier(0,0)(0,50)(50,50) - \qbezier[20](0,0)(50,0)(50,50) - \thinlines - \put(0,0){\line(1,1){50}} - \end{picture} -\end{verbatim} -The |\bezier| command is the same, except that the argument \m{N} is not -optional. It is provided for compatibility with the \LaTeX~2.09 -|bezier| document style option. - -\subsection{Old commands} - -\begin{decl} -|\samepage| -\end{decl} - -The |\samepage| command still exists but is no longer being -maintained. -This is because it only ever worked erratically; it does not -guarantee that there will be no page-breaks within its scope; and -it can cause footnotes and marginals to be wrongly placed. - -We recommend using |\enlargethispage| in conjunction with page-break -commands such as |\newpage| and |\pagebreak| to help control page -breaks. - -\begin{decl} - |\SLiTeX| -\end{decl} -Since \SLiTeX{} no longer exists, the logo is no longer defined in the -\LaTeX{} kernel. A suitable replacement is |\textsc{Sli\TeX}|. The -\SLiTeX{} logo is defined in \LaTeX~2.09 compatibility mode. - -\begin{decl} -|\mho| |\Join| |\Box| |\Diamond| |\leadsto| \\ -|\sqsubset| |\sqsupset| |\lhd| |\unlhd| |\rhd| |\unrhd| -\end{decl} - -These symbols are contained in the \LaTeX{} symbol font, which was -automatically loaded by \LaTeX~2.09. However, \TeX{} has room for -only sixteen math font families; thus many users discovered that they -ran out. Because of this, \LaTeX{} does not load the \LaTeX{} symbol -font unless you use the \textsf{latexsym} package. - -These symbols are also made available, using different fonts, by the -\textsf{amsfonts} package, which also defines a large number of other -symbols. It is supplied by the American Mathematical Society. - -The \textsf{latexsym} package is loaded automatically in \LaTeX~2.09 -compatibility mode. - -\section{\LaTeX~2.09 documents} -\label{Sec:209} - -\LaTeXe{} can process (almost) any \LaTeX~2.09 document, by entering -\emph{\LaTeX~2.09 compatibility mode}. Nothing has changed, you run -\LaTeX{} in the same way you always did, and you will get much the -same results. - -The reason for the `almost' is that some \LaTeX~2.09 packages made use -of low-level unsupported features of \LaTeX. If you discover such a -package, you should find out if it has been updated to work with -\LaTeXe. Most packages will still work with \LaTeXe---the easiest way -to find out whether a package still works is to try it! - -\LaTeX~2.09 compatibility mode is a comprehensive emulation of -\LaTeX~2.09, but at the cost of time. Documents can run up to 50\% -slower in compatibility mode than they did under \LaTeX~2.09. -In addition, many of the new features of \LaTeXe{} are not available in -\LaTeX~2.09 compatibility mode. - -\subsection{Warning} - -\NEWdescription{1995/12/01} -This \emph{\LaTeX~2.09 compatibility mode} is provided solely to allow -you to process 2.09 documents, i.e.~documents that were written (we -hope, a long time ago) for a very old system and therefore could be -processed by using a genuine antique \LaTeX~2.09 system. - -This mode is therefore \emph{not} intended to provide access to the -enhanced features of \LaTeXe{}. Thus it must not be used to process -new documents which masquerade as 2.09 documents (i.e.~they begin with -|\documentstyle|) but which could not be processed using that genuine -antique \LaTeX~2.09 system because they contain some new, -\LaTeXe{}-only, commands or environments. - -To prevent such misuse of the system, and the consequent trouble it -causes when such misleadingly encoded documents are distributed, the -\emph{\LaTeX~2.09 compatibility mode} turns off most of these new -features and commands. Any attempt to use them will give you an error -message and, moreover, many of them simply will not work, whilst -others will produce unpredictable results. -So don't bother sending us any bug reports about such occurrences since -they are intentional. - - -\subsection{Font selection problems} -\label{Sec:fsprob} - -When using compatibility mode, it is possible that you will find -problems with font-changing commands in some old documents. These -problems are of two types: - -\begin{itemize} -\item producing error messages; -\item not producing the font changes you expected. -\end{itemize} - -In case of error messages it is possible that the document (or an old -style file used therein) contains references to old internal commands -which are no longer defined, see Section~\ref{Sec:oldinternals} for -more information if this is the case. - -\NEWdescription{1995/12/01} -One example of the unexpected is if you use one of the new style of -math-mode font changing command as follows: -\begin{verbatim} -$ \mathbf{xy} A $ -\end{verbatim} -You may well find that this behaves as if you had put: -\begin{verbatim} -$ \bf {xy} A $ -\end{verbatim} -everything including the $A$ coming out bold. - -\LaTeX~2.09 allowed sites to customize their \LaTeX{} installation, -which resulted in documents producing different results on different -\LaTeX{} installations. \LaTeXe{} no longer allows so much -customization but, for compatibility with old documents, the local -configuration file |latex209.cfg| is loaded every time \LaTeXe{} -enters \LaTeX~2.09 compatibility mode. - -For example, if your site was customized to use the New Font -Selection Scheme (\NFSS) with the |oldlfont| option, then you can -make \LaTeXe{} emulate this by creating a |latex209.cfg| file -containing the commands: -\begin{verbatim} -\ExecuteOptions{oldlfont}\RequirePackage{oldlfont} -\end{verbatim} -Similarly, to emulate \NFSS{} with the |newlfont| option, you can -create a |latex209.cfg| file containing: -\begin{verbatim} -\ExecuteOptions{newlfont}\RequirePackage{newlfont} -\end{verbatim} - - -\subsection{Native mode} -\label{Sec:native} - -To run an old document faster, and use the new features of -\LaTeXe, you should try using \emph{\LaTeXe{} native mode}. -This is done by replacing the command: -\begin{quote} - |\documentstyle[|\m{options}|,|\m{packages}|]|\arg{class} -\end{quote} -with: -\begin{quote} - |\documentclass|\oarg{options}\arg{class} \\ - |\usepackage{latexsym,|\m{packages}|}| -\end{quote} -However, some documents which can be processed in \LaTeX~2.09 -compatibility mode may not work in native mode. Some \LaTeX~2.09 -packages will only work with \LaTeXe{} in 2.09 compatibility mode. -Some documents will cause errors because of \LaTeXe's improved error -detection abilities. - -But most \LaTeX~2.09 documents can be processed by \LaTeXe{}'s native -mode with the above change. Again, the easiest way to find out -whether your documents can be processed in native mode is to try it! - - -\section{Local modifications} -\label{sec:loc} - -\NEWdescription{1995/12/01} -There are two common types of local modifications that can be done -very simply. Do not forget that documents produced using such -modifications will not be usable at other places (such documents are -called `non-portable'). - -One type of modification is the use of personal commands for commonly -used symbols or constructions. These should be put into a package -file (for example, one called \texttt{mymacros.sty}) and loaded by -putting |\usepackage{mymacros}| in the document preamble. - -Another type is a local document class that is very similar to one of -the standard classes but contains some straightforward modifications -such as extra environments, different values for some parameters, etc. -These should be put into a class file; here we shall describe a simple -method of constructing such a file using, as an example, a class -called \textsf{larticle} that is very similar to the \textsf{article} -class. - -\NEWfeature{1995/12/01} -The class file called \texttt{larticle.cls} should (after the -preliminary identification commands) start as follows: -\begin{verbatim} - \LoadClassWithOptions{article} -\end{verbatim} -This command should be followed by whatever additions and changes you -wish to make to the results of reading in the file -\texttt{article.sty}. - -The effect of using the above |\LoadClassWithOptions| command is to -load the standard class file \textsf{article} with whatever options -are asked for by the document. Thus a document using your -\textsf{larticle} class can specify any option that could be specified -when using the standard \textsf{article} class; for example: -\begin{verbatim} - \documentclass[a4paper,twocolumn,dvips]{larticle} -\end{verbatim} - - -\section{Problems} -\label{Sec:problems} - -This section describes some of the things which may go wrong when -using \LaTeXe, and what you can do about it. - -\subsection{New error messages} - -\LaTeXe{} has a number of new error messages. -Please also note that many error messages now produce further helpful -information if you press |h| in response to the error prompt. - -\begin{decl} -|Option clash for package |\m{package}|.| -\end{decl} -The named package has been loaded twice with different options. If -you enter |h| you will be told what the options were, for example, if -your document contained: -\begin{verbatim} - \usepackage[foo]{fred} - \usepackage[baz]{fred} -\end{verbatim} -then you will get the error message: -\begin{verbatim} - Option clash for package fred. -\end{verbatim} -and typing |h| at the |?| prompt will give you: -\begin{verbatim} - The package fred has already been loaded with options: - [foo] - There has now been an attempt to load it with options: - [baz] - Adding the line: - \usepackage[foo,baz]{fred} - to your document may fix this. - Try typing <<return>> to proceed. -\end{verbatim} -The cure is, as suggested, to load the package with both sets of -options. Note that since \LaTeX{} packages can call other packages, -it is possible to get a package option clash without explicitly -requesting the same package twice. - -\begin{decl} - |Command |\m{command}| not provided in base NFSS.| -\end{decl} -The \m{command} is not provided by default in \LaTeXe. This error is -generated by using one of the commands: -\begin{verbatim} - \mho \Join \Box \Diamond \leadsto - \sqsubset \sqsupset \lhd \unlhd \rhd \unrhd -\end{verbatim} -which are now part of the \textsf{latexsym} package. -The cure is to add: -\begin{verbatim} - \usepackage{latexsym} -\end{verbatim} -in the preamble of your document. - -\begin{decl} - |LaTeX2e command <command> in LaTeX 2.09 document.| -\end{decl} -The \m{command} is a \LaTeXe{} command but this is a \LaTeX~2.09 -document. The cure is to replace the command by a \LaTeX~2.09 -command, or to run document in native mode, as described in -Section~\ref{Sec:native}. - -\begin{decl} - |NFSS release 1 command \newmathalphabet found.| -\end{decl} -The command |\newmathalphabet| was used by the New Font Selection -Scheme Release 1 but it has now been replaced by -|\DeclareMathAlphabet|, the use of which is described in -\emph{\fntguide}. - -The best cure is to update the package which contained the -|\newmathalphabet| command. Find out if there is a new release of -the package, or (if you wrote the package yourself) consult -\emph{\fntguide} for the new syntax of font commands. - -If there is no updated version of the package then you can cure this -error by using the \textsf{newlfont} or \textsf{oldlfont} package, -which tells \LaTeX{} which version of |\newmathalphabet| should be -emulated. - -You should use \textsf{oldlfont} if the document selects math fonts with -syntax such as this: -\begin{quote} - |{\cal A}|, etc. -\end{quote} -Use \textsf{newlfont} if the document's syntax is like this: -\begin{quote} - |\cal{A}|, etc. -\end{quote} - - -\begin{decl} - |Text for \verb command ended by end of line.| -\end{decl} -The |\verb| command has been begun but not ended on that line. This -usually means that you have forgotten to put in the end-character of -the |\verb| command. - -\begin{decl} - |Illegal use of \verb command.| -\end{decl} -The |\verb| command has been used inside the argument of another -command. This has never been allowed in \LaTeX{}---often producing -incorrect output without any warning---and so \LaTeXe{} produces -an error message. - -\subsection{Old internal commands} -\label{Sec:oldinternals} - -A number of \LaTeX~2.09 internal commands have been removed, since -their functionality is now provided in a different way. See -\emph{\clsguide} for more details of the new, supported interface for -class and package writers. - -\begin{decl} - |\tenrm| |\elvrm| |\twlrm| \dots\\ - |\tenbf| |\elvbf| |\twlbf| \dots\\ - |\tensf| |\elvsf| |\twlsf| \dots\\ - $\vdots$ -\end{decl} -These commands provided access to the seventy fonts preloaded by -\LaTeX~2.09. In contrast, \LaTeXe{} normally preloads at most -fourteen fonts, which saves a lot of font memory; but a consequence is -that any \LaTeX{} file which used the above commands to directly -access fonts will no longer work. - -Their use will usually produce an error message such as: -\begin{verbatim} - ! Undefined control sequence. - l.5 \tenrm -\end{verbatim} -The cure for this is to update the document to use the new -font-changing commands provided by \LaTeXe; these are described in -\emph{\fntguide}. - -If this is not possible then, as a last resort, you can -use the \textsf{rawfonts} package, which loads the -seventy \LaTeX~2.09 fonts and provides direct access to them using the -old commands. This takes both time and memory. If you do not -wish to load all seventy fonts, you can select some of them by using the -|only| option to \textsf{rawfonts}. For example, to load only |tenrm| -and |tenbf| you write: -\begin{verbatim} - \usepackage[only,tenrm,tenbf]{rawfonts} -\end{verbatim} - -The \textsf{rawfonts} package is distributed as part of the \LaTeX{} -tools software, see Section~\ref{Sec:st-pack}. - -\subsection{Old files} - -One of the more common mistakes in running \LaTeX{} is to read in old -versions of packages instead of the new versions. If you get an -incomprehensible error message from a standard package, make sure you -are loading the most recent version of the package. You can find out -which version of the package has been loaded by looking in the log -file for a line like: -\begin{verbatim} - Package: fred 1994/06/01 v0.01 Fred's package. -\end{verbatim} -You can use the \m{release-date} options to |\documentclass| and -|\usepackage| to make sure that you are getting a suitably recent copy -of the document class or package. This is useful when sending a -document to another site, which may have out-of-date software. - -\subsection{Where to go for more help} - -If you can't find the answer for your problem here, try looking in -\emph{\LaTeXbook} or \emph{\LaTeXcomp}. If you have a problem with -installing \LaTeX, look in the installation guide files which come with -the distribution. - -If this doesn't help, contact your local \LaTeX{} guru or local -\LaTeX{} mailing list. - -If you think you've discovered a bug then please report it! First, -you should find out if the problem is with a third-party package or -class. If the problem is caused by a package or class other than -those listed in Section~\ref{Sec:class+packages} then please report -the problem to the author of the package or class, not to the \LaTeX3 -project team. - -If the bug really is with core \LaTeX{} then you should create a -\emph{short}, \emph{self-contained} document which exhibits the -problem. You should run a \emph{recent} (less than a year old) -version of \LaTeX{} on the file and then run \LaTeX{} on -|latexbug.tex|. This will create an error report which you should -send, together with the sample document and log file, to the -\LaTeX{} bugs address which can be found in the file -|latexbug.tex| or |bugs.txt|. - - -\section{Enjoy!} -\label{Sec:enjoy} - -We certainly hope you will enjoy using the new standard \LaTeX{} but, -if this is not possible, we hope that you will enjoy success and -fulfillment as a result of the documents which it will help you to -create. - -If you find that the contribution of \LaTeX{} to your life is such -that you would like to support the work of the project team, then -please read Section~\ref{Sec:ltx3} and discover practical ways to do -this. - -\begin{thebibliography}{1} - -\bibitem{A-W:GRM97} -Michel Goossens, Sebastian Rahtz and Frank Mittelbach. -\newblock {\em The {\LaTeX} Graphics Companion}. -\newblock Addison-Wesley, Reading, Massachusetts, 1997. - - -\bibitem{A-W:GR99} -Michel Goossens and Sebastian Rahtz. -\newblock {\em The {\LaTeX} Web Companion}. -\newblock Addison-Wesley, Reading, Massachusetts, 1999. - - -\bibitem{A-W:DEK91} -Donald~E. Knuth. -\newblock {\em The \TeX book}. -\newblock Addison-Wesley, Reading, Massachusetts, 1986. -\newblock Revised to cover \TeX3, 1991. - - -\bibitem{A-W:LLa94} -Leslie Lamport. -\newblock {\em {\LaTeX:} A Document Preparation System}. -\newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994. - -\bibitem{A-W:MG2004} -Frank Mittelbach and Michel Goossens. -\newblock {\em The {\LaTeX} Companion second edition}. -\newblock With Johannes Braams, David Carlisle, and Chris Rowley. -\newblock Addison-Wesley, Reading, Massachusetts, 2004. - - -\end{thebibliography} - -\end{document} diff --git a/Master/texmf-dist/source/latex/base/utf8ienc.dtx b/Master/texmf-dist/source/latex/base/utf8ienc.dtx index 5ba2a3c1c01..7495ecdab4a 100644 --- a/Master/texmf-dist/source/latex/base/utf8ienc.dtx +++ b/Master/texmf-dist/source/latex/base/utf8ienc.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 19932014 +% Copyright 1993-2015 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -39,6 +39,7 @@ and code cleanup by Javier Bezos}} \usepackage[utf8]{inputenc} \begin{document} + \MaintainedByLaTeXTeam{latex} \maketitle \tableofcontents \DocInput{utf8ienc.dtx} @@ -180,7 +181,7 @@ % declaration |\DeclareUnicodeCharacter| which maps Unicode numbers % (as hexadecimal) to \LaTeX{} internal forms. % -% This mapping needs to be set up only once so here it is done at +% This mapping needs to be set up only once so it is done at % |\begin{document}| by looking at the list of font encodings that % are loaded by the document and providing mappings related to % those font encodings whenever these are available. Thus at most @@ -411,9 +412,9 @@ % % \begin{macrocode} \gdef\DeclareUnicodeCharacter#1#2{% - \count@"#1\relax - \wlog{ \space\space defining Unicode char U+#1 (decimal \the\count@)}% - \begingroup + \count@"#1\relax + \wlog{ \space\space defining Unicode char U+#1 (decimal \the\count@)}% + \begingroup % \end{macrocode} % Next we do the parsing of the number stored in |\count@| and assign the % result to |\UTFviii@tmp|. Actually all this could be done in-line, @@ -659,7 +660,7 @@ % % The list below was generated by looking at the current \LaTeX{} font % encoding files, e.g., \texttt{t1enc.def} and using the work by -% Sebastian Rahtz in (\texttt{ucharacters.sty}), with a few +% Sebastian Rahtz (in \texttt{ucharacters.sty}) with a few % modifications. In combinations such as |\^\i| the preferred form % is that and not |\^i|. % @@ -724,7 +725,9 @@ %<all,ts1>\DeclareUnicodeCharacter{00A8}{\textasciidieresis} %<all,ts1,utf8>\DeclareUnicodeCharacter{00A9}{\textcopyright} %<all,ts1,ly1,utf8>\DeclareUnicodeCharacter{00AA}{\textordfeminine} -%<all,x2,t2c,t2b,t2a,t1,ot2,ly1,lcy>\DeclareUnicodeCharacter{00AB}{\guillemotleft} +%<*all,x2,t2c,t2b,t2a,t1,ot2,ly1,lcy> +\DeclareUnicodeCharacter{00AB}{\guillemotleft} +%</all,x2,t2c,t2b,t2a,t1,ot2,ly1,lcy> %<all,ts1>\DeclareUnicodeCharacter{00AC}{\textlnot} %<all,ts1,ly1,utf8>\DeclareUnicodeCharacter{00AE}{\textregistered} %<all,ts1>\DeclareUnicodeCharacter{00AF}{\textasciimacron} @@ -739,7 +742,9 @@ %<all,ot1>\DeclareUnicodeCharacter{00B8}{\c\ } %<all,ts1>\DeclareUnicodeCharacter{00B9}{\textonesuperior} %<all,ts1,ly1,utf8>\DeclareUnicodeCharacter{00BA}{\textordmasculine} -%<all,x2,t2c,t2b,t2a,t1,ot2,ly1,lcy>\DeclareUnicodeCharacter{00BB}{\guillemotright} +%<*all,x2,t2c,t2b,t2a,t1,ot2,ly1,lcy> +\DeclareUnicodeCharacter{00BB}{\guillemotright} +%</all,x2,t2c,t2b,t2a,t1,ot2,ly1,lcy> %<all,ts1,ly1>\DeclareUnicodeCharacter{00BC}{\textonequarter} %<all,ts1,ly1>\DeclareUnicodeCharacter{00BD}{\textonehalf} %<all,ts1,ly1>\DeclareUnicodeCharacter{00BE}{\textthreequarters} @@ -883,10 +888,14 @@ % \changes{v1.1j}{2007/11/09}{Added a few new unicode decls in cyrillic (pr/3988)} % \changes{v1.1k}{2007/11/11}{Added and further unicode decls in cyrillic} % \begin{macrocode} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0400}{\@tabacckludge`\CYRE} +%<*all,x2,t2c,t2b,t2a,ot2,lcy> +\DeclareUnicodeCharacter{0400}{\@tabacckludge`\CYRE} +%</all,x2,t2c,t2b,t2a,ot2,lcy> %<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0401}{\CYRYO} %<all,x2,t2a,ot2>\DeclareUnicodeCharacter{0402}{\CYRDJE} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0403}{\@tabacckludge`\CYRG} +%<*all,x2,t2c,t2b,t2a,ot2,lcy> +\DeclareUnicodeCharacter{0403}{\@tabacckludge`\CYRG} +%</all,x2,t2c,t2b,t2a,ot2,lcy> %<all,x2,t2a,ot2,lcy>\DeclareUnicodeCharacter{0404}{\CYRIE} %<all,x2,t2c,t2b,t2a,ot2>\DeclareUnicodeCharacter{0405}{\CYRDZE} %<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0406}{\CYRII} @@ -895,78 +904,84 @@ %<all,x2,t2b,t2a,ot2>\DeclareUnicodeCharacter{0409}{\CYRLJE} %<all,x2,t2b,t2a,ot2>\DeclareUnicodeCharacter{040A}{\CYRNJE} %<all,x2,t2a,ot2>\DeclareUnicodeCharacter{040B}{\CYRTSHE} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{040C}{\@tabacckludge`\CYRK} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{040D}{\@tabacckludge`\CYRI} +%<*all,x2,t2c,t2b,t2a,ot2,lcy> +\DeclareUnicodeCharacter{040C}{\@tabacckludge`\CYRK} +\DeclareUnicodeCharacter{040D}{\@tabacckludge`\CYRI} +%</all,x2,t2c,t2b,t2a,ot2,lcy> %<all,x2,t2b,t2a,lcy>\DeclareUnicodeCharacter{040E}{\CYRUSHRT} %<all,x2,t2c,t2a,ot2>\DeclareUnicodeCharacter{040F}{\CYRDZHE} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0410}{\CYRA} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0411}{\CYRB} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0412}{\CYRV} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0413}{\CYRG} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0414}{\CYRD} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0415}{\CYRE} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0416}{\CYRZH} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0417}{\CYRZ} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0418}{\CYRI} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0419}{\CYRISHRT} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{041A}{\CYRK} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{041B}{\CYRL} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{041C}{\CYRM} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{041D}{\CYRN} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{041E}{\CYRO} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{041F}{\CYRP} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0420}{\CYRR} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0421}{\CYRS} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0422}{\CYRT} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0423}{\CYRU} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0424}{\CYRF} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0425}{\CYRH} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0426}{\CYRC} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0427}{\CYRCH} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0428}{\CYRSH} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0429}{\CYRSHCH} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{042A}{\CYRHRDSN} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{042B}{\CYRERY} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{042C}{\CYRSFTSN} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{042D}{\CYREREV} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{042E}{\CYRYU} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{042F}{\CYRYA} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0430}{\cyra} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0431}{\cyrb} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0432}{\cyrv} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0433}{\cyrg} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0434}{\cyrd} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0435}{\cyre} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0436}{\cyrzh} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0437}{\cyrz} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0438}{\cyri} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0439}{\cyrishrt} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{043A}{\cyrk} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{043B}{\cyrl} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{043C}{\cyrm} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{043D}{\cyrn} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{043E}{\cyro} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{043F}{\cyrp} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0440}{\cyrr} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0441}{\cyrs} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0442}{\cyrt} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0443}{\cyru} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0444}{\cyrf} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0445}{\cyrh} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0446}{\cyrc} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0447}{\cyrch} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0448}{\cyrsh} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0449}{\cyrshch} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{044A}{\cyrhrdsn} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{044B}{\cyrery} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{044C}{\cyrsftsn} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{044D}{\cyrerev} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{044E}{\cyryu} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{044F}{\cyrya} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0450}{\@tabacckludge`\cyre} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0451}{\cyryo} +%<*all,x2,t2c,t2b,t2a,ot2,lcy> +\DeclareUnicodeCharacter{0410}{\CYRA} +\DeclareUnicodeCharacter{0411}{\CYRB} +\DeclareUnicodeCharacter{0412}{\CYRV} +\DeclareUnicodeCharacter{0413}{\CYRG} +\DeclareUnicodeCharacter{0414}{\CYRD} +\DeclareUnicodeCharacter{0415}{\CYRE} +\DeclareUnicodeCharacter{0416}{\CYRZH} +\DeclareUnicodeCharacter{0417}{\CYRZ} +\DeclareUnicodeCharacter{0418}{\CYRI} +\DeclareUnicodeCharacter{0419}{\CYRISHRT} +\DeclareUnicodeCharacter{041A}{\CYRK} +\DeclareUnicodeCharacter{041B}{\CYRL} +\DeclareUnicodeCharacter{041C}{\CYRM} +\DeclareUnicodeCharacter{041D}{\CYRN} +\DeclareUnicodeCharacter{041E}{\CYRO} +\DeclareUnicodeCharacter{041F}{\CYRP} +\DeclareUnicodeCharacter{0420}{\CYRR} +\DeclareUnicodeCharacter{0421}{\CYRS} +\DeclareUnicodeCharacter{0422}{\CYRT} +\DeclareUnicodeCharacter{0423}{\CYRU} +\DeclareUnicodeCharacter{0424}{\CYRF} +\DeclareUnicodeCharacter{0425}{\CYRH} +\DeclareUnicodeCharacter{0426}{\CYRC} +\DeclareUnicodeCharacter{0427}{\CYRCH} +\DeclareUnicodeCharacter{0428}{\CYRSH} +\DeclareUnicodeCharacter{0429}{\CYRSHCH} +\DeclareUnicodeCharacter{042A}{\CYRHRDSN} +\DeclareUnicodeCharacter{042B}{\CYRERY} +\DeclareUnicodeCharacter{042C}{\CYRSFTSN} +\DeclareUnicodeCharacter{042D}{\CYREREV} +\DeclareUnicodeCharacter{042E}{\CYRYU} +\DeclareUnicodeCharacter{042F}{\CYRYA} +\DeclareUnicodeCharacter{0430}{\cyra} +\DeclareUnicodeCharacter{0431}{\cyrb} +\DeclareUnicodeCharacter{0432}{\cyrv} +\DeclareUnicodeCharacter{0433}{\cyrg} +\DeclareUnicodeCharacter{0434}{\cyrd} +\DeclareUnicodeCharacter{0435}{\cyre} +\DeclareUnicodeCharacter{0436}{\cyrzh} +\DeclareUnicodeCharacter{0437}{\cyrz} +\DeclareUnicodeCharacter{0438}{\cyri} +\DeclareUnicodeCharacter{0439}{\cyrishrt} +\DeclareUnicodeCharacter{043A}{\cyrk} +\DeclareUnicodeCharacter{043B}{\cyrl} +\DeclareUnicodeCharacter{043C}{\cyrm} +\DeclareUnicodeCharacter{043D}{\cyrn} +\DeclareUnicodeCharacter{043E}{\cyro} +\DeclareUnicodeCharacter{043F}{\cyrp} +\DeclareUnicodeCharacter{0440}{\cyrr} +\DeclareUnicodeCharacter{0441}{\cyrs} +\DeclareUnicodeCharacter{0442}{\cyrt} +\DeclareUnicodeCharacter{0443}{\cyru} +\DeclareUnicodeCharacter{0444}{\cyrf} +\DeclareUnicodeCharacter{0445}{\cyrh} +\DeclareUnicodeCharacter{0446}{\cyrc} +\DeclareUnicodeCharacter{0447}{\cyrch} +\DeclareUnicodeCharacter{0448}{\cyrsh} +\DeclareUnicodeCharacter{0449}{\cyrshch} +\DeclareUnicodeCharacter{044A}{\cyrhrdsn} +\DeclareUnicodeCharacter{044B}{\cyrery} +\DeclareUnicodeCharacter{044C}{\cyrsftsn} +\DeclareUnicodeCharacter{044D}{\cyrerev} +\DeclareUnicodeCharacter{044E}{\cyryu} +\DeclareUnicodeCharacter{044F}{\cyrya} +\DeclareUnicodeCharacter{0450}{\@tabacckludge`\cyre} +\DeclareUnicodeCharacter{0451}{\cyryo} +%</all,x2,t2c,t2b,t2a,ot2,lcy> %<all,x2,t2a,ot2>\DeclareUnicodeCharacter{0452}{\cyrdje} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0453}{\@tabacckludge`\cyrg} +%<*all,x2,t2c,t2b,t2a,ot2,lcy> +\DeclareUnicodeCharacter{0453}{\@tabacckludge`\cyrg} +%</all,x2,t2c,t2b,t2a,ot2,lcy> %<all,x2,t2a,ot2,lcy>\DeclareUnicodeCharacter{0454}{\cyrie} %<all,x2,t2c,t2b,t2a,ot2>\DeclareUnicodeCharacter{0455}{\cyrdze} %<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{0456}{\cyrii} @@ -975,8 +990,10 @@ %<all,x2,t2b,t2a,ot2>\DeclareUnicodeCharacter{0459}{\cyrlje} %<all,x2,t2b,t2a,ot2>\DeclareUnicodeCharacter{045A}{\cyrnje} %<all,x2,t2a,ot2>\DeclareUnicodeCharacter{045B}{\cyrtshe} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{045C}{\@tabacckludge`\cyrk} -%<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{045D}{\@tabacckludge`\cyri} +%<*all,x2,t2c,t2b,t2a,ot2,lcy> +\DeclareUnicodeCharacter{045C}{\@tabacckludge`\cyrk} +\DeclareUnicodeCharacter{045D}{\@tabacckludge`\cyri} +%</all,x2,t2c,t2b,t2a,ot2,lcy> %<all,x2,t2b,t2a,lcy>\DeclareUnicodeCharacter{045E}{\cyrushrt} %<all,x2,t2c,t2a,ot2>\DeclareUnicodeCharacter{045F}{\cyrdzhe} %<all,x2,ot2>\DeclareUnicodeCharacter{0462}{\CYRYAT} @@ -1156,27 +1173,37 @@ %<all,t2b>\DeclareUnicodeCharacter{04FF}{\cyrhhcrs} %<all,ts1>\DeclareUnicodeCharacter{0E3F}{\textbaht} %<all,x2,t2c,t2b,t2a,t1,utf8>\DeclareUnicodeCharacter{200C}{\textcompwordmark} -%<all,x2,t2c,t2b,t2a,t1,ot2,ot1,ly1,lcy>\DeclareUnicodeCharacter{2013}{\textendash} -%<all,x2,t2c,t2b,t2a,t1,ot2,ot1,ly1,lcy>\DeclareUnicodeCharacter{2014}{\textemdash} +%<*all,x2,t2c,t2b,t2a,t1,ot2,ot1,ly1,lcy> +\DeclareUnicodeCharacter{2013}{\textendash} +\DeclareUnicodeCharacter{2014}{\textemdash} +%</all,x2,t2c,t2b,t2a,t1,ot2,ot1,ly1,lcy> %<all,ts1>\DeclareUnicodeCharacter{2016}{\textbardbl} -%<all,x2,t2c,t2b,t2a,t1,ot2,ot1,lcy>\DeclareUnicodeCharacter{2018}{\textquoteleft} -%<all,x2,t2c,t2b,t2a,t1,ot2,ot1,lcy>\DeclareUnicodeCharacter{2019}{\textquoteright} +%<*all,x2,t2c,t2b,t2a,t1,ot2,ot1,lcy> +\DeclareUnicodeCharacter{2018}{\textquoteleft} +\DeclareUnicodeCharacter{2019}{\textquoteright} +%</all,x2,t2c,t2b,t2a,t1,ot2,ot1,lcy> %<all,t1>\DeclareUnicodeCharacter{201A}{\quotesinglbase} -%<all,x2,t2c,t2b,t2a,t1,ot2,ot1,ly1,lcy>\DeclareUnicodeCharacter{201C}{\textquotedblleft} -%<all,x2,t2c,t2b,t2a,t1,ot2,ot1,ly1,lcy>\DeclareUnicodeCharacter{201D}{\textquotedblright} +%<*all,x2,t2c,t2b,t2a,t1,ot2,ot1,ly1,lcy> +\DeclareUnicodeCharacter{201C}{\textquotedblleft} +\DeclareUnicodeCharacter{201D}{\textquotedblright} +%</all,x2,t2c,t2b,t2a,t1,ot2,ot1,ly1,lcy> %<all,x2,t2c,t2b,t2a,t1,lcy>\DeclareUnicodeCharacter{201E}{\quotedblbase} %<all,ts1,oms,ly1>\DeclareUnicodeCharacter{2020}{\textdagger} %<all,ts1,oms,ly1>\DeclareUnicodeCharacter{2021}{\textdaggerdbl} %<all,ts1,oms,ly1>\DeclareUnicodeCharacter{2022}{\textbullet} %<all,ly1,utf8>\DeclareUnicodeCharacter{2026}{\textellipsis} -%<all,x2,ts1,t2c,t2b,t2a,t1,ly1>\DeclareUnicodeCharacter{2030}{\textperthousand} -%<all,x2,ts1,t2c,t2b,t2a,t1>\DeclareUnicodeCharacter{2031}{\textpertenthousand} +%<*all,x2,ts1,t2c,t2b,t2a,t1,ly1> +\DeclareUnicodeCharacter{2030}{\textperthousand} +%</all,x2,ts1,t2c,t2b,t2a,t1,ly1> +%<*all,x2,ts1,t2c,t2b,t2a,t1> +\DeclareUnicodeCharacter{2031}{\textpertenthousand} +%</all,x2,ts1,t2c,t2b,t2a,t1> %<all,t1,ly1>\DeclareUnicodeCharacter{2039}{\guilsinglleft} %<all,t1,ly1>\DeclareUnicodeCharacter{203A}{\guilsinglright} %<all,ts1>\DeclareUnicodeCharacter{203B}{\textreferencemark} %<all,ts1>\DeclareUnicodeCharacter{203D}{\textinterrobang} %<all,ts1>\DeclareUnicodeCharacter{2044}{\textfractionsolidus} -%<all,ts1>\DeclareUnicodeCharacter{204E}{\textasteriskcentered} % LOW ASTERISK +%<all,ts1>\DeclareUnicodeCharacter{204E}{\textasteriskcentered} %<all,ts1>\DeclareUnicodeCharacter{2052}{\textdiscount} %<all,ts1>\DeclareUnicodeCharacter{20A1}{\textcolonmonetary} %<all,ts1>\DeclareUnicodeCharacter{20A4}{\textlira} @@ -1215,7 +1242,9 @@ % area where inputenc is notoriously confused. % \begin{verbatim} % %<all,ts1,t1,ot1,ly1>\DeclareUnicodeCharacter{00A3}{\textsterling} -% %<all,x2,ts1,t2c,t2b,t2a,oms,ly1>\DeclareUnicodeCharacter{00A7}{\textsection} +% %<*all,x2,ts1,t2c,t2b,t2a,oms,ly1> +% \DeclareUnicodeCharacter{00A7}{\textsection} +% %</all,x2,ts1,t2c,t2b,t2a,oms,ly1> % %<all,ts1,utf8>\DeclareUnicodeCharacter{00A9}{\textcopyright} % %<all,ts1>\DeclareUnicodeCharacter{00B1}{\textpm} % %<all,ts1,oms,ly1>\DeclareUnicodeCharacter{00B6}{\textparagraph} @@ -1354,7 +1383,8 @@ \inputencoding{latin1} % switch to latin1 German umlauts in UTF-8 but read by latin1 (and will produce one - error since \verb=\textcurrency= is not provided): ^^c3^^a4^^c3^^b6^^c3^^bc + error since \verb=\textcurrency= is not provided): + ^^c3^^a4^^c3^^b6^^c3^^bc \inputencoding{utf8} % switch back to utf8 diff --git a/Master/texmf-dist/source/latex/base/webcomp.err b/Master/texmf-dist/source/latex/base/webcomp.err deleted file mode 100644 index 48537411cd3..00000000000 --- a/Master/texmf-dist/source/latex/base/webcomp.err +++ /dev/null @@ -1,381 +0,0 @@ -\newcommand\erratafiledate{1999/06/05} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% To produce a printed version of this errata file run this file through -% LaTeX. It will unpack a small class file (if not already present) and -% a configuration file with the extension .cfg. You might want to modify -% the setting in this configuration file to print only a partial errata -% suitable for your printed revision of this book, see details in the -% .cfg file. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - -\begin{filecontents}{ttcterrata.cls} -%% -%% Copyright (C) 1997,2004,2005,2007 Frank Mittelbach -%% This class file is licenced under LPPL latest version; -%% see http://www.latex-project.org/lppl -% -% -% It sets up a few commands used to format the errata entries for books in the -% Addison-Wesley Series: -% -% Tools and Techniques for Computer Typesetting -% -% hence the name. However, anybody who likes to use it is free to apply it for -% errata files of other books. -% -% Changes: -% -% v1.0a - changed name from errata.cls to ttcterrata.cls - -\ProvidesClass{ttcterrata} - [2007/11/10 v1.0a Mini class for errata files; subject to change (FMi)] - -\LoadClass{article} - -\setcounter{secnumdepth}{-1} -\addtolength\textwidth{5cm} -\addtolength\oddsidemargin{-3cm} - -\addtolength\textheight{36pt} - -\RequirePackage{shortvrb} -\MakeShortVerb{\|} - -\RequirePackage{array,longtable} -\RequirePackage{multicol} - - -\newcommand\erratagetnumber{} -\def\erratagetnumber#1/#2/#3\erratagetnumber{#1#2#3} - - -\newcommand\gobbleerrata{% - \setbox\@tempboxa\vbox\bgroup - \let\endgobble\egroup - \let\hideamp\relax - \let\\\relax\let\par\@@par} - -\newcommand*\hideamp{&} - -\let\endgobble\relax - - -\newcommand\erratastartdate{} -\newcommand\myprinting{1} - - -\newcommand\doweprint[2]{% - \ifnum \myprinting < \if!#2!1000 \else \ifx s#2 1000\else#2 \fi\fi - \ifnum \expandafter\erratagetnumber\erratastartdate\erratagetnumber < - \erratagetnumber#1\erratagetnumber \relax - \@tempswatrue - \else - \@tempswafalse - \fi - \else - \@tempswafalse - \fi -} - - - -\newcommand\includedentries{entries after = \erratastartdate} -\newcommand\printedentries{between \erratastartdate\space and} - -\newcommand\showallerrors{% - \renewcommand\includedentries{all errata entries}% - \renewcommand\printedentries{up to} - \renewcommand\doweprint[2]{\@tempswatrue}} - - -\newcommand\displayrevisionfix[2]{% - \if!#2!\textbf{#1}\else\textit{#1}\rlap{\textsuperscript{#2}}\fi} - -\newcommand\norevisionnumbers{% - \renewcommand\displayrevisionfix[2]{\textbf{##1}}} - -\IfFileExists{\jobname.cfg} - { - \input{\jobname.cfg} - \typeout{***************************************************} - \typeout{*} - \typeout{* Configuration file for \jobname.err found } - \typeout{*} - \typeout{***************************************************} - \AtEndDocument{ - \typeout{***************************************************} - \typeout{*} - \typeout{* If you wish to generate an errata listing} - \typeout{* containing only errors found after a certain revision} - \typeout{* and/or only errors found after a certain date} - \typeout{* modify the information stored in \jobname.cfg} - \typeout{*} - \typeout{* Current settings are:} - \typeout{*} - \typeout{* \@spaces printing of your book = \myprinting} - \typeout{* \@spaces include \includedentries} - \typeout{*} - \typeout{***************************************************} - }} - {} - -%% \erroronpage <page> <line info> <contributor> <date> <fixed in revision> - -\newcommand\erroronpage[5]{% - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\newcommand\seriouserroronpage[5]{% - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \fbox{\bfseries !!}\hfill - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\newcommand\CHAPTER[1]{\endgobble - &\\[4pt]% - \multicolumn{4}{l}{\framebox[10cm][l]{\textbf{\normalsize\strut#1}}} \\} - -\newenvironment{erratalist} - {\begin{longtable}{r>{\raggedright}p{2cm}l>{\raggedright}p{10cm}l}} - {\endgobble\end{longtable}} - -\newcommand\erratatitle[2] - {\begin{center}\LARGE\bfseries - Errata list for #1\\[5pt](\myprinting.\ printing)\\[10pt] - \small Includes all entries found \printedentries\space #2\\ - (For other periods/print runs reprocess this document - with different config settings) - \end{center}% - \markright{Errata for #1 (\printedentries\space #2)}% - \thispagestyle{plain}% - \vspace{20pt}} - -\pagestyle{myheadings} - -\AtBeginDocument{\small} - -\setlength\parindent{0pt} -\setlength\parskip{2pt} - -\newcommand\contributor[2]{\makebox[1cm][l]{\sffamily#1} #2\par} - -% some special shortcuts overwriting existing commands: - -\let\u\underline -\renewcommand\>{$\to$} - -%%% some code suggested by Thorsten Hansen to count the number of -%%% contributions by individuals (will work only if we do not get -%%% too many :-) - -\def\count@contributors#1/#2/#3\@nil{ - \@ifundefined{c@#1}{\newcounter{#1}}{}\stepcounter{#1}% -%%% also count secondary: -%%% \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}% -} - -\renewcommand\erroronpage[5]{% - \count@contributors#3/secondary/\@nil - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\renewcommand\seriouserroronpage[5]{% - \count@contributors#3/secondary/\@nil - \endgobble - \doweprint{#4}{#5}% - \if@tempswa - \typeout{Typesetting entry #1 #2 #3 #4}% - \else - \typeout{Ignoring entry #1 #2 #3 #4}% - \expandafter\gobbleerrata - \fi - \hideamp \\% - \fbox{\bfseries !!}\hfill - \displayrevisionfix{#1}{#5} - \hideamp #2 \hideamp (\textsf{#3}) \hideamp -} - -\renewcommand\contributor[2]{\makebox[1cm][l]{% - \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par} - -\end{filecontents} - - -\begin{filecontents}{\jobname.cfg} -% -% -% Configuration file for the errata listing of -% -% The LaTeX Web Companion -% -% -% \erratastartdate -% -% Specifies the date from which on -% errata entries should be listed. -% -% The format is YYYY/MM/DD. -% -% The default below ensures that all -% entries are typeset. -% -\renewcommand\erratastartdate{1999/05/01} - -% -% \myprinting -% -% Specifies which (revised) printing you -% own. For example, if you have the second -% printing set this to 2 so that errors -% already corrected in that printing will not -% appear in your errata listing. -% -% The default below ensures that all -% entries are typeset. -% -\renewcommand\myprinting{1} -% -% -% \norevisionnumbers -% -% Specifies that all page numbers in the errata are shown in the same -% format (bold face) irregardless of whether or not they are fixed -% in some revision. The default is to print corrected errors in -% italic and add the revision number as a superscript. -% -% -% \showallerrors -% -% With this command you tell the program that all errata entries are -% supposed to be generated. This makes \myprinting and -% \erratastartdate basically obsolete so this isn't turned on by -% default. -% -% -\endinput -\end{filecontents} - - - -\documentclass{ttcterrata} - - -\begin{document} - -\erratatitle{The \LaTeX{} Web Companion}{\erratafiledate} - - -\begin{verbatim} -@book(A-W:GR99, - author = {Michel Goossens and Sebastian Rahtz}, - title = {The {\LaTeX} Web Companion}, - substitle = {Integrating {\TeX}, HTML, and XML}, - series = "Tools and Techniques for Computer Typesetting", - publisher = {Addison-Wesley}, - address = {Reading, Massachusetts}, - year = 1999, - ISBN = "0-201-43311-7", - LCCN = "QA76.76.H94G66 1999", - pagenums = {xxii + 522}, - source-infos = {yes}, - bibliography = {yes}, - index = {yes}, - price = "US\$39.95", - note = "With Eitan M. Gurari and Ross Moore and Robert S. - Sutor.", -) -\end{verbatim} - -\begin{list}{}{\setlength\leftmargin{0cm}\setlength\rightmargin{5cm}} -\item[] -The latest version of this file (\texttt{\jobname.err}) can be found -as part of the \LaTeX{} distribution. - -The first column in the table shows the page number of the errata -entry. Superscript numbers in the first column refer to the printed -revision in which this entry was corrected. The second column gives -the precise location, negative line numbers are counted from the -bottom of the page. The third column shows the first finder of the -problem. - -\end{list} - - -\begin{erratalist} - -%======================================================================= -\CHAPTER{Chapter 6} - -\erroronpage{247}{3 para l.5}{MGo}{1999/06/05}{} - GenCod \> GenCode - -\CHAPTER{Appendix B} - -\erroronpage{418}{3 para}{MGo}{1999/06/05}{} - The \texttt{book} element types (lines 10--\u{15}) - -\end{erratalist} - - - -%========================================================================== - -\bigskip - - -\begin{multicols}{3}[Thanks to all who have found errors or - omissions. Listed are the people who found an errata entry first.] -\contributor{MGo}{Michel Goossens} -\end{multicols} - - -If you find further errors please report them to one of the authors -\begin{quote}\ttfamily - sebastian.rahtz@oucs.ox.ac.uk\\ - goossens@cern.ch -\end{quote} -preferable in a form usable for this file, i.e., -\begin{flushleft} -|\erroronpage{|\textit{page-number}|}{|\textit{line-identification}|}{|% - \textit{your-initials}|}{|\textit{date}|}{}| \\ - \hspace*{2em}\textit{description of the the errata} -\end{flushleft} -Here is an example: -\begin{verbatim} -\erroronpage{4}{l.-7}{PMcJ}{1998/06/11}{} - surprisingly \> surprising -\end{verbatim} - - -\end{document} diff --git a/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx b/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx index 82cce1be94b..555a88de296 100644 --- a/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx +++ b/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx @@ -1,6 +1,7 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009 +% Copyright 1993-2014 +% % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -60,7 +61,7 @@ % letters added), koi8-ru (it is described in a draft RFC document % specifying the widely used character set for mail and news % exchange in the Ukrainian internet community as well as for -% presentating WWW information resources in the Ukrainian language), +% presenting WWW information resources in the Ukrainian language), % and ISO-IR-111 ECMA Cyrillic Code Page. All these codepages are % supported also. % \item ISO~8859-5 Cyrillic codepage (also called ISO-IR-144). @@ -120,7 +121,7 @@ %<MOS>\ProvidesFile{mos.def} %<NCC>\ProvidesFile{ncc.def} %<MLS>\ProvidesFile{mls.def} - [1999/11/16 v1.0d Input encoding file] + [2014/10/28 v1.0d Input encoding file] % \end{macrocode} % Insert a |\makeatletter| at the beginning of all .def files. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins b/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins index 68e0c50a571..7f2cc1908f8 100644 --- a/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins +++ b/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins @@ -5,26 +5,26 @@ %% %% Copyright 1993-2014 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the Standard LaTeX `Cyrillic Bundle'. %% ---------------------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the `Cyrillic Bundle' is %% given in the file `manifest.txt'. -%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -48,9 +48,13 @@ in the LaTeX2e distribution. This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the Standard LaTeX `Cyrillic Bundle'. ----------------------------------------------------------------------------- @@ -60,7 +64,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX @@ -125,9 +129,13 @@ in the LaTeX2e distribution. This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the Standard LaTeX `Cyrillic Bundle'. ----------------------------------------------------------------------------- @@ -137,7 +145,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX diff --git a/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd b/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd index d6ebb6f6ec0..22c261883a1 100644 --- a/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd +++ b/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd @@ -2,22 +2,22 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the Standard LaTeX `Cyrillic Bundle'. % ---------------------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3b % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3b or later is part of all distributions of LaTeX +% and version 1.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % The list of all files belonging to the `Cyrillic Bundle' is % given in the file `manifest.txt'. -% +% % \fi % \iffalse % This is the file |lcycmlh.fdd| of the cyrillic bundle for LaTeX2e. diff --git a/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd b/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd index 6ccb1e29259..acf91f82810 100644 --- a/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd +++ b/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd @@ -2,22 +2,22 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the Standard LaTeX `Cyrillic Bundle'. % ---------------------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3b % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3b or later is part of all distributions of LaTeX +% and version 1.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % The list of all files belonging to the `Cyrillic Bundle' is % given in the file `manifest.txt'. -% +% % \fi % \iffalse % This is the file |ot2cmams.fdd| of the cyrillic bundle for LaTeX2e. diff --git a/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd b/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd index 70f8a952303..95c0937d447 100644 --- a/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd +++ b/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd @@ -2,22 +2,22 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the Standard LaTeX `Cyrillic Bundle'. % ---------------------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3b % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3b or later is part of all distributions of LaTeX +% and version 1.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % The list of all files belonging to the `Cyrillic Bundle' is % given in the file `manifest.txt'. -% +% % \fi % \iffalse % This is the file |ot2cmlh.fdd| of the cyrillic bundle for LaTeX2e. diff --git a/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd b/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd index 174c57d207a..09b268e012e 100644 --- a/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd +++ b/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd @@ -2,22 +2,22 @@ % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2008 2009 % The LaTeX3 Project and any individual authors listed elsewhere -% in this file. -% +% in this file. +% % This file is part of the Standard LaTeX `Cyrillic Bundle'. % ---------------------------------------------------------- -% +% % It may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3b % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3b or later is part of all distributions of LaTeX +% and version 1.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % The list of all files belonging to the `Cyrillic Bundle' is % given in the file `manifest.txt'. -% +% % \fi % \iffalse % This is the file |t2lhfnt.fdd| of the cyrillic bundle for LaTeX2e. diff --git a/Master/texmf-dist/source/latex/graphics/color.dtx b/Master/texmf-dist/source/latex/graphics/color.dtx index 3bda58eba4f..437d75f1af2 100644 --- a/Master/texmf-dist/source/latex/graphics/color.dtx +++ b/Master/texmf-dist/source/latex/graphics/color.dtx @@ -2,7 +2,7 @@ % \iffalse % %% color.dtx Copyright (C) 1994--1999 David Carlisle -%% Copyright (C) 2005--2014 David Carlisle, LaTeX3 Project +%% Copyright (C) 2005--2015 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -39,6 +39,7 @@ % revised \filedate.}} % \author{D. P. Carlisle} % \date{\filedate} +% \MaintainedByLaTeXTeam{graphics} % \maketitle % % \CheckSum{440} diff --git a/Master/texmf-dist/source/latex/graphics/drivers.dtx b/Master/texmf-dist/source/latex/graphics/drivers.dtx index 31ed1284962..aeb2829cb71 100644 --- a/Master/texmf-dist/source/latex/graphics/drivers.dtx +++ b/Master/texmf-dist/source/latex/graphics/drivers.dtx @@ -3,6 +3,7 @@ % %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle +%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -46,6 +47,7 @@ {Version \fileversion, revised \filedate}} \author{Sebastian Rahtz and David Carlisle} \date{\filedate} + \MaintainedByLaTeXTeam{graphics} \maketitle \DocInput{drivers.dtx} \end{document} diff --git a/Master/texmf-dist/source/latex/graphics/epsfig.dtx b/Master/texmf-dist/source/latex/graphics/epsfig.dtx index c22b0eb6a68..599662f0b99 100644 --- a/Master/texmf-dist/source/latex/graphics/epsfig.dtx +++ b/Master/texmf-dist/source/latex/graphics/epsfig.dtx @@ -2,6 +2,7 @@ % \iffalse % %% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz +%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -34,6 +35,7 @@ % revised \filedate.}} % \author{Sebastian Rahtz\\spqr@ftp.tex.ac.uk} % \date{\filedate} +% \MaintainedByLaTeXTeam{graphics} % \maketitle % % \CheckSum{176} diff --git a/Master/texmf-dist/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx index 39d0d4575f1..95c7a5d9269 100644 --- a/Master/texmf-dist/source/latex/graphics/graphics.dtx +++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx @@ -2,9 +2,7 @@ % \iffalse % %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995--1999 2001 David Carlisle -%% Copyright (C) 2005--2006 David Carlisle, LaTeX3 Project -%% Copyright (C) 2009-2014 LaTeX3 Project +%% Copyright (C) 1995--2015 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -41,6 +39,7 @@ % revised \filedate.}} % \author{D. P. Carlisle\and S. P. Q. Rahtz} % \date{\filedate} +% \MaintainedByLaTeXTeam{graphics} % \maketitle % % \CheckSum{1173} diff --git a/Master/texmf-dist/source/latex/graphics/graphics.ins b/Master/texmf-dist/source/latex/graphics/graphics.ins index 07ec8df03dc..ef0ba6edf46 100644 --- a/Master/texmf-dist/source/latex/graphics/graphics.ins +++ b/Master/texmf-dist/source/latex/graphics/graphics.ins @@ -9,6 +9,12 @@ \input docstrip \preamble + +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + \endpreamble \keepsilent diff --git a/Master/texmf-dist/source/latex/graphics/graphicx.dtx b/Master/texmf-dist/source/latex/graphics/graphicx.dtx index 94aceb4691e..3ba5590b722 100644 --- a/Master/texmf-dist/source/latex/graphics/graphicx.dtx +++ b/Master/texmf-dist/source/latex/graphics/graphicx.dtx @@ -2,7 +2,7 @@ % \iffalse % %% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995 1996 1997 1999 2014 David Carlisle +%% Copyright (C) 1995--2015 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -38,6 +38,7 @@ % revised \filedate.}} % \author{D. P. Carlisle\and S. P. Q. Rahtz} % \date{\filedate} +% \MaintainedByLaTeXTeam{graphics} % \maketitle % % \CheckSum{596} diff --git a/Master/texmf-dist/source/latex/graphics/grfguide.tex b/Master/texmf-dist/source/latex/graphics/grfguide.tex deleted file mode 100644 index a61b0daf5e0..00000000000 --- a/Master/texmf-dist/source/latex/graphics/grfguide.tex +++ /dev/null @@ -1,1007 +0,0 @@ -%% grfguide.tex Copyright (C) 1994 1995 1996 1998 1999 David Carlisle -%% Copyright (C) 2005 2014 David Carlisle, LaTeX3 Project -%% -%% This file is part of the Standard LaTeX `Graphics Bundle'. -%% It may be distributed under the terms of the LaTeX Project Public -%% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.3c or, at your option, any later version. -%% -%% This file has the LPPL maintenance status "maintained". - -\begin{filecontents*}{a.ps} -%! -%%BoundingBox:0 0 72 72 -100 100 moveto -72 72 rlineto -72 neg 0 rlineto -72 72 neg rlineto -stroke -100 100 moveto -/Times-Roman findfont -72 scalefont -setfont -(A) show -showpage -\end{filecontents*} -\begin{filecontents*}{a.pdf} -%PDF-1.4 -%%%%% -1 0 obj -<< -/Pages 2 0 R -/Type /Catalog ->> - endobj -2 0 obj -<< -/Kids [3 0 R] -/Type /Pages -/Count 1 ->> - endobj -3 0 obj -<< -/Rotate 0 -/Parent 2 0 R -/MediaBox [0 0 72 72] - /Resources -<< -/ExtGState 4 0 R -/Font 5 0 R -/ProcSet [/PDF /Text] ->> -/pdftk_PageNum 1 -/Type /Page -/Contents 6 0 R ->> - endobj -4 0 obj -<< -/R7 7 0 R ->> - endobj -5 0 obj -<< -/R8 8 0 R ->> - endobj -6 0 obj -<< -/Length 135 ->> -stream -q 0.1 0 0 0.1 0 0 cm -/R7 gs -10 w -0 G -0 0 m -720 720 l -0 720 l -720 0 l -S -0 g -q -10 0 0 10 0 0 cm BT -/R8 72 Tf -1 0 0 1 0 0 Tm -(A)Tj -ET -Q -Q - - endstream - endobj -7 0 obj -<< -/Type /ExtGState -/OPM 1 ->> - endobj -8 0 obj -<< -/BaseFont /Times-Roman -/LastChar 65 -/Subtype /Type1 -/FontDescriptor 9 0 R -/Widths [722] -/Type /Font -/Encoding /WinAnsiEncoding -/FirstChar 65 ->> - endobj -9 0 obj -<< -/FontName /Times-Roman -/StemV 105 -/CharSet (/A) -/Ascent 674 -/Flags 65568 -/Descent 0 -/ItalicAngle 0 -/MissingWidth 250 -/FontBBox [0 0 706 674] -/Type /FontDescriptor -/CapHeight 674 ->> - endobj -10 0 obj -<< -/Producer (GPL Ghostscript 9.06) -/ModDate (D:20140426202438+01'00') -/CreationDate (D:20140426202438+01'00') ->> -endobj xref -0 11 -0000000000 65535 f -0000000015 00000 n -0000000066 00000 n -0000000125 00000 n -0000000308 00000 n -0000000341 00000 n -0000000374 00000 n -0000000563 00000 n -0000000610 00000 n -0000000774 00000 n -0000000975 00000 n -trailer - -<< -/Info 10 0 R -/Root 1 0 R -/Size 11 -/ID [<4ca1370d594acd28b9d948a5e8b925c3> <4ca1370d594acd28b9d948a5e8b925c3>] ->> -startxref -1106 -%%EOF -\end{filecontents*} -\documentclass{ltxguide} - -%%% No driver option specified -%%% set up the files color.cfg and graphics.cfg for your site. -%%% for example: -%%% -%%% \ExecuteOptions{dvips} -%%% -\usepackage{color,graphicx,shortvrb} - -%% Just as an example, and to make sure, in case some -%% driver option has not declared a default rule for -%% .ps files: -\DeclareGraphicsRule{.ps}{eps}{.ps}{} -\DeclareGraphicsExtensions{.pdf,.ps} -%% Which means: -%% .ps files are (to be treated as) EncapsulatedPostScript -%% files. The .ps file is to be read for the BoundingBox. -%% No `special' commands need to be applied by the driver. - - -\renewcommand\star{{\ttfamily*}} - -\let\package\textsf - -\newlength{\gxlen} -\settowidth{\gxlen}{\package{graphicx}: } -\newcommand\gs{\makebox[\gxlen][l]{\package{graphics}:}} -\newcommand\gx{\makebox[\gxlen][l]{\package{graphicx}:}} - -\MakeShortVerb{\|} - -\begin{document} -\title{Packages in the `graphics' bundle} -\author{D. P. Carlisle \and The \LaTeX3 Project} -\date{2014/04/27} - -\maketitle - -\tableofcontents - -\section{Introduction} -This document serves as a user-manual for the packages \package{color}, -\package{graphics}, and \package{graphicx}. Further documentation may be -obtained by processing the source (|dtx|) files of the individual -packages. - -\section{Driver support}\label{drivers} -All these packages rely on features that are not in \TeX\ itself. -These features must be supplied by the `driver' used to print the -|dvi| file. Unfortunately not all drivers support the same features, and -even the internal method of accessing these extensions varies between -drivers. Consequently all these packages take options such as -`|dvips|' to specify which driver is being used. - -You should to set up a site default for these -options, for the driver that you normally use. Suppose that you wish for -the \package{color} package to always default to use specials for the -PostScript driver, |dvipsone|. In that case create a file |color.cfg| -containing the line:\\ -|\ExecuteOptions{dvipsone}|\\ -Normally you will want an identical file |graphics.cfg| to set a similar -default for the graphics packages. - -The following driver options are declared in the packages. -\begin{quote}\raggedright - |dvips|, |xdvi|, |dvipdf|, |dvipdfm|, |dvipdfmx|, |pdftex|, - |dvipsone|, |dviwindo|, |emtex|, |dviwin|, |pctexps|, |pctexwin|, - |pctexhp|, |pctex32|, |truetex|, |tcidvi|, |vtex|, |oztex|, - |textures|, |xetex| -\end{quote} -Note that the \LaTeX\ Team does not maintain these drivers; we merely -provide a way for a particular driver to work with the graphics -packages. - -If you use a driver that is not in the list above you may add an option -for that driver by putting the appropriate |\DeclareOption| line into -|graphics.cfg| and |color.cfg|, before making it the default option -with |\ExecuteOptions|, as described above. - -For example to add the option `|dvi2ps|' for the original Unix dvi to -ps driver, and to make that the default, you just need configuration -files looking like: -\begin{verbatim} -\DeclareOption{dvi2ps}{\def\Gin@driver{dvi2ps.def}} -\ExecuteOptions{dvi2ps} -\end{verbatim} - -There is a suitable |dvi2ps.def| file in the standard distribution. -It is not enabled by default as it is not well tested as the driver is -no longer available to me. The following driver files are similarly -distributed but not enabled by default. -\begin{quote}\raggedright - |dvi2ps|, |dvialw|, |dvilaser|, |dvitops|, |psprint|, |pubps|, |ln| -\end{quote} - -Most of these driver files are generated from the source file -|drivers.dtx|. That file has the sources for other versions (for -example older versions of dvips and textures) which are not generated -by default. - -Different \TeX\ systems support different drivers and the drivers are -usually maintained by the developers of the \TeX\ variants or -post-processors. Hence they are always linked to some program and -since the \TeX\ distributors decide which programs they support, it is -up to them to make sure the necessary drivers are included with their -distribution. The graphics bundle contains the installation file -|graphics-drivers.ins| which can be used to extract drivers from -|drivers.dtx| but we cannot guarantee that these are up to date. Not -all of the aforementioned drivers are available in |drivers.dtx| (some -like |pdftex| and |dvipdfm| can be found on CTAN). - -If you use a driver that is not covered by any of these possibilities, -you may try to write a |.def| file by analogy with one of the existing -ones, and then specify a suitable option in |graphics.cfg| and -|color.cfg|, as for the above example of |dvi2ps|. - -\section{Colour} -The colour support is built around the idea of a system of -\emph{Colour Models}. The Colour models supported by a driver vary, -but typically include -\begin{description} -\item[rgb] Red Green Blue: A comma separated list of three numbers - between~0 and~1, giving the components of the colour. -\item[cmyk] Cyan Magenta Yellow [K]Black: A comma separated list of - four numbers between~0 and~1, giving the components of the colour - according to the additive model used in most printers. -\item[gray] Grey scale: a single number between~0 and~1. -\item[named] Colours accessed by name, e.g.\ `JungleGreen'. Not all - drivers support this model. The names must either be `known' to the - driver or added using commands described in |color.dtx|. Some drivers - support an extended form of the named model in which an `intensity' of - the colour may also be specified, so `\mbox{JungleGreen, 0.5}' would - denote that colour at half strength. -\end{description} -Note that the \textbf{named} model is really just given as an example -of a colour model that takes names rather than a numeric specification. -Other options may be provided locally that provide different colour -models, eg \textbf{pantone} (An industry standard set of colours), -\textbf{x11} (Colour names from the X Window System), etc. The -standard distribution does not currently have such models, but the -\textbf{named} model could be used as an example of how to define a new -colour model. The names used in the \textbf{named} model are those -suggested by Jim Hafner in his \textsf{colordvi} and \textsf{foiltex} -packages, and implemented originally in the |color.pro| header file for -the \texttt{dvips} driver. - -\subsection{Package Options} -Most of the options to the \package{color} package just specify a -driver, e.g., \ |dvips|, as discussed in section~\ref{drivers}. - -One special option for the \package{color} package -that is of interest is |monochrome.| -If this option is selected the colour commands are all -disabled so that they do not generate errors, but do not generate colour -either. This is useful if previewing with a previewer that can not -produce colour. - -Three other package options control the use of the \textbf{named} model. -The |dvips| driver (by default) pre-defines 68 colour names. The |dvips| -option normally makes these names available in the \textbf{named} colour -model. If you do not want these names to be declared in this model -(Saving \TeX\ some memory) you may give the |nodvipsnames| -option. Conversely, if you are using another driver, you may wish to -add these names to the named model for that driver (especially if you -are processing a document originally produced on |dvips|). In this case -you could use the |dvipsnames| option. Lastly the |usenames| option -makes all names in the \textbf{named} model directly available, as -described below. - -\subsection{Defining Colours} - -The colours |black|, |white|, |red|, |green|, |blue|, |cyan|, -|magenta|, |yellow| should be predefined, but should you wish to mix -your own colours use the |\definecolor| command. - -\begin{decl} -|\definecolor|\arg{name}\arg{model}\arg{colour specification} -\end{decl} - - -This defines \m{name} as a colour which can be used in later colour -commands. For example -\begin{verbatim} -\definecolor{light-blue}{rgb}{0.8,0.85,1} -\definecolor{mygrey}{gray}{0.75} -\end{verbatim} -\definecolor{light-blue}{rgb}{0.8,0.85,1} -\definecolor{mygrey}{gray}{0.75} - -Now |light-blue| and |mygrey| may be used in addition to the -predefined colours above. - -\subsection{Using Colours} - -\subsubsection{Using predefined colours} -The syntax for colour changes is designed to mimic font changes. -The basic syntax is: - -\begin{decl} -|\color|\arg{name} -\end{decl} - -This is a \emph{declaration}, like |\bfseries| It changes the current -colour to \m{name} until the end of the current group or -environment. - -An alternative command syntax is to use a \emph{command} form that -takes the text to be coloured as an \emph{argument}. This is similar -to the font commands such as |\textbf|: - -\begin{decl} -|\textcolor|\arg{name}\arg{text} -\end{decl} - - -So the above is essentially equivalent to -|{\color|\arg{name}\emph{text}|}|. - -\subsubsection{Using colour specifications directly} - - -\begin{decl} -|\color|\oarg{model}\arg{specification}\\ -|\textcolor|\oarg{model}\arg{specification}\arg{text} -\end{decl} - -Normally one would predeclare all the colours used in a package, or in -the document preamble, but sometimes it is convenient to directly use -a colour without naming it first. To achieve this |\color| (and all -the other colour commands) take an optional argument specifying the -model. If this is used then the mandatory argument takes a -\m{colour specification} instead of a \m{name}. For example:\\ -|\color[rgb]{1,0.2,0.3}|\\ -would directly select that colour. - -This is particularly useful for accessing the \textbf{named} model:\\ -|\color[named]{BrickRed}| selects the |dvips| colour BrickRed. - -Rather than repeatedly use |[named]| you may use |\definecolor| to -provide convenient aliases:\\ -|\definecolor{myred}{named}{WildStrawberry}| - \ldots\ |\color{myred}|\ \ldots - -Alternatively if you are happy to use the existing names from the -\textbf{named} model, you may use the |usenames| package option, which -effectively calls |\definecolor| on every colour in the \textbf{named} -model, thus allowing |\color{WildStrawberry}| in addition to -|\color[named]{WildStrawbery}|. - -\subsection{Named Colours} -Using the \textbf{named} colour model has certain advantages over -using other colour models. - -Firstly as the |dvi| file contains a request -for a colour by \emph{name}, the actual mix of primary colours used to -obtain the requested colour can be tuned to the characteristics of a -particular printer. In the |dvips| driver the meanings of the colour -names are defined in the header file |color.pro|. Users are encouraged -to produce different versions of this file for any printers they use. By -this means the same dvi file should produce colours of similar -appearance when printed on printers with different colour -characteristics. - -Secondly, apart from the so called `process colours' that are produced -by mixing primary colours during the print process, one may want to use -`spot' or `custom' colours. Here a particular colour name does not -refer to a mix of primaries, but to a particular ink. The parts of the -document using this colour will be printed separately using this named -ink colour. - -\subsection{Page Colour} - - -\begin{decl} -|\pagecolor|\arg{name}\\ -|\pagecolor|\oarg{model}\arg{specification}\\ -|\nopagecolor| -\end{decl} - -The background colour of the whole page can be set using -|\pagecolor|. This takes the same argument forms as |\color| but sets -the background colour for the current and all subsequent pages. It is -a global declaration, so you need to use -|\nopagecolor|\NEWfeature{2014/04/23}\ to `get back to normal'. -If that is not supported, you may use |\pagecolor{white}| although that -will make a white background rather than the default transparent background. - -\subsection{Box Backgrounds} -Two commands similar to |\fbox| produce boxes with the backgrounds -shaded an appropriate colour. - -\begin{decl} -|\colorbox|\arg{name}\arg{text}\\ -|\colorbox|\oarg{model}\arg{specification}\arg{text}\\ -|\fcolorbox|\arg{name1}\arg{name2}\arg{text}\\ -|\fcolorbox|\oarg{model}% - \arg{specification1}\arg{specification2}\arg{text} -\end{decl} - - -The former produces a box coloured with \emph{name} -\colorbox{mygrey}{like this}. The latter is similar but puts a frame of -colour \emph{name1} around the box coloured \emph{name2}. - -These commands use the |\fbox| parameters |\fboxrule| and |\fboxsep| -to determine the thickness of the rule, and the size of the shaded area. - -\subsection{Possible Problems} - -\TeX\ was not designed with colour in mind, and producing colours -requires a lot of help from the driver program. Thus, depending on the -driver, some or all features of the \package{color} package may not be -available. - -Some drivers do not maintain a special `colour stack'. These drivers are -likely to get confused if you nest colour changes, or use colours in -floating environments. - -Some drivers do not maintain colours over a page break, so that if the -page breaks in the middle of a coloured paragraph, the last part of the -text will incorrectly be printed in black. - -There is a different type of problem that will occur for all drivers. -Due to certain technical difficulties\footnote{At least two causes: -1) The presence of a \texttt{\char`\\special} \m{whatsit} prevents -\texttt{\char`\\addvspace} `seeing' space on the current vertical list, -so causing it to incorrectly add extra vertical space. 2) A -\m{whatsit} as the first item in a \texttt{\char`\\vtop} moves the -reference point of the box.}% -, it is possible that at points -where the colour changes, the \emph{spacing} is affected. For this -reason the |monochrome| option does not completely disable the colour -commands, it redefines them to write to the log file. This will have the -same effects on spacing, so you can produce monochrome drafts of your -document, at least knowing that the final spacing is being shown. -\section{The Graphics packages} -There are two graphics packages: -\begin{description} -\item[\package{graphics}] The `standard' graphics package. -\item[\package{graphicx}] The `extended' or `enhanced' graphics - package. -\end{description} -The two differ only in the format of optional arguments for the -commands defined. The command names, and the mandatory arguments are -the same for the two packages. - -\subsection{Package Options} -As discussed in section~\ref{drivers}, the graphics packages share the -same `driver' options as the \package{color} package. As for colour -you should set up a site-default in a file, -|graphics.cfg|, containing the line (for |dvips|):\\ -|\ExecuteOptions{dvips}| - -The graphics packages have some other options for controlling how many -of the features to enable: -\begin{description} -\item[draft] suppress all the `special' features. In particular - graphics files are not included (but they are still read for size - info) just the filename is printed in a box of the correct size. -\item[final] The opposite of |draft|. Useful to over-ride a global - |draft| option specified in the |\documentclass| command. -\item[hiderotate] Do not show rotated text (presumably because the - previewer can not rotate). -\item[hidescale] Do not show scaled text (presumably because the - previewer can not scale). -\item[hiresbb] Look for size specifications in |%%HiResBoundingBox| - lines rather than standard |%%BoundingBox| lines.% - \NEWfeature{1996/10/29} -\item[demo] Instead of inserting an image file |\includegraphics| - draws a 150\,pt by 100\,pt rectangle unless other dimensions are - specified manually.\NEWfeature{2006/02/20} -\end{description} -\subsection{Rotation} - -\begin{decl} -\gs |\rotatebox|\arg{angle}\arg{text}\\ -\gx |\rotatebox|\oarg{key val list}\arg{angle}\arg{text} -\end{decl} - -This puts \emph{text} in a box, like |\mbox|, but rotates the box -through \emph{angle} degrees, \rotatebox{15}{like this}. - -The standard version always rotates around the reference point of the -box, but the \package{keyval} version takes the following keys: - -\begin{decl} -|origin|=\m{label}\\ -|x|=\m{dimen}\\ -|y|=\m{dimen}\\ -|units|=\m{number} -\end{decl} - -So you may specify both |x| and |y|, which give the coordinate of -the centre of rotation relative to the reference point of the box, eg -|[x=2mm, y=5mm]|. Alternatively, for the most common points, one may use -|origin| with a \emph{label} containing one or two of the following: -|lrctbB| (|B| denotes the baseline, as for \package{PSTricks}). For -example, compare a default rotation of $180^\circ$ -\ldots\rotatebox{180}{Like This}\ldots\ to the effects gained by using -the |origin| key:\\ -|[origin = c]| rotates about the centre of the box,\ldots - \rotatebox[origin=c]{180}{Like This}\ldots\\ -|[origin = tr]| rotates about the top right hand corner\ldots - \rotatebox[origin=tr]{180}{Like This}\ldots - -The |units| key allows a change from the default units of degrees -anti-clockwise. Give the number of units in one full anti-clockwise -rotation. For example:\\ -|[units = -360]| specifies degrees clockwise.\\ -|[units= 6.283185]| specifies radians. - -\subsection{Scaling} - -\subsubsection{Scaling by scale factor} - -\begin{decl} -|\scalebox|\arg{h-scale}\oarg{v-scale}\arg{text} -\end{decl} - -Again this is basically like |\mbox| but scales the \emph{text}. -If \emph{v-scale} is not specified it defaults to \emph{h-scale}. -If it is specified the text is distorted as the horizontal and -vertical stretches are different, \scalebox{3}[.7]{Like This}. - - -\begin{decl} -|\reflectbox|\arg{text} -\end{decl} - -An abbreviation for |\scalebox{-1}[1]|\arg{text}. - -\subsubsection{Scaling to a requested size} - -\begin{decl} -|\resizebox|\star\arg{h-length}\arg{v-length}\arg{text} -\end{decl} - - Scale \emph{text} so that the width is \emph{h-length}. - If |!| is used as either length argument, the other argument is used - to determine a scale factor that is used in both directions. - Normally \emph{v-length} refers to the height of the box, but in the - star form, it refers to the `height + depth'. - As normal for \LaTeXe\ box length arguments, |\height|, - |\width|, |\totalheight|, |\depth| may be used to refer to the - original size of the box. - -|\resizebox{1in}{\height}{Some text}|: -\resizebox{1in}{\height}{Some text} - -|\resizebox{1in}{!}{Some text}|: -\resizebox{1in}{!}{Some text} - -\subsection{Including Graphics Files} -The functions for graphics inclusion try to give the same user syntax -for including any kind of graphics file that can be understood by the -driver. This relies on the file having an extension that identifies -the file type. The `driver options' will define a collection of file -extensions that the driver can handle, although this list may be -extended using the declarations described below. - -If the file's extension is unknown to the driver, the system may try a -default file type. The PostScript driver files set this default to be -|eps| (PostScript), but this behaviour may be customised if other -defaults are required. - -\begin{decl} -\gs |\includegraphics|\star\oarg{llx,lly}\oarg{urx,ury}\arg{file}\\ -\gx |\includegraphics|\star\oarg{key val list}\arg{file} -\end{decl} - Include a graphics file. - - If \star\ is present, then the graphic is `clipped' to the size - specified. If \star\ is omitted, then any part of the graphic that is - outside the specified `bounding box' will over-print the surrounding - text. - - If the optional arguments are omitted, then the size of the graphic - will be determined by reading an external file as described below. - -\paragraph{\package{graphics} version} - If \oarg{urx,ury} is present, then it should specify the coordinates - of the top right corner of the image, as a pair of \TeX\ dimensions. - If the units are omitted they default to |bp|. So |[1in,1in]| and - |[72,72]| are equivalent. If only one optional argument appears, the - lower left corner of the image is assumed to be at |[0,0]|. Otherwise - \oarg{llx,lly} may be used to specify the coordinates of this point. - -\paragraph{\package{graphicx} version} -Here the star form is just for compatibility with the standard -version. It just adds |clip| to the list of keys specified. -(Also, for increased compatibility, if \emph{two} optional arguments are -used, the `standard' version of |\includegraphics| is always used, even -if the \package{graphicx} package is loaded.) - -The allowed keys are listed below. -\begin{description} -\item[bb] The argument should be four dimensions, separated by spaces. - These denote the `Bounding Box' of the printed region within - the file. -\item[bbllx,bblly,bburx,bbury] Set the bounding box. Mainly for - compatibility with older packages. - Specifying |bbllx=a,bblly=b,bburx=c,bbury=d| - is equivalent to specifying |bb = a b c d|. -\item[natwidth,natheight] Again an alternative to |bb|. - |natheight=h,natwidth=w| is equivalent to |bb = 0 0 h w|. -\item[hiresbb]\NEWfeature{1996/10/29} - Boolean valued key. If set to |true| (just specifying |hiresbb| - is equivalent to |hiresbb=true|) then \TeX\ will look for - |%%HiResBoundingBox| lines rather than |%%BoundingBox|. It may be set - to |false| to overrule a default setting of |true| set by the - |hiresbb| package option. -\item[viewport]\NEWfeature{1995/06/01} - The |viewport| key takes four arguments, just like - |bb|. However in this case the values are taken relative to the - origin specified by the bounding box in the file. So to `view' the - 1in square in the bottom left hand corner of the area specified by - the bounding box, use the argument |viewport=0 0 72 72|. -\item[trim]\NEWfeature{1995/06/01} - Similar to viewport, but here the four lengths specify the - amount to remove or add to each side. |trim= 1 2 3 4| `crops' the - picture by 1bp at the left, 2bp at the bottom, 3bp on the right and - 4bp at the top. -\item[angle] Rotation angle. -\item[origin]\NEWfeature{1995/09/28} - Origin for rotation. See the documentation of |\rotatebox|. -\item[width] Required width. The - graphic is scaled to this width. -\item[height] Required height. The - graphic is scaled to this height. -\item[totalheight]\NEWfeature{1995/06/01} - Specify the total height (height $+$ depth) of the figure. - This will differ from the `height' if rotation has occurred. - In particular if the figure has been rotated by $-90^\circ$ - then it will have zero height but large depth. -\item[keepaspectratio]\NEWfeature{1995/09/27} - Boolean valued key like `clip'. - If set to true then specifying both `width' and `height' (or - `totalheight') does not distort the figure but scales such that - neither of the specified dimensions is \emph{exceeded}. -\item[scale] Scale factor. -\item[clip] Either `true' or `false' (or no value, which is equivalent - to `true'). Clip the graphic to the bounding box. -\item[draft] a boolean valued key, like `clip'. Locally switches to - draft mode. -\item[type] Specify the graphics type. -\item[ext] Specify the file extension. This should \emph{only} be - used in conjunction with |type|. -\item[read] Specify the file extension of the `read file'. This - should \emph{only} be used in conjunction with |type|. -\item[command] Specify any command to be applied to the file. This - should \emph{only} be used in conjunction with |type|. -\end{description} - -For the keys specifying the original size (i.e,, the bounding box, -trim and viewport keys) the units can be omitted, in -which case bp (i.e., PostScript points) are assumed. - -The first seven keys specify the original size of the image. This size -needs to be specified in the case that the file can not be read by -\TeX, or it contains an incorrect size `BoundingBox' specification. - -|bbllx|\ldots\ |\bbury| are mainly for compatibility for older -packages.\\ -|bbllx=a, bblly=b, bburx=c, bbury=d|\\ -is equivalent to\\ -|bb = a b c d|. - -|natheight| and |natwidth| are just shorthands for setting the lower -left coordinate to 0 0 and the upper right coordinate to the specified -width and height. - -The next few keys specify any scaling or rotation to be applied to the -image. To get these effects using the standard package, the -|\includegraphics| call must be placed inside the argument of a -|\rotatebox| or |\scalebox| command. - -The keys are read left-to-right, so |[angle=90, height=1in]| means -rotate by 90 degrees, and then scale to a height of 1in. -|[height=1in, angle=90]| would result in a final \emph{width} of 1in. - -If the \textsf{calc} package is also loaded the lengths may use -\textsf{calc} syntax, for instance to specify a width of 2\,cm -less than the text width: |[width=\textwidth-2cm]|. - -\TeX\ leaves the space specified either in the file, or in -the optional arguments. If any part of the image is actually outside -this area, it will by default overprint the surrounding text. -If the star form is used, or |clip| specified, any part of the image -outside this area will not be printed. - -The last four keys suppress the parsing of the filename. If they are -used, the main \emph{file} argument should not have the file -extension. They correspond to the arguments of |\DeclareGraphicsRule| -described below. - -To see the effect that the various options have consider the file -|a.ps|. This file contains the bounding box specification -\begin{verbatim} -%%BoundingBox:0 0 72 72 -\end{verbatim} -That is, the printed region consists of a one-inch square, in -the bottom left hand corner of the paper. - -In all the following examples the input will be of the form -\begin{verbatim} -left---\fbox{\includegraphics{a}}---right -\end{verbatim} -With different options supplied to |\includegraphics|. - -No optional argument.\\ -left---\fbox{\includegraphics{a}}---right - -\gs |\scalebox{0.5}{\includegraphics{a}}|\\ -\gx |\includegraphics[scale=.5]{a}|\\ -left---\fbox{\includegraphics[scale=.5]{a}}---right - -\gs |\includegraphics[15,10][35,45]{a}}|\\ -\gx |\includegraphics[viewport= 15 10 35 45]{a}|\\ -left---\fbox{\includegraphics[viewport= 15 10 35 45]{a}}---right - -\gs |\includegraphics*[15,10][35,45]{a}}|\\ -\gx |\includegraphics[viewport= 15 10 35 45,clip]{a}|\\ -left---\fbox{\includegraphics[viewport= 15 10 35 45,clip]{a}}---right - -\gs |\scalebox{0.5}{\includegraphics{a}}| - and |draft| option.\\ -\gx |\includegraphics[scale=.5, draft]{a}|\\ -left---\fbox{\includegraphics[scale=.5, draft]{a}}---right - -\subsection{Other commands in the \package{graphics} package} - -\begin{decl} -|\graphicspath|\arg{dir-list} -\end{decl} -This optional declaration may be used to specify a list of directories -in which to search for graphics files. The format is the same as for -the \LaTeXe\ primitive |\input@path|. A list of directories, each in a -|{}| group (even if there is only one in the list). For example:\\ - |\graphicspath{{eps/}{tiff/}}|\\ - would cause the system to look in the subdirectories |eps| and |tiff| - of the current directory. This is unix syntax, on a Mac it would be:\\ - |\graphicspath{{:eps:}{:tiff:}}|\\ - Note the differing conventions, an initial |:| is needed on Macintosh - systems to denote the current folder, whereas on unix an initial |/| - would denote the top level `root' directory. - - The default setting of this path is - |\input@path| that is: graphics files will be found wherever \TeX\ - files are found. - -\begin{decl} -|\DeclareGraphicsExtensions|\arg{ext-list} -\end{decl} - \NEWdescription{1994/12/01} - This specifies the behaviour of the system when no file extension - is specified in the argument to |\includegraphics|. - \arg{ext-list} should be a comma separated list of file extensions. - (White space is ignored between the entries.) - A file name is produced by appending one extension from the list. - If a file is found, the system acts as if that extension had been - specified. If not, the next extension in \emph{ext-list} is tried. - - -Note that if the extension is not specified in the |\includegraphics| -command, the graphics file must exist at the time \LaTeX\ is run, as -the existence of the file is used to determine which extension from -the list to choose. However if a file extension \emph{is} specified, -e.g.\ |\includegraphics{a.ps}| instead of |\includegraphics{a}|, then -the graphics file need not exist at the time \LaTeX\ is used. (In -particular it may be created on the fly by the \m{command} -specified in the |\DeclareGraphicsRule| command described below.) -\LaTeX\ does however need to be able to determine the size of the -image so this size must be specified in arguments, or the `read file' -must exist at the time \LaTeX\ is used. - -\begin{decl} -|\DeclareGraphicsRule|\arg{ext}\arg{type}\arg{read-file}\arg{command} -\end{decl} - Any number of these declarations can be made. They determine how the - system behaves when a file with extension \emph{ext} is specified. - (The extension may be specified explicitly or, if the argument to - |\includegraphics| does not have an extension, it may be a default - extension from the \emph{ext-list} specified with - |\DeclareGraphicsExtensions|.) - -\emph{ext} the file extension for which this rule applies. As a special -case, \emph{ext} may be given as |*| to denote the default behaviour for -all undeclared extensions (see the example below). - -\emph{type} is the `type' of file involved. All files of the same type -will be input with the same internal command (which must be defined in -a `driver file'). For example files with extensions |ps|, |eps|, -|ps.gz| may all be classed as type |eps|. - -\emph{read-file} determines the extension of the file that should be -read to determine size information. It may be the same as \emph{ext} -but it may be different, for example |.ps.gz| files are not readable -easily by \TeX, so you may want to put the bounding box information in -a separate file with extension |.ps.bb|. If \emph{read-file} is empty, -|{}|, then the system will not try to locate an external file for size -info, and the size must be specified in the arguments of -|\includegraphics|. If the driver file specifies a procedure for -reading size files for \emph{type}, that will be used, otherwise the -procedure for reading |eps| files will be used. Thus the size of -bitmap files may be specified in a file with a PostScript style -|%%BoundingBox| line, if no other specific format is available. - -As a special case |*| may be used to denote the -same extension as the graphic file. This is mainly of use in -conjunction with using |*| as the extension, as in that case the -particular graphic extension is not known. For example -\begin{verbatim} - \DeclareGraphicsRule{*}{eps}{*}{} -\end{verbatim} -This would declare a default rule, such that all unknown extensions -would be treated as EPS files, and the graphic file would be read for -a BoundingBox comment. - -\emph{command} is usually empty, but if non empty it is used in place -of the filename in the |\special|. Within this argument, |#1| may be -used to denote the filename. Thus using the dvips driver, one may -use\\ -|\DeclareGraphicsRule{.ps.gz}{eps}{.ps.bb}{`zcat #1}|\\ -the final argument causes dvips to use the |zcat| command to unzip the -file before inserting it into the PostScript output. - -Note that \LaTeX\ will find the graphics file by searching along -TEXINPUTS (and possibly other places, as specified with -|\graphicspath|) however it may be that the command you specify -in this argument can not find such files unless they are in the -current directory. On some systems it may be possible to modify -the command so that it will find any files that \LaTeX\ can find. -For example on newer web2c \TeX\ releases on unix, one may modify the -above command so that the last argument is:\\ -|{`zcat `kpsewhich -n latex tex #1`}|\\ -which incantation causes the |kpsewhich| program to find the -file, by searching along \LaTeX's path, and then pass the full path -name to the |zcat| program so that it can uncompress the file. -Any such uses are very system dependent, and would best be placed in -a |graphics.cfg| file, thus keeping the document itself portable. - -\subsection{Global setting of keys} - -Most of the \package{keyval} keys used in the \package{graphicx} package -may also be set using the command |\setkeys| provided by the -\package{keyval} package.% -\footnote{\texttt{clip}, \texttt{scale} and \texttt{angle} may not be set via -\texttt{\string\setkeys} prior to calling -\texttt{\string\includegraphics}.} - -For instance, suppose you wanted all the files to be included in the -current document to be scaled to 75\% of the width of the lines of text, -then one could issue the following command:\\ -|\setkeys{Gin}{width=0.75\textwidth}|\\ -Here `|Gin|' is the name used for the \package{keyval} keys associated -with `Graphics inclusion'. All following -|\includegraphics| commands (within the same group or environment) will -act as if |[width=0.75\textwidth]| had been specified, in addition to -any other key settings actually given in the optional argument. - -Similarly to make all |\rotatebox| arguments take an argument in -radians, one just needs to specify:\\ -|\setkeys{Grot}{units=6.28318}| - -\subsection{Compatibility between \package{graphics} and - \package{graphicx}} - -For a document author, there are not really any problems of -compatibility between the two packages. You just choose the interface -that you personally prefer, and then use the appropriate package. - -For a package or class writer the situation is slightly -different. Suppose that you are writing a letter class that needs to -print a company logo as part of the letterhead. - -As the author of the class you may want to give the users the -possibility of using either interface in their letters (should they -need to include any further graphics into the letter body). -In this case the class should load the \package{graphics} package (not -\package{graphicx}, as this would commit any users of the class to the -\package{keyval} interface). The logo should be included with -|\includegraphics| either with \emph{no} optional argument (if the -correct size information is in the file) or \emph{both} optional -arguments otherwise. -Do not use the \emph{one} optional argument form, as the meaning of this -argument would change (and generate errors) if the user were to load -\package{graphicx} as well as your class. - -\section{Remaining packages in the graphics bundle} - -\subsection{Epsfig} -This is a small package essentially a `wrapper' around the -\package{graphicx} package, defining a command |\psfig| which has the -syntax\\ -|\psfig{file=xxx,...}| rather than |\includegraphics[...]{xxx}|.\\ -It also has a few more commands to make it slightly more compatible with -the old \LaTeX~2.09 style of the same name. - -\subsection{Trig} -The trig package is not intended to be used directly in documents. It -calculates sine, cosine and tangent trigonometric functions. These -are used to calculate the space taken up by a rotated box. This -package is also used by the |fontinst| program which converts -PostScript files to a form usable by \TeX. - -As well as being used as a \LaTeX\ package, the macros may be extracted -with the \package{docstrip} options \texttt{plain,package}. In this case -the \LaTeX\ package declarations are omitted from the file, and the -macros may be directly used as part of another macro file (they work -with any format based on plain \TeX.) - -\subsection{Keyval} -The \package{keyval} package is intended to be used by other -packages. It provides a generic way of setting `keys' as used by the -\package{graphicx} package, and splitting up the comma separated lists -of \m{key}~=~\m{value} pairs. - -Like the \package{trig} package, these macros may be extracted and used -as part of another macro file, based on plain \TeX, as well as the -standard use as a \LaTeX\ package. - -By default an undeclared key will generate an error. -If however the option \texttt{unknownkeysallowed} is used, then -unknown keys will be silently ignored (leaving a message in the log -file). This option is also accepted by the \textsf{graphicx} package. - -\iffalse - -\subsection{Pstcol} -\package{PSTricks}, by Timothy Van Zandt is an immensely powerful -package that enables a very full featured interface between PostScript -and \TeX. Unfortunately the colour support in \package{PSTricks} is -slightly incompatible with the colour mechanism defined in the -\package{color} package. The \package{pstcol} package is a (hopefully -temporary) package that modifies a very small number of internal -PSTricks functions, to remove this incompatibility. If -\package{pstricks} is loaded via this package, you may use any colours -defined by \package{color} package commands within \package{pstricks} -commands, and vice versa. - -\fi - -\subsection{Lscape} -The \package{lscape} package requires and takes the same options -as the \package{graphics} package. It defines a |landscape| environment -within which page bodies are rotated through 90 degrees. The page head -and foot are not affected, they appear in the standard (portrait) -position. -\end{document} diff --git a/Master/texmf-dist/source/latex/graphics/keyval.dtx b/Master/texmf-dist/source/latex/graphics/keyval.dtx index ca7275ef13c..11a96a694e4 100644 --- a/Master/texmf-dist/source/latex/graphics/keyval.dtx +++ b/Master/texmf-dist/source/latex/graphics/keyval.dtx @@ -1,6 +1,7 @@ % % \iffalse -%% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 2014 David Carlisle +%% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle +%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -36,6 +37,7 @@ % revised \filedate.}} % \author{David Carlisle} % \date{\filedate} +% \MaintainedByLaTeXTeam{graphics} % \maketitle % % \begin{abstract} diff --git a/Master/texmf-dist/source/latex/graphics/lscape.dtx b/Master/texmf-dist/source/latex/graphics/lscape.dtx index 60062d1d83b..47dbd68d84d 100644 --- a/Master/texmf-dist/source/latex/graphics/lscape.dtx +++ b/Master/texmf-dist/source/latex/graphics/lscape.dtx @@ -2,6 +2,7 @@ % \iffalse % %% lscape.dtx Copyright (C) 1994 1999-2000 David Carlisle +%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -39,6 +40,7 @@ % \CheckSum{69} % % \begin{landscape} +% \MaintainedByLaTeXTeam{graphics} % \maketitle % % All text, within the \texttt{landscape} environment is rotated through diff --git a/Master/texmf-dist/source/latex/graphics/trig.dtx b/Master/texmf-dist/source/latex/graphics/trig.dtx index 8fc2c845cdb..a5e0b12d43c 100644 --- a/Master/texmf-dist/source/latex/graphics/trig.dtx +++ b/Master/texmf-dist/source/latex/graphics/trig.dtx @@ -1,5 +1,6 @@ % \iffalse %% File: trig.dtx Copyright (C) 1993 1994 1995 1996 1997 1999 David Carlisle +%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -35,6 +36,7 @@ % revised \filedate.}} % \author{David Carlisle} % \date{\filedate} +% \MaintainedByLaTeXTeam{graphics} % \maketitle % % \CheckSum{246} diff --git a/Master/texmf-dist/source/latex/tools/afterpage.dtx b/Master/texmf-dist/source/latex/tools/afterpage.dtx index 932ce59b072..4722377aeaf 100644 --- a/Master/texmf-dist/source/latex/tools/afterpage.dtx +++ b/Master/texmf-dist/source/latex/tools/afterpage.dtx @@ -35,8 +35,9 @@ \title{The \textsf{afterpage} package\thanks{This file has version number \fileversion, last revised \filedate.}} -\author{David Carlisle\\carlisle@cs.man.ac.uk} +\author{David Carlisle} \date{\filedate} +\MaintainedByLaTeXTeam{tools} \maketitle \DocInput{afterpage.dtx} \end{document} diff --git a/Master/texmf-dist/source/latex/tools/afterpage.ins b/Master/texmf-dist/source/latex/tools/afterpage.ins index ad544fade7e..fa0a5ff1dcb 100644 --- a/Master/texmf-dist/source/latex/tools/afterpage.ins +++ b/Master/texmf-dist/source/latex/tools/afterpage.ins @@ -3,28 +3,28 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the Standard LaTeX `Tools Bundle'. %% ------------------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the `Tools Bundle' is %% given in the file `manifest.txt'. -%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -38,9 +38,13 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. -------------------------------------------------------------------------- @@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx index 5b48c6d1538..d869ca48fbf 100644 --- a/Master/texmf-dist/source/latex/tools/array.dtx +++ b/Master/texmf-dist/source/latex/tools/array.dtx @@ -197,6 +197,7 @@ % % \date{Printed \today} % +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \MakeShortVerb{\=} diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx index 2f2a7be12ab..cf1da612630 100644 --- a/Master/texmf-dist/source/latex/tools/bm.dtx +++ b/Master/texmf-dist/source/latex/tools/bm.dtx @@ -59,6 +59,7 @@ % % \date{\filedate} % \author{David Carlisle with support by Frank Mittelbach} +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \section{Introduction} diff --git a/Master/texmf-dist/source/latex/tools/bm.ins b/Master/texmf-dist/source/latex/tools/bm.ins index b9e659bdbdc..cf5c792f866 100644 --- a/Master/texmf-dist/source/latex/tools/bm.ins +++ b/Master/texmf-dist/source/latex/tools/bm.ins @@ -3,28 +3,28 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the Standard LaTeX `Tools Bundle'. %% ------------------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the `Tools Bundle' is %% given in the file `manifest.txt'. -%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -38,9 +38,13 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. -------------------------------------------------------------------------- @@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX diff --git a/Master/texmf-dist/source/latex/tools/calc.dtx b/Master/texmf-dist/source/latex/tools/calc.dtx index 0c57e6e00fd..284a8e1b2d3 100644 --- a/Master/texmf-dist/source/latex/tools/calc.dtx +++ b/Master/texmf-dist/source/latex/tools/calc.dtx @@ -64,6 +64,7 @@ % \author{Kresten Krab Thorup, Frank Jensen (and Chris Rowley)} % \date{\filedate} % +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \changes{v4.0d}{1997/11/08} diff --git a/Master/texmf-dist/source/latex/tools/dcolumn.dtx b/Master/texmf-dist/source/latex/tools/dcolumn.dtx index b0be7a5422c..81f2f474c74 100644 --- a/Master/texmf-dist/source/latex/tools/dcolumn.dtx +++ b/Master/texmf-dist/source/latex/tools/dcolumn.dtx @@ -52,6 +52,7 @@ % \author{David Carlisle} % \date{\filedate} % \author{David Carlisle} +% \MaintainedByLaTeXTeam{tools} % \maketitle % % diff --git a/Master/texmf-dist/source/latex/tools/delarray.dtx b/Master/texmf-dist/source/latex/tools/delarray.dtx index eee2563a0f6..7a9495af405 100644 --- a/Master/texmf-dist/source/latex/tools/delarray.dtx +++ b/Master/texmf-dist/source/latex/tools/delarray.dtx @@ -35,8 +35,9 @@ \title{The \textsf{delarray} package\thanks{This file has version number \fileversion, last revised \filedate.}} -\author{David Carlisle\\carlisle@cs.man.ac.uk} +\author{David Carlisle} \date{\filedate} + \MaintainedByLaTeXTeam{tools} \maketitle \DocInput{delarray.dtx} \end{document} diff --git a/Master/texmf-dist/source/latex/tools/enumerate.dtx b/Master/texmf-dist/source/latex/tools/enumerate.dtx index 3c26cbdde92..b3a6b98eacd 100644 --- a/Master/texmf-dist/source/latex/tools/enumerate.dtx +++ b/Master/texmf-dist/source/latex/tools/enumerate.dtx @@ -49,6 +49,7 @@ % revised \filedate.}} % \author{David Carlisle} % \date{\filedate} +% \MaintainedByLaTeXTeam{tools} % \maketitle % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/source/latex/tools/fileerr.dtx b/Master/texmf-dist/source/latex/tools/fileerr.dtx index cbddc36eeff..9aadbd0f86d 100644 --- a/Master/texmf-dist/source/latex/tools/fileerr.dtx +++ b/Master/texmf-dist/source/latex/tools/fileerr.dtx @@ -29,6 +29,7 @@ % \title{File not found error\thanks{This file has version % \fileversion\ last revised \filedate}} % \author{Frank Mittelbach} +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \changes{v1.0e}{97/07/07}{Added q and r replies (PR/2525).} diff --git a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx index 0bf8f9455fe..da6883c63ca 100644 --- a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx +++ b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx @@ -24,6 +24,7 @@ % \author{Alan Jeffrey} % \date{v0.11} % +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \CheckSum{335} diff --git a/Master/texmf-dist/source/latex/tools/ftnright.dtx b/Master/texmf-dist/source/latex/tools/ftnright.dtx index 286738be565..b4fe704e84e 100644 --- a/Master/texmf-dist/source/latex/tools/ftnright.dtx +++ b/Master/texmf-dist/source/latex/tools/ftnright.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % % The LaTeX3 Project and any individual authors listed elsewhere % in this file. diff --git a/Master/texmf-dist/source/latex/tools/hhline.dtx b/Master/texmf-dist/source/latex/tools/hhline.dtx index 52536a93752..b7521594131 100644 --- a/Master/texmf-dist/source/latex/tools/hhline.dtx +++ b/Master/texmf-dist/source/latex/tools/hhline.dtx @@ -35,8 +35,9 @@ \title{The \textsf{hhline} package\thanks{This file has version number \fileversion, last revised \filedate.}} -\author{David Carlisle\\carlisle@cs.man.ac.uk} +\author{David Carlisle} \date{\filedate} + \MaintainedByLaTeXTeam{tools} \maketitle \DeleteShortVerb{\|} \DocInput{hhline.dtx} diff --git a/Master/texmf-dist/source/latex/tools/indentfirst.dtx b/Master/texmf-dist/source/latex/tools/indentfirst.dtx index 229dbbe58f9..a487867aab3 100644 --- a/Master/texmf-dist/source/latex/tools/indentfirst.dtx +++ b/Master/texmf-dist/source/latex/tools/indentfirst.dtx @@ -35,8 +35,9 @@ \title{The \textsf{indentfirst} package\thanks{This file has version number \fileversion, last revised \filedate.}} -\author{David Carlisle\\carlisle@cs.man.ac.uk} +\author{David Carlisle} \date{\filedate} +\MaintainedByLaTeXTeam{tools} \maketitle \DocInput{indentfirst.dtx} \end{document} diff --git a/Master/texmf-dist/source/latex/tools/layout.dtx b/Master/texmf-dist/source/latex/tools/layout.dtx index 2734c526d6c..5d96f1dda4f 100644 --- a/Master/texmf-dist/source/latex/tools/layout.dtx +++ b/Master/texmf-dist/source/latex/tools/layout.dtx @@ -64,6 +64,7 @@ % \markboth{layout package version \fileversion\space as of \filedate} % {layout package version \fileversion\space as of \filedate} % +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \section{Introduction} diff --git a/Master/texmf-dist/source/latex/tools/longtable.dtx b/Master/texmf-dist/source/latex/tools/longtable.dtx index 9cd4852b86f..32e958fd5a8 100644 --- a/Master/texmf-dist/source/latex/tools/longtable.dtx +++ b/Master/texmf-dist/source/latex/tools/longtable.dtx @@ -49,14 +49,14 @@ % revised \filedate.}} % \author{David Carlisle\thanks{The new algorithm for aligning `chunks' % of a table used in version 4 of this package was devised coded -% and documented by David Kastrup, -% \texttt{dak@neuroinformatik.ruhr-uni-bochum.de}.}} +% and documented by David Kastrup.}} % \date{\filedate} % % \let\package\textsf % \let\env\textsf % \providecommand\finalclearpage{\clearpage} % +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \begin{abstract} diff --git a/Master/texmf-dist/source/latex/tools/longtable.ins b/Master/texmf-dist/source/latex/tools/longtable.ins index c6ace539ddb..f04e21181eb 100644 --- a/Master/texmf-dist/source/latex/tools/longtable.ins +++ b/Master/texmf-dist/source/latex/tools/longtable.ins @@ -3,28 +3,28 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the Standard LaTeX `Tools Bundle'. %% ------------------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the `Tools Bundle' is %% given in the file `manifest.txt'. -%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -38,9 +38,13 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. -------------------------------------------------------------------------- @@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx index 4e0fb6b16ab..3eff4d0c1e7 100644 --- a/Master/texmf-dist/source/latex/tools/multicol.dtx +++ b/Master/texmf-dist/source/latex/tools/multicol.dtx @@ -20,7 +20,7 @@ % \iffalse This is a METACOMMENT % %% Package `multicol' to use with LaTeX2e -%% Copyright 1989-2014 Frank Mittelbach +%% Copyright 1989-2015 Frank Mittelbach %% %% In addition to the terms of LPPL any distributed version %% (unchanged or modified) of multicol has to keep the statement @@ -91,10 +91,10 @@ %<driver> \ProvidesFile{multicol.drv} % \fi % \ProvidesFile{multicol.dtx} - [2014/10/28 v1.8i multicolumn formatting (FMi)] + [2015/03/31 v1.8m multicolumn formatting (FMi)] % % -%% \CheckSum{1853} +%% \CheckSum{1891} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -173,6 +173,7 @@ % {\rm Email:} see top of the source file} % \date{Printed \today} % +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \begin{abstract} @@ -1675,7 +1676,7 @@ % remove any space at the end of the box as we don't want to use % this in balancing. Because of the |\color@endgroup| this can't be % done later in |\balance@columns| as the color command will hide -% it. +% it. % \changes{v1.8c}{2013/11/03}{Add \cs{color@endgroup} to prevent color leak} % \changes{v1.8f}{2014/06/19}{Discard spaces before adding \cs{color@endgroup}} % \begin{macrocode} @@ -1727,16 +1728,13 @@ % \changes{v1.6d}{2003/04/17}{Catch problem with \cs{columnbreak} in % last line} % \begin{macrocode} -%<*colbreak> \ifdim\pagegoal=\maxdimen \ifvoid\colbreak@box\else \mult@info\@ne{Re-adding forced break(s) for splitting}% \unvbox\colbreak@box\fi \fi -%</colbreak> % \end{macrocode} -% % If we are in an unrestricted \mc{} environment we end the current % paragraph above with |\par| but this isn't sufficient since \TeX{}s % {\it page\_builder} will not totally empty the contribution @@ -1765,7 +1763,8 @@ % Now it's safe to change the output routine in order to balance % the columns. % \begin{macrocode} - \output{\balance@columns@out}\eject + \output{\balance@columns@out}% + \eject % \end{macrocode} % If the \mc{} environment body was completely empty or if a % multi-page \mc{} just ends at a page boundary we have the unusual @@ -2136,7 +2135,7 @@ % \end{macro} % % -% \begin{macro}{\vfillmaxdepth} +% \begin{macro}{\vfilmaxdepth} % This curious definition is used as the space at the bottom of a % column if we implement |\raggedcolumns|. Normlly one only appends % |\vfill| in that case but this is actually wrong for columns that @@ -2145,10 +2144,12 @@ % would be allowed a depth of |\maxdepth|. So we allow shrinking by % that amount. This only makes a difference if the box would % otherwise become overfull and shrinking never exceeds the -% specified value, so we should be fine. +% specified value, so we should be fine. % \changes{v1.8h}{2014/09/12}{Macro added (pr/4395)} +% \changes{v1.8j}{2015/03/07}{Use only `0.0001fil' for stretching} % \begin{macrocode} -\def\vfillmaxdepth{\vskip \z@ \@plus 1fill \@minus \maxdepth} +\def\vfilmaxdepth{\vskip \z@ \@plus .0001fil + \@minus \maxdepth} % \end{macrocode} % \end{macro} % @@ -2171,7 +2172,7 @@ % If this was a |\clearpage|, a float or a marginpar we call % |\speci@ls| % \begin{macrocode} - \speci@ls \else + \speci@ls \else % \end{macrocode} % otherwise we construct the final page. % \changes{v1.5u}{1999/05/25}{Support \cs{columnbreak}} @@ -2179,15 +2180,14 @@ % column break support} % For the next block of code see comments in section~\ref{sec:colbreak}. % \begin{macrocode} -%<*colbreak> - \ifvoid\colbreak@box\else - \mult@info\@ne{Re-adding forced - break(s) for splitting}% - \setbox\@cclv\vbox{% - \unvbox\colbreak@box - \penalty-\@Mv\unvbox\@cclv}% - \fi -%</colbreak> + \ifvoid\colbreak@box\else + \mult@info\@ne{Re-adding forced + break(s) for splitting}% + \setbox\@cclv\vbox{% + \unvbox\colbreak@box + \penalty-\@Mv + \unvbox\@cclv}% + \fi % \end{macrocode} % Let us now consider the % normal case. We have to |\vsplit| the columns from the @@ -2197,6 +2197,12 @@ \splittopskip\topskip \splitmaxdepth\maxdepth % \end{macrocode} +% We also need to restrict |\boxmaxdepth| so that re-boxing is not +% generating boxes with arbitrary depth. +% \changes{v1.8j}{2015/03/07}{Set \cs{boxmaxdepth}} +% \begin{macrocode} + \boxmaxdepth\maxdepth +% \end{macrocode} % Then we calculate the current column height (in |\dimen@|). % Note that the height of |\partial@page| is already % subtracted from |\@colroom| so we can use its value as a @@ -2264,28 +2270,28 @@ % this was wrong and unboxing is always needed.} % \changes{v1.8b}{2013/08/28}{Remove discardable items at the % end of split boxes} -% \changes{v1.8h}{2014/09/12}{Use \cs{vfillmaxdepth}} +% \changes{v1.8h}{2014/09/12}{Use \cs{vfilmaxdepth}} +% \changes{v1.8k}{2015/03/22}{\cs{remove@discardable@items} removed} % \begin{macrocode} \setbox\count@ \vbox to\dimen@ {\unvbox\count@ - \remove@discardable@items - \ifshr@nking\vfillmaxdepth\fi}% + \ifshr@nking\vfilmaxdepth\fi}% }% % \end{macrocode} % Then the last column follows. % \changes{v1.5a}{1992/11/04}{New box mechanism} % \changes{v1.8b}{2013/08/28}{Remove discardable items at the % end of split boxes} -% \changes{v1.8h}{2014/09/12}{Use \cs{vfillmaxdepth}} +% \changes{v1.8h}{2014/09/12}{Use \cs{vfilmaxdepth}} +% \changes{v1.8k}{2015/03/22}{\cs{remove@discardable@items} removed} % \begin{macrocode} \setbox\mult@rightbox \vsplit\@cclv to\dimen@ \set@keptmarks \setbox\mult@rightbox\vbox to\dimen@ {\unvbox\mult@rightbox - \remove@discardable@items - \ifshr@nking\vfillmaxdepth\fi}% + \ifshr@nking\vfilmaxdepth\fi}% % \end{macrocode} % Now that we are done with the boxes, we restored the current % setting for shrinking in case it got changed: @@ -2503,21 +2509,44 @@ % column break support} % For the next block of code see comments in section~\ref{sec:colbreak}. % \begin{macrocode} -%<*colbreak> \ifnum\outputpenalty = -\@Mv \mult@info\@ne{Forced column break seen}% \global\advance\vsize-\pagetotal \global\setbox\colbreak@box - \vbox{\ifvoid\colbreak@box - \else - \unvbox\colbreak@box - \penalty-\@Mv - \fi - \unvbox\@cclv} + \vbox{% + \ifvoid\colbreak@box + \else + \unvbox\colbreak@box + \penalty-\@Mv + \fi +% \end{macrocode} +% As this is the place of a forced break we now remove vertical +% white space just in front of it (or some of it at least) as it is +% quite likely that the break is not exactly in the right place, +% e.g., after a display environment (if LaTeX would break here by +% its own it would break before the space following the display). +% +% Thus we rebox box 255 once (using |\maxdepth| and calling +% |\remove@discardable@items| inside). The depth of 255 will then +% give us the depth the box would have had if it would have been a +% natural break. We then unbox 255 to get it into the +% |\colbreak@box| and then back up by this depth. This will position +% the bottom of the box at its natural baseline which is useful for +% balancing later on. +% \changes{v1.8k}{2015/03/21}{Remove discarable items just before a +% forced break} +% \begin{macrocode} + \boxmaxdepth\maxdepth + \setbox\@cclv\vbox{% + \unvbox\@cclv + \remove@discardable@items}% + \dimen@\dp\@cclv + \unvbox\@cclv + \kern-\dimen@ + }% \reinsert@footnotes \else -%</colbreak> % \end{macrocode} % If we encounter a float or a marginpar in the current % implementation we simply warn the user that this is not allowed. @@ -2526,7 +2555,7 @@ \PackageWarningNoLine{multicol}% {Floats and marginpars not allowed inside `multicols' - environment!} + environment!}% \unvbox\@cclv\reinsert@footnotes % \end{macrocode} % Additionally we empty the |\@currlist| to avoid later error @@ -2538,9 +2567,7 @@ % \begin{macrocode} \xdef\@freelist{\@freelist\@currlist}% \gdef\@currlist{}% -%<*colbreak> \fi -%</colbreak> \fi % \end{macrocode} % If the penalty is $-10001$ it will come from a |\clearpage| and @@ -2624,24 +2651,33 @@ \def\balance@columns@out{% % \end{macrocode} % For this we need to put the contents of box 255 into |\mult@box|. -% \begin{macrocode} -%<-colbreak> \setbox\mult@box -%<-colbreak> \vbox{\unvbox\@cclv}% -% \end{macrocode} % \changes{v1.5u}{1999/05/25}{Support \cs{columnbreak}} -% \changes{v1.5v}{1999/07/18}{Added debug statements for -% column break support} -% For the next block of code see comments in section~\ref{sec:colbreak}. +% \changes{v1.5v}{1999/07/18}{Added debug statements for column break +% support} For the next block of code see also comments in +% section~\ref{sec:colbreak}. All forced breaks except the last are +% inside |\colbreak@box| so all we have to do is to concatenate this +% box with box |\@cclv| and put a penalty inbetween. Here we test if +% |\colbreak@box| is void so that the message is only generated if +% we really add forced breaks and the penalty. +% \changes{v1.8k}{2015/03/21}{Use \cs{@Mv} and not \cs{break} in case +% this forced break is not used on this page} % \begin{macrocode} -%<*colbreak> \setbox\mult@box\vbox{% \ifvoid\colbreak@box\else - \unvbox\colbreak@box\break + \unvbox\colbreak@box + \penalty-\@Mv \mult@info\@ne{Re-adding forced break(s) in balancing}% \fi - \unvbox\@cclv}% -%</colbreak> + \unvbox\@cclv +% \end{macrocode} +% The last column again is a forced break, so here we discard white +% space as well as that is normally unwanted. +% \changes{v1.8k}{2015/03/21}{Add \cs{remove@discardable@items} at the +% end of the last column when balancing.} +% \begin{macrocode} + \remove@discardable@items + }% \balance@columns % \end{macrocode} % If during balancing the columns got too long the flag @@ -2653,7 +2689,8 @@ {Balancing failed ... cut a normal page}% % \end{macrocode} -% In that case we put the material back in box 255. The curious set of +% In that case we put the material back in box 255 so that we can +% cut a normal page. The curious set of % |\vskip|s we add is necessary to cancel out the |\splittopskip| % that got added for balancing. % \begin{macrocode} @@ -2664,7 +2701,8 @@ % \end{macrocode} % We then call the standard multicol output routine which will % produce a normal page for us (remember we are still within the -% OR). +% OR so some part of the code in |\multi@column@out| is actually not +% doing anything---perhaps this should be cleaned up at some point). % This also means that if there was an |\enlargethispage| present % it will apply to this page as |\multi@column@out| will look at % the status of |\@kludgeins|. @@ -2673,11 +2711,13 @@ % \end{macrocode} % Because balancing made the columns too long we are sure that there % will be some material remaining which was put back onto the main -% vertical list by |\multi@column@out|. We therefore add another -% breakpoint so that this material will then be processed by the -% balancing OR to finish off the multicol environment. +% vertical list by |\multi@column@out|. This will also put the +% explicit |\eject| penalty back so the current +% |\balance@columns@out| output routine will be called again (so we +% better do not add another penalty or else the OR will be called +% twice and we may get scrambled results). +% \changes{v1.8k}{2015/03/21}{No additional penalty here} % \begin{macrocode} - \break \else % \end{macrocode} % If the balancing went ok, we are in the position @@ -2741,11 +2781,11 @@ % also add a forced break point at the very beginning, so that we % can split the box to height zero later on, thereby adding a known % |\splittopskip| glue at the beginning. +% \changes{v1.8k}{2015/03/21}{\cs{remove@discardable@items} removed} % \begin{macrocode} \setbox\mult@box\vbox{% \penalty-\@M \unvbox\mult@box - \remove@discardable@items }% % \end{macrocode} % Then follow values assignments to get the |\vsplit|ting right. @@ -2859,7 +2899,7 @@ \vbadness\@M % \end{macrocode} % We also allow for overfull boxes while we trying to split the -% columns. They can easily happen if we have objects with unusual depth. +% columns. They can easily happen if we have objects with unusual depth. % \changes{v1.8h}{2014/09/12}{Do not report overfull} % \begin{macrocode} \vfuzz \maxdimen @@ -2894,11 +2934,15 @@ % \end{macrocode} % We start with the assumption that the trial will be successful. % If we end up with a solution that is too bad we set -% |too@bad| to \texttt{true}. +% |too@bad| to \texttt{true}. We also assume that all forced breaks +% (if any) will be used during balancing. If this is not the case +% we record this in |forcedbreak@leftover|. % \changes{v1.5b}{1992/11/05}{New badness mechanism} +% \changes{v1.8k}{2015/03/21}{Init \cs{ifforcedbreak@leftover}} % \begin{macrocode} %<*badness> \too@badfalse + \forcedbreak@leftoverfalse %</badness> % \end{macrocode} % Using |\vsplit| we extract the other columns from box register @@ -2914,11 +2958,12 @@ % the bottom, so we rebox once more. % \changes{v1.8b}{2013/08/28}{Remove discardable items at the % end of split boxes} +% \changes{v1.8k}{2015/03/21}{Do not use \cs{remove@discardable@items} +% here} % \begin{macrocode} \global\setbox\count@ \vbox to\dimen@ - {\unvbox\count@ - \remove@discardable@items}% + {\unvbox\count@}% % \end{macrocode} % After every split we check the badness of the resulting column, % normally the amount of extra white in the column. @@ -3059,12 +3104,10 @@ % the column in which case the material after the break would have % stayed in the box. % \begin{macrocode} -%<*colbreak> \setbox\@tempboxa \copy\mult@grightbox \setbox\z@\vsplit\@tempboxa to\maxdimen \ifvoid\@tempboxa -%</colbreak> % \end{macrocode} % Thus if |\@tempboxa| is void we have a valid solution. % In this case we take a closer @@ -3086,12 +3129,13 @@ % We then compare this badness with the allowed badness for the final % column. If it does not exceed this value we use the box, otherwise % we rebox it once more and add some glue at the bottom. -% \changes{v1.8h}{2014/09/12}{Use \cs{vfillmaxdepth}} +% \changes{v1.8h}{2014/09/12}{Use \cs{vfilmaxdepth}} +% \changes{v1.8j}{2015/03/07}{Use \cs{vfil} in this case} % \begin{macrocode} \ifnum\badness>\c@finalcolumnbadness \global\setbox\mult@grightbox \vbox to\dimen@ - {\unvbox\mult@grightbox\vfillmaxdepth}% + {\unvbox\mult@grightbox\vfil}% \ifnum\c@tracingmulticols>\@ne \message{ setting natural (> \the\c@finalcolumnbadness)}% @@ -3102,15 +3146,38 @@ % we report this fact and try again. % \changes{v1.6f}{2004/07/03}{\texttt{/colbreak} guard in the wrong position} % \begin{macrocode} -%<*colbreak> \else +% \end{macrocode} +% If we have unprocessed forced breaks we normally reiterate with a +% larger column size to fit them in eventually. However, if there +% are simply too many of them (e.g., 3 forced breaks but only 2 +% columns to balance) then this will never succeed and and we would +% continue growing the columns until we hit the largest possible +% column size. So in addition we check how big the column size is +% compared to available room and if we exceed this by +% |\maxbalancingoverflow| we give up and instead of balancing cut +% another normal page. To be indicate this case we set +% |forcedbreak@leftover| to true. +% \changes{v1.8k}{2015/03/21}{Watch out for columns growing too far in +% case of forced breaks} +% \changes{v1.8l}{2015/03/25}{Added additional tracing if column overflows} +% \begin{macrocode} + \@tempdima\@colroom + \advance\@tempdima \maxbalancingoverflow + \ifdim \dimen@ < \@tempdima \too@badtrue - \ifnum\c@tracingmulticols>\@ne - \typeout{Rejected: unprocessed - forced break(s) in last column!}% - \fi + \ifnum\c@tracingmulticols>\@ne + \typeout{Rejected: unprocessed + forced break(s) in last column!}% + \fi + \else + \forcedbreak@leftovertrue + \ifnum\c@tracingmulticols>\@ne + \typeout{Failed: columns too large + with unprocessed forced break(s)!}% + \fi + \fi \fi -%</colbreak> \fi % \end{macrocode} % If the natural height of the first box is smaller than the @@ -3141,6 +3208,19 @@ %</badness> \advance\dimen@\p@ \repeat +% \end{macrocode} +% If we come out of the loop with the switch |forcedbreak@leftover| +% set to true then balancing has failed and we should cut a normal +% page. We indicate this below with |\too@badtrue| when any of the +% columns get too high, so we set this flag here too in order to +% get the same processing logic.\footnote{Should get cleaned up as +% we now have two different routes to reach this part of the +% processing.} +% \changes{v1.8k}{2015/03/21}{} +% \begin{macrocode} + \ifforcedbreak@leftover + \too@badtrue + \else % \end{macrocode} % At that point |\dimen@| holds the height that was determined by % the balancing loop. @@ -3161,11 +3241,11 @@ % \changes{v1.5y}{2000/06/10}{Limit column height only in unrestricted % mode (pr/3212)} % \begin{macrocode} - \if@boxedmulticols\else - \ifdim\dimen@>\@colroom - \dimen@\@colroom + \if@boxedmulticols\else + \ifdim\dimen@>\@colroom + \dimen@\@colroom + \fi \fi - \fi % \end{macrocode} % Then we move the contents of the odd-numbered box registers to % the even-numbered ones, shrinking them if requested. @@ -3176,26 +3256,26 @@ % page-builder via |\page@sofar|. % \changes{v1.3a}{1990/05/20}{Changed \cs{vtop} to \cs{vbox}.} % \begin{macrocode} - \process@cols\mult@rightbox - {\@tempcnta\count@ - \advance\@tempcnta\@ne + \process@cols\mult@rightbox + {\@tempcnta\count@ + \advance\@tempcnta\@ne % \end{macrocode} % when putting the final column together we want overfull % information: % \begin{macrocode} - \vfuzz\z@ - \setbox\count@\vbox to\dimen@ - {% + \vfuzz\z@ + \setbox\count@\vbox to\dimen@ + {% % \end{macrocode} % -% \changes{v1.8h}{2014/09/12}{Use \cs{vfillmaxdepth}} +% \changes{v1.8h}{2014/09/12}{Use \cs{vfilmaxdepth}} % \begin{macrocode} - \vskip \z@ - \@plus-\multicolundershoot - \@minus-\multicolovershoot - \unvbox\@tempcnta - \ifshr@nking\vfillmaxdepth\fi - }% + \vskip \z@ + \@plus-\multicolundershoot + \@minus-\multicolovershoot + \unvbox\@tempcnta + \ifshr@nking\vfilmaxdepth\fi + }% % \end{macrocode} % If the resulting box is overfull there was too much material to % fit into the available space. The question though is how much? If @@ -3204,32 +3284,37 @@ % would then have difficulties to balance). % \changes{v1.8a}{2011/12/20}{Balancing concept improved} % \begin{macrocode} - \ifnum\badness>\@M - \vfuzz\maxdimen % no overfull warning - \setbox\@tempboxa \vbox to\dimen@ - {\vskip-\maxbalancingoverflow - \unvcopy\count@}% \ifnum\badness>\@M - \mult@info\@ne - {Balanced column more than - \the\maxbalancingoverflow\space - too large}% + \vfuzz\maxdimen % no overfull warning + \setbox\@tempboxa \vbox to\dimen@ + {\vskip-\maxbalancingoverflow + \unvcopy\count@}% + \ifnum\badness>\@M + \mult@info\@ne + {Balanced column more than + \the\maxbalancingoverflow\space + too large}% % \end{macrocode} % Fail the balancing attempt: % \begin{macrocode} - \too@badtrue - \else + \too@badtrue + \else % \end{macrocode} % Otherwise report that there is a problem but within the accepted % boundary. % \begin{macrocode} - \mult@info\@ne - {Balanced column - too large, but less than - \the\maxbalancingoverflow}% + \mult@info\@ne + {Balanced column + too large, but less than + \the\maxbalancingoverflow}% + \fi \fi - \fi - }% + }% +% \end{macrocode} +% Finally end the |\ifforcedbreak@leftover| conditional. +% \changes{v1.8k}{2015/03/21}{Finish the new conditional} +% \begin{macrocode} + \fi } % \end{macrocode} % \end{macro} @@ -3559,39 +3644,69 @@ % % \begin{macro}{\remove@discardable@items} % There are situations when we may have some space at the end of a -% column and this macro here will attempt to get rid of it. This -% will not remove an extremely long sequence of spaces and -% penalties, but in nearly all cases this will be enough. -% \begin{macrocode} +% column and this macro here will attempt to get rid of it. The +% typical \LaTeX{} sequence is a series of selfcanceling glues so +% if we remove them recursively we are usually fine. +% +% Special care is needed with handling |\vspace*| as that +% corresponds to |\penalty10000|, |\vskip <skip>|, followed by +% |\vskip 0pt|. If we see this sequence going backwards in the the +% vertical list we assume that this is a ``desired'' space. We +% therefore stop the recursion and reinsert the spaces. +% +% As the multicol code sometimes add an explicit penalty at the end +% of a column we first attempt to remove it in case it is there. +% \changes{v1.8m}{2015/03/31}{Another rewrite of +% \cs{remove@discardable@items} hopefully okay now} +% \begin{macrocode} +\skip0=0pt +\edef\the@zero@skip{\the\skip0} \def\remove@discardable@items{% -%<*debug> - \edef\@tempa{s=\the\lastskip, - p=\the\lastpenalty, - k=\the\lastkern}% - \typeout\@tempa -%</debug> - \unskip\unpenalty\unkern -%<*debug> - \edef\@tempa{s=\the\lastskip, - p=\the\lastpenalty, - k=\the\lastkern}% - \typeout\@tempa -%</debug> - \unskip\unpenalty\unkern -%<*debug> - \edef\@tempa{s=\the\lastskip, - p=\the\lastpenalty, - k=\the\lastkern}% - \typeout\@tempa -%</debug> - \unskip\unpenalty\unkern -%<*debug> - \edef\@tempa{s=\the\lastskip, - p=\the\lastpenalty, - k=\the\lastkern}% - \typeout\@tempa -%</debug> - \unskip\unpenalty\unkern + \unpenalty +% \end{macrocode} +% Save a previous skip (if there) and then remove it, we can't +% really tell the difference between no skip an a skip of zero but +% that's life. +% \begin{macrocode} + \edef\@tempa{\the\lastskip}% +%\typeout{s1=\@tempa}% + \unskip +% \end{macrocode} +% If it was a zero skip (or none) we save the next previous skip +% (if any). +% \begin{macrocode} + \ifx\@tempa\the@zero@skip + \edef\@tempb{\the\lastskip}% +%\typeout{s2=\@tempb}% +% \end{macrocode} +% If this one again was zero (or more likely not there in the first +% place) we stop. +% \begin{macrocode} + \ifx\@tempb\the@zero@skip + \else +% \end{macrocode} +% Otherwise we remove this ``real'' skip. Then we look if it was +% preceeded by a penalty of 10000 (i.e., a |\nobreak|) +% \begin{macrocode} + \unskip +%\typeout{p=\lastpenalty}% + \ifnum \lastpenalty=\@M +% \end{macrocode} +% If so this was a |\vspace*| or something equivalent to +% it. Therefore we reintroduce the skips and stop. Otherwise we +% recurse. +% \begin{macrocode} + \vskip\@tempb\vskip\@tempa\relax + \else + \remove@discardable@items + \fi + \fi + \else +% \end{macrocode} +% If the first skip was a non-zero skip we recurse as well. +% \begin{macrocode} + \remove@discardable@items + \fi } % \end{macrocode} % \end{macro} @@ -3602,6 +3717,11 @@ \def\too@badtrue{\global\let\iftoo@bad\iftrue} \def\too@badfalse{\global\let\iftoo@bad\iffalse} % \end{macrocode} +% +% \changes{v1.8k}{2015/03/21}{The new switch} +% \begin{macrocode} +\newif\ifforcedbreak@leftover +% \end{macrocode} % % \begin{macro}{\c@columnbadness} % \begin{macro}{\c@finalcolumnbadness} @@ -3717,19 +3837,39 @@ % When ending the environment we simply end the inner % \texttt{multicols} environment, except that we better also stick % in some stretchable vertical glue so that the last column still -% containing text is not vertically stretched out. The final |\null| hides this space -% so that it doesn't get removed again when the columns are assembled. -% However, we only do this if we aren't already doing |\raggedcolumns| -% because it would be a mistake to add such glue twice. After all it contains -% a minus component of |\maxdepth| and that would then be applied twice! +% containing text is not vertically stretched out. +% +% We do this as follows: first we cancel out |\lastskip| if it was +% positive (in case of a negative glue we assume that it was +% deliberate, for a deliberate positive glue one needs to use +% |\vspace*|). We can't simply use |\remove@discardable@items| here +% as this only works inside boxes but we are here on the main +% vertical list. +% +% Then we back up by |\prevdepth| but not more than |\boxmaxdepth| +% so that a baseline of the last box is now at the bottom. This way +% the material will align properly in case something like |\vfill| +% spreads it out after all. +% Finally we append |\vfil| to put white space at the bottom of the +% column, but we only do this if we aren't anyway doing |\raggedcolumns|. % \changes{v1.5q}{1998/01/19}{Macro added} -% \changes{v1.8h}{2014/09/12}{Use \cs{vfillmaxdepth}} +% \changes{v1.8h}{2014/09/12}{Use \cs{vfilmaxdepth}} % \changes{v1.8i}{2014/10/28}{Add \cs{null} to hide the final fill and only add % vertical space if not doing \cs{raggedcolumns}} -% \begin{macrocode} - \@namedef{endmulticols*}{\ifshr@nking\else - \vfillmaxdepth\nointerlineskip\null - \fi +% \changes{v1.8j}{2015/03/07}{Redesign the whole approach.} +% \changes{v1.8k}{2015/03/21}{And a bit more redesign because of the +% change in \cs{remove@discardable@items}} +% \begin{macrocode} +\@namedef{endmulticols*}{% + \ifdim\lastskip>\z@ \vskip-\lastskip \fi + \ifdim \prevdepth>\z@ + \vskip-\ifdim\prevdepth>\boxmaxdepth + \boxmaxdepth + \else \prevdepth \fi + \fi + \ifshr@nking\else + \vfil + \fi \end{multicols}} %</nobalance> % \end{macrocode} @@ -3771,7 +3911,6 @@ % |\columnbreak| is modelled after |\pagebreak| except that we % generate a penalty -10005. % \begin{macrocode} -%<*colbreak> \mathchardef\@Mv=10005 \def\columnbreak{% % \end{macrocode} @@ -3802,7 +3941,6 @@ % Need a box to collect the galley up to the column break. % \begin{macrocode} \newbox\colbreak@box -%</colbreak> %</package> % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/tools/multicol.ins b/Master/texmf-dist/source/latex/tools/multicol.ins index d1bb5709742..e5ac6721d27 100644 --- a/Master/texmf-dist/source/latex/tools/multicol.ins +++ b/Master/texmf-dist/source/latex/tools/multicol.ins @@ -3,28 +3,28 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the Standard LaTeX `Tools Bundle'. %% ------------------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the `Tools Bundle' is %% given in the file `manifest.txt'. -%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -38,9 +38,13 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. -------------------------------------------------------------------------- @@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX @@ -64,7 +68,7 @@ given in the file `manifest.txt'. \generateFile{multicol.sty}{t}{% - \from{multicol.dtx}{package,badness,check,marktrace,nobalance,colbreak}} + \from{multicol.dtx}{package,badness,check,marktrace,nobalance}} \endbatchfile diff --git a/Master/texmf-dist/source/latex/tools/rawfonts.dtx b/Master/texmf-dist/source/latex/tools/rawfonts.dtx index 579d5d1122d..f27688331b6 100644 --- a/Master/texmf-dist/source/latex/tools/rawfonts.dtx +++ b/Master/texmf-dist/source/latex/tools/rawfonts.dtx @@ -23,6 +23,7 @@ % \title{The \textsf{rawfonts} package} % \date{v0.01} % \author{Alan Jeffrey} +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \CheckSum{286} diff --git a/Master/texmf-dist/source/latex/tools/showkeys.dtx b/Master/texmf-dist/source/latex/tools/showkeys.dtx index e30d1a57101..960120bcb15 100644 --- a/Master/texmf-dist/source/latex/tools/showkeys.dtx +++ b/Master/texmf-dist/source/latex/tools/showkeys.dtx @@ -54,6 +54,7 @@ % revised \filedate.}} % \author{David Carlisle \and Morten H\o gholm} % \date{\filedate} +% \MaintainedByLaTeXTeam{tools} % \maketitle % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/source/latex/tools/somedefs.dtx b/Master/texmf-dist/source/latex/tools/somedefs.dtx index f611912d0bc..3e086754332 100644 --- a/Master/texmf-dist/source/latex/tools/somedefs.dtx +++ b/Master/texmf-dist/source/latex/tools/somedefs.dtx @@ -23,6 +23,7 @@ % \title{The \textsf{somedefs} toolkit package} % \date{long time ago in a different century\ldots} % \author{Alan Jeffrey} +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \CheckSum{56} diff --git a/Master/texmf-dist/source/latex/tools/tabularx.dtx b/Master/texmf-dist/source/latex/tools/tabularx.dtx index e9ebca7e967..ba816ea8a4c 100644 --- a/Master/texmf-dist/source/latex/tools/tabularx.dtx +++ b/Master/texmf-dist/source/latex/tools/tabularx.dtx @@ -74,6 +74,7 @@ % revised \filedate.}} % \author{David Carlisle} % \date{\filedate} +% \MaintainedByLaTeXTeam{tools} % \maketitle % \DeleteShortVerb{\|} % \MakeShortVerb{\"} diff --git a/Master/texmf-dist/source/latex/tools/tabularx.ins b/Master/texmf-dist/source/latex/tools/tabularx.ins index b5d0515cd6f..2a121836236 100644 --- a/Master/texmf-dist/source/latex/tools/tabularx.ins +++ b/Master/texmf-dist/source/latex/tools/tabularx.ins @@ -3,28 +3,28 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the Standard LaTeX `Tools Bundle'. %% ------------------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the `Tools Bundle' is %% given in the file `manifest.txt'. -%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -38,9 +38,13 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. -------------------------------------------------------------------------- @@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX diff --git a/Master/texmf-dist/source/latex/tools/theorem.dtx b/Master/texmf-dist/source/latex/tools/theorem.dtx index e7550ae7c85..429039d3f28 100644 --- a/Master/texmf-dist/source/latex/tools/theorem.dtx +++ b/Master/texmf-dist/source/latex/tools/theorem.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % % The LaTeX3 Project and any individual authors listed elsewhere % in this file. @@ -109,13 +109,9 @@ % \LaTeX{} theorem environment\thanks{This file % has version number \fileversion, last % revised \filedate.}} -% \author{Frank Mittelbach\\ -% Electronic Data Systems\\ -% (Deutschland) GmbH\\ -% Eisenstra\ss e 56\\ -% D-65424 R\"usselsheim\\ -% Federal Republic of Germany} +% \author{Frank Mittelbach} % +% \MaintainedByLaTeXTeam{tools} % \maketitle % % \begin{abstract} diff --git a/Master/texmf-dist/source/latex/tools/tools.ins b/Master/texmf-dist/source/latex/tools/tools.ins index 0ef92ae22a5..a65ca0d5dfa 100644 --- a/Master/texmf-dist/source/latex/tools/tools.ins +++ b/Master/texmf-dist/source/latex/tools/tools.ins @@ -3,28 +3,28 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the Standard LaTeX `Tools Bundle'. %% ------------------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the `Tools Bundle' is %% given in the file `manifest.txt'. -%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -41,9 +41,14 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. -------------------------------------------------------------------------- @@ -53,7 +58,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX @@ -158,7 +163,7 @@ given in the file `manifest.txt'. \SimplePackage{layout} -% Infix Arithmetic +% Infix Arithmetic %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \SimplePackage{calc} diff --git a/Master/texmf-dist/source/latex/tools/trace.dtx b/Master/texmf-dist/source/latex/tools/trace.dtx index a5e99a673b9..0dfcc4baf21 100644 --- a/Master/texmf-dist/source/latex/tools/trace.dtx +++ b/Master/texmf-dist/source/latex/tools/trace.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2014 +% Copyright 1993-2015 % % The LaTeX3 Project and any individual authors listed elsewhere % in this file. @@ -61,10 +61,9 @@ % \title{The \textsf{trace} package\thanks{This file % has version number \fileversion, last % revised \filedate.}} -% \author{Frank Mittelbach\\ -% \LaTeX3 project\\ -% \texttt{frank.mittelbach@latex-project.org}} +% \author{Frank Mittelbach} % \date{\filedate} +% \MaintainedByLaTeXTeam{tools} % \maketitle % % diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx index e200ffdcab7..2c984b2c125 100644 --- a/Master/texmf-dist/source/latex/tools/varioref.dtx +++ b/Master/texmf-dist/source/latex/tools/varioref.dtx @@ -66,6 +66,7 @@ % \author{Frank Mittelbach} % \date{\filedate} % +% \MaintainedByLaTeXTeam{tools} % \maketitle % % diff --git a/Master/texmf-dist/source/latex/tools/varioref.ins b/Master/texmf-dist/source/latex/tools/varioref.ins index e973ebd9c14..bc693721cae 100644 --- a/Master/texmf-dist/source/latex/tools/varioref.ins +++ b/Master/texmf-dist/source/latex/tools/varioref.ins @@ -3,28 +3,28 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% Copyright 1993-2015 %% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% +%% in this file. +%% %% This file is part of the Standard LaTeX `Tools Bundle'. %% ------------------------------------------------------- -%% +%% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files %% it generates. -%% +%% %% The list of all files belonging to the `Tools Bundle' is %% given in the file `manifest.txt'. -%% +%% %% %% --------------- start of docstrip commands ------------------ %% @@ -38,9 +38,13 @@ This is a generated file. -Copyright 1993-2014 +The source is maintained by the LaTeX Project team and bug +reports for it can be opened at http://latex-project.org/bugs.html +(but please observe conditions on bug reports sent to that address!) + +Copyright 1993-2015 The LaTeX3 Project and any individual authors listed elsewhere -in this file. +in this file. This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. -------------------------------------------------------------------------- @@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This file may only be distributed together with a copy of the LaTeX diff --git a/Master/texmf-dist/source/latex/tools/verbatim.dtx b/Master/texmf-dist/source/latex/tools/verbatim.dtx index d9d1702a8a1..45cd00e1e19 100644 --- a/Master/texmf-dist/source/latex/tools/verbatim.dtx +++ b/Master/texmf-dist/source/latex/tools/verbatim.dtx @@ -51,23 +51,15 @@ \title{A New Implementation of \LaTeX{}'s \\ \texttt{verbatim} and \texttt{verbatim*} Environments.} \author{Rainer Sch\"opf\\ - Internet: \texttt{Schoepf@Uni-Mainz.DE} \and Bernd Raichle\\ - Stettener Str.~73\\ - D-73732 W\"aldenbronn\\ - Federal Republic of Germany\\ - Internet: \texttt{raichle@azu.Informatik.Uni-Stuttgart.DE} \and - Chris Rowley\\ - The Open University\\ - Parsifal College\\ - Finchley Road\\ - London NW3 7BG, UK\\ - Internet: \texttt{C.A.Rowley@open.ac.uk}} + Chris Rowley} + \date{2001/03/12} \begin{document} \markboth{Verbatim style option}{Verbatim style option} +\MaintainedByLaTeXTeam{tools} \maketitle \DocInput{verbatim.dtx} \end{document} diff --git a/Master/texmf-dist/source/latex/tools/xr.dtx b/Master/texmf-dist/source/latex/tools/xr.dtx index 2ca7c7fed8d..e48c5d3e483 100644 --- a/Master/texmf-dist/source/latex/tools/xr.dtx +++ b/Master/texmf-dist/source/latex/tools/xr.dtx @@ -36,9 +36,9 @@ has version number \fileversion, last revised \filedate.}} \author{David Carlisle\thanks{% - The Author of Versions 1--4 was Jean-Pierre Drucbert}\\ - carlisle@cs.man.ac.uk} + The Author of Versions 1--4 was Jean-Pierre Drucbert}} \date{\filedate} +\MaintainedByLaTeXTeam{tools} \maketitle \DocInput{xr.dtx} \end{document} diff --git a/Master/texmf-dist/source/latex/tools/xspace.dtx b/Master/texmf-dist/source/latex/tools/xspace.dtx index 18ef9093d3f..75d6426d335 100644 --- a/Master/texmf-dist/source/latex/tools/xspace.dtx +++ b/Master/texmf-dist/source/latex/tools/xspace.dtx @@ -56,6 +56,7 @@ % revised \filedate.}} % \author{David Carlisle \and Morten H\o gholm} % \date{\filedate} +% \MaintainedByLaTeXTeam{tools} % \maketitle % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |