xcharter (10aug17)

git-svn-id: svn://tug.org/texlive/trunk@45006 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 31 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/fonts/xcharter/README b/Master/texmf-dist/doc/fonts/xcharter/README
index 7e02ce37fb1..96a1b8cf69c 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/README
+++ b/Master/texmf-dist/doc/fonts/xcharter/README
@@ -1,6 +1,6 @@
 				XCharter Fonts
 				Michael Sharpe
-				2017-06-30
+				2017-08-09
 
 This package is an extension of Bitstream Charter, whose original license is reproduced below, as required under the terms of that license. The extension provides small caps, oldstyle figures and superior figures in all four styles, accompanied by LaTeX font support files. The font files themselves are  in otf and pfb formats. The fonts are licensed as Free fonts under the same terms as the original from Bitstream. All other support files are subject to the LaTeX Project Public License. See 
 http://www.ctan.org/license/lppl1.3
@@ -22,7 +22,11 @@ Original Bitstream Free font license:
 The font modifications are Copyright (c) 2009--2012, Andrey Panov; Copyright (c) 2013--2017, Michael Sharpe.
 
 
-Current version: 1.093 2017-07-11
+Current version: 1.094 2017-08-09
+
+Changes in version 1.093
+1. Modified handling of the sups option when using KOMA classes.
+2. Changed \textnu to \textnumerator to avoid conflict with babel greek, though \textnu will be available as an abbreviation in other cases. (Thanks, Enrico Gregorio.)
 
 Changes in version 1.093
 Corrected OT1XCharter-TLF.fd, missing Greek in update to 1.09.
diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
index 2d8faa34851..74403233506 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
index 879ffb6654a..fc58b04be04 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
+++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
@@ -37,7 +37,7 @@ Support files are provided for T$1$, TS$1$, LY$1$, T$2$A and OT$2$ encodings, th
 \item {\tt lining} (or just {\tt lf}) makes lining figures ($0123456789$) the default for text---this is set automatically and does not need to be entered explicitly;
 \item {\tt oldstyle} (or {\tt osf}) sets the figure style in text mode to oldstyle (\textosf{0123456789}) with numeral one like a shortened  $1$, but math mode will always use lining figures;
 \item {\tt oldstyleI} (or {\tt osfI}) sets the figure style in text mode to oldstyle (\textosfI{0123456789}) with numeral one like a shortened I, but math mode will always use lining figures;
-\item {\tt sups} sets the style for superscript figures (eg, footnote markers) to XCharter's superior figures rather than using the default text inserts in mathematical superscripts.
+\item {\tt sups} sets the style for superscript figures (eg, footnote markers) to XCharter's superior figures rather than using the default text inserts in mathematical superscripts. This option has no effect if a KOMA class is in force.
 \item {\tt scosf} makes oldstyle figures the default in small cap text, no matter what the global figure setting may be.
 \end{itemize}
 
@@ -53,7 +53,7 @@ Support files are provided for T$1$, TS$1$, LY$1$, T$2$A and OT$2$ encodings, th
 \item \verb|{\osfstyle 23}| prints \textosf{23} using whatever oldstyle option is in force. 
 \item \verb|\textosf| prints its argument in oldstyle figures using, in effect, the {\tt osf} option---e.g., \verb|\textosf{12}| results in \textosf{12}. 
 \item \verb|\textosfI| prints its argument in oldstyle figures using, in effect, the {\tt osfI} option---e.g., \verb|\textosfI{12}| results in \textosfI{12}. 
-\item Numerators and denominators are normally used only for constructing fractions, but may if needed be called using \verb|\textnu| and \verb|\textde|. They are about 7\% smaller than superiors and inferiors. The \verb|\textfrac| macro allows you to write, e.g.,  \verb|\textfrac{31}{32}| to get \textfrac{31}{32}. 
+\item Numerators and denominators are normally used only for constructing fractions, but may if needed be called using \verb|\textnumerator| and \verb|\textdenominator|. They are about 7\% smaller than superiors and inferiors. The \verb|\textfrac| macro allows you to write, e.g.,  \verb|\textfrac{31}{32}| to get \textfrac{31}{32}. You may use \verb|\textde| and \verb|\textnu| as abbreviations, though the latter will not be available if {\tt babel} is loaded with {\tt greek} option.
 
 \end{itemize}
 
diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
index fe69e3be7b3..efbded30235 100644
--- a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
+++ b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
@@ -3,8 +3,8 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 
-\def\fileversion{1.09}
-\def\filedate{2017/06/25}
+\def\fileversion{1.094}
+\def\filedate{2017/08/08}
 
 \ProvidesPackage{XCharter}[\filedate\space v\fileversion]
 
@@ -34,18 +34,18 @@
     \fa@naming@exception{figures}{{numerators}{tabular}}{Numr}
     \def\nufigures{\@nomath\nufigures%
         \fontfigurestyle{numerators}\selectfont}
-    \DeclareTextFontCommand{\textnu}{\nufigures}
-    \let\textnumerator\textnu
+    \DeclareTextFontCommand{\textnumerator}{\nufigures}
+    %\let\textnu\textnumerator --- conflict with babel greek
 
     \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
     \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
     \def\defigures{\@nomath\defigures%
         \fontfigurestyle{denominators}\selectfont}
-    \DeclareTextFontCommand{\textde}{\defigures}
-    \let\textdenominator\textde
+    \DeclareTextFontCommand{\textdenominator}{\defigures}
+    \let\textde\textdenominator
 }{}
 \providecommand*{\textfrac}[2]{%
-	\textnu{#1}\kern0em\textfractionsolidus\kern0em\textde{#2}}
+	\textnumerator{#1}\kern0em\textfractionsolidus\kern0em\textdenominator{#2}}
 \DeclareRobustCommand{\lfstyle}{%
   \not@math@alphabet\lfstyle\relax
   \fontfamily{XCharter-TLF}\selectfont }
@@ -126,9 +126,23 @@
 {\fontfamily{XCharter-TOsF}\fontshape{sc}\selectfont #1}%
 }\fi% use OsF in small caps
 
+\newif\ifxch@KOMA
+\@ifundefined{KOMAClassName}{}{\xch@KOMAtrue}
+\@ifundefined{ver@scrextend.sty}{}{\xch@KOMAtrue}
 
 \if@XCh@sups %
- \ifdefined\sufigures
+  \ifxch@KOMA %
+    %\message{KOMA}
+%    \AtEndPreamble{%
+%    	\gdef\@textsuperscript#1{\textsu{#1}}
+		%\show\@textsuperscript
+%		\@ifpackageloaded{authblk}{%
+%        	\renewcommand\AB@authnote[1]{\textsuperscript{#1}}
+%        	\renewcommand\AB@affilnote[1]{\textsuperscript{#1}}
+%    }%
+%  }%  
+  \else % not KOMA
+% \ifdefined\sufigures
   \def\f@@tn@te{footnote}
   \def\@makefnmark{%
     \ifx\@mpfn\f@@tn@te%not in a minipage
@@ -152,6 +166,7 @@
 %	\normalfont
 %\else
     \AtEndPreamble{%
+\@ifundefined{textnu}{\let\textnu\textnumerator}{}%
 \renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle}
 \normalfont}
 %\fi