From 77946deb7c8c75536876bd1f5b102c6eed486e46 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 28 Sep 2009 15:31:57 +0000 Subject: babel (latex core) update via latex-tds (25sep09) git-svn-id: svn://tug.org/texlive/trunk@15516 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/babel/athnum.pdf | Bin 96989 -> 96992 bytes Master/texmf-dist/doc/generic/babel/babel.pdf | Bin 2441872 -> 2453925 bytes Master/texmf-dist/doc/generic/babel/bbcompat.pdf | Bin 52227 -> 52228 bytes Master/texmf-dist/doc/generic/babel/bbidxglo.pdf | Bin 58687 -> 58686 bytes Master/texmf-dist/doc/generic/babel/changes.txt | 128 ++++- Master/texmf-dist/doc/generic/babel/greek-fdd.pdf | Bin 105689 -> 105689 bytes .../texmf-dist/doc/generic/babel/greek-usage.pdf | Bin 109186 -> 109186 bytes Master/texmf-dist/doc/generic/babel/grmath.pdf | Bin 68061 -> 68060 bytes Master/texmf-dist/doc/generic/babel/grsymb.pdf | Bin 66198 -> 66199 bytes .../texmf-dist/doc/generic/babel/language.skeleton | 2 +- Master/texmf-dist/doc/generic/babel/manifest.bbl | 16 +- Master/texmf-dist/doc/generic/babel/tb1202.pdf | Bin 174712 -> 164755 bytes Master/texmf-dist/doc/generic/babel/tb1401.pdf | Bin 96190 -> 66398 bytes Master/texmf-dist/doc/generic/babel/tb1604.pdf | Bin 123374 -> 113744 bytes Master/texmf-dist/source/generic/babel/babel.ins | 11 +- Master/texmf-dist/source/generic/babel/danish.dtx | 9 +- Master/texmf-dist/source/generic/babel/danish.ins | 6 +- .../texmf-dist/source/generic/babel/estonian.dtx | 188 ++++--- .../texmf-dist/source/generic/babel/estonian.ins | 6 +- Master/texmf-dist/source/generic/babel/frenchb.dtx | 229 ++++++-- Master/texmf-dist/source/generic/babel/frenchb.ins | 6 +- .../texmf-dist/source/generic/babel/kurmanji.dtx | 401 ++++++++++++++ .../texmf-dist/source/generic/babel/kurmanji.ins | 148 +++++ Master/texmf-dist/source/generic/babel/spanish.dtx | 606 +++++++++++---------- Master/texmf-dist/source/generic/babel/spanish.ins | 110 ++-- Master/texmf-dist/source/generic/babel/tb1202.tex | 2 +- Master/texmf-dist/source/generic/babel/tb1401.tex | 2 +- Master/texmf-dist/source/generic/babel/tb1604.tex | 2 +- Master/texmf-dist/tex/generic/babel/danish.ldf | 8 +- Master/texmf-dist/tex/generic/babel/estonian.ldf | 90 +-- Master/texmf-dist/tex/generic/babel/frenchb.cfg | 2 +- Master/texmf-dist/tex/generic/babel/frenchb.ldf | 91 +++- Master/texmf-dist/tex/generic/babel/kurmanji.ldf | 164 ++++++ Master/texmf-dist/tex/generic/babel/romanidx.sty | 10 +- Master/texmf-dist/tex/generic/babel/spanish.ldf | 33 +- 35 files changed, 1666 insertions(+), 604 deletions(-) create mode 100644 Master/texmf-dist/source/generic/babel/kurmanji.dtx create mode 100644 Master/texmf-dist/source/generic/babel/kurmanji.ins create mode 100644 Master/texmf-dist/tex/generic/babel/kurmanji.ldf (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/generic/babel/athnum.pdf b/Master/texmf-dist/doc/generic/babel/athnum.pdf index 5c3d3c15c13..5b4d75b6d52 100644 Binary files a/Master/texmf-dist/doc/generic/babel/athnum.pdf and b/Master/texmf-dist/doc/generic/babel/athnum.pdf differ diff --git a/Master/texmf-dist/doc/generic/babel/babel.pdf b/Master/texmf-dist/doc/generic/babel/babel.pdf index 7cd8af09fc5..763ee1ae089 100644 Binary files a/Master/texmf-dist/doc/generic/babel/babel.pdf and b/Master/texmf-dist/doc/generic/babel/babel.pdf differ diff --git a/Master/texmf-dist/doc/generic/babel/bbcompat.pdf b/Master/texmf-dist/doc/generic/babel/bbcompat.pdf index d54b04c0201..e00b1c8a9c7 100644 Binary files a/Master/texmf-dist/doc/generic/babel/bbcompat.pdf and b/Master/texmf-dist/doc/generic/babel/bbcompat.pdf differ diff --git a/Master/texmf-dist/doc/generic/babel/bbidxglo.pdf b/Master/texmf-dist/doc/generic/babel/bbidxglo.pdf index 1abda5fe68b..4a6b474c99f 100644 Binary files a/Master/texmf-dist/doc/generic/babel/bbidxglo.pdf and b/Master/texmf-dist/doc/generic/babel/bbidxglo.pdf differ diff --git a/Master/texmf-dist/doc/generic/babel/changes.txt b/Master/texmf-dist/doc/generic/babel/changes.txt index f4e5129f01e..20ece3262ff 100644 --- a/Master/texmf-dist/doc/generic/babel/changes.txt +++ b/Master/texmf-dist/doc/generic/babel/changes.txt @@ -8,7 +8,123 @@ are not part of the distribution. ========================================================================== -2008-06-01 Johannes Braams \ProvidesLanguage{danish} %\fi %\ProvidesFile{danish.dtx} - [2008/07/06 v1.3q Danish support from the babel system] + [2009/09/19 v1.3r Danish support from the babel system] %\iffalse %% File `danish.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2008 +%% Copyright (C) 1989 - 2009 %% by Johannes Braams, TeXniek % %% Please report errors to: J.L. Braams @@ -279,8 +279,9 @@ % command |"/|. % \changes{danish-1.3q}{2008/03/17}{Added definition of \texttt{"/} % from \texttt{dutch.ldf}} +% \changes{danish-1.3r}{2009/09/19}{Made "/ a real Danish shorthand} % \begin{macrocode} -\declare@shorthand{dutch}{"/}{\textormath +\declare@shorthand{danish}{"/}{\textormath {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}} % \end{macrocode} % diff --git a/Master/texmf-dist/source/generic/babel/danish.ins b/Master/texmf-dist/source/generic/babel/danish.ins index 3eef6ab7379..5b113c61593 100644 --- a/Master/texmf-dist/source/generic/babel/danish.ins +++ b/Master/texmf-dist/source/generic/babel/danish.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1989-2008 Johannes L. Braams and any individual authors +%% Copyright 1989-2009 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file is part of the Babel system. @@ -53,7 +53,7 @@ \declarepreamble\mainpreamble This is a generated file. -Copyright 1989-2008 Johannes L. Braams and any individual authors +Copyright 1989-2009 Johannes L. Braams and any individual authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. @@ -87,7 +87,7 @@ extension .ins) which are part of the distribution. \declarepreamble\fdpreamble This is a generated file. -Copyright 1989-2008 Johannes L. Braams and any individual authors +Copyright 1989-2009 Johannes L. Braams and any individual authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. diff --git a/Master/texmf-dist/source/generic/babel/estonian.dtx b/Master/texmf-dist/source/generic/babel/estonian.dtx index 95f26435000..48a39bfac0d 100644 --- a/Master/texmf-dist/source/generic/babel/estonian.dtx +++ b/Master/texmf-dist/source/generic/babel/estonian.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1989-2008 Johannes L. Braams and any individual authors +% Copyright 1989-2009 Johannes L. Braams and any individual authors % listed elsewhere in this file. All rights reserved. % % This file is part of the Babel system. @@ -26,7 +26,7 @@ % and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. % \fi -% \CheckSum{330} +% \CheckSum{327} % \iffalse % Tell the \LaTeX\ system who we are and write an entry on the % transcript. @@ -36,15 +36,15 @@ %\ProvidesLanguage{estonian} %\fi %\ProvidesFile{estonian.dtx} - [2008/07/07 v1.0j Estonian support from the babel system] + [2009/03/08 v1.0k Estonian support from the babel system] %\iffalse %% File `estonian.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2005 +%% Copyright (C) 1989 - 2009 %% by Johannes Braams, TeXniek % %% Estonian language Definition File -%% Copyright (C) 1991 - 2005 +%% Copyright (C) 1991 - 2009 %% by Enn Saar, Tartu Astrophysical Observatory % Tartu Astrophysical Observatory % EE-2444 T\~oravere @@ -55,13 +55,14 @@ % % Johannes Braams, TeXniek % -%% Please report errors to: Enn Saar saar at aai.ee -%% (or J.L. Braams babel atbraams.cistron.nl +%% Please report errors to: Jaan Vajakas jv at ut.ee +%% (or Enn Saar saar at aai.ee +%% or J. L. Braams babel at braams.xs4all.nl) % % This file is part of the babel system, it provides the source -% code for the Estonian language definition file. The original -% version of this file was written by Enn Saar, -% (saar@aai.ee). +% code for the Estonian language definition file. The original +% version of this file was written by Enn Saar (saar@aai.ee). +% Modified by Jaan Vajakas (jv@ut.ee). %<*filedriver> \documentclass{ltxdoc} \newcommand*\TeXhax{\TeX hax} @@ -81,6 +82,8 @@ % \cs{@undefined} and \cs{empty} with \cs{@empty} for consistency % with \LaTeX, moved the definition of \cs{atcatcode} right to the % beginning.} +% \changes{estonian-1.0k}{2009/03/07}{corrected documentation of the +% commands |"-| and |\-|} % % \GetFileInfo{estonian.dtx} % @@ -112,10 +115,8 @@ % |~s| & |\v s|, (and uppercase); \\ % |~z| & |\v z|, (and uppercase); \\ % \verb="|= & disable ligature at this position;\\ -% |"-| & an explicit hyphen sign, allowing hyphenation +% |"-| & like |\-|, but allowing hyphenation % in the rest of the word;\\ -% |\-| & like the old |\-|, but allowing hyphenation -% in the rest of the word; \\ % |"`| & for Estonian low left double quotes (same as German);\\ % |"'| & for Estonian right double quotes;\\ % |"<| & for French left double quotes (also rather popular)\\ @@ -178,6 +179,8 @@ % \changes{estonian-1.0h}{2000/09/20}{Added \cs{glossaryname}} % \changes{estonian-1.0j}{2008/07/07}{Replaced the translation of % `Proof'} +% \changes{estonian-1.0k}{2009/02/03}{Added translation of +% `Glossary'} % \begin{macrocode} \addto\captionsestonian{% \def\prefacename{Sissejuhatus}% @@ -197,8 +200,6 @@ \def\pagename{Lk.}% \def\seename{vt.}% \def\alsoname{vt. ka}% - \def\proofname{T~oestus}% - \def\glossaryname{Glossary}% <-- Needs translation } % \end{macrocode} % @@ -209,8 +210,10 @@ \def\x{\endgroup \addto\captionsestonian{% \def\abstractname{Kokkuv~ote}% - \def\chaptername{Peat"ukk}}} -\x + \def\chaptername{Peat"ukk}% + \def\proofname{T~oestus}% + \def\glossaryname{S~onastik}% +}}\x % \end{macrocode} % \end{macro} % @@ -235,6 +238,15 @@ % \end{macrocode} % \end{macro} % +% Some useful macros, copied from the spanish package (and renamed |es@...| to |et@...|). +% \begin{macrocode} +\def\et@sdef#1{\babel@save#1\def#1} + +\@ifundefined{documentclass} + {\let\ifet@latex\iffalse} + {\let\ifet@latex\iftrue} +% \end{macrocode} +% % \begin{macro}{\extrasestonian} % \begin{macro}{\noextrasestonian} % The macro |\extrasestonian| will perform all the extra @@ -249,11 +261,6 @@ \addto\extrasestonian{\languageshorthands{estonian}} \addto\extrasestonian{\bbl@activate{"}\bbl@activate{~}} % \end{macrocode} -% Store the original macros, and redefine accents. -% -% \begin{macrocode} -\addto\extrasestonian{\babel@save\"\umlautlow\babel@save\~\tildelow} -% \end{macrocode} % % \changes{estonian-1.0d}{1995/07/27}{Removed the code that changes % category, lower case, uper case and space factor codes } @@ -277,38 +284,77 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\tildelow} -% \begin{macro}{\gentilde} -% \begin{macro}{\newtilde} -% \begin{macro}{\newcheck} -% The standard \TeX\ accents are too high for Estonian typography, -% we have to lower them (following the \babel\ German style). For -% a detailed explanation see the file \file{glyphs.dtx}. +% The standard \TeX\ accents are too high for Estonian typography, +% we have to lower them (following the \babel\ German style). +% For umlauts, we can use |\umlautlow| in \file{babel.ldf}. +% \changes{estonian-1.0k}{2009/02/03}{use \cs{umlauthigh} to restore +% umlauts (before, |\babel@save\"| was used but that did not work)} +% \begin{macrocode} +\addto\extrasestonian{\umlautlow} +\addto\noextrasestonian{\umlauthigh} +% \end{macrocode} % +% Redefine tilde (as in \file{spanish.ldf}). In case of \LaTeX, we +% redefine the internal macro for the OT1 encoding because in case of +% T1, the display and hyphenation of words containing |\~o| works +% better without redefining it (e. g. words containing |\et@gentilde| +% are not hyphenated unless |\allowhyphens| is used; when copied from +% Acrobat Reader, pasting an \~o generated using |\et@gentilde{o}| +% gives |~o| rather than \~o; when the times package is used with T1 +% encoding, |\et@gentilde| places the tilde through the letter o). +% In plain \TeX\ there is no encoding infrastructure, so we just +% redefine |\~|. +% \changes{estonian-1.0k}{2009/02/03}{redefine +% |\csname OT1\string\~\endcsname| instead of |\~| (before, +% redefining |\~| resulted in no hyphenation of words containing +% |\~o| in T1 and incorrect display of |\~o| with the times package)} % \begin{macrocode} -\def\tildelow{\def\~{\protect\gentilde}} -\def\gentilde#1{\if#1o\newtilde{#1}\else\if#1O\newtilde{#1}% - \else\newcheck{#1}% - \fi\fi} -\def\newtilde#1{\leavevmode\allowhyphens - {\U@D 1ex% - {\setbox\z@\hbox{\char126}\dimen@ -.45ex\advance\dimen@\ht\z@ - \ifdim 1ex<\dimen@ \fontdimen5\font\dimen@ \fi}% - \accent126\fontdimen5\font\U@D #1}\allowhyphens} -\def\newcheck#1{\leavevmode\allowhyphens - {\U@D 1ex% - {\setbox\z@\hbox{\char20}\dimen@ -.45ex\advance\dimen@\ht\z@ - \ifdim 1ex<\dimen@ \fontdimen5\font\dimen@ \fi}% - \accent20\fontdimen5\font\U@D #1}\allowhyphens} +\ifet@latex + \addto\extrasestonian{% + \expandafter\et@sdef\csname OT1\string\~\endcsname{\et@gentilde}} +\else + \addto\extrasestonian{\et@sdef\~{\et@gentilde}} +\fi +% \end{macrocode} +% +% \begin{macro}{\et@gentilde} +% \changes{estonian-1.0k}{2009/02/03}{use tilde for all letters except +% s and z (instead of using caron for all letters except o), like +% other \babel\ language packages do (this fixes the display of \~n +% when using the utf8 package)} +% \changes{estonian-1.0k}{2009/02/03}{do not redefine caron any +% more because the default one looks good enough} +% \changes{estonian-1.0k}{2009/02/03}{renamed macros \cs{gentilde} and +% \cs{newtilde} to \cs{et@gentilde} and \cs{et@newtilde}} +% \begin{macrocode} +\def\et@gentilde#1{% + \if#1s\v{#1}\else\if#1S\v{#1}\else% + \if#1z\v{#1}\else\if#1Z\v{#1}\else% + \et@newtilde{#1}% + \fi\fi\fi\fi} % \end{macrocode} % \end{macro} -% \end{macro} -% \end{macro} +% +% \begin{macro}{\et@newtilde} +% For a detailed explanation of the following code see the +% definition of \cs{lower@umlaut} in \file{babel.dtx}. +% \changes{estonian-1.0k}{2009/02/04}{merged updates in the definition +% \cs{lower@umlaut} into \cs{et@newtilde}: removed \cs{allowhyphens} +% and added \cs{bgroup}} +% \begin{macrocode} +\def\et@newtilde#1{% + \leavevmode\bgroup\U@D 1ex% + {\setbox\z@\hbox{\char126}\dimen@ -.45ex\advance\dimen@\ht\z@ + \ifdim 1ex<\dimen@ \fontdimen5\font\dimen@ \fi}% + \accent126\fontdimen5\font\U@D #1% + \egroup} +% \end{macrocode} % \end{macro} % -% We save the double quote character in |\dq|, and tilde in |\til|, -% and store the original definitions of |\"| and |\~| as |\dieresis| -% and |\texttilde|. +% We save the double quote character in |\dq|, and tilde in |\til|. +% \changes{estonian-1.0k}{2009/02/03}{removed macros \cs{dieresis} and +% \cs{texttilde} that were used to store the original definitions of +% |\"| and |\~|, as they would have no purpose now} % % \begin{macrocode} \begingroup \catcode`\"12 @@ -316,20 +362,15 @@ \def\noexpand\dq{"} \def\noexpand\til{~}} \x -\let\dieresis\" -\let\texttilde\~ % \end{macrocode} % -% This part follows closely \file{spanish.ldf}. We check the -% encoding and if it is T1, we have to tell \TeX\ about our -% redefined accents. +% If the encoding is T1, we have to tell \TeX\ about our redefined +% accents. % % \changes{estonian-1.0g}{1999/04/11}{use \cs{bbl@t@one} instead of % \cs{bbl@next}} % \begin{macrocode} \ifx\f@encoding\bbl@t@one - \let\@umlaut\dieresis - \let\@tilde\texttilde \DeclareTextComposite{\~}{T1}{s}{178} \DeclareTextComposite{\~}{T1}{S}{146} \DeclareTextComposite{\~}{T1}{z}{186} @@ -343,28 +384,27 @@ % If the encoding differs from T1, we expand the accents, enabling % hyphenation beyond the accent. In this case \TeX\ will not find % all possible breaks, and we have to warn people. -% +% \changes{estonian-1.0k}{2009/02/03}{removed definitions of macros +% |\@umlaut| and |\@tilde| as they seemed to have no purpose} % \begin{macrocode} \else \wlog{Warning: Hyphenation would work better for the T1 encoding.} - \let\@umlaut\newumlaut - \let\@tilde\gentilde \fi % \end{macrocode} % -% Now we define the shorthands. -% +% Now we define the shorthands: umlauts, % \changes{estonian-1.0d}{1995/07/27}{The second argument was missing % in the definition of some of the double-quote shorthands} +% \changes{estonian-1.0k}{2009/02/08}{use \cs{allowhyphens} to allow hyphenation in words containing |"a|, |"A|, |"o|, |"O|, |"u| or |"U|} % \begin{macrocode} -\declare@shorthand{estonian}{"a}{\textormath{\"{a}}{\ddot a}} -\declare@shorthand{estonian}{"A}{\textormath{\"{A}}{\ddot A}} -\declare@shorthand{estonian}{"o}{\textormath{\"{o}}{\ddot o}} -\declare@shorthand{estonian}{"O}{\textormath{\"{O}}{\ddot O}} -\declare@shorthand{estonian}{"u}{\textormath{\"{u}}{\ddot u}} -\declare@shorthand{estonian}{"U}{\textormath{\"{U}}{\ddot U}} +\declare@shorthand{estonian}{"a}{\textormath{\"{a}\allowhyphens}{\ddot a}} +\declare@shorthand{estonian}{"A}{\textormath{\"{A}\allowhyphens}{\ddot A}} +\declare@shorthand{estonian}{"o}{\textormath{\"{o}\allowhyphens}{\ddot o}} +\declare@shorthand{estonian}{"O}{\textormath{\"{O}\allowhyphens}{\ddot O}} +\declare@shorthand{estonian}{"u}{\textormath{\"{u}\allowhyphens}{\ddot u}} +\declare@shorthand{estonian}{"U}{\textormath{\"{U}\allowhyphens}{\ddot U}} % \end{macrocode} -% german and french quotes, +% German and French quotes, % \changes{estonian-1.0f}{1997/04/03}{Removed empty groups after % double quote and guillemot characters} % \begin{macrocode} @@ -377,14 +417,14 @@ \declare@shorthand{estonian}{">}{% \textormath{\guillemotright}{\mbox{\guillemotright}}} % \end{macrocode} -% +% tildes and carons % \begin{macrocode} -\declare@shorthand{estonian}{~o}{\textormath{\@tilde o}{\tilde o}} -\declare@shorthand{estonian}{~O}{\textormath{\@tilde O}{\tilde O}} -\declare@shorthand{estonian}{~s}{\textormath{\@tilde s}{\check s}} -\declare@shorthand{estonian}{~S}{\textormath{\@tilde S}{\check S}} -\declare@shorthand{estonian}{~z}{\textormath{\@tilde z}{\check z}} -\declare@shorthand{estonian}{~Z}{\textormath{\@tilde Z}{\check Z}} +\declare@shorthand{estonian}{~o}{\textormath{\~{o}\allowhyphens}{\tilde o}} +\declare@shorthand{estonian}{~O}{\textormath{\~{O}\allowhyphens}{\tilde O}} +\declare@shorthand{estonian}{~s}{\textormath{\v{s}\allowhyphens}{\check s}} +\declare@shorthand{estonian}{~S}{\textormath{\v{S}\allowhyphens}{\check S}} +\declare@shorthand{estonian}{~z}{\textormath{\v{z}\allowhyphens}{\check z}} +\declare@shorthand{estonian}{~Z}{\textormath{\v{Z}\allowhyphens}{\check Z}} % \end{macrocode} % and some additional commands: % \begin{macrocode} diff --git a/Master/texmf-dist/source/generic/babel/estonian.ins b/Master/texmf-dist/source/generic/babel/estonian.ins index ed51cbad940..8032b81de79 100644 --- a/Master/texmf-dist/source/generic/babel/estonian.ins +++ b/Master/texmf-dist/source/generic/babel/estonian.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% Copyright 1989-2009 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file is part of the Babel system. @@ -53,7 +53,7 @@ \declarepreamble\mainpreamble This is a generated file. -Copyright 1989-2005 Johannes L. Braams and any individual authors +Copyright 1989-2009 Johannes L. Braams and any individual authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. @@ -87,7 +87,7 @@ extension .ins) which are part of the distribution. \declarepreamble\fdpreamble This is a generated file. -Copyright 1989-2005 Johannes L. Braams and any individual authors +Copyright 1989-2009 Johannes L. Braams and any individual authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. diff --git a/Master/texmf-dist/source/generic/babel/frenchb.dtx b/Master/texmf-dist/source/generic/babel/frenchb.dtx index f58deb29aae..b8b97f3b0bc 100644 --- a/Master/texmf-dist/source/generic/babel/frenchb.dtx +++ b/Master/texmf-dist/source/generic/babel/frenchb.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1989-2008 Johannes L. Braams and any individual authors +% Copyright 1989-2009 Johannes L. Braams and any individual authors % listed elsewhere in this file. All rights reserved. % % This file is part of the Babel system. @@ -26,7 +26,7 @@ % and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. % \fi -% \CheckSum{2047} +% \CheckSum{2135} % % \iffalse % Tell the \LaTeX\ system who we are and write an entry on the @@ -41,7 +41,7 @@ %\ProvidesLanguage{frenchb} %\ProvidesFile{frenchb.dtx} %<*!cfg> - [2008/05/08 v2.2a French support from the babel system] + [2009/03/16 v2.3d French support from the babel system] % %<*cfg> %% frenchb.cfg: configuration file for frenchb.ldf @@ -49,12 +49,12 @@ % %% File `frenchb.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2008 +%% Copyright (C) 1989 - 2009 %% by Johannes Braams, TeXniek % %<*!cfg> %% Frenchb language Definition File -%% Copyright (C) 1989 - 2008 +%% Copyright (C) 1989 - 2009 %% by Johannes Braams, TeXniek %% Daniel Flipo, GUTenberg % @@ -142,7 +142,7 @@ % French and in all other languages}\footnote{% % For each item, hooks are provided to reset standard % \LaTeX{} settings or to emulate the behavior of former versions -% of \texttt{frenchb} (see command +% of \texttt{frenchb} (see command % \texttt{\textbackslash frenchbsetup\{\}}, % section~\ref{ssec-custom}).}: % \begin{enumerate} @@ -154,7 +154,7 @@ % (`---' for instance) using |\frenchbsetup{}|; % \item vertical spacing in general \LaTeX{} lists is % shortened; -% \item footnotes are displayed ``\`a la fran\c{c}aise''. +% \item footnotes are displayed ``\`a la fran\c{c}aise''. % \end{enumerate} % % Regarding local typography, the command |\selectlanguage{french}| @@ -254,7 +254,7 @@ % |ShowOptions=true| or just |ShowOptions|, the `|=true|' part % can be omitted. % -% \vspace{.5\baselineskip} +% \vspace{.5\baselineskip} % The other options are listed below. Their default value is shown % between brackets, sometimes followed be a `\texttt{*}'. % The `\texttt{*}' means that the default shown applies when @@ -334,16 +334,23 @@ % but as many people forget about it (even among native French % writers!), the default behaviour of |frenchb| is to % automatically add a |\thinspace| before `|;|' `|!|' `|?|' and a -% normal (unbreakable) space before~`|:|' (recommended by the -% French Imprimerie nationale). This is convenient in most cases -% but can lead to addition of spurious spaces in URLs or in MS-DOS -% paths. Choosing |AutoSpacePunctuation=false| will ensure that +% normal (unbreakable) space before~`|:|' (this is recommended by +% the French Imprimerie nationale). This is convenient in most +% cases but can lead to addition of spurious spaces in URLs or in +% MS-DOS paths but only if they are no typed using |\texttt| or +% verbatim mode. When the current font is a monospaced +% (typewriter) font, |AutoSpacePunctuation| is locally switched +% to |false|, no spurious space is added in that case, so the +% default behaviour of of |frenchb| in that area should be fine +% in most circumstances. +% +% Choosing |AutoSpacePunctuation=false| will ensure that % a proper space will be added before `|:;!?|' \emph{if and only % if} a (normal) space has been typed in. Those who are unsure % about their typing in this area should stick to the default % option and type |\string;| |\string:| |\string!| |\string?| -% instead of |;| |:| |!| |?| whenever no space should be added -% before them (mostly in URLs and MS-DOS paths). +% instead of |;| |:| |!| |?| in case an unwanted space is +% added by |frenchb|. % \item |ThinColonSpace=true [false]| changes the normal % (unbreakable) space added before the colon `:' to a thin space, % so that the same amount of space is added before any of the @@ -486,16 +493,32 @@ % % \subsubsection*{What's new in version 2.2?} % -% Starting with version 2.2a, |frenchb| alters the layout of +% Starting with version~2.2a, |frenchb| alters the layout of % lists, footnotes, and the indentation of first paragraphs of % sections) \emph{only if} French is the ``main language'' % (i.e. babel's last language option). The layout is global for % the whole document: lists, etc. look the same in French and in % other languages, everything is typeset ``\`a la fran\c caise'' -% if French is the ``main language'', otherwise frenchb doesn't +% if French is the ``main language'', otherwise |frenchb| doesn't % change anything regarding lists, footnotes, and indentation of % paragraphs. % +% \subsubsection*{What's new in version 2.3?} +% +% Starting with version~2.3a, |frenchb| no longer inserts spaces +% automatically before `|:;!?|' when a typewriter font is in use; +% this was suggested by Yannis Haralambous to prevent +% spurious spaces in computer source code or expressions like +% \texttt{C\string:/foo}, \texttt{http\string://foo.bar}, +% etc. An option (|OriginalTypewriter|) is provided to get back +% to the former behaviour of |frenchb|. +% +% Another probably invisible change: lowercase conversion in +% |\up{}| is now achieved by the \LaTeX{} command |\MakeLowercase| +% instead of \TeX's |\lowercase| command. This prevents error +% messages when diacritics are used inside |\up{}| (diacritics +% should \emph{never} be used in superscripts though!). +% % \StopEventually{} % % \subsection{File frenchb.cfg} @@ -646,9 +669,9 @@ % definitions needed for the French language. % The macro |\noextrasfrench| is used to cancel the actions of % |\extrasfrench|.\\ -% In French, character``apostrophe'' is a letter in expressions like -% |l'ambulance| (French hyphenation patterns provide entries for -% this kind of words). This means that the |\lccode| of +% In French, character ``apostrophe'' is a letter in expressions +% like |l'ambulance| (French hyphenation patterns provide entries +% for this kind of words). This means that the |\lccode| of % ``apostrophe'' has to be non null in French for proper hyphenation % of those expressions, and has to be reset to null when exiting % French. @@ -695,11 +718,15 @@ % \end{macrocode} % % We define a new `if' |\FBpunct@active| which will be made false -% whenever a better alternative will be available. +% whenever a better alternative will be available. Another `if' +% |\FBAutoSpacePunctuation| needs to be defined now. +% \begin{macrocode} +\newif\ifFBpunct@active \FBpunct@activetrue +\newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue +% \end{macrocode} % The following code makes the four characters |;| |!| |?| and |:| % `active' and provides their definitions. % \begin{macrocode} -\newif\ifFBpunct@active \FBpunct@activetrue \ifFBpunct@active \initiate@active@char{:} \initiate@active@char{;} @@ -767,22 +794,77 @@ \string:} % \end{macrocode} % +% \changes{v2.3a}{2008/10/10}{\cs{NoAutoSpaceBeforeFDP} and +% \cs{AutoSpaceBeforeFDP} now set the flag +% \cs{ifFBAutoSpacePunctuation} accordingly (LaTeX only).} +% % \begin{macro}{\AutoSpaceBeforeFDP} % \begin{macro}{\NoAutoSpaceBeforeFDP} % |\FDP@thinspace| and |\FDP@space| are defined as unbreakable -% spaces by\\ |\AutoSpaceBeforeFDP| or as |\@empty| by -% |\NoAutoSpaceBeforeFDP|.\\ -% Default is |\AutoSpaceBeforeFDP|. +% spaces by |\autospace@beforeFDP| or as |\@empty| by +% |\noautospace@beforeFDP| (internal commands), user commands +% |\AutoSpaceBeforeFDP| and |\NoAutoSpaceBeforeFDP| do the same and +% take care of the flag |\ifFBAutoSpacePunctuation| in \LaTeX{}. +% Set the default now for Plain (done later for \LaTeX). % \begin{macrocode} - \def\AutoSpaceBeforeFDP{% + \def\autospace@beforeFDP{% \def\FDP@thinspace{\penalty\@M\thinspace}% \def\FDP@colonspace{\penalty\@M\Fcolonspace}} - \def\NoAutoSpaceBeforeFDP{\let\FDP@thinspace\@empty + \def\noautospace@beforeFDP{\let\FDP@thinspace\@empty \let\FDP@colonspace\@empty} - \AutoSpaceBeforeFDP + \ifLaTeXe + \def\AutoSpaceBeforeFDP{\autospace@beforeFDP + \FBAutoSpacePunctuationtrue} + \def\NoAutoSpaceBeforeFDP{\noautospace@beforeFDP + \FBAutoSpacePunctuationfalse} + \else + \let\AutoSpaceBeforeFDP\autospace@beforeFDP + \let\NoAutoSpaceBeforeFDP\noautospace@beforeFDP + \AutoSpaceBeforeFDP + \fi % \end{macrocode} % \end{macro} % \end{macro} +% +% \changes{v2.3a}{2008/10/10}{In LaTeX, frenchb no longer adds spaces +% before `double punctuation' characters in computer code. +% Suggested by Yannis Haralambous.} +% +% \changes{v2.3c}{2009/02/07}{Commands \cs{ttfamily}, \cs{rmfamily} +% and \cs{sffamily} have to be robust. Bug introduced in 2.3a, +% pointed out by Manuel P\'egouri\'e-Gonnard.} +% +% In \LaTeXe{} |\ttfamily| (and hence |\texttt|) will be redefined +% `AtBeginDocument' as |\ttfamilyFB| so that no space +% is added before the four |; : ! ?| characters, even if +% |AutoSpacePunctuation| is true. |\rmfamily| and |\sffamily| need +% to be redefined also (|\ttfamily| is not always used inside a +% group, its effect can be cancelled by |\rmfamily| or |\sffamily|). +% +% These redefinitions can be canceled if necessary, for instance to +% recompile older documents, see option |OriginalTypewriter| below. +% \begin{macrocode} + \ifLaTeXe + \let\ttfamilyORI\ttfamily + \let\rmfamilyORI\rmfamily + \let\sffamilyORI\sffamily + \DeclareRobustCommand\ttfamilyFB{% + \noautospace@beforeFDP\ttfamilyORI}% + \DeclareRobustCommand\rmfamilyFB{% + \ifFBAutoSpacePunctuation + \autospace@beforeFDP\rmfamilyORI + \else + \noautospace@beforeFDP\rmfamilyORI + \fi}% + \DeclareRobustCommand\sffamilyFB{% + \ifFBAutoSpacePunctuation + \autospace@beforeFDP\sffamilyORI + \else + \noautospace@beforeFDP\sffamilyORI + \fi}% + \fi +% \end{macrocode} +% % When the active characters appear in an environment where their % French behaviour is not wanted they should give an `expected' % result. Therefore we define shorthands at system level as well. @@ -949,6 +1031,10 @@ % \changes{v2.2a}{2008/05/08}{\cs{newif} and \cs{newdimen} moved % before \cs{ifLaTeXe} to avoid an error with plainTeX.} % +% \changes{v2.3a}{2008/09/30}{\cs{lowercase} changed to +% \cs{MakeLowercase} as the former doesn't work for non ASCII +% characters in encodings like applemac, utf-8,\dots} +% % |\up| eases the typesetting of superscripts like % `1\textsuperscript{er}'. Up to version 2.0 of |frenchb| |\up| was % just a shortcut for |\textsuperscript| in \LaTeXe, but several @@ -978,14 +1064,14 @@ % look correct for most fonts, but can be tuned by the end-user % if necessary by changing |\FBsupR| and |\FBsupS| commands. % -% |\FB@lc| is defined as |\lowercase| to inhibit the uppercasing of -% superscripts (this may happen in page headers with the standard +% |\FB@lc| is defined as |\MakeLowercase| to inhibit the uppercasing +% of superscripts (this may happen in page headers with the standard % classes but is wrong); |\FB@lc| can be redefined to do nothing % by option |LowercaseSuperscripts=false| of |\frenchbsetup{}|. % \begin{macrocode} \newcommand*{\FBsupR}{-0.12} \newcommand*{\FBsupS}{0.65} - \newcommand*{\FB@lc}[1]{\lowercase{#1}} + \newcommand*{\FB@lc}[1]{\MakeLowercase{#1}} \DeclareRobustCommand*{\FB@up@fake}[1]{% \settoheight{\FB@Mht}{M}% \addtolength{\FB@Mht}{\FBsupR \FB@Mht}% @@ -1639,10 +1725,23 @@ % \begin{macro}{\bbl@frenchindent} % \begin{macro}{\bbl@nonfrenchindent} % In French the first paragraph of each section should be indented, -% this is another difference with US-English. +% this is another difference with US-English. This is controlled by +% the flag |\if@afterindent|. +% +% \changes{v2.3d}{2009/03/16}{Bug correction: previous versions of +% frenchb set the flag \cs{if@afterindent} to false outside +% French which is correct for English but wrong for some languages +% like Spanish. Pointed out by Juan Jos\'e Torrens.} +% +% We need to save the value of the flag |\if@afterindent| +% `AtBeginDocument' before eventually changing its value. % % \begin{macrocode} -\let\@aifORI\@afterindentfalse +\AtBeginDocument{\ifx\@afterindentfalse\@afterindenttrue + \let\@aifORI\@afterindenttrue + \else \let\@aifORI\@afterindentfalse + \fi +} \def\bbl@frenchindent{\let\@afterindentfalse\@afterindenttrue \@afterindenttrue} \def\bbl@nonfrenchindent{\let\@afterindentfalse\@aifORI @@ -1707,6 +1806,9 @@ % \changes{v2.0}{2006/11/06}{\cs{parindentFFN} not changed if % already defined (required by JA for cah-gut.cls).} % +% \changes{v2.3b}{2008/12/06}{New commands \cs{dotFFN} and +% \cs{kernFFN} for more flexibility (suggested by JA).} +% % The value of |\parindentFFN| will be redefined at the % |\begin{document}|, as the maximum of |\parindent| and 1.5em % \emph{unless} it has been set in the preamble (the weird value @@ -1714,6 +1816,8 @@ % or not). % % \begin{macrocode} +\newcommand*{\dotFFN}{.} +\newcommand*{\kernFFN}{\kern .5em} \newdimen\parindentFFN \parindentFFN=10in \def\ftnISsymbol{\@fnsymbol\c@footnote} @@ -1724,7 +1828,7 @@ \rule\z@\footnotesep \setbox\@tempboxa\hbox{\@thefnmark}% \ifdim\wd\@tempboxa>\z@ - \llap{\@thefnmark}.\kern.5em + \llap{\@thefnmark}\dotFFN\kernFFN \fi #1 \fi}% % \end{macrocode} @@ -1916,6 +2020,11 @@ % French becomes the document's main language, so % GlobalLayoutFrench applies.} % +% \changes{v2.3a}{2008/10/10}{New option: OriginalTypewriter. Now +% frenchb switches to \cs{noautospace@beforeFDP} when a tt-font is +% in use. When OriginalTypewriter is set to true, frenchb behaves +% as in pre-2.3 versions.} +% % We first define a collection of conditionals with their defaults % (true or false). % @@ -1929,7 +2038,7 @@ \newif\ifFBIndentFirst \FBIndentFirstfalse \newif\ifFBFrenchFootnotes \FBFrenchFootnotesfalse \newif\ifFBAutoSpaceFootnotes \FBAutoSpaceFootnotesfalse -\newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue +\newif\ifFBOriginalTypewriter \FBOriginalTypewriterfalse \newif\ifFBThinColonSpace \FBThinColonSpacefalse \newif\ifFBThinSpaceInFrenchNumbers \FBThinSpaceInFrenchNumbersfalse \newif\ifFBFrenchSuperscripts \FBFrenchSuperscriptstrue @@ -1986,6 +2095,9 @@ % |GlobalLayoutFrench| forces the layout in French and (as far as % possible) outside French to meet the French typographic standards. % +% \changes{v2.3d}{2009/03/16}{Warning added to \cs{GlobalLayoutFrench} +% when French is not the main language.} +% % \begin{macrocode} \AtEndOfPackage{% \RequirePackage{keyval}% @@ -2010,13 +2122,18 @@ \define@key{FB}{GlobalLayoutFrench}[true]% {\csname FBGlobalLayoutFrench#1\endcsname \ifFBGlobalLayoutFrench - \FBReduceListSpacingtrue - \FBCompactItemizetrue - \FBStandardItemLabelsfalse - \FBIndentFirsttrue - \FBFrenchFootnotestrue - \FBAutoSpaceFootnotestrue - \fi}% + \iflanguage{french}% + {\FBReduceListSpacingtrue + \FBCompactItemizetrue + \FBStandardItemLabelsfalse + \FBIndentFirsttrue + \FBFrenchFootnotestrue + \FBAutoSpaceFootnotestrue}% + {\PackageWarning{frenchb.ldf}% + {Option `GlobalLayoutFrench' skipped: + \MessageBreak French is *not* + babel's last option.\MessageBreak}}% + \fi}% \define@key{FB}{ReduceListSpacing}[true]% {\csname FBReduceListSpacing#1\endcsname}% \define@key{FB}{CompactItemize}[true]% @@ -2052,6 +2169,8 @@ {\csname FBAutoSpaceFootnotes#1\endcsname}% \define@key{FB}{AutoSpacePunctuation}[true]% {\csname FBAutoSpacePunctuation#1\endcsname}% + \define@key{FB}{OriginalTypewriter}[true]% + {\csname FBOriginalTypewriter#1\endcsname}% \define@key{FB}{ThinColonSpace}[true]% {\csname FBThinColonSpace#1\endcsname}% \define@key{FB}{ThinSpaceInFrenchNumbers}[true]% @@ -2182,7 +2301,9 @@ % % |ReduceListSpacing| reduces the vertical spaces between list % items in French (done by changing |\list| to |\listFB|). -% When |GlobalLayoutFrench| is true the same is done outside French. +% When |GlobalLayoutFrench| is true (the default), the same is +% done outside French except for languages that force a different +% setting. % \begin{macrocode} \ifFBReduceListSpacing \addto\extrasfrench{\let\list\listFB @@ -2244,7 +2365,9 @@ % % |IndentFirst| forces the first paragraphs of sections to be % indented just like the other ones in French. -% When |GlobalLayoutFrench| is true the same is done outside French. +% When |GlobalLayoutFrench| is true (the default), the same is +% done outside French except for languages that force a different +% setting. % \begin{macrocode} \ifFBIndentFirst \addto\extrasfrench{\bbl@frenchindent}% @@ -2269,9 +2392,23 @@ % typed before them. % \begin{macrocode} \ifFBAutoSpacePunctuation - \AutoSpaceBeforeFDP + \autospace@beforeFDP + \else + \noautospace@beforeFDP + \fi +% \end{macrocode} +% +% When |OriginalTypewriter| is set to |false| (the default), +% |\ttfamily|, |\rmfamily| and |\sffamily| are redefined as +% |\ttfamilyFB|, |\rmfamilyFB| and |\sffamilyFB| respectively +% to prevent addition of automatic spaces before the four active +% characters in computer code. +% \begin{macrocode} + \ifFBOriginalTypewriter \else - \NoAutoSpaceBeforeFDP + \let\ttfamily\ttfamilyFB + \let\rmfamily\rmfamilyFB + \let\sffamily\sffamilyFB \fi % \end{macrocode} % @@ -2372,6 +2509,7 @@ FrenchFootnotes=false [true]\MessageBreak AutoSpaceFootnotes=false [true]\MessageBreak AutoSpacePunctuation=false [true]\MessageBreak + OriginalTypewriter=true [false]\MessageBreak ThinColonSpace=true [false]\MessageBreak ThinSpaceInFrenchNumbers=true [false]\MessageBreak FrenchSuperscripts=false [true]\MessageBreak @@ -2519,4 +2657,3 @@ % % \Finale \endinput - diff --git a/Master/texmf-dist/source/generic/babel/frenchb.ins b/Master/texmf-dist/source/generic/babel/frenchb.ins index 2e8b09885f6..5bd27edfee3 100644 --- a/Master/texmf-dist/source/generic/babel/frenchb.ins +++ b/Master/texmf-dist/source/generic/babel/frenchb.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1989-2008 Johannes L. Braams and any individual authors +%% Copyright 1989-2009 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file is part of the Babel system. @@ -53,7 +53,7 @@ \declarepreamble\mainpreamble This is a generated file. -Copyright 1989-2008 Johannes L. Braams and any individual authors +Copyright 1989-2009 Johannes L. Braams and any individual authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. @@ -87,7 +87,7 @@ extension .ins) which are part of the distribution. \declarepreamble\fdpreamble This is a generated file. -Copyright 1989-2008 Johannes L. Braams and any individual authors +Copyright 1989-2009 Johannes L. Braams and any individual authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. diff --git a/Master/texmf-dist/source/generic/babel/kurmanji.dtx b/Master/texmf-dist/source/generic/babel/kurmanji.dtx new file mode 100644 index 00000000000..f4587a51186 --- /dev/null +++ b/Master/texmf-dist/source/generic/babel/kurmanji.dtx @@ -0,0 +1,401 @@ +% \iffalse meta-comment +% +% Copyright 1989-2009 Johannes L. Braams and any individual authors +% listed elsewhere in this file. All rights reserved. +% +% This file is part of the Babel system. +% -------------------------------------- +% +% It may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% 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.3 or later is part of all distributions of LaTeX +% version 2003/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work is Johannes Braams. +% +% The list of all files belonging to the Babel system is +% given in the file `manifest.bbl. See also `legal.bbl' 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 +% \CheckSum{344} +% +% \iffalse +% Tell the \LaTeX\ system who we are and write an entry on the +% transcript. +%<*dtx> +\ProvidesFile{kurmanji.dtx} +% +%\ProvidesLanguage{kurmanji} +%\fi +%\ProvidesFile{kurmanji.dtx} + [2009/06/25 v1.1 Kurmanji support from the babel system] +%\iffalse +%% Babel package for LaTeX version 2e +%% Copyright (C) 1989 -- 2009 +%% by Johannes Braams, TeXniek +% +%% Please report errors to: J.L. Braams +%% babel at braams.xs4all.nl +% +% This file is part of the babel system, it provides the source code for +% the Kurmanji language definition file. +%<*filedriver> +\documentclass{ltxdoc} +\newcommand*{\TeXhax}{\TeX hax} +\newcommand*{\babel}{\textsf{babel}} +\newcommand*{\langvar}{$\langle \mathit lang \rangle$} +\newcommand*{\note}[1]{} +\newcommand*{\Lopt}[1]{\textsf{#1}} +\newcommand*{\file}[1]{\texttt{#1}} +\begin{document} + \DocInput{kurmanji.dtx} +\end{document} +% +%\fi +% \GetFileInfo{kurmanji.dtx} +% +% \changes{kurmanji-1.1}{2009/02/13}{Removed old changes from +% language.skeleton} +% \changes{kurmanji-1.1}{2009/02/13}{Corrected some typographical errors +% in the documentation} +% \changes{kurmanji-1.1}{2009/02/13}{Added documentation about the date} +% \changes{kurmanji-1.1}{2009/02/13}{Rewrote the code for Kurmanji date} +% \changes{kurmanji-1.1}{2009/02/13}{Set both hyphenmins to two} +% \changes{kurmanji-1.1}{2009/02/13}{Use frenchspacing} +% \changes{kurmanji-1.1}{2009/05/11}{Make month > 12 an error} +% \changes{kurmanji-1.1}{2009/05/11}{Documentation of hyphenmins} +% \changes{kurmanji-1.1}{2009/05/11}{Added three numerical date formats} +% \changes{kurmanji-1.1}{2009/06/25}{Page, Chapter, and Apppendix inflected} +% \changes{kurmanji-1.1}{2009/06/25}{Added Makro \cs{ontoday}} +% +% \section{The Kurmanji language} +% +% The Kurmanji language belongs to the Kurdish languages. +% Of the Kurdish languages, Kurmanji has the largest +% number of speakers and is written with the turkish based latin alphabet +% by Mir Celadet Bedirxan. Kurmanji is spoken in Turkey, Syria and by +% the majority of the Kurdish diaspora in Europe. +% +% The file \file{\filename}\footnote{The file described in this +% section has version number \fileversion\ and was last revised on +% \filedate.} defines all the language definition macros for the +% Kurmanji language. Versions 1.0 and 1.1 of this file were +% contributed by +% J\"org Knappen and Medeni Shemd\^e. The code for the active |^| +% was lifted from esperanto.dtx. +% +% \begin{table}[htb] +% \centering +% \begin{tabular}{lp{8cm}} +% |^c| & gives \c c with hyphenation in the rest of the word +% allowed, this works for c, C, s, S\\ +% |^e| & gives \^e, with hyphenation in the rest of the word +% allowed, this works for e, E, i, I, u, U\\ +% \verb=^|= & inserts a |\discretionary{-}{}{}|\\ +% |"`| & gives lower left double german style quotes, like~,,\\ +% |"'| & gives upper right double igerman style quotes, like~``\\ +% \end{tabular} +% \caption{The functions of the active character for Kurmanji.} +% \label{tab:kur-act} +% \end{table} +% +% \subsection{The date in Kurmanji} +% +% Currently, there is no agreed set of month names for the gregorian calendar +% in Kurmanji. We provide two lists of month names, |\datekurmanji| selects +% month names based on traditional sources, |\datekurmanjialternate| gives +% another selection. In addition, we provide macros |\januaryname| to +% |\decembername| allowing the user to redefine each single month name +% according to their preferences. +% +% The predefinded month names can be found in table~\ref{tab:kur-mon}. +% +% \begin{table}[htb] +% \begin{tabular}{lll} +% English & Kurmanji (traditional) & Kurmanji (alternate) \\ \hline +% January & \c{C}ileya Pa\c{s}{\^\i}n & R\^ebendan\\ +% February & Sibat & Re\c{s}emih\\ +% March & Adar & Adar\\ +% April & N{\^\i}san & Cotan\\ +% May & Gulan & Gulan\\ +% June & Hez{\^\i}ran & P\^u\c{s}per\\ +% July & T{\^\i}rmeh & T{\^\i}rmeh\\ +% August & Tebax & Gelav\^ej\\ +% September& \^Ilon & Gelarezan\\ +% Oktober & \c{C}iriya P\^e\c{s}{\^\i}n & Kew\c{c}\^er\\ +% November & \c{C}iriya Pa\c{s}{\^\i}n & Sermawez\\ +% December & \c{C}ileya P\^e\c{s}{\^\i}n & Berfandar +% \end{tabular} +% \caption{Month names in Kurmanji.} +% \label{tab:kur-mon} +% \end{table} +% +% \changes{kurmanji-1.1}{2009/06/25}{Added Makro \cs{ontoday}} +% The macro \cs{ontoday} gives the date in the inflected form. This form is +% used in the head of a letter and looks like 25'\^e Hez{\^\i}ran\^e 2009. +% +% \changes{kurmanji-1.1}{2009/05/11}{Added three numerical date formats} +% In addition to the date formats with month names we provide three +% numerical date formats: \cs{datesymd} provides the date in the swedish style +% YYYY-MM-DD, \cs{datesdmy} provides the date in the style D/M YYYY (also +% popular in sweden), and \cs{dategdmy} provides the date in the style +% D. M. YYYY (popular in germany and many other countries). +% These commands should be issued after \cs{begin{document}}. +% \StopEventually{} +% +% The macro |\LdfInit| takes care of preventing that this file is +% loaded more than once, checking the category code of the +% \texttt{@} sign, etc. +% \begin{macrocode} +%<*code> +\LdfInit{kurmanji}{captionskurmanji} +% \end{macrocode} +% +% When this file is read as an option, i.e. by the |\usepackage| +% command, \texttt{kurmanji} could be an `unknown' language in +% which case we have to make it known. So we check for the +% existence of |\l@kurmanji| to see whether we have to do +% something here. +% +% \begin{macrocode} +\ifx\undefined\l@kurmanji + \@nopatterns{Kurmanji} + \adddialect\l@kurmanji0\fi +% \end{macrocode} +% The next step consists of defining commands to switch to (and +% from) the Kurmanji language. +% +% Now we declare the || language attribute. +% \begin{macrocode} +\bbl@declare@ttribute{kurmanji}{}{% +% \end{macrocode} +% This code adds the expansion of |\extraskurmanji| to +% |\extraskurmanji|. +% \begin{macrocode} + \expandafter\addto\expandafter\extraskurmanji + \expandafter{\extraskurmanji}% + \let\captionskurmanji\captionskurmanji + } +% \end{macrocode} +% +% \changes{kurmanji-1.1}{2009/02/13}{Set both hyphenmins to two} +% \changes{kurmanji-1.1}{2009/05/11}{Documentation of hyphenmins} +% The kurmanji hyphenation patterns can be used with |\lefthyphenmin| +% and |\righthyphenmin| set to~2. +% \begin{macro}{\kurmanjihyphenmins} +% This macro is used to store the correct values of the hyphenation +% parameters |\lefthyphenmin| and |\righthyphenmin|. +% \begin{macrocode} +\providehyphenmins{kurmanji}{\tw@\tw@} +% \end{macrocode} +% \end{macro} +% +% \changes{kurmanji-1.1}{2009/06/25}{Page, Chapter, and Apppendix inflected} +% \begin{macro}{\captionskurmanji} +% The macro |\captionskurmanji| defines all strings used in the +% four standard documentclasses provided with \LaTeX. +% \begin{macrocode} +\def\captionskurmanji{% + \def\prefacename{Pe\c{s}gotin}% % Gotina Pe\c{s}\^i + \def\refname{Pirtuken bijart{\^\i}}% + \def\abstractname{Kurteb{\^\i}r}% % En\c{c}am + \def\bibname{\c{C}avkan{\^\i}ya Pirtukan}% + \def\chaptername{Ser\^e}% + \def\appendixname{Teb{\^\i}n{\^\i}ya}% + \def\contentsname{Nav\^erok}% % Navedank + \def\listfigurename{Hejmara Dimena}% + \def\listtablename{Hejmara Kevalen}% + \def\indexname{Endeks}% + \def\figurename{Dimen\^e}% % Weney\^e + \def\tablename{Kevala}% + \def\partname{B\^e\c{s}a}% + \def\enclname{Dumahik}% % Duvik + \def\ccname{Belavker}% + \def\headtoname{Ji bo}% % Ji ... re + \def\pagename{R\^upel\^e}% + \def\seename{bin\^era}% % bala xwe bida + \def\alsoname{le v\^eya ji bin\^era}% + \def\proofname{Del{\^\i}l}% + \def\glossaryname{\c{C}avkan{\^\i}ya l\^ekol{\^\i}n\^e}% +} +% \end{macrocode} +% \end{macro} +% +% +% \changes{kurmanji-1.1}{2009/02/13}{Rewrote the code for Kurmanji date} +% \begin{macro}{\datekurmanji} +% \begin{macro}{\datekurmanjialternate} +% The macro |\datekurmanji| redefines the command |\today| to +% produce Kurmanji dates. We choose the traditional names for the months. +% The macro |\datekurmanjialternate| +% defines an alternate set of month names. It is +% also very common to use numbers for the month. +% \changes{kurmanji-1.1}{2009/06/25}{Added Makro \cs{ontoday}} +% +% \changes{kurmanji-1.1}{2009/05/11}{Make month > 12 an error} +% We define the general date format in terms of macros |\januaryname| to +% |\decembername| which can be redefined by the user. +% \begin{macrocode} +\def\datekurmanji{% + \def\today{\number\day.~\ifcase\month\or + \januaryname\or \februaryname\or \marchname\or \aprilname\or + \mayname\or \junename\or \julyname\or \augustname\or + \septembername\or \octobername\or \novembername\or + \decembername\or \@ctrerr\fi~\number\year}% + \def\ontoday{\number\day'\^e~\ifcase\month\or + \januaryname\or \februaryname\or \marchname\or \aprilname\or + \mayname\or \junename\or \julyname\or \augustname\or + \septembername\or \octobername\or \novembername\or + \decembername\or \@ctrerr\fi\^e~\number\year}% + \def\januaryname{\c{C}ileya Pa\c{s}{\^\i}n}% + \def\februaryname{Sibat}% + \def\marchname{Adar}% + \def\aprilname{N\^{\i}san}% + \def\mayname{Gulan}% + \def\junename{Hez{\^\i}ran}% + \def\julyname{T{\^\i}rmeh}% + \def\augustname{Tebax}% + \def\septembername{\^Ilon}% + \def\octobername{\c{C}iriya P\^e\c{s}{\^\i}n}% + \def\novembername{\c{C}iriya Pa\c{s}{\^\i}n}% + \def\decembername{\c{C}ileya P\^e\c{s}{\^\i}n}% +} +\def\datekurmanjialternate{% + \datekurmanji + \def\januaryname{R\^ebendan}% + \def\februaryname{Re\c{s}emih}% + \def\aprilname{Cotan}% % Avr\^el + \def\junename{P\^u\c{s}per}% + \def\augustname{Gelav\^ej}% + \def\septembername{Gelarezan}% % Rezber + \def\octobername{Kew\c{c}\^er}% + \def\novembername{Sermawez}% + \def\decembername{Berfandar}% +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \changes{kurmanji-1.1}{2009/05/11}{Added three numerical date formats} +% \begin{macro}{\datesymd} +% \changes{swedish-2.3a}{2000/01/20}{Command added} +% The macro |\datesymd| redefines the command |\today| to +% produce dates in the format YYYY-MM-DD, common in Sweden. +% \begin{macrocode} +\def\datesymd{% + \def\today{\number\year-\two@digits\month-\two@digits\day}% + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\datesdmy} +% The macro |\datesdmy| redefines the command |\today| to +% produce Swedish dates in the format DD/MM YYYY, also common in +% Sweden. +% \begin{macrocode} +\def\datesdmy{% + \def\today{\number\day/\number\month\space\number\year}% + } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\dategdmy} +% The macros |\dategdmy| redefines the command |\today| to produce +% german style dates in the format D. M. YYYY. +% \begin{macrocode} +\def\dategdmy{% + \def\today{\number\day.\space\number\month.\space\number\year}% + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\extraskurmanji} +% \begin{macro}{\noextraskurmanji} +% The macro |\extraskurmanji| will perform all the extra +% definitions needed for the Kurmanji language. The macro +% |\noextraskurmanji| is used to cancel the actions of +% |\extraskurmanji|. +% +% For Kurmanji the |^| character is made active. This is done +% once, later on its definition may vary. +% +% \begin{macrocode} +\initiate@active@char{^} +% \end{macrocode} +% Because the character |^| is used in math mode with quite a +% different purpose we need to add an extra level of evaluation to +% the definition of the active |^|. It checks whether math mode is +% active; if so the shorthand mechanism is bypassed by a direct +% call of |\normal@char^|. +% \begin{macrocode} +\addto\extraskurmanji{\languageshorthands{kurmanji}} +\addto\extraskurmanji{\bbl@activate{^}} +\addto\noextraskurmanji{\bbl@deactivate{^}} +% \end{macrocode} +% +% In order to prevent problems with the active |^| we add a +% shorthand on system level which expands to a `normal |^|. +% \begin{macrocode} +\declare@shorthand{system}{^}{\csname normal@char\string^\endcsname} +% \end{macrocode} +% And here are the uses of the active |^|: +% \begin{macrocode} +\declare@shorthand{kurmanji}{^c}{\c{c}\allowhyphens} +\declare@shorthand{kurmanji}{^C}{\c{C}\allowhyphens} +\declare@shorthand{kurmanji}{^e}{\^e\allowhyphens} +\declare@shorthand{kurmanji}{^E}{\^E\allowhyphens} +\declare@shorthand{kurmanji}{^i}{{\^\i}\allowhyphens} +\declare@shorthand{kurmanji}{^I}{\^I\allowhyphens} +\declare@shorthand{kurmanji}{^s}{\c{s}\allowhyphens} +\declare@shorthand{kurmanji}{^S}{\c{S}\allowhyphens} +\declare@shorthand{kurmanji}{^u}{\^u\allowhyphens} +\declare@shorthand{kurmanji}{^U}{\^U\allowhyphens} +\declare@shorthand{kurmanji}{^`}{\glqq} +\declare@shorthand{kurmanji}{^'}{\grqq} +\declare@shorthand{kurmanji}{^|}{\discretionary{-}{}{}\allowhyphens} +% \end{macrocode} +% +% \changes{kurmanji-1.1}{2009/02/13}{Use frenchspacing} +% For typesetting Kurmanji text, frenchspacing is preferred. +% \begin{macrocode} +\addto\extraskurmanji{\bbl@frenchspacing} +\addto\noextraskurmanji{\bbl@nonfrenchspacing} +% \end{macrocode} + +% \end{macro} +% \end{macro} +% +% The macro |\ldf@finish| takes care of looking for a +% configuration file, setting the main language to be switched on +% at |\begin{document}| and resetting the category code of +% \texttt{@} to its original value. +% \begin{macrocode} +\ldf@finish{kurmanji} +% +% \end{macrocode} +% +% \Finale +%\endinput +%% \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 \~} +%% diff --git a/Master/texmf-dist/source/generic/babel/kurmanji.ins b/Master/texmf-dist/source/generic/babel/kurmanji.ins new file mode 100644 index 00000000000..ca18be14cba --- /dev/null +++ b/Master/texmf-dist/source/generic/babel/kurmanji.ins @@ -0,0 +1,148 @@ +%% +%% 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 1989-2009 Johannes L. Braams and any individual authors +%% listed elsewhere in this file. All rights reserved. +%% +%% This file is part of the Babel system. +%% -------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% 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.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Johannes Braams. +%% +%% The list of all files belonging to the LaTeX base distribution is +%% given in the file `manifest.bbl. See also `legal.bbl' 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. +%% +%% --------------- start of docstrip commands ------------------ +%% +\def\filedate{2009/09/19} +\def\batchfile{kurmanji.ins} +\input docstrip.tex + +{\ifx\generate\undefined +\Msg{**********************************************} +\Msg{*} +\Msg{* This installation requires docstrip} +\Msg{* version 2.3c or later.} +\Msg{*} +\Msg{* An older version of docstrip has been input} +\Msg{*} +\Msg{**********************************************} +\errhelp{Move or rename old docstrip.tex.} +\errmessage{Old docstrip in input path} +\batchmode +\csname @@end\endcsname +\fi} + +\declarepreamble\mainpreamble +This is a generated file. + +Copyright 1989-2009 Johannes L. Braams and any individual authors +listed elsewhere in this file. All rights reserved. + +This file was generated from file(s) of the Babel system. +--------------------------------------------------------- + +It may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3 +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.3 or later is part of all distributions of LaTeX +version 2003/12/01 or later. + +This work has the LPPL maintenance status "maintained". + +The Current Maintainer of this work is Johannes Braams. + +This file may only be distributed together with a copy of the Babel +system. You may however distribute the Babel system without +such generated files. + +The list of all files belonging to the Babel distribution is +given in the file `manifest.bbl'. See also `legal.bbl 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 + +\declarepreamble\fdpreamble +This is a generated file. + +Copyright 1989-2009 Johannes L. Braams and any individual authors +listed elsewhere in this file. All rights reserved. + +This file was generated from file(s) of the Babel system. +--------------------------------------------------------- + +It may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3 +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.3 or later is part of all distributions of LaTeX +version 2003/12/01 or later. + +This work has the LPPL maintenance status "maintained". + +The Current Maintainer of this work is Johannes Braams. + +This file may only be distributed together with a copy of the Babel +system. You may however distribute the Babel system without +such generated files. + +The list of all files belonging to the Babel distribution is +given in the file `manifest.bbl'. See also `legal.bbl for additional +information. + +In particular, permission is granted to customize the declarations in +this file to serve the needs of your installation. + +However, NO PERMISSION is granted to distribute a modified version +of this file under its original name. + +\endpreamble + +\keepsilent + +\usedir{tex/generic/babel} + +\usepreamble\mainpreamble +\generate{\file{kurmanji.ldf}{\from{kurmanji.dtx}{code}} + } +\usepreamble\fdpreamble + +\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 All *.def, *.fd, *.ldf, *.sty} +\Msg{*} +\Msg{* To produce the documentation run the files ending with} +\Msg{* '.dtx' and `.fdd' through LaTeX.} +\Msg{*} +\Msg{* Happy TeXing} +\Msg{***********************************************************} +} + +\endinput diff --git a/Master/texmf-dist/source/generic/babel/spanish.dtx b/Master/texmf-dist/source/generic/babel/spanish.dtx index 8b0166f8035..dce24b98abf 100644 --- a/Master/texmf-dist/source/generic/babel/spanish.dtx +++ b/Master/texmf-dist/source/generic/babel/spanish.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1989-2008 Johannes L. Braams and any individual authors +% Copyright 1989-2009 Johannes L. Braams and any individual authors % listed elsewhere in this file. All rights reserved. % % This file is part of the Babel system. @@ -26,13 +26,8 @@ % and covered by LPPL is defined by the unpacking scripts (with % extension .ins) which are part of the distribution. % \fi -% \ifx\langdeffile\undefined -% \CheckSum{2145} -% \else -% \CheckSum{2061} -% \fi % \ProvidesFile{spanish.dtx} -% [2008/07/06 v5.0e Spanish support from the babel system] +% [2009/01/02 v5.0h Spanish support from the babel system] %\iffalse %% File `spanish.dtx' %% Babel package for LaTeX version 2e @@ -40,19 +35,20 @@ %% by Johannes Braams, TeXniek % %% Spanish Language Definition File -%% Copyright (C) 1997 - 2008 -%% Javier Bezos (www.texytipografia.com) +%% Copyright (C) 1997 - 2009 +%% Javier Bezos (www.tex-tipografia.com) %% and -%% CervanTeX (www.cervantex.org) +%% CervanTeX (www.cervantex.es) % %% Please report errors to: Javier Bezos (preferably) -%% www.texytipografia.com/contact.html +%% www.tex-tipografia.com %% J.L. Braams %% www.latex-project.org % % This file is part of the babel system, it provides the source % code for the Spanish language definition file. % The original version of this file was written by Javier Bezos. +% The latest release is available on CTAN:/language/spanish/ % %<*filedriver> \let\ooverb\verb @@ -69,19 +65,19 @@ \usepackage[cp1252]{inputenc} \usepackage[T1]{fontenc} \newcommand\act[1]{% - \\% - \makebox[1.5pc][l]{\textcolor{green}{$\surd$}}% - \textsf{#1}\ignorespaces} + \\% + \makebox[1.5pc][l]{\textcolor{green}{$\surd$}}% + \textsf{#1}\ignorespaces} \newcommand\deact[1]{% - \\% - \makebox[1.5pc][l]{\textcolor{red}{$\times$}}% - \texttt{#1}\ignorespaces} + \\% + \makebox[1.5pc][l]{\textcolor{red}{$\times$}}% + \texttt{#1}\ignorespaces} \newcommand\txt{\makebox[1.5pc][l]{\textcolor{blue}{$\Rightarrow$}}\ignorespaces} \newcommand\con{\makebox[1.5pc][l]{\textcolor{magenta}{$\star$}}\ignorespaces} \newcommand\alw{% - \\% - \makebox[1.5pc][l]{\textcolor{green}{$\surd$}}% - Se define siempre, sin depender de un grupo.} + \\% + \makebox[1.5pc][l]{\textcolor{green}{$\surd$}}% + Se define siempre, sin depender de un grupo.} \newcommand\opp{\qquad Opción de paquete} %\makeindex @@ -95,26 +91,26 @@ \newcommand\hmk{$\string|$} \newenvironment{decl}[1][]% - {\par\small\addvspace{4.5ex plus 1ex}% - \vskip -\parskip - \ifx\relax#1\relax - \def\@decl@date{}% - \else - \def\@decl@date{\NEWfeature{#1}}% - \fi - \noindent%\hspace{-\leftmargini}% - \begin{tabular}{|l|}\hline\ignorespaces}% - {\\\hline\end{tabular}\nobreak\@decl@date\par\nobreak - \vspace{2.3ex}\vskip-\parskip} + {\par\small\addvspace{4.5ex plus 1ex}% + \vskip-\parskip + \ifx\relax#1\relax + \def\@decl@date{}% + \else + \def\@decl@date{\NEWfeature{#1}}% + \fi + \noindent%\hspace{-\leftmargini}% + \begin{tabular}{|l|}\hline\ignorespaces}% + {\\\hline\end{tabular}\nobreak\@decl@date\par\nobreak + \vspace{2.3ex}\vskip-\parskip} \newcommand\New[1]{% - \leavevmode\marginpar{\raggedleft\sffamily Nuevo en #1}} + \leavevmode\marginpar{\raggedleft\sffamily Nuevo en #1}} \newcommand\nm[1]{\unskip\,$^{#1}$} \newcommand\nt[1]{\quad$^{#1}$\,\ignorespaces} \makeatletter - \renewcommand\@biblabel{} + \renewcommand\@biblabel{} \makeatother \newcommand\DOT[1]{\lsc{DOT},~#1} @@ -130,7 +126,7 @@ \OnlyDescription \begin{document} - \DocInput{spanish.dtx} + \DocInput{spanish.dtx} \end{document} % %\fi @@ -143,20 +139,20 @@ % % \title{Estilo \textsf{spanish}\\ % para el sistema \babel.\footnote{Este -% archivo est\'a actualmente en la versi\'on -% 5.0d con fecha 25 de mayo del 2008. ^^A@# +% archivo está actualmente en la versión +% 5.0h con fecha 2 de enero del 2009. ^^A@# % Esta copia del manual se compuso el~\today.}} % -% \author{Javier Bezos\footnote{Por favor, env\'{\i}en comentarios y -% sugerencias en http://www.texytipografia.com/contact.html. Han +% \author{Javier Bezos\footnote{Por favor, envíen comentarios y +% sugerencias en http://www.tex-tipografia.com/spanish.html. Han % colaborado de una u otra forma muchas personas, a las cuales % agradezco sus comentarios y sugerencias; en particular, han sido muy -% activos Juan Luis Varona y José Luis Rivera. Para m'as informaci'on -% sobre los criterios seguidos, v'ease la referencia: Javier Bezos, -% \textit{Tipograf'ia espa'nola con \TeX.} Para informaci'on sobre -% actualizaciones: http://www.cervantex.org/}} +% activos Juan Luis Varona y José Luis Rivera. Para más información +% sobre los criterios seguidos, véase la referencia: Javier Bezos, +% \textit{Tipografía española con \TeX.} Para información sobre +% actualizaciones: http://www.cervantex.es/}} % -% \date{25 de mayo del 2008} ^^A@# +% \date{2 de enero del 2009} ^^A@# % % \maketitle % @@ -180,8 +176,8 @@ % \section{Uso de \textsf{spanish} para babel} % % El estilo de \textsf{spanish} para babel tiene con finalidad adaptar una -% serie de elementos de los documentos de \LaTeX\ a la lengua -% española, tanto en las traducciones como en la tipografía. Para +% serie de elementos de los documentos de \LaTeX\ al castellano, +% tanto en las traducciones como en la tipografía. Para % usarlo, basta con emplear la opción \textsf{spanish} al cargar babel: %\begin{verbatim} %\usepackage[spanish]{babel} @@ -189,8 +185,8 @@ % % Esto es todo lo que hace falta para conseguir que el documento tenga % un aspecto español. En caso de estar en México, véase, además, el -% apartado \ref{paises} (<>):\footnote{En próximas versiones se -% añadirán más países.} +% apartado \ref{paises} (<>):\footnote{En próximas +% versiones se añadirán más países.} %\begin{verbatim} %\usepackage[spanish,mexico]{babel} %\end{verbatim} @@ -199,7 +195,7 @@ % manual de babel). Si \textsf{spanish} es la última de las lenguas cargadas, % entonces se considera la lengua principal y se hacen una serie de % ajustes tipográficos adicionales. En particular, se modifican -% 'ordenes y entornos como: +% órdenes y entornos como: %\begin{center} %\begin{tabular}{lll} % |enumerate| & |\roman| & |\section| \\ @@ -230,16 +226,16 @@ % % Si la lengua principal es \textsf{spanish}, se introducen una serie de % cambios en el momento de cargar la lengua para adaptar varios -% elementos a los usos tipogr'aficos espa'noles. Estos cambios -% funcionan con las clases est'andar "+--con otras tal vez alguno de +% elementos a los usos tipográficos españoles. Estos cambios +% funcionan con las clases estándar "+--con otras tal vez alguno de % ellos no tenga efecto--- y persisten durante todo el documento. % Ninguno de ellos es necesario para componer el documento, aunque -% naturalmente el resultado ser'a distinto. +% naturalmente el resultado será distinto. % % \subsection{Listas} % % \begin{decl} \txt |\begin{enumerate} ... \end{enumerate}|% -% \deact{es-nolists, \textit{es-nolayout, es-minimal, +% \deact{es-nolists, es-noenumerate, \textit{es-nolayout, es-minimal, % es-sloppy}} \end{decl} % % Usa la siguiente secuencia:\\ @@ -249,7 +245,7 @@ % \qquad\qquad \emph{a$'$}) % % \begin{decl} \txt |\begin{itemize} ... \end{itemize}|% -% \deact{es-nolists, \textit{es-nolayout, es-minimal, +% \deact{es-nolists, es-noitemize, \textit{es-nolayout, es-minimal, % es-sloppy}} \end{decl} % % Usa la siguiente secuencia:\\ @@ -263,7 +259,7 @@ % \con |\spanishdashitems \spanishsignitems| % \end{decl} % -% Dos 'ordenes para cambiar a otros estilos en +% Dos órdenes para cambiar a otros estilos en % |itemize|: rayas en todos los niveles y \textbullet{} $\circ$ % $\diamond$ $\triangleright$, respectivamente. % @@ -280,22 +276,22 @@ % \txt |\alph \Alph|\deact{\textit{es-nolayout, es-sloppy}} % \end{decl} % -% Incluyen la e'ne. +% Incluyen la eñe. % % \begin{decl} % \txt |\fnsymbol|\deact{\textit{es-nolayout, es-sloppy}} % \end{decl} % % Se emplean uno, dos, tres... asteriscos (*, **, ***, etc.), -% en lugar de la sucesi'on angloamericana de cruces, barras, +% en lugar de la sucesión angloamericana de cruces, barras, % etc.\footnote{\DOT{162}.} % % \begin{decl} % \txt |\roman|\deact{es-ucroman, es-lcroman, \textit{es-nolayout, es-minimal, es-sloppy}} % \end{decl} % -% Como en castellano no se usan n'umeros romanos en min'uscula, -% |\roman| se redefine para que los d'e en +% Como en castellano no se usan números romanos en minúscula, +% |\roman| se redefine para que los dé en % versalitas.\footnote{\DTL{197}.} La opción de paquete % |es-minimal| los desactiva con |es-ucroman|, y |es-sloppy| % con |es-lcroman|. @@ -326,16 +322,16 @@ % \end{decl} % % \textit{MakeIndex} no puede entender la forma en que |\roman| -% escribe el n'umero de p'agina, por lo que elimina las l'ineas +% escribe el número de página, por lo que elimina las líneas % afectadas. Por ello el archivo |.idx| ha de ser convertido antes de % procesarlo con \textit{MakeIndex}. Con este paquete se proporciona % la utilidad |romanidx.sty| que se encarga de ello. Simplemente se -% compone ese archivo con \LaTeX{} y a continuaci'on se responde a las +% compone ese archivo con \LaTeX{} y a continuación se responde a las % preguntas que se formulan; el archivo resultante, es decir, el que % hay que procesar con \textit{MakeIndex,} tiene la extensión % \texttt{eix}. Este proceso no es necesario si no se introdujo -% ninguna entrada de 'indice en p'aginas numeradas con |\roman| (lo -% cual ser'a lo m'as normal). Si un s'imbolo propio de +% ninguna entrada de índice en páginas numeradas con |\roman| (lo +% cual será lo más normal). Si un símbolo propio de % \emph{MakeIndex} generara problemas, debe encerrarse entre llaves: % \verb={"|}=. % @@ -376,9 +372,9 @@ % es-mininal, es-sloppy}} % \end{decl} % -% Los n'umeros en los t'itulos est'an seguidos de un punto -% tanto en el texto como en el 'indice. Adem'as, -% el primer p'arrafo tras el t'itulo no elimina la sangr'ia. +% Los números en los títulos están seguidos de un punto +% tanto en el texto como en el índice. Además, +% el primer párrafo tras el título no elimina la sangría. % % \begin{decl} % \con |es-nolayout|\opp @@ -397,7 +393,7 @@ % \act{captions} % \end{decl} % -% Establecen las traducciones al castellano de algunos t'erminos, +% Establecen las traducciones al castellano de algunos términos, % tal y como se describe en el cuadro 1. Para cambiar el texto % de ellas, conviene redefinir la forma que empieza con % |\spanish...|, ya que, al contrario que las órdenes @@ -416,30 +412,30 @@ % \toprule3 % \name{ref} & Referencias\\ % \name{abstract} & Resumen\\ -% \name{bib} & Bibliograf'ia\\ -% \name{chapter} & Cap'itulo\\ -% \name{appendix} & Ap'endice\\ -% \name{contents} & 'Indice general\nm{a}\\ -% \name{listfigure} & 'Indice de figuras\\ -% \name{listtable} & 'Indice de cuadros\\ -% \name{index} & 'Indice alfab'etico\\ +% \name{bib} & Bibliografía\\ +% \name{chapter} & Capítulo\\ +% \name{appendix} & Apéndice\\ +% \name{contents} & índice general\nm{a}\\ +% \name{listfigure} & índice de figuras\\ +% \name{listtable} & índice de cuadros\\ +% \name{index} & índice alfabético\\ % \name{figure} & Figura\\ % \name{table} & Cuadro\\ % \name{part} & Parte\\ % \name{encl} & Adjunto\\ % \name{cc} & Copia a\\ % \name{headto} & A\\ -% \name{page} & p'agina\\ -% \name{see} & v'ease\\ -% \name{also} & v'ease tambi'en\\ -% \name{proof} & Demostraci'on +% \name{page} & página\\ +% \name{see} & véase\\ +% \name{also} & véase también\\ +% \name{proof} & Demostración % \botrule3 % \end{tabular} % % \vspace{1.5ex} % % \begin{minipage}{10cm}\footnotesize -% \nt{a} Pero s'olo <<'Indice>> en \textsf{article}. +% \nt{a} Pero sólo <<índice>> en \textsf{article}. % \end{minipage} % \end{table} % @@ -488,7 +484,7 @@ % \section{Abreviaciones (\textit{shorthands})} % % La lista completa se puede encontrar en el cuadro 2. En los -% siguientes apartados se dar'an m'as detalles sobre algunas de +% siguientes apartados se darán más detalles sobre algunas de % ellas. % % \begin{table}[!t] @@ -497,9 +493,9 @@ % \vspace{1.5ex} % \begin{tabular}{l@{\hspace{3em}}l@{\hspace{3em}}l} % \toprule2 -% |'a 'e 'i 'o 'u| & 'a 'e 'i 'o 'u\\ -% |'A 'E 'I 'O 'U| & 'A 'E 'I 'O 'U\\ -% |'n 'N| & 'n 'N\nm{a}\\ +% |á é í ó ú| & á é í ó ú\\ +% |á é í ó ú| & á é í ó ú\\ +% |ñ ñ| & ñ ñ\nm{a}\\ % |"u "U| & "u "U\\ % |"i "I| & "i "I\\ % |"a "A "o "O| & Ordinales: 1"a, 1"A, 1"o, 1"O\\ @@ -507,13 +503,13 @@ % |"c "C| & "c "C\\ % |"rr "RR| & rr, pero -r cuando se divide\\ % |"y| & El antiguo signo para <>\\ -% |"-| & Como |\-|, pero permite m'as divisiones\\ +% |"-| & Como |\-|, pero permite más divisiones\\ % |"=| & Como |-|, pero permite mas divisiones\nm{b}\\ -% |"~| & Gui'on estil'istico\nm{c}\\ -% |"+ "+- "+--| & Como |-|, |--| y |---|, pero sin divisi'on\\ +% |"~| & Guión estilístico\nm{c}\\ +% |"+ "+- "+--| & Como |-|, |--| y |---|, pero sin división\\ % |~- ~-- ~---| & Lo mismo que el anterior.\\ -% |""| & Permite mas divisiones antes y despu'es\nm{d}\\ -% |"/| & Una barra algo m'as baja\\ +% |""| & Permite mas divisiones antes y después\nm{d}\\ +% |"/| & Una barra algo más baja\\ % \verb+"|+ & Divide un logotipo\nm{e}\\ % |"< ">| & "< ">\\ % |"` "'| & |\begin{quoting}| |\end{quoting}|\nm{f}\\ @@ -530,33 +526,33 @@ % \nt{a} La forma |~n| no está activada por omisión a partir de % la versión 5. % \nt{b} |"=| viene a ser lo mismo que |""-""|. -% \nt{c} Esta abreviaci'on tiene un uso distinto +% \nt{c} Esta abreviación tiene un uso distinto % en otras lenguas de babel. % \nt{d} Como en <>. % \nt{e} Carece de uso en castellano. -% \nt{f} V'ease sec.~2.7. +% \nt{f} Véase sec.~2.7. % \nt{g} No proporcionadas por este paquete, sino por cada tipo; -% figuran aqu'i como simple recordatorio. -% \nt{h} 'Utiles en r'otulos en may'usculas. +% figuran aquí como simple recordatorio. +% \nt{h} útiles en rótulos en mayúsculas. % \end{minipage} % \end{table} % % Los caracteres usados como abreviaciones se comportan -% como otras 'ordenes de \TeX{} y por tanto se hace caso +% como otras órdenes de \TeX{} y por tanto se hace caso % omiso de los espacios que le puedan seguir: \verb*|' a| es lo mismo -% que |'a|. Eso tambi'en implica que tras esos caracteres no -% puede ir una llave de cierre y que deber'a escribirse -% |{... '{}}| en lugar de |{... '}|; en modo matem'atico no hay -% ningún problema y |$x^{a'}$| ($x^{a'}$) es v'alido. +% que |á|. Eso también implica que tras esos caracteres no +% puede ir una llave de cierre y que deberá escribirse +% |{... '{}}| en lugar de |{... '}|; en modo matemático no hay +% ningún problema y |$x^{a'}$| ($x^{a'}$) es válido. % % \begin{decl} % \con |activeacute|\opp % \end{decl} % -% Para poder usar ap'ostrofos como abreviaciones de acentos es -% necesaria esta opci'on en |\usepackage|. Puede cambiarse este +% Para poder usar apóstrofos como abreviaciones de acentos es +% necesaria esta opción en |\usepackage|. Puede cambiarse este % comportamiento con la orden |\es@acuteactive| en el archivo de -% configuraci'on |spanish.cfg|; en ese caso los ap'ostrofos se activan +% configuración |spanish.cfg|; en ese caso los apóstrofos se activan % siempre. % % \begin{decl} @@ -575,9 +571,9 @@ % Permite desactivar las abreviaciones correspondientes a los % caracteres dados. Para evitar entrar en conflicto con otras lenguas, % al salir de \textsf{spanish} se reactivan,\footnote{El punto para -% los decimales no es estrictamente una abreviaci'on y no se +% los decimales no es estrictamente una abreviación y no se % reactiva.} por lo que si se desea que -% persistan hay que a'nadir la orden a |\shorthandsspanish| con +% persistan hay que añadir la orden a |\shorthandsspanish| con %|\addto|. La orden |\renewcommand\shorthandsspanish{}| es una % variante optimizada de %\begin{verbatim} @@ -603,14 +599,14 @@ % omisión, se siguen las normas internacionales ISO y la legislación % de diversos países (como de España y México) de emplear la coma. % Ya que \TeX\ usa la coma como separador en intervalos o expresiones -% similares, lo que a'nade un espacio fino, \textsf{spanish} -% interpreta todo punto en modo matem'atico de esta forma siempre -% que est'e seguido de una cifra, pero no en otras circunstancias: +% similares, lo que añade un espacio fino, \textsf{spanish} +% interpreta todo punto en modo matemático de esta forma siempre +% que esté seguido de una cifra, pero no en otras circunstancias: % \begin{quote}\small\begin{tabbing} % |$1\,234.567\,890$| \quad \= $1\,234.567\,890$\\ % |$f(1,2)=12.34.$| \> $f(1,2)=12.34.$\\ % |$1{.}000$| \> $1{.}000$, pero\\ -% |1.000| \> 1.000, pues no es modo matem'atico. +% |1.000| \> 1.000, pues no es modo matemático. % \end{tabbing}\end{quote} % % @@ -620,7 +616,7 @@ % % Las dos primeras establecen si se usa una coma (predeterminado) % o un punto, mientras que |\spanishdecimal|\marg{math} -% permite darle una definici'on arbitraria. +% permite darle una definición arbitraria. % % \begin{decl} % \con |es-nodecimaldot|\opp @@ -628,31 +624,31 @@ % % Cancela por completo el mecanismo del punto decimal. % -% \subsection{Divisi'on de palabras} +% \subsection{División de palabras} % % \textsf{Spanish} comprueba la -% codificaci'on en el momento en que se usa un acento: si la -% codificaci'on es |OT1| se toman medidas para facilitar -% la divisi'on, que pese a todo nunca ser'a perfecta, mientras que con -% |T1| se accede directamente al car'acter correspondiente. +% codificación en el momento en que se usa un acento: si la +% codificación es |OT1| se toman medidas para facilitar +% la división, que pese a todo nunca será perfecta, mientras que con +% |T1| se accede directamente al carácter correspondiente. % % \begin{decl} % \txt |"- "= "~|\act{shorthands} % \deact{\textit{es-noshorthands, es-sloppy}} % \end{decl} % -% Para matizar la divisi'on de palabras hay cuatro posibilidades, dos -% de ellas con el m'etodo de abreviaciones: +% Para matizar la división de palabras hay cuatro posibilidades, dos +% de ellas con el método de abreviaciones: % \begin{itemize} -% \item la orden |\-| es un gui'on opcional que no permite -% m'as divisiones, +% \item la orden |\-| es un guión opcional que no permite +% más divisiones, % -% \item |"-| es similar pero permite m'as divisiones, +% \item |"-| es similar pero permite más divisiones, % -% \item un |-| es un gui'on que no permite m'as divisiones ni -% antes ni despu'es, y +% \item un |-| es un guión que no permite más divisiones ni +% antes ni después, y % -% \item |"=| es el equivalente que s'i las permite,\footnote{No +% \item |"=| es el equivalente que sí las permite,\footnote{No % es una buena idea usar esta orden, pero en % medidas muy cortas puede resultar necesario.} % @@ -664,16 +660,16 @@ % Za\hmk ra\hmk go\hmk za-\hmk Bar\hmk ce\hmk lo\hmk na\\ % |semi\-abierto| \> semi\hmk abierto\\ % |semi"-abierto| \> se\hmk mi\hmk abier\hmk to.\footnotemark -% \end{tabbing}\footnotetext{Justo antes y despu'es de +% \end{tabbing}\footnotetext{Justo antes y después de % {\ttfamily\string"\string-} y {\ttfamily\string"\string=} se % aplican los correspondientes % valores de {\ttfamily\string\...hyphenmin} lo que implica que la -% divis'on semia\hmk bierto no es posible. -% 'Este es un comportamiento correcto.} +% divisón semia\hmk bierto no es posible. +% éste es un comportamiento correcto.} % \end{quote} % -% La abreviaci'on |"~| se usa cuando se quiere que el gui'on -% tambi'en aparezca al comienzo de la siguiente l'inea. Por ejemplo: +% La abreviación |"~| se usa cuando se quiere que el guión +% también aparezca al comienzo de la siguiente línea. Por ejemplo: % \begin{quote}\small\begin{tabbing} % |infra"~rojo| \quad \= in\hmk fra-ro\hmk jo, pero infra-\hmk-rojo. % \end{tabbing}\end{quote} @@ -688,31 +684,31 @@ % es-minimal, es-sloppy}} % \end{decl} -% Evitan divisiones: |~-|, que resulta 'util para expresar una serie -% de n'umeros sin que el gui'on los divida (12~-14, |12~-14|), y +% Evitan divisiones: |~-|, que resulta útil para expresar una serie +% de números sin que el guión los divida (12~-14, |12~-14|), y % |~---|, que es la forma que debe usarse para abrir incisos con -% rayas, ya que de lo contrario puede haber una divisi'on entre la +% rayas, ya que de lo contrario puede haber una división entre la % raya de abrir y la palabra que le sigue: % \begin{quote}\small\begin{tabbing} -%|Los conciertos ~---o % academias--- que organiz'o...| +%|Los conciertos ~---o % academias--- que organizó...| % \end{tabbing}\end{quote} % % También pueden emplearse para esta misma función las abreviaciones -% |"+|, |"+-| y |"+---|. Mientras que este gui'on evita toda posible -% divisi'on en los elementos que une, la raya (---) y la semirraya +% |"+|, |"+-| y |"+---|. Mientras que este guión evita toda posible +% división en los elementos que une, la raya (---) y la semirraya % (--) las permiten en las palabras que le precedan o le sigan. % -% Otra abreviaci'on es |"rr| que sirve para el -% 'unico cambio de escritura del castellano en caso de haber divisi'on. -% La \lsc{RAE} indica que al a'nadir un prefijo que termina en vocal a -% una palabra que comienza con \emph{r}, 'esta 'ultima debe -% doblarse a menos que se unan por un gui'on. Por ejemplo: +% Otra abreviación es |"rr| que sirve para el +% único cambio de escritura del castellano en caso de haber división. +% La \lsc{RAE} indica que al añadir un prefijo que termina en vocal a +% una palabra que comienza con \emph{r}, ésta última debe +% doblarse a menos que se unan por un guión. Por ejemplo: % \begin{quote}\small\begin{tabbing} % |extra"rradio| \quad \= ex\hmk trarra\hmk dio, pero extra-\hmk % radio. % \end{tabbing}\end{quote} % No hay acuerdo sobre si esta regla y otras similares han de -% aplicarse o no, aunque la opini'on mayoritaria actual est'a en +% aplicarse o no, aunque la opinión mayoritaria actual está en % contra. % % \subsection{Otros} @@ -721,15 +717,15 @@ % \txt |"/|\act{shorthands}\deact{\textit{es-noshorthands, es-sloppy}} % \end{decl} % -% Es una utilidad tipogr'afica m'as que espec'ificamente espa'nola. -% En ciertos tipos, como Times, el extremo inferior de la barra est'a -% en la l'inea de base y expresiones como <> resultan poco -% est'eticas. |"/| produce una barra que, de ser necesario, se baja -% ligeramente. Computer Modern tiene una barra bien dise'nada y no es -% posible ilustrar aqu'i este punto pero en todo caso se escribir'ia -% |am"/pm|.\footnote{En \MEA{141} se recurre a una soluci'on que es la -% 'unica sencilla en programas de maquetaci'on: usar un cuerpo menor. -% Pero con \TeX{} es mucho m'as f'acil automatizar las tareas.} +% Es una utilidad tipográfica más que específicamente española. +% En ciertos tipos, como Times, el extremo inferior de la barra está +% en la línea de base y expresiones como <> resultan poco +% estéticas. |"/| produce una barra que, de ser necesario, se baja +% ligeramente. Computer Modern tiene una barra bien diseñada y no es +% posible ilustrar aquí este punto pero en todo caso se escribiría +% |am"/pm|.\footnote{En \MEA{141} se recurre a una solución que es la +% única sencilla en programas de maquetación: usar un cuerpo menor. +% Pero con \TeX{} es mucho más fácil automatizar las tareas.} % % \begin{decl} % \txt |"y|\act{shorthand}\deact{\textit{es-noshorthands, es-sloppy}} @@ -737,7 +733,7 @@ % % El signo \textit{et tironiano}, que en español se empleó muy a % menudo, se puede <> con |"y|, siempre que se haya cargado el -% paquete |graphics|; de no ser as'i, se usa la letra $\tau$, aunque +% paquete |graphics|; de no ser así, se usa la letra $\tau$, aunque % la variante normal de \TeX{} no es demasiado apropiada. % % \section{Funciones de texto y matemáticas} @@ -749,28 +745,28 @@ % \end{decl} % % Pone un punto y le sigue el argumento en voladitas. Para -% abreviaturas como |adm\sptext{'on}| que da adm\sptext{'on}. Hay seis +% abreviaturas como |adm\sptext{ón}| que da adm\sptext{ón}. Hay seis % abreviaciones asociadas a ordinales: |"a|, |"A|, |"o|, |"O|, |"er| y % |"ER| que equivalen a |\sptext{a}|, etc. Muchos tipos -% a'naden un peque'no subrayado que debe evitarse, y por tanto no se +% añaden un pequeño subrayado que debe evitarse, y por tanto no se % deben escribir los ordinales con \textsf{inputenc}. % -% Para ajustar el tama'no lo mejor posible, se usa el de -% 'indices en curso. Esto funciona bien salvo para tama'nos muy -% grandes o muy peque'nos, donde los resultados son meramente +% Para ajustar el tamaño lo mejor posible, se usa el de +% índices en curso. Esto funciona bien salvo para tamaños muy +% grandes o muy pequeños, donde los resultados son meramente % aceptables. % % En Plain \TeX{} se ejecuta la orden |\sptextfont| para la % letra voladita, de forma que |{\bf\let\sptextfont\bf 1"o}| da el % resultado correcto (|\mit| si es para cursiva). Para usar un tipo -% nuevo con |\sptext| hay que definir tambi'en las variantes -% matem'aticas con |\newfam|. +% nuevo con |\sptext| hay que definir también las variantes +% matemáticas con |\newfam|. % % \subsection{Espaciado} % -% Salvo excepciones, el espaciado espa'nol difiere relativamente poco -% del ingl'es; una de ellas es que en \textsf{spanish} |\frenchspacing| -% est'a activo. +% Salvo excepciones, el espaciado español difiere relativamente poco +% del inglés; una de ellas es que en \textsf{spanish} |\frenchspacing| +% está activo. % % \begin{decl} % \txt |\...|\act{text}\deact{\textit{es-sloppy}} @@ -781,8 +777,8 @@ % \begin{quote}\small\begin{tabbing} % |\... y solo estaba\... ella.|\quad\=\... y solo estaba\... ella. % \end{tabbing}\end{quote} -% Tambi'en podr'ian escribirse los tres puntos sin m'as |...|, y en -% la pr'actica no hay diferencia, a menos que se cambie el +% También podrían escribirse los tres puntos sin más |...|, y en +% la práctica no hay diferencia, a menos que se cambie el % valor del espacio tras punto; en ese caso, la forma con barra % da los valores apropiados \emph{dentro} de una sentencia, y % los tres puntos \emph{al final} de ella. Esta orden no @@ -793,7 +789,7 @@ % \end{decl} % % Se añade un espacio fino antes del signo (que -% m'as exactamente es |\,|, con lo cual se puede " con +% más exactamente es |\,|, con lo cual se puede " con % su opuesto |\!| si |\%| no sigue a una cifra; también se puede % emplear |\percentsign|). % @@ -815,20 +811,20 @@ % |\lsc{RAE}| \quad \= \lsc{RAE}\\ % |\lsc{ReNFe}| \quad \= \lsc{ReNFe}.\\ % |siglo \lsc{XVII}| \quad \= siglo \lsc{XVII}\\ -% |cap'itulo \lsc{II}| \quad \= cap'itulo \lsc{II}. +% |capítulo \lsc{II}| \quad \= capítulo \lsc{II}. % \end{tabbing}\end{quote} % % Para evitar que con un tipo que carece de versalitas acabe -% apareciendo (por substituci'on) un texto de min'usculas se intenta -% usar en estos casos las versales \emph{reales} de un tama'no menor +% apareciendo (por substitución) un texto de minúsculas se intenta +% usar en estos casos las versales \emph{reales} de un tamaño menor % (\LaTeX\ tiende a sustituir versalitas por versalitas, pero hay % excepciones, como con las negritas). % % \begin{decl} -% \txt |\'i|\alw +% \txt |\í|\alw % \end{decl} % -% Lo mismo que |\'{\i}|. +% Lo mismo que |í|. % % \subsection{Entrecomillados} % @@ -837,10 +833,10 @@ % \end{decl} % % El entorno |quoting| entrecomilla un -% texto, a'nadiendo comillas de seguir al comienzo de -% cada p'arrafo en su interior.\footnote{Se puede encontrar -% una detallada exposici'on de las comillas en \DTL{44 ss.} De ah'i -% se ha tomado alg'un ejemplo.} +% texto, añadiendo comillas de seguir al comienzo de +% cada párrafo en su interior.\footnote{Se puede encontrar +% una detallada exposición de las comillas en \DTL{44 ss.} De ahí +% se ha tomado algún ejemplo.} % % \begin{decl} % \txt |<< >>|\act{shorthands}\deact{es-noquoting, \textit{es-noshorthands, es-minimal, @@ -851,26 +847,26 @@ % \txt |"` "'|\act{shorthands}\deact{\textit{es-noshorthands, es-sloppy}} % \end{decl} % -% Tambi'en se pueden emplear las abreviaciones |<<| y |>>| (o +% También se pueden emplear las abreviaciones |<<| y |>>| (o % alternativamente |"`| y |"'|) que se limitan a llamar a |quoting|, % que por ser entorno considera sus cambios internos como locales. % (Es decir, |<< ... >>| implica |{<< ... >>}|.) Las abreviaciones -% |"<| y |">| contin'uan dando sin m'as los caracteres de comillas de +% |"<| y |">| continúan dando sin más los caracteres de comillas de % abrir y cerrar, respectivamente. % % Por ejemplo: %\begin{verbatim} % <> a las que son de cierre, -% pero se colocan al comienzo de cada p'arrafo cuando se transcribe -% un texto entrecomillado con m'as de un p'arrafo. +% pero se colocan al comienzo de cada párrafo cuando se transcribe +% un texto entrecomillado con más de un párrafo. % % En su interior, como de costumbre, se usan inglesas.>> %\end{verbatim} % cuyo resultado es: % \begin{quotation}\small % <> a las que son de cierre, -% pero se colocan al comienzo de cada p'arrafo cuando se transcribe -% un texto entrecomillado con m'as de un p'arrafo. +% pero se colocan al comienzo de cada párrafo cuando se transcribe +% un texto entrecomillado con más de un párrafo. % % En su interior, como de costumbre, se usan inglesas.>> % \end{quotation} @@ -882,19 +878,19 @@ %\begin{verbatim} % \renewenvironment{quoting}{\itshape}{} %\end{verbatim} -% pero en principio no implica un nuevo p'arrafo, ya que -% est'a pensado para ser usado tambi'en en el texto. +% pero en principio no implica un nuevo párrafo, ya que +% está pensado para ser usado también en el texto. % % \begin{decl} % \con |\lquoti| |\rquoti| |\lquotii| |\rquotii| |\lquotiii| % |\rquotiii| % \end{decl} % -% Controlan las comillas en |quoting|, seg'un el +% Controlan las comillas en |quoting|, según el % nivel en que nos encontremos. |\lquoti| son las comillas de abrir -% m'as exteriores, |\lquotii| las de segundo nivel, etc., y lo mismo +% más exteriores, |\lquotii| las de segundo nivel, etc., y lo mismo % para las de cerrar con |\rquoti|... Para las de seguir siempre se -% usan las de cerrar. Los valores predefinidos est'an en el cuadro 3. +% usan las de cerrar. Los valores predefinidos están en el cuadro 3. % \begin{table} % \center\small % \caption{Entrecomillados} @@ -917,25 +913,25 @@ % % Las incompatibilidades potenciales de estas abreviaciones son % enormes. Por ejemplo, en \textsf{ifthen} se cancelan las -% comparaciones entre n'umeros;\,\footnote{Y en \texttt{\textbackslash +% comparaciones entre números;\,\footnote{Y en \texttt{\textbackslash % ifnum}, % \texttt{\textbackslash ifdim}, etc., usado por los desarrolladores en -% los paquetes.} tambi'en +% los paquetes.} también % resultan inoperantes |@>>>| y |@<<<| de % \textsf{amstex}.\footnote{Aunque en -% este caso cabe usar los sin'onimos |@)))| y |@(((|.} +% este caso cabe usar los sinónimos |@)))| y |@(((|.} % Por ello, se da la posibilidad de cancelarlas y reactivarlas con -% estas 'ordenes, aunque si se est'a usando +% estas órdenes, aunque si se está usando % \textsf{xmltex} ya se -% desactivan por completo de forma autom'atica. El entorno +% desactivan por completo de forma automática. El entorno % |quoting| siempre permanece disponible.\footnote{Algunos tipos % disponen de esta ligadura de forma interna para -% generar los caracteres de comillas, por lo que en ellos tambi'en +% generar los caracteres de comillas, por lo que en ellos también % podemos usarlos siempre, aunque los ajustes proporcionados por % \textsf{spanish} se pueden perder; por otra parte, tampoco se % usan demasiado a menudo.} % -% \subsection{Funciones matem'aticas} +% \subsection{Funciones matemáticas} % % \begin{decl} % \txt |\lim \limsup \liminf \bmod \pmod \sen \tg| @@ -944,44 +940,44 @@ % % Tradicionalmente, las abreviaciones de lo que en \TeX\ se conocen % como operadores se han formado a partir del nombre castellano, lo -% que implica la presencia del acento en l'im (en sus tres formas -% |\lim|, |\limsup| y |\liminf|), m'ax, m'in, 'inf y m'od (en sus dos +% que implica la presencia del acento en lím (en sus tres formas +% |\lim|, |\limsup| y |\liminf|), máx, mín, ínf y mód (en sus dos % formas |\bmod| y |\pmod|). % % Con \textsf{spanish} pueden seguirse varias convenciones con ayuda -% de las siguientes 'ordenes: +% de las siguientes órdenes: % \begin{decl} \con |\accentedoperators| |\unaccentedoperators| % \end{decl} % Activa o desactiva los acentos. -% Por omisi'on se acent'uan, como por ejemplo: $\lim_{x\to 0}(1/x)$ +% Por omisión se acentúan, como por ejemplo: $\lim_{x\to 0}(1/x)$ % (|$\lim_{x\to 0}(1/x)$|). % % \begin{decl} % \con |\spacedoperators| |\unspacedoperators| % \end{decl} -% Activa o desactiva el espacio entre " y la funci'on. -% Lo habitual ha sido con espacio; as'i pues, por omisi'on +% Activa o desactiva el espacio entre " y la función. +% Lo habitual ha sido con espacio; así pues, por omisión % se espacia. % -% Tambi'en se a'naden |\sen|, |\arcsen|, |\tg| y |\arctg|, +% También se añaden |\sen|, |\arcsen|, |\tg| y |\arctg|, % que dan las funciones respectivas. % \begin{decl} % \con |\spanishoperators| % \end{decl} % -% Otras funciones trigonom'etricas se encuentran almacenadas en el -% par'ametro |\spanishoperators|, que inicialmente incluye cotg, -% cosec, senh y tgh. La raz'on por la que estas funciones se han -% separado es porque su forma no está normalizada en el 'ambito +% Otras funciones trigonométricas se encuentran almacenadas en el +% parámetro |\spanishoperators|, que inicialmente incluye cotg, +% cosec, senh y tgh. La razón por la que estas funciones se han +% separado es porque su forma no está normalizada en el ámbito % hispanohablante. De esta forma se puede cambiar por otras con, por % ejemplo: %\begin{verbatim} % \renewcommand{\spanishoperators}{ctg arc\,ctg sh ch th} %\end{verbatim} % (separadas con espacio). Cuando se selecciona \textsf{spanish} se crean -% 'ordenes con esos nombres -% y que dan esas funciones (siempre con |\nolimits|). Adem'as de -% las letras sin acentuar se aceptan las 'ordenes |\,| y |\acute|, que +% órdenes con esos nombres +% y que dan esas funciones (siempre con |\nolimits|). Además de +% las letras sin acentuar se aceptan las órdenes |\,| y |\acute|, que % se pasan por alto para formar el nombre. Por ejemplo, |arc\,ctg| % se escribe en el documento con % |\arcctg|, |M\acute{a}x| como |\Max| y |cr\acute{i}t| como |\crit| @@ -989,16 +985,16 @@ % La orden |\,| responde a |\|(|un|)|spacedoperators|, y |\acute| % a |\|(|un|)|accentedoperators|. % -% Conviene que |\spanishoperators| est'e en el pre'ambulo del -% documento en s'i, antes de |\selectspanish| o de +% Conviene que |\spanishoperators| esté en el preámbulo del +% documento en sí, antes de |\selectspanish| o de % |\begin{document}|. % % \begin{decl} % \txt |\dotlessi|\act{math}\deact{\textit{es-sloppy}} % \end{decl} % -% La \textit{i} sin punto tambi'en es accesible directamente en modo -% matem'atico con la orden |\dotlessi|, de forma que se puede escribir +% La \textit{i} sin punto también es accesible directamente en modo +% matemático con la orden |\dotlessi|, de forma que se puede escribir % |\acute{\dotlessi}|. Por ejemplo, % |$V_{\mathbf{cr\acute{\dotlessi}t}}$| da % $V_{\mathbf{cr\acute{\dotlessi}t}}$. @@ -1025,24 +1021,24 @@ % Anula, además, todas las ligaduras sin excepción, la eñe en listas y los % grupos \textsf{text} y \textsf{math}. % -% \section{Selecci'on} +% \section{Selección} % % \begin{decl} % |\selectspanish| % \end{decl} % -% Por omisi'on, \babel{} deja <> las lenguas hasta que se +% Por omisión, \babel{} deja <> las lenguas hasta que se % llega a |\begin{document}| con el fin de evitar conflictos por % las abreviaciones; a cambio, -% se priva de la posibilidad de usar las lenguas en el pre'ambulo -% en 'ordenes como |\savebox|, |\title|, |\newtheorem|, etc. +% se priva de la posibilidad de usar las lenguas en el preámbulo +% en órdenes como |\savebox|, |\title|, |\newtheorem|, etc. % % La orden |\selectspanish| permite activar \textsf{spanish} con sus % extensiones y abreviaciones antes de % |\begin{document}|.\footnote{Algunos detalles, que % apenas afectan a \textsf{spanish}, siguen sin activarse hasta el % comienzo del documento.} -% De esta forma, podr'iamos decir +% De esta forma, podríamos decir %\begin{verbatim} % \documentclass{book} % \usepackage[T1]{fontenc} @@ -1052,15 +1048,15 @@ % % \selectspanish % -% \title{T'itulo} +% \title{Título} % \author{Autor} -% \newcommand{\pste}{para"-psicol'ogicamente} +% \newcommand{\pste}{para"-psicológicamente} % ... % Mas definiciones % % \begin{document} %\end{verbatim} % -% \section{Adaptaci'on} +% \section{Adaptación} % % \subsection{Opciones por países} % \label{paises} @@ -1083,35 +1079,35 @@ % Probablemente, esta opción también sea apropiada en algunos % países de América Central y del Sur. % -% \subsection{Configuraci'on} +% \subsection{Configuración} % -% En sus 'ultimas versiones, \babel{} ofrece la posibilidad -% de cargar autom'aticamente un archivo con el mismo nombre que -% el principal, pero con extensi'on |.cfg|. \textsf{Spanish} -% proporciona unas pocas 'ordenes para ser usadas en este archivo: +% En sus últimas versiones, \babel{} ofrece la posibilidad +% de cargar automáticamente un archivo con el mismo nombre que +% el principal, pero con extensión |.cfg|. \textsf{Spanish} +% proporciona unas pocas órdenes para ser usadas en este archivo: % % \begin{decl} % \con |\es@activeacute| % \end{decl} -% Activa las abreviaciones con ap'ostrofos, sin que sea -% necesario incluir |activeacute| como opci'on en |\usepackage|. +% Activa las abreviaciones con apóstrofos, sin que sea +% necesario incluir |activeacute| como opción en |\usepackage|. % % \begin{decl} \con |\es@enumerate{}|% % |{}{}{}|\alw % \end{decl} % Cambia los valores preestablecidos por \textsf{spanish} para % |enumerate|. \textit{leveln} consiste en una letra, que -% indica qu'e formato tendr'a el n'umero, seguida -% de cualquier texto. La letra tiene que ser: |1| (ar'abigo), -% |a| (min'uscula \emph{cursiva}\,\footnote{La letra es cursiva -% pero no los signos que le puedan seguir. M'as bien deber'ia +% indica qué formato tendrá el número, seguida +% de cualquier texto. La letra tiene que ser: |1| (arábigo), +% |a| (minúscula \emph{cursiva}\,\footnote{La letra es cursiva +% pero no los signos que le puedan seguir. Más bien debería % decirse destacada, ya que se usa |\string\emph|. -% V'ease \DTL{11}.}), |A| (versal), +% Véase \DTL{11}.}), |A| (versal), % |i| (romano \emph{versalita}), |I| (romano versal) o -% finalmente |o| (ordinal\,\footnote{Lo normal es no a'nadir ning'un +% finalmente |o| (ordinal\,\footnote{Lo normal es no añadir ningún % signo tras ordinal.}). % -% Esta orden no est'a pensada para hacer cambios elaborados, sino +% Esta orden no está pensada para hacer cambios elaborados, sino % sólo meros reajustes. Los valores preestablecidos % equivalen a %\begin{verbatim} @@ -1121,7 +1117,7 @@ % \begin{decl} \con |\es@itemize{}|% % |{}{}{}|\alw % \end{decl} -% Lo mismo para |itemize|, s'olo que los argumentos se +% Lo mismo para |itemize|, sólo que los argumentos se % usan de forma literal. Los valores originales de \LaTeX{} son % similares a %\begin{verbatim} @@ -1137,7 +1133,7 @@ %\end{verbatim} % Es buena idea incluirlo si no se van a usar, ya que ahorra memoria. % -% Otros ajustes 'utiles en este contexto son |\spanishoperators|, +% Otros ajustes útiles en este contexto son |\spanishoperators|, % |\selectspanish| y |\deactivatequoting|. % % @@ -1175,12 +1171,12 @@ %\end{verbatim} % % Se incluyen: traducciones, casi todas las abreviaciones, coma -% decimal, utilidades para divisi'on de palabras, ordinales en una -% versi'on simplificada (y no muy elegante), funciones matem'aticas, -% |\'i| y espaciado. La selecci'on de la lengua es inmediata al +% decimal, utilidades para división de palabras, ordinales en una +% versión simplificada (y no muy elegante), funciones matemáticas, +% |\í| y espaciado. La selección de la lengua es inmediata al % cargar el archivo. % -% En cambio no est'an disponibles: entrecomillados, +% En cambio no están disponibles: entrecomillados, % |\lsc| ni las adaptaciones de lengua principal. % % \section{Compatibilidad con versiones anteriores} @@ -1210,25 +1206,25 @@ % \leftskip1.5cm \parindent-1.5cm % % \makebox[1.5cm][l]{\lsc{DRAE}}\textit{Diccionario de la Academia -% Espa'nola}, Madrid, Espasa-Calpe, 21"a ed., 1992. +% Española}, Madrid, Espasa-Calpe, 21"a ed., 1992. % -% \makebox[1.5cm][l]{\lsc{DOT}}Jos'e Mart'inez de Sousa, -% \textit{Diccionario de ortograf'ia t'ecnica}, -% Madrid, Germ'an S'anchez Ruip'erez/Pir'amide, 1987. +% \makebox[1.5cm][l]{\lsc{DOT}}José Martínez de Sousa, +% \textit{Diccionario de ortografía técnica}, +% Madrid, Germán Sánchez Ruipérez/Pirámide, 1987. % (Biblioteca del libro.) % -% \makebox[1.5cm][l]{\lsc{DTL}}Jos'e Mart'inez de Sousa, -% \textit{Diccionario de tipograf'ia y del libro}, +% \makebox[1.5cm][l]{\lsc{DTL}}José Martínez de Sousa, +% \textit{Diccionario de tipografía y del libro}, % Madrid, Paraninfo, 3"a ed., 1992. % -% \makebox[1.5cm][l]{\lsc{MEA}}Jos'e Mart'inez de Sousa, -% \textit{Manual de edici'on y autoedici'on}, -% Madrid, Pir'amide, 1994. +% \makebox[1.5cm][l]{\lsc{MEA}}José Martínez de Sousa, +% \textit{Manual de edición y autoedición}, +% Madrid, Pirámide, 1994. % % \leftskip0pt \parindent0pt \vspace{6pt} % % {\itshape -% Para otras cuestiones tipogr'aficas, las referencias +% Para otras cuestiones tipográficas, las referencias % usadas son, entre otras:} % % \parindent-1.5pc \leftskip1.5pc \vspace{3pt} @@ -1237,12 +1233,16 @@ % \textit{Diccionario panhispánico de dudas}, Madrid, Santillana, 2005. % % Javier Bezos, -% \textit{Tipograf'ia espa'nola con \TeX}, documento electr'onico +% \textit{Tipografía española con \TeX}, documento electrónico % disponible en % \textsf{http://perso.wanadoo.es/jbezos/tipografia.html}. % +% Javier Bezos, +% \textit{Tipografía y notaciones científicas}, Gijón, +% Trea, 2008. +% % Bureau International des Poids et mesures, -% \textit{Le Sist\`{e}me international d'unités}, +% \textit{Le Sist\`{e}me international dúnités}, % 8"a ed., París, {\footnotesize BIPM}, 2006, % \textsf{http://www.bipm.org/""fr/""si/""si\_brochure/}, 2006-11-10. % @@ -1251,50 +1251,50 @@ % % % \textit{The Chicago Manual of Style}, Chicago, University of -% Chicago Press, 14"a~ed., 1993, esp.~p'ags.~333~-335. +% Chicago Press, 14"a~ed., 1993, esp.~págs.~333~-335. % -% Jos'e Fern'andez Castillo, -% \textit{Normas para correctores y compositores tip'ografos}, +% José Fernández Castillo, +% \textit{Normas para correctores y compositores tipógrafos}, % Madrid, Espasa-Calpe, 1959. % -% IRANOR [AENOR], Normas \lsc{UNE} n'umeros 5010 (<>), 5028 (<>) y 5029 (<>). +% IRANOR [AENOR], Normas \lsc{UNE} números 5010 (<>), 5028 (<>) y 5029 (<>). % [Obsoletas.] % % Llerena, Mario, % \textit{Un manual de estilo,} Miami, Unilit, 1999. % -% Real Academia Espa'nola, -% \textit{Esbozo de una nueva gram'atica de la -% lengua espa'nola}, Madrid, Espasa-Calpe, 1973. +% Real Academia Española, +% \textit{Esbozo de una nueva gramática de la +% lengua española}, Madrid, Espasa-Calpe, 1973. % -% V.\ Mart'inez Sicluna, -% \textit{Teor'ia y pr'actica de la tipograf'ia}, +% V.\ Martínez Sicluna, +% \textit{Teoría y práctica de la tipografía}, % Barcelona, Gustavo Gili, 1945. % -% Jos'e Mart'inez de Sousa, -% \textit{Diccionario de ortograf'ia de la lengua espa'nola}, +% José Martínez de Sousa, +% \textit{Diccionario de ortografía de la lengua española}, % Madrid, Paraninfo, 1996. % -% Juan Mart'inez Val, \textit{Tipograf'ia pr'actica}, Madrid, +% Juan Martínez Val, \textit{Tipografía práctica}, Madrid, % Laberinto, 2002. % -% Juan Jos'e Morato, \textit{Gu'ia pr'actica del compositor -% tipogr'afico}, Madrid, Hernando, 2"a ed., 1908 (1"a ed., 1900, +% Juan José Morato, \textit{Guía práctica del compositor +% tipográfico}, Madrid, Hernando, 2"a ed., 1908 (1"a ed., 1900, % 3"a ed., 1933). % % Marion Neubauer, % <>, % \textit{Die \TeX nisches Kom\"odie}, parte I, vol. 8, n"o 4, 1996, -% p'ags. 23-40; parte II, vol. 9, n"o 1, 1997, p'ags.~25~-44. +% págs. 23-40; parte II, vol. 9, n"o 1, 1997, págs.~25~-44. % % Notimex, \textit{Manual de operación y estilo editorial}, México, % Notimex, 1999. % -% Jos'e Polo, -% \textit{Ortograf'ia y ciencia del lenguaje}, Madrid, Paraninfo, +% José Polo, +% \textit{Ortografía y ciencia del lenguaje}, Madrid, Paraninfo, % 1974. % % Siglo 21, \textit{Libro de estilo}, México, Alda, @@ -1302,11 +1302,11 @@ % (impr. 1995). % % Pedro Valle, -% \textit{C'omo corregir sin ofender}, Buenos Aires, Lumen, 1998. +% \textit{Cómo corregir sin ofender}, Buenos Aires, Lumen, 1998. % -% Hugh C. Wolfe, <>, -% \textit{Enciclopedia de F'isica}, dir. Rita G. Lerner y George L. -% Trigg, Madrid, Alianza, 1987, t.~2, p'ags.~1423~-1451. +% Hugh C. Wolfe, <>, +% \textit{Enciclopedia de Física}, dir. Rita G. Lerner y George L. +% Trigg, Madrid, Alianza, 1987, t.~2, págs.~1423~-1451. % %\endgroup % @@ -1321,9 +1321,9 @@ % The file \file{\filename}\footnote{The file described in this % section has version number \fileversion\ and was last revised on % \filedate. The maintainer from v4.0 on is Javier Bezos -% (http://www.texytipografia.com). Previous +% (http://www.tex-tipografia.com). Previous % versions were made by Julio S\'anchez. The English documentation -% has been improved by José Luis Rivera; thanks to him it is now a lot +% has been improved by José Luis Rivera; thanks to him it is now a lot % clearer.} defines all the language-specific macros for the Spanish % language. % @@ -1458,19 +1458,19 @@ % \begin{table} % \centering % \begin{tabular}{cccc}\hline -% Basic Options & |es-minimal| & |es-sloppy| & |es-noshorthands| \\\hline -% |es-noindentfirst| & X & X & \\ -% |es-nosectiondot| & X & X & \\ -% |es-nolists| & X & X & \\ -% |es-noquoting| & X & X & X \\ -% |es-notilde| & X & X & X \\ -% |es-nodecimaldot| & X & X & X \\ -% |es-nolayout| & & X & \\ -% |es-ucroman| & X & & \\ -% |es-lcroman| & X & X & \\\hline +% Basic Options & |es-minimal| & |es-sloppy| & |es-noshorthands| \\\hline +% |es-noindentfirst| & X & X & \\ +% |es-nosectiondot| & X & X & \\ +% |es-nolists| & X & X & \\ +% |es-noquoting| & X & X & X \\ +% |es-notilde| & X & X & X \\ +% |es-nodecimaldot| & X & X & X \\ +% |es-nolayout| & & X & \\ +% |es-ucroman| & X & & \\ +% |es-lcroman| & X & X & \\\hline % \end{tabular} -% \caption{Spanish Customization Options} -% \label{tab:SpanishCustomizationOptions} +% \caption{Spanish Customization Options} +% \label{tab:SpanishCustomizationOptions} % \end{table} % % Some global options are built upon lower level options, and may be @@ -1642,11 +1642,13 @@ % % \fi % -% \changes{spanish~5.0a}{2007-02-21}{Reimplemented in full, which some -% parts rewritten from scratch. Added the es- mechanism and the mexico -% option. Many bug fixes.} -% \changes{spanish~5.0d}{2008-05-25}{Fixed two bugs: misplaced -% subscripts with lim and the like; problem with \cs{roman} and hyperref.} +% \changes{spanish~5.0a}{2007/02/21}{Reimplemented in full, which some +% parts rewritten from scratch. Added the es- mechanism and the mexico +% option. Many bug fixes.} +% \changes{spanish~5.0d}{2008/05/25}{Fixed two bugs: misplaced +% subscripts with lim and the like; problem with \cs{roman} and hyperref.} +% \changes{spanish~5.0h}{2009/01/02}{Removed unnecessary \cs{string}s +% with two acutes. Added es-noenumerate, es-noitemize.} % % This file provides definition for both \LaTeXe{} and non % \LaTeXe{} formats. @@ -1654,7 +1656,7 @@ % \begin{macrocode} %<*code> \ProvidesLanguage{spanish.ldf} - [2008/07/06 v5.0e Spanish support from the babel system] + [2009/01/02 v5.0h Spanish support from the babel system] \LdfInit{spanish}\captionsspanish \edef\es@savedcatcodes{% @@ -1695,10 +1697,12 @@ {}} \es@genoption{es-minimal} - {es-ucroman,es-noindentfirst,es-nosectiondot,es-nolists,% - es-noquoting,es-notilde,es-nodecimaldot} + {es-ucroman,es-noindentfirst,es-nosectiondot,es-noenumerate,% + es-noitemize,es-noquoting,es-notilde,es-nodecimaldot} {\spanishplainpercent \let\es@operators\relax} +\es@genoption{es-nolists} + {es-noenumerate,es-noitemize}{} \es@genoption{es-sloppy} {es-nolayout,es-noshorthands}{} \es@genoption{es-noshorthands} @@ -2362,10 +2366,13 @@ % Acute accent shorthands are stored in a macro. If |activeacute| % was set as an option it's executed. If not is not deleted for a % possible later use in the |cfg| file. In non \LaTeXe{} formats -% is always executed. +% it's always executed. % -% \changes{spanish-5.0e}{2008/07/06}{Two acutes in a row should be +% \changes{spanish~5.0e}{2008/07/06}{Two acutes in a row should be % turned into a double right quote} +% \changes{spanish~5.0g}{2008/07/20}{Fixed bad kerning before two +% acutes} +% % \begin{macrocode} \begingroup \catcode`\'=12 @@ -2376,7 +2383,7 @@ \es@a A\es@a E\es@a I\es@a O\es@a U% \es@declare{'n}{\~n}% \es@declare{'N}{\~N}% - \es@declare{''}{\textquotedblright}% + \es@declare{''}{''}% % \end{macrocode} % % But \textsf{spanish} allows two category codes for |'|, @@ -2465,22 +2472,23 @@ K\or L\or M\or N\or \~N\or O\or P\or Q\or R\or S\or T\or U\or V\or W\or X\or Y\or Z\else\@ctrerr\fi}} -\es@optlayout{nolists}{% +\es@optlayout{noenumerate}{% \def\es@enumerate#1#2#3#4{% \es@enumdef{i}#1\@empty\@empty\@@ \es@enumdef{ii}#2\@empty\@empty\@@ \es@enumdef{iii}#3\@empty\@empty\@@ \es@enumdef{iv}#4\@empty\@empty\@@}% + \def\p@enumii{\theenumi}% + \def\p@enumiii{\p@enumii\theenumii}% + \def\p@enumiv{\p@enumiii\theenumiii}% + \expandafter\es@enumerate\es@enum} +\es@optlayout{noitemize}{% \def\es@itemize#1#2#3#4{% \def\labelitemi{\es@listquot#1}% \def\labelitemii{\es@listquot#2}% \def\labelitemiii{\es@listquot#3}% \def\labelitemiv{\es@listquot#4}}% - \def\p@enumii{\theenumi}% - \def\p@enumiii{\p@enumii\theenumii}% - \def\p@enumiv{\p@enumiii\theenumiii}% - \expandafter\es@enumerate\es@enum - \expandafter\es@itemize\es@item} + \expandafter\es@itemize\es@item} \let\esromanindex\@secondoftwo \es@ifoption{ucroman} {\def\es@romandef{% diff --git a/Master/texmf-dist/source/generic/babel/spanish.ins b/Master/texmf-dist/source/generic/babel/spanish.ins index 3347f7b15ff..73844365aed 100644 --- a/Master/texmf-dist/source/generic/babel/spanish.ins +++ b/Master/texmf-dist/source/generic/babel/spanish.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1989-2008 Johannes L. Braams and any individual authors +%% Copyright 1989-2009 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file is part of the Babel system. @@ -31,29 +31,29 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\batchfile{spanish.ins} -\def\filedate{2007/02/21} -\input docstrip.tex - -{\ifx\generate\undefined - \Msg{**********************************************} - \Msg{*} - \Msg{* This installation requires docstrip} - \Msg{* version 2.3c or later.} - \Msg{*} - \Msg{* An older version of docstrip has been input} - \Msg{*} - \Msg{**********************************************} - \errhelp{Move or rename old docstrip.tex.} - \errmessage{Old docstrip in input path} - \batchmode - \csname @@end\endcsname -\fi} - -\declarepreamble\mainpreamble +\def\batchfile{spanish.ins} +\def\filedate{2007/02/21} +\input docstrip.tex + +{\ifx\generate\undefined + \Msg{**********************************************} + \Msg{*} + \Msg{* This installation requires docstrip} + \Msg{* version 2.3c or later.} + \Msg{*} + \Msg{* An older version of docstrip has been input} + \Msg{*} + \Msg{**********************************************} + \errhelp{Move or rename old docstrip.tex.} + \errmessage{Old docstrip in input path} + \batchmode + \csname @@end\endcsname +\fi} + +\declarepreamble\mainpreamble This is a generated file. -Copyright 1989-2008 Johannes L. Braams and any individual authors +Copyright 1989-2009 Johannes L. Braams and any individual authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. @@ -82,12 +82,12 @@ 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 - -\declarepreamble\fdpreamble +\endpreamble + +\declarepreamble\fdpreamble This is a generated file. -Copyright 1989-2008 Johannes L. Braams and any individual authors +Copyright 1989-2009 Johannes L. Braams and any individual authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. @@ -119,32 +119,32 @@ this file to serve the needs of your installation. However, NO PERMISSION is granted to distribute a modified version of this file under its original name. -\endpreamble - -\keepsilent - -\usedir{tex/generic/babel} - -\keepsilent - -\usepreamble\mainpreamble -\generate{\file{spanish.ldf}{\from{spanish.dtx}{code}}% - \file{romanidx.sty}{\from{spanish.dtx}{indexes}}} -\usepreamble\fdpreamble - -\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 All *.def, *.fd, *.ldf, *.sty} -\Msg{*} -\Msg{* To produce the documentation run the files ending with} -\Msg{* '.dtx' and `.fdd' through LaTeX.} -\Msg{*} -\Msg{* Happy TeXing} -\Msg{***********************************************************} -} - -\endinput +\endpreamble + +\keepsilent + +\usedir{tex/generic/babel} + +\keepsilent + +\usepreamble\mainpreamble +\generate{\file{spanish.ldf}{\from{spanish.dtx}{code}}% + \file{romanidx.sty}{\from{spanish.dtx}{indexes}}} +\usepreamble\fdpreamble + +\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 All *.def, *.fd, *.ldf, *.sty} +\Msg{*} +\Msg{* To produce the documentation run the files ending with} +\Msg{* '.dtx' and `.fdd' through LaTeX.} +\Msg{*} +\Msg{* Happy TeXing} +\Msg{***********************************************************} +} + +\endinput diff --git a/Master/texmf-dist/source/generic/babel/tb1202.tex b/Master/texmf-dist/source/generic/babel/tb1202.tex index fbec780704e..8b8f6cd3af9 100644 --- a/Master/texmf-dist/source/generic/babel/tb1202.tex +++ b/Master/texmf-dist/source/generic/babel/tb1202.tex @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1989-2008 Johannes L. Braams and any individual authors +% Copyright 1989-2009 Johannes L. Braams and any individual authors % listed elsewhere in this file. All rights reserved. % % This file is part of the Babel system. diff --git a/Master/texmf-dist/source/generic/babel/tb1401.tex b/Master/texmf-dist/source/generic/babel/tb1401.tex index 00373e522fa..a1f2a78d151 100644 --- a/Master/texmf-dist/source/generic/babel/tb1401.tex +++ b/Master/texmf-dist/source/generic/babel/tb1401.tex @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1989-2008 Johannes L. Braams and any individual authors +% Copyright 1989-2009 Johannes L. Braams and any individual authors % listed elsewhere in this file. All rights reserved. % % This file is part of the Babel system. diff --git a/Master/texmf-dist/source/generic/babel/tb1604.tex b/Master/texmf-dist/source/generic/babel/tb1604.tex index 579bf65f504..f5f2b74fc4d 100644 --- a/Master/texmf-dist/source/generic/babel/tb1604.tex +++ b/Master/texmf-dist/source/generic/babel/tb1604.tex @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1989-2008 Johannes L. Braams and any individual authors +% Copyright 1989-2009 Johannes L. Braams and any individual authors % listed elsewhere in this file. All rights reserved. % % This file is part of the Babel system. diff --git a/Master/texmf-dist/tex/generic/babel/danish.ldf b/Master/texmf-dist/tex/generic/babel/danish.ldf index a489d2d6ac4..98e36d4cdcf 100644 --- a/Master/texmf-dist/tex/generic/babel/danish.ldf +++ b/Master/texmf-dist/tex/generic/babel/danish.ldf @@ -7,7 +7,7 @@ %% danish.dtx (with options: `code') %% This is a generated file. %% -%% Copyright 1989-2008 Johannes L. Braams and any individual authors +%% Copyright 1989-2009 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file was generated from file(s) of the Babel system. @@ -37,10 +37,10 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesLanguage{danish} - [2008/07/06 v1.3q Danish support from the babel system] + [2009/09/19 v1.3r Danish support from the babel system] %% File `danish.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2008 +%% Copyright (C) 1989 - 2009 %% by Johannes Braams, TeXniek %% Please report errors to: J.L. Braams %% babel at braams.xs4all.nl @@ -97,7 +97,7 @@ \declare@shorthand{danish}{"=}{\nobreak-\hskip\z@skip} \declare@shorthand{danish}{"|}{% \textormath{\discretionary{-}{}{\kern.03em}}{}} -\declare@shorthand{dutch}{"/}{\textormath +\declare@shorthand{danish}{"/}{\textormath {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}} \expandafter\addto\csname extras\CurrentOption\endcsname{% \babel@save\-} diff --git a/Master/texmf-dist/tex/generic/babel/estonian.ldf b/Master/texmf-dist/tex/generic/babel/estonian.ldf index 889c01e0549..e6d95b898ba 100644 --- a/Master/texmf-dist/tex/generic/babel/estonian.ldf +++ b/Master/texmf-dist/tex/generic/babel/estonian.ldf @@ -7,7 +7,7 @@ %% estonian.dtx (with options: `code') %% This is a generated file. %% -%% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% Copyright 1989-2009 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file was generated from file(s) of the Babel system. @@ -37,16 +37,17 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesLanguage{estonian} - [2008/07/07 v1.0j Estonian support from the babel system] + [2009/03/08 v1.0k Estonian support from the babel system] %% File `estonian.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2005 +%% Copyright (C) 1989 - 2009 %% by Johannes Braams, TeXniek %% Estonian language Definition File -%% Copyright (C) 1991 - 2005 +%% Copyright (C) 1991 - 2009 %% by Enn Saar, Tartu Astrophysical Observatory -%% Please report errors to: Enn Saar saar at aai.ee -%% (or J.L. Braams babel atbraams.cistron.nl +%% Please report errors to: Jaan Vajakas jv at ut.ee +%% (or Enn Saar saar at aai.ee +%% or J. L. Braams babel at braams.xs4all.nl) \LdfInit{estonian}\captionsestonian \ifx\l@estonian\@undefined \@nopatterns{Estonian} @@ -70,15 +71,15 @@ \def\pagename{Lk.}% \def\seename{vt.}% \def\alsoname{vt. ka}% - \def\proofname{T~oestus}% - \def\glossaryname{Glossary}% <-- Needs translation } \begingroup \catcode`\"\active \def\x{\endgroup \addto\captionsestonian{% \def\abstractname{Kokkuv~ote}% - \def\chaptername{Peat"ukk}}} -\x + \def\chaptername{Peat"ukk}% + \def\proofname{T~oestus}% + \def\glossaryname{S~onastik}% +}}\x \begingroup \catcode`\"\active \def\x{\endgroup \def\month@estonian{\ifcase\month\or @@ -89,38 +90,43 @@ \def\dateestonian{% \def\today{\number\day.\space\month@estonian \space\number\year.\space a.}} +\def\et@sdef#1{\babel@save#1\def#1} + +\@ifundefined{documentclass} + {\let\ifet@latex\iffalse} + {\let\ifet@latex\iftrue} \initiate@active@char{"} \initiate@active@char{~} \addto\extrasestonian{\languageshorthands{estonian}} \addto\extrasestonian{\bbl@activate{"}\bbl@activate{~}} -\addto\extrasestonian{\babel@save\"\umlautlow\babel@save\~\tildelow} \addto\extrasestonian{\bbl@frenchspacing} \addto\noextrasestonian{\bbl@nonfrenchspacing} \providehyphenmins{\CurrentOption}{\tw@\tw@} -\def\tildelow{\def\~{\protect\gentilde}} -\def\gentilde#1{\if#1o\newtilde{#1}\else\if#1O\newtilde{#1}% - \else\newcheck{#1}% - \fi\fi} -\def\newtilde#1{\leavevmode\allowhyphens - {\U@D 1ex% - {\setbox\z@\hbox{\char126}\dimen@ -.45ex\advance\dimen@\ht\z@ - \ifdim 1ex<\dimen@ \fontdimen5\font\dimen@ \fi}% - \accent126\fontdimen5\font\U@D #1}\allowhyphens} -\def\newcheck#1{\leavevmode\allowhyphens - {\U@D 1ex% - {\setbox\z@\hbox{\char20}\dimen@ -.45ex\advance\dimen@\ht\z@ - \ifdim 1ex<\dimen@ \fontdimen5\font\dimen@ \fi}% - \accent20\fontdimen5\font\U@D #1}\allowhyphens} +\addto\extrasestonian{\umlautlow} +\addto\noextrasestonian{\umlauthigh} +\ifet@latex + \addto\extrasestonian{% + \expandafter\et@sdef\csname OT1\string\~\endcsname{\et@gentilde}} +\else + \addto\extrasestonian{\et@sdef\~{\et@gentilde}} +\fi +\def\et@gentilde#1{% + \if#1s\v{#1}\else\if#1S\v{#1}\else% + \if#1z\v{#1}\else\if#1Z\v{#1}\else% + \et@newtilde{#1}% + \fi\fi\fi\fi} +\def\et@newtilde#1{% + \leavevmode\bgroup\U@D 1ex% + {\setbox\z@\hbox{\char126}\dimen@ -.45ex\advance\dimen@\ht\z@ + \ifdim 1ex<\dimen@ \fontdimen5\font\dimen@ \fi}% + \accent126\fontdimen5\font\U@D #1% + \egroup} \begingroup \catcode`\"12 \edef\x{\endgroup \def\noexpand\dq{"} \def\noexpand\til{~}} \x -\let\dieresis\" -\let\texttilde\~ \ifx\f@encoding\bbl@t@one - \let\@umlaut\dieresis - \let\@tilde\texttilde \DeclareTextComposite{\~}{T1}{s}{178} \DeclareTextComposite{\~}{T1}{S}{146} \DeclareTextComposite{\~}{T1}{z}{186} @@ -131,15 +137,13 @@ \DeclareTextComposite{\"}{T1}{>}{20} \else \wlog{Warning: Hyphenation would work better for the T1 encoding.} - \let\@umlaut\newumlaut - \let\@tilde\gentilde \fi -\declare@shorthand{estonian}{"a}{\textormath{\"{a}}{\ddot a}} -\declare@shorthand{estonian}{"A}{\textormath{\"{A}}{\ddot A}} -\declare@shorthand{estonian}{"o}{\textormath{\"{o}}{\ddot o}} -\declare@shorthand{estonian}{"O}{\textormath{\"{O}}{\ddot O}} -\declare@shorthand{estonian}{"u}{\textormath{\"{u}}{\ddot u}} -\declare@shorthand{estonian}{"U}{\textormath{\"{U}}{\ddot U}} +\declare@shorthand{estonian}{"a}{\textormath{\"{a}\allowhyphens}{\ddot a}} +\declare@shorthand{estonian}{"A}{\textormath{\"{A}\allowhyphens}{\ddot A}} +\declare@shorthand{estonian}{"o}{\textormath{\"{o}\allowhyphens}{\ddot o}} +\declare@shorthand{estonian}{"O}{\textormath{\"{O}\allowhyphens}{\ddot O}} +\declare@shorthand{estonian}{"u}{\textormath{\"{u}\allowhyphens}{\ddot u}} +\declare@shorthand{estonian}{"U}{\textormath{\"{U}\allowhyphens}{\ddot U}} \declare@shorthand{estonian}{"`}{% \textormath{\quotedblbase}{\mbox{\quotedblbase}}} \declare@shorthand{estonian}{"'}{% @@ -148,12 +152,12 @@ \textormath{\guillemotleft}{\mbox{\guillemotleft}}} \declare@shorthand{estonian}{">}{% \textormath{\guillemotright}{\mbox{\guillemotright}}} -\declare@shorthand{estonian}{~o}{\textormath{\@tilde o}{\tilde o}} -\declare@shorthand{estonian}{~O}{\textormath{\@tilde O}{\tilde O}} -\declare@shorthand{estonian}{~s}{\textormath{\@tilde s}{\check s}} -\declare@shorthand{estonian}{~S}{\textormath{\@tilde S}{\check S}} -\declare@shorthand{estonian}{~z}{\textormath{\@tilde z}{\check z}} -\declare@shorthand{estonian}{~Z}{\textormath{\@tilde Z}{\check Z}} +\declare@shorthand{estonian}{~o}{\textormath{\~{o}\allowhyphens}{\tilde o}} +\declare@shorthand{estonian}{~O}{\textormath{\~{O}\allowhyphens}{\tilde O}} +\declare@shorthand{estonian}{~s}{\textormath{\v{s}\allowhyphens}{\check s}} +\declare@shorthand{estonian}{~S}{\textormath{\v{S}\allowhyphens}{\check S}} +\declare@shorthand{estonian}{~z}{\textormath{\v{z}\allowhyphens}{\check z}} +\declare@shorthand{estonian}{~Z}{\textormath{\v{Z}\allowhyphens}{\check Z}} \declare@shorthand{estonian}{"-}{\nobreak\-\bbl@allowhyphens} \declare@shorthand{estonian}{"|}{% \textormath{\nobreak\discretionary{-}{}{\kern.03em}% diff --git a/Master/texmf-dist/tex/generic/babel/frenchb.cfg b/Master/texmf-dist/tex/generic/babel/frenchb.cfg index 6939f13aaf9..4a864468b5c 100644 --- a/Master/texmf-dist/tex/generic/babel/frenchb.cfg +++ b/Master/texmf-dist/tex/generic/babel/frenchb.cfg @@ -2,7 +2,7 @@ %% Daniel Flipo Daniel.Flipo at univ-lille1.fr %% File `frenchb.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2008 +%% Copyright (C) 1989 - 2009 %% by Johannes Braams, TeXniek %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%% WARNING: THIS FILE SHOULD NO LONGER BE USED %%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/babel/frenchb.ldf b/Master/texmf-dist/tex/generic/babel/frenchb.ldf index d12d4036724..2f4d1481cf6 100644 --- a/Master/texmf-dist/tex/generic/babel/frenchb.ldf +++ b/Master/texmf-dist/tex/generic/babel/frenchb.ldf @@ -7,7 +7,7 @@ %% frenchb.dtx (with options: `code') %% This is a generated file. %% -%% Copyright 1989-2008 Johannes L. Braams and any individual authors +%% Copyright 1989-2009 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file was generated from file(s) of the Babel system. @@ -37,13 +37,13 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesLanguage{frenchb} - [2008/05/08 v2.2a French support from the babel system] + [2009/03/16 v2.3d French support from the babel system] %% File `frenchb.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2008 +%% Copyright (C) 1989 - 2009 %% by Johannes Braams, TeXniek %% Frenchb language Definition File -%% Copyright (C) 1989 - 2008 +%% Copyright (C) 1989 - 2009 %% by Johannes Braams, TeXniek %% Daniel Flipo, GUTenberg %% Please report errors to: Daniel Flipo, GUTenberg @@ -114,7 +114,8 @@ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}% \fi \vskip\belowcaptionskip}% -\newif\ifFBpunct@active \FBpunct@activetrue +\newif\ifFBpunct@active \FBpunct@activetrue +\newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue \ifFBpunct@active \initiate@active@char{:} \initiate@active@char{;} @@ -157,12 +158,40 @@ \fi \fi \string:} - \def\AutoSpaceBeforeFDP{% + \def\autospace@beforeFDP{% \def\FDP@thinspace{\penalty\@M\thinspace}% \def\FDP@colonspace{\penalty\@M\Fcolonspace}} - \def\NoAutoSpaceBeforeFDP{\let\FDP@thinspace\@empty + \def\noautospace@beforeFDP{\let\FDP@thinspace\@empty \let\FDP@colonspace\@empty} - \AutoSpaceBeforeFDP + \ifLaTeXe + \def\AutoSpaceBeforeFDP{\autospace@beforeFDP + \FBAutoSpacePunctuationtrue} + \def\NoAutoSpaceBeforeFDP{\noautospace@beforeFDP + \FBAutoSpacePunctuationfalse} + \else + \let\AutoSpaceBeforeFDP\autospace@beforeFDP + \let\NoAutoSpaceBeforeFDP\noautospace@beforeFDP + \AutoSpaceBeforeFDP + \fi + \ifLaTeXe + \let\ttfamilyORI\ttfamily + \let\rmfamilyORI\rmfamily + \let\sffamilyORI\sffamily + \DeclareRobustCommand\ttfamilyFB{% + \noautospace@beforeFDP\ttfamilyORI}% + \DeclareRobustCommand\rmfamilyFB{% + \ifFBAutoSpacePunctuation + \autospace@beforeFDP\rmfamilyORI + \else + \noautospace@beforeFDP\rmfamilyORI + \fi}% + \DeclareRobustCommand\sffamilyFB{% + \ifFBAutoSpacePunctuation + \autospace@beforeFDP\sffamilyORI + \else + \noautospace@beforeFDP\sffamilyORI + \fi}% + \fi \declare@shorthand{system}{:}{\string:} \declare@shorthand{system}{!}{\string!} \declare@shorthand{system}{?}{\string?} @@ -226,7 +255,7 @@ \AtEndOfPackage{\RequirePackage{scalefnt}} \newcommand*{\FBsupR}{-0.12} \newcommand*{\FBsupS}{0.65} - \newcommand*{\FB@lc}[1]{\lowercase{#1}} + \newcommand*{\FB@lc}[1]{\MakeLowercase{#1}} \DeclareRobustCommand*{\FB@up@fake}[1]{% \settoheight{\FB@Mht}{M}% \addtolength{\FB@Mht}{\FBsupR \FB@Mht}% @@ -530,7 +559,11 @@ \FB@enterFrenchtrue \fi } -\let\@aifORI\@afterindentfalse +\AtBeginDocument{\ifx\@afterindentfalse\@afterindenttrue + \let\@aifORI\@afterindenttrue + \else \let\@aifORI\@afterindentfalse + \fi +} \def\bbl@frenchindent{\let\@afterindentfalse\@afterindenttrue \@afterindenttrue} \def\bbl@nonfrenchindent{\let\@afterindentfalse\@aifORI @@ -547,6 +580,8 @@ \let\@footnotemark\@footnotemarkFB \fi}% } +\newcommand*{\dotFFN}{.} +\newcommand*{\kernFFN}{\kern .5em} \newdimen\parindentFFN \parindentFFN=10in \def\ftnISsymbol{\@fnsymbol\c@footnote} @@ -557,7 +592,7 @@ \rule\z@\footnotesep \setbox\@tempboxa\hbox{\@thefnmark}% \ifdim\wd\@tempboxa>\z@ - \llap{\@thefnmark}.\kern.5em + \llap{\@thefnmark}\dotFFN\kernFFN \fi #1 \fi}% \AtBeginDocument{\@ifpackageloaded{bigfoot}{}% @@ -623,7 +658,7 @@ \newif\ifFBIndentFirst \FBIndentFirstfalse \newif\ifFBFrenchFootnotes \FBFrenchFootnotesfalse \newif\ifFBAutoSpaceFootnotes \FBAutoSpaceFootnotesfalse -\newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue +\newif\ifFBOriginalTypewriter \FBOriginalTypewriterfalse \newif\ifFBThinColonSpace \FBThinColonSpacefalse \newif\ifFBThinSpaceInFrenchNumbers \FBThinSpaceInFrenchNumbersfalse \newif\ifFBFrenchSuperscripts \FBFrenchSuperscriptstrue @@ -667,13 +702,18 @@ \define@key{FB}{GlobalLayoutFrench}[true]% {\csname FBGlobalLayoutFrench#1\endcsname \ifFBGlobalLayoutFrench - \FBReduceListSpacingtrue - \FBCompactItemizetrue - \FBStandardItemLabelsfalse - \FBIndentFirsttrue - \FBFrenchFootnotestrue - \FBAutoSpaceFootnotestrue - \fi}% + \iflanguage{french}% + {\FBReduceListSpacingtrue + \FBCompactItemizetrue + \FBStandardItemLabelsfalse + \FBIndentFirsttrue + \FBFrenchFootnotestrue + \FBAutoSpaceFootnotestrue}% + {\PackageWarning{frenchb.ldf}% + {Option `GlobalLayoutFrench' skipped: + \MessageBreak French is *not* + babel's last option.\MessageBreak}}% + \fi}% \define@key{FB}{ReduceListSpacing}[true]% {\csname FBReduceListSpacing#1\endcsname}% \define@key{FB}{CompactItemize}[true]% @@ -709,6 +749,8 @@ {\csname FBAutoSpaceFootnotes#1\endcsname}% \define@key{FB}{AutoSpacePunctuation}[true]% {\csname FBAutoSpacePunctuation#1\endcsname}% + \define@key{FB}{OriginalTypewriter}[true]% + {\csname FBOriginalTypewriter#1\endcsname}% \define@key{FB}{ThinColonSpace}[true]% {\csname FBThinColonSpace#1\endcsname}% \define@key{FB}{ThinSpaceInFrenchNumbers}[true]% @@ -840,9 +882,15 @@ \addto\noextrasfrench{\bbl@nonfrenchindent}% \fi \ifFBAutoSpacePunctuation - \AutoSpaceBeforeFDP + \autospace@beforeFDP + \else + \noautospace@beforeFDP + \fi + \ifFBOriginalTypewriter \else - \NoAutoSpaceBeforeFDP + \let\ttfamily\ttfamilyFB + \let\rmfamily\rmfamilyFB + \let\sffamily\sffamilyFB \fi \ifFBThinColonSpace\renewcommand*{\Fcolonspace}{\thinspace}\fi \@ifpackageloaded{numprint}% @@ -907,6 +955,7 @@ FrenchFootnotes=false [true]\MessageBreak AutoSpaceFootnotes=false [true]\MessageBreak AutoSpacePunctuation=false [true]\MessageBreak + OriginalTypewriter=true [false]\MessageBreak ThinColonSpace=true [false]\MessageBreak ThinSpaceInFrenchNumbers=true [false]\MessageBreak FrenchSuperscripts=false [true]\MessageBreak diff --git a/Master/texmf-dist/tex/generic/babel/kurmanji.ldf b/Master/texmf-dist/tex/generic/babel/kurmanji.ldf new file mode 100644 index 00000000000..0d9353ed9ae --- /dev/null +++ b/Master/texmf-dist/tex/generic/babel/kurmanji.ldf @@ -0,0 +1,164 @@ +%% +%% This is file `kurmanji.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% kurmanji.dtx (with options: `code') +%% This is a generated file. +%% +%% Copyright 1989-2009 Johannes L. Braams and any individual authors +%% listed elsewhere in this file. All rights reserved. +%% +%% This file was generated from file(s) of the Babel system. +%% --------------------------------------------------------- +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% 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.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Johannes Braams. +%% +%% This file may only be distributed together with a copy of the Babel +%% system. You may however distribute the Babel system without +%% such generated files. +%% +%% The list of all files belonging to the Babel distribution is +%% given in the file `manifest.bbl'. See also `legal.bbl 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. +\ProvidesLanguage{kurmanji} + [2009/06/25 v1.1 Kurmanji support from the babel system] +%% Babel package for LaTeX version 2e +%% Copyright (C) 1989 -- 2009 +%% by Johannes Braams, TeXniek +%% Please report errors to: J.L. Braams +%% babel at braams.xs4all.nl +\LdfInit{kurmanji}{captionskurmanji} +\ifx\undefined\l@kurmanji + \@nopatterns{Kurmanji} + \adddialect\l@kurmanji0\fi +\bbl@declare@ttribute{kurmanji}{}{% + \expandafter\addto\expandafter\extraskurmanji + \expandafter{\extraskurmanji}% + \let\captionskurmanji\captionskurmanji + } +\providehyphenmins{kurmanji}{\tw@\tw@} +\def\captionskurmanji{% + \def\prefacename{Pe\c{s}gotin}% % Gotina Pe\c{s}\^i + \def\refname{Pirtuken bijart{\^\i}}% + \def\abstractname{Kurteb{\^\i}r}% % En\c{c}am + \def\bibname{\c{C}avkan{\^\i}ya Pirtukan}% + \def\chaptername{Ser\^e}% + \def\appendixname{Teb{\^\i}n{\^\i}ya}% + \def\contentsname{Nav\^erok}% % Navedank + \def\listfigurename{Hejmara Dimena}% + \def\listtablename{Hejmara Kevalen}% + \def\indexname{Endeks}% + \def\figurename{Dimen\^e}% % Weney\^e + \def\tablename{Kevala}% + \def\partname{B\^e\c{s}a}% + \def\enclname{Dumahik}% % Duvik + \def\ccname{Belavker}% + \def\headtoname{Ji bo}% % Ji ... re + \def\pagename{R\^upel\^e}% + \def\seename{bin\^era}% % bala xwe bida + \def\alsoname{le v\^eya ji bin\^era}% + \def\proofname{Del{\^\i}l}% + \def\glossaryname{\c{C}avkan{\^\i}ya l\^ekol{\^\i}n\^e}% +} +\def\datekurmanji{% + \def\today{\number\day.~\ifcase\month\or + \januaryname\or \februaryname\or \marchname\or \aprilname\or + \mayname\or \junename\or \julyname\or \augustname\or + \septembername\or \octobername\or \novembername\or + \decembername\or \@ctrerr\fi~\number\year}% + \def\ontoday{\number\day'\^e~\ifcase\month\or + \januaryname\or \februaryname\or \marchname\or \aprilname\or + \mayname\or \junename\or \julyname\or \augustname\or + \septembername\or \octobername\or \novembername\or + \decembername\or \@ctrerr\fi\^e~\number\year}% + \def\januaryname{\c{C}ileya Pa\c{s}{\^\i}n}% + \def\februaryname{Sibat}% + \def\marchname{Adar}% + \def\aprilname{N\^{\i}san}% + \def\mayname{Gulan}% + \def\junename{Hez{\^\i}ran}% + \def\julyname{T{\^\i}rmeh}% + \def\augustname{Tebax}% + \def\septembername{\^Ilon}% + \def\octobername{\c{C}iriya P\^e\c{s}{\^\i}n}% + \def\novembername{\c{C}iriya Pa\c{s}{\^\i}n}% + \def\decembername{\c{C}ileya P\^e\c{s}{\^\i}n}% +} +\def\datekurmanjialternate{% + \datekurmanji + \def\januaryname{R\^ebendan}% + \def\februaryname{Re\c{s}emih}% + \def\aprilname{Cotan}% % Avr\^el + \def\junename{P\^u\c{s}per}% + \def\augustname{Gelav\^ej}% + \def\septembername{Gelarezan}% % Rezber + \def\octobername{Kew\c{c}\^er}% + \def\novembername{Sermawez}% + \def\decembername{Berfandar}% +} +\def\datesymd{% + \def\today{\number\year-\two@digits\month-\two@digits\day}% + } +\def\datesdmy{% + \def\today{\number\day/\number\month\space\number\year}% + } +\def\dategdmy{% + \def\today{\number\day.\space\number\month.\space\number\year}% + } +\initiate@active@char{^} +\addto\extraskurmanji{\languageshorthands{kurmanji}} +\addto\extraskurmanji{\bbl@activate{^}} +\addto\noextraskurmanji{\bbl@deactivate{^}} +\declare@shorthand{system}{^}{\csname normal@char\string^\endcsname} +\declare@shorthand{kurmanji}{^c}{\c{c}\allowhyphens} +\declare@shorthand{kurmanji}{^C}{\c{C}\allowhyphens} +\declare@shorthand{kurmanji}{^e}{\^e\allowhyphens} +\declare@shorthand{kurmanji}{^E}{\^E\allowhyphens} +\declare@shorthand{kurmanji}{^i}{{\^\i}\allowhyphens} +\declare@shorthand{kurmanji}{^I}{\^I\allowhyphens} +\declare@shorthand{kurmanji}{^s}{\c{s}\allowhyphens} +\declare@shorthand{kurmanji}{^S}{\c{S}\allowhyphens} +\declare@shorthand{kurmanji}{^u}{\^u\allowhyphens} +\declare@shorthand{kurmanji}{^U}{\^U\allowhyphens} +\declare@shorthand{kurmanji}{^`}{\glqq} +\declare@shorthand{kurmanji}{^'}{\grqq} +\declare@shorthand{kurmanji}{^|}{\discretionary{-}{}{}\allowhyphens} +\addto\extraskurmanji{\bbl@frenchspacing} +\addto\noextraskurmanji{\bbl@nonfrenchspacing} + +\ldf@finish{kurmanji} +%% \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 \~} +%% +\endinput +%% +%% End of file `kurmanji.ldf'. diff --git a/Master/texmf-dist/tex/generic/babel/romanidx.sty b/Master/texmf-dist/tex/generic/babel/romanidx.sty index 2a8699d038c..851b5c370dd 100644 --- a/Master/texmf-dist/tex/generic/babel/romanidx.sty +++ b/Master/texmf-dist/tex/generic/babel/romanidx.sty @@ -7,7 +7,7 @@ %% spanish.dtx (with options: `indexes') %% This is a generated file. %% -%% Copyright 1989-2008 Johannes L. Braams and any individual authors +%% Copyright 1989-2009 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file was generated from file(s) of the Babel system. @@ -41,12 +41,12 @@ %% Copyright (C) 1989 - 2008 %% by Johannes Braams, TeXniek %% Spanish Language Definition File -%% Copyright (C) 1997 - 2008 -%% Javier Bezos (www.texytipografia.com) +%% Copyright (C) 1997 - 2009 +%% Javier Bezos (www.tex-tipografia.com) %% and -%% CervanTeX (www.cervantex.org) +%% CervanTeX (www.cervantex.es) %% Please report errors to: Javier Bezos (preferably) -%% www.texytipografia.com/contact.html +%% www.tex-tipografia.com %% J.L. Braams %% www.latex-project.org diff --git a/Master/texmf-dist/tex/generic/babel/spanish.ldf b/Master/texmf-dist/tex/generic/babel/spanish.ldf index 6096f5f220b..1dbbe470a69 100644 --- a/Master/texmf-dist/tex/generic/babel/spanish.ldf +++ b/Master/texmf-dist/tex/generic/babel/spanish.ldf @@ -7,7 +7,7 @@ %% spanish.dtx (with options: `code') %% This is a generated file. %% -%% Copyright 1989-2008 Johannes L. Braams and any individual authors +%% Copyright 1989-2009 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file was generated from file(s) of the Babel system. @@ -41,18 +41,18 @@ %% Copyright (C) 1989 - 2008 %% by Johannes Braams, TeXniek %% Spanish Language Definition File -%% Copyright (C) 1997 - 2008 -%% Javier Bezos (www.texytipografia.com) +%% Copyright (C) 1997 - 2009 +%% Javier Bezos (www.tex-tipografia.com) %% and -%% CervanTeX (www.cervantex.org) +%% CervanTeX (www.cervantex.es) %% Please report errors to: Javier Bezos (preferably) -%% www.texytipografia.com/contact.html +%% www.tex-tipografia.com %% J.L. Braams %% www.latex-project.org \ProvidesLanguage{spanish.ldf} - [2008/07/06 v5.0e Spanish support from the babel system] + [2009/01/02 v5.0h Spanish support from the babel system] \LdfInit{spanish}\captionsspanish \edef\es@savedcatcodes{% @@ -87,10 +87,12 @@ {}} \es@genoption{es-minimal} - {es-ucroman,es-noindentfirst,es-nosectiondot,es-nolists,% - es-noquoting,es-notilde,es-nodecimaldot} + {es-ucroman,es-noindentfirst,es-nosectiondot,es-noenumerate,% + es-noitemize,es-noquoting,es-notilde,es-nodecimaldot} {\spanishplainpercent \let\es@operators\relax} +\es@genoption{es-nolists} + {es-noenumerate,es-noitemize}{} \es@genoption{es-sloppy} {es-nolayout,es-noshorthands}{} \es@genoption{es-noshorthands} @@ -638,7 +640,7 @@ \es@a A\es@a E\es@a I\es@a O\es@a U% \es@declare{'n}{\~n}% \es@declare{'N}{\~N}% - \es@declare{''}{\textquotedblright}% + \es@declare{''}{''}% \let\es@pr@m@s\bbl@pr@m@s \def\bbl@pr@m@s{% \ifx'\@let@token @@ -715,22 +717,23 @@ K\or L\or M\or N\or \~N\or O\or P\or Q\or R\or S\or T\or U\or V\or W\or X\or Y\or Z\else\@ctrerr\fi}} -\es@optlayout{nolists}{% +\es@optlayout{noenumerate}{% \def\es@enumerate#1#2#3#4{% \es@enumdef{i}#1\@empty\@empty\@@ \es@enumdef{ii}#2\@empty\@empty\@@ \es@enumdef{iii}#3\@empty\@empty\@@ \es@enumdef{iv}#4\@empty\@empty\@@}% + \def\p@enumii{\theenumi}% + \def\p@enumiii{\p@enumii\theenumii}% + \def\p@enumiv{\p@enumiii\theenumiii}% + \expandafter\es@enumerate\es@enum} +\es@optlayout{noitemize}{% \def\es@itemize#1#2#3#4{% \def\labelitemi{\es@listquot#1}% \def\labelitemii{\es@listquot#2}% \def\labelitemiii{\es@listquot#3}% \def\labelitemiv{\es@listquot#4}}% - \def\p@enumii{\theenumi}% - \def\p@enumiii{\p@enumii\theenumii}% - \def\p@enumiv{\p@enumiii\theenumiii}% - \expandafter\es@enumerate\es@enum - \expandafter\es@itemize\es@item} + \expandafter\es@itemize\es@item} \let\esromanindex\@secondoftwo \es@ifoption{ucroman} {\def\es@romandef{% -- cgit v1.2.3