xcharter (14mar15)

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

4 files changed, 37 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/fonts/xcharter/README b/Master/texmf-dist/doc/fonts/xcharter/README
index 4fad8d196fc..fddad89defe 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
-				2015-02-20
+				2015-03-14
 
 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,10 @@ Original Bitstream Free font license:
 The font modifications are Copyright (c) 2013--2015, Michael Sharpe.
 
 
-Current version: 1.072
+Current version: 1.073
+
+Changes in version 1.073
+Modified XCharter.sty to detect babel usage and change behavior accordingly. Documentation also modified.
 
 Changes in version 1.072
 Modified kerning tables in each style to correct overly tight kerning between letters (especially uppercase) and punctuation. (Thanks Sven Boese.)
diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
index 015d70deeb6..f1cae3333cf 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 ac234bcb479..80d61fa6458 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
+++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
@@ -2,8 +2,8 @@
 \documentclass[11pt]{article}
 \usepackage[margin=1in]{geometry} 
 \usepackage[parfill]{parskip} 
-\pdfmapfile{=XCharter.map}
-\usepackage[scaled=1.03,varqu,varl]{zi4}
+%\pdfmapfile{=XCharter.map}
+\usepackage[scaled=1.03,varqu,varl]{inconsolata}
 \usepackage[type1]{cabin}
 \usepackage[scaled=.98,osfI]{XCharter}
 \usepackage[T1]{fontenc}
@@ -34,6 +34,8 @@ Support files are provided for T$1$, TS$1$ and LY$1$ encodings. The package has
 \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.
 \end{itemize}
+
+
 \textsc{Special Macros:}
 \begin{itemize}
 \item
@@ -57,7 +59,7 @@ Three math packages seem to provide reasonable companions for \textsf{XCharter}.
 \textsc{Example 2:}
 \begin{verbatim}
 \usepackage[scaled=.98,sups,osf]{XCharter}% lining figures in math, osf in text
-\usepackage[scaled=1.04,varqu,varl]{zi4}% inconsolata typewriter
+\usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter
 \usepackage[type1]{cabin}% sans serif
 \usepackage[libertine,bigdelims,vvarbb,scaled=1.07]{newtxmath}
 \usepackage[cal=boondoxo]{mathalfa}
@@ -67,9 +69,21 @@ Three math packages seem to provide reasonable companions for \textsf{XCharter}.
 \textsc{Example 3:}
 \begin{verbatim}
 \usepackage[scaled=.98,sups,osf]{XCharter}% lining figures in math, osf in text
-\usepackage[scaled=1.04,varqu,varl]{zi4}% inconsolata typewriter
+\usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter
+\usepackage[type1]{cabin}% sans serif
+\usepackage[charter,bigdelims,vvarbb,scaled=1.07]{newtxmath}
+\usepackage[cal=boondoxo]{mathalfa}
+\linespread{1.04}
+\end{verbatim}
+\textsc{Example 4:}
+\begin{verbatim}
+\usepackage[<specify babel languages>]{babel}% load before newtxtext
+\usepackage[scaled=.98,sups]{XCharter}% lining figures in math
+% don't use option osf--- \useosf[I] instead (below)
+\usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter
 \usepackage[type1]{cabin}% sans serif
 \usepackage[charter,bigdelims,vvarbb,scaled=1.07]{newtxmath}
+\useosf % or \useosfI---must be after newtxmath---osf in text mode
 \usepackage[cal=boondoxo]{mathalfa}
 \linespread{1.04}
 \end{verbatim}
diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
index 5678ded4849..1bdd5eca062 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.072}
-\def\filedate{2015/02/20}
+\def\fileversion{1.073}
+\def\filedate{2015/03/13}
 
 \ProvidesPackage{XCharter}[\filedate\space v\fileversion]
 
@@ -44,6 +44,8 @@
 }
 \let\orig@footnote=\thefootnote
 \let\orig@makefnmark=\@makefnmark
+\newif\ifXCh@babel
+\ifdefined\bbl@tempa \XCh@babeltrue\fi
 
 \def\XCharter@altone{1}% default is to use 1, not I
 \newif\if@XCh@sups
@@ -110,9 +112,18 @@
  \fi%
 \fi
 
-\AtEndPreamble{%
+%\AtEndPreamble{%
+%\renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle}
+%\normalfont}
+
+\ifXCh@babel
+    \renewcommand*{\rmdefault}{XCharter-\XCharter@figuresstyle}
+	\normalfont
+\else
+    \AtEndPreamble{%
 \renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle}
 \normalfont}
+\fi
 
 
 \endinput