From 89c7aec2b8cf45fdb7baba8fc6a92b81b9628194 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 10 Nov 2011 00:00:57 +0000 Subject: frcursive (9nov11) git-svn-id: svn://tug.org/texlive/trunk@24559 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/frcursive/COPYING | 658 ++++++------ Master/texmf-dist/doc/fonts/frcursive/FILES | 105 -- Master/texmf-dist/doc/fonts/frcursive/README | 45 +- Master/texmf-dist/doc/fonts/frcursive/doc/Makefile | 34 - Master/texmf-dist/doc/fonts/frcursive/fcsource.tex | 83 -- Master/texmf-dist/doc/fonts/frcursive/figs.tex | 38 - .../texmf-dist/doc/fonts/frcursive/frcursive.pdf | Bin 230289 -> 316661 bytes .../texmf-dist/doc/fonts/frcursive/latex/Makefile | 7 - Master/texmf-dist/doc/fonts/frcursive/lttst.tex | 62 -- Master/texmf-dist/doc/fonts/frcursive/mf/Makefile | 9 - Master/texmf-dist/doc/fonts/frcursive/mkdrv.sh | 171 ---- .../texmf-dist/doc/fonts/frcursive/test/Makefile | 42 - Master/texmf-dist/doc/fonts/frcursive/tfc.tex | 53 - Master/texmf-dist/doc/fonts/frcursive/txt-en.tex | 176 ---- Master/texmf-dist/doc/fonts/frcursive/txt-fr.tex | 645 ------------ .../fonts/map/dvips/frcursive/frcursive.map | 23 + .../fonts/source/public/frcursive/frca10.mf | 29 - .../fonts/source/public/frcursive/frcbx11.mf | 29 - .../fonts/source/public/frcursive/frcbx12.mf | 29 - .../fonts/source/public/frcursive/frcbx17.mf | 29 - .../fonts/source/public/frcursive/frcbx6.mf | 29 + .../fonts/source/public/frcursive/frcbx7.mf | 29 - .../fonts/source/public/frcursive/frcbx8.mf | 29 - .../fonts/source/public/frcursive/frcbx9.mf | 29 - .../fonts/source/public/frcursive/frcc11.mf | 29 - .../fonts/source/public/frcursive/frcc12.mf | 29 - .../fonts/source/public/frcursive/frcc6.mf | 29 + .../fonts/source/public/frcursive/frcf10.mf | 1 + .../fonts/source/public/frcursive/frcf11.mf | 36 - .../fonts/source/public/frcursive/frcf12.mf | 36 - .../fonts/source/public/frcursive/frcf14.mf | 1 + .../fonts/source/public/frcursive/frcf6.mf | 37 + .../fonts/source/public/frcursive/frcr11.mf | 29 - .../fonts/source/public/frcursive/frcr12.mf | 29 - .../fonts/source/public/frcursive/frcr17.mf | 29 - .../fonts/source/public/frcursive/frcr6.mf | 29 + .../fonts/source/public/frcursive/frcr7.mf | 29 - .../fonts/source/public/frcursive/frcr8.mf | 29 - .../fonts/source/public/frcursive/frcr9.mf | 29 - .../fonts/source/public/frcursive/frcsl11.mf | 29 - .../fonts/source/public/frcursive/frcsl12.mf | 29 - .../fonts/source/public/frcursive/frcsl17.mf | 29 - .../fonts/source/public/frcursive/frcsl6.mf | 29 + .../fonts/source/public/frcursive/frcsl7.mf | 29 - .../fonts/source/public/frcursive/frcsl8.mf | 29 - .../fonts/source/public/frcursive/frcsl9.mf | 29 - .../fonts/source/public/frcursive/frcslbx11.mf | 29 - .../fonts/source/public/frcursive/frcslbx12.mf | 29 - .../fonts/source/public/frcursive/frcslbx17.mf | 29 - .../fonts/source/public/frcursive/frcslbx6.mf | 29 + .../fonts/source/public/frcursive/frcslbx7.mf | 29 - .../fonts/source/public/frcursive/frcslbx8.mf | 29 - .../fonts/source/public/frcursive/frcslbx9.mf | 29 - .../fonts/source/public/frcursive/frcslc10.mf | 29 + .../fonts/source/public/frcursive/frcslc14.mf | 29 + .../fonts/source/public/frcursive/frcslc6.mf | 29 + .../fonts/source/public/frcursive/frcursive.mf | 1067 +++++++++++++------- .../fonts/source/public/frcursive/frcw10.mf | 29 - .../fonts/tfm/public/frcursive/frca10.tfm | Bin 3048 -> 3972 bytes .../fonts/tfm/public/frcursive/frcbx10.tfm | Bin 3060 -> 3984 bytes .../fonts/tfm/public/frcursive/frcbx11.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcbx12.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcbx14.tfm | Bin 3060 -> 3984 bytes .../fonts/tfm/public/frcursive/frcbx17.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcbx6.tfm | Bin 0 -> 3984 bytes .../fonts/tfm/public/frcursive/frcbx7.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcbx8.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcbx9.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcc10.tfm | Bin 3060 -> 3984 bytes .../fonts/tfm/public/frcursive/frcc11.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcc12.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcc14.tfm | Bin 3060 -> 3984 bytes .../fonts/tfm/public/frcursive/frcc6.tfm | Bin 0 -> 3984 bytes .../fonts/tfm/public/frcursive/frcf10.tfm | Bin 3060 -> 3980 bytes .../fonts/tfm/public/frcursive/frcf11.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcf12.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcf14.tfm | Bin 3060 -> 3980 bytes .../fonts/tfm/public/frcursive/frcf6.tfm | Bin 0 -> 3980 bytes .../fonts/tfm/public/frcursive/frcr10.tfm | Bin 3060 -> 3984 bytes .../fonts/tfm/public/frcursive/frcr11.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcr12.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcr14.tfm | Bin 3060 -> 3984 bytes .../fonts/tfm/public/frcursive/frcr17.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcr6.tfm | Bin 0 -> 3984 bytes .../fonts/tfm/public/frcursive/frcr7.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcr8.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcr9.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcsl10.tfm | Bin 3060 -> 3984 bytes .../fonts/tfm/public/frcursive/frcsl11.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcsl12.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcsl14.tfm | Bin 3060 -> 3984 bytes .../fonts/tfm/public/frcursive/frcsl17.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcsl6.tfm | Bin 0 -> 3984 bytes .../fonts/tfm/public/frcursive/frcsl7.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcsl8.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcsl9.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcslbx10.tfm | Bin 3060 -> 3984 bytes .../fonts/tfm/public/frcursive/frcslbx11.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcslbx12.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcslbx14.tfm | Bin 3060 -> 3984 bytes .../fonts/tfm/public/frcursive/frcslbx17.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcslbx6.tfm | Bin 0 -> 3984 bytes .../fonts/tfm/public/frcursive/frcslbx7.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcslbx8.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcslbx9.tfm | Bin 3060 -> 0 bytes .../fonts/tfm/public/frcursive/frcslc10.tfm | Bin 0 -> 3984 bytes .../fonts/tfm/public/frcursive/frcslc14.tfm | Bin 0 -> 3984 bytes .../fonts/tfm/public/frcursive/frcslc6.tfm | Bin 0 -> 3984 bytes .../fonts/tfm/public/frcursive/frcw10.tfm | Bin 3032 -> 3952 bytes .../fonts/type1/public/frcursive/frca10.pfb | Bin 0 -> 89469 bytes .../fonts/type1/public/frcursive/frcbx10.pfb | Bin 0 -> 83505 bytes .../fonts/type1/public/frcursive/frcbx14.pfb | Bin 0 -> 81161 bytes .../fonts/type1/public/frcursive/frcbx6.pfb | Bin 0 -> 85147 bytes .../fonts/type1/public/frcursive/frcc10.pfb | Bin 0 -> 80084 bytes .../fonts/type1/public/frcursive/frcc14.pfb | Bin 0 -> 88894 bytes .../fonts/type1/public/frcursive/frcc6.pfb | Bin 0 -> 82898 bytes .../fonts/type1/public/frcursive/frcf10.pfb | Bin 0 -> 86773 bytes .../fonts/type1/public/frcursive/frcf14.pfb | Bin 0 -> 86533 bytes .../fonts/type1/public/frcursive/frcf6.pfb | Bin 0 -> 85143 bytes .../fonts/type1/public/frcursive/frcr10.pfb | Bin 0 -> 82803 bytes .../fonts/type1/public/frcursive/frcr14.pfb | Bin 0 -> 86225 bytes .../fonts/type1/public/frcursive/frcr6.pfb | Bin 0 -> 82377 bytes .../fonts/type1/public/frcursive/frcsl10.pfb | Bin 0 -> 80233 bytes .../fonts/type1/public/frcursive/frcsl14.pfb | Bin 0 -> 78168 bytes .../fonts/type1/public/frcursive/frcsl6.pfb | Bin 0 -> 81583 bytes .../fonts/type1/public/frcursive/frcslbx10.pfb | Bin 0 -> 80938 bytes .../fonts/type1/public/frcursive/frcslbx14.pfb | Bin 0 -> 82059 bytes .../fonts/type1/public/frcursive/frcslbx6.pfb | Bin 0 -> 83205 bytes .../fonts/type1/public/frcursive/frcslc10.pfb | Bin 0 -> 80746 bytes .../fonts/type1/public/frcursive/frcslc14.pfb | Bin 0 -> 80937 bytes .../fonts/type1/public/frcursive/frcslc6.pfb | Bin 0 -> 77012 bytes .../fonts/type1/public/frcursive/frcw10.pfb | Bin 0 -> 85509 bytes Master/texmf-dist/metapost/frcursive/chars.mp | 143 --- Master/texmf-dist/source/fonts/frcursive/Makefile | 125 --- .../source/fonts/frcursive/frcursive.dtx | 258 ----- .../source/fonts/frcursive/frcursive.ins | 17 - Master/texmf-dist/tex/latex/frcursive/ot1frc.fd | 7 +- Master/texmf-dist/tex/latex/frcursive/t1frc.fd | 21 +- Master/tlpkg/libexec/ctan2tds | 1 - Master/tlpkg/tlpsrc/frcursive.tlpsrc | 1 + 140 files changed, 1366 insertions(+), 3580 deletions(-) delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/FILES delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/doc/Makefile delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/fcsource.tex delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/figs.tex delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/latex/Makefile delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/lttst.tex delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/mf/Makefile delete mode 100755 Master/texmf-dist/doc/fonts/frcursive/mkdrv.sh delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/test/Makefile delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/tfc.tex delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/txt-en.tex delete mode 100644 Master/texmf-dist/doc/fonts/frcursive/txt-fr.tex create mode 100644 Master/texmf-dist/fonts/map/dvips/frcursive/frcursive.map delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frca10.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcbx11.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcbx12.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcbx17.mf create mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcbx6.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcbx7.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcbx8.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcbx9.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcc11.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcc12.mf create mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcc6.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcf11.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcf12.mf create mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcf6.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcr11.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcr12.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcr17.mf create mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcr6.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcr7.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcr8.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcr9.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcsl11.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcsl12.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcsl17.mf create mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcsl6.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcsl7.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcsl8.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcsl9.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcslbx11.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcslbx12.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcslbx17.mf create mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcslbx6.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcslbx7.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcslbx8.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcslbx9.mf create mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcslc10.mf create mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcslc14.mf create mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcslc6.mf delete mode 100644 Master/texmf-dist/fonts/source/public/frcursive/frcw10.mf delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcbx11.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcbx12.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcbx17.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcbx6.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcbx7.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcbx8.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcbx9.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcc11.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcc12.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcc6.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcf11.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcf12.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcf6.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcr11.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcr12.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcr17.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcr6.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcr7.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcr8.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcr9.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcsl11.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcsl12.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcsl17.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcsl6.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcsl7.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcsl8.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcsl9.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx11.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx12.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx17.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx6.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx7.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx8.tfm delete mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx9.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcslc10.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcslc14.tfm create mode 100644 Master/texmf-dist/fonts/tfm/public/frcursive/frcslc6.tfm create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frca10.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcbx10.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcbx14.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcbx6.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcc10.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcc14.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcc6.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcf10.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcf14.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcf6.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcr10.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcr14.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcr6.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcsl10.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcsl14.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcsl6.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcslbx10.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcslbx14.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcslbx6.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcslc10.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcslc14.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcslc6.pfb create mode 100644 Master/texmf-dist/fonts/type1/public/frcursive/frcw10.pfb delete mode 100644 Master/texmf-dist/metapost/frcursive/chars.mp delete mode 100644 Master/texmf-dist/source/fonts/frcursive/Makefile delete mode 100644 Master/texmf-dist/source/fonts/frcursive/frcursive.dtx delete mode 100644 Master/texmf-dist/source/fonts/frcursive/frcursive.ins (limited to 'Master') diff --git a/Master/texmf-dist/doc/fonts/frcursive/COPYING b/Master/texmf-dist/doc/fonts/frcursive/COPYING index d60c31a97a5..5b05fe86893 100644 --- a/Master/texmf-dist/doc/fonts/frcursive/COPYING +++ b/Master/texmf-dist/doc/fonts/frcursive/COPYING @@ -1,340 +1,318 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. + +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.2 1999-09-03 + +Copyright 1999 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the license under which the +base LaTeX distribution is distributed. + +You may use this license for any program that you have written and wish +to distribute. This license may be particularly suitable if your +program is TeX-related (such as a LaTeX package), but you may use it +even if your program is unrelated to TeX. The section `WHETHER AND HOW +TO DISTRIBUTE PROGRAMS UNDER THIS LICENSE', below, gives instructions, +examples, and recommendations for authors who are considering +distributing their programs under this license. + +In this license document, `The Program' refers to any program +distributed under this license. + +This license gives conditions under which The Program may be distributed +and conditions under which modified versions of The Program may be +distributed. Individual files of The Program may bear supplementary +and/or superseding conditions on modification of themselves and on the +distribution of modified versions of themselves, but *no* file of The +Program may bear supplementary or superseding conditions on the +distribution of an unmodified copy of the file. A distributor wishing +to distribute a complete, unmodified copy of The Program therefore +needs to check the conditions only in this license and nowhere else. + +Activities other than distribution and/or modification of The Program +are not covered by this license; they are outside its scope. In +particular, the act of running The Program is not restricted. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of The Program +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +The Program. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +in the base LaTeX distribution for suggestions. + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +You may distribute a complete, unmodified copy of The Program. +Distribution of only part of The Program is not allowed. + +You may not modify in any way a file of The Program that bears a legal +notice forbidding modification of that file. + +You may distribute a modified file of The Program if, and only if, the +following eight conditions are met: + + 1. You must meet any additional conditions borne by the file on the + distribution of a modified version of the file as described below + in the subsection `Additional Conditions on Individual Files of + The Program'. + + 2. If the file is a LaTeX software file, then you must meet any + applicable additional conditions on the distribution of a modified + version of the file that are described below in the subsection + `Additional Conditions on LaTeX Software Files'. + + 3. You must not distribute the modified file with the filename of the + original file. + + 4. In the modified file, you must acknowledge the authorship and + name of the original file, and the name (if any) of the program + which contains it. + + 5. You must change any identification string in the file to indicate + clearly that the modified file is not part of The Program. + + 6. You must change any addresses in the modified file for the + reporting of errors in the file or in The Program generally to + ensure that reports for files no longer maintained by the original + maintainers will be directed to the maintainers of the modified + files. + + 7. You must distribute the modified file under a license that forbids + distribution both of the modified file and of any files derived + from the modified file with the filename of the original file. + + 8. You must do either (A) or (B): + + (A) distribute a copy of The Program (that is, a complete, + unmodified copy of The Program) together with the modified + file; if your distribution of the modified file is made by + offering access to copy the modified file from a designated + place, then offering equivalent access to copy The Program + from the same place meets this condition, even though third + parties are not compelled to copy The Program along with the + modified file; + + (B) provide to those who receive the modified file information + that is sufficient for them to obtain a copy of The Program; + for example, you may provide a Uniform Resource Locator (URL) + for a site that you expect will provide them with a copy of + The Program free of charge (either the version from which + your modification is derived, or perhaps a later version). + +Note that in the above, `distribution' of a file means making the +file available to others by any means. This includes, for instance, +installing the file on any machine in such a way that the file is +accessible by users other than yourself. `Modification' of a file +means any procedure that produces a derivative file under any +applicable law -- that is, a file containing the original file or +a significant portion of it, either verbatim or with modifications +and/or translated into another language. + +Changing the name of a file (other than as necessitated by the file +conventions of the target file systems) is considered to be a +modification of the file. + +The distribution conditions in this license do not have to be +applied to files that have been modified in accordance with the +above conditions. Note, however, that Condition 7. does apply to +any such modified file. + +The conditions above are not intended to prohibit, and hence do not +apply to, the updating, by any method, of a file so that it becomes +identical to the latest version of that file of The Program. + + + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a file of The Program, even for your own +personal use, without also meeting the above eight conditions for +distributing the modified file. While you might intend that such +modified files will never be distributed, often this will happen by +accident -- you may forget that you have modified the file; or it may +not occur to you when allowing others to access the modified file +that you are thus distributing it and violating the conditions of +this license. It is usually in your best interest to keep your copy +of The Program identical with the public one. Many programs provide +ways to control the behavior of that program without altering its +licensed files. + + +Additional Conditions on Individual Files of The Program +-------------------------------------------------------- + +An individual file of The Program may bear additional conditions that +supplement and/or supersede the conditions in this license if, and only +if, such additional conditions exclusively concern modification of the +file or distribution of a modified version of the file. The conditions +on individual files of The Program therefore may differ only with +respect to the kind and extent of modification of those files that +is allowed, and with respect to the distribution of modified versions +of those files. + + +Additional Conditions on LaTeX Software Files +--------------------------------------------- + +If a file of The Program is intended to be used with LaTeX (that is, +if it is a LaTeX software file), then the following additional +conditions, which supplement and/or supersede the conditions +above, apply to the file according to its filename extension: + + - You may not modify any file with filename extension `.ins' since + these are installation files containing the legal notices that are + placed in the files they generate. + + - You may distribute modified versions of files with filename + extension `.fd' (LaTeX font definition files) under the standard + conditions of the LPPL as described above. You may also distribute + such modified LaTeX font definition files with their original names + provided that: + (1) the only changes to the original files either enable use of + available fonts or prevent attempts to access unavailable fonts; + (2) you also distribute the original, unmodified files (TeX input + paths can be used to control which set of LaTeX font definition + files is actually used by TeX). + + - You may distribute modified versions of files with filename + extension `.cfg' (configuration files) with their original names. + The Program may (and usually will) specify the range of commands + that are allowed in a particular configuration file. + +Because of portability and exchangeability issues in LaTeX software, +The LaTeX3 Project deprecates the distribution of modified versions of +components of LaTeX or of generally available contributed code for them, +but such distribution can meet the conditions of this license. + + +NO WARRANTY +=========== + +There is no warranty for The Program. Except when otherwise stated in +writing, The Copyright Holder provides The Program `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for +a particular purpose. The entire risk as to the quality and performance +of The Program is with you. Should The Program prove defective, you +assume the cost of all necessary servicing, repair, or correction. + +In no event unless agreed to in writing will The Copyright Holder, or +any author named in the files of The Program, or any other party who may +distribute and/or modify The Program as permitted above, be liable to +you for damages, including any general, special, incidental or +consequential damages arising out of any use of The Program or out of +inability to use The Program (including, but not limited to, loss of +data, data being rendered inaccurate, or losses sustained by anyone as +a result of any failure of The Program to operate with any other +programs), even if The Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +WHETHER AND HOW TO DISTRIBUTE PROGRAMS UNDER THIS LICENSE +========================================================= + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +programs under this license. These authors are addressed as `you' in +this section. + + +Choosing This License or Another License +---------------------------------------- + +If for any part of your program you want or need to use *distribution* +conditions that differ from those in this license, then do not refer to +this license anywhere in your program but instead distribute your +program under a different license. You may use the text of this license +as a model for your own license, but your license should not refer to +the LPPL or otherwise give the impression that your program is +distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your program is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their programs under any +license are encouraged to read it. + + +How to Use This License +----------------------- + +To use this license, place in each of the files of your program both +an explicit copyright notice including your name and the year and also +a statement that the distribution and/or modification of the file is +constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2001 M. Y. Name + % + % This program may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.2 + % of this license or (at your option) any later version. + % The latest version of this license is in + % http://www.latex-project.org/lppl.txt + % and version 1.2 or later is part of all distributions of LaTeX + % version 1999/12/01 or later. + % + % This program consists of the files pig.dtx and pig.ins + +Given such a notice and statement in a file, the conditions given in +this license document would apply, with `The Program' referring to the +two files `pig.dtx' and `pig.ins', and `The Copyright Holder' referring +to the person `M. Y. Name'. + + +Important Recommendations +------------------------- + + Defining What Constitutes The Program + + The LPPL requires that distributions of The Program contain all the + files of The Program. It is therefore important that you provide a + way for the licensee to determine which files constitute The Program. + This could, for example, be achieved by explicitly listing all the + files of The Program near the copyright notice of each file or by + using a line like + + % This program consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise The Program. + + Noting Exceptional Files + + If The Program contains any files bearing additional conditions on + modification, or on distribution of modified versions, of those + files (other than those listed in `Additional Conditions on LaTeX + Software Files'), then it is recommended that The Program contain a + prominent file that defines the exceptional conditions, and either + lists the exceptional files or defines one or more categories of + exceptional files. + + Files containing the text of a license (such as this file) are + often examples of files bearing more restrictive conditions on + modification. LaTeX configuration files (with filename extension + `.cfg') are examples of files bearing less restrictive conditions + on the distribution of a modified version of the file. The + additional conditions on LaTeX software given above are examples + of declaring a category of files bearing exceptional additional + conditions. + + + diff --git a/Master/texmf-dist/doc/fonts/frcursive/FILES b/Master/texmf-dist/doc/fonts/frcursive/FILES deleted file mode 100644 index 39c5101c57f..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/FILES +++ /dev/null @@ -1,105 +0,0 @@ -The distribution contains the following directories: - -* mf/ - - This directory contains the source files for the font in its various - flavours. Following the TeX Directory Standard, this directory has to be - copied somewhere inside .../texmf/fonts/source. The files in this directory - are the following: - - - frcursive.mf - - This is the main source file, it contains general parameter definitions - and the shape of all glyphs, depending on parameters that should be - defined in driver files. - - - mkdrv.sh - - This shell script is used to generate driver files with appropriate - parameters for various sizes and variants. Run it with no parameters to - get a description of the syntax. - - - frca10.mf, frcw10.mf - - Example driver files with non-standard parameters. The "frca" variant is an - "academic" one, i.e. with integer ratios between base height, ascenders - and descenders. The "frcw" variant is a modification of the standard - "frcr10" with wide inter-letter links. - - - Makefile - - This is used to build the standard set of sources. - - The directory also contains a set of driver files produced by "mkdrv.sh". - -* latex/ - - This directory contains support sources for LaTeX. The directory has to be - copied somewhere in .../texmf/tex/latex (in the case of teTeX, I don't know - the other distributions). The following files are present: - - - t1frc.fd - - The font is defined in the T1 (TeX text extended) encoding, thus providing - (most of) the standard Latin-1 accented letters. This file is the - associated NFSS font definition. - - - frcursive.dtx, frcursive.ins - - The Docstrip literate source for the LaTeX support package. The ".ins" - file is the script to make the proper ".sty" package file. - - - Makefile - - This contains the rule to make the package out of its literate source. To - build the formatted documentation, use the Makefile from the doc/ - directory. - -* doc/ - - This directory contains various pieces of documentation associated to the - font. - - - COPYING - - This is the copyright terms that apply to the font's sources, i.e. the - General Public License. - - - FILES - - This file... - - - fcsource.tex - - This is a driver file for pretty-printing the Metafont sources, it - contains some TeX macros that are used when typesetting the TeX file - produced by mft from frcursive.mf. - - - Makefile - - This contains rules to build Postscript versions of the pretty-printed - source and the documentation for the LaTeX support package. - -* test/ - - This directory contains some files used to test the font. - - - Makefile - - Just some rules to compile the examples. - - - figs.tex, chars.mp - - This is an experiment at using the font's sources to produce Metapost - figures. Just use "make figs.ps" to make it compile. - - - tfrc.tex, lttst.tex - - Two raw test files, in Plain TeX and LaTeX respectively, that I use during - developement. - - - txt-fr.tex, txt-en.tex - - These two example files are longer texts typeset using French Cursive - variants (the first chapter of "Les Trois Mousquetaires" by Dumas and - "Robinson Crusoe" by Defoe, respectively). diff --git a/Master/texmf-dist/doc/fonts/frcursive/README b/Master/texmf-dist/doc/fonts/frcursive/README index 24671bbb8c9..532b0d4527d 100644 --- a/Master/texmf-dist/doc/fonts/frcursive/README +++ b/Master/texmf-dist/doc/fonts/frcursive/README @@ -1,33 +1,33 @@ This is the French Cursive font, a cursive hand-writing font family in the style of the French academic running-hand, written with Metafont. -This package is dated February 2nd, 2004. +This package is dated November 9, 2011. Installation ------------ -Copy the files from the "mf" subdirectory somewhere in Metafont's search path -and the files from the "latex" subdirectory somewhere in LaTeX's search path. +To install frcursive, you need to copy the files in appropriate places so that +TeX and Metafont can find them. -On Unix, the top-level Makefile can be used to install the files. Become root -and just type "make install" to copy the files in a place appropriate for TeX -distributions that respect the hierarchy standard. You may change the value of -the variables at the beginning of the Makefile if you don't want to install -the files in "/usr/share/texmf/...". - -You may have to update TeX's databases by running "texhash" or "mktexlsr" -(this is for Kpathsea-based distributions like teTeX) or a similar command. +Installation by hand goes like this, assuming TEXMF is the base directory of +you TeX installation (that would be /usr/share/texmf, C:\localtexmf, or +something like that): +- copy the files from the "latex" directory into TEXMF/tex/latex/frcursive/ +- copy the files from the "mf" directory into TEXMF/fonts/source/public/frcursive/ +To use the Adobe Type 1 versions, +- copy the files from the "type1" directory into TEXMF/fonts/type1/public/frcursive/ +- copy the files from the "tfm" directory into TEXMF/fonts/tfm/public/frcursive/ +- copy "frcursive.map" into TEXMF/fonts/map/dvips/frcursive/ +- make sure the TEXMF/web2c/updmap.cfg contains the line + MixedMap frcursive.map +You may have to update TeX's databases by running "texhash" or "mktexlsr". Usage ----- -The "doc" directory contains some documentation, but more would be a good -thing. The file "latex/frcursive.dtx" contains documentation for the LaTeX -package. The "test" directory contains some examples in plain TeX and LaTeX. - -Look at doc/FILES for a more descriptive list of files. +The file "frcursive.pdf" contains the documentation of the LaTeX package. Feedback @@ -40,13 +40,22 @@ continuous (but slow) developement. Check out the home page at Enjoy ! -© Emmanuel Beffara , 2001--2004 -For those interested in legal stuff, this work is covered by the GPL license. +© Emmanuel Beffara , 2001--2011 +For those interested in legal stuff, this work is covered by the LPPL license. ChangeLog --------- +2011/11/09: + - various packaging updates + - Type 1 version included in the distribution + +2005/04/16: + - changed the codes of link glyphs to the range 0--32 + - added all accented letters of the T1 encoding + - less design sizes + 2004/02/02: - added the square brackets and the slash - added some hinting information diff --git a/Master/texmf-dist/doc/fonts/frcursive/doc/Makefile b/Master/texmf-dist/doc/fonts/frcursive/doc/Makefile deleted file mode 100644 index 4325f2d400d..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/doc/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -MP = mpost --interaction=batchmode -SRC = ../mf -LTX = ../latex - -MPATH = env MFINPUTS=$(SRC):$$MFINPUTS -LMPATH = $(MPATH) TEXINPUTS=$(LTX):$$TEXINPUTS - -all: fcsource.ps frcursive.ps - -clean: - rm -f *~ *.*pk *.tfm frcursive.* mfplain.* *.log *.aux *.toc *.dvi *.ps - -#-- the pretty-printed source - -fcsource.dvi: fcsource.tex frcursive.tex $(SRC)/frcr10.mf - $(MPATH) tex $< -frcursive.tex: ../mf/frcursive.mf - mft $< - -#-- the LaTeX package's documentation - -frcursive.dvi: $(LTX)/frcursive.dtx $(LTX)/frcursive.sty $(SRC)/frcr10.mf - $(LMPATH) latex $< - -#-- generic rules - -%.ps: %.dvi $(SRC)/frcr10.mf - dvips $< -o $@ - -$(SRC)/frcr10.mf: - @make -C $(SRC) - -$(LTX)/frcursive.sty: - @make -C $(LTX) diff --git a/Master/texmf-dist/doc/fonts/frcursive/fcsource.tex b/Master/texmf-dist/doc/fonts/frcursive/fcsource.tex deleted file mode 100644 index 04d214fb7a0..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/fcsource.tex +++ /dev/null @@ -1,83 +0,0 @@ -% This files contains macros used to pretty-print the Metafont source file of -% the French-Cursive typeface. It acts as a driver file: compile it after -% processing frcursive.mf through mft to get the DVI document. The font itself -% must be available since it is used in the source's comments. - -%-- some fonts - -\font\tentex=ectt10 -\font\eightrm=cmr8 -\font\tensc=cmcsc10 -\font\titlefont=cmcsc14 -\font\fc=frcr10 -\tenrm - -%-- some useful macros - -\def\cs#1{{\tt\string#1}} -\def\item{% - \par\noindent% - --\kern 1.5ex\relax} -\def\deflist#1{\halign{\kern\parindent\relax##\hfil&\ = ##\hfil\cr#1}} - -%-- a nice title - -\def\title#1,#2.{% - \begingroup% - \parindent=0pt% - \parfillskip=0pt% - \leftskip=3em plus 1fil% - \rightskip=\leftskip% - {\titlefont #1}\medskip - {\tensc \let\cr\medskip \ignorespaces #2}\bigskip% - \vrule height 0.4pt width 10cm\bigskip% - \endgroup} - -%-- sectioning - -\newwrite\tocfile -\openout\tocfile=\jobname.toc - -\newcount\secnum -\outer\def\sec#1.{% - \par\vfil\break% - \advance\secnum1\relax\subsecnum0% - \sechead{$\oldstyle\the\secnum.$ #1}% - \write\tocfile{\noexpand\tocsec{\the\pageno}{\the\secnum}{#1}}} - -\def\sechead#1{% - \centerline{\tensc #1}% - \centerline{\vrule height 0.4pt width 5em}% - \bigskip} - -\newcount\subsecnum -\outer\def\subsec#1.{% - \medbreak% - \advance\subsecnum1% - \centerline{\it\the\subsecnum. #1.}% - \smallskip} - -%-- generating the toc file - -\def\tocsec#1#2#3{% - \medskip% - \line{\kern2cm% - \hbox to 7mm{$\oldstyle#2.$\hfil}#3 \xleaders\hbox{ . }\hfil\ #1% - \kern2cm}} - -%-- input the processed Metafont source - -\input frcursive - -%-- generating the table of contents - -\closeout\tocfile - -\vfill\eject -\nopagenumbers -\topskip 0pt plus 1fill -\sechead{Table of contents} -\input\jobname.toc -\vfill - -\end diff --git a/Master/texmf-dist/doc/fonts/frcursive/figs.tex b/Master/texmf-dist/doc/fonts/frcursive/figs.tex deleted file mode 100644 index 40651c2a4c8..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/figs.tex +++ /dev/null @@ -1,38 +0,0 @@ -\documentclass{article} -\usepackage[a4paper,margin=2cm]{geometry} -\usepackage{graphicx} -\begin{document} - -\newcount\c -\c=`a -\def\loopc{% - \includegraphics{chars.\the\c}\par\pagebreak - \advance\c1% - \message{\the\c}% - \ifnum\c>`z\relax\else\expandafter\loopc\fi} -\loopc - -\end{document} - -This is the uppercase A in French Cursive, in its regular flavour at ten -points base size: -\begin{center} - \includegraphics[scale=0.3]{chars.65} -\end{center} -And these are three representative lowercase letters, showing ascending and -descending loops: -\begin{center} - \includegraphics[scale=0.3]{chars.97} \hfil - \includegraphics[scale=0.3]{chars.98} \hfil - \includegraphics[scale=0.3]{chars.106} -\end{center} -But these are isolated letters, without links. If we add the appropriate links -and spacings, here is the result: -\begin{center} - \includegraphics[scale=0.3]{chars.0} -\end{center} -The same inside text looks like this: -{\usefont{T1}{frc}{m}{n}abject}. -Isn't is nice? - -\end{document} diff --git a/Master/texmf-dist/doc/fonts/frcursive/frcursive.pdf b/Master/texmf-dist/doc/fonts/frcursive/frcursive.pdf index 5581a34d635..c8c22d347d6 100644 Binary files a/Master/texmf-dist/doc/fonts/frcursive/frcursive.pdf and b/Master/texmf-dist/doc/fonts/frcursive/frcursive.pdf differ diff --git a/Master/texmf-dist/doc/fonts/frcursive/latex/Makefile b/Master/texmf-dist/doc/fonts/frcursive/latex/Makefile deleted file mode 100644 index e77d86c3479..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/latex/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -all: frcursive.sty - -clean: - rm -f *.log *.sty - -frcursive.sty: frcursive.ins frcursive.dtx - latex --interaction=batchmode $< diff --git a/Master/texmf-dist/doc/fonts/frcursive/lttst.tex b/Master/texmf-dist/doc/fonts/frcursive/lttst.tex deleted file mode 100644 index 1c035784b59..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/lttst.tex +++ /dev/null @@ -1,62 +0,0 @@ -\documentclass{article} - -\usepackage[frenchb]{babel} -\usepackage[latin1]{inputenc} -\usepackage[T1]{fontenc} -\usepackage{color} - -\usepackage{frcursive} - -\renewcommand{\seyesDefault}{\color{blue}} - -\begin{document} - -Voici un texte destiné à essayer diverses commandes de convenance pour -l'utilisation de la police French Cursive. Un aspect difficile concerne -l'interligne, parce que les lettres de cette police sont plus hautes et plus -profondes que celles de Computer Modern, par exemple. Il faut en fait ajouter -un tiers à l'interligne, sans quoi un mot \textcursive{haut} peut bousculer -l'espacement d'une ligne par rapport aux autres, ce qui choque à la lecture. -On pourrait se dire que, de toutes façons, les règles typographiques à -respecter en écriture cursive ne sont pas les même qu'en imprimerie, il -n'empèche que le problème de l'interligne est à considérer. Si le mot se -trouve aussi être \textcursive{profond}, les dégâts sont encore plus visibles. -Une solution consiste à donner le bon interligne à tout le paragraphe, -cependant il devient trop grand pour les polices usuelles. Autant n'écrire que -des paragraphes complets en cursif. - -\begin{cursive} - En effet, si l'on se restreint à l'écriture cursive dans tout un paragraphe, - il est possible d'agrandir l'interligne pour ce paragraphe de telle sorte - que l'espacement de lignes consécutives soit suffisant. À présent, plus de - problème d'irrégularité. Cependant, si l'idée venait d'introduire à nouveau - du texte en \textrm{caractères d'imprimerie}, celui-ci pourrait paraître - trop petit au milieu du texte environnant. -\end{cursive} - -Un effet intéressant peut consister à écrire du texte cursif par-dessus des -lignes comme dans un cahier. On rend donc explicite la ligne de base, les -lignes pour petites lettres, barres et boucle montantes, et les lignes pour -barres et boucles descendantes. Mais voici quel est l'effet obtenu: -\begin{quote} - \cursive - \seyes{Les lignes ne sont pas régulièrement disposées.} -\end{quote} -Mais ce qui est bien, c'est que la commande \texttt{\string\seyes} utilisée se -base uniquement sur les dimensions de certains caractères, si bien qu'il est -possible de s'en servir avec Computer Modern: -\begin{quote} - \seyes{Le résultat est particulier...} -\end{quote} -Mais surtout on peut utiliser la variante ``académique'' de French Cursive, où -les rapports entre dimensions de base sont entiers: -\begin{quote} - \cursive\acadshape - \seyes[\color{red}]{Et là on obtient quelque chose de régulier !} -\end{quote} -Par contre le texte sur lequel les lignes sont insérées est composé en mode -horizontal, ce qui interdit de composer un paragraphe entier de cette façon. -Pluieurs remèdes sont imaginables, je tenterai de les mettre en \oe uvre si le -besoin s'en fait sentir... - -\end{document} diff --git a/Master/texmf-dist/doc/fonts/frcursive/mf/Makefile b/Master/texmf-dist/doc/fonts/frcursive/mf/Makefile deleted file mode 100644 index ae49a9de4ad..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/mf/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# This makefile assumes that as long as frcr10.mf is present, all standard -# drivers are. - -all: frcr10.mf -frcr10.mf: mkdrv.sh - ./mkdrv.sh default - -clean: - rm -f *~ frcr*.mf frcbx*.mf frcsl*.mf frcslbx*.mf frcc*.mf frcf*.mf diff --git a/Master/texmf-dist/doc/fonts/frcursive/mkdrv.sh b/Master/texmf-dist/doc/fonts/frcursive/mkdrv.sh deleted file mode 100755 index 0102a56d0c0..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/mkdrv.sh +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/sh -# -# Automatic generation of driver files for French Cursive. -# -# © Emmanuel Beffara, 2001--2004. This script is covered by the GPL licence, -# and is part of the French Cursive font sources. - -calc() -{ - ( echo "scale=3"; echo $* ) | bc -l -} - -make_driver() -{ - DESCR="" # textual description - IDENT="" # font identifier - SIZE=$1 # specific size in points - - EX=0 # value of ex# in sharp points - THIN=0.2 # thickness of thin drawings - MED=0.4 # thickness of medium drawings - THICK=0.6 # thickness of thick drawings - DOT=0.8 # diameter of dots - - WIDTH=0.8 # base width - SLANT=0 # slant factor - - ACCW=0.7 # relative width of accents - - FIXED=false # fixed-thickness version ? - - shift - while [ "$#" != 0 ]; do - case $1 in - bold) IDENT="${IDENT}B"; MED=0.55; THICK=0.8; DOT=1.25; - DESCR="${DESCR}bold ";; - callig) IDENT="${IDENT}C"; MED=0.3; THICK=0.8; - DESCR="${DESCR}calligraphic ";; - ext) IDENT="${IDENT}X"; WIDTH=0.9; - DESCR="${DESCR}extended ";; - slant) IDENT="${IDENT}SL"; SLANT=0.3; - DESCR="${DESCR}slanted ";; - fixed) IDENT="${IDENT}F"; FIXED=true; - THIN=$MED; THICK=$MED; DOT=`calc "2*$MED"`; - DESCR="${DESCR}fixed-thickness ";; - esac - shift - done - - # The value of ex# is computed the same way as for Computer Modern: - EX=`calc "$SIZE*15.5"`/36 - - # The base width is multiplied by a scale factor related to height - WIDTH=`calc "$WIDTH/e(l($SIZE/10)/6)"` - - # Correct the thickness values according to the size: - THIN=`calc "$THIN*$SIZE/10"` - MED=`calc "$MED*$SIZE/10"` - THICK=`calc "$THICK*$SIZE/10"` - DOT=`calc "$DOT*$SIZE/10"` - - # The identifier is "FRC" followed by the letters above (or "R") - IDENT="FRC${IDENT:-R}" - - # And here we go... - - cat < at " - exit 1 - fi - - local SIZE - for SIZE in $SIZES; do - local RS=$(echo "x=$SIZE;y=x-x%1;if(x%1>.5)y+1else y" | bc) - local FN="$NAME${RS%%.*}.mf" - echo "making $FN" - make_driver $SIZE $OPTS > $FN - done -} - -if [ "$#" = 0 ]; then - cat < at - $(basename $0) default - -The second form produces a set of standard variants and sizes. - -The modifiers are words among: - bold = thicker stems and hairlines - callig = more contrasted stems and hairlines - fixed = fixed thickness - ext = slightly extended width - slant = well, slanted... - -The sizes are expressed in points, they can be non-integer. The file names -produced are of the form .mf. -EOF -elif [ "$1" = default ]; then - make_series frcr at 7 8 9 10 10.95 12 14.4 17.28 - make_series frcsl slant at 7 8 9 10 10.95 12 14.4 17.28 - make_series frcbx bold ext at 7 8 9 10 10.95 12 14.4 17.28 - make_series frcslbx slant bold ext at 7 8 9 10 10.95 12 14.4 17.28 - make_series frcc callig at 10 10.95 12 14.4 - make_series frcf fixed at 10 10.95 12 14.4 -else - make_series $@ -fi diff --git a/Master/texmf-dist/doc/fonts/frcursive/test/Makefile b/Master/texmf-dist/doc/fonts/frcursive/test/Makefile deleted file mode 100644 index 84f2d9074c3..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/test/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -MP = mpost --interaction=scrollmode -SRC = ../mf -LTX = ../latex - -MPATH = env MFINPUTS=$(SRC):$$MFINPUTS -LMPATH = $(MPATH) TEXINPUTS=$(LTX):$$TEXINPUTS - -all: figs.ps lttst.ps txt-fr.dvi txt-en.dvi - -clean: - rm -f *~ *.*pk *.tfm *.dvi *.ps *.log *.[0-9]* *.aux - rm -f frcursive.* mfplain.* - -#-- A LaTeX example - -lttst.dvi: lttst.tex $(SRC)/frcr10.mf $(LTX)/t1frc.fd $(LTX)/frcursive.sty - $(LMPATH) latex lttst - -#-- An example with Metapost figures - -figs.dvi: figs.tex chars.97 $(SRC)/frcr10.mf $(LTX)/frcursive.sty - $(LMPATH) latex $< - -mfplain.mem: - ini$(MP) "mfplain dump" - -chars.97: chars.mp mfplain.mem $(SRC)/frcr10.mf $(SRC)/frcursive.mf - $(MPATH) $(MP) --mem mfplain $< - -#-- Generic rules. - -$(LTX)/frcursive.sty: $(LTX)/frcursive.dtx - @make -C $(LTX) - -$(SRC)/frcr10.mf: - @make -C $(SRC) - -%.ps: %.dvi - $(MPATH) dvips $< -o $@ - -%.dvi: %.tex $(SRC)/frcr10.mf - $(MPATH) tex $< diff --git a/Master/texmf-dist/doc/fonts/frcursive/tfc.tex b/Master/texmf-dist/doc/fonts/frcursive/tfc.tex deleted file mode 100644 index b40c2e22781..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/tfc.tex +++ /dev/null @@ -1,53 +0,0 @@ -%\magnification=2000 -\hoffset -.9in -\voffset -.9in -\hsize=10cm \baselineskip=16pt \parindent=0pt -\def\stepstop{.} -\def\dostep#1{% - \expandafter\ifx\csname#1\endcsname\.\stepstop\else% - \do{#1}\expandafter\dostep\fi} - -\def\fnt#1{\font\f=frc#1\f} - -{\fnt{c17} La police French-Cursive} - -\def\try#1{\par\fnt{#1}\char189portez! ce [vieux/jeune] \char190whisky? au -juge blond qui (fume/boit)} -\def\do#1{\try{#110}}\dostep r{bx}fwc{sl}. -\try{r7}\try{bx7} -\fnt{r10} - -%\font\tryfont=psch10\tryfont portez ce vieux whisky au juge blond qui fume - -\bigskip Évidemment, mais le meilleur moyen de se faire une idée, c'est de -tenter une collection de pangrammes (c'est-à-dire des phrases qui contiennent -toutes les lettres): - -\medskip - -Dès Noël, où un zéphyr haï me vêt de glaçons würmiens, je dîne d'exquis -rôtis de boeuf au kir, à l'aÿ d'âge mûr, \&~caetera. % æ ? - -\medskip - -R\&D, Argh, förlåt, \char154, Övningskörning - -De l'art ou du Cauchon ? ``Ah'', fit-il. - -Blomonoxvmvnvxömönöxamanaxbmbnbxemenex. - -\chardef\HL=131 -\chardef\LL=139 - -Nouveauté: le «oe» est obtenu par kerning, mais le ``o\HL e'' peut -s'obtenir en mettant la liaison à la main. Ceci permet des fantaisies comme ce -b\HL\HL\HL\HL\HL\HL el espacement. Le principe s'étend aux liaisons -ba\LL\LL\LL\LL\LL\LL sses. Conséquence: \par -\line{il d\LL\leaders\hbox{\LL}\hfil\LL evient -po\HL\leaders\hbox{\HL}\hfil\HL ssible -de bien s'am\LL\leaders\hbox{\LL}\hfil\LL user !} - -\fnt{a10} -Ceci est une variante dont les proportions sont du genre «Académique». - -\bye diff --git a/Master/texmf-dist/doc/fonts/frcursive/txt-en.tex b/Master/texmf-dist/doc/fonts/frcursive/txt-en.tex deleted file mode 100644 index 55ed5456110..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/txt-en.tex +++ /dev/null @@ -1,176 +0,0 @@ -\hoffset=-1in \advance\hoffset2cm \voffset=\hoffset -\hsize=17cm \vsize=26cm - -\font\tenrm=frcr12 -\font\bold=frcbx12 -\font\calligraphic=frcbx17 - -\tenrm\baselineskip=21.75pt - -\centerline{\calligraphic Robinson Crusoe} -\smallskip\centerline{by Daniel Defoe} - -\bigskip - -\centerline{\bold Chapter One} - -\medskip - -I was born in the year 1632, in the city of York, of a good family, -though not of that country, my father being a foreigner of Bremen, who -settled first at Hull. He got a good estate by merchandise, and leaving -off his trade lived afterward at York, from whence he had married my -mother, whose relations were named Robinson, a good family in that -country, and from whom I was called Robinson Kreutznear; but by the -usual corruption of words in England we are now called, nay, we call -ourselves, and write our name, Crusoe, and so my companions always -called me. - -I had two elder brothers, one of which was lieutenant-colonel to an -English regiment of foot in Flanders, formerly commanded by the famous -Colonel Lockhart, and was killed at the battle near Dunkirk against the -Spaniards; what became of my second brother I never knew, any more than -my father and mother did know what was become of me. - -Being the third son of the family, and not bred to any trade, my head -began to be filled very early with rambling thoughts. My father, who -was very ancient, had given me a competent share of learning, as far as -house-education and a country free school generally goes, and designed -me for the law, but I would be satisfied with nothing but going to sea; -and my inclination to this led me so strongly against the will, nay, the -commands, of my father, and against all the entreaties and persuasions -of my mother and other friends, that there seemed to be something fatal -in that propension of nature tending directly to the life of misery -which was to befall me. - -My father, a wise and grave man, gave me serious and excellent counsel -against what he foresaw was my design. He called me one morning into -his chamber, where he was confined by the gout, and expostulated very -warmly with me upon this subject. He asked me what reasons more than a -mere wandering inclination I had for leaving my father's house and my -native country, where I might be well introduced, and had a prospect of -raising my fortunes by application and industry, with a life of ease and -pleasure. He told me it was for men of desperate fortunes on one hand, -or of aspiring, superior fortunes on the other, who went abroad upon -adventures, to rise by enterprise, and make themselves famous in -undertakings of a nature out of the common road; that these things were -all either too far above me, or too far below me; that mine was the -middle state, or what might be called the upper station of low life, -which he had found by long experience was the best state in the world, -the most suited to human happiness, not exposed to the miseries and -hardships, the labor and sufferings, of the mechanic part of mankind, -and not embarrassed with the pride, luxury, ambition, and envy of the -upper part of mankind. He told me I might judge of the happiness of -this state by one thing, viz., that this was the state of life which all -other people envied; that kings have frequently lamented the miserable -consequences of being born to great things, and wished they had been -placed in the middle of the two extremes, between the mean and the -great; that the wise man gave his testimony to this as the just standard -of true felicity, when he prayed to have neither poverty nor riches. - -He bid me observe it, and I should always find that the calamities of -life were shared among the upper and lower part of mankind; but that the -middle station had the fewest disasters and was not exposed to so many -vicissitudes as the higher or lower part of mankind. Nay, they were not -subjected to so many distempers and uneasiness either of body or mind as -those were who, by vicious living, luxury, and extravagancies on one -hand, or by hard labor, want of necessaries, and mean or insufficient -diet on the other hand, bring distempers upon themselves by the natural -consequences of their way of living; that the middle station of life was -calculated for all kind of virtues and all kind of enjoyments; that -peace and plenty were the handmaids of a middle fortune; that -temperance, moderation, quietness, health, society, all agreeable -diversions, and all desirable pleasures, were the blessings attending -the middle station of life; that this way men went silently and smoothly -through the world, and comfortably out of it, not embarrassed with the -labors of the hands or of the head, not sold to the life of slavery for -daily bread, or harassed with perplexed circumstances, which rob the -soul of peace, and the body of rest; not enraged with the passion of -envy, or secret burning lust of ambition for great things; but in easy -circumstances sliding gently through the world, and sensibly tasting the -sweets of living, without the bitter, feeling that they are happy, and -learning by every day's experience to know it more sensibly. - -After this, he pressed me earnestly, and in the most affectionate -manner, not to play the young man, not to precipitate myself into -miseries which Nature and the station of life I was born in seemed to -have provided against; that I was under no necessity of seeking my -bread; that he would do well for me, and endeavor to enter me fairly -into the station of life which he had been just recommending to me; and -that if I was not very easy and happy in the world it must be my mere -fate or fault that must hinder it, and that he should have nothing to -answer for, having thus discharged his duty in warning me against -measures which he knew would be to my hurt; in a word, that as he would -do very kind things for me if I would stay and settle at home as he -directed, so he would not have so much hand in my misfortunes, as to -give me any encouragement to go away. And to close all, he told me I -had my elder brother for an example, to whom he had used the same -earnest persuasions to keep him from going into the Low Country wars, -but could not prevail, his young desires prompting him to run into the -army, where he was killed; and though he said he would not cease to pray -for me, yet he would venture to say to me, that if I did take this -foolish step, God would not bless me, and I would have leisure hereafter -to reflect upon having neglected his counsel when there might be none to -assist in my recovery. - -I observed in this last part of his discourse, which was truly -prophetic, though I suppose my father did not know it to be so himself - -I say, I observed the tears run down his face very plentifully, and -especially when he spoke of my brother who was killed; and that when he -spoke of my having leisure to repent, and none to assist me, he was so -moved that he broke off the discourse, and told me his heart was so full -he could say no more to me. - -I was sincerely affected with this discourse, as indeed who could be -otherwise? and I resolved not to think of going abroad any more, but to -settle at home according to my father's desire. But alas! a few days -wore it all off; and, in short, to prevent any of my father's farther -importunities, in a few weeks after I resolved to run quite away from -him. However, I did not act so hastily neither as my first heat of -resolution prompted, but I took my mother, at a time when I thought her -a little pleasanter than ordinary, and told her that my thoughts were so -entirely bent upon seeing the world that I should never settle to -anything with resolution enough to go through with it, and my father had -better give me his consent than force me to go without it; that I was -now eighteen years old, which was too late to go apprentice to a trade, -or clerk to an attorney; that I was sure if I did, I should never serve -out my time, and I should certainly run away from my master before my -time was out, and go to sea; and if she would speak to my father to let -me go but one voyage abroad, if I came home again and did not like it, I -would go no more, and I would promise by a double diligence to recover -that time I had lost. - -This put my mother into a great passion. She told me she knew it would -be to no purpose to speak to my father upon any such subject; that he -knew too well what was my interest to give his consent to anything so -much for my hurt, and that she wondered how I could think of any such -thing after such a discourse as I had had with my father, and such kind -and tender expressions as she knew my father had used to me; and that, -in short, if I would ruin myself there was no help for me; but I might -depend I should never have their consent to it; that for her part, she -should not have so much hand in my destruction, and I should never have -it to say, that my mother was willing when my father was not. - -Though my mother refused to move it to my father, yet, as I have heard -afterwards, she reported all the discourse to him, and that my father, -after showing a great concern at it, said to her with a sigh, "That boy -might be happy if he would stay at home, but if he goes abroad he will -be the miserablest wretch that was ever born: I can give no consent to -it." - -It was not till almost a year after this that I broke loose, though in -the meantime I continued obstinately deaf to all proposals of settling -to business, and frequently expostulating with my father and mother -about their being so positively determined against what they knew my -inclinations prompted me to. But being one day at Hull, where I went -casually, and without any purpose of making an elopement that time; but -I say, being there, and one of my companions being going by sea to -London, in his father's ship, and prompting me to go with them, with the -common allurement of sea-faring men, viz., that it should cost me -nothing for my passage, I consulted neither father nor mother any more, -nor so much as sent them word of it; but leaving them to hear of it as -they might, without asking God's blessing, or my father's, without any -consideration of circumstances or consequences, and in an ill hour, God -knows. - -\bye diff --git a/Master/texmf-dist/doc/fonts/frcursive/txt-fr.tex b/Master/texmf-dist/doc/fonts/frcursive/txt-fr.tex deleted file mode 100644 index 3247cbd67d2..00000000000 --- a/Master/texmf-dist/doc/fonts/frcursive/txt-fr.tex +++ /dev/null @@ -1,645 +0,0 @@ -\hoffset=-1in \advance\hoffset2cm \voffset=\hoffset -\hsize=17cm \vsize=26.5cm - -\font\tenrm=frcr12 -\font\bf=frcbx12 %} -\font\it=frcsl12 %} -\font\call=frcbx17 - -%\catcode`«=\active \chardef«='23 -%\catcode`»=\active \chardef»='24 - -\tenrm\baselineskip=21.75pt -\tolerance 400 - -\centerline{\call Les Trois Mousquetaires} -\smallskip\centerline{Alexandre Dumas, fils} - -\bigskip -\centerline{\bf Chapitre Premier} -\centerline{\bf Les Trois présents de M. d'Artagnan Père} - -\medskip - -Le premier lundi du mois d'avril 1625, le bourg de Meung, où naquit l'auteur -du {\it Roman de la Rose}, semblait être dans une révolution aussi entière que -si les huguenots en fussent venus faire une seconde Rochelle. Plusieurs -bourgeois, voyant s'enfuir les femmes du côté de la Grande-Rue, entendant les -enfants crier sur le seuil des portes, se hâtaient d'endosser la cuirasse et, -appuyant leur contenance quelque peu incertaine d'un mousquet ou d'une -pertuisane, se dirigeaient vers l'hôtellerie du {\it Franc Meunier}, devant -laquelle s'empressait, en grossissant de minute en minute, un groupe compact, -bruyant et plein de curiosité. - -En ce temps-là les paniques étaient fréquentes, et peu de jours se passaient -sans qu'une ville ou l'autre enregistrât sur ses archives quelque événement de -ce genre. Il y avait les seigneurs qui guerroyaient entre eux~; il y avait le -roi qui faisait la guerre au cardinal~; il y avait l'Espagnol qui faisait la -guerre au roi. Puis, outre ces guerres sourdes ou publiques, secrètes ou -patentes, il y avait encore les voleurs, les mendiants, les huguenots, les -loups et les laquais, qui faisaient la guerre à tout le monde. Les bourgeois -s'armaient toujours contre les voleurs, contre les loups, contre les laquais, ---- souvent contre les seigneurs et les huguenots, --- quelquefois contre le -roi, --- mais jamais contre le cardinal et l'Espagnol. Il résulta donc de -cette habitude prise, que, ce susdit premier lundi du mois d'avril 1625, les -bourgeois, entendant du bruit, et ne voyant ni le guidon jaune et rouge, ni la -livrée du duc de Richelieu, se précipitèrent du côté de l'hôtel du {\it Franc -Meunier}. - -Arrivé là, chacun put voir et reconnaître la cause de cette rumeur. - -Un jeune homme... --- traçons son portrait d'un seul trait de plume~: -figurez-vous don Quichotte à dix-huit ans, don Quichotte décorcelé, sans -haubert et sans cuissards, don Quichotte revêtu d'un pourpoint de laine dont -la couleur bleue s'était transformée en une nuance insaisissable de lie-de-vin -et d'azur céleste. Visage long et brun~; la pommette des joues saillante, -signe d'astuce~; les muscles maxillaires énormément développés, indice -infaillible auquel on reconnaît le Gascon, même sans béret, et notre jeune -homme portait un béret orné d'une espèce de plume, l'oeil ouvert et -intelligent~; le nez crochu, mais finement dessiné~; trop grand pour un -adolescent, trop petit pour un homme fait, et qu'un oeil peu exercé eût pris -pour un fils de fermier en voyage, sans sa longue épée qui, pendue à un -baudrier de peau, battait les mollets de son propriétaire quand il était à -pied, et le poil hérissé de sa monture quand il était à cheval. - -Car notre jeune homme avait une monture, et cette monture était même si -remarquable, qu'elle fut remarquée~: c'était un bidet du Béarn, âgé de douze -ou quatorze ans, jaune de robe, sans crins à la queue, mais non pas sans -javarts aux jambes, et qui, tout en marchant la tête plus bas que les genoux, -ce qui rendait inutile l'application de la martingale, faisait encore -également ses huit lieues par jour. Malheureusement les qualités de ce cheval -étaient si bien cachées sous son poil étrange et son allure incongrue, que -dans un temps où tout le monde se connaissait en chevaux, l'apparition du -susdit bidet à Meung, où il était entré il y avait un quart d'heure à peu près -par la porte de Beaugency, produisit une sensation dont la défaveur rejaillit -jusqu'à son cavalier. - -Et cette sensation avait été d'autant plus pénible au jeune d'Artagnan (ainsi -s'appelait le don Quichotte de cette autre Rossinante), qu'il ne se cachait -pas le côté ridicule que lui donnait, si bon cavalier qu'il fût, une pareille -monture~; aussi avait-il fort soupiré en acceptant le don que lui en avait -fait M. d'Artagnan père. Il n'ignorait pas qu'une pareille bête valait au -moins vingt livres~; il est vrai que les paroles dont le présent avait été -accompagné n'avaient pas de prix. - -«~Mon fils, avait dit le gentilhomme gascon --- dans ce pur patois de Béarn -dont Henri IV n'avait jamais pu parvenir à se défaire ---, mon fils, ce cheval -est né dans la maison de votre père, il y a tantôt treize ans, et y est resté -depuis ce temps-là, ce qui doit vous porter à l'aimer. Ne le vendez jamais, -laissez-le mourir tranquillement et honorablement de vieillesse, et si vous -faites campagne avec lui, ménagez-le comme vous ménageriez un vieux serviteur. -A la cour, continua M. d'Artagnan père, si toutefois vous avez l'honneur d'y -aller, honneur auquel, du reste, votre vieille noblesse vous donne des droits, -soutenez dignement votre nom de gentilhomme, qui a été porté dignement par vos -ancêtres depuis plus de cinq cents ans. Pour vous et pour les vôtres --- par -les vôtres, j'entends vos parents et vos amis ---, ne supportez jamais rien -que de M. le cardinal et du roi. C'est par son courage, entendez-vous bien, -par son courage seul, qu'un gentilhomme fait son chemin aujourd'hui. Quiconque -tremble une seconde laisse peut-être échapper l'appât que, pendant cette -seconde justement, la fortune lui tendait. Vous êtes jeune, vous devez être -brave par deux raisons~: la première, c'est que vous êtes Gascon, et la -seconde, c'est que vous êtes mon fils. Ne craignez pas les occasions et -cherchez les aventures. Je vous ai fait apprendre à manier l'épée~; vous avez -un jarret de fer, un poignet d'acier~; battez-vous à tout propos~; battez-vous -d'autant plus que les duels sont défendus, et que, par conséquent, il y a deux -fois du courage à se battre. Je n'ai, mon fils, à vous donner que quinze écus, -mon cheval et les conseils que vous venez d'entendre. Votre mère y ajoutera la -recette d'un certain baume qu'elle tient d'une bohémienne, et qui a une vertu -miraculeuse pour guérir toute blessure qui n'atteint pas le coeur. Faites -votre profit du tout, et vivez heureusement et longtemps. --- Je n'ai plus -qu'un mot à ajouter, et c'est un exemple que je vous propose, non pas le mien, -car je n'ai, moi, jamais paru à la cour et n'ai fait que les guerres de -religion en volontaire~; je veux parler de M. de Tréville, qui était mon -voisin autrefois, et qui a eu l'honneur de jouer tout enfant avec notre roi -Louis treizième, que Dieu conserve~! Quelquefois leurs jeux dégénéraient en -bataille, et dans ces batailles le roi n'était pas toujours le plus fort. Les -coups qu'il en reçut lui donnèrent beaucoup d'estime et d'amitié pour M. de -Tréville. Plus tard, M. de Tréville se battit contre d'autres dans son premier -voyage à Paris, cinq fois~; depuis la mort du feu roi jusqu'à la majorité du -jeune sans compter les guerres et les sièges, sept fois~; et depuis cette -majorité jusqu'aujourd'hui, cent fois peut-être~! --- Aussi, malgré les édits, -les ordonnances et les arrêts, le voilà capitaine des mousquetaires, -c'est-à-dire chef d'une légion de César, dont le roi fait un très grand cas, -et que M. le cardinal redoute, lui qui ne redoute pas grand-chose, comme -chacun sait. De plus, M. de Tréville gagne dix mille écus par an~; c'est donc -un fort grand seigneur. --- Il a commencé comme vous, allez le voir avec cette -lettre, et réglez-vous sur lui, afin de faire comme lui.~» - -Sur quoi, M. d'Artagnan père ceignit à son fils sa propre épée, l'embrassa -tendrement sur les deux joues et lui donna sa bénédiction. - -En sortant de la chambre paternelle, le jeune homme trouva sa mère qui -l'attendait avec la fameuse recette dont les conseils que nous venons de -rapporter devaient nécessiter un assez fréquent emploi. Les adieux furent de -ce côté plus longs et plus tendres qu'ils ne l'avaient été de l'autre, non pas -que M. d'Artagnan n'aimât son fils, qui était sa seule progéniture, mais M. -d'Artagnan était un homme, et il eût regardé comme indigne d'un homme de se -laisser aller à son émotion, tandis que Mme d'Artagnan était femme et, de -plus, était mère. --- Elle pleura abondamment, et, disons-le à la louange de -M. d'Artagnan fils, quelques efforts qu'il tentât pour rester ferme comme le -devait être un futur mousquetaire, la nature l'emporta, et il versa force -larmes, dont il parvint à grand-peine à cacher la moitié. - -Le même jour le jeune homme se mit en route, muni des trois présents paternels -et qui se composaient, comme nous l'avons dit, de quinze écus, du cheval et de -la lettre pour M. de Tréville~; comme on le pense bien, les conseils avaient -été donnés par-dessus le marché. - -Avec un pareil vade-mecum, d'Artagnan se trouva, au moral comme au physique, -une copie exacte du héros de Cervantes, auquel nous l'avons si heureusement -comparé lorsque nos devoirs d'historien nous ont fait une nécessité de tracer -son portrait. Don Quichotte prenait les moulins à vent pour des géants et les -moutons pour des armées, d'Artagnan prit chaque sourire pour une insulte et -chaque regard pour une provocation. Il en résulta qu'il eut toujours le poing -fermé depuis Tarbes jusqu'à Meung, et que l'un dans l'autre il porta la main -au pommeau de son épée dix fois par jour~; toutefois le poing ne descendit sur -aucune mâchoire, et l'épée ne sortit point de son fourreau. Ce n'est pas que -la vue du malencontreux bidet jaune n'épanouît bien des sourires sur les -visages des passants~; mais, comme au-dessus du bidet sonnait une épée de -taille respectable et qu'au-dessus de cette épée brillait un oeil plutôt -féroce que fier, les passants réprimaient leur hilarité, ou, si l'hilarité -l'emportait sur la prudence, ils tâchaient au moins de ne rire que d'un seul -côté, comme les masques antiques. D'Artagnan demeura donc majestueux et intact -dans sa susceptibilité jusqu'à cette malheureuse ville de Meung. - -Mais là, comme il descendait de cheval à la porte du {\it Franc Meunier} sans -que personne, hôte, garçon ou palefrenier, fût venu prendre l'étrier au -montoir, d'Artagnan avisa à une fenêtre entrouverte du rez-de-chaussée un -gentilhomme de belle taille et de haute mine, quoique au visage légèrement -renfrogné, lequel causait avec deux personnes qui paraissaient l'écouter avec -déférence. D'Artagnan crut tout naturellement, selon son habitude, être -l'objet de la conversation et écouta. Cette fois, d'Artagnan ne s'était trompé -qu'à moitié~: ce n'était pas de lui qu'il était question, mais de son cheval. -Le gentilhomme paraissait énumérer à ses auditeurs toutes ses qualités, et -comme, ainsi que je l'ai dit, les auditeurs paraissaient avoir une grande -déférence pour le narrateur, ils éclataient de rire à tout moment. Or, comme -un demi-sourire suffisait pour éveiller l'irascibilité du jeune homme, on -comprend quel effet produisit sur lui tant de bruyante hilarité. - -Cependant d'Artagnan voulut d'abord se rendre compte de la physionomie de -l'impertinent qui se moquait de lui. Il fixa son regard fier sur l'étranger et -reconnut un homme de quarante à quarante-cinq ans, aux yeux noirs et perçants, -au teint pâle, au nez fortement accentué, à la moustache noire et parfaitement -taillée~; il était vêtu d'un pourpoint et d'un haut-de-chausses violet avec -des aiguillettes de même couleur, sans aucun ornement que les crevés habituels -par lesquels passait la chemise. Ce haut-de-chausses et ce pourpoint, quoique -neufs, paraissaient froissés comme des habits de voyage longtemps renfermés -dans un portemanteau. D'Artagnan fit toutes ces remarques avec la rapidité de -l'observateur le plus minutieux, et sans doute par un sentiment instinctif qui -lui disait que cet inconnu devait avoir une grande influence sur sa vie à -venir. - -Or, comme au moment où d'Artagnan fixait son regard sur le gentilhomme au -pourpoint violet, le gentilhomme faisait à l'endroit du bidet béarnais une de -ses plus savantes et de ses plus profondes démonstrations, ses deux auditeurs -éclatèrent de rire, et lui-même laissa visiblement, contre son habitude, -errer, si l'on peut parler ainsi, un pâle sourire sur son visage. Cette fois, -il n'y avait plus de doute, d'Artagnan était réellement insulté. Aussi, plein -de cette conviction, enfonça-t-il son béret sur ses yeux, et, tâchant de -copier quelques-uns des airs de cour qu'il avait surpris en Gascogne chez des -seigneurs en voyage, il s'avança, une main sur la garde de son épée et l'autre -appuyée sur la hanche. Malheureusement, au fur et à mesure qu'il avançait, la -colère l'aveuglant de plus en plus, au lieu du discours digne et hautain qu'il -avait préparé pour formuler sa provocation, il ne trouva plus au bout de sa -langue qu'une personnalité grossière qu'il accompagna d'un geste furieux. - -«~Eh~! Monsieur, s'écria-t-il, Monsieur, qui vous cachez derrière ce volet~! -oui, vous, dites-moi donc un peu de quoi vous riez, et nous rirons ensemble.~» - -Le gentilhomme ramena lentement les yeux de la monture au cavalier, comme s'il -lui eût fallu un certain temps pour comprendre que c'était à lui que -s'adressaient de si étranges reproches~; puis, lorsqu'il ne put plus conserver -aucun doute, ses sourcils se froncèrent légèrement, et après une assez longue -pause, avec un accent d'ironie et d'insolence impossible à décrire, il -répondit à d'Artagnan~: - -«~Je ne vous parle pas, Monsieur. - ---- Mais je vous parle, moi~!~» s'écria le jeune homme exaspéré de ce mélange - d'insolence et de bonnes manières, de convenances et de dédains. - -L'inconnu le regarda encore un instant avec son léger sourire, et, se retirant -de la fenêtre, sortit lentement de l'hôtellerie pour venir à deux pas de -d'Artagnan se planter en face du cheval. Sa contenance tranquille et sa -physionomie railleuse avaient redoublé l'hilarité de ceux avec lesquels il -causait et qui, eux, étaient restés à la fenêtre. - -D'Artagnan, le voyant arriver, tira son épée d'un pied hors du fourreau. - -«~Ce cheval est décidément ou plutôt a été dans sa jeunesse bouton d'or, -reprit l'inconnu continuant les investigations commencées et s'adressant à ses -auditeurs de la fenêtre, sans paraître aucunement remarquer l'exaspération de -d'Artagnan, qui cependant se redressait entre lui et eux. C'est une couleur -fort connue en botanique, mais jusqu'à présent fort rare chez les chevaux. - ---- Tel rit du cheval qui n'oserait pas rire du maître~! s'écria l'émule de - Tréville, furieux. - ---- Je ne ris pas souvent, Monsieur, reprit l'inconnu, ainsi que vous pouvez le - voir vous-même à l'air de mon visage~; mais je tiens cependant à conserver - le privilège de rire quand il me plaît. - ---- Et moi, s'écria d'Artagnan, je ne veux pas qu'on rie quand il me déplaît~! - ---- En vérité, Monsieur~? continua l'inconnu plus calme que jamais, eh bien, - c'est parfaitement juste.~» Et tournant sur ses talons, il s'apprêta à - rentrer dans l'hôtellerie par la grande porte, sous laquelle d'Artagnan en - arrivant avait remarqué un cheval tout sellé. - -Mais d'Artagnan n'était pas de caractère à lâcher ainsi un homme qui avait eu -l'insolence de se moquer de lui. Il tira son épée entièrement du fourreau et -se mit à sa poursuite en criant~: - -«~Tournez, tournez donc, Monsieur le railleur, que je ne vous frappe point -par-derrière. - ---- Me frapper, moi~! dit l'autre en pivotant sur ses talons et en regardant le - jeune homme avec autant d'étonnement que de mépris. Allons, allons donc, - mon cher, vous êtes fou~!~» - -Puis, à demi-voix, et comme s'il se fût parlé à lui-même~: - -«~C'est fâcheux, continua-t-il, quelle trouvaille pour Sa Majesté, qui cherche -des braves de tous côtés pour recruter ses mousquetaires~!~» - -Il achevait à peine, que d'Artagnan lui allongea un si furieux coup de pointe, -que, s'il n'eût fait vivement un bond en arrière, il est probable qu'il eût -plaisanté pour la dernière fois. L'inconnu vit alors que la chose passait la -raillerie, tira son épée, salua son adversaire et se mit gravement en garde. -Mais au même moment ses deux auditeurs, accompagnés de l'hôte, tombèrent sur -d'Artagnan à grands coups de bâtons, de pelles et de pincettes. Cela fit une -diversion si rapide et si complète à l'attaque, que l'adversaire de -d'Artagnan, pendant que celui-ci se retournait pour faire face à cette grêle -de coups, rengainait avec la même précision, et, d'acteur qu'il avait manqué -d'être, redevenait spectateur du combat, rôle dont il s'acquitta avec son -impassibilité ordinaire, tout en marmottant néanmoins~: - -«~La peste soit des Gascons~! Remettez-le sur son cheval orange, et qu'il s'en -aille~! - ---- Pas avant de t'avoir tué, lâche~!~» criait d'Artagnan tout en faisant face - du mieux qu'il pouvait et sans reculer d'un pas à ses trois ennemis, qui le - moulaient de coups. - -«~Encore une gasconnade, murmura le gentilhomme. Sur mon honneur, ces Gascons -sont incorrigibles~! Continuez donc la danse, puisqu'il le veut absolument. -Quand il sera las, il dira qu'il en a assez.~» - -Mais l'inconnu ne savait pas encore à quel genre d'entêté il avait affaire~; -d'Artagnan n'était pas homme à jamais demander merci. Le combat continua donc -quelques secondes encore~; enfin d'Artagnan, épuisé, laissa échapper son épée -qu'un coup de bâton brisa en deux morceaux. Un autre coup, qui lui entama le -front, le renversa presque en même temps tout sanglant et presque évanoui. - -C'est à ce moment que de tous côtés on accourut sur le lieu de la scène. -L'hôte, craignant du scandale, emporta, avec l'aide de ses garçons, le blessé -dans la cuisine où quelques soins lui furent accordés. - -Quant au gentilhomme, il était revenu prendre sa place à la fenêtre et -regardait avec une certaine impatience toute cette foule, qui semblait en -demeurant là lui causer une vive contrariété. - -«~Eh bien, comment va cet enragé~? reprit-il en se retournant au bruit de la -porte qui s'ouvrit et en s'adressant à l'hôte qui venait s'informer de sa -santé. - ---- Votre Excellence est saine et sauve~? demanda l'hôte. - ---- Oui, parfaitement saine et sauve, mon cher hôtelier, et c'est moi qui vous - demande ce qu'est devenu notre jeune homme. - ---- Il va mieux, dit l'hôte~: il s'est évanoui tout à fait. - ---- Vraiment~? fit le gentilhomme. - ---- Mais avant de s'évanouir il a rassemblé toutes ses forces pour vous appeler - et vous défier en vous appelant. - ---- Mais c'est donc le diable en personne que ce gaillard-là~! s'écria - l'inconnu. - ---- Oh~! non, Votre Excellence, ce n'est pas le diable, reprit l'hôte avec une - grimace de mépris, car pendant son évanouissement nous l'avons fouillé, et - il n'a dans son paquet qu'une chemise et dans sa bourse que onze écus, ce - qui ne l'a pas empêché de dire en s'évanouissant que si pareille chose - était arrivée à Paris, vous vous en repentiriez tout de suite, tandis - qu'ici vous ne vous en repentirez que plus tard. - ---- Alors, dit froidement l'inconnu, c'est quelque prince du sang déguisé. - ---- Je vous dis cela, mon gentilhomme, reprit l'hôte, afin que vous vous teniez - sur vos gardes. - ---- Et il n'a nommé personne dans sa colère~? - ---- Si fait, il frappait sur sa poche, et il disait~: «~Nous verrons ce que M. - de Tréville pensera de cette insulte faite à son protégé.~» - ---- M. de Tréville~? dit l'inconnu en devenant attentif~; il frappait sur sa - poche en prononçant le nom de M. de Tréville~?... Voyons, mon cher hôte, - pendant que votre jeune homme était évanoui, vous n'avez pas été, j'en suis - bien sûr, sans regarder aussi cette poche-là. Qu'y avait-il~? - ---- Une lettre adressée à M. de Tréville, capitaine des mousquetaires. - ---- En vérité~! - ---- C'est comme j'ai l'honneur de vous le dire, Excellence.~» - -L'hôte, qui n'était pas doué d'une grande perspicacité, ne remarqua point -l'expression que ses paroles avaient donnée à la physionomie de l'inconnu. -Celui-ci quitta le rebord de la croisée sur lequel il était toujours resté -appuyé du bout du coude, et fronça le sourcil en homme inquiet. - -«~Diable~! murmura-t-il entre ses dents, Tréville m'aurait-il envoyé ce -Gascon~? il est bien jeune~! Mais un coup d'épée est un coup d'épée, quel que -soit l'âge de celui qui le donne, et l'on se défie moins d'un enfant que de -tout autre~; il suffit parfois d'un faible obstacle pour contrarier un grand -dessein.~» - -Et l'inconnu tomba dans une réflexion qui dura quelques minutes. - -«~Voyons, l'hôte, dit-il, est-ce que vous ne me débarrasserez pas de ce -frénétique~? En conscience, je ne puis le tuer, et cependant, ajouta-t-il avec -une expression froidement menaçante, cependant il me gêne. Où est-il~? - ---- Dans la chambre de ma femme, où on le panse, au premier étage. - ---- Ses hardes et son sac sont avec lui~? il n'a pas quitté son pourpoint~? - ---- Tout cela, au contraire, est en bas dans la cuisine. Mais puisqu'il vous - gêne, ce jeune fou... - ---- Sans doute. Il cause dans votre hôtellerie un scandale auquel d'honnêtes - gens ne sauraient résister. Montez chez vous, faites mon compte et - avertissez mon laquais. - ---- Quoi~! Monsieur nous quitte déjà~? - ---- Vous le savez bien, puisque je vous avais donné l'ordre de seller mon - cheval. Ne m'a-t-on point obéi~? - ---- Si fait, et comme Votre Excellence a pu le voir, son cheval est sous la - grande porte, tout appareillé pour partir. - ---- C'est bien, faites ce que je vous ai dit alors.~» - -«~Ouais~! se dit l'hôte, aurait-il peur du petit garçon~?~» - -Mais un coup d'oeil impératif de l'inconnu vint l'arrêter court. Il salua -humblement et sortit. - -«~Il ne faut pas que Milady soit aperçue de ce drôle, continua l'étranger~: -elle ne doit pas tarder à passer~; déjà même elle est en retard. Décidément, -mieux vaut que je monte à cheval et que j'aille au-devant d'elle... Si -seulement je pouvais savoir ce que contient cette lettre adressée à -Tréville~!~» - -Et l'inconnu, tout en marmottant, se dirigea vers la cuisine. - -Pendant ce temps, l'hôte, qui ne doutait pas que ce ne fût la présence du -jeune garçon qui chassât l'inconnu de son hôtellerie, était remonté chez sa -femme et avait trouvé d'Artagnan maître enfin de ses esprits. Alors, tout en -lui faisant comprendre que la police pourrait bien lui faire un mauvais parti -pour avoir été chercher querelle à un grand seigneur --- car, à l'avis de -l'hôte, l'inconnu ne pouvait être qu'un grand seigneur ---, il le détermina, -malgré sa faiblesse, à se lever et à continuer son chemin. D'Artagnan, à -moitié abasourdi, sans pourpoint et la tête tout emmaillotée de linges, se -leva donc et, poussé par l'hôte, commença de descendre~; mais, en arrivant à -la cuisine, la première chose qu'il aperçut fut son provocateur qui causait -tranquillement au marchepied d'un lourd carrosse attelé de deux gros chevaux -normands. - -Son interlocutrice, dont la tête apparaissait encadrée par la portière, était -une femme de vingt à vingt-deux ans. Nous avons déjà dit avec quelle rapidité -d'investigation d'Artagnan embrassait toute une physionomie~; il vit donc du -premier coup d'oeil que la femme était jeune et belle. Or cette beauté le -frappa d'autant plus qu'elle était parfaitement étrangère aux pays méridionaux -que jusque-là d'Artagnan avait habités. C'était une pâle et blonde personne, -aux longs cheveux bouclés tombant sur ses épaules, aux grands yeux bleus -languissants, aux lèvres rosées et aux mains d'albâtre. Elle causait très -vivement avec l'inconnu. - -«~Ainsi, Son Eminence m'ordonne..., disait la dame. - ---- De retourner à l'instant même en Angleterre, et de la prévenir directement -si le duc quittait Londres. - ---- Et quant à mes autres instructions~? demanda la belle voyageuse. - ---- Elles sont renfermées dans cette boîte, que vous n'ouvrirez que de l'autre - côté de la Manche. - ---- Très bien~; et vous, que faites-vous~? - ---- Moi, je retourne à Paris. - ---- Sans châtier cet insolent petit garçon~?~» demanda la dame. - -L'inconnu allait répondre~: mais, au moment où il ouvrait la bouche, -d'Artagnan, qui avait tout entendu, s'élança sur le seuil de la porte. - -«~C'est cet insolent petit garçon qui châtie les autres, s'écria-t-il, et -j'espère bien que cette fois-ci celui qu'il doit châtier ne lui échappera pas -comme la première. - ---- Ne lui échappera pas~? reprit l'inconnu en fronçant le sourcil. - ---- Non, devant une femme, vous n'oseriez pas fuir, je présume. - ---- Songez, s'écria Milady en voyant le gentilhomme porter la main à son épée, - songez que le moindre retard peut tout perdre. - ---- Vous avez raison, s'écria le gentilhomme~; partez donc de votre côté, moi, - je pars du mien.~» - -Et, saluant la dame d'un signe de tête, il s'élança sur son cheval, tandis que -le cocher du carrosse fouettait vigoureusement son attelage. Les deux -interlocuteurs partirent donc au galop, s'éloignant chacun par un côté opposé -de la rue. - -«~Eh~! votre dépense~», vociféra l'hôte, dont l'affection pour son voyageur se -changeait en un profond dédain en voyant qu'il s'éloignait sans solder ses -comptes. - -«~Paie, maroufle~», s'écria le voyageur toujours galopant à son laquais, -lequel jeta aux pieds de l'hôte deux ou trois pièces d'argent et se mit à -galoper après son maître. - -«~Ah~! lâche, ah~! misérable, ah~! faux gentilhomme~!~» cria d'Artagnan -s'élançant à son tour après le laquais. - -Mais le blessé était trop faible encore pour supporter une pareille secousse. -A peine eut-il fait dix pas, que ses oreilles tintèrent, qu'un éblouissement -le prit, qu'un nuage de sang passa sur ses yeux et qu'il tomba au milieu de la -rue, en criant encore~: - -«~Lâche~! lâche~! lâche~! - ---- Il est en effet bien lâche~», murmura l'hôte en s'approchant de d'Artagnan, - et essayant par cette flatterie de se raccommoder avec le pauvre garçon, - comme le héron de la fable avec son limaçon du soir. - -«~Oui, bien lâche, murmura d'Artagnan~; mais elle, bien belle~! - ---- Qui, elle~? demanda l'hôte. - ---- Milady~», balbutia d'Artagnan. - -Et il s'évanouit une seconde fois. - -«~C'est égal, dit l'hôte, j'en perds deux, mais il me reste celui-là, que je -suis sûr de conserver au moins quelques jours. C'est toujours onze écus de -gagnés.~» - -On sait que onze écus faisaient juste la somme qui restait dans la bourse de -d'Artagnan. - -L'hôte avait compté sur onze jours de maladie à un écu par jour~; mais il -avait compté sans son voyageur. Le lendemain, dès cinq heures du matin, -d'Artagnan se leva, descendit lui-même à la cuisine, demanda, outre quelques -autres ingrédients dont la liste n'est pas parvenue jusqu'à nous, du vin, de -l'huile, du romarin, et, la recette de sa mère à la main, se composa un baume -dont il oignit ses nombreuses blessures, renouvelant ses compresses lui-même -et ne voulant admettre l'adjonction d'aucun médecin. Grâce sans doute à -l'efficacité du baume de Bohême, et peut-être aussi grâce à l'absence de tout -docteur, d'Artagnan se trouva sur pied dès le soir même, et à peu près guéri -le lendemain. - -Mais, au moment de payer ce romarin, cette huile et ce vin, seule dépense du -maître qui avait gardé une diète absolue, tandis qu'au contraire le cheval -jaune, au dire de l'hôtelier du moins, avait mangé trois fois plus qu'on n'eût -raisonnablement pu le supposer pour sa taille, d'Artagnan ne trouva dans sa -poche que sa petite bourse de velours râpé ainsi que les onze écus qu'elle -contenait~; mais quant à la lettre adressée à M. de Tréville, elle avait -disparu. - -Le jeune homme commença par chercher cette lettre avec une grande patience, -tournant et retournant vingt fois ses poches et ses goussets, fouillant et -refouillant dans son sac, ouvrant et refermant sa bourse~; mais lorsqu'il eut -acquis la conviction que la lettre était introuvable, il entra dans un -troisième accès de rage, qui faillit lui occasionner une nouvelle consommation -de vin et d'huile aromatisés~: car, en voyant cette jeune mauvaise tête -s'échauffer et menacer de tout casser dans l'établissement si l'on ne -retrouvait pas sa lettre, l'hôte s'était déjà saisi d'un épieu, sa femme d'un -manche à balai, et ses garçons des mêmes bâtons qui avaient servi la -surveille. - -«~Ma lettre de recommandation~! s'écria d'Artagnan, ma lettre de -recommandation, sangdieu~! ou je vous embroche tous comme des ortolans~!~» - -Malheureusement une circonstance s'opposait à ce que le jeune homme accomplît -sa menace~: c'est que, comme nous l'avons dit, son épée avait été, dans sa -première lutte, brisée en deux morceaux, ce qu'il avait parfaitement oublié. -Il en résulta que, lorsque d'Artagnan voulut en effet dégainer, il se trouva -purement et simplement armé d'un tronçon d'épée de huit ou dix pouces à peu -près, que l'hôte avait soigneusement renfoncé dans le fourreau. Quant au reste -de la lame, le chef l'avait adroitement détourné pour s'en faire une lardoire. - -Cependant cette déception n'eût probablement pas arrêté notre fougueux jeune -homme, si l'hôte n'avait réfléchi que la réclamation que lui adressait son -voyageur était parfaitement juste. - -«~Mais, au fait, dit-il en abaissant son épieu, où est cette lettre~? - ---- Oui, où est cette lettre~? cria d'Artagnan. D'abord, je vous en préviens, - cette lettre est pour M. de Tréville, et il faut qu'elle se retrouve~; ou - si elle ne se retrouve pas, il saura bien la faire retrouver, lui~!~» - -Cette menace acheva d'intimider l'hôte. Après le roi et M. le cardinal, M. de -Tréville était l'homme dont le nom peut-être était le plus souvent répété par -les militaires et même par les bourgeois. Il y avait bien le père Joseph, -c'est vrai~; mais son nom à lui n'était jamais prononcé que tout bas, tant -était grande la terreur qu'inspirait l'Eminence grise, comme on appelait le -familier du cardinal. - -Aussi, jetant son épieu loin de lui, et ordonnant à sa femme d'en faire autant -de son manche à balai et à ses valets de leurs bâtons, il donna le premier -l'exemple en se mettant lui-même à la recherche de la lettre perdue. - -«~Est-ce que cette lettre renfermait quelque chose de précieux~? demanda -l'hôte au bout d'un instant d'investigations inutiles. - ---- Sandis~! je le crois bien~! s'écria le Gascon qui comptait sur cette lettre - pour faire son chemin à la cour~; elle contenait ma fortune. - ---- Des bons sur l'Epargne~? demanda l'hôte inquiet. - ---- Des bons sur la trésorerie particulière de Sa Majesté~», répondit - d'Artagnan, qui, comptant entrer au service du roi grâce à cette - recommandation, croyait pouvoir faire sans mentir cette réponse quelque peu - hasardée. - -«~Diable~! fit l'hôte tout à fait désespéré. - ---- Mais il n'importe, continua d'Artagnan avec l'aplomb national, il - n'importe, et l'argent n'est rien~: --- cette lettre était tout. J'eusse - mieux aimé perdre mille pistoles que de la perdre.~» - -Il ne risquait pas davantage à dire vingt mille, mais une certaine pudeur -juvénile le retint. - -Un trait de lumière frappa tout à coup l'esprit de l'hôte, qui se donnait au -diable en ne trouvant rien. - -«~Cette lettre n'est point perdue, s'écria-t-il. - ---- Ah~! fit d'Artagnan. - ---- Non~; elle vous a été prise. - ---- Prise~! et par qui~? - ---- Par le gentilhomme d'hier. Il est descendu à la cuisine, où était votre - pourpoint. Il y est resté seul. Je gagerais que c'est lui qui l'a volée. - ---- Vous croyez~?~» répondit d'Artagnan peu convaincu~; car il savait mieux que - personne l'importance toute personnelle de cette lettre, et n'y voyait rien - qui pût tenter la cupidité. Le fait est qu'aucun des valets, aucun des - voyageurs présents n'eût rien gagné à posséder ce papier. - -«~Vous dites donc, reprit d'Artagnan, que vous soupçonnez cet impertinent -gentilhomme. - ---- Je vous dis que j'en suis sûr, continua l'hôte~; lorsque je lui ai annoncé - que Votre Seigneurie était le protégé de M. de Tréville, et que vous aviez - même une lettre pour cet illustre gentilhomme, il a paru fort inquiet, m'a - demandé où était cette lettre, et est descendu immédiatement à la cuisine - où il savait qu'était votre pourpoint. - ---- Alors c'est mon voleur, répondit d'Artagnan~; je m'en plaindrai à M. de - Tréville, et M. de Tréville s'en plaindra au roi.~» Puis il tira - majestueusement deux écus de sa poche, les donna à l'hôte, qui - l'accompagna, le chapeau à la main, jusqu'à la porte, remonta sur son - cheval jaune, qui le conduisit sans autre incident jusqu'à la porte - Saint-Antoine à Paris, où son propriétaire le vendit trois écus, ce qui - était fort bien payé, attendu que d'Artagnan l'avait fort surmené pendant - la dernière étape. Aussi le maquignon auquel d'Artagnan le céda moyennant - les neuf livres susdites ne cacha-t-il point au jeune homme qu'il n'en - donnait cette somme exorbitante qu'à cause de l'originalité de sa couleur. - -D'Artagnan entra donc dans Paris à pied, portant son petit paquet sous son -bras, et marcha tant qu'il trouvât à louer une chambre qui convînt à -l'exiguïté de ses ressources. Cette chambre fut une espèce de mansarde, sise -rue des Fossoyeurs, près du Luxembourg. - -Aussitôt le denier à Dieu donné, d'Artagnan prit possession de son logement, -passa le reste de la journée à coudre à son pourpoint et à ses chausses des -passementeries que sa mère avait détachées d'un pourpoint presque neuf de M. -d'Artagnan père, et qu'elle lui avait données en cachette~; puis il alla quai -de la Ferraille, faire remettre une lame à son épée~; puis il revint au Louvre -s'informer, au premier mousquetaire qu'il rencontra, de la situation de -l'hôtel de M. de Tréville, lequel était situé rue du Vieux-Colombier, -c'est-à-dire justement dans le voisinage de la chambre arrêtée par -d'Artagnan~: circonstance qui lui parut d'un heureux augure pour le succès de -son voyage. - -Après quoi, content de la façon dont il s'était conduit à Meung, sans remords -dans le passé, confiant dans le présent et plein d'espérance dans l'avenir, il -se coucha et s'endormit du sommeil du brave. - -Ce sommeil, tout provincial encore, le conduisit jusqu'à neuf heures du matin, -heure à laquelle il se leva pour se rendre chez ce fameux M. de Tréville, le -troisième personnage du royaume d'après l'estimation paternelle. - -\bye diff --git a/Master/texmf-dist/fonts/map/dvips/frcursive/frcursive.map b/Master/texmf-dist/fonts/map/dvips/frcursive/frcursive.map new file mode 100644 index 00000000000..4e7c7c6297f --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvips/frcursive/frcursive.map @@ -0,0 +1,23 @@ +frcr6 frcr6 1: proofrule((pos,-d), (pos,h)); fi - width#.ltr := charwd; % for the accented version's width - height#.ltr := charht; % for the height of accented uppercase letters - depth#.ltr := chardp - endgroup +def save_letter (suffix ltr) (expr pos) = + picture letter.ltr; + letter.ltr := currentpicture; + accpos.ltr := cedpos.ltr := pos; + width.ltr := w; + height.ltr := h; + if proofing > 1: proofrule((pos,-d), (pos,h)); fi + width#.ltr := charwd; % for the accented version's width + height#.ltr := charht; % for the height of accented uppercase letters + depth#.ltr := chardp enddef; %% Most characters have absolute widths of the same form: @@ -205,6 +206,7 @@ beginchar("a", ltr_w(7/6), ex#, 0); label(9); save_letter(a)(x2); + cedpos.a := x9; endchar; "The letter b"; @@ -260,6 +262,8 @@ beginchar("d", ltr_w(7/6), straight_ascend * ex#, 0); penstroke z6e .. {down}z7e .. {down}z8e .. {right}z9e ; label(9); + + save_letter(d)(x6); endchar; "The letter e"; @@ -324,6 +328,8 @@ beginchar("g", ltr_w(9/8), ex#, loop_descend * ex#); .. z9e .. z10e .. {ml_dir}z11e ; label(11); + + save_letter(g)(x2); endchar; "The letter h"; @@ -424,6 +430,8 @@ beginchar("l", ltr_w(2/3), loop_ascend * ex#, 0); .. controls (x5e,1/2[y5e,y6e]) and (x5e,y6e) .. z6e .. {ml_dir}z7e ; label(7); + + save_letter(l)(x3); endchar ; "The letter m"; @@ -512,7 +520,7 @@ beginchar("p", ltr_w(7/4), ex#, straight_descend * ex#); endchar; "The letter q with no link"; -beginchar(150, ltr_w(1), ex#, straight_descend * ex#); +beginchar("q", ltr_wd(1, 0) + thick# - med#, ex#, straight_descend * ex#); penpos1(med, 0); x1r = hround (base_width * ex); y1 = 2/3 ex; penpos2(med, 90); z2r = (3/5, 1) u; penpos3(thick, 180); z3r = (0, a_left) u; @@ -527,22 +535,12 @@ beginchar(150, ltr_w(1), ex#, straight_descend * ex#); penstroke z6e .. z7e --- z8e; + picture letter.q; letter.q := currentpicture; % We keep the glyph for the linked version. label(8); endchar; -"The letter q with a right link"; -beginchar("q", ltr_w(7/6), ex#, straight_descend * ex#) - addto currentpicture also letter.q; - penpos0(med, 0); x0r = hround (base_width * ex); y0 = 1/3 ex; - penpos1(thick, 180); z1r = z0l; - penpos2(med, 270); z2r = (7/6 + lnk, 0) u; - penstroke z1e{down} .. {right}z2e; - label(2); -endchar; - - "The letter r"; beginchar("r", ltr_w(5/4), 6/5 ex#, 0); penpos1(med, 0); z1l = (1/6, 1) u; @@ -558,11 +556,15 @@ beginchar("r", ltr_w(5/4), 6/5 ex#, 0); .. tension 1.3 .. {down}z5e .. {right}z6e; label(6); + + save_letter(r)(1/2[x1,x4]); + height.r := ex; + height#.r := ex#; endchar; "The letter s with no link"; -beginchar(154, ltr_w(13/12), 7/6 ex#, 0); - penpos0(thick, 0); z0r = (3/4, 1) u; +beginchar("s", ltr_wd(5/4, 0), 7/6 ex#, 0); + penpos0(thick, 0); z0 = good.rt ((3/4, 1) u); penpos1(med, 0); z1l = z0l; penpos2(med, 90); z2r = z1l + (0, 1/6) u; penpos3(med, 210); z3l = z1l; @@ -573,18 +575,14 @@ beginchar(154, ltr_w(13/12), 7/6 ex#, 0); penstroke z1e{dir 60} .. z2e .. z3e{dir 315} .. tension 1.2 .. z4e .. {left}z5e .. {dir 30}z6e; + picture letter.s; letter.s := currentpicture; % Same trick as for the q. label(6); -endchar; -"The letter s with a right link"; -beginchar("s", ltr_w(5/4), 7/6 ex#, 0); - addto currentpicture also letter.s; - penpos1(med, 180); z1l = (5/4, 1/3) u; - penpos2(med, 270); z2r = (5/4 + lnk, 0) u; - penstroke z1e .. {right}z2e; - label(2); + save_letter(s)(x5); + height.s := ex; + height#.s := ex#; endchar; "The letter t"; @@ -602,6 +600,8 @@ beginchar("t", ltr_w(7/8), straight_ascend * ex#, 0); penstroke z5e -- z6e; label(6); + + save_letter(t)(x3); endchar; "The letter u"; @@ -622,7 +622,9 @@ beginchar("u", ltr_w(4/3), ex#, 0); label(7); + begingroup save u; save_letter(u)(1/2[x1,x5]); + endgroup endchar; "The letter v"; @@ -723,8 +725,17 @@ beginchar("z", ltr_w(11/6), 6/5 * ex#, loop_descend * ex#); .. z9e .. z10e .. tension 1.4 .. {ml_dir}z11e; label(8); + + save_letter(z)(1/2[x1,x4]); + height.z := ex; + height#.z := ex#; endchar; +"The ligature oe"; +beginchar(247, ltr_w(2), ex#, 0) + addto currentpicture also letter.o; + addto currentpicture also letter.e shifted ((1,0) u); +endchar; %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% @@ -775,6 +786,7 @@ beginchar("A", ltr_wd(3,0), hgt, 0); label(15); save_letter(A)(x6l); + cedpos.A := x9; endchar; @@ -850,6 +862,8 @@ beginchar("D", ltr_wd(13/6,0), hgt, 0); .. z6e .. z7e .. z8e .. z9e .. z10e .. {up}z11e; label(11); + + save_letter(D)(1/2[x1,x2]); endchar; @@ -916,21 +930,24 @@ endchar; "The letter G"; -beginchar("G", ltr_wd(2,1), hgt, loop_descend * ex#); +beginchar("G", ltr_w(2), hgt, loop_descend * ex#); penpos1(thin, 180); z1 = (1/2, 1) uu; penpos2(med, 200); z2r = (0, 2/3) uu; penpos3(med, 0); z3r = (2, 5/6) uu; penpos4(med, 90); z4r = (5/3, 1) uu; penpos5(thick, 180); z5r = (1/3, 1/3) uu; penpos6(med, 270); z6r = (1, 0) uu; - penpos7(thick, 0); z7r = (15/8, 1) u; + penpos7(thick, 0); z7 = good.rt ((15/8, 1) u); penstroke z1e .. {down}z2e .. tension 1.2 .. z3e .. z4e .. tension 1.2 .. z5e .. z6e .. {up}z7e; - addto currentpicture also letter.j shifted (9/8 * v, 0); + penpos0(thick, 180); z0 = good.lft ((3/4, 1) u); + addto currentpicture also letter.j shifted (z7 - z0); label(7); + + save_letter(G)(1/4[x4,x5]); endchar; @@ -996,15 +1013,17 @@ endchar; "The letter J"; -beginchar("J", ltr_wd(9/8,1) + thick#/2, hgt, loop_descend * ex#); +beginchar("J", ltr_w(9/8), hgt, loop_descend * ex#); addto currentpicture also small_loop; - addto currentpicture also letter.j shifted (1/4 v + thick/2, 0); + z0 = good.lft ((3/4, 1) uu); penpos1(thick, 180); z1 = (1, 1) uu; penpos2(thick, 180); z2 = (1, 0) uu; penstroke z1e .. z2e; + addto currentpicture also letter.j shifted (z1 - z0); + label(2); endchar; @@ -1054,6 +1073,8 @@ beginchar("L", ltr_wd(7/3,0), hgt, 0); .. z7e .. {dir -50}z8e .. {right}z9e .. z10e .. {down}z11e; label(11); + + save_letter(L)(x9); endchar; @@ -1147,7 +1168,7 @@ beginchar("O", ltr_wd(2,0), hgt, 0); label(6); - save_letter(O)(x1); + save_letter(O)(x3); endchar; @@ -1212,6 +1233,8 @@ beginchar("R", ltr_wd(13/4,0), hgt, 0); .. tension 1.4 .. z11e .. z12e .. z13e .. z14e; label(14); + + save_letter(R)(x10); endchar; @@ -1231,6 +1254,9 @@ beginchar("S", ltr_wd(2,0), hgt, 0); .. z6e .. z7e .. z8e .. {dir 250}z9e; label(9); + + save_letter(S)(1/2[x3,x5]); + cedpos.S := x7; endchar; @@ -1251,6 +1277,9 @@ beginchar("T", ltr_wd(11/4,0), hgt, 0); .. {left}z6e .. tension 1.2 .. z7e .. {right}z8e .. z9e .. z10e; label(10); + + save_letter(T)(1/2[x3,x6]); + cedpos.T := x8; endchar; @@ -1351,7 +1380,7 @@ endchar; "The letter Y"; -beginchar("Y", ltr_wd(19/8,1), hgt, loop_descend * ex#); +beginchar("Y", ltr_w(19/8), hgt, loop_descend * ex#); penpos1(thin, 180); z1 = (3/4, 3/5) uu; penpos2(med, 0); z2l = (0, 2/3) uu; penpos3(med, 250); z3l = (3/5, 1) uu; @@ -1359,8 +1388,8 @@ beginchar("Y", ltr_wd(19/8,1), hgt, loop_descend * ex#); penpos5(med, 270); z5r = (3/2, 1/8) uu; penpos6(med, 0); z6l = z8r; - penpos7(thick, 180); z7l = (9/4, 1) uu; - penpos8(thick, 180); z8l = (9/4, 1) u; + penpos7(thick, 180); x7 = x8; y7 = uc_ascend * ex; + penpos8(thick, 180); z8 = good.rt ((9/4, 1) u); penstroke z1e{down} .. z2e{up} .. z3e .. tension 1.1 .. z4e .. z5e .. {up}z6e; @@ -1382,7 +1411,7 @@ beginchar("Z", ltr_wd(3,0), hgt, 0); penpos4(med, 270); z4 = (5/2, 3/4) uu; penpos5(med, 0); z5r = (3, 7/8) uu; penpos6(med, 90); z6r = (8/3, 1) uu; - penpos7(thick, 135); z7 = (6/4, 1/2) uu; + penpos7(thick, 165); z7 = (6/4, 1/2) uu; penpos8(med, 90); z7 = 1/2[z6, z8]; penpos9(med, 0); z7 = 1/2[z5, z9]; penpos10(med, 270); z7 = 1/2[z4, z10]; @@ -1400,6 +1429,8 @@ beginchar("Z", ltr_wd(3,0), hgt, 0); penstroke z14e{dir 30} .. z15e .. {dir 30}z16e; label(16); + + save_letter(Z)(x15); endchar; @@ -1407,17 +1438,38 @@ endchar; %%\sec Inter-letter links. %{{{1 +%% The constants below define the position of the link glyphs in the font. +%% the names have the form ``{\it lnk.right.left}'' where {\it right} is the +%% shape of the letter on the right and {\it left} is the kind of link at the +%% end of the letter on the left. + +%% Since we are limited to 256 positions, we have to use some codes that are +%% defined in the T1 encoding for other purposes. The accent glyphs may be +%% used for that, since constructed accented letters are unusable in this font +%% (because they don't link to surrounding letters). The ``f'' ligatures are +%% also usable since they are irrelevant here. + +lnk.small.low = 0; lnk.small.med = 1; lnk.small.high = 2; +lnk.loop.low = 3; lnk.loop.med = 4; lnk.loop.high = 5; +lnk.vert.low = 6; lnk.vert.med = 7; lnk.vert.high = 8; +lnk.far.low = 9; lnk.far.med = 10; lnk.far.high = 11; +lnk.hloop.low = 12; lnk.hloop.med = 13; +lnk.mn.low = 14; lnk.mn.med = 15; lnk.mn.high = 16; lnk.mn.beg = 17; +lnk.x.low = 24; lnk.x.med = 27; +lnk.sq = 28; +lnk.high = 29; lnk.low = 30; lnk.lowmed = 31; + %% There is a special trick we use in all links: the initial $x$ coordinante %% is not 0 as would be expected but $-1$. This makes links begin one pixel to %% the left of their box, ensuring that they actually join with the letter %% before them. -%%\subsec For small letters (a, c, d, e, g, o, q). %{{{2 - lw := link_width * ex#; +%%\subsec For small letters (a, c, d, e, g, o, q). %{{{2 + "Low link for small letters"; -beginchar(128, lw, 0, 0); +beginchar(lnk.small.low, lw, 0, 0); penpos1(med, 270); z1r = (-1, 0); penpos2(med, 0); z2l = (lnk, 1/3) u; penstroke z1e{right} .. {up}z2e; @@ -1425,15 +1477,15 @@ beginchar(128, lw, 0, 0); endchar ; "Medium link for small letters"; -beginchar(129, lw, 0, 0); +beginchar(lnk.small.med, lw, 0, 0); penpos1(med, ml_d); z1 = (-1, ml_y * ex); - penpos2(med, 0); z2l = (lnk, 1/3) u; + penpos2(med, ml_d); z2l = (lnk, 1/3) u; penstroke z1e{ml_dir} .. tension 3 .. {up}z2e; label(2); endchar ; "High link for small letters"; -beginchar(130, lw, 0, 0); +beginchar(lnk.small.high, lw, 0, 0); penpos1(med, 270); z1 = (-1, hl_y * ex); penpos2(thin, 270); z2l = (3/5 + lnk, 1) u; penstroke z1e{right} .. {right}z2e ; @@ -1443,7 +1495,7 @@ endchar ; %%\subsec For loops (b, f, h, l). %{{{2 "Low link for large loops"; -beginchar(132, lw, loop_ascend*ex#, 0); +beginchar(lnk.loop.low, lw, loop_ascend*ex#, 0); if proofing > 1: proofrule ((lnk,0) u, (lnk,loop_ascend)u); fi penpos1(med, 270); z1r = (-1, 0); penpos2(med, 330); z2 = (3/4 + lnk, 2/3 * loop_ascend) u + (0,0); @@ -1452,7 +1504,7 @@ beginchar(132, lw, loop_ascend*ex#, 0); endchar; "Medium link for large loops"; -beginchar(133, lw, loop_ascend*ex#, 0); +beginchar(lnk.loop.med, lw, loop_ascend*ex#, 0); if proofing > 1: proofrule ((lnk,0) u, (lnk,loop_ascend)u); fi penpos1(med, ml_d); z1 = (-1, ml_y * ex); penpos2(med, 330); z2 = (3/4 + lnk, 2/3 * loop_ascend) u + (0,0); @@ -1461,7 +1513,7 @@ beginchar(133, lw, loop_ascend*ex#, 0); endchar; "High link for large loops"; -beginchar(134, lw, loop_ascend*ex#, 0); +beginchar(lnk.loop.high, lw, loop_ascend*ex#, 0); if proofing > 1: proofrule ((lnk,0) u, (lnk,loop_ascend)u); fi penpos1(med, 270); z1 = (-1, hl_y * ex); penpos2(med, 330); z2 = (3/4 + lnk, 2/3 * loop_ascend) u + (0,0); @@ -1470,7 +1522,7 @@ beginchar(134, lw, loop_ascend*ex#, 0); endchar; "Low to medium transition"; -beginchar(135, ltr_w(1/6), 0, 0); +beginchar(lnk.lowmed, ltr_w(1/6), 0, 0); penpos1(med, 270); z1r = (-1, 0); penpos2(med, ml_d); z2 = (1/6 + lnk, ml_y) u; penstroke z1e{right} .. {ml_dir}z2e ; @@ -1480,7 +1532,7 @@ endchar; %%\subsec For those vertical on the left (i, u). %{{{2 "Low link for verticals"; -beginchar(136, lw, 0, 0); +beginchar(lnk.vert.low, lw, 0, 0); penpos1(med, 270); z1r = (-1, 0); penpos2(med, 0); z2l = (1/6 + lnk, 2/3) u; penpos3(med, 0); z3l = (1/6 + lnk, 1) u; @@ -1489,7 +1541,7 @@ beginchar(136, lw, 0, 0); endchar; "Medium link for verticals"; -beginchar(137, lw, 0, 0); +beginchar(lnk.vert.med, lw, 0, 0); penpos1(med, ml_d); z1 = (-1, ml_y * ex); penpos2(med, 0); z2l = (1/6 + lnk, 1) u; penstroke z1e{ml_dir} .. tension 1.2 .. {up}z2e; @@ -1497,7 +1549,7 @@ beginchar(137, lw, 0, 0); endchar; "High link for verticals"; -beginchar(138, lw, 0, 0); +beginchar(lnk.vert.high, lw, 0, 0); penpos1(med, 270); z1 = (-1, hl_y * ex); penpos2(med, 0); z2l = (1/6 + lnk, 1) u; penstroke z1e{right} .. {up}z2e; @@ -1507,37 +1559,29 @@ endchar; %%\subsec For the far verticals (j, p). %{{{2 "Low link for far verticals"; -beginchar(140, ltr_w(1/4), 0, 0); +beginchar(lnk.far.low, lw, 0, 0); penpos1(med, 270); z1r = (-1, 0); penpos2(med, 0); z2l = z3l; pickup thickpen; - penpos3(thick, 0); z3 = good.rt ((1 + lnk, 1) u); + penpos3(thick, 0); z3 = good.rt ((3/4 + lnk, 1) u); penstroke z1e{right} .. tension 1.2 .. {dir 60}z2e; label(2); endchar; "Medium link for far verticals"; -beginchar(141, lw, 0, 0); +beginchar(lnk.far.med, ltr_w(-1/4), 0, 0); penpos1(med, ml_d); z1 = (-1, ml_y * ex); penpos2(med, 0); z2l = z3l; - penpos3(thick, 0); z3r = (3/4 + lnk, 1) u; + penpos3(thick, 0); z3 = good.rt ((1/2 + lnk, 1) u); penstroke z1e{ml_dir} .. tension 1.3 .. {dir 60}z2e; label(2); endchar; -"Long medium link for far verticals"; -beginchar(142, ltr_w(1/4), 0, 0); - penpos1(med, ml_d); z1 = (-1, ml_y * ex); - penpos2(med, 0); z2r = (1 + lnk, 1) u; - penstroke z1e{ml_dir} .. tension 1.3 .. {dir 70}z2e; - label(2); -endchar; - "High link for far verticals"; -beginchar(143, lw, 0, 0); +beginchar(lnk.far.high, ltr_w(-1/4), 0, 0); penpos1(med, 270); z1 = (-1, hl_y * ex); penpos2(med, 0); z2l = z3l; - penpos3(thick, 0); z3r = (3/4 + lnk, 1) u; + penpos3(thick, 0); z3 = good.rt ((1/2 + lnk, 1) u); penstroke z1e{right} .. {dir 50}z2e; label(2); endchar; @@ -1545,7 +1589,7 @@ endchar; %%\subsec For high loops (h, k). %{{{2 "Low link for high loops"; -beginchar(144, ltr_w(1/6), 0, 0) +beginchar(lnk.hloop.low, ltr_w(1/6), 0, 0) penpos1(med, 270); z1r = (-1, 0); penpos2(med, 0); z2l = (1/6 + lnk, 6/8) u; @@ -1560,7 +1604,7 @@ beginchar(144, ltr_w(1/6), 0, 0) endchar; "Medium link for high loops"; -beginchar(145, lw, 0, 0) +beginchar(lnk.hloop.med, lw, 0, 0) penpos1(med, ml_d); z1 = (-1, ml_y * ex); penpos2(med, 0); z2l = (lnk, 6/8) u; @@ -1577,7 +1621,7 @@ endchar; %%\subsec For m, n, v, and w. %{{{2 "Low link for m and n"; -beginchar(146, ltr_w(1/6), 0, 0) +beginchar(lnk.mn.low, ltr_w(1/6), 0, 0) penpos1(med, 270); z1r = (-1, 0); penpos2(med, 0); z2l = (1/12 + lnk, 1/2) u; penpos3(med, 270); z3l = (1/2 + lnk, 1) u + (1,0); @@ -1586,7 +1630,7 @@ beginchar(146, ltr_w(1/6), 0, 0) endchar; "Medium link for m and n"; -beginchar(147, ltr_w(1/12), 0, 0) +beginchar(lnk.mn.med, ltr_w(1/12), 0, 0) penpos1(med, ml_d); z1 = (-1, ml_y * ex); penpos2(med, 0); z2l = ((1/24 + lnk) * v, 1/2 [y1, y3]); penpos3(med, 270); z3l = (5/12 + lnk, 1) u + (1,0); @@ -1595,7 +1639,7 @@ beginchar(147, ltr_w(1/12), 0, 0) endchar; "High link for m and n"; -beginchar(148, ltr_w(1/6), 0, 0) +beginchar(lnk.mn.high, ltr_w(1/6), 0, 0) penpos1(med, 270); z1 = (-1, hl_y * ex); penpos2(med, 330); z2 = 1/2 [z1, z3]; penpos3(med, 270); z3l = (1/2 + lnk, 1) u + (1,0); @@ -1604,7 +1648,7 @@ beginchar(148, ltr_w(1/6), 0, 0) endchar; "Beginning for m and n"; -beginchar(149, 0, 0, 0) +beginchar(lnk.mn.beg, 0, 0, 0) penpos1(med, 320); z1 = (-1, 2/5 * ex); penpos2(med, 270); z2l = (1/3, 1) u + (1,0); penstroke z1e{up} .. {right} z2e; @@ -1614,7 +1658,7 @@ endchar; %%\subsec For the x. %{{{2 "Low link for x"; -beginchar(155, ltr_w(1/2), 0, 0) +beginchar(lnk.x.low, ltr_w(1/2), 0, 0) penpos1(med, 270); z1r = (-1, 0); penpos2(med, 0); z2 = 1/2[z1,z3]; penpos3(med, 270); z3l = (5/6 + lnk, 1) u + (1,0); @@ -1623,7 +1667,7 @@ beginchar(155, ltr_w(1/2), 0, 0) endchar; "Medium link for x"; -beginchar(156, ltr_w(1/4), 0, 0) +beginchar(lnk.x.med, ltr_w(1/4), 0, 0) penpos1(med, ml_d); z1 = (-1, ml_y * ex); penpos2(med, 0); z2 = 1/2[z1,z3]; penpos3(med, 270); z3l = (7/12 + lnk, 1) u + (1,0); @@ -1633,6 +1677,17 @@ endchar; %%\subsec Special links. %{{{2 +%% The letters {\fc s} and {\fc q} have final forms without a link on the +%% right, which is the actual glyph. Inside words, they need an extra link. + +"Right link for s and q"; +beginchar(lnk.sq, lw, ex#/3, 0); + penpos1(med, 180); z1l = (0, 1/3) u; + penpos2(med, 270); z2r = (lnk, 0) u; + penstroke z1e {down} .. {right}z2e; + label(2); +endchar; + %% \chardef\HL=131 %% This link has to be inserted by hand between the letters {\fc o} and %% {\fc e}, in order to produce ``{\fc o\HL e}'', which is different @@ -1640,7 +1695,7 @@ endchar; %% ``{\tt oe}''. "High horizontal link"; -beginchar(131, lw, 0, 0); +beginchar(lnk.high, lw, 0, 0); penpos1(med, 270); z1 = (-1, hl_y * ex); penpos2(med, 270); z2 = (lnk, 1/2) u + (1,0); penstroke z1e{right} .. {right}z2e ; @@ -1652,7 +1707,7 @@ endchar ; %% \par\nobreak "Low horizontal link"; -beginchar(139, lw, 0, 0); +beginchar(lnk.low, lw, 0, 0); penpos1(med, 270); z1r = (-1, 0); penpos2(med, 270); z2r = (lnk * v + 1, 0); penstroke z1e{right} .. {right}z2e ; @@ -1670,92 +1725,146 @@ endchar ; a_wd := accent_wd * base_width * ex#; a_ht := accent_top * ex#; -%% We use the following macro to save an accent's picture and dimensions in -%% order to use it later when building accented characters: +%%\subsec The glyphs for the accents. %{{{2 -def save_accent (text acc) = +%% When \TeX\ builds an accented character out of an unaccented one and an +%% accent glyph, the resulting object is not subject to ligatures. Therefore +%% the accent glyphs are rather useless in this font, which has the pleasant +%% effect of freeing a good number of character positions. The glyphs below +%% are thus drawn, but not saved (except for some of them that correspond to +%% proper characters, like tilde or circumflex). We use the following macros +%% to save an accent's picture and dimensions in order to use it later when +%% building accented characters: +%%% beginchar beginaccent +%%% endchar endaccent + +ignored = 0; + +def beginaccent (expr code, wd, ht, dp) = + beginchar(code, wd, ht, dp); +enddef; + +def endaccent (suffix acc) = picture accent.acc; accent.acc := currentpicture; acc_wd.acc := w; - acc_ht#.acc := charht -enddef; + acc_ht#.acc := charht; + acc_dp#.acc := chardp; -%%\subsec The glyphs for the accents. %{{{2 + if charcode = ignored: + save shipit; let shipit = relax; + fi + endchar +enddef; + +athin := 2/3 [thin, med]; +athick := 2/3 [med, thick]; "Grave accent"; -beginchar(0, a_wd, a_ht, 0); - penpos1(med, 225); z1 = (0, 1) ua; - penpos2(med, 270); z2 = (1, 0) ua; +beginaccent(ignored, a_wd, a_ht, 0); + penpos1(athick, 225); z1 = (0, 1) ua; + penpos2(athin, 270); z2 = (1, 0) ua; penstroke z1e .. tension 1.4 .. {right}z2e; label(2); - save_accent(grave); -endchar; +endaccent(grave); "Acute accent"; -beginchar(1, a_wd, a_ht, 0); - penpos1(med, 135); z1 = (1, 1) ua; - penpos2(med, 90); z2 = (0, 0) ua; +beginaccent(ignored, a_wd, a_ht, 0); + penpos1(athick, 135); z1 = (1, 1) ua; + penpos2(athin, 90); z2 = (0, 0) ua; penstroke z1e .. tension 1.4 .. {left}z2e; label(2); - save_accent(acute); -endchar; +endaccent(acute); "Circumflex"; -beginchar(2, 3/2 * a_wd, a_ht, 0); - penpos1(med, 270); z1 = (0, 0) ua; - penpos2(med, 0); z2 = (3/4, 1) ua; +beginaccent("^", 3/2 * a_wd, a_ht, 0); + penpos1(athin, 270); z1 = (0, 0) ua; + penpos2(athick, 0); z2 = (3/4, 1) ua; penstroke z1e{right} .. z2e; - penpos3(med, 180); z3 = z2; - penpos4(med, 270); z4 = (3/2, 0) ua; + penpos3(athick, 180); z3 = z2; + penpos4(athin, 270); z4 = (3/2, 0) ua; penstroke z3e .. {right}z4e; label(4); - save_accent(circum); -endchar; +endaccent(circum); "Tilde"; -beginchar(3, 3/2 * a_wd, (2 accent_top + accent_bot)/3 * ex#, 0); - penpos1(med, 310); z1 = (0, 1/3) ua; +beginaccent("~", 3/2 * a_wd, (2 accent_top + accent_bot)/3 * ex#, 0); + penpos1(athin, 310); z1 = (0, 1/3) ua; penpos2(med, 210); z2l = (3/4, 1/2) ua; - penpos4(med, 310); (x4, y4l) = (3/2, 2/3) ua; + penpos4(athick, 310); (x4, y4l) = (3/2, 2/3) ua; penstroke z1e .. z2e{dir 315} .. z4e; label(4); - save_accent(tilde); -endchar; +endaccent(tilde); + +"Double acute"; +beginaccent(34, 4/3 a_wd, a_ht, 0); + penpos1(athick, 135); z1 = (2/3, 1) ua; + penpos2(athin, 135); z2 = (0, 0) ua; + penstroke z1e .. z2e; + z3 = (4/3, 1) ua; + addto currentpicture also currentpicture shifted (z3 - z1); + label(2); +endaccent(dblacute); "Umlaut"; -beginchar(4, a_wd, height_with_dot, 0); +beginaccent(ignored, a_wd, height_with_dot, 0); pickup pencircle scaled dot_size; lft z1 = (0, dot_height) u; rt z2 = (accent_wd, dot_height) u; drawdot z1; drawdot z2; label(2); - save_accent(umlaut); -endchar; +endaccent(umlaut); "Ring"; -beginchar(6, 3/4 a_wd, a_ht, 0); +beginaccent(ignored, 3/4 a_wd, a_ht, 0); penpos1(med, 90); z1r = (3/8, 1) ua; penpos2(med, 180); z2r = (0, 1/2) ua; penpos3(med, 270); z3r = (3/8, 0) ua; penpos4(med, 0); z4r = (3/4, 1/2) ua; penstroke z1e .. z2e .. z3e .. z4e .. cycle; label(4); - save_accent(ring); -endchar; +endaccent(ring); + +"Hachek"; +beginaccent(ignored, 3/2 * a_wd, a_ht, 0); + penpos1(athin, 270); z1l = (0, 1) ua; + penpos2(athick, 270); z2r = (3/4, 0) ua; + penpos3(athin, 270); z3l = (3/2, 1) ua; + penstroke z1e -- z2e -- z3e; + label(3); +endaccent(hachek); + +"Breve"; +beginaccent(ignored, 3/2 * a_wd, a_ht, 0); + penpos1(athin, 180); z1r = (0, 1) ua; + penpos2(med, 270); z2r = (3/4, 0) ua; + penpos3(athin, 0); z3r = (3/2, 1) ua; + penstroke z1e .. z2e .. z3e; + label(3); +endaccent(breve); "Cedilla"; -beginchar(11, ltr_wd(3/4,0), 0, (cedilla_dp + 1/3) * ex#); +beginaccent(ignored, ltr_wd(3/4,0), 0, (cedilla_dp + 1/3) * ex#); penpos1(thick, 180); z1 = (3/8, 0) u; penpos2(thick, 180); z2 = (3/8, -cedilla_dp) u; penstroke z1e .. z2e; penpos3(med, 270); z3r = z2l; - penpos4(thick, 180); x4l = 3/4 base_width * ex; y4 = 1/2[y3,y5]; + penpos4(athick, 180); x4l = 3/4 base_width * ex; y4 = 1/2[y3,y5]; penpos5(med, 90); z5l = (3/8, -cedilla_dp - 1/3) u; - penpos6(thin, 0); x6l = 0; y6 = y4; + penpos6(athin, 0); x6l = 0; y6 = y4; penstroke z3e .. z4e .. z5e{left} .. z6e; label(6); - save_accent(cedilla); -endchar; +endaccent(cedilla); + +"Ogonek"; +beginaccent(ignored, ltr_wd(3/4,0), 0, 2 * cedilla_dp * ex#); + penpos1(med, 90); z1l = (3/8, 0) u; + penpos2(athick, 180); z2r = (0, -cedilla_dp) u; + penpos3(med, 270); z3r = (3/8, -2 cedilla_dp) u; + penpos4(athin, -45); z4 = (0.7, -cedilla_dp) u; + penstroke z1e {left} .. z2e .. z3e .. z4e; + label(4); +endaccent(ogonek); %%\subsec The accented characters. %{{{2 @@ -1763,7 +1872,11 @@ endchar; %% The definition of `make\_accented' produces characters with the same height %% as their unaccented version, so that the accented uppercase are not too %% high (otherwise it would force to space out successive lines too much). -%% Is this a good choice ? +%% The macro `make\_cedilla' is used to put something (a cedilla or an +%% ogonek) under a letter, and this one does modify the depth of the original +%% letter. The macro `make\_caron' adds a caron (same shape as an apostrophe) +%% to a glyph, without changing the glyph width, so that linking is not +%% influenced. def make_accented(expr name, chr)(text base, acc) = begingroup save base; @@ -1776,81 +1889,226 @@ def make_accented(expr name, chr)(text base, acc) = endgroup enddef; -make_accented("The letter a with gravis", "à")(a)(grave); -make_accented("The letter a with acute", "á")(a)(acute); -make_accented("The letter a with circumflex", "â")(a)(circum); -make_accented("The letter a with tilde", "ã")(a)(tilde); -make_accented("The letter a with umlaut", "ä")(a)(umlaut); -make_accented("The letter a with ring", "å")(a)(ring); - -make_accented("The letter e with gravis", "è")(e)(grave); -make_accented("The letter e with acute", "é")(e)(acute); -make_accented("The letter e with circumflex", "ê")(e)(circum); -make_accented("The letter e with umlaut", "ë")(e)(umlaut); - -make_accented("The letter i with gravis", "ì")(i)(grave); -make_accented("The letter i with acute", "í")(i)(acute); -make_accented("The letter i with circumflex", "î")(i)(circum); -make_accented("The letter i with umlaut", "ï")(i)(umlaut); - -make_accented("The letter o with gravis", "ò")(o)(grave); -make_accented("The letter o with acute", "ó")(o)(acute); -make_accented("The letter o with circumflex", "ô")(o)(circum); -make_accented("The letter o with tilde", "õ")(o)(tilde); -make_accented("The letter o with umlaut", "ö")(o)(umlaut); - -make_accented("The letter u with gravis", "ù")(u)(grave); -make_accented("The letter u with acute", "ú")(u)(acute); -make_accented("The letter u with circumflex", "û")(u)(circum); -make_accented("The letter u with umlaut", "ü")(u)(umlaut); - -make_accented("The letter y with acute", "ý")(y)(acute); -make_accented("The letter y with umlaut", "ÿ")(y)(umlaut); -make_accented("The letter n with tilde", "ñ")(n)(tilde); - -"The letter c with cedilla"; -beginchar("ç", width#.c, ex#, (cedilla_dp + 1/3) * ex#); - addto currentpicture also letter.c; - addto currentpicture also accent.cedilla - shifted (accpos.c - acc_wd.cedilla/2, 0); - endchar; +def make_cedilla(expr name, chr)(text base, acc) = + begingroup save base; + name; + beginchar(chr, width#.base, height#.base, max(depth#.base, acc_dp#.acc)) + addto currentpicture also letter.base; + addto currentpicture also accent.acc + shifted (cedpos.base - acc_wd.acc/2, 0); + endchar + endgroup +enddef; + +def make_caron(expr name, chr)(text base, pos) = + begingroup save base; + name; + beginchar(chr, width#.base, height#.base, depth#.base) + addto currentpicture also letter.base; + penpos1(athick, 180); + penpos2(athin, 90); + y1 = h; x2 = pos; + z1 - z2 = (accent_wd/2, 1/2) u; + penstroke z1e {down} .. z2e; + label(2); + endchar + endgroup +enddef; + +make_accented("The letter a with breve", 160)(a)(breve); +make_cedilla ("The letter a with ogonek", 161)(a)(ogonek); +make_accented("The letter a with gravis", 224)(a)(grave); +make_accented("The letter a with acute", 225)(a)(acute); +make_accented("The letter a with circumflex", 226)(a)(circum); +make_accented("The letter a with tilde", 227)(a)(tilde); +make_accented("The letter a with umlaut", 228)(a)(umlaut); +make_accented("The letter a with ring", 229)(a)(ring); + +make_accented("The letter c with acute", 162)(c)(acute); +make_accented("The letter c with hachek", 163)(c)(hachek); +make_cedilla ("The letter c with cedilla", 231)(c)(cedilla); + +make_caron("The letter d with caron", 164)(d)(accpos.d + thick*base_width); + +make_accented("The letter e with hachek", 165)(e)(hachek); +make_cedilla ("The letter e with ogonek", 166)(e)(ogonek); +make_accented("The letter e with gravis", 232)(e)(grave); +make_accented("The letter e with acute", 233)(e)(acute); +make_accented("The letter e with circumflex", 234)(e)(circum); +make_accented("The letter e with umlaut", 235)(e)(umlaut); + +make_accented("The letter g with breve", 167)(g)(breve); + +make_accented("The letter i with gravis", 236)(i)(grave); +make_accented("The letter i with acute", 237)(i)(acute); +make_accented("The letter i with circumflex", 238)(i)(circum); +make_accented("The letter i with umlaut", 239)(i)(umlaut); + +make_accented("The letter l with acute", 168)(l)(acute); +make_caron ("The letter l with caron", 169)(l)(w); + +"The letter l slash"; +beginchar(170, width#.l, height#.l, depth#.l) + addto currentpicture also letter.l; + penpos1(med, 270); + penpos2(med, 270); + penpos3(thick, 0); z3l = (0, loop_ascend/2) u; + 1/2[z2,z1] = z3; + z2 - z1 = (2/3, 1/6) u; + penstroke z1e .. z2e; + label(2); +endchar; + +make_accented("The letter n with acute", 171)(n)(acute); +make_accented("The letter n with hachek", 172)(n)(hachek); +make_accented("The letter n with tilde", 241)(n)(tilde); + +make_accented("The letter o with double acute", 174)(o)(dblacute); +make_accented("The letter o with gravis", 242)(o)(grave); +make_accented("The letter o with acute", 243)(o)(acute); +make_accented("The letter o with circumflex", 244)(o)(circum); +make_accented("The letter o with tilde", 245)(o)(tilde); +make_accented("The letter o with umlaut", 246)(o)(umlaut); + +"Scandinavian letter o slash"; +beginchar(248, width#.o, 7/6 ex#, 1/6 ex#) + addto currentpicture also letter.o; + penpos1(med, 150); z1l = (w, 7/6 ex); + penpos2(med, 150); z2r = (0, -1/6 ex); + penstroke z1e .. z2e; + label(2); +endchar; + +make_accented("The letter r with acute", 175)(r)(acute); +make_accented("The letter r with hachek", 176)(r)(hachek); + +make_accented("The letter s with acute", 177)(s)(acute); +make_accented("The letter s with hachek", 178)(s)(hachek); +make_cedilla ("The letter s with cedilla", 179)(s)(cedilla); + +make_caron ("The letter t with caron", 180)(t)(accpos.t); +make_cedilla ("The letter t with cedilla", 181)(t)(cedilla); + +make_accented("The letter u with double acute", 182)(u)(dblacute); +make_accented("The letter u with ring", 183)(u)(ring); +make_accented("The letter u with gravis", 249)(u)(grave); +make_accented("The letter u with acute", 250)(u)(acute); +make_accented("The letter u with circumflex", 251)(u)(circum); +make_accented("The letter u with umlaut", 252)(u)(umlaut); + +make_accented("The letter y with umlaut", 184)(y)(umlaut); +make_accented("The letter y with acute", 253)(y)(acute); + +make_accented("The letter z with acute", 185)(z)(acute); +make_accented("The letter z with hachek", 186)(z)(hachek); + +"The letter z with dot above"; +beginchar(187, width#.z, height#.z, depth#.z) + addto currentpicture also letter.z; + pickup pencircle scaled dot_size; + drawdot (accpos.z, 1/2[accent_bot, accent_top] * ex); +endchar; -make_accented("The letter A with gravis", "À")(A)(grave); -make_accented("The letter A with acute", "Á")(A)(acute); -make_accented("The letter A with circumflex", "Â")(A)(circum); -make_accented("The letter A with tilde", "Ã")(A)(tilde); -make_accented("The letter A with umlaut", "Ä")(A)(umlaut); -make_accented("The letter A with ring", "Å")(A)(ring); - -make_accented("The letter E with gravis", "È")(E)(grave); -make_accented("The letter E with acute", "É")(E)(acute); -make_accented("The letter E with circumflex", "Ê")(E)(circum); -make_accented("The letter E with umlaut", "Ë")(E)(umlaut); - -make_accented("The letter I with gravis", "Ì")(I)(grave); -make_accented("The letter I with acute", "Í")(I)(acute); -make_accented("The letter I with circumflex", "Î")(I)(circum); -make_accented("The letter I with umlaut", "Ï")(I)(umlaut); - -make_accented("The letter O with gravis", "Ò")(O)(grave); -make_accented("The letter O with acute", "Ó")(O)(acute); -make_accented("The letter O with circumflex", "Ô")(O)(circum); -make_accented("The letter O with tilde", "Õ")(O)(tilde); -make_accented("The letter O with umlaut", "Ö")(O)(umlaut); - -make_accented("The letter U with gravis", "Ù")(U)(grave); -make_accented("The letter U with acute", "Ú")(U)(acute); -make_accented("The letter U with circumflex", "Û")(U)(circum); -make_accented("The letter U with umlaut", "Ü")(U)(umlaut); - -make_accented("The letter Y with acute", "Ý")(Y)(acute); -make_accented("The letter N with tilde", "Ñ")(N)(tilde); - -"The letter C with cedilla"; -beginchar("Ç", width#.C, height#.C, (cedilla_dp + 1/3) * ex#); - addto currentpicture also letter.C; - addto currentpicture also accent.cedilla - shifted (accpos.C - acc_wd.cedilla/2, 0); +make_accented("The letter A with breve", 128)(A)(breve); +make_cedilla ("The letter A with ogonek", 129)(A)(ogonek); +make_accented("The letter A with gravis", 192)(A)(grave); +make_accented("The letter A with acute", 193)(A)(acute); +make_accented("The letter A with circumflex", 194)(A)(circum); +make_accented("The letter A with tilde", 195)(A)(tilde); +make_accented("The letter A with umlaut", 196)(A)(umlaut); +make_accented("The letter A with ring", 197)(A)(ring); + +make_accented("The letter C with acute", 130)(C)(acute); +make_accented("The letter C with hachek", 131)(C)(hachek); +make_cedilla ("The letter C with cedilla", 199)(C)(cedilla); + +make_accented("The letter D with hachek", 132)(D)(hachek); + +make_accented("The letter E with hachek", 133)(E)(hachek); +make_cedilla ("The letter E with ogonek", 134)(E)(ogonek); +make_accented("The letter E with gravis", 200)(E)(grave); +make_accented("The letter E with acute", 201)(E)(acute); +make_accented("The letter E with circumflex", 202)(E)(circum); +make_accented("The letter E with umlaut", 203)(E)(umlaut); + +make_accented("The letter G with breve", 135)(G)(breve); + +"The letter I with dot above"; +beginchar(157, width#.I, height#.I, depth#.I) + addto currentpicture also letter.I; + pickup pencircle scaled dot_size; + drawdot (accpos.z, (1/2[accent_bot, accent_top] + uc_ascend - 1) * ex); +endchar; + +make_accented("The letter I with gravis", 204)(I)(grave); +make_accented("The letter I with acute", 205)(I)(acute); +make_accented("The letter I with circumflex", 206)(I)(circum); +make_accented("The letter I with umlaut", 207)(I)(umlaut); + +make_accented("The letter L with acute", 136)(L)(acute); +make_caron ("The letter L with caron", 137)(L)(w); + +"The letter L slash"; +beginchar(138, width#.L, height#.L, depth#.L) + addto currentpicture also letter.L; + penpos1(med, 270); + penpos2(med, 270); + 1/2[z2,z1] = (7/6, 2/5) uu; + z2 - z1 = (1, 1/10) u; + penstroke z1e .. z2e; + label(2); +endchar; + +make_accented("The letter N with acute", 139)(N)(acute); +make_accented("The letter N with hachek", 140)(N)(hachek); +make_accented("The letter N with tilde", 209)(N)(tilde); + +make_accented("The letter O with double acute", 142)(O)(dblacute); +make_accented("The letter O with gravis", 210)(O)(grave); +make_accented("The letter O with acute", 211)(O)(acute); +make_accented("The letter O with circumflex", 212)(O)(circum); +make_accented("The letter O with tilde", 213)(O)(tilde); +make_accented("The letter O with umlaut", 214)(O)(umlaut); + +"Scandinavian letter O slash"; +beginchar(216, width#.O, height#.O, depth#.O) + addto currentpicture also letter.O; + penpos1(med, 150); z1l = (w - 1/8 v, h); + penpos2(med, 150); z2r = (1/8 v, 0); + penstroke z1e .. z2e; + label(2); +endchar; + +make_accented("The letter R with acute", 143)(R)(acute); +make_accented("The letter R with hachek", 144)(R)(hachek); + +make_accented("The letter S with acute", 145)(S)(acute); +make_accented("The letter S with hachek", 146)(S)(hachek); +accpos.S := base_width * ex; +make_cedilla ("The letter S with cedilla", 147)(S)(cedilla); + +make_accented("The letter T with hachek", 148)(T)(hachek); +accpos.T := 2 base_width * ex; +make_cedilla ("The letter T with cedilla", 149)(T)(cedilla); + +make_accented("The letter U with double acute", 150)(U)(dblacute); +make_accented("The letter U with ring", 151)(U)(ring); +make_accented("The letter U with gravis", 217)(U)(grave); +make_accented("The letter U with acute", 218)(U)(acute); +make_accented("The letter U with circumflex", 219)(U)(circum); +make_accented("The letter U with umlaut", 220)(U)(umlaut); + +make_accented("The letter Y with umlaut", 152)(Y)(umlaut); +make_accented("The letter Y with acute", 221)(Y)(acute); + +make_accented("The letter Z with acute", 153)(Z)(acute); +make_accented("The letter Z with hachek", 154)(Z)(hachek); + +"The letter Z with dot above"; +beginchar(155, width#.Z, height#.Z, depth#.Z) + addto currentpicture also letter.Z; + pickup pencircle scaled dot_size; + drawdot (accpos.Z, (1/2[accent_bot, accent_top] + uc_ascend - 1) * ex); endchar; "The letter i with no dot"; @@ -2087,7 +2345,7 @@ beginchar(189, ltr_wd(1/2,2), (loop_ascend - straight_descend) * ex#, straight_descend * ex#); addto currentpicture also letter.exclam scaled -1 shifted ((1/2 base_width + 2 link_width, - loop_ascend - straight_descend) * ex) + loop_ascend - straight_descend) * ex) endchar; "Apostrophe"; @@ -2101,7 +2359,7 @@ beginchar("'", ltr_wd(1/3,2), straight_ascend * ex#, 0); endchar; "High apostrophe"; -beginchar(152, ltr_wd(1/3,2), loop_ascend * ex#, 0); +beginchar(18, ltr_wd(1/3,2), loop_ascend * ex#, 0); penpos1(thick, 180); z1 = ((base_width + 3 link_width) / 3, loop_ascend) * ex; penpos2(thin, 90); @@ -2203,7 +2461,7 @@ beginchar(190, ltr_wd(3/2,2), (loop_ascend - straight_descend) * ex#, straight_descend * ex#); addto currentpicture also letter.interg scaled -1 shifted ((3/2 base_width + 2 link_width, - loop_ascend - straight_descend) * ex); + loop_ascend - straight_descend) * ex); endchar; "Left parenthesis"; @@ -2226,48 +2484,112 @@ endchar; "Left bracket"; beginchar("[", ltr_wd(1,0), loop_ascend * ex#, 1/2 loop_descend * ex#); - penpos1(med, 270); z1r = (5/6, loop_ascend) u; - penpos2(med, 270); z2r = (1/6, loop_ascend) u; - - penstroke z1e .. z2e; + penpos1(med, 90); z1r = (5/6, loop_ascend) u; + penpos2(med, 90); z2r = (1/6, loop_ascend) u; penpos3(thick, 180); z3r = (1/6, loop_ascend) u; penpos4(thick, 180); z4r = (1/6, -1/2 loop_descend) u; - penstroke z3e .. z4e; - - penpos5(med, 90); z5l = (1/6, -1/2 loop_descend) u; - penpos6(med, 90); z6l = (5/6, -1/2 loop_descend) u; + penpos5(med, 270); z5r = (1/6, -1/2 loop_descend) u; + penpos6(med, 270); z6r = (5/6, -1/2 loop_descend) u; - penstroke z5e .. z6e; + if fixed: + draw z1 -- z2 -- z5 -- z6 withpen pencircle scaled med; + else: + penstroke z1e .. z2e; + penstroke z3e .. z4e; + penstroke z5e .. z6e; + fi label(6); endchar; "Right bracket"; beginchar("]", ltr_wd(1,0), loop_ascend * ex#, 1/2 loop_descend * ex#); - penpos1(med, 270); z1r = (5/6, loop_ascend) u; - penpos2(med, 270); z2r = (1/6, loop_ascend) u; - - penstroke z1e .. z2e; + penpos1(med, 270); z1l = (1/6, loop_ascend) u; + penpos2(med, 270); z2l = (5/6, loop_ascend) u; penpos3(thick, 180); z3l = (5/6, loop_ascend) u; penpos4(thick, 180); z4l = (5/6, -1/2 loop_descend) u; - penstroke z3e .. z4e; + penpos5(med, 90); z5l = (5/6, -1/2 loop_descend) u; + penpos6(med, 90); z6l = (1/6, -1/2 loop_descend) u; - penpos5(med, 90); z5l = (1/6, -1/2 loop_descend) u; - penpos6(med, 90); z6l = (5/6, -1/2 loop_descend) u; + if fixed: + draw z1 -- z2 -- z5 -- z6 withpen pencircle scaled med; + else: + penstroke z1e .. z2e; + penstroke z3e .. z4e; + penstroke z5e .. z6e; + fi - penstroke z5e .. z6e; + label(6); +endchar; + +"Left brace"; +beginchar("{", ltr_wd(7/6,0), loop_ascend * ex#, 1/2 loop_descend * ex#); + penpos1(med, 90); + penpos2(thick, 180); + penpos3(med, 90); + penpos4(med, 270); + penpos5(thick, 180); + penpos6(med, 270); + + x1 = x6 = v; + y1r = loop_ascend * ex; + y6r = -1/2 loop_descend * ex; + z3 = z4 = (1/6 v, 1/2[y1,y6]); + z2 = 1/2 [z1, z3]; + z5 = 1/2 [z4, z6]; + + penstroke z1e {left} .. z2e .. {left} z3e; + penstroke z4e {right} .. z5e .. {right} z6e; + + label(6); +endchar; + +"Right brace"; +beginchar("}", ltr_wd(7/6,0), loop_ascend * ex#, 1/2 loop_descend * ex#); + penpos1(med, 270); + penpos2(thick, 180); + penpos3(med, 270); + penpos4(med, 90); + penpos5(thick, 180); + penpos6(med, 90); + + x1 = x6 = 1/6 v; + y1l = loop_ascend * ex; + y6l = -1/2 loop_descend * ex; + z3 = z4 = (v, 1/2[y1,y6]); + z2 = 1/2 [z1, z3]; + z5 = 1/2 [z4, z6]; + + penstroke z1e {right} .. z2e .. {right} z3e; + penstroke z4e {left} .. z5e .. {left} z6e; label(6); endchar; "Slash"; -beginchar("/", ltr_wd(3/2,0), loop_ascend * ex#, 1/2 loop_descend * ex#); - penpos1(thick, 180); z1l = (8/6, loop_ascend) u; - penpos2(thick, 180); z2r = (1/6, -1/2 loop_descend) u; +beginchar("/", ltr_wd(2,0), loop_ascend * ex#, 1/2 loop_descend * ex#); + penpos1(thick, 180); z1l = (w - 1/6 v, loop_ascend * ex); + penpos2(thick, 180); z2r = (1/6 v, -1/2 loop_descend * ex); + penstroke z1e .. z2e; + label(2); +endchar; + +"Vertical bar"; +beginchar("|", ltr_wd(1,0), loop_ascend * ex#, 1/2 loop_descend * ex#); + penpos1(thick, 180); z1 = (w/2, loop_ascend * ex); + penpos2(thick, 180); z2 = (w/2, -1/2 loop_descend * ex); + penstroke z1e .. z2e; + label(2); +endchar; + +"Reverse slash"; +beginchar("\", ltr_wd(2,0), loop_ascend * ex#, 1/2 loop_descend * ex#); + penpos1(thick, 180); z1r = (1/6 v, loop_ascend * ex); + penpos2(thick, 180); z2l = (w - 1/6 v, -1/2 loop_descend * ex); penstroke z1e .. z2e; label(2); endchar; @@ -2289,27 +2611,48 @@ beginchar("&", ltr_wd(3,0), uc_ascend * ex#, 0); endchar; "French opening quote"; -beginchar("«", ltr_wd(1,2), ex#, 0); - penpos1(med, 180); z1l = (1/2, 9/10) u; - penpos2(thick, 180); z2r = (0, 1/2) u; - penpos3(med, 180); z3l = (1/2, 1/10) u; - penstroke z1e{down} .. tension 1.3 .. z2e; - penstroke z2e .. tension 1.3 .. {down}z3e; +beginchar(19, ltr_wd(11/10,2), ex#, 0); + penpos1(thick, 150); y1r = ex; + penpos2(thin, 90); z2 = (link_width, 1/2) u; + penpos3(thick, 30); y3l = 0; + x1l = x3r = w - (link_width + 2/5) * v; + penstroke z1e .. {dir 190} z2e; + penstroke z3e .. {dir 170} z2e; label(3); - addto currentpicture also currentpicture shifted (3/8 v, 0); + addto currentpicture also currentpicture shifted (2/5 v, 0); endchar; "French closing quote"; -beginchar("»", ltr_wd(1,2), ex#, 0); - penpos1(med, 180); z1r = (2 link_width + 1/2, 9/10) u; - penpos2(thick, 180); z2l = (2 link_width + 1, 1/2) u; - penpos3(med, 180); z3r = (2 link_width + 1/2, 1/10) u; - penstroke z1e{down} .. tension 2 .. z2e; - penstroke z2e .. tension 2 .. {down}z3e; +beginchar(20, ltr_wd(11/10,2), ex#, 0); + penpos1(thick, 210); y1l = ex; + penpos2(thin, 270); z2 = (w - (link_width + 2/5) * v, ex/2); + penpos3(thick, 330); y3r = 0; + x1r = x3l = link_width * v; + penstroke z1e .. {dir -10} z2e; + penstroke z3e .. {dir 10} z2e; label(3); - addto currentpicture also currentpicture shifted (-3/8 v, 0); + addto currentpicture also currentpicture shifted (2/5 v, 0); endchar; +"Less than sign"; +beginchar("<", ltr_wd(3/2,2), num_ht, 0); + penpos1(med, 90); z1r = (3/2 + link_width, 9/10 straight_ascend) u; + penpos2(med, 90); z2 = (link_width, 1/2 straight_ascend) u; + penpos3(med, 90); z3l = (3/2 + link_width, 1/10 straight_ascend) u; + penstroke z1e .. z2e; + penstroke z3e .. z2e; + label(3); +endchar; + +"Greater than sign"; +beginchar(">", ltr_wd(3/2,2), num_ht, 0); + penpos1(med, 270); z1r = (link_width, 9/10 straight_ascend) u; + penpos2(med, 270); z2 = (3/2 + link_width, 1/2 straight_ascend) u; + penpos3(med, 270); z3l = (link_width, 1/10 straight_ascend) u; + penstroke z1e .. z2e; + penstroke z3e .. z2e; + label(3); +endchar; %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% @@ -2324,6 +2667,8 @@ endchar; %% successions of an uppercase and a lowercase, but also in some cases for %% punctuation. +%%\subsec Macros for ligature tables. %{{{2 + k# := base_width * ex#; "Right boundary pseudo-character"; @@ -2332,75 +2677,85 @@ beginchar(23, 0, 0, 0) endchar; boundarychar := 23; def word_ends = - ".", ",", ";", ":", "'", ")", "]", "/", "»", "-", 21, 22 enddef; - -%% The following macros enumerate all variants of each vowel. - -def var_a = "a","à","á","â","ã","ä","å" enddef; -def var_c = "c","ç" enddef; -def var_e = "e","è","é","ê","ë" enddef; -def var_i = "i","ì","í","î","ï" enddef; -def var_o = "ò","ó","ô","õ","ö" enddef; -% We don't include ``o'' because of the special kerning with the ``e''. -def var_u = "u","ù","ú","û","ü" enddef; - -def lig_small (expr lig) = - for lt = var_a, var_c, var_e, "o", var_o: lt |=:| lig, endfor - "d" |=:| lig, - "g" |=:| lig, - "q" |=:| lig -enddef; - -def lig_loop (expr lig) = - "b" |=:| lig, - "f" |=:| lig, - "h" |=:| lig, - "k" |=:| lig, - "l" |=:| lig + ".", ",", ";", ":", "'", ")", "]", "/", 20, "-", 21, 22 enddef; + +%% The sets of variants of letters. + +def var_a = "a",160,161,224,225,226,227,228,229 enddef; +def var_c = "c",162,163,231 enddef; +def var_d = "d",164 enddef; +def var_e = "e",165,166,232,233,234,235 enddef; +def var_g = "g",167 enddef; +def var_i = "i",236,237,238,239 enddef; +def var_l = "l",168,169,170 enddef; +def var_n = "n",171,172,241 enddef; +def var_o = "o",174,242,243,244,245,246,248 enddef; +def var_r = "r",175,176 enddef; +def var_s = "s",177,178,179 enddef; +def var_t = "t",180,181 enddef; +def var_u = "u",182,183,249,250,251,252 enddef; +def var_y = "y",184,253 enddef; +def var_z = "z",185,186,187 enddef; + +%% The sets of shapes for links. + +def sh_small = var_a, var_c, var_d, var_e, var_g, var_o, "q", 247 enddef; +def sh_loop = "b", "f", "h", "k", var_l enddef; +def sh_vert = var_i, var_r, var_t, var_u, var_z enddef; +def sh_far = "j", "p", var_s enddef; +def sh_hloop = "h", "k" enddef; +def sh_mn = "m", var_n, "v", "w", "x", var_y enddef; +def sh_x = "x" enddef; + +%% Some macros to use these lists. + +boolean ligged[], first; + +def ligtables (text list) = + ligtable + for c = list: + if not known ligged[byte c]: + hide ( ligged[byte c] = true ) c: + fi + endfor enddef; -def lig_vert (expr lig) = - for lt = var_i, var_u: lt |=:| lig, endfor - "r" |=:| lig, - "t" |=:| lig, - "u" |=:| lig, - "z" |=:| lig +def link (text list) (expr chr) = + hide(first := true) + for lft = list: + if first: hide(first := false) else: , fi lft |=:| chr endfor enddef; -def lig_far (expr lig) = - "j" |=:| lig, - "p" |=:| lig, - "s" |=:| lig -enddef; - -def lig_mn (expr lig) = - "m" |=:| lig, - "n" |=:| lig, "ñ" |=:| lig, - "v" |=:| lig, - "w" |=:| lig, - "x" |=:| lig, - "y" |=:| lig, "ý" |=:| lig, "ÿ" |=:| lig +def links (suffix ln) (text sh) = + hide (first := true) + forsuffixes # = sh: + if first: hide(first := false) else: , fi + expandafter link expandafter ( scantokens ("sh_" & str #) )(lnk.#.ln) + endfor enddef; +%%% ligtable ligtables +%%% penpos link links %%\subsec Ligatures between lowercase and punctuations. %{{{2 ligtable "-": "-" =: 21, skipto 0; -ligtable 21: "-" =: 22; +ligtable 21: "-" =: 22, skipto 0; ligtable "!": "`" =: 189; ligtable "?": "`" =: 190; ligtable "`": "`" kern -2 link_width * k#, skipto 0; ligtable "'": "'" kern -2 link_width * k#, skipto 0; -ligtable 152: "'" =:| "'", skipto 0; +ligtable 18: "'" =:| "'", skipto 0; -%% % ligtable "<": "<" =: "«"; -%% % ligtable ">": ">" =: "»"; +ligtable "<": "<" =: 19; +ligtable ">": ">" =: 20; -ligtable ||: "(": "[": "/": 189: 190: +ligtable ||: "(": ")": "[": "]": "{": "}": "/": "|": "\": + 189: 190: ".": ":": ";": 20: 22: 0:: - lig_far(140), lig_mn(149), + link(sh_far)(lnk.far.low), link(sh_mn)(lnk.mn.beg), skipto 2; @@ -2409,90 +2764,94 @@ ligtable ||: "(": "[": "/": 189: 190: %% Special cases: the q and the s have a different shape at the end of words, %% they have no right link, contrary to the other letters. -ligtable "q": - for c = boundarychar, word_ends: c =:| 150, endfor - skipto 2; -ligtable "s": - for c = boundarychar, word_ends: c =:| 154, endfor - skipto 2; +ligtables ("q", var_s) + for c = 97 upto 122: c |=:| lnk.sq, endfor + for c = 160, 161, 162, 163, 165, 166, 167, 168, 170, 171, 172, + 175, 176, 177, 178, 179, 181, 183, 185, 186, 187: c |=:| lnk.sq, endfor + for c = 224 upto 252: + if (c <> 230) and (c <> 240): c |=:| lnk.sq, fi endfor + 253 |=:| lnk.sq; + +ligtables ("h", "k") + "'" |=: 18, skipto 1; -ligtable "h": "k": "'" |=: 152, skipto 1; -ligtable for lt = var_a, var_i, var_u: lt: endfor +ligtables (var_a, var_d, var_i, "m", var_n, "p", var_r, var_u, lnk.sq) 1:: - "d": "m": "n": "ñ": "p": "r": - for lt = boundarychar, word_ends: lt |=:| 135, endfor + for lt = boundarychar, word_ends: lt |=:| lnk.lowmed, endfor skipto 2; -ligtable 139: + +ligtables (lnk.low) 2:: - "h" |=:| 144, "k" |=:| 144, "x" |=:| 155, - lig_small(128), lig_loop(132), lig_vert(136), lig_far(140), lig_mn(146); -ligtable "f": "g": "j": "y": "ý": "ÿ": "z": - "j" |=:| 142, skipto 3; -ligtable "l": "'" |=: 152, skipto 3; -ligtable for lt = var_c, var_e: lt: endfor "t": "x": + links (low) (small, hloop, loop, vert, far, mn, x); + +ligtables (var_l) + "'" |=: 18, skipto 3; + +ligtables (var_c, var_e, "f", var_g, "j", var_t, "x", var_y, var_z, 247) 3:: - "h" |=:| 145, "k" |=:| 145, "x" |=:| 156, - lig_small(129), lig_loop(133), lig_vert(137), lig_far(141), lig_mn(147); -ligtable "o": - "e" kern -link_width*k# - med#, skipto 5; -ligtable 131: - "e" kern -thin#, skipto 5; -ligtable "b": "'" |=: 152, skipto 4; -ligtable for lt = var_o: lt: endfor "v": "w": + links (med) (small, hloop, loop, vert, far, mn, x); + +ligtables (lnk.high) + for c = var_e: c kern -thin#, endfor + skipto 5; + +ligtables ("b") + "'" |=: 18, skipto 4; + +ligtables (var_o, "v", "w") 4:: - "e" |=:| 131, + for c = var_e: c |=:| lnk.high, endfor + for c = "-", 21, 22: c kern thin#, endfor 5:: - lig_small(130), lig_loop(134), lig_vert(138), lig_far(143), lig_mn(148); + links (high) (small, loop, vert, far, mn); %%\subsec Ligatures and spacings after uppercase letters. %{{{2 -ligtable "G": "J": "Y": "Ý": - "h" |=:| 145, "j" |=:| 142, "k" |=:| 145, "x" |=:| 156, - lig_small(129), lig_loop(133), lig_vert(137), lig_far(141), lig_mn(147); +ligtable "G": "J": "Y": 221: + links (med) (small, hloop, loop, vert, far, mn, x); ligtable "F": "S": - 128 kern -1/2 k#, % small letters are closer - 142 kern -1/5 k#, % j, p, s too - lig_small(128), + lnk.small.low kern -1/2 k#, % small letters are closer + lnk.vert.low kern -1/4 k#, % verticals too + lnk.far.med kern -1/5 k#, % j, p, s too + link(sh_small)(lnk.small.low), skipto 6; -ligtable "I": "Ì": "Í": "Î": "Ï": - for l = 134, 136, 149: l kern 1/8ex#, endfor +ligtable "I": 204: 205: 206: 207: + for l = lnk.loop.high, lnk.vert.low, lnk.mn.beg: l kern 1/8ex#, endfor skipto 6; -ligtable "N": "Ñ": - 128 kern -1/3 k#, - 142 kern -1/5 k#, +ligtable "N": 209: + lnk.small.low kern -1/3 k#, + lnk.far.med kern -1/5 k#, skipto 6; ligtable "P": - 128 kern -5/8 k#, - 142 kern -1/3 k#, - 136 kern -5/12 k#, + lnk.small.low kern -5/8 k#, + lnk.far.med kern -1/3 k#, + lnk.vert.low kern -5/12 k#, skipto 6; ligtable "Q": - 149 kern 1/5 k#, - lig_small(128), + lnk.mn.beg kern 1/5 k#, + link(sh_small)(lnk.small.low), skipto 6; -ligtable "H": "K": "L": - 128 kern 1/8 k#, - 149 kern 1/6 k#, +ligtable "H": "K": "L": + lnk.small.low kern 1/8 k#, + lnk.mn.beg kern 1/6 k#, skipto 6; -ligtable "B": "C": "D": "M": "R": "T": "V": "W": "X": "Z": - "A": "À": "Á": "Â": "Ã": "Ä": - "E": "È": "É": "Ê": "Ë": - "O": "Ò": "Ó": "Ô": "Õ": "Ö": - "U": "Ù": "Ú": "Û": "Ü": - 149 kern 1/6 k#, +ligtable "B": "C": 199: "D": "M": "R": "T": "V": "W": "X": "Z": + "A": 192: 193: 194: 195: 196: 197: + "E": 200: 201: 202: 203: + "O": 210: 211: 212: 213: 214: 216: + "U": 217: 218: 219: 220: + lnk.mn.beg kern 1/6 k#, 6:: - lig_small(128), - "h" |=:| 145, "k" |=:| 145, - lig_loop(132), - lig_vert(136), - lig_far(142), - lig_mn(149); + links (med) (hloop), + links (low) (small, loop, vert), + links (med) (far), + links (beg) (mn); bye. diff --git a/Master/texmf-dist/fonts/source/public/frcursive/frcw10.mf b/Master/texmf-dist/fonts/source/public/frcursive/frcw10.mf deleted file mode 100644 index 0df51cdf09f..00000000000 --- a/Master/texmf-dist/fonts/source/public/frcursive/frcw10.mf +++ /dev/null @@ -1,29 +0,0 @@ -%%% This file is part of the French Cursive font definition. -%%% This is a parameter file for the wide-links variant - -font_identifier := "FCW"; -font_size 10 pt#; - -mode_setup; - -ex# := 155.0/36 pt#; -med# := 0.4 pt#; -thin# := 0.2 pt#; -thick# := 0.6 pt#; -dot_size# := 0.8 pt#; - -base_width := .800; -slant := 0; -accent_wd := 0.7; -link_width := 0.4; -straight_ascend := 2; -loop_ascend := 2.5; -uc_ascend := 2.5; -straight_descend := 1.2; -loop_descend := 1.5; -dot_height := 1.4; -accent_bot := 1.2; -accent_top := 1.6; -cedilla_dp = 0.2; - -input frcursive diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frca10.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frca10.tfm index d6978e3b527..be3cdf9cf0a 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frca10.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frca10.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx10.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx10.tfm index c4f6d91c4e8..b938299d944 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx10.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx10.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx11.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx11.tfm deleted file mode 100644 index 4c432b0af32..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx11.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx12.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx12.tfm deleted file mode 100644 index a0920b5b2e9..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx12.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx14.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx14.tfm index d9eea1c9f51..e9d57a56a10 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx14.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx14.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx17.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx17.tfm deleted file mode 100644 index f180dc96f55..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx17.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx6.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx6.tfm new file mode 100644 index 00000000000..e8730d98fdf Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx6.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx7.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx7.tfm deleted file mode 100644 index 73d632c9d69..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx7.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx8.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx8.tfm deleted file mode 100644 index fd323b8c94c..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx8.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx9.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx9.tfm deleted file mode 100644 index 55e93af18b2..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcbx9.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcc10.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcc10.tfm index 63608cf5389..cf63147273b 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcc10.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcc10.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcc11.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcc11.tfm deleted file mode 100644 index 33923a7a57d..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcc11.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcc12.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcc12.tfm deleted file mode 100644 index 769594bb2b3..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcc12.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcc14.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcc14.tfm index ededc282110..9f14f5c4c8d 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcc14.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcc14.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcc6.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcc6.tfm new file mode 100644 index 00000000000..a54a824f645 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcc6.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcf10.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcf10.tfm index f241f5e728f..567df6104c7 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcf10.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcf10.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcf11.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcf11.tfm deleted file mode 100644 index 3d1d3d676d6..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcf11.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcf12.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcf12.tfm deleted file mode 100644 index 67042dbe263..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcf12.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcf14.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcf14.tfm index eb4d50c3ef0..bdf3297333d 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcf14.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcf14.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcf6.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcf6.tfm new file mode 100644 index 00000000000..2c205b22c69 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcf6.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr10.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr10.tfm index 46f417e6ccc..51da26447e7 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr10.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr10.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr11.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr11.tfm deleted file mode 100644 index c828a499910..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr11.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr12.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr12.tfm deleted file mode 100644 index bc8daabe326..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr12.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr14.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr14.tfm index 02df4918e28..ae3696e2eab 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr14.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr14.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr17.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr17.tfm deleted file mode 100644 index 670aa5768b7..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr17.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr6.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr6.tfm new file mode 100644 index 00000000000..769f627970b Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr6.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr7.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr7.tfm deleted file mode 100644 index 4f70645471a..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr7.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr8.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr8.tfm deleted file mode 100644 index 4d2c67c9331..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr8.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr9.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcr9.tfm deleted file mode 100644 index 20bfcafc0b2..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcr9.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl10.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl10.tfm index 0a2f9f32c16..af586df24f0 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl10.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl10.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl11.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl11.tfm deleted file mode 100644 index 032554a28c4..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl11.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl12.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl12.tfm deleted file mode 100644 index 3089dd3375b..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl12.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl14.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl14.tfm index 164df7063d2..feae64c4242 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl14.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl14.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl17.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl17.tfm deleted file mode 100644 index a6d3a38f44c..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl17.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl6.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl6.tfm new file mode 100644 index 00000000000..e731e28c830 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl6.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl7.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl7.tfm deleted file mode 100644 index 43b1f0bfe42..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl7.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl8.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl8.tfm deleted file mode 100644 index 25d6acae7c2..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl8.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl9.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl9.tfm deleted file mode 100644 index 014eda94933..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcsl9.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx10.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx10.tfm index 83d2b714190..5304d647de0 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx10.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx10.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx11.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx11.tfm deleted file mode 100644 index f128d1ce1ad..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx11.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx12.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx12.tfm deleted file mode 100644 index fe22558015a..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx12.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx14.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx14.tfm index 03547679f6d..4e3383e07e2 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx14.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx14.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx17.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx17.tfm deleted file mode 100644 index 89bea9d8b07..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx17.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx6.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx6.tfm new file mode 100644 index 00000000000..964a2a4405a Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx6.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx7.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx7.tfm deleted file mode 100644 index 7439c0b7605..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx7.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx8.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx8.tfm deleted file mode 100644 index 179765d0852..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx8.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx9.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx9.tfm deleted file mode 100644 index d8b9a982b0d..00000000000 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslbx9.tfm and /dev/null differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslc10.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslc10.tfm new file mode 100644 index 00000000000..a8b8dc82318 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslc10.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslc14.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslc14.tfm new file mode 100644 index 00000000000..31a335fd919 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslc14.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcslc6.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslc6.tfm new file mode 100644 index 00000000000..ca6fdea0e74 Binary files /dev/null and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcslc6.tfm differ diff --git a/Master/texmf-dist/fonts/tfm/public/frcursive/frcw10.tfm b/Master/texmf-dist/fonts/tfm/public/frcursive/frcw10.tfm index 9437516bc1a..b1a91ca5bf3 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/frcursive/frcw10.tfm and b/Master/texmf-dist/fonts/tfm/public/frcursive/frcw10.tfm differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frca10.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frca10.pfb new file mode 100644 index 00000000000..74926ceac50 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frca10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcbx10.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcbx10.pfb new file mode 100644 index 00000000000..5a67407e207 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcbx10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcbx14.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcbx14.pfb new file mode 100644 index 00000000000..e06c41a2d62 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcbx14.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcbx6.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcbx6.pfb new file mode 100644 index 00000000000..9778a9836fc Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcbx6.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcc10.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcc10.pfb new file mode 100644 index 00000000000..b3b82e85160 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcc10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcc14.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcc14.pfb new file mode 100644 index 00000000000..d3cd2a8acc5 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcc14.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcc6.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcc6.pfb new file mode 100644 index 00000000000..81a041a9ae3 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcc6.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcf10.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcf10.pfb new file mode 100644 index 00000000000..ed38900d0ef Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcf10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcf14.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcf14.pfb new file mode 100644 index 00000000000..ade2d4ec051 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcf14.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcf6.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcf6.pfb new file mode 100644 index 00000000000..3bda86af0df Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcf6.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcr10.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcr10.pfb new file mode 100644 index 00000000000..d27ed9247dd Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcr10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcr14.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcr14.pfb new file mode 100644 index 00000000000..f8d7ef4017b Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcr14.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcr6.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcr6.pfb new file mode 100644 index 00000000000..aa77b25a0f4 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcr6.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcsl10.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcsl10.pfb new file mode 100644 index 00000000000..9d5f7f93f38 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcsl10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcsl14.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcsl14.pfb new file mode 100644 index 00000000000..170806e81e1 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcsl14.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcsl6.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcsl6.pfb new file mode 100644 index 00000000000..d6d207b2383 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcsl6.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcslbx10.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcslbx10.pfb new file mode 100644 index 00000000000..814eed8b2a3 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcslbx10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcslbx14.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcslbx14.pfb new file mode 100644 index 00000000000..4070d443a92 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcslbx14.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcslbx6.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcslbx6.pfb new file mode 100644 index 00000000000..bbe2797693a Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcslbx6.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcslc10.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcslc10.pfb new file mode 100644 index 00000000000..d4311123d19 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcslc10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcslc14.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcslc14.pfb new file mode 100644 index 00000000000..56abb1f0d96 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcslc14.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcslc6.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcslc6.pfb new file mode 100644 index 00000000000..f7aede54ee2 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcslc6.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/frcursive/frcw10.pfb b/Master/texmf-dist/fonts/type1/public/frcursive/frcw10.pfb new file mode 100644 index 00000000000..1cfcc005a61 Binary files /dev/null and b/Master/texmf-dist/fonts/type1/public/frcursive/frcw10.pfb differ diff --git a/Master/texmf-dist/metapost/frcursive/chars.mp b/Master/texmf-dist/metapost/frcursive/chars.mp deleted file mode 100644 index 7dbfa32a43a..00000000000 --- a/Master/texmf-dist/metapost/frcursive/chars.mp +++ /dev/null @@ -1,143 +0,0 @@ -%&mfplain - -% The resolution tu use for rounding. - -pixel = 1in/300; - -% The rounding primitives, adapted from plain.mf. - -vardef round primary u = - if numeric u: floor(u+.5) - elseif pair u: (hround xpart u, vround ypart u) - else: u fi enddef; -vardef hround primary x = (floor(x/pixel+.5)*pixel) enddef; -vardef vround primary y = (floor(y/pixel.o_+.5)_o_*pixel) enddef; - -def define_pixels(text t) = - forsuffixes $=t: $:=$.#*hppp; endfor enddef; -def define_whole_pixels(text t) = - forsuffixes $=t: $:=hround($.#*hppp); endfor enddef; -def define_whole_vertical_pixels(text t) = - forsuffixes $=t: $:=vround($.#*hppp); endfor enddef; -def define_good_x_pixels(text t) = - forsuffixes $=t: $:=good.x($.#*hppp); endfor enddef; -def define_good_y_pixels(text t) = - forsuffixes $=t: $:=good.y($.#*hppp); endfor enddef; -def define_blacker_pixels(text t) = - forsuffixes $=t: $:=$.#*hppp+blacker; endfor enddef; -def define_whole_blacker_pixels(text t) = - forsuffixes $=t: $:=hround($.#*hppp+blacker); - if $<=0: $:=1; fi endfor enddef; -def define_whole_vertical_blacker_pixels(text t) = - forsuffixes $=t: $:=vround($.#*hppp+blacker); - if $<=0: $:=1_o_; fi endfor enddef; -def define_corrected_pixels(text t) = - forsuffixes $=t: $:=vround($.#*hppp*o_correction)+eps; endfor enddef; -def define_horizontal_corrected_pixels(text t) = - forsuffixes $=t: $:=hround($.#*hppp*o_correction)+eps; endfor enddef; - -vardef good.x primary x = hround(x+pen_lft)-pen_lft enddef; -vardef good.y primary y = vround(y+pen_top)-pen_top enddef; -vardef good.lft primary z = save z_; pair z_; - (z_+(pen_lft,0))t_=round((z+(pen_lft,0))t_); z_ enddef; -vardef good.rt primary z = save z_; pair z_; - (z_+(pen_rt,0))t_=round((z+(pen_rt,0))t_); z_ enddef; -vardef good.top primary z = save z_; pair z_; - (z_+(0,pen_top))t_=round((z+(0,pen_top))t_); z_ enddef; -vardef good.bot primary z = save z_; pair z_; - (z_+(0,pen_bot))t_=round((z+(0,pen_bot))t_); z_ enddef; - - -% We change the stroke routine a bit and we save some character shapes. - -let saved_beginchar = beginchar; -let saved_endchar = endchar; - -picture pic[]; - -def penstroke text t = - forsuffixes e = l,r: path_.e:=t; endfor - fill path_.l -- reverse path_.r -- cycle; - draw path_.l -- reverse path_.r -- cycle - withpen pencircle scaled 1 withcolor black enddef; - -def beginchar (expr c,w,h,d) = -if (byte c) >= 128: - proofcolor := .3[white,red]; -else: - proofcolor :=.3[white,black]; -fi -saved_beginchar(c,w,h,d) -enddef; - -def endchar = ; -%if charcode = 97: - for pos = 0 step pixel until w: proofrule((pos,-d), (pos,h)); endfor - for pos = 0 step pixel until h: proofrule((0,pos), (w,pos)); endfor - for pos = -pixel step -pixel until -d: proofrule((0,pos), (w,pos)); endfor -%fi -%if save_char(charcode): -% pic[charcode] = currentpicture; -% wid[charcode] = w -%fi; -%if make_char(charcode): - saved_endchar -%else: endgroup fi -enddef; - - -% We build a figure with a string, using saved characters. - -def txt = - 128, "a", 132, "b", 143, "j", 129, "e", 129, "c", 137, "t" -enddef; - -def make_char (expr c) = - for cc = "A", "a", "b", "j": (c = byte cc) or endfor false enddef; -def save_char (expr c) = - for cc = txt: (c = byte cc) or endfor false enddef; - - -% Here we read the actual font, providing an explicit driver (this is frcr10). - -proofing := -1; - -mode_setup; - -ex# := 155.0/36 pt#; -med# := .400 pt#; -thin# := .200 pt#; -thick# := .610 pt#; -dot_size# := .800 pt#; - -base_width := .800; -slant := 0; -accent_wd := 0.7; -link_width := 0.13; -straight_ascend := 2; -loop_ascend := 2.5; -uc_ascend := 2.5; -straight_descend := 1.2; -loop_descend := 1.5; -dot_height := 1.4; -accent_bot := 1.2; -accent_top := 1.6; -cedilla_dp = 0.2; - -input frcursive - - -% Here is the word built as one figure. - -let beginchar = saved_beginchar; -let endchar = saved_endchar; - -beginchar(0,0,0,0) - xpos := 0; - for c = txt: - addto currentpicture also pic[byte c] shifted (xpos,0); - xpos := xpos + wid[byte c]; - endfor; -endchar; - -end diff --git a/Master/texmf-dist/source/fonts/frcursive/Makefile b/Master/texmf-dist/source/fonts/frcursive/Makefile deleted file mode 100644 index f4c7e9c1af3..00000000000 --- a/Master/texmf-dist/source/fonts/frcursive/Makefile +++ /dev/null @@ -1,125 +0,0 @@ -# main Makefile for French Cursive -# © 2002--2004 Emmanuel Beffara, GPL -# -#---------------------------------------------------------- -# -# Modify the following variables to install the files in the appropriate -# directories for your system. -# -# The base of the TeX hierarchy: - -TEXMF = /usr/share/texmf - -# The place where the Metafont sources are installed: - -MFDIR = $(TEXMF)/fonts/source/frcursive - -# The place where the LaTeX sources are installed: - -LATEXDIR = $(TEXMF)/tex/latex/misc - -# Here ends the customization part. -# -#---------------------------------------------------------- - -SRCDIR = mf -LTXDIR = latex - -FONTS = $(basename $(notdir $(wildcard $(SRCDIR)/frc*.mf))) -SOURCES = frcursive - -TFMs = $(addsuffix .tfm,$(FONTS)) -SRC = $(addsuffix .mf,$(SOURCES)) -ALLSRC = $(addsuffix .mf,$(SOURCES) $(FONTS)) -MFs = $(addprefix $(SRCDIR)/,$(SRC)) -ALLMFs = $(addprefix $(SRCDIR)/,$(ALLSRC)) - -MFVAR = env MFINPUTS=.:$(SRCDIR):$$MFINPUTS -LMVAR = $(MFVAR) TEXINPUTS=.:$(LTXDIR):$$TEXINPUTS - -.SUFFIXES: -.PHONY: default source doc test type1 clean dist -.SECONDARY: $(TFMs) - -#-- Main targets. - -default: - @echo please choose a target... - -source: - @make -C mf -latex: $(LTXDIR)/frcursive.sty -$(LTXDIR)/frcursive.sty: $(LTXDIR)/frcursive.ins $(LTXDIR)/frcursive.dtx - @make -C latex -doc: - @make -C doc -test: - @make -C test -type1: - @make -C pfb - -clean: - rm -f *.pbm *.*gf *.*pk *.tfm *.dvi *.log *.aux *.ps *.pdf - rm -rf frcursive - @make -C mf clean - @make -C latex clean - @make -C doc clean - @make -C test clean - -#-- Installation. - -install: - mkdir -p $(MFDIR) - cp mf/*.mf $(MFDIR)/ - mkdir -p $(LATEXDIR) - cp latex/* $(LATEXDIR)/ - -#-- Distribution. - -DOCS = doc/COPYING doc/Makefile doc/fcsource.tex doc/FILES - -dist: - make clean source latex - rm -rf frcursive frcursive.tar.gz - mkdir frcursive - mkdir frcursive/mf - mkdir frcursive/latex - mkdir frcursive/doc - mkdir frcursive/test - cp Makefile README frcursive/ - cp mf/* frcursive/mf/ - cp latex/* frcursive/latex/ - rm -v frcursive/latex/frcursive.log - cp $(DOCS) frcursive/doc/ - cp test/* frcursive/test/ - tar zcf frcursive.tar.gz frcursive - rm -rf frcursive - -#-- Testing targets. - -t: - rm -f *.tfm *.*pk - $(MFVAR) tex test/tfc - xdvi -geometry 1024x768+0+0 -s 2 tfc -tf: - rm -f *.tfm *.*pk - echo -e "frcr10\n\\\\table\\\\end" | $(MFVAR) tex testfont - xdvi testfont - -f: frcr10.dvi - - -%.tfm: $(SRCDIR)/%.mf $(MFs) - rm -f $(addprefix $(basename $@),.tfm .*pk .*gf) - $(MFVAR) mktextfm $(basename $@) -%.2602gf: $(SRCDIR)/%.mf $(MFs) - $(MFVAR) mf $(basename $@) - -%.dvi: test/%.tex $(LTXDIR)/frcursive.sty - $(LMVAR) latex $< - -t%.dvi: test/t%.tex - $(MFVAR) tex $< - -frc%.dvi: frc%.2602gf - gftodvi $< diff --git a/Master/texmf-dist/source/fonts/frcursive/frcursive.dtx b/Master/texmf-dist/source/fonts/frcursive/frcursive.dtx deleted file mode 100644 index 90cc4a9ff94..00000000000 --- a/Master/texmf-dist/source/fonts/frcursive/frcursive.dtx +++ /dev/null @@ -1,258 +0,0 @@ -% \iffalse -%<*driver> -\documentclass{ltxdoc} -\usepackage[latin1]{inputenc} -\usepackage{frcursive,url} -\title{French Cursive for \LaTeX} -\author{Emmanuel \textsc{Beffara}\\\url{manu@beffara.org}} -\date{version 1.2, February 2nd, 2004} -\begin{document} -\DocInput{frcursive.dtx} -\end{document} -% -% \fi -% \maketitle -% -% \section{Presentation} -% -% French Cursive is a cursive hand-writing font family. Its design is based on -% the French academic tradition for running-hand. The base shape is upright -% with lightly contrasted stems and hairlines. All lowercase letters are -% connected, but most uppercase are independent. -% \vspace{-3ex} -% \begin{center} -% \newcommand{\exmpl}[2]{% -% #1&\cursive#2\relax The quick brown fox jumps over the lazy dog.} -% \linespread{1.5}\selectfont -% \begin{tabular}{ll} -% style & example \\ \hline \noalign{\smallskip} -% \exmpl{regular}{} \\ -% \exmpl{bold-extended}{\bfseries} \\ -% \exmpl{slanted}{\slshape} \\ -% \exmpl{calligraphic}{\calseries} \\ -% \exmpl{fixed-thickness}{\ftseries} \\ -% wide & \cursive\wideseries The quick brown fox jumps \dots \\ -% \exmpl{academic}{\acadshape} -% \end{tabular} -% \end{center} -% The extra styles come with associated macros: -% \begin{center} -% \begin{tabular}{lll} -% style & environment & local macro \\ \hline -% cursive & \texttt{cursive} & \texttt{\string\textcursive} \\ -% calligraphic & \texttt{calseries} & \texttt{\string\textcal} \\ -% fixed-thickness & \texttt{ftseries} & \texttt{\string\textft} \\ -% wide & \texttt{wideseries} & \texttt{\string\textwide} \\ -% academic & \texttt{acadshape} & \texttt{\string\textacad} \\ -% \end{tabular} -% \end{center} -% -% For a given design size, the choice was made to make the base height (1\,ex) -% equal to the one for Computer Modern faces, \mbox{i.e.} small letters like -% ``a'' have the same height in both fonts at 10pt (namely $155/36$ points). -% As you can see, the ascending and descending loops are larger than the -% largest letters in Computer Modern and other roman fonts. For this reason, -% the space between lines has to be augmented a lot. We must actually use a -% |\linespread| value of $3/2$ in paragraphs that contain cursive text. -% -% Inter-letter links are inserted using a complex ligature system. Since -% ligatures are incompatible with \TeX's way of composing accented letters, -% all accented letters have to be provided by the font itself, therefore the -% encoding used is T1. Though technically the font can be used in standard OT1 -% encoding, this is only suitable if no accented character is to be used, -% therefore OT1 encoding is not the default. -% -% \section{Interface} -% -% \begin{macrocode} -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{frcursive} - [2004/02/01 v1.2 support package for French Cursive] -% \end{macrocode} -% -% \subsection{Package options} -% -% \begin{macro}{OT1} -% The default encoding used for the font is T1, but we provide the option -% ``OT1'' to use this encoding instead. -% \begin{macrocode} -\newcommand{\frcursive@enc}{T1} -\DeclareOption{OT1}{% - \renewcommand{\frcursive@enc}{OT1}} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{default} -% By default we don't change the font for the whole document. However, one -% might want to typeset a whole text in French Cursive. For this purpose, we -% provide the option ``default''. We must delay the redefinition of the -% default face in order to take care of these encoding issues. -% \begin{macrocode} -\newif\if@frcursive@default -\@frcursive@defaultfalse -\DeclareOption{default}{% - \@frcursive@defaulttrue} -% \end{macrocode} -% \end{macro} -% -% These are the only options we provide. -% \begin{macrocode} -\ProcessOptions\relax -% \end{macrocode} -% -% Now we can change fonts if asked for it. -% \begin{macrocode} -\if@frcursive@default -\renewcommand{\rmdefault}{frc} -\linespread{1.5} -\RequirePackage[T1]{fontenc} -\fi -% \end{macrocode} -% -% -% \subsection{Macros} -% -% \begin{macro}{\cursive} -% The main macro we define is obviously the one that switches to cursive font. -% What it has to do is change the font family and encoding, and also change -% the line spread, because letters in French Cursive are larger. We define -% this as an environment because it can be used either in plain \TeX\ style as -% |{\cursive |\emph{text}|}| or as a \LaTeX\ environment. -% \begin{macrocode} -\newenvironment{cursive}{% - \fontencoding{\frcursive@enc}% - \fontfamily{frc}% - \linespread{1.5}% - \selectfont}{% - \par} -% \end{macrocode} -% For the sake of completeness, we provide the alternative form for short -% cursive texts as |\textcursive{|\emph{text}|}|: -% \begin{macrocode} -\newcommand{\textcursive}[1]{{\cursive#1}} -% \end{macrocode} -% However, take care that the effect of the |\linespread| macro only appears -% when changing paragraphs, which means that the |\par| must appear inside the -% group where |\cursive| is used. That is why we put it at the end of the -% |cursive| environment. -% \end{macro} -% -% \begin{macro}{\calseries} -% \begin{macro}{\textcal} -% One of the variants of the typeface is called ``calligraphic''. It is a -% series like ``medium'' and ``bold'', with strong stems and thing hairlines. -% We thus provide a macro to use this series. Using this macro when not using -% the \texttt{frc} family will not work. -% \begin{macrocode} -\newenvironment{calseries}{\fontseries{cal}\selectfont}{} -% \end{macrocode} -% We also provide a variant of this macro in the style of |\textbf|: -% \begin{macrocode} -\newcommand{\textcal}[1]{{\calseries#1}} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\ftseries} -% \begin{macro}{\textft} -% Another variant is called ``fixed-thickness'', is also a series like -% ``medium'' and ``bold'', but with a constant line thickness We provide a -% macro to use this series. As before, using this macro when not using the -% \texttt{frc} family will not work. -% \begin{macrocode} -\newenvironment{ftseries}{\fontseries{ft}\selectfont}{} -\newcommand{\textft}[1]{{\ftseries#1}} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\wideseries} -% \begin{macro}{\textwide} -% There is a variant with wide inter-letter links, we declare it a as a new -% series called ``wide''. This is also specific to French Cursive. -% \begin{macrocode} -\newenvironment{wideseries}{\fontseries{w}\selectfont}{} -\newcommand{\textwide}[1]{{\wideseries#1}} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\acadshape} -% \begin{macro}{\textacad} -% In the same spirit, we now define a pair of macros for accessing the -% ``academic'' shape, the one with integer height ratios between base height, -% ascenders and descenders. This also will not work with other font families. -% \begin{macrocode} -\newenvironment{acadshape}{\fontshape{ac}\selectfont}{} -\newcommand{\textacad}[1]{{\acadshape#1}} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% -% \subsection{Workbook lines} -% -% The following macro is an experimental mechanism for drawing horizontal -% lines behind cursive text, in the style of children's workbooks. -% \begin{center} -% \cursive\acadshape -% \seyes{Here is an example of its behaviour.} -% \end{center} -% I took this idea from C. Verchery's typeface family Plum. His approach was -% to create a version (named Seyes) with the lines in them. Although this -% would be rather trivial to implement with Metafont, it would not work with -% \TeX, in particular because of its handling of spaces. Therefore my approach -% is to put the rules using \TeX\ commands, which also allows, for instance, -% for changing their color independently of the text. -% -% \begin{macro}{\seyesThickness} -% The default thickness of the rules will be a twentieth of a millimeter, -% which can be changed be redefining the |\seyesThickness| length: -% \begin{macrocode} -\newlength{\seyesThickness} -\setlength{\seyesThickness}{0.05mm} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\seyesDefault} -% The default code for changing colors is contained in |\seyesDefault|, which -% is empty by default. One can redefine it for instance to |\color{blue}| to -% make the rules blue. -% \begin{macrocode} -\newcommand{\seyesDefault}{} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\seyes} -% The main macro thus takes the text as argument and behaves as a box with -% this text in it and the lines behind. The width of the box is the one of the -% text, while its height and depth are the maximal ones in the font. We -% actually take reference characters to define the height of each line, so -% that it works with any font. However the result is strange when not using -% the academic shape of French Cursive. -% \begin{macrocode} -\newsavebox{\seyes@box} -\newlength{\seyes@ln} -% \end{macrocode} -% \begin{macrocode} -\newcommand{\seyes}[2][\seyesDefault]{% - \mbox{% - \sbox\seyes@box{#2}% - #1% - \raisebox{-0.5\seyesThickness}{\mbox{% - \rlap{\rule{\wd\seyes@box}{\seyesThickness}}% - \settoheight\seyes@ln{a}% - \rlap{\rule[\seyes@ln]{\wd\seyes@box}{\seyesThickness}}% - \settoheight\seyes@ln{d}% - \rlap{\rule[\seyes@ln]{\wd\seyes@box}{\seyesThickness}}% - \settoheight\seyes@ln{b}% - \rlap{\rule[\seyes@ln]{\wd\seyes@box}{\seyesThickness}}% - \settodepth\seyes@ln{p}% - \rlap{\rule[-\seyes@ln]{\wd\seyes@box}{\seyesThickness}}% - \settodepth\seyes@ln{g}% - \rlap{\rule[-\seyes@ln]{\wd\seyes@box}{\seyesThickness}}% - }}% - \usebox\seyes@box}} -% \end{macrocode} -% \end{macro} -% -% \Finale diff --git a/Master/texmf-dist/source/fonts/frcursive/frcursive.ins b/Master/texmf-dist/source/fonts/frcursive/frcursive.ins deleted file mode 100644 index 7c01552f46e..00000000000 --- a/Master/texmf-dist/source/fonts/frcursive/frcursive.ins +++ /dev/null @@ -1,17 +0,0 @@ -% This is the docstrip script for generating frcursive.sty. - -\def\batchfile{frcursive.ins} -\input docstrip - -\usedir{tex/latex/misc} - -\askforoverwritefalse -\keepsilent - -\preamble -\endpreamble - -\generate{\file{frcursive.sty}{\from{frcursive.dtx}{}}} - -\endbatchfile - diff --git a/Master/texmf-dist/tex/latex/frcursive/ot1frc.fd b/Master/texmf-dist/tex/latex/frcursive/ot1frc.fd index 54192c9e70f..403410a06cf 100644 --- a/Master/texmf-dist/tex/latex/frcursive/ot1frc.fd +++ b/Master/texmf-dist/tex/latex/frcursive/ot1frc.fd @@ -2,7 +2,7 @@ % NFSS definition for the French Cursive font family % Bugfixes by Mariusz Wodzicki. -\ProvidesFile{ot1frc.fd}[2004/02/02 French Cursive font definition] +\ProvidesFile{ot1frc.fd}[2004/06/12 French Cursive font definition] \DeclareFontFamily{OT1}{frc}{} \newcommand\DeclareFrenchCursiveShape[3]{ @@ -25,8 +25,9 @@ <12> frc#112 <14.4-> frc#114}{}} -\DeclareReducedFrenchCursiveShape {c} {cal}{n} % calligraphic -\DeclareReducedFrenchCursiveShape {f} {ft}{n} % fixed-thickness +\DeclareReducedFrenchCursiveShape {c} {cal}{n} % calligraphic +\DeclareReducedFrenchCursiveShape {slc} {cal}{sl} % slanted calligraphic +\DeclareReducedFrenchCursiveShape {f} {ft}{n} % fixed-thickness \DeclareFontShape{OT1}{frc}{m}{ac}{<-> frca10}{} \DeclareFontShape{OT1}{frc}{w}{n}{<-> frcw10}{} diff --git a/Master/texmf-dist/tex/latex/frcursive/t1frc.fd b/Master/texmf-dist/tex/latex/frcursive/t1frc.fd index 516ebccdbab..54ab280609b 100644 --- a/Master/texmf-dist/tex/latex/frcursive/t1frc.fd +++ b/Master/texmf-dist/tex/latex/frcursive/t1frc.fd @@ -2,16 +2,14 @@ % NFSS definition for the French Cursive font family % Bugfixes by Mariusz Wodzicki. -\ProvidesFile{t1frc.fd}[2004/02/02 French Cursive font definition] +\ProvidesFile{t1frc.fd}[2004/06/12 French Cursive font definition] \DeclareFontFamily{T1}{frc}{} \newcommand\DeclareFrenchCursiveShape[3]{ \DeclareFontShape{T1}{frc}{#2}{#3}{% - <-8> frc#17 - <8><9><10><12> gen * frc#1 - <10.95> frc#111 - <14.4> frc#114 - <17.28-> frc#117}{}} + <-8> frc#16 + <8-14> frc#110 + <14-> frc#114}{}} \DeclareFrenchCursiveShape {r} {m}{n} \DeclareFrenchCursiveShape {sl} {m}{sl} @@ -20,13 +18,12 @@ \newcommand\DeclareReducedFrenchCursiveShape[3]{ \DeclareFontShape{T1}{frc}{#2}{#3}{% - <-10.95> frc#110 - <10.95> frc#111 - <12> frc#112 - <14.4-> frc#114}{}} + <-14> frc#110 + <14-> frc#114}{}} -\DeclareReducedFrenchCursiveShape {c} {cal}{n} % calligraphic -\DeclareReducedFrenchCursiveShape {f} {ft}{n} % fixed-thickness +\DeclareReducedFrenchCursiveShape {c} {cal}{n} % calligraphic +\DeclareReducedFrenchCursiveShape {slc} {cal}{sl} % slanted calligraphic +\DeclareReducedFrenchCursiveShape {f} {ft}{n} % fixed-thickness \DeclareFontShape{T1}{frc}{m}{ac}{<-> frca10}{} \DeclareFontShape{T1}{frc}{w}{n}{<-> frcw10}{} diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 57359b851b4..4fc529520ac 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -357,7 +357,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'fouriernc', "&MAKEflatten", 'fp', "&MAKEfp", 'fpl', "&MAKEflatten", - 'frcursive', "&MAKEflatten", 'fribrief', "die 'skipping, nonfree license'", 'fullpict', "die 'skipping, noinfo license'", 'futhark', "die 'skipping, nonfree license'", diff --git a/Master/tlpkg/tlpsrc/frcursive.tlpsrc b/Master/tlpkg/tlpsrc/frcursive.tlpsrc index e69de29bb2d..28419f420cf 100644 --- a/Master/tlpkg/tlpsrc/frcursive.tlpsrc +++ b/Master/tlpkg/tlpsrc/frcursive.tlpsrc @@ -0,0 +1 @@ +execute addMap frcursive.map -- cgit v1.2.3