From 267a02628e118ed3aea7361550c231c792bbc09b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Mar 2017 23:08:17 +0000 Subject: xcharter (11mar17) git-svn-id: svn://tug.org/texlive/trunk@43465 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/xcharter/README | 9 ++++++--- .../texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf | Bin 134873 -> 161039 bytes .../texmf-dist/doc/fonts/xcharter/xcharter-doc.tex | 10 ++++------ Master/texmf-dist/tex/latex/xcharter/XCharter.sty | 18 +++++++++--------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Master/texmf-dist/doc/fonts/xcharter/README b/Master/texmf-dist/doc/fonts/xcharter/README index f2d32be2cfa..1cc1e3e42a0 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 - 2016-12-31 + 2017-03-11 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 @@ -19,10 +19,13 @@ Original Bitstream Free font license: BITSTREAM CHARTER is a registered trademark of Bitstream Inc. -The font modifications are Copyright (c) 2013--2016, Michael Sharpe. +The font modifications are Copyright (c) 2013--2017, Michael Sharpe. -Current version: 1.079a 2016-12-31 +Current version: 1.08 2017-03-11 + +Changes in version 1.08 +Modified the sty file so that XCharter text figure styles are selected always in the \AtEndPreamble hook. (Formerly, using babel would prevent this.) Changes in version 1.079 Added two entries to smcp table so that dotlessi and dotlessj map to correct small cap glyph. diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf index f1cae3333cf..0f45d9620c0 100644 Binary files a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf and b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf differ diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex index 80d61fa6458..a17d64567bf 100644 --- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex +++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex @@ -8,7 +8,7 @@ \usepackage[scaled=.98,osfI]{XCharter} \usepackage[T1]{fontenc} \linespread{1.04} -\usepackage[charter,bigdelims,vvarbb,scaled=1.07]{newtxmath} +\usepackage[charter,vvarbb,scaled=1.07]{newtxmath} \usepackage[cal=boondoxo]{mathalfa} \font\osfIfnt=XCharter-Roman-tosf-t1 at 11pt \font\osffnt=XCharter1-Roman-tosf-t1 at 11pt @@ -77,13 +77,11 @@ Three math packages seem to provide reasonable companions for \textsf{XCharter}. \end{verbatim} \textsc{Example 4:} \begin{verbatim} -\usepackage[]{babel}% load before newtxtext -\usepackage[scaled=.98,sups]{XCharter}% lining figures in math -% don't use option osf--- \useosf[I] instead (below) +\usepackage[]{babel}% load before XCharter +\usepackage[scaled=.98,sups,osf]{XCharter}% osf in text, lining figures in math \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[charter,vvarbb,scaled=1.07]{newtxmath} \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 e4b9d39eac8..30804a94ae9 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.078} -\def\filedate{2016/05/27} +\def\fileversion{1.08} +\def\filedate{2017/03/11} \ProvidesPackage{XCharter}[\filedate\space v\fileversion] @@ -44,8 +44,8 @@ } \let\orig@footnote=\thefootnote \let\orig@makefnmark=\@makefnmark -\newif\ifXCh@babel -\ifdefined\bbl@tempa \XCh@babeltrue\fi +%\newif\ifXCh@babel +%\ifdefined\bbl@tempa \XCh@babeltrue\fi \def\XCharter@altone{1}% default is to use 1, not I \newif\if@XCh@sups @@ -116,14 +116,14 @@ %\renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle} %\normalfont} -\ifXCh@babel - \renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle} - \normalfont -\else +%\ifXCh@babel +% \renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle} +% \normalfont +%\else \AtEndPreamble{% \renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle} \normalfont} -\fi +%\fi \endinput -- cgit v1.2.3