diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-spanish/README.md (renamed from Master/texmf-dist/doc/generic/babel-spanish/README) | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/babel-spanish/spanish.pdf | bin | 183022 -> 183267 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-spanish/spanish.dtx | 68 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-spanish/romanidx.sty | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf | 39 |
5 files changed, 88 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-spanish/README b/Master/texmf-dist/doc/generic/babel-spanish/README.md index 12cd1344bcf..13a0711375d 100644 --- a/Master/texmf-dist/doc/generic/babel-spanish/README +++ b/Master/texmf-dist/doc/generic/babel-spanish/README.md @@ -1,10 +1,10 @@ Spanish for babel 5.0n -================= +====================== This is the babel style for the Spanish language (5.0n). History -~~~~~~~ +------- 5.0a. 2007-02-21 Reimplemented in full, which some parts rewritten from scratch. Added @@ -50,5 +50,10 @@ New macros \spanishdate, \spanishDate, which format dates Mainly internal changes, using the new tools in babel 3.9 Fixed error with \foreignlanguage in tabular +5.0o. 2016-01-15 +New macro \spanishdatefirst +Fixed a bug when \alph reached tilde-n +Fixed \dotlessi with lua (but not \acute, yet) + ---------- -2014-04-24 +2016-01-15 diff --git a/Master/texmf-dist/doc/generic/babel-spanish/spanish.pdf b/Master/texmf-dist/doc/generic/babel-spanish/spanish.pdf Binary files differindex 96f7842cc1f..f057af362b4 100644 --- a/Master/texmf-dist/doc/generic/babel-spanish/spanish.pdf +++ b/Master/texmf-dist/doc/generic/babel-spanish/spanish.pdf diff --git a/Master/texmf-dist/source/generic/babel-spanish/spanish.dtx b/Master/texmf-dist/source/generic/babel-spanish/spanish.dtx index 4a028181e82..dec261a5700 100644 --- a/Master/texmf-dist/source/generic/babel-spanish/spanish.dtx +++ b/Master/texmf-dist/source/generic/babel-spanish/spanish.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 1997 - 2014 +% Copyright (C) 1997 - 2016 % Javier Bezos (www.tex-tipografia.com) % and % CervanTeX (www.cervantex.es) @@ -23,12 +23,12 @@ % \fi % % \ProvidesFile{spanish.dtx} -% [2014/04/24 v5.0n Spanish support from the babel system] +% [2016/01/15 v5.0o Spanish support from the babel system] %\iffalse %% File `spanish.dtx' % %% Spanish Language Definition File -%% Copyright (C) 1997 - 2014 +%% Copyright (C) 1997 - 2016 %% Javier Bezos (www.tex-tipografia.com) %% and %% CervanTeX (www.cervantex.es) @@ -118,7 +118,7 @@ \title{Estilo \textsf{spanish}\\ para el sistema \babel.\footnote{Este archivo está actualmente -en la versión 5.0n con fecha 24 de abril del 2014. ^^A@# +en la versión 5.0no con fecha 15 de enero del 2016. ^^A@# Esta copia del manual se compuso el~\today.}} \author{Javier Bezos\footnote{Por favor, envíen comentarios y @@ -128,7 +128,7 @@ sus comentarios y sugerencias; en particular, han sido muy activos Juan Luis Varona y José Luis Rivera. Para información sobre actualizaciones: http://www.cervantex.es/}} -\date{24 de abril del 2014} ^^A@# +\date{15 de enero del 2016} ^^A@# \maketitle @@ -463,6 +463,13 @@ justo lo contrario (predeterminado). Cambia el formato de |\today| a la forma \textit{enero 1 del 2004.} Con |\Today| el mes va en mayúscula. +\begin{decl} +\con |\spanishdatefirst|\marg{día-uno} +\end{decl} + +Establece el formato del primer día. Por defecto es \textit{1}, pero +se puede cambiar a \textit{1.º}, por ejemplo. + \section{Abreviaciones (\textit{shorthands})} La lista completa se puede encontrar en el cuadro 2. En los @@ -1259,7 +1266,7 @@ Trigg, Madrid, Alianza, 1987, t.~2, págs.~1423~-1451. \section{The Spanish language} The file \file{spanish.dtx}\footnote{The file described in this -section has version number 5.0n and was last revised on 2014-04-24. +section has version number 5.0o and was last revised on 2016-01-15. The maintainer from v4.0 on is Javier Bezos (http://www.tex-tipografia.com). Previous versions were made by Julio S\'anchez. The English documentation has been improved by José Luis @@ -1552,13 +1559,15 @@ previous behavior and macros for backwards compatibility. % \changes{spanish~5.0n}{2014/04/14}{Check font name in \cs{dotlessi}}} % \changes{spanish~5.0n}{2014/04/23}{Added \cs{spanishdate} and % \cs{spanishDate}} +% \changes{spanish~5.0o}{2016/01/14}{Added \cs{spanishdate} and +% \cs{spanishDate}} % % This file is (hopefully) for both \LaTeXe{} and Plain formats. % % \begin{macrocode} %<*code> \ProvidesLanguage{spanish.ldf} - [2014/04/24 v5.0n Spanish support from the babel system] + [2016/01/15 v5.0o Spanish support from the babel system] \LdfInit{spanish}\captionsspanish \edef\es@savedcatcodes{% @@ -1716,9 +1725,19 @@ previous behavior and macros for backwards compatibility. \newcommand\spanishDate{\es@date{uc}} \def\es@date#1#2#3#4{% \ifcase\es@datefmt - \number#4~de \csname#1month\romannumeral#3name\endcsname + \ifnum#4=1 + \es@datefirst + \else + \number#4\relax + \fi + ~de \csname#1month\romannumeral#3name\endcsname \else - \csname#1month\romannumeral#3name\endcsname~\number#4\relax + \csname#1month\romannumeral#3name\endcsname~% + \ifnum#4=1 + \es@datefirst + \else + \number#4\relax + \fi \fi \ de% \ifnum#2>1999\relax\es@yearl @@ -1730,6 +1749,8 @@ previous behavior and macros for backwards compatibility. \def\spanishdatedel{\def\es@yearl{l}} \def\spanishdatede{\let\es@yearl\@empty} \spanishdatede +\def\spanishdatefirst{\def\es@datefirst} +\spanishdatefirst{1} % \end{macrocode} % % The basic macros to select the language in the preamble or the @@ -1921,6 +1942,8 @@ previous behavior and macros for backwards compatibility. % we need |\i|, which is forbidden in math mode. |\dotlessi| must % be converted to uppercase if necessary in \LaTeXe. There are two % versions, depending on the format. +% \changes{spanish~5.0o}{2016/01/10}{Fixed EUx: deal with them +% separately, to be improved} % % \begin{macrocode} \addto\mathspanish{\es@sDRC\dotlessi{\es@dotlessi}} @@ -1932,6 +1955,9 @@ previous behavior and macros for backwards compatibility. \fi \ifes@latex + \@ifundefined{Umathchardef}{}% + {\expandafter\Umathchardef\csname es@EU1@dotlessi\endcsname"7"1"0131\relax + \expandafter\Umathchardef\csname es@EU2@dotlessi\endcsname"7"1"0131\relax}% \def\es@dotlessi{% \ifmmode {\ifnum\mathgroup=\m@ne @@ -1951,11 +1977,13 @@ previous behavior and macros for backwards compatibility. {Find where this font has been (re)defined, and fix it.}% \def\f@encoding{OT1}% \fi - \@ifundefined{\f@encoding\string\i}% - {\edef\f@encoding{\string?}}{}% - \expandafter\count@\the\csname\f@encoding\string\i\endcsname - \advance\count@"7000 - \mathchar\count@ + \@ifundefined{es@\f@encoding @dotlessi}% + {\@ifundefined{\f@encoding\string\i}% + {\edef\f@encoding{\string?}}{}% + \expandafter\count@\the\csname\f@encoding\string\i\endcsname + \advance\count@"7000 + \mathchar\count@}% + {\csname es@\f@encoding @dotlessi\endcsname}% \fi}% \else \i @@ -1982,7 +2010,7 @@ previous behavior and macros for backwards compatibility. % Operators are stored in |\es@operators|, which is % included in the math group. Since |\operator@font| is % defined in \LaTeXe{} only, we define it in the plain variant. -% \changes{spanish~5.0n}{2014-03-28}{tabular didn't liked the +% \changes{spanish~5.0n}{2014-03-28}{tabular didn't like the % ampersand used in tests. Replaced by double backslash.} % % \begin{macrocode} @@ -2322,6 +2350,10 @@ previous behavior and macros for backwards compatibility. % turned into a double right quote} % \changes{spanish~5.0g}{2008/07/20}{Fixed bad kerning before two % acutes} +% \changes{spanish~5.0g}{2008/07/20}{Fixed bad kerning before two +% acutes} +% \changes{spanish~5.0o}{2015/12/14}{Fixed typo in \cs{numberline} (\cs{if} +% to \cs{ifx})} % % \begin{macrocode} \begingroup @@ -2444,7 +2476,7 @@ previous behavior and macros for backwards compatibility. \@afterindenttrue} \es@optlayout{nosectiondot}{% \def\@seccntformat#1{\csname the#1\endcsname.\quad}% - \def\numberline#1{\hb@xt@\@tempdima{#1\if&\else.\fi\hfil}}} + \def\numberline#1{\hb@xt@\@tempdima{#1\ifx&\else.\fi\hfil}}} \es@ifoption{nolayout}{\let\layoutspanish\relax}{} \es@ifoption{sloppy}{\let\textspanish\relax\let\mathspanish\relax}{} \es@ifoption{delayed}{}{\def\es@layoutspanish{\layoutspanish}} @@ -2474,6 +2506,8 @@ previous behavior and macros for backwards compatibility. % % After restoring the catcode of |~| and setting the minimal % values for hyphenation, the |.ldf| is finished. +% \changes{spanish~5.0o}{2015/12/14}{Misplaced line -- activatequoting +% must precede \cs{ldf@finish}} % % \begin{macrocode} \es@savedcatcodes @@ -2481,8 +2515,8 @@ previous behavior and macros for backwards compatibility. \ifes@latex\else \es@select \fi -\ldf@finish{spanish} \csname activatequoting\endcsname +\ldf@finish{spanish} %</code> % \end{macrocode} % That's all in the main file. diff --git a/Master/texmf-dist/tex/generic/babel-spanish/romanidx.sty b/Master/texmf-dist/tex/generic/babel-spanish/romanidx.sty index f00e9dac35b..32d25215497 100644 --- a/Master/texmf-dist/tex/generic/babel-spanish/romanidx.sty +++ b/Master/texmf-dist/tex/generic/babel-spanish/romanidx.sty @@ -29,7 +29,7 @@ %% extension .ins) which are part of the distribution. %% File `spanish.dtx' %% Spanish Language Definition File -%% Copyright (C) 1997 - 2014 +%% Copyright (C) 1997 - 2016 %% Javier Bezos (www.tex-tipografia.com) %% and %% CervanTeX (www.cervantex.es) diff --git a/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf b/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf index d7756d03f72..51b105d47a9 100644 --- a/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf +++ b/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf @@ -29,14 +29,14 @@ %% extension .ins) which are part of the distribution. %% File `spanish.dtx' %% Spanish Language Definition File -%% Copyright (C) 1997 - 2014 +%% Copyright (C) 1997 - 2016 %% Javier Bezos (www.tex-tipografia.com) %% and %% CervanTeX (www.cervantex.es) %% Please report errors to: Javier Bezos (preferably) %% www.tex-tipografia.com \ProvidesLanguage{spanish.ldf} - [2014/04/24 v5.0n Spanish support from the babel system] + [2016/01/15 v5.0o Spanish support from the babel system] \LdfInit{spanish}\captionsspanish \edef\es@savedcatcodes{% @@ -175,9 +175,19 @@ \newcommand\spanishDate{\es@date{uc}} \def\es@date#1#2#3#4{% \ifcase\es@datefmt - \number#4~de \csname#1month\romannumeral#3name\endcsname + \ifnum#4=1 + \es@datefirst + \else + \number#4\relax + \fi + ~de \csname#1month\romannumeral#3name\endcsname \else - \csname#1month\romannumeral#3name\endcsname~\number#4\relax + \csname#1month\romannumeral#3name\endcsname~% + \ifnum#4=1 + \es@datefirst + \else + \number#4\relax + \fi \fi \ de% \ifnum#2>1999\relax\es@yearl @@ -189,6 +199,8 @@ \def\spanishdatedel{\def\es@yearl{l}} \def\spanishdatede{\let\es@yearl\@empty} \spanishdatede +\def\spanishdatefirst{\def\es@datefirst} +\spanishdatefirst{1} \def\selectspanish{% \def\selectspanish{% \def\selectspanish{% @@ -332,6 +344,9 @@ \fi \ifes@latex + \@ifundefined{Umathchardef}{}% + {\expandafter\Umathchardef\csname es@EU1@dotlessi\endcsname"7"1"0131\relax + \expandafter\Umathchardef\csname es@EU2@dotlessi\endcsname"7"1"0131\relax}% \def\es@dotlessi{% \ifmmode {\ifnum\mathgroup=\m@ne @@ -351,11 +366,13 @@ {Find where this font has been (re)defined, and fix it.}% \def\f@encoding{OT1}% \fi - \@ifundefined{\f@encoding\string\i}% - {\edef\f@encoding{\string?}}{}% - \expandafter\count@\the\csname\f@encoding\string\i\endcsname - \advance\count@"7000 - \mathchar\count@ + \@ifundefined{es@\f@encoding @dotlessi}% + {\@ifundefined{\f@encoding\string\i}% + {\edef\f@encoding{\string?}}{}% + \expandafter\count@\the\csname\f@encoding\string\i\endcsname + \advance\count@"7000 + \mathchar\count@}% + {\csname es@\f@encoding @dotlessi\endcsname}% \fi}% \else \i @@ -777,7 +794,7 @@ \@afterindenttrue} \es@optlayout{nosectiondot}{% \def\@seccntformat#1{\csname the#1\endcsname.\quad}% - \def\numberline#1{\hb@xt@\@tempdima{#1\if&\else.\fi\hfil}}} + \def\numberline#1{\hb@xt@\@tempdima{#1\ifx&\else.\fi\hfil}}} \es@ifoption{nolayout}{\let\layoutspanish\relax}{} \es@ifoption{sloppy}{\let\textspanish\relax\let\mathspanish\relax}{} \es@ifoption{delayed}{}{\def\es@layoutspanish{\layoutspanish}} @@ -802,8 +819,8 @@ \ifes@latex\else \es@select \fi -\ldf@finish{spanish} \csname activatequoting\endcsname +\ldf@finish{spanish} \endinput %% %% End of file `spanish.ldf'. |