summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd18
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd30
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd29
-rw-r--r--Master/texmf-dist/tex/latex/xcharter/XCharter.sty36
4 files changed, 58 insertions, 55 deletions
diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd
index 9b45f84f258..7070b0a237e 100644
--- a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd
@@ -9,30 +9,36 @@
\edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
\fi
+\def\XCharter@@srb{}
+\expandafter\ifx\csname @XCh@srbtrue\endcsname\relax
+\else
+ \edef\XCharter@@srb{\if@XCh@srb srb\fi}%
+\fi
+
\DeclareFontFamily{T2A}{XCharter-Sup}{}
\DeclareFontShape{T2A}{XCharter-Sup}{b}{sl}{
- <-> \XCharter@@scale XCharter-BoldSlanted-sup-t2a
+ <-> \XCharter@@scale XCharter-BoldSlanted-sup-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-Sup}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-sup-t2a
+ <-> \XCharter@@scale XCharter-BoldItalic-sup-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-Sup}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-sup-t2a
+ <-> \XCharter@@scale XCharter-Bold-sup-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-Sup}{m}{sl}{
- <-> \XCharter@@scale XCharter-Slanted-sup-t2a
+ <-> \XCharter@@scale XCharter-Slanted-sup-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-Sup}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-sup-t2a
+ <-> \XCharter@@scale XCharter-Italic-sup-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-Sup}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-sup-t2a
+ <-> \XCharter@@scale XCharter-Roman-sup-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-Sup}{bx}{sl}{
diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd
index cb65bf904e1..0e7aea8d69c 100644
--- a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd
@@ -9,54 +9,60 @@
\edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
\fi
+\def\XCharter@@srb{}
+\expandafter\ifx\csname @XCh@srbtrue\endcsname\relax
+\else
+ \edef\XCharter@@srb{\if@XCh@srb srb\fi}%
+\fi
+
\DeclareFontFamily{T2A}{XCharter-TLF}{}
\DeclareFontShape{T2A}{XCharter-TLF}{b}{it}{
- <-> \XCharter@@scale XCharter-BoldItalic-tlf-t2a
+ <-> \XCharter@@scale XCharter-BoldItalic-tlf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{b}{sc}{
- <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2a
+ <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{b}{sl}{
- <-> \XCharter@@scale XCharter-BoldSlanted-tlf-t2a
+ <-> \XCharter@@scale XCharter-BoldSlanted-tlf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{b}{scsl}{
- <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-t2a
+ <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{b}{n}{
- <-> \XCharter@@scale XCharter-Bold-tlf-t2a
+ <-> \XCharter@@scale XCharter-Bold-tlf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{b}{scit}{
- <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2a
+ <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{m}{scit}{
- <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2a
+ <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{m}{scsl}{
- <-> \XCharter@@scale XCharter-Slanted-tlf-sc-t2a
+ <-> \XCharter@@scale XCharter-Slanted-tlf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{m}{n}{
- <-> \XCharter@@scale XCharter-Roman-tlf-t2a
+ <-> \XCharter@@scale XCharter-Roman-tlf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{m}{sl}{
- <-> \XCharter@@scale XCharter-Slanted-tlf-t2a
+ <-> \XCharter@@scale XCharter-Slanted-tlf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{m}{it}{
- <-> \XCharter@@scale XCharter-Italic-tlf-t2a
+ <-> \XCharter@@scale XCharter-Italic-tlf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{m}{sc}{
- <-> \XCharter@@scale XCharter-Roman-tlf-sc-t2a
+ <-> \XCharter@@scale XCharter-Roman-tlf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TLF}{bx}{it}{
diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd
index 619dcdf63ee..8b2f9ea8618 100644
--- a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd
@@ -9,6 +9,11 @@
\edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}%
\fi
+\def\XCharter@@srb{}
+\expandafter\ifx\csname @XCh@srbtrue\endcsname\relax
+\else
+ \edef\XCharter@@srb{\if@XCh@srb srb\fi}%
+\fi
\expandafter\ifx\csname XCharter@altone\endcsname\relax
\let\XCharter@@altone\@empty
@@ -19,51 +24,51 @@
\DeclareFontFamily{T2A}{XCharter-TOsF}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{m}{scsl}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-sc-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{m}{n}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{m}{scit}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-sc-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{m}{it}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{m}{sc}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-sc-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{m}{sl}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{b}{scit}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-sc-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{b}{n}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{b}{scsl}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-sc-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{b}{sl}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{b}{sc}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-sc-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-sc-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{b}{it}{
- <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-t2a
+ <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-t2a\XCharter@@srb
}{}
\DeclareFontShape{T2A}{XCharter-TOsF}{bx}{scit}{
diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
index efbded30235..87238c778f7 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.094}
-\def\filedate{2017/08/08}
+\def\fileversion{1.1}
+\def\filedate{2017/09/19}
\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{\textnumerator}{\nufigures}
- %\let\textnu\textnumerator --- conflict with babel greek
+ \DeclareTextFontCommand{\textnu}{\nufigures}
+ \let\textnumerator\textnu
\fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
\fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
\def\defigures{\@nomath\defigures%
\fontfigurestyle{denominators}\selectfont}
- \DeclareTextFontCommand{\textdenominator}{\defigures}
- \let\textde\textdenominator
+ \DeclareTextFontCommand{\textde}{\defigures}
+ \let\textdenominator\textde
}{}
\providecommand*{\textfrac}[2]{%
- \textnumerator{#1}\kern0em\textfractionsolidus\kern0em\textdenominator{#2}}
+ \textnu{#1}\kern0em\textfractionsolidus\kern0em\textde{#2}}
\DeclareRobustCommand{\lfstyle}{%
\not@math@alphabet\lfstyle\relax
\fontfamily{XCharter-TLF}\selectfont }
@@ -70,7 +70,7 @@
%\newif\ifXCh@babel
%\ifdefined\bbl@tempa \XCh@babeltrue\fi
\newif\if@XCh@scosf
-
+\newif\if@XCh@srb
\def\XCharter@altone{1}% default is to use 1, not I
\newif\if@XCh@sups
\DeclareOptionX{lf}{\edef\XCharter@figurestyle{TLF}}
@@ -83,6 +83,7 @@
\DeclareOptionX{osfI}{\edef\XCharter@figurestyle{TOsF}\edef\XCharter@altone{}}
\DeclareOptionX{sups}{\@XCh@supstrue}
\DeclareOptionX{scosf}{\@XCh@scosftrue}
+\DeclareOptionX{serbianc}{\@XCh@srbtrue}
\edef\bfseries@rm{b}
\edef\mdseries@rm{m}
@@ -126,23 +127,9 @@
{\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 %
- \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
+ \ifdefined\sufigures
\def\f@@tn@te{footnote}
\def\@makefnmark{%
\ifx\@mpfn\f@@tn@te%not in a minipage
@@ -165,8 +152,7 @@
% \renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle}
% \normalfont
%\else
- \AtEndPreamble{%
-\@ifundefined{textnu}{\let\textnu\textnumerator}{}%
+\AtEndPreamble{%
\renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle}
\normalfont}
%\fi