summaryrefslogtreecommitdiff
path: root/fonts/xcharter/doc
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-08-07 03:02:55 +0000
committerNorbert Preining <norbert@preining.info>2020-08-07 03:02:55 +0000
commit3710c23789342d9d88783cbe9ad23eb5263a7c33 (patch)
tree1c40b2bfb9f6b652f7877ad0991f5d6b44391154 /fonts/xcharter/doc
parentd99fea72e367e8d4d2809b43b3b0206b1bb526b8 (diff)
CTAN sync 202008070302
Diffstat (limited to 'fonts/xcharter/doc')
-rwxr-xr-xfonts/xcharter/doc/altone.py11
-rw-r--r--fonts/xcharter/doc/xcharter-doc.pdfbin711124 -> 719666 bytes
-rw-r--r--fonts/xcharter/doc/xcharter-doc.tex18
3 files changed, 16 insertions, 13 deletions
diff --git a/fonts/xcharter/doc/altone.py b/fonts/xcharter/doc/altone.py
index 0f89240d09..d35e655692 100755
--- a/fonts/xcharter/doc/altone.py
+++ b/fonts/xcharter/doc/altone.py
@@ -15,9 +15,11 @@ t2aligs='''% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
encfiles=set()
enclst=[]
enclstt1=[]
+enclstts1=[]
enclstly1=[]
enclstot1=[]
encfilest1=set()
+encfilests1=set()
encfilesly1=set()
encfilesot1=set()
newlines=[]
@@ -34,8 +36,12 @@ with open(tmfv+"/fonts/map/dvips/xcharter/XCharter.map",'r') as f:
enclstly1.append(enc)
elif "-ot1-" in line:
enclstot1.append(enc)
- else:
+ elif "-t1-" in line:
enclstt1.append(enc)
+ elif "-ts1-" in line:
+ enclstts1.append(enc)
+ else:
+ continue
h=tmp[5][1:-4] # psfile, without .pfb or <
a=tmp[0][:-6] # name of vf
vflst.append(a)
@@ -43,6 +49,7 @@ with open(tmfv+"/fonts/map/dvips/xcharter/XCharter.map",'r') as f:
afmcmds.append(s)
encfilest1=set(enclstt1)
+encfilests1=set(enclstts1)
encfilesly1=set(enclstly1)
encfilesot1=set(enclstot1)
for f in sorted(encfilest1):
@@ -69,7 +76,7 @@ for f in sorted(encfilesly1):
with open(tmfv+"/fonts/map/dvips/xcharter/XCharter.map",'r') as f:
for line in f:
- if "-tosf-" in line:
+ if ("-tosf-" in line) or ("-ts1" in line):
tmp = line.split()
enc=tmp[4][2:]
if (enc[-4:]==".enc") and (enc[:4]=="xch_"):
diff --git a/fonts/xcharter/doc/xcharter-doc.pdf b/fonts/xcharter/doc/xcharter-doc.pdf
index 07cd58e72e..ceea635530 100644
--- a/fonts/xcharter/doc/xcharter-doc.pdf
+++ b/fonts/xcharter/doc/xcharter-doc.pdf
Binary files differ
diff --git a/fonts/xcharter/doc/xcharter-doc.tex b/fonts/xcharter/doc/xcharter-doc.tex
index ea13fc6078..a028f10b6c 100644
--- a/fonts/xcharter/doc/xcharter-doc.tex
+++ b/fonts/xcharter/doc/xcharter-doc.tex
@@ -16,8 +16,8 @@
\usepackage[scaled=.98,osf]{XCharter}
\usepackage[OT2,T2A,T1]{fontenc}
\linespread{1.04}
-\usepackage[charter,alty,vvarbb,scaled=1.05]{newtxmath}
-\usepackage[cal=boondoxo]{mathalfa}
+\usepackage[uprightscript,charter,alty,vvarbb,scaled=1.05]{newtxmath}
+%\usepackage[cal=boondoxo]{mathalfa}
\font\osfIfnt=XCharter-Roman-tosf-t1 at 11pt
\font\osffnt=XCharter1-Roman-tosf-t1 at 11pt
\usepackage{fonttable}
@@ -87,8 +87,7 @@ Three math packages seem to provide reasonable companions for \textsf{XCharter}.
\usepackage[scaled=.98,sups,osf]{XCharter}% lining figures in math, osf in text
\usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter
\usepackage[type1]{cabin}% sans serif
-\usepackage[libertine,vvarbb,scaled=1.05]{newtxmath}
-\usepackage[cal=boondoxo]{mathalfa}
+\usepackage[uprightscript,libertine,vvarbb,scaled=1.05]{newtxmath}
\linespread{1.04}
\end{verbatim}
@@ -97,8 +96,7 @@ Three math packages seem to provide reasonable companions for \textsf{XCharter}.
\usepackage[scaled=.98,sups,osf]{XCharter}% lining figures in math, osf in text
\usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter
\usepackage[type1]{cabin}% sans serif
-\usepackage[charter,vvarbb,scaled=1.05]{newtxmath}
-\usepackage[cal=boondoxo]{mathalfa}
+\usepackage[uprightscript,charter,vvarbb,scaled=1.05]{newtxmath}
\linespread{1.04}
\end{verbatim}
\textsc{Example 4:}
@@ -107,8 +105,7 @@ Three math packages seem to provide reasonable companions for \textsf{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,vvarbb,scaled=1.05]{newtxmath}
-\usepackage[cal=boondoxo]{mathalfa}
+\usepackage[uprightscript,charter,vvarbb,scaled=1.05]{newtxmath}
\linespread{1.04}
\end{verbatim}
@@ -125,9 +122,8 @@ Three math packages seem to provide reasonable companions for \textsf{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,vvarbb,scaled=1.05]{newtxmath}
-\usepackage[cal=boondoxo]{mathalfa}
-\linespread{1.04}
+\usepackage[uprightscript,charter,vvarbb,scaled=1.05]{newtxmath}
+\\linespread{1.04}
\end{verbatim}