From a9c3e5d23faadb1852fb9081aa2bb028eeeeaf21 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 12 Nov 2020 21:43:57 +0000 Subject: xcharter (12nov20) git-svn-id: svn://tug.org/texlive/trunk@56918 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/xcharter/T2ASRBXCharter-Sup.fd | 42 +++++------ .../tex/latex/xcharter/T2ASRBXCharter-TLF.fd | 88 +++++++++++----------- .../tex/latex/xcharter/T2ASRBXCharter-TOsF.fd | 84 ++++++++++----------- Master/texmf-dist/tex/latex/xcharter/XCharter.sty | 4 +- 4 files changed, 109 insertions(+), 109 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd index 45b834e3de1..5b994b13241 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/08/05 +%% Generated by autoinst on 2020/11/11 %% \ProvidesFile{T2ASRBXCharter-Sup.fd} - [2020/08/05 (autoinst) Font definitions for T2ASRB/XCharter-Sup.] + [2020/11/11 (autoinst) Font definitions for T2ASRB/XCharter-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,14 +22,6 @@ % ---- m = regular ---- -\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{sl}{ - <-> \XCharter@@scale XCharter-Slanted-sup-t2asrb -}{} - -\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{sl}{ - <-> alias * XCharter-Sup/m/sl -}{} - \DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{n}{ <-> \XCharter@@scale XCharter-Roman-sup-t2asrb }{} @@ -46,17 +38,17 @@ <-> alias * XCharter-Sup/m/it }{} - -% ---- b = bold ---- - -\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{n}{ - <-> \XCharter@@scale XCharter-Bold-sup-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{sl}{ + <-> \XCharter@@scale XCharter-Slanted-sup-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{n}{ - <-> alias * XCharter-Sup/b/n +\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{sl}{ + <-> alias * XCharter-Sup/m/sl }{} + +% ---- b = bold ---- + \DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{sl}{ <-> \XCharter@@scale XCharter-BoldSlanted-sup-t2asrb }{} @@ -73,19 +65,27 @@ <-> alias * XCharter-Sup/b/it }{} +\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{n}{ + <-> \XCharter@@scale XCharter-Bold-sup-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{n}{ + <-> alias * XCharter-Sup/b/n +}{} + % ---- Extra 'ssub' rules to map 'bx' to 'b' ---- -\DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{it}{ - <-> ssub * XCharter-Sup/b/it +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{n}{ + <-> ssub * XCharter-Sup/b/n }{} \DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{sl}{ <-> ssub * XCharter-Sup/b/sl }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{n}{ - <-> ssub * XCharter-Sup/b/n +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{it}{ + <-> ssub * XCharter-Sup/b/it }{} \endinput diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd index 101c2f34a1a..723ab7c01ee 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/08/05 +%% Generated by autoinst on 2020/11/11 %% \ProvidesFile{T2ASRBXCharter-TLF.fd} - [2020/08/05 (autoinst) Font definitions for T2ASRB/XCharter-TLF.] + [2020/11/11 (autoinst) Font definitions for T2ASRB/XCharter-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,20 +22,20 @@ % ---- b = bold ---- -\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scit}{ - <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sc}{ + <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scit}{ - <-> alias * XCharter-TLF/b/scit +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{sc}{ + <-> alias * XCharter-TLF/b/sc }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{it}{ - <-> \XCharter@@scale XCharter-BoldItalic-tlf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{n}{ + <-> \XCharter@@scale XCharter-Bold-tlf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{it}{ - <-> alias * XCharter-TLF/b/it +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{n}{ + <-> alias * XCharter-TLF/b/n }{} \DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sl}{ @@ -46,20 +46,20 @@ <-> alias * XCharter-TLF/b/sl }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{n}{ - <-> \XCharter@@scale XCharter-Bold-tlf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scit}{ + <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{n}{ - <-> alias * XCharter-TLF/b/n +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scit}{ + <-> alias * XCharter-TLF/b/scit }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sc}{ - <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{it}{ + <-> \XCharter@@scale XCharter-BoldItalic-tlf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{sc}{ - <-> alias * XCharter-TLF/b/sc +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{it}{ + <-> alias * XCharter-TLF/b/it }{} \DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scsl}{ @@ -81,12 +81,20 @@ <-> alias * XCharter-TLF/m/scsl }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sc}{ - <-> \XCharter@@scale XCharter-Roman-tlf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{it}{ + <-> \XCharter@@scale XCharter-Italic-tlf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{sc}{ - <-> alias * XCharter-TLF/m/sc +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{it}{ + <-> alias * XCharter-TLF/m/it +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scit}{ + <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scit}{ + <-> alias * XCharter-TLF/m/scit }{} \DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sl}{ @@ -105,47 +113,39 @@ <-> alias * XCharter-TLF/m/n }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scit}{ - <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2asrb -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scit}{ - <-> alias * XCharter-TLF/m/scit -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{it}{ - <-> \XCharter@@scale XCharter-Italic-tlf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sc}{ + <-> \XCharter@@scale XCharter-Roman-tlf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{it}{ - <-> alias * XCharter-TLF/m/it +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{sc}{ + <-> alias * XCharter-TLF/m/sc }{} % ---- Extra 'ssub' rules to map 'bx' to 'b' ---- -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sc}{ - <-> ssub * XCharter-TLF/b/sc +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scit}{ + <-> ssub * XCharter-TLF/b/scit }{} \DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sl}{ <-> ssub * XCharter-TLF/b/sl }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{n}{ - <-> ssub * XCharter-TLF/b/n -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scit}{ - <-> ssub * XCharter-TLF/b/scit +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scsl}{ + <-> ssub * XCharter-TLF/b/scsl }{} \DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{it}{ <-> ssub * XCharter-TLF/b/it }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scsl}{ - <-> ssub * XCharter-TLF/b/scsl +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sc}{ + <-> ssub * XCharter-TLF/b/sc +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{n}{ + <-> ssub * XCharter-TLF/b/n }{} \endinput diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd index b4bd5c3dc49..f0e88e2f4b8 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/08/05 +%% Generated by autoinst on 2020/11/11 %% \ProvidesFile{T2ASRBXCharter-TOsF.fd} - [2020/08/05 (autoinst) Font definitions for T2ASRB/XCharter-TOsF.] + [2020/11/11 (autoinst) Font definitions for T2ASRB/XCharter-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,6 +22,14 @@ % ---- b = bold ---- +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sc}{ + <-> \XCharter@@scale XCharter-Bold-tosf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sc}{ + <-> alias * XCharter-TOsF/b/sc +}{} + \DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{n}{ <-> \XCharter@@scale XCharter-Bold-tosf-t2asrb }{} @@ -30,20 +38,20 @@ <-> alias * XCharter-TOsF/b/n }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-tosf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scit}{ + <-> \XCharter@@scale XCharter-BoldItalic-tosf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sl}{ - <-> alias * XCharter-TOsF/b/sl +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{scit}{ + <-> alias * XCharter-TOsF/b/scit }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sc}{ - <-> \XCharter@@scale XCharter-Bold-tosf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-tosf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sc}{ - <-> alias * XCharter-TOsF/b/sc +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sl}{ + <-> alias * XCharter-TOsF/b/sl }{} \DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{it}{ @@ -54,14 +62,6 @@ <-> alias * XCharter-TOsF/b/it }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scit}{ - <-> \XCharter@@scale XCharter-BoldItalic-tosf-sc-t2asrb -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{scit}{ - <-> alias * XCharter-TOsF/b/scit -}{} - \DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scsl}{ <-> \XCharter@@scale XCharter-BoldSlanted-tosf-sc-t2asrb }{} @@ -81,14 +81,6 @@ <-> alias * XCharter-TOsF/m/scsl }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scit}{ - <-> \XCharter@@scale XCharter-Italic-tosf-sc-t2asrb -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scit}{ - <-> alias * XCharter-TOsF/m/scit -}{} - \DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{it}{ <-> \XCharter@@scale XCharter-Italic-tosf-t2asrb }{} @@ -105,12 +97,12 @@ <-> alias * XCharter-TOsF/m/sl }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sc}{ - <-> \XCharter@@scale XCharter-Roman-tosf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scit}{ + <-> \XCharter@@scale XCharter-Italic-tosf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{sc}{ - <-> alias * XCharter-TOsF/m/sc +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scit}{ + <-> alias * XCharter-TOsF/m/scit }{} \DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{n}{ @@ -121,31 +113,39 @@ <-> alias * XCharter-TOsF/m/n }{} +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sc}{ + <-> \XCharter@@scale XCharter-Roman-tosf-sc-t2asrb +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- - -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{it}{ - <-> ssub * XCharter-TOsF/b/it +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{sc}{ + <-> alias * XCharter-TOsF/m/sc }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scit}{ - <-> ssub * XCharter-TOsF/b/scit + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{n}{ + <-> ssub * XCharter-TOsF/b/n }{} \DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sc}{ <-> ssub * XCharter-TOsF/b/sc }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sl}{ - <-> ssub * XCharter-TOsF/b/sl -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{n}{ - <-> ssub * XCharter-TOsF/b/n +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{it}{ + <-> ssub * XCharter-TOsF/b/it }{} \DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scsl}{ <-> ssub * XCharter-TOsF/b/scsl }{} +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sl}{ + <-> ssub * XCharter-TOsF/b/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scit}{ + <-> ssub * XCharter-TOsF/b/scit +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty index a36d120f26e..0345a4f8a29 100644 --- a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty +++ b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty @@ -122,8 +122,8 @@ \DeclareOptionX{scosf}{\@XCh@scosftrue} \DeclareOptionX{serbianc}{\@XCh@srbtrue} -%\edef\bfseries@rm{b} % these are not needed after 2020-02 -%\edef\mdseries@rm{m} +\edef\bfseries@rm{b} +\edef\mdseries@rm{m} \ExecuteOptionsX{lining} \ProcessOptionsX\relax -- cgit v1.2.3