xcharter (3jun18)

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

4 files changed, 31 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/fonts/xcharter/README b/Master/texmf-dist/doc/fonts/xcharter/README
index 56bdffeef64..dbe1dabe340 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
-				2018-04-10
+				2018-06-02
 
 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:
 Portions of the font modifications are Copyright (c) 2009--2012, Andrey Panov; Copyright (c) 2013--2018, Michael Sharpe.
 
 
-Current version: 1.113 2018-04-10
+Current version: 1.114 2018-06-02
+
+Changes in version 1.114
+1. Substituted the pfb fonts produced directly from FontForge for those constructed by otftotfm. The former seem to work better in the production of PDF/A-1B documents. 
+2. Reworked the T2A fonts, which had fallen into disrepair, some not handling the basic ligatures correctly. These now work again as expected.
 
 Changes in version 1.113
 Added new math italics with original Charter italic v and w. Not suited for use with Greek math \nu.
diff --git a/Master/texmf-dist/doc/fonts/xcharter/altone.py b/Master/texmf-dist/doc/fonts/xcharter/altone.py
index f2a255a3691..0f89240d09c 100755
--- a/Master/texmf-dist/doc/fonts/xcharter/altone.py
+++ b/Master/texmf-dist/doc/fonts/xcharter/altone.py
@@ -5,6 +5,13 @@ import os, sys
 # Run this in the root directory containing afm files and a texmf branch
 # Before running, all encoding files a_* should be renamed to xch_*
 # and the corresponding changes applied to xcharter.map
+t2aligs='''% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
+'''
 encfiles=set()
 enclst=[]
 enclstt1=[]
@@ -32,7 +39,7 @@ with open(tmfv+"/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 "+tmfv+"/fonts/enc/dvips/xcharter/"+enc+" -v "+a+" "+tmp[0]
+				s="/Library/TeX/texbin/afm2tfm "+h+" -T "+tmfv+"/fonts/enc/dvips/xcharter/"+enc+" -v "+a+" "+tmp[0]
 				afmcmds.append(s)
 					
 encfilest1=set(enclstt1)
@@ -77,7 +84,7 @@ with open(tmfv+"/fonts/map/dvips/xcharter/XCharter.map",'r') as f:
 				if a[-6:]=="--base":
 					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]
+				s="afm2tfm "+h+" -T "+tmfv+"/fonts/enc/dvips/xcharter/"+enc+" -v "+a+" "+tmp[0]
 				afmcmds.append(s)
 			
 #print newlines
@@ -92,6 +99,7 @@ for f in sorted(encfiles):
 		tmp=tmp.replace("AutoEnc","AutoEnc1")
 		tmp=tmp.replace("one.oldstyle","one.Alt.oldstyle")
 	with open(tmfv+"/fonts/enc/dvips/xcharter/"+f,'w') as g:
+		g.write(t2aligs)
 		g.write(tmp)
 
 #Finally, write the afmcmds and update mapfile
@@ -100,7 +108,7 @@ for j in range(len(vflst)):
 	s=afmcmds[j]
 	print s
 	if os.system(s)==0:
-		if os.system("/usr/texbin/vptovf "+a)==0:
+		if os.system("vptovf "+a)==0:
 			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")
diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
index 54dd92ba465..ada759abe5c 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 23aebcc9030..415576ce969 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
+++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
@@ -178,7 +178,20 @@ Because the package supplies a file named {\tt XCharter.fontspec} whose contents
 \usepackage{fontspec}
 \setmainfont{XCharter}
 \end{verbatim}
-With unicode-encoded text, you will, in particular,  have complete access to the newly added Cyrillic glyphs.
+With unicode-encoded text, you will, in particular,  have complete access to the Cyrillic glyphs.
+
+\section{XCharter and PDF/A}
+There are a number of PDF/A validators available, though their outputs can and do differ when applied to the same document. I've tried the following.
+\begin{itemize}
+\item
+Adobe Acrobat Pro. Almost all XCharter documents validate PDF/A-1b.
+\item 
+\url{https://www.pdf-online.com/osa/validate.aspx} is a free online validator. Almost all XCharter documents validate PDF/A-1b.
+\item 
+The free {\tt veraPDF} validator is much stricter. Most documents produced using XCharter failed. 
+\end{itemize}
+\newpage
+
 \section{Using Cyrillic with pdflatex}
 The OT$2$ encoding, now considered as obsolete because it is 7-bit, is nonetheless useful to scholars who wish to write short segments using a Cyrillic script from a Western keyboard. There are two means of doing this, one using control sequences for the characters (e.g., \verb|\CYRA| for Cyrillic A) and the other using ligatures to access the characters. Tables setting out the substitutions available may be consulted at \url{http://herbert.the-little-red-haired-girl.org/dvi/pdf/cyrillic.pdf}.