xcharter (14mar15)

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

1 files changed, 18 insertions, 4 deletions

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}