summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic/babel-spanish
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-30 22:58:02 +0000
committerKarl Berry <karl@freefriends.org>2014-01-30 22:58:02 +0000
commitb7426af2394557101ccd2f4e36832854844d45bc (patch)
tree666f001c97d25f245afc4bb279d267ca996606be /Master/texmf-dist/source/generic/babel-spanish
parentf9b6fc357ce2d792bde2938759b2c77efd98c6d1 (diff)
babel-spanish (30jan14)
git-svn-id: svn://tug.org/texlive/trunk@32825 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic/babel-spanish')
-rw-r--r--Master/texmf-dist/source/generic/babel-spanish/spanish.dtx78
-rw-r--r--Master/texmf-dist/source/generic/babel-spanish/spanish.ins8
2 files changed, 54 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/generic/babel-spanish/spanish.dtx b/Master/texmf-dist/source/generic/babel-spanish/spanish.dtx
index 244d7ab2adb..9b6dd6c803b 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 1989-2011 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -16,7 +16,7 @@
%
% This work has the LPPL maintenance status "maintained".
%
-% The Current Maintainer of this work is Johannes Braams.
+% The Current Maintainer of this work is Javier Bezos
%
% The list of all files belonging to the Babel system is
% given in the file `manifest.bbl. See also `legal.bbl' for additional
@@ -26,24 +26,20 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
+%
% \ProvidesFile{spanish.dtx}
-% [2010/05/23 v5.0j Spanish support from the babel system]
+% [2014/01/29 v5.0m Spanish support from the babel system]
%\iffalse
%% File `spanish.dtx'
-%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2008
-%% by Johannes Braams, TeXniek
%
%% Spanish Language Definition File
-%% Copyright (C) 1997 - 2010
+%% Copyright (C) 1997 - 2014
%% Javier Bezos (www.tex-tipografia.com)
%% and
%% CervanTeX (www.cervantex.es)
%
%% Please report errors to: Javier Bezos (preferably)
%% 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.
@@ -138,7 +134,7 @@
% \title{Estilo \textsf{spanish}\\
% para el sistema \babel.\footnote{Este
% archivo está actualmente en la versión
-% 5.0j con fecha 23 de mayo del 2010. ^^A@#
+% 5.0m con fecha 29 de enero del 2014. ^^A@#
% Esta copia del manual se compuso el~\today.}}
%
% \author{Javier Bezos\footnote{Por favor, envíen comentarios y
@@ -150,7 +146,7 @@
% \textit{Tipografía española con \TeX.} Para información sobre
% actualizaciones: http://www.cervantex.es/}}
%
-% \date{23 de mayo del 2010} ^^A@#
+% \date{29 de enero del 2014} ^^A@#
%
% \maketitle
%
@@ -990,7 +986,6 @@
% |$V_{\mathbf{cr\acute{\dotlessi}t}}$| da
% $V_{\mathbf{cr\acute{\dotlessi}t}}$.
%
-%
% \section{Opciones generales}
%
% Están pensadas principalmente para documentos basados en una clase
@@ -1561,13 +1556,14 @@
%
% \item The macro |\Today| gives months in uppercase.
%
-% \item The macros |\spanish|\textit{caption} change the value of the \emph{caption}
-% automatically (no need to add an |\addto|).
+% \item The macros |\spanish|\textit{caption} change the value of the
+% \emph{caption} automatically (no need to add an |\addto|).
%
% \item The command |\spanishdeactivate|\marg{characters} disables the
-% shorthand characters listed in the argument. Elegible characters
-% are the set |.'"~<>|. These shorthand characters may be globally
-% deactivated for Spanish adding this command to |\shorthandsspanish|.
+% shorthand characters listed in the argument. Elegible characters
+% are the set |.'"~<>|. These shorthand characters may be globally
+% deactivated for Spanish adding this command to
+% |\shorthandsspanish|.
%
% \item Extras are divided in groups controlled by the commands
% |\textspanish|, |\mathspanish|, |\shorthandsspanish| y
@@ -1647,13 +1643,20 @@
% babel doesn't restore it after french}
% \changes{spanish~5.0j}{2010/05/08}{Changed order of tests in
% shorthands, to fix a bug with ifthen}
+% \changes{spanish~5.0k}{2011/08/08}{When saving ., check if
+% \cs{mathcode} is 8000}
+% \changes{spanish~5.0l}{2013/04/11}{Support for babel modifiers}
+% \changes{spanish~5.0m}{2014/01/29}{\cs{S@}size surrounded by
+% \cs{globalsdef} to avoid global changes in the size}
+% \changes{spanish~5.0m}{2014/01/29}{Execute the first \cs{bbl@allowhyphens}
+% in \cs{es@accent} only in horizontal mode}
%
% This file is for both \LaTeXe{} and Plain formats.
%
% \begin{macrocode}
%<*code>
\ProvidesLanguage{spanish.ldf}
- [2010/05/23 v5.0j Spanish support from the babel system]
+ [2014/01/29 v5.0m Spanish support from the babel system]
\LdfInit{spanish}\captionsspanish
\edef\es@savedcatcodes{%
@@ -1717,8 +1720,11 @@
\def\rquotiii{\guillemotright{}}}
\def\es@ifoption#1#2#3{%
- \DeclareOption{es-#1}{}%
- \@ifpackagewith{babel}{es-#1}{#2}{#3}}%
+ \@ifundefined{BabelModifiers}%
+ {\DeclareOption{es-#1}{}%
+ \@ifpackagewith{babel}{es-#1}{#2}{#3}}
+ {\@expandtwoargs\in@{,#1,}{,\BabelModifiers,}%
+ \ifin@#2\else#3\fi}}
\def\es@optlayout#1#2{\es@ifoption{#1}{}{\addto\layoutspanish{#2}}}
@@ -1821,7 +1827,7 @@
% \end{macrocode}
%
% Instead of joining all the extras directly in |\extrasspanish|,
-% we subdivide them in three further groups.
+% we subdivide them in three further groups.
%
% \begin{macrocode}
\def\extrasspanish{%
@@ -1861,7 +1867,9 @@
\def\es@sptext#1{%
{\es@orddot
\setbox\z@\hbox{8}\dimen@\ht\z@
+ \globaldefs\m@ne
\csname S@\f@size\endcsname
+ \globaldefs\z@
\edef\@tempa{\def\noexpand\@tempc{#1}%
\lowercase{\def\noexpand\@tempb{#1}}}\@tempa
\ifx\@tempb\@tempc
@@ -2144,7 +2152,8 @@
\def\es@spdeactivate#1{%
\if.#1%
- \mathcode`\.=\es@period@code
+ \mathcode`\.=\es@period@math\relax
+ \begingroup\lccode`\~=`\.\lowercase{\endgroup\let~\es@period@code}%
\else
\begingroup
\lccode`\~=`#1
@@ -2200,13 +2209,13 @@
\def\es@accent#1#2#3{%
\expandafter\@text@composite
\csname OT1\string#1\endcsname#3\@empty\@text@composite
- {\bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
+ {\ifhmode\bbl@allowhyphens\fi\add@accent{#2}{#3}\bbl@allowhyphens
\setbox\@tempboxa\hbox{#3%
\global\mathchardef\accent@spacefactor\spacefactor}%
\spacefactor\accent@spacefactor}}
\else
\def\es@accent#1#2#3{%
- \bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
+ \ifhmode\bbl@allowhyphens\fi\add@accent{#2}{#3}\bbl@allowhyphens
\spacefactor\sfcode`#3 }
\fi
@@ -2296,21 +2305,32 @@
\decimalcomma
\es@ifoption{nodecimaldot}{}
{\AtBeginDocument{\bgroup\@fileswfalse}%
- \es@set@shorthand{.}%
+ \begingroup\lccode`\~=`\.\lowercase{\endgroup
+ \let\es@period@code~%
+ \es@set@shorthand{.}%
+ \let~\es@period@code}%
\AtBeginDocument{\egroup}%
\@namedef{normal@char\string.}{%
\@ifnextchar\egroup
- {\mathchar\es@period@code\relax}%
+ {\es@period@code}%
{\csname active@char\string.\endcsname}}%
- \declare@shorthand{system}{.}{\mathchar\es@period@code\relax}%
+ \declare@shorthand{system}{.}{\es@period@code}%
\addto\shorthandsspanish{%
- \mathchardef\es@period@code\the\mathcode`\.%
\babel@savevariable{\mathcode`\.}%
- \mathcode`\.="8000 %
+ \edef\es@period@math{\the\mathcode`\.}%
+ \babel@save\es@period@code
+ \ifnum\es@period@math="8000
+ \begingroup\lccode`\~=`\.\lowercase{\endgroup\let\es@period@code~}%
+ \else
+ \mathchardef\es@period@code\es@period@math\relax
+ \mathcode`\.="8000 %
+ \fi
+ \begingroup\lccode`\~=`\.\lowercase{\endgroup\babel@save~}%
\es@activate{.}}%
\def\es@a#1{\es@declare{.#1}{\es@decimal#1}}%
\es@a1\es@a2\es@a3\es@a4\es@a5\es@a6\es@a7\es@a8\es@a9\es@a0}
+
\es@ifoption{notilde}{}{\es@set@shorthand{~}}
\def\deactivatetilden{%
\expandafter\let\csname spanish@sh@\string~@n@\endcsname\relax
diff --git a/Master/texmf-dist/source/generic/babel-spanish/spanish.ins b/Master/texmf-dist/source/generic/babel-spanish/spanish.ins
index d643bded1b1..bd7876dde6d 100644
--- a/Master/texmf-dist/source/generic/babel-spanish/spanish.ins
+++ b/Master/texmf-dist/source/generic/babel-spanish/spanish.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2011 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -35,6 +35,8 @@
\def\filedate{2007/02/21}
\input docstrip.tex
+\tracingmacros2
+
{\ifx\generate\undefined
\Msg{**********************************************}
\Msg{*}
@@ -53,7 +55,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2011 Johannes L. Braams and any individual authors
+Copyright 1989-2008 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 +89,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2011 Johannes L. Braams and any individual authors
+Copyright 1989-2008 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.