From 27935810e559fc26a31c53cda9c8b85d60f3a595 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 2 Mar 2013 22:38:51 +0000 Subject: spanglish (2mar13) git-svn-id: svn://tug.org/texlive/trunk@29272 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/spanglish/spanglish.ldf | 38 +++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/Master/texmf-dist/tex/latex/spanglish/spanglish.ldf b/Master/texmf-dist/tex/latex/spanglish/spanglish.ldf index 25bc5dfc15c..12d859ef987 100644 --- a/Master/texmf-dist/tex/latex/spanglish/spanglish.ldf +++ b/Master/texmf-dist/tex/latex/spanglish/spanglish.ldf @@ -28,14 +28,14 @@ %% %% \changes{2010/12/28}{Release version, from 2007/01/26 code} \ProvidesLanguage{spanglish} - [2010/12/28 v0.1 Spanglish: simple Spanish support] + [2013/03/01 v0.1a Spanglish: simple Spanish support] \LdfInit{spanglish}\captionsspanglish \ifx\l@spanglish\@undefined \ifx\l@spanish\@undefined \@nopatterns{spanglish} \adddialect\l@spanglish0\fi \adddialect\l@spanglish\l@spanish\fi -\def\LaTeXeFmtName{LaTeX2e} +% \addto\captionsspanglish{% \def\prefacename{Prefacio}% \def\refname{Referencias}% @@ -59,6 +59,7 @@ \def\proofname{Demostraci\'on}% \def\glossaryname{Glosario}% } +% \def\datespanglish{% \def\today{\number\day\space de \ifcase\month\or enero\or febrero\or marzo\or abril\or mayo\or junio\or @@ -66,6 +67,12 @@ \space de \number\year}} \addto\extrasspanglish{\bbl@frenchspacing} \addto\noextrasspanglish{\bbl@nonfrenchspacing} +% +\newif\ifxp@latex +\@ifundefined{documentclass} + {\xp@latexfalse} + {\xp@latextrue} +% \addto\extrasspanglish{\languageshorthands{spanglish}} \initiate@active@char{"} \addto\extrasspanglish{% @@ -104,7 +111,7 @@ {}{R}\bbl@allowhyphens} \declare@shorthand{spanglish}{"<}{\guillemotleft{}} \declare@shorthand{spanglish}{">}{\guillemotright{}} -\ifx\fmtname\LaTeXeFmtName% this code, by javier bezos (jb) +\ifxp@latex% this code, by javier bezos (jb) \DeclareTextCommand{\guillemotleft}{OT1}{% \ifmmode\ll \else @@ -141,7 +148,7 @@ \def\xp@plain@esabrv#1{.$^{{\rm #1}}$} \def\xp@ltx@esabrv#1{.\textsuperscript{#1}} \def\xp@esabrv@r#1#2{\esabrv{#1#2}}% nice trick by Bezos -\ifx\fmtname\LaTeXeFmtName +\ifxp@latex \addto\extrasxpanish{\let\esabrv=\xp@ltx@esabrv} \else \addto\extrasxpanish{\let\esabrv=\xp@plain@esabrv} @@ -179,15 +186,10 @@ \babel@save{\-}% \def\-{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens}} % the following code from spanish.ldf 5.x, by Bezos -\@ifundefined{documentclass} - {\let\ifxp@latex\iffalse} - {\let\ifxp@latex\iftrue} -\ifxp@latex % +\ifxp@latex \addto\mathspanglish{\xp@sdef\dotlessi{\protect\xp@dotlessi}} \let\nomathspanglish\relax -% -\ifxp@latex \def\xp@texti{\i} \addto\@uclclist{\dotlessi\xp@texti} \fi @@ -215,6 +217,7 @@ \def\xp@dotlessi{\textormath{\i}{\mathchar"7010}} \fi % +\ifxp@latex \def\accentedoperators{% \def\xp@op@ac##1{\acute{\if i##1\dotlessi\else##1\fi}}} \def\unaccentedoperators{% @@ -225,9 +228,10 @@ \spacedoperators \addto\mathspanglish{\xp@operators} % -\ifxp@latex\else +\else \let\operator@font\rm \fi +% \def\xp@operators{% \xp@sdef\bmod{\nonscript\mskip-\medmuskip\mkern5mu \mathbin{\operator@font m\xp@op@ac od}\penalty900\mkern5mu @@ -279,8 +283,8 @@ 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} } -\ifx\fmtname\LaTeXeFmtName% -%\ifes@LaTeXe %<<<<<< again, by Bezos +% +\ifxp@latex \addto\textspanish{% \babel@save\lsc \def\lsc{\protect\xp@lsc}} @@ -293,13 +297,15 @@ \csname\curr@fontshape/\f@size\endcsname \csname S@\f@size\endcsname \fontsize\sf@size\z@\selectfont - \PackageInfo{spanish}{Replacing undefined sc font\MessageBreak + \PackageInfo{spanglish}{Replacing undefined sc font\MessageBreak shape by faked small caps}% \MakeUppercase{#1}% \else \MakeLowercase{#1}% \fi}} -%\fi %<<<<<< +\fi + %<<<<<< +\ifxp@latex \def\spanglishlayout{% nothing fancy \def\theenumii{\alph{enumii}} \def\theenumiii{\arabic{enumiii}} @@ -323,7 +329,7 @@ \RequirePackage{esindex}% \def\bbl@tempa{spanglish}% \ifx\bbl@main@language\bbl@tempa% - \AtBeginDocument{\spanglishlayout}% + \AtBeginDocument{\spanglishlayout}\fi% } \fi %% -- cgit v1.2.3