xcharter (12jan15)

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

4 files changed, 66 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/fonts/xcharter/README b/Master/texmf-dist/doc/fonts/xcharter/README
index 60d44c88aca..7b854f9aa83 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
-				2014-11-05
+				2015-01-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
@@ -22,7 +22,11 @@ Original Bitstream Free font license:
 The font modifications are Copyright (c) 2013--2-14, Michael Sharpe.
 
 
-Current version: 1.06
+Current version: 1.07
+
+Changes in version 1.07
+1. Added over 50 new glyphs to each style so that the package now covers essentially the complete range of the EC (T1) encoding.
+2. Corrected behavior of small cap germandbls when using the alternate form of oldstyle 1.
 
 Changes in version 1.06
 Added support files for a new "charter" option to newtxmath, providing math italic (oml) with XCharter [bold-]italic letters replacing Times [bold-]italic, with sizes reduced to match xheight of Times italic.
diff --git a/Master/texmf-dist/doc/fonts/xcharter/altone.py b/Master/texmf-dist/doc/fonts/xcharter/altone.py
index 954c763ae66..e79b3da3a8c 100755
--- a/Master/texmf-dist/doc/fonts/xcharter/altone.py
+++ b/Master/texmf-dist/doc/fonts/xcharter/altone.py
@@ -7,10 +7,55 @@ import os, sys
 # and the corresponding changes applied to xcharter.map
 encfiles=set()
 enclst=[]
+enclstt1=[]
+enclstly1=[]
+encfilest1=set()
+encfilesly1=set()
 newlines=[]
 afmcmds=[]
 vflst=[]
-with open("texmf/fonts/map/dvips/xcharter/XCharter.map",'r') as f:
+tmfv = sys.argv[1]
+with open(tmfv+"/fonts/map/dvips/xcharter/XCharter.map",'r') as f:
+	for line in f:
+		if "-sc-" in line:
+			tmp = line.split()
+			enc=tmp[4][2:] # omit <[
+			if (enc[-4:]==".enc") and (enc[:4]=="xch_"):
+				if "-ly1-" in line:
+					enclstly1.append(enc)
+				else:
+					enclstt1.append(enc)
+				h=tmp[5][1:-4] # psfile, without .pfb or <
+				a=tmp[0][:-6] # name of vf
+				vflst.append(a)
+				s="/usr/texbin/afm2tfm "+h+" -T "+tmfv+"/fonts/enc/dvips/xcharter/"+enc+" -v "+a+" "+tmp[0]
+				afmcmds.append(s)
+					
+encfilest1=set(enclstt1)
+encfilesly1=set(enclstly1)
+for f in sorted(encfilest1):
+	with open(tmfv+"/fonts/enc/dvips/xcharter/"+f,'r') as g:
+		tmp = g.read()
+		k=tmp.find('/thorn')+6
+		s=tmp[k:]
+		if '/.notdef' in s:
+			s=s.replace('/.notdef','/SSsmall')
+	with open(tmfv+"/fonts/enc/dvips/xcharter/"+f,'w') as g:
+		g.write(tmp[:k]+s)
+for f in sorted(encfilesly1):
+	with open(tmfv+"/fonts/enc/dvips/xcharter/"+f,'r') as g:
+		tmp = g.read()
+		k=tmp.find('/cedilla')+8
+		s=tmp[k:]
+		j=s.find('/')
+		if s[j:j+8]=='/.notdef':
+			s=s[:j]+'/SSsmall'+s[j+8:]
+	with open(tmfv+"/fonts/enc/dvips/xcharter/"+f,'w') as g:
+		g.write(tmp[:k]+s)
+# We've modified the encoding files
+# Now regenerate the --base and vpl
+
+with open(tmfv+"/fonts/map/dvips/xcharter/XCharter.map",'r') as f:
 	for line in f:
 		if "-tosf-" in line:
 			tmp = line.split()
@@ -25,7 +70,7 @@ with open("texmf/fonts/map/dvips/xcharter/XCharter.map",'r') as f:
 				h=tmp[5][1:-4] # psfile, without .pfb or <
 				a=tmp[0][:-6] # name of vf
 				vflst.append(a)
-				s="/usr/texbin/afm2tfm "+h+" -T texmf/fonts/enc/dvips/xcharter/"+enc+" -v "+a+" "+tmp[0]
+				s="/usr/texbin/afm2tfm "+h+" -T "+tmfv+"/fonts/enc/dvips/xcharter/"+enc+" -v "+a+" "+tmp[0]
 				afmcmds.append(s)
 			
 #print newlines
@@ -34,12 +79,12 @@ encfiles=set(enclst)
 #sys.exit()
 for f in sorted(encfiles):
 	f0=f[:3]+f[4:] # remove "1"
-	os.system("/bin/cp -fp texmf/fonts/enc/dvips/xcharter/"+f0+" texmf/fonts/enc/dvips/xcharter/"+f)
-	with open("texmf/fonts/enc/dvips/xcharter/"+f,'r') as g:
+	os.system("/bin/cp -fp "+tmfv+"/fonts/enc/dvips/xcharter/"+f0+" "+tmfv+"/fonts/enc/dvips/xcharter/"+f)
+	with open(tmfv+"/fonts/enc/dvips/xcharter/"+f,'r') as g:
 		tmp = g.read()
 		tmp=tmp.replace("AutoEnc","AutoEnc1")
 		tmp=tmp.replace("one.oldstyle","one.Alt.oldstyle")
-	with open("texmf/fonts/enc/dvips/xcharter/"+f,'w') as g:
+	with open(tmfv+"/fonts/enc/dvips/xcharter/"+f,'w') as g:
 		g.write(tmp)
 
 #Finally, write the afmcmds and update mapfile
@@ -49,10 +94,10 @@ for j in range(len(vflst)):
 	print s
 	if os.system(s)==0:
 		if os.system("/usr/texbin/vptovf "+a)==0:
-			os.system("/bin/mv -f "+a+".tfm texmf/fonts/tfm/public/xcharter")
-			os.system("/bin/mv -f "+a+"--base.tfm texmf/fonts/tfm/public/xcharter")
-			os.system("/bin/mv -f "+a+".vf texmf/fonts/vf/public/xcharter")
+			os.system("/bin/mv -f "+a+".tfm "+tmfv+"/fonts/tfm/public/xcharter")
+			os.system("/bin/mv -f "+a+"--base.tfm "+tmfv+"/fonts/tfm/public/xcharter")
+			os.system("/bin/mv -f "+a+".vf "+tmfv+"/fonts/vf/public/xcharter")
 		
-with open("texmf/fonts/map/dvips/xcharter/XCharter.map",'a+') as f:
+with open(tmfv+"/fonts/map/dvips/xcharter/XCharter.map",'a+') as f:
 	for s in newlines:
 		f.write(s+'\n')
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
index d1baf05d104..e192fff6acf 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
index 2cccb85c5da..ac234bcb479 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
+++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
@@ -23,7 +23,7 @@
 
 
 \section{Package Features}
-The XCharter fonts are extensions of the Bitstream Charter fonts, adding oldstyle figures (proportionally spaced only), superior figures and small caps in all styles. The original Charter fonts were designed by famed font designer Matthew Carter in the late 1980's to enhance legibility of the output from printers of that era (laser, dot matrix, thermal and inkjet) with resolutions that would now be considered low---not far from modern screen resolutions. Their low contrasts, high x-heights and use of piecewise linear outlines where possible may make them interesting again as fonts that will render well on small devices and perhaps projected slides. (It's worth noting that the same designer provided Georgia for Microsoft. It is widely considered to be one of the clearest serifed fonts for viewing on screen, and bears a number of similarities to Charter, though the latter is  heavier.)
+The XCharter fonts are extensions of the Bitstream Charter fonts, adding oldstyle figures (proportionally spaced only), superior figures and small caps in all styles. The original Charter fonts were created by famed font designer Matthew Carter in the late 1980's to enhance legibility of the output from printers of that era (laser, dot matrix, thermal and inkjet) with resolutions that would now be considered low---not far from modern screen resolutions. Their low contrasts, high x-heights and use of piecewise linear outlines where possible may make them interesting again as fonts that will render well on small devices and perhaps projected slides. (It's worth noting that the same designer provided Georgia for Microsoft. It is widely considered to be one of the clearest serifed fonts for viewing on screen, and bears a number of similarities to Charter, though the latter is  heavier.)
 
 Support files are provided for T$1$, TS$1$ and LY$1$ encodings. The package has  a number of options:
 \begin{itemize}
@@ -38,7 +38,7 @@ Support files are provided for T$1$, TS$1$ and LY$1$ encodings. The package has
 \begin{itemize}
 \item
 \verb|\useosf| (usable only in the preamble) may be used for changing the text figure style to {\tt osf} though math mode will use lining figures.
-\item \verb|\useosfI| (usable only in the preamble) may ne used for changing the text figure style to {\tt osfI} though math mode will use lining figures.
+\item \verb|\useosfI| (usable only in the preamble) may be used for changing the text figure style to {\tt osfI} though math mode will use lining figures.
 \item \verb|\textsu| prints its argument in superior figures, eg \verb|\textsu{12}| results in \textsu{12}. The effect is the same with \verb|{\sustyle 12}|.
 \item \verb|\textlf| prints its argument in lining figures, eg \verb|\textlf{12}| results in \textlf{12}. The effect is the same with \verb|{\lfstyle 12}|.
 \item \verb|{\osfstyle 23}| prints \textosf{23} using whatever oldstyle option is in force. 
@@ -87,11 +87,11 @@ and $\uppi$. (The first two are entered as \verb|\mathrm{d}| and
 $X_1$, $X_2,\cdots$ be a sequence of iid random variables with mean $0$ 
 and variance $1$ on a probability space $(\Omega,\mathcal{F},\Pr)$. Then}
 \[\Pr\left(\frac{X_1+\cdots+X_n}{\sqrt{n}}\le y\right)\to\mathfrak{N}(y)\coloneq
-\int_{-\infty}^y \frac{\mathrm{e}^{-t^2/2}}{\sqrt{2\uppi}}\,
-\mathrm{d}t\quad\mbox{as $n\to\infty$,}\]
+\int_{-\infty}^y \frac{\mathrm{e}^{-v^2/2}}{\sqrt{2\uppi}}\,
+\mathrm{d}v\quad\mbox{as $n\to\infty$,}\]
 \textit{or, equivalently, letting} $S_n\coloneq\sum_1^n X_k$,
-\[\mathbb{E} f\left(S_n/\sqrt{n}\right)\to \int_{-\infty}^\infty f(t)
-\frac{\mathrm{e}^{-t^2/2}}{\sqrt{2\uppi}}\,\mathrm{d}t
+\[\mathbb{E} f\left(S_n/\sqrt{n}\right)\to \int_{-\infty}^\infty f(v)
+\frac{\mathrm{e}^{-v^2/2}}{\sqrt{2\uppi}}\,\mathrm{d}v
 \quad\mbox{as $n\to\infty$, for every $f\in\mathrm{b}
 \mathcal{C}(\mathbb{R})$.}\]