xcharter (2dec13)

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

3 files changed, 13 insertions, 66 deletions

diff --git a/Master/texmf-dist/doc/fonts/xcharter/README b/Master/texmf-dist/doc/fonts/xcharter/README
index b6eaceaddb9..9bf7f163922 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
-				2013-10-28
+				2013-12-01
 
 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/tex-archive/help/Catalogue/licenses.lppl.html 
 for the details of that license. 
@@ -21,80 +21,28 @@ Original Bitstream Free font license:
 The font modifications are Copyright (c) 2013, Michael Sharpe.
 
 
-Current version: 1.00
+Current version: 1.01
 
-The otf fonts contain all the kerning and other tables. Should you wish to modify these yourself, the basic LaTeX support files may be re-created using the command
+Changes in version 1.01
+The method of generating the support files has changed from version 1.00, and is outlined below. The result is that the problem is version 1.00, where under the option oldstyle (or the macro \useosf) the resulting oldstyle 1 (like a short 1) failed to behave as a the character 1 when copied from a pdf file, is now rectified.
+
+The otf fonts contain all the kerning and other tables. Should you wish to modify these yourself, the following outlie of the method should be followed.
+
+Make four copies of of the otf files and rename them internally and externally to XCharter1... Place the 8 otf files in a new folder along with a subfolder named texmf. Then run the command
 
 /usr/texbin/autoinst  --noupdmap  --noswash --notitling --noornaments --target=./texmf --encoding=TS1,T1,LY1 --vendor=public --typeface=xcharter *.otf
 
-after cding to the folder containing just the modified otf fonts and a subfolder named texmf. You should replace the newly generated XCharter.sty with the one from the distribution in order to preserve its functionality. The names of the encoding files should also be modified appropriately from those assigned by autoinst. I used the following bash shell script, which assumed you are in the directory holding the otf files and a texmf subfolder:
+after cding to the new folder. You should replace the newly generated XCharter.sty and .fd files the with the ones from the distribution in order to preserve the functionality of the package. The names of the encoding files should also be modified appropriately from those assigned by autoinst. I used the following bash shell script, which assumed you are in the directory holding the otf files and a texmf subfolder:
 
 #!/bin/bash
 pushd texmf/fonts/map/dvips/xcharter
 sed -i '' 's/<\[a_/<\[XCh_/g' XCharter.map
 popd
 pushd texmf/fonts/enc/dvips/xcharter
-for f in *.enc; do mv ${f} XCh${f:1}; done
+for f in *.enc; do mv ${f} xch${f:1}; done
 popd
 
-Creating the parallel version of the osf fonts (labelled osfx) with a small 1 rather than a short I for oldstyle one was somewhat laborious:
-1. Copy the relevant .enc files, providing them new names, and replace one.oldstyle to oneAlt.oldstyle in each. Change the internal encoding name as well.
-2. Use afm2tfm to create a new raw tfm file for each, with names like XCharter-Roman-osfx-t1--base.tfm. The commands were
-
-  afm2tfm XCharter-Bold -T XCh_o3e.enc XCharter-Bold-osfx-ly1--base 
-  afm2tfm XCharter-Bold -T XCh_57c.enc XCharter-Bold-osfx-t1--base 
-  afm2tfm XCharter-Bold -T XCh_gev.enc XCharter-Bold-osfx-sc-ly1--base
-  afm2tfm XCharter-Bold -T XCh_7ya.enc XCharter-Bold-osfx-sc-t1--base 
-  afm2tfm XCharter-BoldItalic -T XCh_o3e.enc XCharter-BoldItalic-osfx-ly1--base
-  afm2tfm XCharter-BoldItalic -T XCh_57c.enc XCharter-BoldItalic-osfx-t1--base
-  afm2tfm XCharter-BoldItalic -T XCh_gev.enc XCharter-BoldItalic-osfx-sc-ly1--base
-  afm2tfm XCharter-BoldItalic -T XCh_7ya.enc XCharter-BoldItalic-osfx-sc-t1--base
-  afm2tfm XCharter-Italic -T XCh_o3e.enc XCharter-Italic-osfx-ly1--base
-  afm2tfm XCharter-Italic -T XCh_57c.enc XCharter-Italic-osfx-t1--base
-  afm2tfm XCharter-Italic -T XCh_gev.enc XCharter-Italic-osfx-sc-ly1--base
-  afm2tfm XCharter-Italic -T XCh_7ya.enc XCharter-Italic-osfx-sc-t1--base
-  afm2tfm XCharter-Roman -T XCh_o3e.enc XCharter-Roman-osfx-ly1--base
-  afm2tfm XCharter-Roman -T XCh_57c.enc XCharter-Roman-osfx-t1--base
-  afm2tfm XCharter-Roman -T XCh_nhq.enc XCharter-Roman-osfx-sc-ly1--base
-  afm2tfm XCharter-Roman -T XCh_774.enc XCharter-Roman-osfx-sc-t1--base
-
-Copy the resulting tfm files to the tfm folder and assemble the output with appropriate pfb files appended to XCharter.map.
-
-3. Create virtual vpl files for each osf tfm/vf pair, using
-
-vftovp XCharter-Roman-osf-t1 XCharter-Roman-osf-t1 XCharter-Roman-osf-t1
-vftovp XCharter-Roman-osf-ly1 XCharter-Roman-osf-ly1 XCharter-Roman-osf-ly1
-vftovp XCharter-Roman-osf-sc-t1 XCharter-Roman-osf-sc-t1 XCharter-Roman-osf-sc-t1
-#tftopl XCharter-Roman-osf-sc-ot1 XCharter-Roman-osf-sc-ot1
-vftovp XCharter-Roman-osf-sc-ly1 XCharter-Roman-osf-sc-ly1 XCharter-Roman-osf-sc-ly1
-vftovp XCharter-Bold-osf-t1 XCharter-Bold-osf-t1 XCharter-Bold-osf-t1
-vftovp XCharter-Bold-osf-ly1 XCharter-Bold-osf-ly1 XCharter-Bold-osf-ly1
-vftovp XCharter-Bold-osf-sc-t1 XCharter-Bold-osf-sc-t1 XCharter-Bold-osf-sc-t1
-vftovp XCharter-Bold-osf-sc-ly1 XCharter-Bold-osf-sc-ly1 XCharter-Bold-osf-sc-ly1
-vftovp XCharter-BoldItalic-osf-t1 XCharter-BoldItalic-osf-t1 XCharter-BoldItalic-osf-t1
-vftovp XCharter-BoldItalic-osf-ly1 XCharter-BoldItalic-osf-ly1 XCharter-BoldItalic-osf-ly1
-vftovp XCharter-BoldItalic-osf-sc-t1 XCharter-BoldItalic-osf-sc-t1 XCharter-BoldItalic-osf-sc-t1
-vftovp XCharter-BoldItalic-osf-sc-ly1 XCharter-BoldItalic-osf-sc-ly1 XCharter-BoldItalic-osf-sc-ly1
-vftovp XCharter-Italic-osf-t1 XCharter-Italic-osf-t1 XCharter-Italic-osf-t1
-vftovp XCharter-Italic-osf-ly1 XCharter-Italic-osf-ly1 XCharter-Italic-osf-ly1
-vftovp XCharter-Italic-osf-sc-t1 XCharter-Italic-osf-sc-t1 XCharter-Italic-osf-sc-t1
-vftovp XCharter-Italic-osf-sc-ly1 XCharter-Italic-osf-sc-ly1 XCharter-Italic-osf-sc-ly1
-
-4 For each resulting vpl, change the name fragment -osf- to -osfx- and within the file, remove the two checksum lines and change the source file name similarly. That is, in the section
-
-MAPFONT D 0
-
-change
-
-(FONTNAME XCharter-Bold-osf-t1--base) to (FONTNAME XCharter-Bold-osfx-t1--base)
-
-5. Copy the resulting vpl files to a new empty folder, cd to that folder and run
-
-apply vptovf *.vpl
-
-to produce the required tfm/vf alternate pairs, and move them to appropriate locations.
-
-(It would have been much easier to write a simple fontinst driver script for this, but the current version of otftotfm does not place all f-ligatures in the correct slots as specified by the T1 and LY1 encodings.)
+Discard all newly generated XCharter1*.tfm EXCEPT for the 32 files containing -tosf and not -ts1. Do the same for XCharter1*.vf. These are referenced by the fd files in the package.
 
 Please send comments and bug reports or suggestions for improvement to
 
diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
index 9dbc8527106..e472738b894 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 58a1c9dfc69..e8ab5b6218d 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
+++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
@@ -4,15 +4,14 @@
 
 \usepackage[scaled=1.03,varqu,varl]{zi4}
 \usepackage[type1]{cabin}
-\pdfmapfile{+XCharter.map}
 \usepackage[scaled=.98]{XCharter}
 \usepackage[T1]{fontenc}
 \linespread{1.04}
 \usepackage[libertine,scaled=1.07]{newtxmath}
 \usepackage[cal=boondoxo,bb=boondox,frak=boondox]{mathalfa}
 \useosf
-\font\osfIfnt=XCharter-Roman-osf-t1 at 11pt
-\font\osffnt=XCharter-Roman-osfx-t1 at 11pt
+\font\osfIfnt=XCharter-Roman-tosf-t1 at 11pt
+\font\osffnt=XCharter1-Roman-tosf-t1 at 11pt
 
 %\usepackage[cal=rsfso]{mathalfa}
 %\usepackage{bm}% load after all math to give access to bold math