From 4c1378dcd7835008b7c4455b2d9ebfb7582805af Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Jul 2018 21:43:30 +0000 Subject: lettrine (26jul18) git-svn-id: svn://tug.org/texlive/trunk@48278 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/lettrine/README | 27 +- Master/texmf-dist/doc/latex/lettrine/W.eps | 818 --------------------- Master/texmf-dist/doc/latex/lettrine/W.pdf | Bin 14470 -> 0 bytes Master/texmf-dist/doc/latex/lettrine/demo-de.pdf | Bin 123435 -> 136050 bytes Master/texmf-dist/doc/latex/lettrine/demo-de.tex | 9 +- Master/texmf-dist/doc/latex/lettrine/demo.pdf | Bin 119379 -> 132341 bytes Master/texmf-dist/doc/latex/lettrine/demo.tex | 22 +- Master/texmf-dist/doc/latex/lettrine/lettrine.pdf | Bin 239462 -> 106431 bytes .../texmf-dist/source/latex/lettrine/contrib.dtx | 376 ++++++++++ .../texmf-dist/source/latex/lettrine/contrib.ins | 59 ++ .../texmf-dist/source/latex/lettrine/lettrine.dtx | 384 ++++++---- .../texmf-dist/source/latex/lettrine/lettrine.ins | 19 +- Master/texmf-dist/tex/latex/lettrine/lettrine.cfg | 18 +- Master/texmf-dist/tex/latex/lettrine/lettrine.sty | 75 +- Master/texmf-dist/tex/latex/lettrine/optfile.cfl | 46 +- Master/texmf-dist/tex/latex/lettrine/pacl.cfl | 35 +- Master/texmf-dist/tex/latex/lettrine/padl.cfl | 36 +- Master/texmf-dist/tex/latex/lettrine/pzc2.cfl | 11 +- Master/texmf-dist/tex/latex/lettrine/pzc3.cfl | 11 +- Master/tlpkg/libexec/ctan2tds | 3 +- 20 files changed, 821 insertions(+), 1128 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/lettrine/W.eps delete mode 100644 Master/texmf-dist/doc/latex/lettrine/W.pdf create mode 100644 Master/texmf-dist/source/latex/lettrine/contrib.dtx create mode 100644 Master/texmf-dist/source/latex/lettrine/contrib.ins (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/lettrine/README b/Master/texmf-dist/doc/latex/lettrine/README index ec8d9c2acbe..fe1ad41f1a7 100644 --- a/Master/texmf-dist/doc/latex/lettrine/README +++ b/Master/texmf-dist/doc/latex/lettrine/README @@ -1,15 +1,24 @@ Lettrine bundle This bundle contains a package that I maintain to typeset dropped -capitals in a LaTeXe document. +capitals in a LaTeX document. It is subject to the LaTeX Project Public License. See http://www.latex-project.org/lppl.txt for the details of that license. -Run (pdf)latex on lettrine.dtx to get the documentation (lettrine.dvi -or lettrine.pdf), then on lettrine.ins to strip the comments and create -lettrine.sty. +Installation: this bundle is included in most TeX distributions, but +if you need to install it by yourself +1. run lualatex on lettrine.dtx to get the documentation (lettrine.pdf), +2. run luatex on lettrine.ins to strip the comments and create + lettrine.sty and lettrine.cfg +3. run luatex on contrib.dtx to produce the *.cfl files. +Files lettrine.sty, lettrine.cfg and *.cfl go to to a directory searched +by TeX, typically $TEXMF/tex/latex/lettrine. +Files README, demo*, *.pdf go to a doc directory, typically +$TEXMF/doc/latex/lettrine. +Files *.dtx, *.ins go to a source directory, typically +$TEXMF/source/latex/lettrine If you wish, you can customize lettrine.cfg according to your needs. @@ -20,14 +29,6 @@ You can also play with the source files demo.tex or demo-de.tex. Have a look at lettrine.pdf in the doc directory, if you are interested in the complete documentation and code. -Installation: this bundle is included in most TeX distributions, but -if you need to install it by yourself, a TDS compliant zip archive is -provided (lettrine.tds.zip). Just download that file, and unpack it -in your TDS directory (~/texmf for Unix-like systems). That's all! -you have got everything in place including documentation and sources. -On MikTeX/Windows, please use the very efficient management of updates -provided by MIkTeX. - -- Daniel Flipo, -September, 16th, 2014. +July, 21th, 2018. diff --git a/Master/texmf-dist/doc/latex/lettrine/W.eps b/Master/texmf-dist/doc/latex/lettrine/W.eps deleted file mode 100644 index 7598a882cdc..00000000000 --- a/Master/texmf-dist/doc/latex/lettrine/W.eps +++ /dev/null @@ -1,818 +0,0 @@ -%!PS -%%BoundingBox: -18 -23 4457 4018 -%%HiResBoundingBox: -17.76689 -22.3026 4456.64955 4017.78212 -%%Creator: MetaPost 1.999 -%%CreationDate: 2015.07.21:1004 -%%Pages: 1 -%%BeginProlog -%%EndProlog -%%Page: 1 1 -% MF2PT1: glyph_dimensions 0 0 4524.60858 3866.66605 -% MF2PT1: font_size 10 -% MF2PT1: font_slant 0 -% MF2PT1: charwd 45.24606 -% MF2PT1: font_identifier YINIT -% MF2PT1: font_coding_scheme UNSPECIFIED -% MF2PT1: font_fixed_pitch 0 - 0 0 0 setrgbcolor -newpath 1121.41708 216.23692 moveto -1214.18167 370.255 1349.99135 494.51979 1514.86368 566.25336 curveto -1506.01494 589.30508 lineto -1506.01494 658.54144 1500.12729 728.21646 1476.56947 793.38567 curveto -1432.5355 915.19908 1334.41861 1006.74403 1220.50626 1068.64551 curveto -980.59921 1199.01413 615.32079 1397.53542 588.62677 1511.10861 curveto -533.98529 1743.58794 728.0501 1959.25781 977.34346 1959.25781 curveto -977.34346 1996.2955 lineto -711.10184 1996.2955 497.50616 1780.15993 477.56485 1511.10861 curveto -451.646 1161.40715 735.63994 893.37665 1045.15952 709.1325 curveto -1100.84268 675.98663 1160.17047 640.66171 1188.91643 584.39502 curveto -1246.46994 471.74103 1168.5889 342.38339 1099.8212 228.20758 curveto - closepath fill -newpath 977.34346 1996.2955 moveto -977.34346 1959.25781 lineto -1134.48422 1959.25781 1257.77618 1825.53497 1253.7626 1666.66689 curveto -1250.6282 1542.59889 1163.13911 1434.56696 1043.9847 1434.56696 curveto -964.91621 1434.56696 900.8412 1498.69785 900.8412 1577.77936 curveto -900.8412 1612.0294 939.54263 1631.68968 977.34346 1622.2231 curveto -993.16998 1618.25963 1007.55145 1610.04912 1023.11981 1605.20168 curveto -1085.78691 1585.68936 1152.81647 1620.07025 1165.62903 1682.5318 curveto -1144.46416 1695.24916 lineto -1138.22313 1664.82404 1095.92097 1659.19547 1064.8496 1683.6849 curveto -1034.50293 1707.60315 1016.26175 1749.03883 977.34346 1755.55782 curveto -903.06389 1767.99997 876.14943 1671.51254 876.14943 1577.77936 curveto -876.14943 1485.06094 951.27931 1409.87517 1043.9847 1409.87517 curveto -1176.00648 1409.87517 1272.92574 1529.21599 1278.45439 1666.66689 curveto -1285.58652 1843.98216 1151.58276 1996.2955 977.34346 1996.2955 curveto closepath fill -newpath 1506.01494 589.30508 moveto -1514.86368 566.25336 lineto -2297.26732 906.66592 2803.61664 1682.01823 2776.54442 2533.3323 curveto -2761.95206 2992.20464 2571.04912 3444.6271 2165.94054 3647.4216 curveto -1970.46913 3745.27321 1746.75595 3766.41951 1532.65303 3722.22272 curveto -1279.70839 3670.00789 1051.61229 3528.13643 829.90863 3390.21602 curveto -470.57611 3166.6776 56.77339 3224.31137 56.77339 3511.10887 curveto -32.0816 3511.10887 lineto -32.0816 3104.7636 536.78409 2902.46632 991.5094 3098.67645 curveto -1174.27663 3177.53896 1336.98698 3304.50504 1532.65303 3344.44218 curveto -1679.31116 3374.37639 1831.51015 3352.52895 1965.55717 3285.9154 curveto -2249.17018 3144.9764 2402.97989 2845.88759 2465.57242 2533.3323 curveto -2626.00916 1732.19307 2247.58063 911.94965 1506.01494 589.30508 curveto closepath fill -newpath 56.77339 3511.10887 moveto -56.77339 3689.9329 231.91893 3788.47003 333.76349 3696.0775 curveto -383.56612 3650.89694 393.67656 3555.55603 466.46138 3555.55603 curveto -554.62556 3555.55603 637.3698 3601.64874 675.54633 3680.62973 curveto -696.70654 3724.40672 700.93112 3773.66602 700.93112 3822.22543 curveto -676.23933 3822.22543 lineto -676.23933 3774.64664 676.23468 3705.70805 657.19666 3697.15172 curveto -651.17574 3694.44571 644.56345 3693.52406 637.969 3693.39137 curveto -632.82799 3693.2879 524.72772 3772.11635 465.87682 3815.03188 curveto -289.02446 3943.99693 32.0816 3778.71391 32.0816 3511.10887 curveto - closepath fill -newpath 2899.41609 218.61263 moveto -2956.5624 392.41447 3055.70566 552.13155 3205.83844 656.67868 curveto -3191.32501 676.65483 lineto -3168.52158 733.01765 3141.71187 799.27812 3116.54909 842.78212 curveto -3050.7343 956.5695 2946.86066 1044.21324 2821.53654 1083.76077 curveto -2670.29381 1131.48727 2504.44327 1102.75769 2354.18805 1153.80168 curveto -2178.16095 1213.60078 2051.10626 1370.9415 2047.98195 1555.55576 curveto -2044.50385 1761.07446 2198.11436 1937.03426 2398.9346 1937.03426 curveto -2398.9346 1974.07195 lineto -2172.2017 1974.07195 1999.3005 1784.28262 1950.24692 1555.55576 curveto -1889.59012 1272.72554 2011.76808 979.57214 2265.98477 846.19858 curveto -2411.38358 769.91579 2582.33545 762.0657 2731.5591 694.01726 curveto -2770.15552 676.41667 2807.18135 654.7152 2836.36674 623.87936 curveto -2934.2231 520.4892 2921.2538 364.06244 2875.80338 225.83185 curveto - closepath fill -newpath 3191.32501 676.65483 moveto -3205.83844 656.67868 lineto -3395.07454 788.45596 3599.8889 898.44177 3774.3181 1049.52368 curveto -3930.76833 1185.03313 4061.31122 1355.88004 4086.98552 1560.98174 curveto -4112.19775 1762.3921 4031.23865 1958.5898 3900.16109 2114.17409 curveto -3783.51889 2252.62411 3620.1213 2446.59587 3613.95222 2555.5559 curveto -3605.16594 2710.74052 3712.38391 2849.35426 3864.9532 2870.3704 curveto -4003.03145 2889.39046 4130.56401 2794.67134 4119.15858 2666.66702 curveto -4113.25725 2600.43541 4063.03032 2545.6782 3998.22885 2545.6782 curveto -3998.22885 2520.98642 lineto -4076.59831 2520.98642 4137.85313 2586.74986 4143.85037 2666.66702 curveto -4154.42395 2807.56706 4017.73534 2910.36179 3864.9532 2907.4081 curveto -3665.66376 2903.55531 3506.24606 2750.35349 3449.58275 2555.5559 curveto -3378.39731 2310.83403 3470.29022 2057.56876 3607.6215 1841.37926 curveto -3667.95833 1746.39589 3753.63023 1611.52322 3776.20332 1550.1298 curveto -3832.98155 1395.70654 3820.28125 1223.35657 3733.46446 1083.8045 curveto -3700.95781 1031.55225 3379.29846 807.55286 3191.32501 676.65483 curveto closepath fill -newpath 3998.22885 2520.98642 moveto -3998.22885 2545.6782 lineto -3944.6215 2545.6782 3889.645 2565.44702 3889.645 2612.34895 curveto -3864.95323 2612.34895 lineto -3864.95323 2552.44641 3931.16243 2520.98642 3998.22885 2520.98642 curveto closepath fill -newpath 3864.95323 2612.34895 moveto -3864.95323 2575.53241 3894.78409 2545.67645 3931.59444 2545.6782 curveto -3968.40215 2545.67998 3998.22888 2575.53499 3998.22888 2612.34895 curveto -3998.22888 2649.16292 3968.40215 2679.01791 3931.59444 2679.0197 curveto -3894.78409 2679.02147 3864.95323 2649.16548 3864.95323 2612.34895 curveto closepath fill -newpath 2398.9346 1974.07195 moveto -2398.9346 1937.03426 lineto -2586.98239 1937.03426 2760.40686 1820.9164 2764.20192 1644.4433 curveto -2767.2345 1503.42639 2652.81961 1390.73955 2509.99649 1367.903 curveto -2368.28358 1345.24394 2230.24101 1426.7214 2233.58415 1555.55576 curveto -2235.05652 1612.2972 2270.17825 1662.71066 2322.8948 1683.75171 curveto -2252.85057 1738.47635 lineto -2212.54073 1686.67763 2196.52074 1620.01448 2208.89238 1555.55576 curveto -2235.21832 1418.39238 2368.2286 1330.93071 2509.99649 1343.21123 curveto -2668.36713 1356.92993 2792.24657 1486.9924 2788.89369 1644.4433 curveto -2784.7628 1838.42824 2602.35095 1974.07195 2398.9346 1974.07195 curveto closepath fill -newpath 2369.64632 3232.33582 moveto -2383.80898 3212.10947 lineto -2646.0382 3414.11572 2946.24951 3645.29019 3198.58171 3466.66849 curveto -3244.91556 3433.86954 3280.33601 3388.59964 3308.81293 3339.53767 curveto -3362.53694 3246.97824 3392.76457 3140.00526 3466.24055 3061.66586 curveto -3641.22368 2875.1005 3942.9994 2907.75955 4125.4502 3104.18234 curveto -4184.61589 3167.8789 4227.58075 3246.58592 4232.6986 3333.33377 curveto -4241.3715 3480.34062 4139.34572 3612.34908 3998.22885 3612.34908 curveto -3998.22885 3587.6573 lineto -4127.06937 3587.6573 4220.46887 3466.693 4208.0068 3333.33377 curveto -4201.11731 3259.60753 4160.60039 3191.71979 4093.13136 3162.48788 curveto -3997.33217 3120.98152 3890.72548 3168.91296 3819.41817 3249.45149 curveto -3746.75636 3331.51984 3710.6968 3439.61873 3639.22678 3522.68651 curveto -3531.304 3648.1224 3364.31894 3700.1517 3198.58171 3688.89075 curveto -2939.51942 3671.2888 2625.78737 3429.65213 2369.64632 3232.33582 curveto closepath fill -newpath 3998.22885 3587.6573 moveto -3998.22885 3612.34908 lineto -3935.40974 3612.34908 3873.84003 3581.78053 3873.84003 3525.42851 curveto -3898.53181 3525.42851 lineto -3898.53181 3568.72154 3948.87555 3587.6573 3998.22885 3587.6573 curveto closepath fill -newpath 3873.84003 3525.42851 moveto -3873.84003 3491.06421 3901.6833 3463.19621 3936.04121 3463.19977 curveto -3970.39384 3463.20332 3998.22885 3491.06932 3998.22885 3525.42851 curveto -3998.22885 3559.7877 3970.39384 3587.65372 3936.04121 3587.65727 curveto -3901.6833 3587.6608 3873.84003 3559.79283 3873.84003 3525.42851 curveto closepath fill -newpath 1296.89162 1124.4539 moveto -1546.07518 1345.08058 1821.41808 1588.94733 1821.41808 1911.11273 curveto -1821.41808 2142.94167 1787.68459 2382.55344 1634.29745 2555.9662 curveto -1517.88493 2687.57713 1358.64697 2867.63788 1387.6404 2971.23444 curveto -1366.70047 2984.31917 lineto -1288.77254 2705.87437 986.25307 2593.75185 707.396 2500.75949 curveto -714.20192 2477.0243 lineto -842.18112 2519.7024 984.31487 2567.08368 1105.74919 2537.84546 curveto -1221.5465 2509.96448 1310.77966 2424.76268 1386.58116 2332.92336 curveto -1488.55614 2209.37282 1572.77916 2069.23041 1599.29424 1911.11273 curveto -1648.09206 1620.11636 1502.52626 1339.47095 1279.7393 1142.2158 curveto - closepath fill -newpath 698.04263 3547.62018 moveto -679.12779 3563.49187 lineto -597.60982 3489.16449 488.02084 3456.7908 377.6132 3456.7908 curveto -186.12973 3456.7908 18.74197 3592.09145 12.3459 3777.77827 curveto -8.59315 3886.72505 76.1463 3987.65462 177.69635 3987.65462 curveto -177.69635 4012.3464 lineto -62.70825 4012.3464 -15.74002 3900.23772 -12.34587 3777.77827 curveto --6.82114 3578.44928 172.15395 3432.09903 377.6132 3432.09903 curveto -495.17595 3432.09903 611.22823 3468.46358 698.04263 3547.62018 curveto closepath fill -newpath 1010.02939 181.59023 moveto -1033.5125 173.95995 lineto -1068.93066 296.20718 1115.36713 456.53644 1077.47017 538.35359 curveto -1038.77663 621.89055 866.18178 692.32378 738.02745 744.60924 curveto -414.7137 876.51746 219.76518 1204.97322 234.46974 1555.55576 curveto -249.62971 1916.99608 495.30074 2235.52992 844.06781 2254.32376 curveto -1158.35869 2271.25983 1424.16249 2027.6855 1453.67268 1711.11404 curveto -1466.5129 1573.37036 1428.00044 1432.54465 1324.1668 1342.21446 curveto -1264.73079 1290.50803 1189.26965 1261.34402 1110.61914 1256.79189 curveto -901.9104 1244.71219 718.71217 1397.77902 723.14485 1600.00291 curveto -726.3196 1744.83763 838.27904 1865.31447 977.34346 1854.31964 curveto -1068.02972 1847.14973 1142.70068 1777.78111 1142.70068 1688.89047 curveto -1167.39247 1688.89047 lineto -1167.39247 1791.3324 1081.6952 1871.67203 977.34346 1879.01141 curveto -824.62349 1889.75272 701.75392 1758.3214 698.45306 1600.00291 curveto -693.95142 1384.09201 888.28531 1219.89859 1110.61914 1232.1001 curveto -1195.63046 1236.76544 1277.0867 1268.57349 1341.3191 1324.45256 curveto -1450.23251 1419.2019 1491.33911 1566.61984 1478.36447 1711.11404 curveto -1448.69199 2041.56674 1171.92665 2296.56113 844.06781 2279.01555 curveto -482.51848 2259.66699 227.53088 1930.10318 209.77797 1555.55576 curveto -192.59639 1193.06267 391.73273 850.82808 727.98434 722.05222 curveto -852.08751 674.52385 1016.9581 611.36583 1054.91315 528.31049 curveto -1088.91353 453.9089 1043.7557 297.998 1010.02939 181.59023 curveto closepath fill -newpath 1341.3191 1324.45256 moveto -1324.1668 1342.21446 lineto -1213.88359 1246.27345 1006.34433 1140.76625 837.89487 1055.13916 curveto -519.51729 893.2998 209.77794 658.40997 209.77794 311.10979 curveto -209.77794 110.88924 395.34367 -36.73418 599.73705 -12.3459 curveto -768.56616 7.79883 901.88 143.58105 900.8412 311.10979 curveto -899.9862 448.99532 799.84325 567.90154 666.37149 567.90154 curveto -539.4487 567.90154 428.98724 477.07108 431.90175 355.55698 curveto -434.12277 262.95627 507.84656 187.65276 599.73705 187.65276 curveto -599.73705 212.34453 lineto -521.50291 212.34453 458.88165 276.60466 456.59352 355.55698 curveto -453.46675 463.44644 552.94984 543.20975 666.37149 543.20975 curveto -786.26736 543.20975 875.39473 435.38098 876.14943 311.10979 curveto -877.08461 157.12161 754.82433 32.30199 599.73705 12.34587 curveto -408.9707 -12.20126 234.46971 124.44745 234.46971 311.10979 curveto -234.46971 649.78749 539.4655 876.10606 850.24077 1033.7554 curveto -1020.54622 1120.14755 1226.68729 1224.72847 1341.3191 1324.45256 curveto closepath fill -newpath 234.46971 311.10979 moveto -209.77794 311.10979 lineto -209.77794 171.90456 209.18231 12.3459 88.84816 12.3459 curveto -88.84816 -12.34587 lineto -220.06976 -12.34587 234.46971 158.38194 234.46971 311.10979 curveto closepath fill -newpath 666.37149 543.20975 moveto -666.37149 567.90154 lineto -378.36542 567.90154 88.73842 685.24576 101.19406 933.33615 curveto -107.51967 1059.3289 211.83017 1158.90038 333.18573 1143.21251 curveto -408.92128 1133.42204 470.20566 1075.313 476.32922 1000.00014 curveto -482.46893 924.4886 428.63725 856.78777 355.39949 856.78777 curveto -355.39949 832.09598 lineto -442.28221 832.09598 507.21404 910.89261 501.02101 1000.00014 curveto -494.8493 1088.80084 422.56061 1157.68951 333.18573 1167.90428 curveto -197.87788 1183.3688 82.29662 1072.86365 76.50229 933.33615 curveto -65.65596 672.15582 365.80823 543.20975 666.37149 543.20975 curveto closepath fill -newpath 599.73705 212.34453 moveto -599.73705 187.65276 lineto -666.80347 187.65276 733.0127 219.11276 733.0127 279.0153 curveto -708.32092 279.0153 lineto -708.32092 232.11339 653.34439 212.34453 599.73705 212.34453 curveto closepath fill -newpath 733.0127 279.0153 moveto -733.0127 315.83185 703.18184 345.68784 666.37149 345.68605 curveto -629.56378 345.68428 599.73705 315.82927 599.73705 279.0153 curveto -599.73705 242.20135 629.56378 212.34634 666.37149 212.34456 curveto -703.18184 212.34282 733.0127 242.19878 733.0127 279.0153 curveto closepath fill -newpath 88.84816 -12.34587 moveto -88.84816 12.3459 lineto -48.00197 12.3459 6.92488 29.5846 6.92488 65.68384 curveto --17.76689 65.68384 lineto --17.76689 16.39389 34.51698 -12.34587 88.84816 -12.34587 curveto closepath fill -newpath -17.76689 65.68384 moveto --17.76689 36.22906 6.09831 12.34235 35.54742 12.3459 curveto -64.99126 12.34946 88.84819 36.23422 88.84819 65.68384 curveto -88.84819 95.13347 64.99126 119.01822 35.54742 119.02177 curveto -6.09831 119.02533 -17.76689 95.13861 -17.76689 65.68384 curveto closepath fill -newpath 355.39949 832.09598 moveto -355.39949 856.78777 lineto -306.0462 856.78777 255.70248 875.72348 255.70248 919.01651 curveto -231.0107 919.01651 lineto -231.0107 862.66452 292.58041 832.09598 355.39949 832.09598 curveto closepath fill -newpath 231.0107 919.01651 moveto -231.0107 884.6522 258.85397 856.78424 293.21188 856.78777 curveto -327.56451 856.7913 355.39952 884.65732 355.39952 919.01651 curveto -355.39952 953.3757 327.56451 981.24171 293.21188 981.24527 curveto -258.85397 981.24883 231.0107 953.38081 231.0107 919.01651 curveto closepath fill -newpath 1209.4708 224.04712 moveto -1233.8913 220.39738 lineto -1266.86832 327.13487 1372.84854 383.99622 1473.09991 434.33133 curveto -1786.23073 591.55083 2095.65392 764.00208 2341.61781 1014.12418 curveto -2769.39658 1449.13486 2960.16785 2061.70558 2877.74188 2666.66702 curveto -2805.68112 3195.55382 2516.49464 3686.50519 2024.315 3878.64494 curveto -1679.8893 4013.1037 1294.66052 3968.26146 970.98477 3788.36072 curveto -611.86906 3588.76222 386.51251 3208.93687 409.68802 2800.00174 curveto -433.96054 2371.70895 738.95218 2003.4511 1155.04659 1987.65436 curveto -1541.79585 1972.97171 1864.1987 2281.93816 1855.97095 2666.66702 curveto -1849.96417 2947.54253 1648.17781 3190.1214 1377.17043 3190.1214 curveto -919.1932 3190.12137 902.22488 2412.34355 444.24765 2412.34352 curveto -296.02065 2412.34352 169.23749 2522.04692 167.83531 2666.66702 curveto -166.66899 2786.96008 257.8807 2888.13228 377.6132 2898.76695 curveto -474.37123 2907.36107 564.90648 2846.36392 565.17738 2755.55455 curveto -565.3767 2688.73817 511.12158 2634.56577 444.24765 2634.56577 curveto -444.24765 2609.874 lineto -524.86697 2609.874 590.35283 2675.09256 589.86917 2755.55455 curveto -589.24231 2859.83817 487.71213 2931.71797 377.6132 2923.45874 curveto -244.06956 2913.44078 141.76494 2800.80965 143.14352 2666.66702 curveto -144.76967 2508.43472 282.48347 2387.65173 444.24765 2387.65173 curveto -902.22488 2387.65176 919.1932 3165.42958 1377.17043 3165.42961 curveto -1634.65054 3165.42961 1825.49835 2933.93048 1831.27916 2666.66702 curveto -1839.3037 2295.6701 1528.07733 1997.89474 1155.04659 2012.34613 curveto -752.3664 2027.94617 458.1553 2385.24422 434.37979 2800.00174 curveto -411.43929 3200.19296 632.21991 3571.8401 983.70215 3767.19583 curveto -1301.70274 3943.94234 1680.31361 3987.6672 2018.34135 3854.6867 curveto -2499.60773 3665.356 2781.08693 3184.15945 2853.05011 2666.66702 curveto -2936.413 2067.19858 2749.77031 1458.59439 2322.98256 1030.32326 curveto -2076.96385 783.4495 1766.93248 616.66891 1458.93727 454.55768 curveto -1354.16383 399.41086 1244.30626 336.79999 1209.4708 224.04712 curveto closepath fill -newpath 2065.74884 3777.77827 moveto -2102.27953 3924.29367 lineto -1976.90752 3955.55338 lineto -1940.37683 3809.03796 lineto - closepath fill -newpath 977.34346 3844.44902 moveto -940.53317 3844.44902 910.70226 3814.59413 910.70226 3777.77827 curveto -910.70226 3740.96242 940.53317 3711.10753 977.34346 3711.10753 curveto -1014.15375 3711.10753 1043.98466 3740.96242 1043.98466 3777.77827 curveto -1043.98466 3814.59413 1014.15375 3844.44902 977.34346 3844.44902 curveto closepath fill -newpath 983.70215 3767.19583 moveto -970.98477 3788.36072 lineto -768.84732 3676.0116 612.44661 3464.3125 377.6132 3456.7908 curveto -185.4314 3450.63522 17.7467 3590.00658 12.3459 3777.77827 curveto -9.21341 3886.68666 76.31851 3987.65462 177.69635 3987.65462 curveto -177.69635 4012.3464 lineto -62.95259 4012.3464 -14.88889 3900.18404 -12.34587 3777.77827 curveto --8.14893 3575.76405 171.28644 3424.29129 377.6132 3432.09903 curveto -381.03105 3432.22835 777.88797 3652.80319 983.70215 3767.19583 curveto closepath fill -newpath 631.0463 2275.01033 moveto -612.84169 2258.329 lineto -832.54346 2059.66441 1122.96504 2118.90941 1122.96504 2311.11005 curveto -1098.27327 2311.11005 lineto -1098.27327 2137.7161 833.8076 2091.66406 631.0463 2275.01033 curveto closepath fill -newpath 1377.17043 3165.42961 moveto -1377.17043 3190.1214 lineto -1160.67023 3190.1214 964.99756 3048.66202 964.99756 2844.44212 curveto -964.99756 2352.80827 1611.64015 2380.64311 1611.64015 2755.55455 curveto -1586.94836 2755.55455 lineto -1586.94836 2413.15784 989.68933 2385.76338 989.68933 2844.44212 curveto -989.68933 3035.1198 1174.25066 3165.42961 1377.17043 3165.42961 curveto closepath fill -newpath 444.24765 2387.65173 moveto -444.24765 2412.34352 lineto -273.3474 2412.34352 76.50226 2412.30795 76.50226 2266.66966 curveto -101.19403 2266.66966 lineto -101.19403 2387.62221 286.96947 2387.65173 444.24765 2387.65173 curveto closepath fill -newpath 177.69635 4012.3464 moveto -177.69635 3987.65462 lineto -214.29321 3987.65462 250.73958 3971.28683 250.73958 3938.76544 curveto -275.43135 3938.76544 lineto -275.43135 3984.55107 227.79181 4012.3464 177.69635 4012.3464 curveto closepath fill -newpath 275.43135 3938.76544 moveto -275.43135 3965.76227 253.55655 3987.65462 226.56384 3987.65462 curveto -199.57112 3987.65462 177.69632 3965.76227 177.69632 3938.76544 curveto -177.69632 3911.76863 199.57112 3889.87627 226.56384 3889.87627 curveto -253.55655 3889.87627 275.43135 3911.76863 275.43135 3938.76544 curveto closepath fill -newpath 1098.27327 2311.11005 moveto -1122.96504 2311.11005 lineto -1122.96504 2369.70052 1093.33728 2426.66316 1040.51886 2426.66316 curveto -1040.51886 2401.97139 lineto -1080.21779 2401.97139 1098.27327 2356.22665 1098.27327 2311.11005 curveto closepath fill -newpath 1040.51886 2426.66316 moveto -1008.61667 2426.66316 982.76271 2400.78963 982.76448 2368.88321 curveto -982.76627 2336.97946 1008.61925 2311.11005 1040.51886 2311.11005 curveto -1072.41847 2311.11005 1098.27145 2336.97946 1098.27324 2368.88321 curveto -1098.27501 2400.78963 1072.42105 2426.66316 1040.51886 2426.66316 curveto closepath fill -newpath 1586.94836 2755.55455 moveto -1611.64015 2755.55455 lineto -1611.64015 2814.14502 1582.01239 2871.10767 1529.19395 2871.10767 curveto -1529.19395 2846.4159 lineto -1568.89288 2846.4159 1586.94836 2800.67116 1586.94836 2755.55455 curveto closepath fill -newpath 1529.19395 2871.10767 moveto -1497.29178 2871.10767 1471.4378 2845.23413 1471.43959 2813.32771 curveto -1471.44136 2781.42397 1497.29434 2755.55455 1529.19395 2755.55455 curveto -1561.09357 2755.55455 1586.94656 2781.42397 1586.94833 2813.32771 curveto -1586.95012 2845.23413 1561.09615 2871.10767 1529.19395 2871.10767 curveto closepath fill -newpath 101.19403 2266.66966 moveto -76.50226 2266.66966 lineto -76.50226 2214.44177 104.74509 2164.44933 152.285 2164.44933 curveto -152.285 2189.14111 lineto -117.96962 2189.14111 101.19403 2227.93272 101.19403 2266.66966 curveto closepath fill -newpath 152.285 2164.44933 moveto -180.50653 2164.44933 203.3777 2187.3377 203.37593 2215.5629 curveto -203.37415 2243.78545 180.50397 2266.66966 152.285 2266.66966 curveto -124.06604 2266.66966 101.19585 2243.78545 101.19406 2215.5629 curveto -101.19229 2187.3377 124.06346 2164.44933 152.285 2164.44933 curveto closepath fill -newpath 444.24765 2609.874 moveto -444.24765 2634.56577 lineto -394.89436 2634.56577 344.55064 2653.5015 344.55064 2696.79453 curveto -319.85887 2696.79453 lineto -319.85887 2640.44254 381.42859 2609.874 444.24765 2609.874 curveto closepath fill -newpath 319.85887 2696.79453 moveto -319.85887 2662.4302 347.70213 2634.56224 382.06004 2634.56577 curveto -416.41267 2634.56932 444.24768 2662.43533 444.24768 2696.79453 curveto -444.24768 2731.15372 416.41267 2759.01971 382.06004 2759.02327 curveto -347.70213 2759.02682 319.85887 2731.15883 319.85887 2696.79453 curveto closepath fill -newpath 1332.74295 701.23622 moveto -1332.74295 676.54443 lineto -1591.40868 676.54443 1833.76399 828.03503 1833.76399 1066.66411 curveto -1833.76402 1320.3417 1475.88647 1312.86472 1475.88644 1088.88766 curveto -1475.88644 1020.71318 1531.12903 965.43063 1599.29424 965.43063 curveto -1599.29424 990.12242 lineto -1544.76593 990.12242 1500.57823 1034.35007 1500.57823 1088.88766 curveto -1500.57823 1280.00476 1809.0722 1287.43524 1809.0722 1066.66411 curveto -1809.0722 841.46861 1577.86903 701.23622 1332.74295 701.23622 curveto closepath fill -newpath 1809.0722 1066.66411 moveto -1833.76399 1066.66411 lineto -1775.42441 1176.09865 1744.90903 1298.20724 1744.90903 1422.22104 curveto -1720.21724 1422.22104 lineto -1720.21724 1298.20724 1750.73264 1176.09865 1809.0722 1066.66411 curveto closepath fill -newpath 1599.29424 990.12242 moveto -1599.29424 965.43063 lineto -1657.86734 965.43063 1714.79619 995.09001 1714.79619 1047.9024 curveto -1690.10442 1047.9024 lineto -1690.10442 1008.21205 1644.39311 990.12242 1599.29424 990.12242 curveto closepath fill -newpath 1714.79619 1047.9024 moveto -1714.79619 1079.8094 1688.94339 1105.68414 1657.04181 1105.68236 curveto -1625.14287 1105.68059 1599.29424 1079.80682 1599.29424 1047.9024 curveto -1599.29424 1015.99796 1625.14287 990.12422 1657.04181 990.12245 curveto -1688.94339 990.12067 1714.79619 1015.9954 1714.79619 1047.9024 curveto closepath fill -newpath 1720.21724 1422.22104 moveto -1744.90903 1422.22104 lineto -1744.90903 1458.8328 1761.24886 1495.30756 1793.77654 1495.30756 curveto -1793.77654 1519.99933 lineto -1747.98677 1519.99933 1720.21724 1472.33095 1720.21724 1422.22104 curveto closepath fill -newpath 1793.77654 1519.99933 moveto -1766.78383 1519.99933 1744.90903 1498.10698 1744.90903 1471.11015 curveto -1744.90903 1444.11334 1766.78383 1422.22101 1793.77654 1422.22101 curveto -1820.76924 1422.22101 1842.64404 1444.11337 1842.64404 1471.11015 curveto -1842.64404 1498.10698 1820.76924 1519.99933 1793.77654 1519.99933 curveto closepath fill -newpath 2872.65268 2432.20926 moveto -2858.13925 2412.2331 lineto -2927.06133 2363.64197 2994.13977 2305.02748 3008.53947 2222.22252 curveto -3034.59048 2072.41734 2896.70305 1947.76149 2732.12033 1945.68219 curveto -2527.92743 1943.10245 2360.91275 2105.4892 2344.64607 2311.11005 curveto -2324.13062 2570.43788 2535.74052 2788.31854 2798.76155 2787.65582 curveto -3093.66946 2786.91278 3315.99658 2526.16255 3319.51147 2222.22252 curveto -3323.53342 1874.44203 3055.66605 1583.06409 2709.91338 1567.90167 curveto -2368.35408 1552.92314 2078.09476 1817.24286 2078.09476 2155.55855 curveto -2078.09479 2627.66368 2422.26324 3026.71873 2887.60974 3120.98921 curveto -3034.02734 3150.65067 3186.23581 3101.09344 3186.23581 2977.77681 curveto -3210.92758 2977.77681 lineto -3210.92758 3113.59383 3046.9665 3172.46992 2887.60974 3145.68098 curveto -2405.16945 3064.57962 2053.40297 2645.25026 2053.40297 2155.55855 curveto -2053.40297 1803.61835 2354.72125 1528.25685 2709.91338 1543.20988 curveto -3069.34378 1558.34137 3348.3298 1860.79436 3344.20326 2222.22252 curveto -3340.57767 2539.7756 3107.24513 2811.58391 2798.76155 2812.34761 curveto -2522.22046 2813.0322 2299.66972 2584.13556 2319.9543 2311.11005 curveto -2336.25513 2091.70456 2514.30675 1918.0978 2732.12033 1920.99042 curveto -2909.99669 1923.35266 3059.01387 2058.57643 3033.23126 2222.22252 curveto -3018.9493 2312.87239 2947.94356 2379.12804 2872.65268 2432.20926 curveto closepath fill -newpath 1954.68695 2044.44742 moveto -2176.81076 2044.44742 lineto -2176.81076 2266.66966 lineto -1954.68695 2266.66966 lineto - closepath fill -newpath 3210.92758 2977.77681 moveto -3186.23581 2977.77681 lineto -3186.23581 2928.40439 3167.33737 2878.02467 3124.03462 2878.02467 curveto -3124.03462 2853.3329 lineto -3180.3936 2853.3329 3210.92758 2914.93892 3210.92758 2977.77681 curveto closepath fill -newpath 3124.03462 2853.3329 moveto -3158.39372 2853.3329 3186.23936 2881.19853 3186.23581 2915.56166 curveto -3186.23225 2949.91946 3158.38858 2977.77684 3124.03462 2977.77684 curveto -3089.68068 2977.77684 3061.837 2949.91946 3061.83345 2915.56166 curveto -3061.8299 2881.19853 3089.67552 2853.3329 3124.03462 2853.3329 curveto closepath fill -newpath 3331.85739 2284.45126 moveto -3297.49963 2284.45126 3269.6562 2256.58548 3269.6562 2222.22252 curveto -3269.6562 2187.85956 3297.49963 2159.99376 3331.85739 2159.99376 curveto -3366.21513 2159.99376 3394.05856 2187.85956 3394.05856 2222.22252 curveto -3394.05856 2256.58548 3366.21513 2284.45126 3331.85739 2284.45126 curveto closepath fill -newpath 3033.23126 2222.22252 moveto -3008.53947 2222.22252 lineto -3008.53947 2181.35999 2991.33186 2140.252 2955.22516 2140.252 curveto -2955.22516 2115.56021 lineto -3004.5202 2115.56021 3033.23126 2167.87537 3033.23126 2222.22252 curveto closepath fill -newpath 2955.22516 2115.56021 moveto -2984.67546 2115.56021 3008.54303 2139.4446 3008.53947 2168.89815 curveto -3008.53592 2198.34642 2984.67035 2222.22255 2955.22516 2222.22255 curveto -2925.77998 2222.22255 2901.91437 2198.34645 2901.91084 2168.89815 curveto -2901.90729 2139.4446 2925.77486 2115.56021 2955.22516 2115.56021 curveto closepath fill -newpath 2053.40297 2155.55855 moveto -2078.09476 2155.55855 lineto -2078.09476 2546.95514 2078.16939 2976.66232 2383.80898 3212.10947 curveto -2369.64632 3232.33582 lineto -2056.80304 2991.3394 2053.40297 2554.79745 2053.40297 2155.55855 curveto closepath fill -newpath 2053.40297 2155.55855 moveto -2078.09476 2155.55855 lineto -2078.09476 2672.07507 2156.15431 3205.09035 2497.24695 3592.06734 curveto -2735.63716 3862.52625 3103.38353 3961.67188 3465.13303 3943.20747 curveto -3712.37993 3930.5875 3958.42758 3863.41508 4145.78241 3701.65689 curveto -4341.93114 3532.30621 4447.42166 3280.77434 4430.13058 3022.22398 curveto -4408.14754 2693.515 4182.71893 2405.99274 3864.9532 2390.1267 curveto -3595.6652 2376.68114 3362.59169 2577.00696 3344.2033 2844.44212 curveto -3326.44063 3102.77689 3519.06833 3328.17265 3776.10504 3343.21146 curveto -3979.59975 3355.1176 4163.5793 3216.53145 4163.5793 3022.22398 curveto -4188.27107 3022.22398 lineto -4188.27107 3230.10677 3993.16327 3379.71922 3776.10504 3367.90324 curveto -3505.39731 3353.16675 3301.69551 3116.52742 3319.5115 2844.44212 curveto -3337.92047 2563.30128 3582.04623 2351.79137 3864.9532 2365.43492 curveto -4196.11035 2381.40538 4432.3075 2679.94403 4454.82237 3022.22398 curveto -4472.31143 3288.09988 4363.47636 3546.57838 4161.65408 3720.57172 curveto -3969.79866 3885.9725 3718.17226 3955.2125 3465.13303 3967.89925 curveto -3096.13605 3986.39984 2721.51997 3883.84091 2478.33212 3607.93901 curveto -2133.40643 3216.61333 2053.40297 2677.87804 2053.40297 2155.55855 curveto closepath fill -newpath 2478.33212 3607.93901 moveto -2497.24695 3592.06734 lineto -2566.2913 3670.39964 2625.46075 3763.90405 2611.19737 3866.6658 curveto -2600.22876 3945.68997 2542.53079 4012.40918 2465.57582 4012.34644 curveto -2397.41266 4012.29085 2342.16798 3957.04291 2342.16798 3888.8894 curveto -2366.85977 3888.8894 lineto -2366.85977 3943.32092 2411.05872 3987.37244 2465.57582 3987.65465 curveto -2529.2334 3987.98418 2576.34897 3932.14806 2586.50558 3866.6658 curveto -2601.53023 3769.79822 2543.64511 3682.03804 2478.33212 3607.93901 curveto closepath fill -newpath 2366.85977 3888.8894 moveto -2342.16798 3888.8894 lineto -2342.16798 3834.54225 2370.87907 3782.22707 2420.17412 3782.22707 curveto -2420.17412 3806.91885 lineto -2384.06741 3806.91885 2366.85977 3848.02684 2366.85977 3888.8894 curveto closepath fill -newpath 2420.17412 3782.22707 moveto -2449.62442 3782.22707 2473.49199 3806.11147 2473.48843 3835.565 curveto -2473.48491 3865.0133 2449.6193 3888.8894 2420.17412 3888.8894 curveto -2390.72893 3888.8894 2366.86336 3865.01328 2366.8598 3835.565 curveto -2366.85625 3806.11147 2390.72382 3782.22707 2420.17412 3782.22707 curveto closepath fill -newpath 3319.5115 2844.44212 moveto -3344.2033 2844.44212 lineto -3344.2033 2885.30464 3361.4109 2926.41264 3397.51761 2926.41264 curveto -3397.51761 2951.10442 lineto -3348.22256 2951.10442 3319.5115 2898.78926 3319.5115 2844.44212 curveto closepath fill -newpath 3397.51761 2951.10442 moveto -3368.0673 2951.10442 3344.19974 2927.22003 3344.2033 2897.76648 curveto -3344.20685 2868.3182 3368.07242 2844.4421 3397.51761 2844.4421 curveto -3426.96278 2844.4421 3450.8284 2868.31818 3450.83192 2897.76648 curveto -3450.83548 2927.22003 3426.96791 2951.10442 3397.51761 2951.10442 curveto closepath fill -newpath 4188.27107 3022.22398 moveto -4163.5793 3022.22398 lineto -4163.5793 2977.1074 4145.52385 2931.36269 4105.82492 2931.36269 curveto -4105.82492 2906.6709 lineto -4158.64333 2906.6709 4188.27107 2963.63351 4188.27107 3022.22398 curveto closepath fill -newpath 4105.82492 2906.6709 moveto -4137.72711 2906.6709 4163.58107 2932.54445 4163.5793 2964.45085 curveto -4163.57751 2996.35461 4137.72453 3022.22401 4105.82492 3022.22401 curveto -4073.92531 3022.22401 4048.07233 2996.35461 4048.07054 2964.45085 curveto -4048.06877 2932.54445 4073.92273 2906.6709 4105.82492 2906.6709 curveto closepath fill -newpath 3465.13303 4017.78212 moveto -3430.77528 4017.78212 3402.93185 3989.91634 3402.93185 3955.55338 curveto -3402.93185 3921.19041 3430.77528 3893.32462 3465.13303 3893.32462 curveto -3499.49078 3893.32462 3527.33421 3921.19041 3527.33421 3955.55338 curveto -3527.33421 3989.91634 3499.49078 4017.78212 3465.13303 4017.78212 curveto closepath fill -newpath 2887.60974 3440.00967 moveto -2853.25198 3440.00967 2825.40855 3412.14389 2825.40855 3377.78093 curveto -2825.40855 3343.41797 2853.25198 3315.55217 2887.60974 3315.55217 curveto -2921.96748 3315.55217 2949.81091 3343.41797 2949.81091 3377.78093 curveto -2949.81091 3412.14389 2921.96748 3440.00967 2887.60974 3440.00967 curveto closepath fill -newpath 4144.98837 3719.84418 moveto -4174.26006 3723.998 4196.51683 3748.25787 4198.13893 3777.77827 curveto -4199.35513 3799.91182 4188.0905 3820.24084 4183.50702 3841.81335 curveto -4165.95976 3924.4007 4238.07654 3994.58272 4309.20085 3967.89925 curveto -4309.20085 3943.20747 lineto -4280.8813 3953.83203 4252.2159 3925.76593 4257.1984 3891.5183 curveto -4265.92609 3831.52757 4348.43658 3827.16454 4375.83528 3777.77827 curveto -4463.60938 3619.56519 4193.54843 3524.1474 4162.44812 3702.38443 curveto - closepath fill -newpath 1954.68695 3128.89313 moveto -1920.32921 3128.89313 1892.48578 3101.02733 1892.48578 3066.66437 curveto -1892.48578 3032.3014 1920.32921 3004.43561 1954.68695 3004.43561 curveto -1989.04471 3004.43561 2016.88814 3032.3014 2016.88814 3066.66437 curveto -2016.88814 3101.02733 1989.04471 3128.89313 1954.68695 3128.89313 curveto closepath fill -newpath 1303.89586 254.85835 moveto -1317.16258 234.03333 lineto -1445.07162 313.57892 1581.71161 387.65144 1732.56311 387.65144 curveto -1973.32858 387.65144 2233.67917 437.50365 2233.58415 644.44316 curveto -2233.55455 708.92989 2192.78444 767.90019 2132.39009 767.90019 curveto -2132.39009 743.20842 lineto -2179.37454 743.20842 2209.1736 695.40587 2208.89238 644.44316 curveto -2207.8161 449.39297 1959.29161 412.34323 1732.56311 412.34323 curveto -1577.03336 412.34323 1435.77994 336.87598 1303.89586 254.85835 curveto closepath fill -newpath 1732.56311 412.34323 moveto -1732.56311 387.65144 lineto -1877.89804 387.65144 2021.27547 351.66411 2147.17378 279.02643 curveto -2271.61153 207.23143 2443.93335 107.82513 2532.21025 120.98882 curveto -2657.31717 139.64453 2747.00389 250.5873 2744.46625 377.78053 curveto -2741.82353 510.23962 2638.51396 619.89441 2509.99649 612.3487 curveto -2416.56181 606.86281 2340.82831 536.43399 2319.95427 444.4445 curveto -2300.41516 358.33801 2350.52567 276.10748 2421.14833 288.88959 curveto -2473.45276 298.35626 2494.48193 365.83694 2546.8422 375.14487 curveto -2572.76396 379.75293 2598.74747 367.98085 2613.28891 345.96242 curveto -2628.82788 365.15152 lineto -2589.83946 424.18712 2522.72266 462.11673 2473.15082 424.8498 curveto -2454.18918 410.5949 2443.92918 385.54207 2421.14833 377.77713 curveto -2383.84451 365.062 2347.91797 399.8104 2344.64604 444.4445 curveto -2338.47928 528.56856 2419.34503 590.70622 2509.99649 587.6569 curveto -2623.71733 583.8316 2714.39986 491.90698 2719.77446 377.78053 curveto -2725.12755 264.11067 2644.49059 164.48654 2532.21025 145.68059 curveto -2444.0768 130.91904 2281.28069 227.78236 2162.03383 298.74602 curveto -2032.44806 375.86234 1883.33316 412.34323 1732.56311 412.34323 curveto closepath fill -newpath 1732.56311 412.34323 moveto -1732.56311 387.65144 lineto -1863.93668 387.65144 1992.57857 322.43938 2008.98225 199.99866 curveto -2021.30148 108.04524 1957.41376 23.08025 1865.83876 12.3459 curveto -1692.42223 -7.9818 1597.23143 246.20251 1421.59111 212.34456 curveto -1379.33365 204.19864 1342.61076 174.55157 1342.61076 133.33472 curveto -1367.30255 133.33472 lineto -1367.30255 161.34831 1393.1193 180.3901 1421.59111 187.65279 curveto -1598.44429 232.76505 1694.70532 -20.94951 1865.83876 -12.34587 curveto -1972.33252 -6.99196 2048.29318 92.33723 2033.67404 199.99866 curveto -2015.28145 335.44919 1876.66737 412.34323 1732.56311 412.34323 curveto closepath fill -newpath 1865.83876 -12.34587 moveto -1865.83876 12.3459 lineto -1758.23355 -35.83873 1643.90964 64.9935 1678.27458 177.7751 curveto -1691.78908 222.12794 1730.99901 254.3235 1776.9906 254.3235 curveto -1776.9906 279.01527 lineto -1717.66737 279.01527 1667.70137 235.93115 1653.58281 177.7751 curveto -1623.14961 52.41707 1744.57533 -56.34586 1865.83876 -12.34587 curveto closepath fill -newpath 2132.39009 743.20842 moveto -2132.39009 767.90019 lineto -2073.81699 767.90019 2016.88814 738.24081 2016.88814 685.42842 curveto -2041.57991 685.42842 lineto -2041.57991 725.11877 2087.29121 743.20842 2132.39009 743.20842 curveto closepath fill -newpath 2016.88814 685.42842 moveto -2016.88814 653.52142 2042.74094 627.64668 2074.64252 627.64847 curveto -2106.54144 627.65024 2132.39009 653.524 2132.39009 685.42842 curveto -2132.39009 717.33289 2106.54144 743.2066 2074.64252 743.20839 curveto -2042.74094 743.21016 2016.88814 717.33542 2016.88814 685.42842 curveto closepath fill -newpath 1776.9906 279.01527 moveto -1776.9906 254.3235 lineto -1813.58745 254.3235 1850.03381 237.95572 1850.03381 205.43433 curveto -1874.7256 205.43433 lineto -1874.7256 251.21996 1827.08604 279.01527 1776.9906 279.01527 curveto closepath fill -newpath 1874.7256 205.43433 moveto -1874.7256 232.43114 1852.8508 254.3235 1825.85808 254.3235 curveto -1798.86537 254.3235 1776.99057 232.43114 1776.99057 205.43433 curveto -1776.99057 178.4375 1798.86537 156.54515 1825.85808 156.54515 curveto -1852.8508 156.54515 1874.7256 178.4375 1874.7256 205.43433 curveto closepath fill -newpath 1367.30255 133.33472 moveto -1342.61076 133.33472 lineto -1342.61076 74.74425 1372.23853 17.7816 1425.05696 17.7816 curveto -1425.05696 42.47337 lineto -1385.35803 42.47337 1367.30255 88.21811 1367.30255 133.33472 curveto closepath fill -newpath 1425.05696 17.7816 moveto -1456.95914 17.7816 1482.81311 43.65514 1482.81133 75.56155 curveto -1482.80956 107.46532 1456.95657 133.33472 1425.05696 133.33472 curveto -1393.15735 133.33472 1367.30435 107.46532 1367.30258 75.56155 curveto -1367.3008 43.65514 1393.15477 17.7816 1425.05696 17.7816 curveto closepath fill -newpath 1732.56311 457.77731 moveto -1700.6616 457.77731 1674.80875 431.9037 1674.80875 399.99734 curveto -1674.80875 368.09099 1700.6616 342.21739 1732.56311 342.21739 curveto -1764.46463 342.21739 1790.31749 368.09099 1790.31749 399.99734 curveto -1790.31749 431.9037 1764.46463 457.77731 1732.56311 457.77731 curveto closepath fill -newpath 3013.54182 632.14401 moveto -3028.22894 612.2952 lineto -3269.7488 816.74127 3608.5323 1103.56566 3610.75458 1288.88635 curveto -3611.80243 1376.26749 3581.15155 1462.17513 3516.81044 1521.09668 curveto -3460.7635 1572.42273 3385.37221 1596.80081 3309.64363 1590.12526 curveto -3171.6689 1577.96266 3060.33267 1470.42787 3052.96016 1333.33351 curveto -3045.98245 1203.581 3137.57684 1088.48344 3265.22295 1076.54176 curveto -3351.35205 1068.4841 3433.05145 1120.20264 3433.05145 1199.9988 curveto -3408.35968 1199.9988 lineto -3408.35968 1133.59242 3337.93658 1092.7306 3265.22295 1101.23354 curveto -3151.54225 1114.52704 3071.12796 1217.69836 3077.65193 1333.33351 curveto -3084.62604 1456.94698 3185.18233 1553.58287 3309.64363 1565.43347 curveto -3380.17586 1572.14923 3450.60315 1549.5242 3502.29701 1501.12053 curveto -3560.22752 1446.87717 3586.89455 1368.38152 3586.0628 1288.88635 curveto -3584.24646 1115.28639 3249.33823 831.74522 3013.54182 632.14401 curveto closepath fill -newpath 3408.35968 1199.9988 moveto -3433.05145 1199.9988 lineto -3433.05145 1275.58578 3399.87617 1351.1083 3332.83157 1351.1083 curveto -3332.83157 1326.41653 lineto -3386.98137 1326.41653 3408.35968 1262.13667 3408.35968 1199.9988 curveto closepath fill -newpath 3332.83157 1351.1083 moveto -3291.11115 1351.1083 3257.29994 1317.2723 3257.3035 1275.54678 curveto -3257.30705 1233.82652 3291.11629 1199.9988 3332.83157 1199.9988 curveto -3374.54686 1199.9988 3408.3561 1233.82652 3408.35965 1275.54678 curveto -3408.3632 1317.2723 3374.552 1351.1083 3332.83157 1351.1083 curveto closepath fill -newpath 3502.29701 1501.12053 moveto -3516.81044 1521.09668 lineto -3450.69678 1595.04318 3388.63074 1678.73073 3388.63074 1777.77802 curveto -3363.93896 1777.77802 lineto -3363.93896 1670.98792 3431.01534 1580.84732 3502.29701 1501.12053 curveto closepath fill -newpath 3363.93896 1777.77802 moveto -3388.63074 1777.77802 lineto -3388.63074 1822.89459 3406.68619 1868.63931 3446.38512 1868.63931 curveto -3446.38512 1893.3311 lineto -3393.56673 1893.3311 3363.93896 1836.36848 3363.93896 1777.77802 curveto closepath fill -newpath 3446.38512 1893.3311 moveto -3414.48293 1893.3311 3388.62897 1867.45755 3388.63074 1835.55113 curveto -3388.63252 1803.64738 3414.4855 1777.77798 3446.38512 1777.77798 curveto -3478.28473 1777.77798 3504.13773 1803.64738 3504.1395 1835.55113 curveto -3504.14128 1867.45755 3478.28731 1893.3311 3446.38512 1893.3311 curveto closepath fill -newpath 2920.00778 180.55225 moveto -2944.0666 174.99796 lineto -3046.66147 389.61165 3354.21637 585.45367 3605.13268 745.20016 curveto -3954.15793 967.40796 4267.70573 1286.5368 4232.6986 1688.89047 curveto -4209.6071 1954.29187 4028.81989 2166.68776 3851.00046 2364.73207 curveto -3794.33775 2427.83945 3736.1522 2494.01118 3721.8165 2577.77948 curveto -3701.58752 2695.98438 3782.64871 2805.01198 3887.16693 2787.65582 curveto -3945.15425 2778.02654 3985.88293 2726.0001 3985.88293 2666.66702 curveto -4010.57472 2666.66702 lineto -4010.57472 2739.60631 3958.84749 2802.74757 3887.16693 2812.34761 curveto -3768.31728 2828.26494 3677.05827 2708.3168 3697.12473 2577.77948 curveto -3711.08342 2486.97458 3773.45813 2414.8304 3834.47847 2346.3824 curveto -4006.95721 2152.90869 4184.90868 1947.35179 4208.0068 1688.89047 curveto -4243.20605 1295.02168 3932.74646 984.91982 3591.68472 765.9084 curveto -3336.35437 601.94907 3026.23866 402.77193 2920.00778 180.55225 curveto closepath fill -newpath 2986.64221 47.2243 moveto -3010.70103 41.67 lineto -3147.75232 356.32564 3417.09601 609.8737 3753.89128 609.8737 curveto -4021.04373 609.8737 4270.39835 755.32573 4232.6986 977.77654 curveto -4216.59442 1072.80045 4137.98454 1145.68076 4042.65633 1145.68076 curveto -4042.65633 1120.98897 lineto -4124.44844 1120.98897 4191.98944 1058.99149 4208.0068 977.77654 curveto -4249.02939 769.7747 4009.9488 634.56548 3753.89128 634.56548 curveto -3406.0496 634.56548 3128.20944 372.24808 2986.64221 47.2243 curveto closepath fill -newpath 3753.89128 634.56548 moveto -3753.89128 609.8737 lineto -3865.28447 609.8737 4087.07701 609.8737 4087.07701 609.8737 curveto -4198.247 629.798 4319.06866 623.47232 4319.06866 533.33203 curveto -4343.76045 533.33203 lineto -4343.76045 634.98782 4210.35521 649.60338 4087.07701 634.56548 curveto -4087.07701 634.56548 3865.10893 634.56548 3753.89128 634.56548 curveto closepath fill -newpath 3753.89128 634.56548 moveto -3753.89128 609.8737 lineto -3911.34888 609.8737 4052.51738 504.80197 4052.51738 355.55698 curveto -4052.51738 200.66891 3966.6665 53.18521 3820.53249 34.5695 curveto -3745.548 25.01738 3671.15982 57.49496 3629.03545 120.14034 curveto -3573.1424 203.26176 3681.31012 307.7637 3771.3853 240.2963 curveto -3807.98578 212.88213 3818.5669 155.05872 3864.9532 144.4431 curveto -3920.51483 131.72772 3963.119 191.29933 3963.119 258.56987 curveto -3944.48375 274.76895 lineto -3944.48375 227.22006 3902.10461 193.08423 3864.9532 211.10707 curveto -3819.61017 233.10385 3844.75212 296.07864 3825.25221 337.47615 curveto -3756.42819 483.5867 3453.25262 338.45476 3612.19586 102.08191 curveto -3657.90465 34.10597 3739.03938 -0.2274 3820.53249 9.87772 curveto -3979.92831 29.64278 4077.20915 187.55832 4077.20915 355.55698 curveto -4077.20915 518.37311 3924.94331 634.56548 3753.89128 634.56548 curveto closepath fill -newpath 4077.20915 355.55698 moveto -4052.51738 355.55698 lineto -4052.51738 199.88284 4086.45088 32.10124 4220.35269 32.10124 curveto -4220.35269 56.79303 lineto -4098.26613 56.79303 4077.20915 213.33162 4077.20915 355.55698 curveto closepath fill -newpath 3612.19586 102.08191 moveto -3629.03545 120.14034 lineto -3559.94661 222.88597 3454.7049 301.23213 3331.85739 301.23213 curveto -3263.69218 301.23213 3208.44955 245.94958 3208.44955 177.7751 curveto -3233.14134 177.7751 lineto -3233.14134 232.3127 3277.32907 276.54034 3331.85739 276.54034 curveto -3448.37933 276.54034 3546.58876 199.64969 3612.19586 102.08191 curveto closepath fill -newpath 3687.25684 711.1139 moveto -3687.25684 533.32527 lineto -3820.52571 533.32527 lineto -3820.52571 711.1139 lineto - closepath fill -newpath 4042.65633 1120.98897 moveto -4042.65633 1145.68076 lineto -3984.08322 1145.68076 3927.15437 1116.02138 3927.15437 1063.20898 curveto -3951.84616 1063.20898 lineto -3951.84616 1102.89934 3997.55746 1120.98897 4042.65633 1120.98897 curveto closepath fill -newpath 3927.15437 1063.20898 moveto -3927.15437 1031.30199 3953.00717 1005.42725 3984.90875 1005.42903 curveto -4016.8077 1005.4308 4042.65633 1031.30457 4042.65633 1063.20898 curveto -4042.65633 1095.11343 4016.8077 1120.98717 3984.90875 1120.98894 curveto -3953.00717 1120.99072 3927.15437 1095.11598 3927.15437 1063.20898 curveto closepath fill -newpath 4343.76045 533.33203 moveto -4319.06866 533.33203 lineto -4319.06866 509.45357 4305.45264 486.91112 4283.52805 486.91112 curveto -4283.52805 462.21933 lineto -4318.95856 462.21933 4343.76045 495.8874 4343.76045 533.33203 curveto closepath fill -newpath 4283.52805 462.21933 moveto -4303.15945 462.21933 4319.06866 478.14131 4319.06866 497.7757 curveto -4319.06866 517.41008 4303.15945 533.33206 4283.52805 533.33206 curveto -4263.89664 533.33206 4247.98743 517.41008 4247.98743 497.7757 curveto -4247.98743 478.14131 4263.89664 462.21933 4283.52805 462.21933 curveto closepath fill -newpath 4220.35269 56.79303 moveto -4220.35269 32.10124 lineto -4278.92578 32.10124 4335.85463 61.76062 4335.85463 114.57301 curveto -4311.16286 114.57301 lineto -4311.16286 74.88268 4265.45155 56.79303 4220.35269 56.79303 curveto closepath fill -newpath 4335.85463 114.57301 moveto -4335.85463 146.48001 4310.00183 172.35475 4278.10027 172.35298 curveto -4246.20132 172.3512 4220.35269 146.47745 4220.35269 114.57301 curveto -4220.35269 82.66856 4246.20132 56.79483 4278.10027 56.79306 curveto -4310.00183 56.79128 4335.85463 82.66602 4335.85463 114.57301 curveto closepath fill -newpath 3233.14134 177.7751 moveto -3208.44955 177.7751 lineto -3208.44955 114.93723 3238.98358 53.33116 3295.34254 53.33116 curveto -3295.34254 78.02295 lineto -3252.03981 78.02295 3233.14134 128.40266 3233.14134 177.7751 curveto closepath fill -newpath 3295.34254 53.33116 moveto -3329.70164 53.33116 3357.54729 81.19681 3357.54373 115.55992 curveto -3357.54018 149.91774 3329.6965 177.7751 3295.34254 177.7751 curveto -3260.9886 177.7751 3233.14493 149.91774 3233.14137 115.55992 curveto -3233.13782 81.19681 3260.98344 53.33116 3295.34254 53.33116 curveto closepath fill -newpath 3077.65193 1333.33351 moveto -3052.96016 1333.33351 lineto -3052.96016 1172.09837 2811.10745 1172.09837 2811.10745 1333.33351 curveto -2786.41566 1333.33351 lineto -2786.41566 1139.17598 3077.65193 1139.17598 3077.65193 1333.33351 curveto closepath fill -newpath 2786.41566 1333.33351 moveto -2811.10745 1333.33351 lineto -2811.10745 1376.32477 2828.74202 1419.75282 2866.64519 1419.75282 curveto -2866.64519 1444.44461 lineto -2815.58871 1444.44461 2786.41566 1389.80373 2786.41566 1333.33351 curveto closepath fill -newpath 2866.64519 1444.44461 moveto -2835.96674 1444.44461 2811.10393 1419.56415 2811.10745 1388.88226 curveto -2811.11101 1358.20566 2835.97188 1333.33348 2866.64519 1333.33348 curveto -2897.31848 1333.33348 2922.17935 1358.20566 2922.1829 1388.88226 curveto -2922.18643 1419.56415 2897.32362 1444.44461 2866.64519 1444.44461 curveto closepath fill -newpath 62.57968 2034.22038 moveto -85.50404 2025.04688 lineto -102.97975 2084.49106 162.76918 2121.56909 217.53708 2099.65256 curveto -234.92506 2092.6944 212.66992 2016.97672 196.7789 1962.9229 curveto -177.81325 1898.41058 104.05777 1874.21852 62.57907 1823.10634 curveto -45.58652 1802.16724 34.62709 1775.45529 44.18256 1750.69452 curveto -70.49791 1682.50438 162.47293 1725.64601 222.2463 1701.72644 curveto -285.54391 1676.39656 325.8373 1566.23872 393.57831 1610.87639 curveto -415.59242 1625.38246 420.85042 1653.80481 418.6892 1680.60147 curveto -412.9953 1751.19885 365.97595 1817.96388 386.29614 1887.0837 curveto -402.51544 1942.2542 424.45024 2016.85188 439.66089 2010.76503 curveto -498.84435 1987.08151 525.23912 1919.0736 506.8273 1856.44528 curveto -529.75166 1847.27177 lineto -551.98996 1922.916 520.27795 2005.09976 448.83441 2033.68939 curveto -408.5277 2049.81898 383.70981 1965.43768 363.37178 1896.25722 curveto -358.7398 1880.50137 382.23325 1759.47653 395.76483 1689.77498 curveto -399.77985 1669.09355 400.01291 1646.17383 383.8551 1633.5732 curveto -293.73856 1563.2961 303.66287 1748.9319 249.76686 1770.49956 curveto -196.1222 1791.96661 99.09082 1668.45824 66.87936 1760.41772 curveto -60.20856 1779.46194 71.47452 1798.76117 85.50343 1813.93282 curveto -130.24901 1862.32307 200.793 1889.42546 219.70326 1953.74939 curveto -239.51271 2021.13187 264.83997 2107.31866 226.7106 2122.57692 curveto -158.86551 2149.72656 83.88501 2106.69106 62.57968 2034.22038 curveto closepath fill -newpath 62.57968 2034.22038 moveto -32.95049 1960.17912 144.0124 1915.73534 173.6416 1989.77661 curveto -203.27081 2063.81787 92.2089 2108.26166 62.57968 2034.22038 curveto closepath fill -newpath 529.75166 1847.27177 moveto -559.38086 1921.31303 448.31894 1965.75682 418.68974 1891.71555 curveto -389.06055 1817.67429 500.12247 1773.2305 529.75166 1847.27177 curveto closepath fill -newpath 222.12384 1611.11809 moveto -191.4467 1611.11809 166.5861 1586.23752 166.5861 1555.55576 curveto -166.5861 1524.87401 191.4467 1499.99342 222.12384 1499.99342 curveto -252.80098 1499.99342 277.66158 1524.87401 277.66158 1555.55576 curveto -277.66158 1586.23752 252.80098 1611.11809 222.12384 1611.11809 curveto closepath fill -showpage -%%EOF diff --git a/Master/texmf-dist/doc/latex/lettrine/W.pdf b/Master/texmf-dist/doc/latex/lettrine/W.pdf deleted file mode 100644 index 5fd9502f083..00000000000 Binary files a/Master/texmf-dist/doc/latex/lettrine/W.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf index ddd39350b66..3bfc83077d3 100644 Binary files a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf and b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf differ diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-de.tex b/Master/texmf-dist/doc/latex/lettrine/demo-de.tex index 490237056d9..5ff30292a35 100644 --- a/Master/texmf-dist/doc/latex/lettrine/demo-de.tex +++ b/Master/texmf-dist/doc/latex/lettrine/demo-de.tex @@ -5,10 +5,10 @@ \usepackage{lettrine} \usepackage[T1]{fontenc} -%%% Palatino fonts... +%%% Palatino und Latin Modern Typewriter fonts \usepackage{palatino} -%%% ... or EC fonts -%\usepackage{type1ec} +\renewcommand{\ttdefault}{lmtt} +\usepackage{microtype} \usepackage{german} @@ -201,8 +201,7 @@ Er fa{\ss}t ihn sicher, er h"alt ihn warm. \vspace{\baselineskip} Und hier der zum Beispiel geh\"orende \LaTeX{}--Code: Das erste Argument von \verb+\lettrine+ war \verb+W+. Die Option \texttt{image=true} l\"adt dann die Datei \verb+W.eps+. Das Suffix \verb+.eps+ kann -- dank des -Pakets \verb+graphicx.sty+ -- weggelassen werden. \verb+\LettrineFontHook+ -enth\"alt den Befehl (\verb+\color{red}+), um in Rot zu schreiben. +Pakets \verb+graphicx.sty+ -- weggelassen werden. \begin{verbatim} {\fontfamily{yfrak}\selectfont\Large diff --git a/Master/texmf-dist/doc/latex/lettrine/demo.pdf b/Master/texmf-dist/doc/latex/lettrine/demo.pdf index a8be84ce6d1..1caefc12dde 100644 Binary files a/Master/texmf-dist/doc/latex/lettrine/demo.pdf and b/Master/texmf-dist/doc/latex/lettrine/demo.pdf differ diff --git a/Master/texmf-dist/doc/latex/lettrine/demo.tex b/Master/texmf-dist/doc/latex/lettrine/demo.tex index e7b1c6b7661..43a03ae05e1 100644 --- a/Master/texmf-dist/doc/latex/lettrine/demo.tex +++ b/Master/texmf-dist/doc/latex/lettrine/demo.tex @@ -9,18 +9,12 @@ %%% Palatino fonts... \usepackage[T1]{fontenc} -\usepackage{palatino} -%%% ... or EC fonts ... -%\usepackage[T1]{fontenc} -%\usepackage{type1ec} -%%% ... or LM fonts -%\usepackage[T1]{fontenc} -%\usepackage{lmodern} -%%% ... or CM fonts -%\usepackage{type1cm} +\usepackage{palatino} % Romain (sans-serif= helvetica) +\renewcommand{\ttdefault}{lmtt} % Courier chasse trop ! +\usepackage{microtype} \usepackage{babel} -\frenchbsetup{AutoSpacePunctuation=false} +\frenchbsetup{AutoSpacePunctuation=false,og=«,fg=»} \usepackage{graphicx,color} @@ -66,9 +60,9 @@ la Tour Carbonnière. \verb+\lettrine[lines=3]{E}{n} plein marais...+ \lettrine[lines=3]{E}{n} plein marais de la Souteyranne, -à quelques kilomètres au nord d'Aigues-Mortes, +à juste quelques kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière. -Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès +Elle contrôlait l'unique voie d'accès terrestre de la ville fortifiée, celle qui menait à Psalmody, l'une des « abbayes de sel» dont il ne reste que quelques vestiges. @@ -173,11 +167,11 @@ la reliait au château de Treillan. \vspace{.5\baselineskip} \textit{Changement de police (ici Typocaps) et de couleur pour la lettrine :}\\ -\verb+\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{black}}+\\ +\verb+\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}+\\ \verb+\lettrine[findent=.3em]{E}{n} plein marais...+ {% Groupe (changement local de fonte) -\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{black}} +\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}} \lettrine[findent=.3em]{E}{n} plein marais de la Souteyranne, à quelques kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière. diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf index 174f90ff402..f360cd9cf91 100644 Binary files a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf and b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf differ diff --git a/Master/texmf-dist/source/latex/lettrine/contrib.dtx b/Master/texmf-dist/source/latex/lettrine/contrib.dtx new file mode 100644 index 00000000000..15fa6217409 --- /dev/null +++ b/Master/texmf-dist/source/latex/lettrine/contrib.dtx @@ -0,0 +1,376 @@ +% \iffalse meta-comment +% +% This program can be distributed and/or modified under the terms +% of the LaTeX Project Public License either version 1.3c 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.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This file has the LPPL maintenance status "maintained". +% +% \fi +% +% \iffalse +%<*opt> +% \fi +% \begin{macrocode} +%% This is an example of config file *for syntax only*. +%% +%% Copy it to your document's directory and add +%% \renewcommand{\DefaultOptionsFile}{optfile.cfl} +%% to your document's preamble to use it. +%% +%% The settings below are just *examples*, they are not meant to be good! +%% Proper values heavily depend on the font used! +%% +%% Letters not listed below, will get either the default parameters, +%% or those given as optional argument of \lettrine, if any. +%% +%% The values of the parameters set in this file can be overridden locally +%% using the optional argument of \lettrine. +%% +%% A +\LettrineOptionsFor{A}{slope=0.1\LettrineWidth, findent=-.5em, nindent=.7em} +%% Same parameters for \`A +\LettrineOptionsFor{\`A}{slope=0.1\LettrineWidth, findent=-.5em, nindent=0.7em} +%% C' +\LettrineOptionsFor{C'}{nindent=-0.5em} +%% I and J hang into the margin +\LettrineOptionsFor{I}{lhang=1, nindent=0pt} +\LettrineOptionsFor{J}{lhang=1, nindent=0pt} +%% Q +\LettrineOptionsFor{Q}{loversize=-0.1, lraise=0.1} +%% V +\LettrineOptionsFor{V}{slope=-0.1\LettrineWidth, lhang=0.5, nindent=0pt} +% \end{macrocode} +% \iffalse +% +% \fi +% +% \iffalse +%<*pzc2> +% \fi +% \begin{macrocode} +%%% This is file `pzc2.cfl'. +%%% It is provided under the LPPL. Copyright is held by Kevin M. Dunn. +%%% If you modify this file you *MUST* change its name. + +%%% This file contains config values to simplify the use of the +%%% Zapf-Chancery (aka pzc) font with the lettrine package by Daniel Flipo. +%%% This file provides the parameters for 2 DefaultLines. + +%%% If you want to use this file, your document should contain +%%% the next three lines, without the leading percent signs. +%%% \setcounter{DefaultLines}{2} +%%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{pzc}\selectfont} +%%% \renewcommand{\DefaultOptionsFile}{pzc2.cfl} + +%%% Comments about this file can be sent to Kevin Dunn +%%% (cavema2 at cavemanchemistry.com) + +\ProvidesFile{pzc2.cfl}[2006/03/19 v0.1 Kevin M. Dunn] + +\LettrineOptionsFor{A}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.25\LettrineWidth} +\LettrineOptionsFor{B}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.08\LettrineWidth} +\LettrineOptionsFor{C}{loversize= 0.35,lraise= 0.10,lhang= 0.35,findent= 0.00\LettrineWidth,nindent= 0.28\LettrineWidth} +\LettrineOptionsFor{D}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.15\LettrineWidth,nindent= 0.05\LettrineWidth} +\LettrineOptionsFor{E}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.00\LettrineWidth,nindent= 0.28\LettrineWidth} +\LettrineOptionsFor{F}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.00\LettrineWidth} +\LettrineOptionsFor{G}{loversize= 0.35,lraise= 0.10,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.17\LettrineWidth} +\LettrineOptionsFor{H}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.20\LettrineWidth} +\LettrineOptionsFor{I}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.25\LettrineWidth} +\LettrineOptionsFor{J}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.15\LettrineWidth,nindent= 0.00\LettrineWidth} +\LettrineOptionsFor{K}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.13\LettrineWidth} +\LettrineOptionsFor{L}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=-0.02\LettrineWidth,nindent= 0.30\LettrineWidth} +\LettrineOptionsFor{M}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{N}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.10\LettrineWidth} +\LettrineOptionsFor{O}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.15\LettrineWidth,nindent= 0.08\LettrineWidth} +\LettrineOptionsFor{P}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.25\LettrineWidth,nindent= 0.05\LettrineWidth} +\LettrineOptionsFor{Q}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.15\LettrineWidth,nindent= 0.10\LettrineWidth} +\LettrineOptionsFor{R}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.08\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{S}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.13\LettrineWidth} +\LettrineOptionsFor{T}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.20\LettrineWidth} +\LettrineOptionsFor{U}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{V}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.18\LettrineWidth,nindent=-0.15\LettrineWidth} +\LettrineOptionsFor{W}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.15\LettrineWidth,nindent=-0.05\LettrineWidth} +\LettrineOptionsFor{X}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.00\LettrineWidth,nindent= 0.35\LettrineWidth} +\LettrineOptionsFor{Y}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.05\LettrineWidth} +\LettrineOptionsFor{Z}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.00\LettrineWidth,nindent= 0.30\LettrineWidth} +% \end{macrocode} +% \iffalse +% +% \fi +% +% \iffalse +%<*pzc3> +% \fi +% \begin{macrocode} +%%% This is file `pzc3.cfl'. +%%% It is provided under the LPPL. Copyright is held by Kevin M. Dunn. +%%% If you modify this file you *MUST* change its name. + +%%% This file contains config values to simplify the use of the +%%% Zapf-Chancery (aka pzc) font with the lettrine package by Daniel Flipo. +%%% This file provides the parameters for 3 DefaultLines. + +%%% If you want to use this file, your document should contain +%%% the next three lines, without the leading percent signs. +%%% \setcounter{DefaultLines}{3} +%%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{pzc}\selectfont} +%%% \renewcommand{\DefaultOptionsFile}{pzc3.cfl} + +%%% Comments about this file can be sent to Kevin Dunn +%%% (cavema2 at cavemanchemistry.com) + +\ProvidesFile{pzc3.cfl}[2006/03/19 v0.1 Kevin M. Dunn] + +\LettrineOptionsFor{A}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.25\LettrineWidth} +\LettrineOptionsFor{B}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.08\LettrineWidth,slope=-0.08\LettrineWidth} +\LettrineOptionsFor{C}{loversize= 0.35,lraise= 0.10,lhang= 0.35,findent=0.00\LettrineWidth,nindent= 0.28\LettrineWidth} +\LettrineOptionsFor{D}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.15\LettrineWidth,nindent= 0.05\LettrineWidth,slope=-0.05\LettrineWidth} +\LettrineOptionsFor{E}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.00\LettrineWidth,nindent= 0.28\LettrineWidth} +\LettrineOptionsFor{F}{loversize= 0.35,lraise= 0.05,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.00\LettrineWidth} +\LettrineOptionsFor{G}{loversize= 0.30,lraise= 0.30,lhang= 0.5,findent=0.10\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{H}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.20\LettrineWidth} +\LettrineOptionsFor{I}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.25\LettrineWidth} +\LettrineOptionsFor{J}{loversize= 0.35,lraise= 0.05,lhang= 0.35,findent=0.15\LettrineWidth,nindent= 0.00\LettrineWidth} +\LettrineOptionsFor{K}{loversize= 0.30,lraise= 0.20,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.13\LettrineWidth,slope= 0.20\LettrineWidth} +\LettrineOptionsFor{L}{loversize= 0.35,lraise= 0.00,lhang=0.35,findent=-0.02\LettrineWidth,nindent= 0.30\LettrineWidth} +\LettrineOptionsFor{M}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{N}{loversize= 0.30,lraise= 0.20,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.10\LettrineWidth,slope= 0.20\LettrineWidth} +\LettrineOptionsFor{O}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.15\LettrineWidth,nindent= 0.08\LettrineWidth} +\LettrineOptionsFor{P}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.25\LettrineWidth,nindent= 0.05\LettrineWidth} +\LettrineOptionsFor{Q}{loversize= 0.30,lraise= 0.25,lhang= 0.35,findent=0.15\LettrineWidth,nindent= 0.10\LettrineWidth,slope= 0.20\LettrineWidth} +\LettrineOptionsFor{R}{loversize= 0.30,lraise= 0.20,lhang= 0.35,findent=0.08\LettrineWidth,nindent= 0.15\LettrineWidth,slope= 0.20\LettrineWidth} +\LettrineOptionsFor{S}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.13\LettrineWidth} +\LettrineOptionsFor{T}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.20\LettrineWidth} +\LettrineOptionsFor{U}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{V}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.18\LettrineWidth,nindent=-0.05\LettrineWidth,slope=-0.15\LettrineWidth} +\LettrineOptionsFor{W}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.18\LettrineWidth,nindent=-0.05\LettrineWidth,slope=-0.10\LettrineWidth} +\LettrineOptionsFor{X}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.00\LettrineWidth,nindent= 0.35\LettrineWidth} +\LettrineOptionsFor{Y}{loversize= 0.30,lraise= 0.10,lhang= 0.40,findent=0.10\LettrineWidth,nindent= 0.00\LettrineWidth,slope=-0.10\LettrineWidth} +\LettrineOptionsFor{Z}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.00\LettrineWidth,nindent= 0.30\LettrineWidth} +% \end{macrocode} +% \iffalse +% +% \fi +% +% \iffalse +%<*pacl> +% \fi +% \begin{macrocode} +%%% This is file `pacl.cfl'. +%%% It is provided under the LPPL. Copyright is hold by Pascal Kockaert. +%%% If you modify this file you *MUST* change its name. + +%%% This file contains config values to simplify the use of the +%%% ACaslon-SwashItalic (aka pacri8s) font from Adobe +%%% with the lettrine package by Daniel Flipo. + +%%% If you want to use this file, your document should contain +%%% the two next lines, without the leading percent signs. +%%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{pacl}\selectfont} +%%% \renewcommand{\DefaultOptionsFile}{pacl.cfl} + +%%% The fontfamily pacl is defined through the file T1pacl.fd. +%%% The contents of T1pacl.fd is listed at the end of this file. + +%%% The settings below were defined according to my visual tastes. +%%% No mathematical rule based on the metrices was applied. +%%% Though the result may not please you, it should be better +%%% than the default placement. This said, comments are welcome. + +%%% Comments about this file can be sent to Pascal.Kockaert +%%% at the mail server ulb.ac.be. + +\ProvidesFile{pacl.cfl}[2003/08/24 v0.1 Pascal Kockaert] + +\LettrineOptionsFor{A}{loversize= 0.15,lraise= 0.02,lhang= 0.30,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{B}{loversize= 0.15,lraise= 0.00,lhang= 0.25,findent=-0.05\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{C}{loversize=-0.10,lraise= 0.25,lhang= 0.05,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{D}{loversize= 0.15,lraise= 0.00,lhang= 0.20,findent=-0.07\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{E}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent=-0.10\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{F}{loversize=-0.10,lraise= 0.20,lhang= 0.00,findent= 0.05\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{G}{loversize=-0.10,lraise= 0.20,lhang= 0.05,findent=-0.05\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{H}{loversize= 0.05,lraise= 0.00,lhang= 0.25,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{I}{loversize= 0.15,lraise= 0.00,lhang= 0.00,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{J}{loversize=-0.10,lraise= 0.20,lhang= 0.00,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{K}{loversize=-0.10,lraise= 0.25,lhang= 0.00,findent= 0.00\LettrineWidth,nindent= 0.45\LettrineWidth} +\LettrineOptionsFor{L}{loversize= 0.00,lraise= 0.20,lhang= 0.00,findent=-0.10\LettrineWidth,nindent= 0.40\LettrineWidth} +\LettrineOptionsFor{M}{loversize= 0.15,lraise= 0.00,lhang= 0.24,findent=-0.05\LettrineWidth,nindent= 0.10\LettrineWidth} +\LettrineOptionsFor{N}{loversize=-0.05,lraise= 0.25,lhang= 0.13,findent= 0.05\LettrineWidth,nindent= 0.35\LettrineWidth} +\LettrineOptionsFor{O}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent=-0.12\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{P}{loversize= 0.15,lraise= 0.00,lhang= 0.25,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{Q}{loversize=-0.15,lraise= 0.25,lhang= 0.10,findent=-0.05\LettrineWidth,nindent= 0.55\LettrineWidth} +\LettrineOptionsFor{R}{loversize=-0.15,lraise= 0.25,lhang= 0.20,findent=-0.05\LettrineWidth,nindent= 0.45\LettrineWidth} +\LettrineOptionsFor{S}{loversize=-0.10,lraise= 0.25,lhang=-0.05,findent=-0.05\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{T}{loversize= 0.15,lraise= 0.00,lhang= 0.15,findent= 0.00\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{U}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{V}{loversize= 0.15,lraise= 0.00,lhang= 0.20,findent=-0.05\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{W}{loversize= 0.15,lraise= 0.00,lhang= 0.15,findent=-0.05\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{X}{loversize= 0.15,lraise= 0.00,lhang= 0.45,findent= 0.05\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{Y}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent= 0.20\LettrineWidth,nindent= 0.25\LettrineWidth} +\LettrineOptionsFor{Z}{loversize= 0.05,lraise= 0.15,lhang= 0.15,findent= 0.00\LettrineWidth,nindent= 0.30\LettrineWidth} +\let\EOF\endinput +\EOF + +%% The installation of the pacl family can be performed using the +%% fontinst package. +%% You must own the font ACaslon-SwashItalic, that is an AFM and a PFB file +%% which should be renamed as padri8w.afm and padri8w.pfb. + +%% You should process the file Makepacl.tex (see below) through TeX, +%% and follow the instructions of the fontinst manual to finish the install. +%% The file T1pacl.fd should be defined as below and put with other local +%% FD files. + +%%% File Makepacl.tex +\input fontinst.sty +\installfonts + \declareencoding{T1-SWASH}{T1} + \fromafm{pacri8s} %%% File containing metrics of ACaslon-SwashItalic + \installfont{pacri9s}{pacri8s}{T1}{T1}{pacl}{m}{n}{} +\endinstallfonts +\bye +%%% End of file Makepacl.tex + +%%% The pacl family is defined by the file T1pacl.fd, as follows + +%%% File T1pacl.fd +%%% THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY +\ProvidesFile{t1pacl.fd}[2003/08/24 v1.0 Pascal Kockaert] +\DeclareFontFamily{T1}{pacl}{} +\DeclareFontShape{T1}{pacl}{m}{n}{<->pacri9s}{} +%%% End of file T1pacl.fd +% \end{macrocode} +% \iffalse +% +% \fi +% +% \iffalse +%<*padl> +% \fi +% \begin{macrocode} +%%% This is file `padl.cfl'. +%%% It is provided under the LPPL. Copyright is hold by Pascal Kockaert. +%%% If you modify this file you *MUST* change its name. + +%%% This file contains config values to simplify the use of the +%%% AGaramondAlt-Italic (aka padri8w) font from Adobe +%%% with the lettrine package by Daniel Flipo. + +%%% If you want to use this file, your document should contain +%%% the two next lines, without the leading percent signs. +%%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{padl}\selectfont} +%%% \renewcommand{\DefaultOptionsFile}{padl.cfl} + +%%% The fontfamily padl is defined through the file T1padl.fd. +%%% The contents of T1padl.fd is listed at the end of this file. + +%%% The settings below were defined according to my visual tastes. +%%% No mathematical rule based on the metrices was applied. +%%% Though the result may not please you, it should be better +%%% than the default placement. This said, comments are welcome. + +%%% Comments about this file can be sent to Pascal.Kockaert +%%% at the mail server ulb.ac.be. + +\ProvidesFile{padl.cfl}[2003/08/24 v1.0 Pascal Kockaert] + +\LettrineOptionsFor{A}{loversize= 0.05,lraise= 0.10,lhang= 0.40,findent= 0.000\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{B}{loversize= 0.10,lraise= 0.00,lhang= 0.30,findent= 0.025\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{C}{loversize= 0.00,lraise= 0.10,lhang= 0.15,findent= 0.175\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{D}{loversize= 0.10,lraise= 0.00,lhang= 0.30,findent=-0.025\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{E}{loversize= 0.10,lraise= 0.00,lhang= 0.10,findent= 0.100\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{F}{loversize= 0.10,lraise= 0.00,lhang= 0.30,findent= 0.100\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{G}{loversize=-0.08,lraise= 0.20,lhang= 0.10,findent= 0.000\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{H}{loversize=-0.01,lraise= 0.00,lhang= 0.00,findent= 0.040\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{I}{loversize= 0.10,lraise= 0.00,lhang= 0.00,findent= 0.050\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{J}{loversize=-0.08,lraise= 0.20,lhang= 0.00,findent=-0.025\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{K}{loversize=-0.05,lraise= 0.25,lhang= 0.00,findent=-0.050\LettrineWidth,nindent= 0.60\LettrineWidth} +\LettrineOptionsFor{L}{loversize= 0.00,lraise= 0.20,lhang= 0.00,findent= 0.100\LettrineWidth,nindent= 0.40\LettrineWidth} +\LettrineOptionsFor{M}{loversize= 0.10,lraise= 0.00,lhang= 0.40,findent= 0.040\LettrineWidth,nindent= 0.10\LettrineWidth} +\LettrineOptionsFor{N}{loversize= 0.00,lraise= 0.20,lhang= 0.20,findent=-0.010\LettrineWidth,nindent= 0.40\LettrineWidth} +\LettrineOptionsFor{O}{loversize= 0.10,lraise= 0.00,lhang= 0.20,findent=-0.010\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{P}{loversize= 0.10,lraise= 0.00,lhang= 0.30,findent= 0.050\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{Q}{loversize= 0.00,lraise= 0.20,lhang= 0.20,findent= 0.050\LettrineWidth,nindent= 0.70\LettrineWidth} +\LettrineOptionsFor{R}{loversize=-0.05,lraise= 0.25,lhang= 0.25,nindent= 0.500\LettrineWidth,nindent= 0.50\LettrineWidth} +\LettrineOptionsFor{S}{loversize= 0.10,lraise= 0.05,lhang= 0.00,findent= 0.000\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{T}{loversize= 0.10,lraise= 0.00,lhang= 0.35,findent= 0.100\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{U}{loversize= 0.10,lraise= 0.00,lhang= 0.20,findent= 0.050\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{V}{loversize= 0.10,lraise= 0.00,lhang= 0.40,findent= 0.050\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{W}{loversize= 0.10,lraise= 0.00,lhang= 0.30,findent= 0.040\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{X}{loversize= 0.10,lraise= 0.00,lhang= 0.40,findent= 0.040\LettrineWidth,nindent= 0.20\LettrineWidth} +\LettrineOptionsFor{Y}{loversize= 0.10,lraise= 0.00,lhang= 0.20,findent= 0.100\LettrineWidth,nindent= 0.20\LettrineWidth} +\LettrineOptionsFor{Z}{loversize=-0.05,lraise= 0.25,lhang= 0.00,findent= 0.050\LettrineWidth,nindent= 0.55\LettrineWidth} +\let\EOF\endinput +\EOF + +%% The installation of the padl family can be performed using the +%% fontinst package. +%% You must own the font AGaramondAlt-Italic, that is an AFM and a PFB +%% file which should be renamed as padri8w.afm and padri8w.pfb. + +%% You should process the file Makepadl.tex (see below) through TeX, +%% and follow the instructions of the fontinst manual to finish the +%% install. +%% The file T1padl.fd should be defined as below and put with other +%% local FD files. + +%%% File Makepadl.tex +\input fontinst.sty +\installfonts + \declareencoding{T1-SWASH}{T1} + \fromafm{padri8w} %%% File containing metrics of AGaramondAlt-Italic + \gdef\uc#1#2{#1swash} + \installfont{padw9w}{padri8w}{T1}{T1}{padl}{m}{n}{} +\endinstallfonts +\bye +%%% End of file Makepadl.tex + +%% The padl family is defined by the file T1padl.fd, as follows + +%%% File T1padl.fd +%%% THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY +\ProvidesFile{t1padl.fd}[2003/08/24 v0.1 Pascal Kockaert] +\DeclareFontFamily{T1}{padl}{} +\DeclareFontShape{T1}{padl}{m}{n}{<->padw9w}{} +%%% End of file T1padl.fd +% \end{macrocode} +% \iffalse +% +% \fi +% +% \iffalse +%<*dtx> +% \fi +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +% \iffalse +% +% \fi +% +% \Finale +\endinput + +%%% Local Variables: +%%% fill-column: 70 +%%% coding: utf-8 +%%% End: diff --git a/Master/texmf-dist/source/latex/lettrine/contrib.ins b/Master/texmf-dist/source/latex/lettrine/contrib.ins new file mode 100644 index 00000000000..2070b331cf6 --- /dev/null +++ b/Master/texmf-dist/source/latex/lettrine/contrib.ins @@ -0,0 +1,59 @@ +%% +%% Copyright (C) 1999-2018 Daniel Flipo. +%% +%% This program can be distributed and/or modified under the terms +%% of the LaTeX Project Public License either version 1.3c 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.3c or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This file will generate fast loadable files and documentation +%% driver files from the doc files in this package when run through +%% LaTeX or TeX. +%% +\def\batchfile{contrib.ins} +\input docstrip.tex + +{\ifx\generate\undefined +\Msg{**********************************************} +\Msg{*} +\Msg{* This installation requires docstrip} +\Msg{* version 2.3c or later.} +\Msg{*} +\Msg{* An older version of docstrip has been input} +\Msg{*} +\Msg{**********************************************} +\errhelp{Move or rename old docstrip.tex.} +\errmessage{Old docstrip in input path} +\batchmode +\csname @@end\endcsname +\fi} + +\keepsilent +\askforoverwritefalse + +\usedir{tex/latex/lettrine} + +\nopreamble +\generate{\file{optfile.cfl}{\from{contrib.dtx}{opt}} + \usedir{tex/latex/lettrine/contrib} + \file{pzc2.cfl}{\from{contrib.dtx}{pzc2}} + \file{pzc3.cfl}{\from{contrib.dtx}{pzc3}} + \nopostamble + \file{pacl.cfl}{\from{contrib.dtx}{pacl}} + \file{padl.cfl}{\from{contrib.dtx}{padl}} + } + +\Msg{***********************************************************} +\Msg{*} +\Msg{* To finish the installation please move all the *.cfl} +\Msg{* files to the contrib subdirectory of tex/latex/lettrine.} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{***********************************************************} + +\endbatchfile +\endinput diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx index 46391279324..13b9b7990e0 100644 --- a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx +++ b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx @@ -1,9 +1,9 @@ % -% \CheckSum{567} +% \CheckSum{596} % % \iffalse meta-comment % -% Copyright (C) 1999-2015 Daniel Flipo. +% Copyright © 1999-2018 Daniel Flipo. % % This program can be distributed and/or modified under the terms % of the LaTeX Project Public License either version 1.3c of this @@ -15,9 +15,6 @@ % % This file has the LPPL maintenance status "maintained". % -% NO PERMISSION is granted to produce or to distribute a -% modified version of this file under its original name. -% % \fi % % \iffalse @@ -30,37 +27,46 @@ \ProvidesFile{lettrine.dtx} % %<*!cfg> - [2015/08/31 v1.9 (Daniel Flipo)] + [2018/07/21 v2.0 (Daniel Flipo)] % % % Lettrine package for LaTeX version 2e % -% Copyright (C) 1999-2015 by Daniel Flipo +% Copyright © 1999-2018 by Daniel Flipo % % Please report errors to: daniel.flipo at free.fr % %<*driver> \documentclass[a4paper]{ltxdoc} -\usepackage[utf8]{inputenc} +\usepackage{unicode-math} +\setmainfont{Latin Modern Roman} +\setmathfont{XITS Math} +\usepackage[expansion=true,protrusion=true]{microtype} +\usepackage{url} +\usepackage[numbered]{hypdoc} +\hypersetup{colorlinks,urlcolor=blue,unicode} \usepackage{lettrine} -\GetFileInfo{lettrine.dtx} -\RecordChanges -%\OnlyDescription % -\newenvironment{key}[2]{\expandafter\macro\expandafter{% - \csname KV@#1@#2\endcsname}}{\endmacro} +\RecordChanges +\AtEndDocument{% + \section{Change History}% + \GlossaryPrologue{}% + Changes are listed in reverse order (latest first) from version~1.0 + \PrintChanges +} % \newcommand*\file[1]{\texttt{#1}} +\renewcommand\meta[1]{\textit{<#1>}} % no math mode (see doc.sty) % -\newcommand{\at}{@} \setlength{\parindent}{0pt} \setlength{\parskip}{.3\baselineskip} \begin{document} +\GetFileInfo{lettrine.dtx} \begin{center} - \textbf{\Large Typesetting `lettrines' in \LaTeXe{} documents} + \textbf{\Large Typesetting dropped capitals in \LaTeXe{} documents} \\[.2\baselineskip]^^A\] - {\large Daniel \textsc{Flipo}}\\ - \texttt{daniel.flipo\at free.fr} + {\large Daniel Flipo}\\ + \texttt{daniel.flipo@free.fr} \end{center} \DocInput{lettrine.dtx} \end{document} @@ -77,9 +83,9 @@ % % Adding |\usepackage{lettrine}| in the preamble of a document % defines the command |\lettrine|, the simplest use of which is -% |\lettrine{|\emph{$<$letter$>$}|}{|\emph{$<$text$>$}|}|. -% It produces a dropped capital \emph{$<$letter$>$} (2 lines high), -% followed by \emph{$<$text$>$} typeset in small caps, and the rest +% |\lettrine{|\meta{letter}|}{|\meta{text}|}|. +% It produces a dropped capital \meta{letter} (2 lines high), +% followed by \meta{text} typeset in small caps, and the rest % of the paragraph is wrapped around the dropped capital. % % Various parameters are provided to control the size and layout @@ -89,53 +95,52 @@ % \item ``Lexique des règles typographiques en usage à % l'Imprimerie nationale'' troisième édition (1994), % ISBN-2-11-081075-0, -% \item ``Mise en page et impression'' Yves~\textsc{Perrousseaux}, +% \item ``Mise en page et impression'' Yves~Perrousseaux, % ISBN-2-911220-01-3. % \end{itemize} % The parameters can be set using David Carlisle's % \texttt{keyval.sty} syntax: % \begin{itemize} -% \item |lines=|\emph{$<$integer$>$} sets how many lines the +% \item |lines=|\meta{integer} sets how many lines the % dropped capital will occupy (default=2); % -% \changes{lettrine-1.7}{2014/09/16}{New counter to add lines for +% \changes{v1.7}{2014/09/16}{New counter to add lines for % dropped capitals with positive depth, like Q.} % -% \item |depth=|\emph{$<$integer$>$} sets the number of lines to +% \item |depth=|\meta{integer} sets the number of lines to % be reserved under the baseline, this is meant for dropped % capital with positive depth, like Q (default=0); -% \item |lhang=|\emph{$<$decimal$>$} ($0\le|lhang|\le1$) sets +% \item |lhang=|\meta{decimal} ($0\le|lhang|\le1$) sets % how much of the dropped capital's width should hang into % the margin (default=0); -% \item |loversize=|\emph{$<$decimal$>$} ($-1<|loversize|\le1$) +% \item |loversize=|\meta{decimal} ($-1<|loversize|\le1$) % enlarges the dropped capital's height: with % |loversize=0.1| its height is enlarged by 10\% so that % it raises above the top paragraph's line (default=0); -% \item |lraise=|\emph{$<$decimal$>$} does not affect the dropped +% \item |lraise=|\meta{decimal} does not affect the dropped % capital's height, but moves it up (if positive), % down (if negative); useful with capitals like |J| or |Q| % which have a positive depth, (default=0); -% \item |findent=|\emph{$<$dimen$>$} (positive or negative) +% \item |findent=|\meta{dimen} (positive or negative) % controls the horizontal gap between the dropped capital % and the indented block of text (default=0pt); -% \item |nindent=|\emph{$<$dimen$>$} shifts all indented lines, +% \item |nindent=|\meta{dimen} shifts all indented lines, % starting from the second one, horizontally by -% \emph{$<$dimen$>$} (this shift is relative to the first +% \meta{dimen} (this shift is relative to the first % line, default=0.5em); -% \item |slope=|\emph{$<$dimen$>$} can be used with dropped -% capitals like |A| or |V| to add \emph{$<$dimen$>$} +% \item |slope=|\meta{dimen} can be used with dropped +% capitals like |A| or |V| to add \meta{dimen} % (positive or negative) to the indentation of each line % starting from the third one (no effect if |lines=2|, % default=0pt); -% \item |ante=|\emph{$<$text$>$} can be used to typeset -% \emph{$<$text$>$} \emph{before} the dropped capital -% (typical use is for French guillemets starting -% the paragraph). +% \item |ante=|\meta{text} can be used to typeset \meta{text} +% \emph{before} the dropped capital (typical use is for +% French guillemets starting the paragraph). % -% \changes{lettrine-1.6}{2004/05/22}{Add a flag to switch to +% \changes{v1.6}{2004/05/22}{Add a flag to switch to % images in eps or pdf format. Suggested by Bill Jetzer.} % -% \item |image=|\emph{$<$true$>$} (new to version 1.6) will force +% \item |image=|\meta{true} (new to version 1.6) will force % |\lettrine| to replace the letter normally used as % dropped capital by an image in eps format (latex) or % in pdf, jpg, etc.\ format (pdflatex); this needs the @@ -147,15 +152,15 @@ % \verb+\LettrineFontEPS+ still works for compatibility % but is deprecated. % -% \changes{lettrine-1.8}{2015/02/06}{Added two keyval options: +% \changes{v1.8}{2015/02/06}{Added two keyval options: % `grid' (true/false) and `novskip' to override \cs{DiscardVskip}.} % -% \item |grid=|\emph{$<$true$>$} (new to version 1.8) will force +% \item |grid=|\meta{true} (new to version 1.8) will force % the vertical skip added above the paragraph starting with % |\lettrine| to be rounded up to an integer number of % |\baselineskip|. % This option is meant for grid typesetting. -% \item |novskip=|\emph{$<$dimen$>$} (new to version 1.8) +% \item |novskip=|\meta{dimen} (new to version 1.8) % overrides |\DiscardVskip| (default=0.2pt). In some cases % (see options |lraise|, |loversize| or accentuated dropped % capitals,\dots) the top of the dropped capital will raise @@ -167,11 +172,11 @@ % prevent small vertical skips from being rounded up to % |\baselineskip| when using the `grid' option. % -% \changes{lettrine-1.9}{2015/08/31}{New keyval option: `realheight' +% \changes{v1.9}{2015/08/31}{New keyval option: `realheight' % (true/false) and new global flag \cs{ifLettrineRealHeight}.} % -% \item |realheight=|\emph{$<$true$>$} (new to version 1.9) will -% compute the default height of the lettrine so that the +% \item |realheight=|\meta{true} (new to version 1.9) will +% compute the default height of the initial so that the % top of it is exactly aligned with the top of the text % entered as second mandatory argument of |\lettrine| % taking possible accents into account. @@ -188,13 +193,13 @@ % these two examples: % \begin{description} % \item |\lettrine{H}{ello}| you probably would like the -% top of the `L' to be aligned with the top of the `ll' +% top of the `H' to be aligned with the top of the `ll' % rather than with the top of the `e', adding option % |realheight| does the trick: % |\lettrine[realheight]{H}{ello}|.\par % Global variants : |\LettrineRealHeighttrue| or (without -% the |realheight| option) -% |\renewcommand{\LettrineSecondString}{l}|. +% |realheight| option) +% |\renewcommand*{\LettrineSecondString}{l}|. % \item |\lettrine{L}{a misère}| option |realheight=true| % would align with the top of the `L' with the top of the % grave accent, the default is probably better (top of @@ -209,22 +214,22 @@ % \mbox{}\phantom{\tt Example: lettrine}% % |{V}{oici} un exemple |\dots % -% Coloured lettrines are possible in conjonction with package +% Coloured initials are possible in conjonction with package % \file{color}, examples: |\lettrine{\textcolor{red}{A}}{n} example| % \quad or\\ |\lettrine{\textcolor[gray]{0.5}{A}}{nother} one| \\ % see package \file{color} for the syntax of colour commands. -% Another possibility to colour lettrines globally is described +% Another possibility to colour initials globally is described % below, see |\LettrineFontHook|. % % Three dimensions, |\LettrineWidth|, |\LettrineHeight| and -% |\LettrineDepth|, store the final size of the lettrine. +% |\LettrineDepth|, store the final size of the initial. % % Once \file{lettrine.sty} will be installed (run \texttt{latex} % on \file{lettrine.ins} to extract it), compile and print % \file{demo.tex} to see the possible usage of these parameters. % -% \changes{lettrine-1.9}{2015/08/31}{New customisable string -% \cs{LettrineSecondString} to tune the lettrine's height.} +% \changes{v1.9}{2015/08/31}{New customisable string +% \cs{LettrineSecondString} to tune the initial's height.} % % The default settings can be customized either in a config file % \file{lettrine.cfg} (for a global usage), or on a per document @@ -268,7 +273,7 @@ % usually the current font in a (large) size, computed % automatically from the number of lines it will fill: % the font size is computed so that, a \emph{standard} dropped -% capital (say X, not À) when sitting on its baseline, gets +% capital (say Z, not À) when sitting on its baseline, gets % its top aligned with the top of the following text (provided % $|loversize|=0$ and $|lines|\ge 2$). When $|lines|=1$, % size is computed as if |lines| was~2.\\ @@ -283,9 +288,9 @@ % |\LettrineFontHook| can also be used to change the colour of % all lettrines in a (part of) document: % |\renewcommand{\LettrineFontHook}{\color[gray]{0.5}}| \\ -% will colour the lettrines following this command in grey. +% will colour the initials following this command in grey. % -% \changes{lettrine-1.3}{2002/08/23}{Correct the documentation to +% \changes{v1.3}{2002/08/23}{Correct the documentation to % mention the cm-super fonts and the type1ec package by % Vladimir Volovich.} % @@ -323,7 +328,7 @@ % fully scalable too! % % \vspace{\baselineskip} -% \textbf{Known problems:} +% \textbf{Known issues:} % \begin{itemize} % \item nothing is done to prevent page-breaking in a paragraph % starting with a dropped capital; when it happens to hang @@ -333,17 +338,27 @@ % (except with option \texttt{[lines=1]}); % \item |\lettrine| does not work within lists; % \item if a \emph{list} has to be included in a paragraph starting -% with a `lettrine', it is necessary to add the command +% with |\lettrine|, it is necessary to add the command % |\parshape=0| just after the end of the list (starting a new % paragraph just before or just after the list works too). % Remember that `quote', `quotation', `abstract' environments % are implemented as \emph{lists} in \LaTeX{}. +% \item if you are facing some slight height inaccuracy for a +% dropped capital, you can try changing |\LettrineTestString|:\\ +% |\renewcommand*{\LettrineTestString}{|\meta{letter}|}|\\ +% where \meta{letter} is the used dropped capital \emph{without +% accent}. Informations about targeted and effective initial’s +% height are available in the \file{.log} file. Using LuaTeX +% or XeTeX engines with OpenType fonts may be an option +% (some TFM files for Type1 fonts are slightly inaccurate). +% \item |\LettrineTestString|’s value has changed over the time; +% to achieve strict backward compatibility with previous versions, +% please look at the end of \file{lettrine.cfg}. % \end{itemize} % -% \StopEventually{\PrintChanges} +% \StopEventually{} % -% \pagebreak[3] -% \section{\TeX{}nical details} +% \section{\TeX{}nical details} % % This package only runs with \LaTeXe{} and requires keyval.sty % \iffalse @@ -359,13 +374,13 @@ % and commands to hold the default settings and set these default % settings. They can be overwritten in file |lettrine.cfg|. % -% \changes{lettrine-1.2}{2002/03/13}{\cs{newlength} changed to +% \changes{v1.2}{2002/03/13}{\cs{newlength} changed to % \cs{newdimen}, to correct a bug with seminar.cls (pointed out % by Peter Münster).} % -% \changes{lettrine-1.6}{2004/05/22}{Added newif \cs{ifLettrineImage}.} +% \changes{v1.6}{2004/05/22}{Added newif \cs{ifLettrineImage}.} % -% \changes{lettrine-1.8}{2015/02/06}{Added newif \cs{ifLettrineOnGrid} +% \changes{v1.8}{2015/02/06}{Added newif \cs{ifLettrineOnGrid} % and new dimen \cs{DiscardVskip}, default (0.2pt) set for % compatibility with previous releases.} % @@ -393,9 +408,9 @@ % Then let's define the necessary internal counters, lengths, % and commands. % -% \changes{lettrine-1.6}{2004/05/22}{Added newif \cs{ifL@image}.} +% \changes{v1.6}{2004/05/22}{Added newif \cs{ifL@image}.} % -% \changes{lettrine-1.6}{2015/02/06}{Added newif \cs{ifL@grid}.} +% \changes{v1.6}{2015/02/06}{Added newif \cs{ifL@grid}.} % % \begin{macrocode} \newsavebox{\L@lbox} @@ -411,6 +426,12 @@ \newdimen\L@slope \newdimen\L@height \newdimen\L@novskip +\newdimen\L@target@ht +\newdimen\L@target@dp +\newdimen\L@target@tht +\newdimen\LettrineWidth +\newdimen\LettrineHeight +\newdimen\LettrineDepth \newcommand*{\L@file}{} \newcommand*{\L@hang}{} \newcommand*{\L@oversize}{} @@ -440,76 +461,107 @@ % If |lines=1|, the default size for the dropped capital is % computed as if |lines=2|. % -% |\Lettrine@height| computes the wished height for the dropped -% capital and stores it into |\L@height|. |\L@height| depends only -% on |L@lines|, |\L@oversize| and, in case option |realheight=true| -% on the height of |\L@tbox|. So options \emph{must} be read and -% |\L@tbox| must be properly initialised \emph{before} executing -% |\Lettrine@height| (see below in |\@lettrine| code). A default -% initialisation of |\L@tbox| is provided just in case +% |\Lettrine@height| computes the targeted height for the dropped +% capital and stores it into |\L@target@tht| which depends only +% on |L@lines| and on the height of |\L@tbox|. So options +% \emph{must} be read and |\L@tbox| must be properly initialised +% \emph{before} executing |\Lettrine@height| (see below in +% |\@lettrine| code). +% A default initialisation of |\L@tbox| is provided just in case % |\LettrineFont| would be used outside |\lettrine|. % -% As |\baselineskip| might be a rubber length, we convert it into -% a `dimen' using |\@tempdima|. -% |\LettrineFontHook| enables to select another font for the -% dropped capital. Its default definition is empty (the current -% text font is used). +% |\L@height| is set to |\L@target@tht| raised by the |\L@oversize| +% factor. % -% \changes{lettrine-0.9}{1998/02/23}{Size of the dropped capital +% \changes{v0.9}{1998/02/23}{Size of the dropped capital % changed when `lines' value is 1 (was \cs{Huge}).} -% \changes{lettrine-0.9}{1998/03/13}{\cs{Lettrine@height} added.} -% \changes{lettrine-0.9}{1998/03/13}{\cs{LettrineFontHook} added.} -% \changes{lettrine-1.2}{2002/03/13}{\cs{baselineskip} may be a +% \changes{v0.9}{1998/03/13}{\cs{Lettrine@height} added.} +% \changes{v0.9}{1998/03/13}{\cs{LettrineFontHook} added.} +% \changes{v1.2}{2002/03/13}{\cs{baselineskip} may be a % rubber length, we convert it to a dimen.} % -% \changes{lettrine-1.63}{2012/07/20}{Added command +% \changes{v1.63}{2012/07/20}{Added command % \cs{LettrineTestString} which defaults to % `ABCDEFGHIJKLMNOQPRSTUVWXYZ'. In previous versions height % computations were based on letter `X' which might not exist % in some (rare) fonts. Pointed out by Raphaël Pinson.} % -% \changes{lettrine-1.9}{2015/08/31}{\cs{theL@lines} changed +% \changes{v1.9}{2015/08/31}{\cs{theL@lines} changed % to \cs{value\{L@lines\}}. Needed for babel-hebrew which % redefines \cs{@arabic}.} % +% \changes{v2.0}{2018/07/21}{\cs{LettrineTestString} changed +% from `ABCDEFGHIJKLMNOQPRSTUVWXYZ' to `EFTZ' as +% some capitals like C, G, O, Q or X might be slightly taller +% (possible optical correction).} +% +% \changes{v2.0}{2018/07/21}{Store targeted dimensions of the +% dropped capital (ht, dp, tht) for further use.} +% % \begin{macrocode} \def\Lettrine@height{% - \@tempdima=\baselineskip - \setlength{\L@height}{\value{L@lines}\@tempdima}% - \ifnum\value{L@lines}>1 - \addtolength{\L@height}{-\@tempdima}% - \fi \ifvoid\L@tbox \sbox{\L@tbox}{\LettrineTextFont{\LettrineSecondString}}% \fi - \addtolength{\L@height}{\ht\L@tbox}% - \addtolength{\L@height}{\L@oversize\L@height}% + \global\setlength{\L@target@ht}{\ht\L@tbox}% +% \end{macrocode} +% As |\baselineskip| might be a rubber length, let’s convert it +% into a `dimen' using |\@tempdima|. +% \begin{macrocode} + \@tempdima=\baselineskip + \global\setlength{\L@target@dp}{\value{L@lines}\@tempdima}% + \ifnum\value{L@lines}>1 + \global\addtolength{\L@target@dp}{-\@tempdima}% + \else + \global\addtolength{\L@target@ht}{\L@target@dp}% + \global\setlength{\L@target@dp}{0pt}% + \fi + \global\setlength{\L@target@tht}{\L@target@ht}% + \global\addtolength{\L@target@tht}{\L@target@dp}% + \setlength{\L@height}{\L@target@tht}% + \addtolength{\L@height}{\L@oversize\L@target@tht}% } +% \end{macrocode} +% +% |\LettrineFontHook| enables to select another font for the +% dropped capital. Its default definition is empty (the current +% text font is used). +% +% \begin{macrocode} \newcommand*{\LettrineFontHook}{} -\newcommand*{\LettrineTestString}{ABCDEFGHIJKLMNOQPRSTUVWXYZ} +\newcommand*{\LettrineTestString}{EFTZ} \newcommand*{\LettrineSecondString}{x} \newcommand*{\LettrineFont}{% \Lettrine@height % \end{macrocode} % |\L@height| now holds the exact height required for the dropped -% capital, setting |\fontsize| to that height would not give the -% expected result (capital too small), some computing has to be -% done: we measure the maximal capitals' height and compute a -% scaling factor (always $\ge1$). All capitals are expected to -% have the same height, in case this assumption would be wrong for -% some special font, |\LettrineTestString| can be customised to any -% non empty subset of capitals. +% capital, let’s compute the matching |\fontsize|’s value: +% we divide |\L@height| (converted into sp) by the ``standard’’ +% capitals’ height (see the list in |\LettrineTestString|) to get +% a scaling factor (always $\ge1$). +% All capitals in |\LettrineTestString| are expected to have the +% same height, in case this assumption would be wrong for some +% special font, |\LettrineTestString| can be customised to any +% non empty subset of capitals, the maximal height of these +% capitals will be taken into account. +% Mind that some fonts apply optical correction to capitals C, G, +% O, or Q (they are slightly taller than `T’ or `Z’), that’s why +% they are not part of |\LettrineTestString|. % \begin{macrocode} \sbox{\@tempboxa}{\LettrineFontHook\fontsize{\L@height}{\L@height}% \selectfont \LettrineTestString}% % \end{macrocode} % Arithmetic calculations convert the dimensions into integers % (in sp) and compute a (4 decimal accurate) scaling factor. +% +% \changes{v2.0}{2018/07/21}{Change factors 100/100 to 50/200 +% to reach larger sizes (height up to 600pt).} +% % \begin{macrocode} \@tempcntb=\ht\@tempboxa \@tempcnta=\L@height - \multiply\@tempcnta by 100 - \divide\@tempcntb by 100 + \multiply\@tempcnta by 50 + \divide\@tempcntb by 200 \divide\@tempcnta by \@tempcntb \advance\@tempcnta by -9999 \ifnum\@tempcnta>0 @@ -525,7 +577,7 @@ % \end{macro} % \end{macro} % -% \changes{lettrine-0.9}{1998/03/13}{\cs{LettrineFontEPS} added.} +% \changes{v0.9}{1998/03/13}{\cs{LettrineFontEPS} added.} % % \begin{macro}{\LettrineFontEPS} % The following definition is for use with dropped capitals defined @@ -535,7 +587,7 @@ % computed just as in the standard case, |\includegraphics| % prints the EPS file at this size. % -% \changes{lettrine-1.6}{2004/05/22}{Added \cs{LettrineFontHook} +% \changes{v1.6}{2004/05/22}{Added \cs{LettrineFontHook} % to \cs{LettrineFontEPS}. This is needed for color options.} % % \begin{macrocode} @@ -564,7 +616,7 @@ \define@key{L}{novskip}{\setlength{\L@novskip}{#1}} % \end{macrocode} % -% \changes{lettrine-1.5}{2003/08/18}{\cs{LettrineOptionsFor} and +% \changes{v1.5}{2003/08/18}{\cs{LettrineOptionsFor} and % \cs{LettrineWidth} added.} % % \begin{macro}{\LettrineOptionsFor} @@ -578,9 +630,6 @@ % % \begin{macrocode} \newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}} -\newdimen\LettrineWidth -\newdimen\LettrineHeight -\newdimen\LettrineDepth % \end{macrocode} % \end{macro} % @@ -592,9 +641,9 @@ \def\@lettrine[#1]#2#3{% % \end{macrocode} % -% \changes{lettrine-0.81}{1997/02/26}{\cs{DefaultLoversize} added.} +% \changes{v0.81}{1997/02/26}{\cs{DefaultLoversize} added.} % -% \changes{lettrine-1.9}{2015/08/31}{\cs{theDefaultLines} changed to +% \changes{v1.9}{2015/08/31}{\cs{theDefaultLines} changed to % \cs{value\{DefaultLines\}}, same with \cs{theDefaultDepth}. % Needed for babel-hebrew which redefines \cs{@arabic}. % Thanks to Ulrike Fischer for providing the fix.} @@ -616,14 +665,14 @@ \ifLettrineRealHeight\L@realhtrue\else\L@realhfalse\fi % \end{macrocode} % -% |\LettrineFont| and |\LettrineFontEPS| both call +% |\LettrineFont| and |\LettrineFontEPS| both execute % |\Lettrine@height| to set |\L@height| which depends on % |\L@tbox|. The content of |\L@tbox| depends on option -% |realheight|, so we have to read the lettrine's options +% |realheight|, so we have to read |\lettrine|'s optional argument % and initialise the |\L@tbox| content now% % \footnote{Now means before eventually reading the config file.}. % -% \changes{lettrine-1.9}{2015/08/31}{Use the second mandatory +% \changes{v1.9}{2015/08/31}{Use the second mandatory % argument of \cs{lettrine} or \cs{LettrineSecondString} (which % defaults to `x') to compute \cs{L@height}. This is controlled by % the `realheight' flag.} @@ -642,12 +691,12 @@ \fi \fi % \end{macrocode} -% \changes{lettrine-1.5}{2003/08/18}{Added reading of an optional +% \changes{v1.5}{2003/08/18}{Added reading of an optional % config file \cs{DefaultOptionsFile}.} % Then try to read an optional file (its name is given by % |\DefaultOptionsFile|), do this inside a group, and define a % global command |\l@LOKeys| which will expand to the list of -% options given by |\LettrineOptionsFor| for the current lettrine +% options given by |\LettrineOptionsFor| for the current initial % (defined by |#2|)\dots % \begin{macrocode} \if\DefaultOptionsFile\relax @@ -685,7 +734,7 @@ \expandafter\KV@do\l@LOKeys,\relax, % \end{macrocode} % As some parameters' values |findent|, |nindent| and |slope| -% ---which do not influence the lettrine size--- may be given +% ---which do not influence the initial’s size--- may be given % relative to |\LettrineWidth|, this has to be done again after % measuring the lettrine for |\LettrineWidth| to be set properly. % \begin{macrocode} @@ -712,10 +761,36 @@ \sbox{\L@lbox}{\LettrineFont #2}% \fi % \end{macrocode} -% Height calculations done, let's reset |\L@tbox|'s content -% (mandatory in case |realheight=false|): % -% \changes{lettrine-1.6}{2004/05/22}{Add braces around \#3 to allow +% \changes{v1.65}{2014/09/04}{Measure and store the initial's +% final dimensions.} +% Store the initial’s final dimensions, +% \begin{macrocode} + \setlength{\LettrineWidth}{\wd\L@lbox}% + \setlength{\LettrineHeight}{\ht\L@lbox}% + \setlength{\LettrineDepth}{\dp\L@lbox}% +% \end{macrocode} +% +% \changes{v2.0}{2018/07/21}{Add informations about targeted +% and actual height of the initial to the .log file.} +% +% print some informations about accuracy to the log file, +% \begin{macrocode} + \begingroup + \def\IeC##1{##1}% + \@tempdima=\L@oversize pt\relax + \PackageInfo{lettrine.sty}% + {Targeted height = \the\L@target@tht\MessageBreak + (no accent, loversize=0),\MessageBreak + Lettrine height = \the\LettrineHeight\space (#2)% + \ifdim\@tempdima=\z@\else\space loversize=\L@oversize\fi;% + \MessageBreak reported}% + \endgroup +% \end{macrocode} +% and reset |\L@tbox|'s content (mandatory in case +% |realheight=false|): +% +% \changes{v1.6}{2004/05/22}{Add braces around \#3 to allow % commands taking an argument (such as \cs{MakeLowercase}) in % \cs{LettrineTextFont}. Suggested by Philipp Lehman.} % @@ -724,44 +799,32 @@ % \end{macrocode} % % Start a new paragraph, skipping the necessary amount of space -% if the dropped capital sticks out the top of paragraph. +% if the dropped capital sticks out of the top of paragraph. % We use |\L@first| to compute the amount of space to be skipped. -% Again, as |\baselineskip| might be a rubber length, we convert -% it into a `dimen' using |\@tempdima|. % -% \changes{lettrine-0.9}{1998/02/23}{Calculations of length +% \changes{v0.9}{1998/02/23}{Calculations of length % \cs{L@first} changed. Do not `vskip' small lengths ($<$0.2pt), % they are just rounding errors.} % -% \changes{lettrine-1.8}{2015/02/06}{The 0.2pt limit for discarded +% \changes{v1.8}{2015/02/06}{The 0.2pt limit for discarded % vskips is now customisable through \cs{DiscardVskip} and option % `novskip'.} % -% \changes{lettrine-1.2}{2002/03/13}{\cs{baselineskip} may be a +% \changes{v1.2}{2002/03/13}{\cs{baselineskip} may be a % rubber length, we convert it to a dimen.} % +% The basis for |\L@raise| (and |\L@oversize|, see +% |\LettrineFont|) is |\L@target@tht|. +% % \begin{macrocode} - \@tempdima=\baselineskip + \setlength{\L@first}{\LettrineHeight}% + \setlength{\L@lraise}{\L@raise\L@target@tht}% + \addtolength{\L@first}{\L@lraise}% \ifnum\value{L@lines}=1 - \setlength{\L@first}{\ht\L@lbox}% \addtolength{\L@first}{-\ht\L@tbox}% - \setlength{\L@lraise}{\z@}% \else - \setlength{\L@first}{-\value{L@lines}\@tempdima}% - \addtolength{\L@first}{\@tempdima}% - \sbox{\@tempboxa}{\LettrineTextFont x}% - \addtolength{\L@first}{-\ht\@tempboxa}% -% \end{macrocode} -% Now, |\L@first| holds (the opposite of) the raw height of a -% standard dropped capital (like~'X'), excluding the effect of -% |\L@oversize|. This is the basis for |\L@raise| -% (and |\L@oversize|, see |\LettrineFont|). -% \begin{macrocode} - \setlength{\L@lraise}{-\L@raise\L@first}% - \addtolength{\L@first}{\L@lraise}% - \addtolength{\L@first}{\ht\L@lbox}% - \addtolength{\L@lraise}{-\value{L@lines}\@tempdima}% - \addtolength{\L@lraise}{\@tempdima}% + \addtolength{\L@first}{-\L@target@tht}% + \addtolength{\L@lraise}{-\L@target@dp}% \fi \par % \end{macrocode} @@ -782,10 +845,9 @@ \advance\@tempcnta by 1 \advance\L@first by -\@tempdima \repeat - \vskip\@tempcnta\baselineskip - \else - \vskip\L@first + \L@first=\@tempcnta\baselineskip \fi + \vskip\L@first \fi % \end{macrocode} % Again, we (mis)use the length |\L@first| to compute the width of @@ -807,12 +869,12 @@ \addtolength{\L@next}{-\L@Nindent}% % \end{macrocode} % -% \changes{lettrine-1.1}{1999/08/18}{Add \cs{rightmargin} to +% \changes{v1.1}{1999/08/18}{Add \cs{rightmargin} to % \cs{L@Pindent} for \cs{Lettrine} to work properly in quote, % quotation, abstract environments\dots{} but do not change % \cs{linewidth} which is set by these environments.} % -% \changes{lettrine-1.4}{2002/10/26}{\cs{lettrine} still didn't +% \changes{v1.4}{2002/10/26}{\cs{lettrine} still didn't % work properly in quote, quotation, abstract environments, % pointed out by Matthias C.\ Schmidt. \cs{rightmargin} was added % too early to \cs{L@Nindent}, thus making \cs{\L@next} too short @@ -826,18 +888,10 @@ \addtolength{\L@Pindent}{\rightmargin}% \addtolength{\L@Nindent}{\rightmargin}% % \end{macrocode} -% \changes{lettrine-1.65}{2014/09/04}{Measure and store the lettrine's -% final dimensions.} -% Store the lettrine's final dimensions: -% \begin{macrocode} - \setlength{\LettrineWidth}{\wd\L@lbox}% - \setlength{\LettrineHeight}{\ht\L@lbox}% - \setlength{\LettrineDepth}{\dp\L@lbox}% -% \end{macrocode} % Now, set up the shape of the new paragraph (designed by % |\parshape|). % -% \changes{lettrine-1.9}{2015/08/31}{\cs{theL@depth} changed to +% \changes{v1.9}{2015/08/31}{\cs{theL@depth} changed to % \cs{value\{L@depth\}}.} % % \begin{macrocode} @@ -854,7 +908,7 @@ \noindent \parshape=\L@parshape\relax % \end{macrocode} -% \changes{lettrine-1.64}{2013/03/14}{Remove \$ around \cs{smash} +% \changes{v1.64}{2013/03/14}{Remove \$ around \cs{smash} % and add \cs{relax}. Bug pointed out by David Monniaux. % Correction by Enrico Gregorio.} % Write the dropped capital into the left margin, and wrap @@ -887,11 +941,11 @@ %% lettrine.cfg: configuration file for lettrine.sty %% %% If you want to customize lettrine, please *do not* hack into the -%% code, copy this file to the directory where lettrine.sty lies -%% and customize it as you like. +%% code, copy this file to your working directory and customize the +%% copy as you like. %% -%% Uncomment these lines and change the parameters' values to fit -%% your needs (see lettrine.dtx). +%% Uncomment any of these lines and change the parameters' values +%% to fit your needs (see lettrine.dtx). %% %%\setcounter{DefaultLines}{2} %%\setcounter{DefaultDepth}{0} @@ -912,13 +966,17 @@ %%\LettrineOnGridfalse %%\LettrineRealHeightfalse %% -%% Theses are *commands* (value=string, only its height matters): -%%\renewcommand*{\LettrineTestString}{ABCDEFGHIJKLMNOQPRSTUVWXYZ} +%% Theses are *commands* (value=string, only height matters): +%%\renewcommand*{\LettrineTestString}{EFTZ} %%\renewcommand*{\LettrineSecondString}{x} +%% For backward compatibility with versions 1.63 to 1.9: +%%\renewcommand*{\LettrineTestString}{ABCDEFGHIJKLMNOQPRSTUVWXYZ} +%% For backward compatibility with versions up to 1.62: +%%\renewcommand*{\LettrineTestString}{X} %% %% In case you want to set parameters for some letters %% in file `optfile.cfl' -%%\renewcommand{\DefaultOptionsFile}{optfile.cfl} +%% \renewcommand{\DefaultOptionsFile}{optfile.cfl} % \end{macrocode} % \iffalse % diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.ins b/Master/texmf-dist/source/latex/lettrine/lettrine.ins index fdb3abfaa19..63f5f435bbc 100644 --- a/Master/texmf-dist/source/latex/lettrine/lettrine.ins +++ b/Master/texmf-dist/source/latex/lettrine/lettrine.ins @@ -1,5 +1,5 @@ %% -%% Copyright (C) 1999-2015 Daniel Flipo. +%% Copyright (C) 1999-2018 Daniel Flipo. %% %% This program can be distributed and/or modified under the terms %% of the LaTeX Project Public License either version 1.3c of this @@ -32,27 +32,26 @@ \fi} \keepsilent +\askforoverwritefalse \usedir{tex/latex/lettrine} \generate{\file{lettrine.sty}{\from{lettrine.dtx}{sty}} - } - -\nopreamble -\generate{\file{lettrine.cfg}{\from{lettrine.dtx}{cfg}} + \nopreamble + \file{lettrine.cfg}{\from{lettrine.dtx}{cfg}} } \Msg{***********************************************************} \Msg{*} -\Msg{* To finish the installation you have to move lettrine.sty} -\Msg{* lettrine.cfg and the *.cfl files from the contrib} -\Msg{* directory into a directory searched by TeX.} +\Msg{* To finish the installation you have to move} +\Msg{* lettrine.sty, lettrine.cfg and the *.cfl files generated} +\Msg{* from contrib.ins into a directory searched by TeX.} \Msg{*} \Msg{* If you want to change the default settings, uncomment the} \Msg{* lines you want in file lettrine.cfg and customize them.} \Msg{*} -\Msg{* To produce the documentation} -\Msg{* run lettrine.dtx through LaTeX or pdfLaTeX.} +\Msg{* To produce the documentation run lettrine.dtx} +\Msg{* through LuaLaTeX.} \Msg{*} \Msg{* Happy TeXing!} \Msg{*} diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg b/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg index 4860d4df3f3..c84e0004a8b 100644 --- a/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg @@ -1,11 +1,11 @@ %% lettrine.cfg: configuration file for lettrine.sty %% %% If you want to customize lettrine, please *do not* hack into the -%% code, copy this file to the directory where lettrine.sty lies -%% and customize it as you like. +%% code, copy this file to your working directory and customize the +%% copy as you like. %% -%% Uncomment these lines and change the parameters' values to fit -%% your needs (see lettrine.dtx). +%% Uncomment any of these lines and change the parameters' values +%% to fit your needs (see lettrine.dtx). %% %%\setcounter{DefaultLines}{2} %%\setcounter{DefaultDepth}{0} @@ -26,13 +26,17 @@ %%\LettrineOnGridfalse %%\LettrineRealHeightfalse %% -%% Theses are *commands* (value=string, only its height matters): -%%\renewcommand*{\LettrineTestString}{ABCDEFGHIJKLMNOQPRSTUVWXYZ} +%% Theses are *commands* (value=string, only height matters): +%%\renewcommand*{\LettrineTestString}{EFTZ} %%\renewcommand*{\LettrineSecondString}{x} +%% For backward compatibility with versions 1.63 to 1.9: +%%\renewcommand*{\LettrineTestString}{ABCDEFGHIJKLMNOQPRSTUVWXYZ} +%% For backward compatibility with versions up to 1.62: +%%\renewcommand*{\LettrineTestString}{X} %% %% In case you want to set parameters for some letters %% in file `optfile.cfl' -%%\renewcommand{\DefaultOptionsFile}{optfile.cfl} +%% \renewcommand{\DefaultOptionsFile}{optfile.cfl} \endinput %% %% End of file `lettrine.cfg'. diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty index 281acaf0755..567b7fcaf16 100644 --- a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{lettrine.sty} - [2015/08/31 v1.9 (Daniel Flipo)] + [2018/07/21 v2.0 (Daniel Flipo)] \NeedsTeXFormat{LaTeX2e}[1999/12/01] \RequirePackage{keyval} \newcounter{DefaultLines} @@ -56,6 +56,12 @@ \newdimen\L@slope \newdimen\L@height \newdimen\L@novskip +\newdimen\L@target@ht +\newdimen\L@target@dp +\newdimen\L@target@tht +\newdimen\LettrineWidth +\newdimen\LettrineHeight +\newdimen\LettrineDepth \newcommand*{\L@file}{} \newcommand*{\L@hang}{} \newcommand*{\L@oversize}{} @@ -66,19 +72,25 @@ \newif\ifL@realh \newcommand*{\LettrineTextFont}{\scshape} \def\Lettrine@height{% - \@tempdima=\baselineskip - \setlength{\L@height}{\value{L@lines}\@tempdima}% - \ifnum\value{L@lines}>1 - \addtolength{\L@height}{-\@tempdima}% - \fi \ifvoid\L@tbox \sbox{\L@tbox}{\LettrineTextFont{\LettrineSecondString}}% \fi - \addtolength{\L@height}{\ht\L@tbox}% - \addtolength{\L@height}{\L@oversize\L@height}% + \global\setlength{\L@target@ht}{\ht\L@tbox}% + \@tempdima=\baselineskip + \global\setlength{\L@target@dp}{\value{L@lines}\@tempdima}% + \ifnum\value{L@lines}>1 + \global\addtolength{\L@target@dp}{-\@tempdima}% + \else + \global\addtolength{\L@target@ht}{\L@target@dp}% + \global\setlength{\L@target@dp}{0pt}% + \fi + \global\setlength{\L@target@tht}{\L@target@ht}% + \global\addtolength{\L@target@tht}{\L@target@dp}% + \setlength{\L@height}{\L@target@tht}% + \addtolength{\L@height}{\L@oversize\L@target@tht}% } \newcommand*{\LettrineFontHook}{} -\newcommand*{\LettrineTestString}{ABCDEFGHIJKLMNOQPRSTUVWXYZ} +\newcommand*{\LettrineTestString}{EFTZ} \newcommand*{\LettrineSecondString}{x} \newcommand*{\LettrineFont}{% \Lettrine@height @@ -86,8 +98,8 @@ \selectfont \LettrineTestString}% \@tempcntb=\ht\@tempboxa \@tempcnta=\L@height - \multiply\@tempcnta by 100 - \divide\@tempcntb by 100 + \multiply\@tempcnta by 50 + \divide\@tempcntb by 200 \divide\@tempcnta by \@tempcntb \advance\@tempcnta by -9999 \ifnum\@tempcnta>0 @@ -117,9 +129,6 @@ \define@key{L}{realheight}[true]{\csname L@realh#1\endcsname} \define@key{L}{novskip}{\setlength{\L@novskip}{#1}} \newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}} -\newdimen\LettrineWidth -\newdimen\LettrineHeight -\newdimen\LettrineDepth \def\lettrine{\@ifnextchar[\@lettrine{\@lettrine[]}} \def\@lettrine[#1]#2#3{% \setcounter{L@lines}{\value{DefaultLines}}% @@ -180,22 +189,28 @@ \else \sbox{\L@lbox}{\LettrineFont #2}% \fi + \setlength{\LettrineWidth}{\wd\L@lbox}% + \setlength{\LettrineHeight}{\ht\L@lbox}% + \setlength{\LettrineDepth}{\dp\L@lbox}% + \begingroup + \def\IeC##1{##1}% + \@tempdima=\L@oversize pt\relax + \PackageInfo{lettrine.sty}% + {Targeted height = \the\L@target@tht\MessageBreak + (no accent, loversize=0),\MessageBreak + Lettrine height = \the\LettrineHeight\space (#2)% + \ifdim\@tempdima=\z@\else\space loversize=\L@oversize\fi;% + \MessageBreak reported}% + \endgroup \sbox{\L@tbox}{\LettrineTextFont{#3}}% - \@tempdima=\baselineskip + \setlength{\L@first}{\LettrineHeight}% + \setlength{\L@lraise}{\L@raise\L@target@tht}% + \addtolength{\L@first}{\L@lraise}% \ifnum\value{L@lines}=1 - \setlength{\L@first}{\ht\L@lbox}% \addtolength{\L@first}{-\ht\L@tbox}% - \setlength{\L@lraise}{\z@}% \else - \setlength{\L@first}{-\value{L@lines}\@tempdima}% - \addtolength{\L@first}{\@tempdima}% - \sbox{\@tempboxa}{\LettrineTextFont x}% - \addtolength{\L@first}{-\ht\@tempboxa}% - \setlength{\L@lraise}{-\L@raise\L@first}% - \addtolength{\L@first}{\L@lraise}% - \addtolength{\L@first}{\ht\L@lbox}% - \addtolength{\L@lraise}{-\value{L@lines}\@tempdima}% - \addtolength{\L@lraise}{\@tempdima}% + \addtolength{\L@first}{-\L@target@tht}% + \addtolength{\L@lraise}{-\L@target@dp}% \fi \par \ifdim\L@first>\L@novskip @@ -208,10 +223,9 @@ \advance\@tempcnta by 1 \advance\L@first by -\@tempdima \repeat - \vskip\@tempcnta\baselineskip - \else - \vskip\L@first + \L@first=\@tempcnta\baselineskip \fi + \vskip\L@first \fi \setlength{\L@Pindent}{\wd\L@lbox}% \addtolength{\L@Pindent}{-\L@hang\wd\L@lbox}% @@ -225,9 +239,6 @@ \addtolength{\L@next}{-\L@Nindent}% \addtolength{\L@Pindent}{\rightmargin}% \addtolength{\L@Nindent}{\rightmargin}% - \setlength{\LettrineWidth}{\wd\L@lbox}% - \setlength{\LettrineHeight}{\ht\L@lbox}% - \setlength{\LettrineDepth}{\dp\L@lbox}% \addtocounter{L@lines}{1}% \addtocounter{L@lines}{\value{L@depth}}% \def\L@parshape{\c@L@lines \the\L@Pindent \the\L@first}% diff --git a/Master/texmf-dist/tex/latex/lettrine/optfile.cfl b/Master/texmf-dist/tex/latex/lettrine/optfile.cfl index b41acdb4f38..3803ea3f110 100644 --- a/Master/texmf-dist/tex/latex/lettrine/optfile.cfl +++ b/Master/texmf-dist/tex/latex/lettrine/optfile.cfl @@ -1,29 +1,31 @@ -%%% This is an example of config file *for syntax only*. -%%% Copy it to your document's directory and add -%%% \renewcommand{\DefaultOptionsFile}{optfile.cfl} -%%% to your document's preamble to use it. -%%% -%%% The settings below are just *examples*, they are not meant to be good! -%%% Proper values heavily depend on the font used! -%%% -%%% Letters not listed below, will get either the default parameters, -%%% or those given as optional argument of \lettrine, if any. -%%% -%%% The values of the parameters set in this file can be overridden locally -%%% using the optional argument of \lettrine. - -% A +%% This is an example of config file *for syntax only*. +%% +%% Copy it to your document's directory and add +%% \renewcommand{\DefaultOptionsFile}{optfile.cfl} +%% to your document's preamble to use it. +%% +%% The settings below are just *examples*, they are not meant to be good! +%% Proper values heavily depend on the font used! +%% +%% Letters not listed below, will get either the default parameters, +%% or those given as optional argument of \lettrine, if any. +%% +%% The values of the parameters set in this file can be overridden locally +%% using the optional argument of \lettrine. +%% +%% A \LettrineOptionsFor{A}{slope=0.1\LettrineWidth, findent=-.5em, nindent=.7em} -% Same parameters for \`A +%% Same parameters for \`A \LettrineOptionsFor{\`A}{slope=0.1\LettrineWidth, findent=-.5em, nindent=0.7em} -% C' +%% C' \LettrineOptionsFor{C'}{nindent=-0.5em} -% I and J hang into the margin +%% I and J hang into the margin \LettrineOptionsFor{I}{lhang=1, nindent=0pt} \LettrineOptionsFor{J}{lhang=1, nindent=0pt} -% Q -\LettrineOptionsFor{Q}{loversize=0, lraise=0.1} -% V +%% Q +\LettrineOptionsFor{Q}{loversize=-0.1, lraise=0.1} +%% V \LettrineOptionsFor{V}{slope=-0.1\LettrineWidth, lhang=0.5, nindent=0pt} - \endinput +%% +%% End of file `optfile.cfl'. diff --git a/Master/texmf-dist/tex/latex/lettrine/pacl.cfl b/Master/texmf-dist/tex/latex/lettrine/pacl.cfl index a7c122313fa..f5003b0f4e6 100644 --- a/Master/texmf-dist/tex/latex/lettrine/pacl.cfl +++ b/Master/texmf-dist/tex/latex/lettrine/pacl.cfl @@ -1,29 +1,29 @@ %%% This is file `pacl.cfl'. %%% It is provided under the LPPL. Copyright is hold by Pascal Kockaert. %%% If you modify this file you *MUST* change its name. -%%% + %%% This file contains config values to simplify the use of the %%% ACaslon-SwashItalic (aka pacri8s) font from Adobe %%% with the lettrine package by Daniel Flipo. -%%% + %%% If you want to use this file, your document should contain %%% the two next lines, without the leading percent signs. %%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{pacl}\selectfont} %%% \renewcommand{\DefaultOptionsFile}{pacl.cfl} -%%% + %%% The fontfamily pacl is defined through the file T1pacl.fd. %%% The contents of T1pacl.fd is listed at the end of this file. -%%% + %%% The settings below were defined according to my visual tastes. %%% No mathematical rule based on the metrices was applied. %%% Though the result may not please you, it should be better %%% than the default placement. This said, comments are welcome. -%%% + %%% Comments about this file can be sent to Pascal.Kockaert %%% at the mail server ulb.ac.be. - \ProvidesFile{pacl.cfl}[2003/08/24 v0.1 Pascal Kockaert] + \LettrineOptionsFor{A}{loversize= 0.15,lraise= 0.02,lhang= 0.30,findent= 0.00\LettrineWidth,nindent= 0.50em} \LettrineOptionsFor{B}{loversize= 0.15,lraise= 0.00,lhang= 0.25,findent=-0.05\LettrineWidth,nindent= 0.50em} \LettrineOptionsFor{C}{loversize=-0.10,lraise= 0.25,lhang= 0.05,findent= 0.00\LettrineWidth,nindent= 0.50em} @@ -50,16 +50,18 @@ \LettrineOptionsFor{X}{loversize= 0.15,lraise= 0.00,lhang= 0.45,findent= 0.05\LettrineWidth,nindent= 0.15\LettrineWidth} \LettrineOptionsFor{Y}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent= 0.20\LettrineWidth,nindent= 0.25\LettrineWidth} \LettrineOptionsFor{Z}{loversize= 0.05,lraise= 0.15,lhang= 0.15,findent= 0.00\LettrineWidth,nindent= 0.30\LettrineWidth} -\endinput +\let\EOF\endinput +\EOF +%% The installation of the pacl family can be performed using the +%% fontinst package. +%% You must own the font ACaslon-SwashItalic, that is an AFM and a PFB file +%% which should be renamed as padri8w.afm and padri8w.pfb. -% The installation of the pacl family can be performed using the fontinst package. -% You must own the font ACaslon-SwashItalic, that is an AFM and a PFB file -% which should be renamed as padri8w.afm and padri8w.pfb. -% -% You should process the file Makepacl.tex (see below) through TeX, -% and follow the instructions of the fontinst manual to finish the install. -% The file T1pacl.fd should be defined as below and put with other local FD files. +%% You should process the file Makepacl.tex (see below) through TeX, +%% and follow the instructions of the fontinst manual to finish the install. +%% The file T1pacl.fd should be defined as below and put with other local +%% FD files. %%% File Makepacl.tex \input fontinst.sty @@ -71,12 +73,11 @@ \bye %%% End of file Makepacl.tex -% The pacl family is defined by the file T1pacl.fd, as follows +%%% The pacl family is defined by the file T1pacl.fd, as follows %%% File T1pacl.fd -%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY +%%% THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{t1pacl.fd}[2003/08/24 v1.0 Pascal Kockaert] \DeclareFontFamily{T1}{pacl}{} \DeclareFontShape{T1}{pacl}{m}{n}{<->pacri9s}{} -\endinput %%% End of file T1pacl.fd diff --git a/Master/texmf-dist/tex/latex/lettrine/padl.cfl b/Master/texmf-dist/tex/latex/lettrine/padl.cfl index 784bebc935e..79e90b96aec 100644 --- a/Master/texmf-dist/tex/latex/lettrine/padl.cfl +++ b/Master/texmf-dist/tex/latex/lettrine/padl.cfl @@ -1,29 +1,27 @@ %%% This is file `padl.cfl'. %%% It is provided under the LPPL. Copyright is hold by Pascal Kockaert. %%% If you modify this file you *MUST* change its name. -%%% + %%% This file contains config values to simplify the use of the %%% AGaramondAlt-Italic (aka padri8w) font from Adobe %%% with the lettrine package by Daniel Flipo. -%%% + %%% If you want to use this file, your document should contain %%% the two next lines, without the leading percent signs. %%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{padl}\selectfont} %%% \renewcommand{\DefaultOptionsFile}{padl.cfl} -%%% + %%% The fontfamily padl is defined through the file T1padl.fd. %%% The contents of T1padl.fd is listed at the end of this file. -%%% + %%% The settings below were defined according to my visual tastes. %%% No mathematical rule based on the metrices was applied. %%% Though the result may not please you, it should be better %%% than the default placement. This said, comments are welcome. -%%% + %%% Comments about this file can be sent to Pascal.Kockaert %%% at the mail server ulb.ac.be. - - \ProvidesFile{padl.cfl}[2003/08/24 v1.0 Pascal Kockaert] \LettrineOptionsFor{A}{loversize= 0.05,lraise= 0.10,lhang= 0.40,findent= 0.000\LettrineWidth,nindent= 0.50em} @@ -52,16 +50,19 @@ \LettrineOptionsFor{X}{loversize= 0.10,lraise= 0.00,lhang= 0.40,findent= 0.040\LettrineWidth,nindent= 0.20\LettrineWidth} \LettrineOptionsFor{Y}{loversize= 0.10,lraise= 0.00,lhang= 0.20,findent= 0.100\LettrineWidth,nindent= 0.20\LettrineWidth} \LettrineOptionsFor{Z}{loversize=-0.05,lraise= 0.25,lhang= 0.00,findent= 0.050\LettrineWidth,nindent= 0.55\LettrineWidth} -\endinput +\let\EOF\endinput +\EOF +%% The installation of the padl family can be performed using the +%% fontinst package. +%% You must own the font AGaramondAlt-Italic, that is an AFM and a PFB +%% file which should be renamed as padri8w.afm and padri8w.pfb. -% The installation of the padl family can be performed using the fontinst package. -% You must own the font AGaramondAlt-Italic, that is an AFM and a PFB file -% which should be renamed as padri8w.afm and padri8w.pfb. -% -% You should process the file Makepadl.tex (see below) through TeX, -% and follow the instructions of the fontinst manual to finish the install. -% The file T1padl.fd should be defined as below and put with other local FD files. +%% You should process the file Makepadl.tex (see below) through TeX, +%% and follow the instructions of the fontinst manual to finish the +%% install. +%% The file T1padl.fd should be defined as below and put with other +%% local FD files. %%% File Makepadl.tex \input fontinst.sty @@ -74,12 +75,11 @@ \bye %%% End of file Makepadl.tex -% The padl family is defined by the file T1padl.fd, as follows +%% The padl family is defined by the file T1padl.fd, as follows %%% File T1padl.fd -%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY +%%% THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{t1padl.fd}[2003/08/24 v0.1 Pascal Kockaert] \DeclareFontFamily{T1}{padl}{} \DeclareFontShape{T1}{padl}{m}{n}{<->padw9w}{} -\endinput %%% End of file T1padl.fd diff --git a/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl b/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl index 77799687805..334f8805c1c 100644 --- a/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl +++ b/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl @@ -1,21 +1,22 @@ %%% This is file `pzc2.cfl'. %%% It is provided under the LPPL. Copyright is held by Kevin M. Dunn. %%% If you modify this file you *MUST* change its name. -%%% + %%% This file contains config values to simplify the use of the %%% Zapf-Chancery (aka pzc) font with the lettrine package by Daniel Flipo. %%% This file provides the parameters for 2 DefaultLines. -%%% + %%% If you want to use this file, your document should contain %%% the next three lines, without the leading percent signs. %%% \setcounter{DefaultLines}{2} %%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{pzc}\selectfont} %%% \renewcommand{\DefaultOptionsFile}{pzc2.cfl} -%%% + %%% Comments about this file can be sent to Kevin Dunn %%% (cavema2 at cavemanchemistry.com) -%%% + \ProvidesFile{pzc2.cfl}[2006/03/19 v0.1 Kevin M. Dunn] + \LettrineOptionsFor{A}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.25\LettrineWidth} \LettrineOptionsFor{B}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.08\LettrineWidth} \LettrineOptionsFor{C}{loversize= 0.35,lraise= 0.10,lhang= 0.35,findent= 0.00\LettrineWidth,nindent= 0.28\LettrineWidth} @@ -43,3 +44,5 @@ \LettrineOptionsFor{Y}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.05\LettrineWidth} \LettrineOptionsFor{Z}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.00\LettrineWidth,nindent= 0.30\LettrineWidth} \endinput +%% +%% End of file `pzc2.cfl'. diff --git a/Master/texmf-dist/tex/latex/lettrine/pzc3.cfl b/Master/texmf-dist/tex/latex/lettrine/pzc3.cfl index a67ba9b5b0e..125c07ac4e7 100644 --- a/Master/texmf-dist/tex/latex/lettrine/pzc3.cfl +++ b/Master/texmf-dist/tex/latex/lettrine/pzc3.cfl @@ -1,21 +1,22 @@ -%%% This is file `pzc2.cfl'. +%%% This is file `pzc3.cfl'. %%% It is provided under the LPPL. Copyright is held by Kevin M. Dunn. %%% If you modify this file you *MUST* change its name. -%%% + %%% This file contains config values to simplify the use of the %%% Zapf-Chancery (aka pzc) font with the lettrine package by Daniel Flipo. %%% This file provides the parameters for 3 DefaultLines. -%%% + %%% If you want to use this file, your document should contain %%% the next three lines, without the leading percent signs. %%% \setcounter{DefaultLines}{3} %%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{pzc}\selectfont} %%% \renewcommand{\DefaultOptionsFile}{pzc3.cfl} -%%% + %%% Comments about this file can be sent to Kevin Dunn %%% (cavema2 at cavemanchemistry.com) \ProvidesFile{pzc3.cfl}[2006/03/19 v0.1 Kevin M. Dunn] + \LettrineOptionsFor{A}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.25\LettrineWidth} \LettrineOptionsFor{B}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.08\LettrineWidth,slope=-0.08\LettrineWidth} \LettrineOptionsFor{C}{loversize= 0.35,lraise= 0.10,lhang= 0.35,findent=0.00\LettrineWidth,nindent= 0.28\LettrineWidth} @@ -43,3 +44,5 @@ \LettrineOptionsFor{Y}{loversize= 0.30,lraise= 0.10,lhang= 0.40,findent=0.10\LettrineWidth,nindent= 0.00\LettrineWidth,slope=-0.10\LettrineWidth} \LettrineOptionsFor{Z}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.00\LettrineWidth,nindent= 0.30\LettrineWidth} \endinput +%% +%% End of file `pzc3.cfl'. diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 2c511691562..eea913db950 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2558,10 +2558,11 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'luaindex' => 'lualatex --shell-escape', 'luatexja' => 'lualatex', 'mandi' => 'pdflatex-preserve-pdf', + 'mathfont' => 'tex', 'mcmthesis' => 'tex', # requires interaction 'mversion' => 'latex', # requires interaction 'minitoc' => 'latex', # requires interaction and 1000q instead of 10q - 'mylatexformat'=> 'tex', + 'mylatexformat'=> 'pdflatex', 'nameauth' => 'pdflatex-preserve-pdf', 'notespages' => 'latex', # requires interaction 'nwejm' => 'tex', -- cgit v1.2.3