From e92e98a3e58920b1acb6aab670b6ea08279cb2f9 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:29:23 +0000 Subject: [PATCH] lilypond-1.1.5 --- TODO | 8 +- buildscripts/tfmtoafm.sh | 38 ++++++++ input/test/alphabet.ly | 122 +++++++++++++++++++++++ input/test/stars-and-stripes.ly | 23 +++-- input/test/vertical-text.ly | 10 ++ lily/text-def.cc | 21 ++-- lily/text-item.cc | 3 +- mf/GNUmakefile | 7 +- mf/cmr10.afm.in | 133 ++++++++++++++++++++++++++ mf/cmr8.afm.in | 133 ++++++++++++++++++++++++++ mf/cmti10.afm.in | 133 ++++++++++++++++++++++++++ mf/cmti8.afm.in | 133 ++++++++++++++++++++++++++ stepmake/stepmake/metafont-rules.make | 3 + tex/lily-ps-defs.tex | 75 ++++++++++----- 14 files changed, 782 insertions(+), 60 deletions(-) create mode 100644 buildscripts/tfmtoafm.sh create mode 100644 input/test/alphabet.ly create mode 100644 input/test/vertical-text.ly create mode 100644 mf/cmr10.afm.in create mode 100644 mf/cmr8.afm.in create mode 100644 mf/cmti10.afm.in create mode 100644 mf/cmti8.afm.in diff --git a/TODO b/TODO index a94bbad6d9..6b8dc778be 100644 --- a/TODO +++ b/TODO @@ -8,11 +8,13 @@ grep for TODO and ugh/ugr/urg BUGS: + * gallina barlines. + * latex bla.tex broken (titles / \lilyfooter stuff?) - * --safe: disallow backslashes, disallow \include. + * acc placement: \score { \notes \key G; \transpose\notes { a b c } } - * fix rounding stuff in number->string + * --safe: disallow backslashes, disallow \include. * msgfmt -o check? @@ -135,7 +137,7 @@ BUGS: * fix weird behaviour when .AFMs not found. - * Xdvi zooming ?! + * Xdvi zooming ?! Try to understand GS garbage collection. gs: Error: /undefined in draw_beam gs: Operand stack: diff --git a/buildscripts/tfmtoafm.sh b/buildscripts/tfmtoafm.sh new file mode 100644 index 0000000000..e29420dbcc --- /dev/null +++ b/buildscripts/tfmtoafm.sh @@ -0,0 +1,38 @@ +#!@SHELL@ +# tfmtoafm.sh --urg + +if [ $# -ne 1 ]; then + echo "Usage: tfmtoafm FONT" + echo + echo "example: tfmtoafm cmr10" + exit 2 +fi + +font=$1 +afm=$1.afm +fontfile=`locate $1.tfm` +t1=/tmp/tfmtoafm1-$$ +t2=/tmp/tfmtoafm2-$$ +rm -f $t1 $t2 $font $afm + +for i in `seq 1 127`; do printf "%d Character-%d\n" $i $i >> $t1; done +tfmtodit $fontfile $t1 $font +rm $t1 +tail -127 $font | cut -f 1-2 > $t1 +cat $t1 | cut -d, -f 1-2 > $t2 +rm $t1 +nl -ba $t2 | sed "s/,/ /g" | sed "s/^ *//" | sed "s/$/ /" | sed "s/^[0-9]*/C &;/" | sed "s/\([0-9]\)\([0-9][0-9][0-9][0-9][0-9]\) /\1.\2 /"g | sed "s/-[0-9]*/&; B 0.00 0.00 /" > $t1 +cat > $afm <> $afm +cat $t1 >> $afm +cat >> $afm < + \paper { + castingalgorithm = \Wordwrap; + linewidth = 40.\mm; + } +} diff --git a/input/test/stars-and-stripes.ly b/input/test/stars-and-stripes.ly index 289fc5acdd..8c9f99f515 100644 --- a/input/test/stars-and-stripes.ly +++ b/input/test/stars-and-stripes.ly @@ -1,6 +1,7 @@ %{ Converted from star.mup with the aid of mup-to-ly.py -http://www.Arkkra.com/.../star.ps +http://www.Arkkra.com/doc/star.html +http://www.Arkkra.com/doc/star.ps %} \header{ title="The Star Spangled Banner"; @@ -42,20 +43,20 @@ $staff2_voice_2 = \notes { a4. a8 a,4 d2 s4 } $text1 = \lyrics{ - Oh say. can you see, by the dawn's ear- ly light What_so proud- ly we hailed, - At the twi- light's last gleam- ing. Whose broad + Oh4 say. can you see,2 by8. the16 dawn's4 ear- ly light2 What8 so8 proud-4. ly8 we4 hailed,2 + At8. the16 twi-4 light's last gleam- ing. Whose8. broad16 } $text2 = \lyrics{ - _ stripes and bright stars, through the per- il- ous fight, O'er the ram- parts - we watched, were so gal- lant- ly _ _ _ + _4 stripes and bright stars,2 through8 the8 per-4 il- ous fight,2 O'er8 the8 ram-4. parts8 + we4 watched,2 were8. so16 gal-4 lant- ly _ _ _ } $text3 = \lyrics{ - stream- ing. And the rock- ets' red glare, the bombs burst- ing in air, gave - proof through the night that our flag was still there, _ Oh say, does that - star- span- gled ban- ner yet wave, _ O'er the land _ of_the free and_the - home of the brave. + stream-4 ing. And8. the16 rock-4 ets' red glare,2 the8 bombs8 burst-4 ing in air,2 gave4 + proof4. through8 the4 night2 that8. our16 flag4 was still there,2 Oh4 say, does that + star- span- gled ban- ner yet wave,2 O'er8. the16 land2 of8 the8 free2 and8 the8 + home4. of8 the4 brave.2 } global = \notes { @@ -76,7 +77,9 @@ global = \notes { \score{ \type GrandStaff < \type Staff=staffA < - \global + % urg, ugly bug + %\global + \notes \transpose c'' \global \notes \transpose c'' {\voiceone \$staff1_voice_1 } \notes \transpose c'' {\voicetwo \$staff1_voice_2 } > diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly new file mode 100644 index 0000000000..4d1d3d59e1 --- /dev/null +++ b/input/test/vertical-text.ly @@ -0,0 +1,10 @@ +\score{ + < + \type Staff = o \notes\relative c,,, { \stemdown [c8 c c c] } + \type Lyrics \lyrics{ BLA bla } + \type Staff = t \notes\relative c''''' { \stemup [c8 c c c] } + > + \paper{ + castingalgorithm = \Wordwrap; + } +} diff --git a/lily/text-def.cc b/lily/text-def.cc index 06eccd3fe6..921d0ac6dc 100644 --- a/lily/text-def.cc +++ b/lily/text-def.cc @@ -6,12 +6,12 @@ (c) 1996, 1997--1998 Han-Wen Nienhuys */ +#include #include "debug.hh" #include "lookup.hh" #include "paper-def.hh" #include "molecule.hh" #include "text-def.hh" -#include Direction Text_def::staff_dir () const @@ -24,17 +24,7 @@ Text_def::staff_dir () const Real Text_def::guess_width_f(Atom& a) const { - // Count each TeX command as one character, ugh - int index, length=0; - int total_length=text_str_.length_i(); - const char* str=text_str_.ch_C(); - for (index=0;indexlookup_l(0)->text (style_str_, text_str_); a.translate_axis (-(align_dir_ + 1)* guess_width_f (a) / 2, X_AXIS); + // urg 1/1 is too much; see input/test/vertical-text.ly + a.translate_axis (a.dim_.y ().length () * 9 / 10, Y_AXIS); return a; } diff --git a/lily/text-item.cc b/lily/text-item.cc index 35dcbdb49f..f9fca7840e 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -73,10 +73,9 @@ Text_item::brew_molecule_p () const Molecule* mol_p = new Molecule (a); if (dir_<0) // should do something better anyway. - mol_p->translate_axis (-mol_p->extent ().y ().left , Y_AXIS); + mol_p->translate_axis (mol_p->extent ().y ().left , Y_AXIS); mol_p->translate_axis (coordinate_offset_f_, Y_AXIS); - return mol_p; } diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 88c89cdeff..984dc63710 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -6,19 +6,18 @@ STEPMAKE_TEMPLATES=metafont metapost install install-out EXTRA_DIST_FILES += TODO README feta.mp mfplain.ini - FET_FILES = $(wildcard feta[0-9]*.mf) LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly)) LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log)) TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex)) -AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) +AFM_IN_FILES = $(wildcard *.afm.in) +AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) \ + $(addprefix $(outdir)/, $(AFM_IN_FILES:.in=)) XPM_FONTS = feta20 ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) -OUT_DIST_FILES += $(AFM_FILES) - #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" INSTALLATION_DIR=$(datadir)/mf/ INSTALLATION_FILES=$(MF_FILES) diff --git a/mf/cmr10.afm.in b/mf/cmr10.afm.in new file mode 100644 index 0000000000..df080fdfd3 --- /dev/null +++ b/mf/cmr10.afm.in @@ -0,0 +1,133 @@ +FontName cmr +StartFontMetrics +StartCharMetrics +C 0; Character-0; B 0.00 0.00 8.73816 7.16526 +C 1; Character-1; B 0.00 0.00 8.73816 7.16526 +C 2; Character-2; B 0.00 0.00 8.15562 7.16526 +C 3; Character-3; B 0.00 0.00 7.28179 7.16526 +C 4; Character-4; B 0.00 0.00 6.99053 7.16526 +C 5; Character-5; B 0.00 0.00 7.86434 7.16526 +C 6; Character-6; B 0.00 0.00 7.57307 7.16526 +C 7; Character-7; B 0.00 0.00 8.15562 7.16526 +C 8; Character-8; B 0.00 0.00 7.57307 7.16526 +C 9; Character-9; B 0.00 0.00 8.15562 7.16526 +C 10; Character-10; B 0.00 0.00 7.57307 7.16526 +C 11; Character-11; B 0.00 0.00 6.11672 7.28178 +C 12; Character-12; B 0.00 0.00 5.82544 7.28178 +C 13; Character-13; B 0.00 0.00 5.82544 7.28178 +C 14; Character-14; B 0.00 0.00 8.73816 7.28178 +C 15; Character-15; B 0.00 0.00 8.73816 7.28178 +C 16; Character-16; B 0.00 0.00 2.91272 4.51470 +C 17; Character-17; B 0.00 0.00 3.20400 4.51470 +C 18; Character-18; B 0.00 0.00 5.24290 7.28178 +C 19; Character-19; B 0.00 0.00 5.24290 7.28178 +C 20; Character-20; B 0.00 0.00 5.24290 6.59002 +C 21; Character-21; B 0.00 0.00 5.24290 7.28178 +C 22; Character-22; B 0.00 0.00 5.24290 5.95357 +C 23; Character-23; B 0.00 0.00 7.86434 7.28178 +C 24; Character-24; B 0.00 0.00 4.66035 0 +C 25; Character-25; B 0.00 0.00 5.24291 7.28178 +C 26; Character-26; B 0.00 0.00 7.57307 4.51470 +C 27; Character-27; B 0.00 0.00 8.15562 4.51470 +C 28; Character-28; B 0.00 0.00 5.24290 5.53416 +C 29; Character-29; B 0.00 0.00 9.46634 7.16526 +C 30; Character-30; B 0.00 0.00 10.63142 7.16526 +C 31; Character-31; B 0.00 0.00 8.15562 7.67499 +C 32; Character-32; B 0.00 0.00 2.91272 4.51470 +C 33; Character-33; B 0.00 0.00 2.91272 7.28178 +C 34; Character-34; B 0.00 0.00 5.24290 7.28178 +C 35; Character-35; B 0.00 0.00 8.73816 7.28178 +C 36; Character-36; B 0.00 0.00 5.24290 7.86432 +C 37; Character-37; B 0.00 0.00 8.73816 7.86432 +C 38; Character-38; B 0.00 0.00 8.15562 7.28178 +C 39; Character-39; B 0.00 0.00 2.91272 7.28178 +C 40; Character-40; B 0.00 0.00 4.07781 7.86432 +C 41; Character-41; B 0.00 0.00 4.07781 7.86432 +C 42; Character-42; B 0.00 0.00 5.24290 7.86432 +C 43; Character-43; B 0.00 0.00 8.15562 6.11670 +C 44; Character-44; B 0.00 0.00 2.91272 1.10683 +C 45; Character-45; B 0.00 0.00 3.49526 4.51470 +C 46; Character-46; B 0.00 0.00 2.91272 1.10683 +C 47; Character-47; B 0.00 0.00 5.24290 7.86432 +C 48; Character-48; B 0.00 0.00 5.24290 6.75749 +C 49; Character-49; B 0.00 0.00 5.24290 6.75749 +C 50; Character-50; B 0.00 0.00 5.24290 6.75749 +C 51; Character-51; B 0.00 0.00 5.24290 6.75749 +C 52; Character-52; B 0.00 0.00 5.24290 6.75749 +C 53; Character-53; B 0.00 0.00 5.24290 6.75749 +C 54; Character-54; B 0.00 0.00 5.24290 6.75749 +C 55; Character-55; B 0.00 0.00 5.24290 6.75749 +C 56; Character-56; B 0.00 0.00 5.24290 6.75749 +C 57; Character-57; B 0.00 0.00 5.24290 6.75749 +C 58; Character-58; B 0.00 0.00 2.91272 4.51470 +C 59; Character-59; B 0.00 0.00 2.91272 4.51470 +C 60; Character-60; B 0.00 0.00 2.91272 5.24288 +C 61; Character-61; B 0.00 0.00 8.15562 3.84696 +C 62; Character-62; B 0.00 0.00 4.95163 5.24288 +C 63; Character-63; B 0.00 0.00 4.95163 7.28178 +C 64; Character-64; B 0.00 0.00 8.15562 7.28178 +C 65; Character-65; B 0.00 0.00 7.86434 7.16526 +C 66; Character-66; B 0.00 0.00 7.42744 7.16526 +C 67; Character-67; B 0.00 0.00 7.57307 7.16526 +C 68; Character-68; B 0.00 0.00 8.00998 7.16526 +C 69; Character-69; B 0.00 0.00 7.13616 7.16526 +C 70; Character-70; B 0.00 0.00 6.84490 7.16526 +C 71; Character-71; B 0.00 0.00 8.22843 7.16526 +C 72; Character-72; B 0.00 0.00 7.86434 7.16526 +C 73; Character-73; B 0.00 0.00 3.78653 7.16526 +C 74; Character-74; B 0.00 0.00 5.38853 7.16526 +C 75; Character-75; B 0.00 0.00 8.15562 7.16526 +C 76; Character-76; B 0.00 0.00 6.55362 7.16526 +C 77; Character-77; B 0.00 0.00 9.61197 7.16526 +C 78; Character-78; B 0.00 0.00 7.86434 7.16526 +C 79; Character-79; B 0.00 0.00 8.15562 7.16526 +C 80; Character-80; B 0.00 0.00 7.13616 7.16526 +C 81; Character-81; B 0.00 0.00 8.15562 7.16526 +C 82; Character-82; B 0.00 0.00 7.71870 7.16526 +C 83; Character-83; B 0.00 0.00 5.82544 7.16526 +C 84; Character-84; B 0.00 0.00 7.57307 7.16526 +C 85; Character-85; B 0.00 0.00 7.86434 7.16526 +C 86; Character-86; B 0.00 0.00 7.86434 7.16526 +C 87; Character-87; B 0.00 0.00 10.77706 7.16526 +C 88; Character-88; B 0.00 0.00 7.86434 7.16526 +C 89; Character-89; B 0.00 0.00 7.86434 7.16526 +C 90; Character-90; B 0.00 0.00 6.40798 7.16526 +C 91; Character-91; B 0.00 0.00 2.91272 7.86432 +C 92; Character-92; B 0.00 0.00 5.24290 7.28178 +C 93; Character-93; B 0.00 0.00 2.91272 7.86432 +C 94; Character-94; B 0.00 0.00 5.24290 7.28178 +C 95; Character-95; B 0.00 0.00 2.91272 7.00301 +C 96; Character-96; B 0.00 0.00 2.91272 7.28178 +C 97; Character-97; B 0.00 0.00 5.24290 4.51470 +C 98; Character-98; B 0.00 0.00 5.82544 7.28178 +C 99; Character-99; B 0.00 0.00 4.66035 4.51470 +C 100; Character-100; B 0.00 0.00 5.82544 7.28178 +C 101; Character-101; B 0.00 0.00 4.66035 4.51470 +C 102; Character-102; B 0.00 0.00 3.20400 7.28178 +C 103; Character-103; B 0.00 0.00 5.24290 4.51470 +C 104; Character-104; B 0.00 0.00 5.82544 7.28178 +C 105; Character-105; B 0.00 0.00 2.91272 7.00301 +C 106; Character-106; B 0.00 0.00 3.20400 7.00301 +C 107; Character-107; B 0.00 0.00 5.53418 7.28178 +C 108; Character-108; B 0.00 0.00 2.91272 7.28178 +C 109; Character-109; B 0.00 0.00 8.73816 4.51470 +C 110; Character-110; B 0.00 0.00 5.82544 4.51470 +C 111; Character-111; B 0.00 0.00 5.24290 4.51470 +C 112; Character-112; B 0.00 0.00 5.82544 4.51470 +C 113; Character-113; B 0.00 0.00 5.53416 4.51470 +C 114; Character-114; B 0.00 0.00 4.10694 4.51470 +C 115; Character-115; B 0.00 0.00 4.13606 4.51470 +C 116; Character-116; B 0.00 0.00 4.07781 6.44958 +C 117; Character-117; B 0.00 0.00 5.82544 4.51470 +C 118; Character-118; B 0.00 0.00 5.53418 4.51470 +C 119; Character-119; B 0.00 0.00 7.57307 4.51470 +C 120; Character-120; B 0.00 0.00 5.53418 4.51470 +C 121; Character-121; B 0.00 0.00 5.53418 4.51470 +C 122; Character-122; B 0.00 0.00 4.66035 4.51470 +C 123; Character-123; B 0.00 0.00 5.24290 4.51470 +C 124; Character-124; B 0.00 0.00 10.48579 4.51470 +C 125; Character-125; B 0.00 0.00 5.24290 7.28178 +C 126; Character-126; B 0.00 0.00 5.24290 7.00301 +C 127; Character-127; B 0.00 0.00 5.24290 7.00301 +EndCharMetrics +EndFontMetrics diff --git a/mf/cmr8.afm.in b/mf/cmr8.afm.in new file mode 100644 index 0000000000..b06a7bc375 --- /dev/null +++ b/mf/cmr8.afm.in @@ -0,0 +1,133 @@ +FontName cmr +StartFontMetrics +StartCharMetrics +C 0; Character-0; B 0.00 0.00 7.73700 7.16526 +C 1; Character-1; B 0.00 0.00 7.73700 7.16526 +C 2; Character-2; B 0.00 0.00 7.22120 7.16526 +C 3; Character-3; B 0.00 0.00 6.43840 7.16526 +C 4; Character-4; B 0.00 0.00 6.18960 7.16526 +C 5; Character-5; B 0.00 0.00 6.95420 7.16526 +C 6; Character-6; B 0.00 0.00 6.70540 7.16526 +C 7; Character-7; B 0.00 0.00 7.22120 7.16526 +C 8; Character-8; B 0.00 0.00 6.70540 7.16526 +C 9; Character-9; B 0.00 0.00 7.22120 7.16526 +C 10; Character-10; B 0.00 0.00 6.70540 7.16526 +C 11; Character-11; B 0.00 0.00 5.41590 7.28178 +C 12; Character-12; B 0.00 0.00 5.15800 7.28178 +C 13; Character-13; B 0.00 0.00 5.15800 7.28178 +C 14; Character-14; B 0.00 0.00 7.73700 7.28178 +C 15; Character-15; B 0.00 0.00 7.73700 7.28178 +C 16; Character-16; B 0.00 0.00 2.57900 4.51470 +C 17; Character-17; B 0.00 0.00 2.83690 4.51470 +C 18; Character-18; B 0.00 0.00 4.64220 7.28178 +C 19; Character-19; B 0.00 0.00 4.64220 7.28178 +C 20; Character-20; B 0.00 0.00 4.64220 6.59002 +C 21; Character-21; B 0.00 0.00 4.64220 7.28178 +C 22; Character-22; B 0.00 0.00 4.64220 6.01474 +C 23; Character-23; B 0.00 0.00 6.95420 7.28178 +C 24; Character-24; B 0.00 0.00 4.12640 0 +C 25; Character-25; B 0.00 0.00 4.64220 7.28178 +C 26; Character-26; B 0.00 0.00 6.70540 4.51470 +C 27; Character-27; B 0.00 0.00 7.22120 4.51470 +C 28; Character-28; B 0.00 0.00 4.64220 5.53416 +C 29; Character-29; B 0.00 0.00 8.37720 7.16526 +C 30; Character-30; B 0.00 0.00 9.40880 7.16526 +C 31; Character-31; B 0.00 0.00 7.22120 7.67498 +C 32; Character-32; B 0.00 0.00 2.57900 4.51470 +C 33; Character-33; B 0.00 0.00 2.57900 7.28178 +C 34; Character-34; B 0.00 0.00 4.64220 7.28178 +C 35; Character-35; B 0.00 0.00 7.73700 7.28178 +C 36; Character-36; B 0.00 0.00 4.64220 7.86432 +C 37; Character-37; B 0.00 0.00 7.73700 7.86432 +C 38; Character-38; B 0.00 0.00 7.22120 7.28178 +C 39; Character-39; B 0.00 0.00 2.57900 7.28178 +C 40; Character-40; B 0.00 0.00 3.61060 7.86432 +C 41; Character-41; B 0.00 0.00 3.61060 7.86432 +C 42; Character-42; B 0.00 0.00 4.64220 7.86432 +C 43; Character-43; B 0.00 0.00 7.22120 6.33520 +C 44; Character-44; B 0.00 0.00 2.57900 1.16508 +C 45; Character-45; B 0.00 0.00 3.09480 4.51470 +C 46; Character-46; B 0.00 0.00 2.57900 1.16508 +C 47; Character-47; B 0.00 0.00 4.64220 7.86432 +C 48; Character-48; B 0.00 0.00 4.64220 6.75750 +C 49; Character-49; B 0.00 0.00 4.64220 6.75750 +C 50; Character-50; B 0.00 0.00 4.64220 6.75750 +C 51; Character-51; B 0.00 0.00 4.64220 6.75750 +C 52; Character-52; B 0.00 0.00 4.64220 6.75750 +C 53; Character-53; B 0.00 0.00 4.64220 6.75750 +C 54; Character-54; B 0.00 0.00 4.64220 6.75750 +C 55; Character-55; B 0.00 0.00 4.64220 6.75750 +C 56; Character-56; B 0.00 0.00 4.64220 6.75750 +C 57; Character-57; B 0.00 0.00 4.64220 6.75750 +C 58; Character-58; B 0.00 0.00 2.57900 4.51470 +C 59; Character-59; B 0.00 0.00 2.57900 4.51470 +C 60; Character-60; B 0.00 0.00 2.57900 5.24288 +C 61; Character-61; B 0.00 0.00 7.22120 3.96348 +C 62; Character-62; B 0.00 0.00 4.38430 5.24288 +C 63; Character-63; B 0.00 0.00 4.38430 7.28178 +C 64; Character-64; B 0.00 0.00 7.22120 7.28178 +C 65; Character-65; B 0.00 0.00 6.95420 7.16526 +C 66; Character-66; B 0.00 0.00 6.57190 7.16526 +C 67; Character-67; B 0.00 0.00 6.70540 7.16526 +C 68; Character-68; B 0.00 0.00 7.08770 7.16526 +C 69; Character-69; B 0.00 0.00 6.31400 7.16526 +C 70; Character-70; B 0.00 0.00 6.05610 7.16526 +C 71; Character-71; B 0.00 0.00 7.28340 7.16526 +C 72; Character-72; B 0.00 0.00 6.95420 7.16526 +C 73; Character-73; B 0.00 0.00 3.34360 7.16526 +C 74; Character-74; B 0.00 0.00 4.76660 7.16526 +C 75; Character-75; B 0.00 0.00 7.21210 7.16526 +C 76; Character-76; B 0.00 0.00 5.79820 7.16526 +C 77; Character-77; B 0.00 0.00 8.50160 7.16526 +C 78; Character-78; B 0.00 0.00 6.95420 7.16526 +C 79; Character-79; B 0.00 0.00 7.22120 7.16526 +C 80; Character-80; B 0.00 0.00 6.31400 7.16526 +C 81; Character-81; B 0.00 0.00 7.22120 7.16526 +C 82; Character-82; B 0.00 0.00 6.82980 7.16526 +C 83; Character-83; B 0.00 0.00 5.15800 7.16526 +C 84; Character-84; B 0.00 0.00 6.70540 7.16526 +C 85; Character-85; B 0.00 0.00 6.95420 7.16526 +C 86; Character-86; B 0.00 0.00 6.95420 7.16526 +C 87; Character-87; B 0.00 0.00 9.53320 7.16526 +C 88; Character-88; B 0.00 0.00 6.95420 7.16526 +C 89; Character-89; B 0.00 0.00 6.95420 7.16526 +C 90; Character-90; B 0.00 0.00 5.67380 7.16526 +C 91; Character-91; B 0.00 0.00 2.57900 7.86432 +C 92; Character-92; B 0.00 0.00 4.64220 7.28178 +C 93; Character-93; B 0.00 0.00 2.57900 7.86432 +C 94; Character-94; B 0.00 0.00 4.64220 7.28178 +C 95; Character-95; B 0.00 0.00 2.57900 7.03212 +C 96; Character-96; B 0.00 0.00 2.57900 7.28178 +C 97; Character-97; B 0.00 0.00 4.64220 4.51470 +C 98; Character-98; B 0.00 0.00 5.15800 7.28178 +C 99; Character-99; B 0.00 0.00 4.12640 4.51470 +C 100; Character-100; B 0.00 0.0 5.15800 7.28178 +C 101; Character-101; B 0.00 0.0 4.12640 4.51470 +C 102; Character-102; B 0.00 0.0 2.83690 7.28178 +C 103; Character-103; B 0.00 0.0 4.64220 4.51470 +C 104; Character-104; B 0.00 0.0 5.15800 7.28178 +C 105; Character-105; B 0.00 0.0 2.57900 7.03212 +C 106; Character-106; B 0.00 0.0 2.83690 7.03212 +C 107; Character-107; B 0.00 0.0 4.90010 7.28178 +C 108; Character-108; B 0.00 0.0 2.57900 7.28178 +C 109; Character-109; B 0.00 0.0 7.73700 4.51470 +C 110; Character-110; B 0.00 0.0 5.15800 4.51470 +C 111; Character-111; B 0.00 0.0 4.64220 4.51470 +C 112; Character-112; B 0.00 0.0 5.15800 4.51470 +C 113; Character-113; B 0.00 0.0 4.90010 4.51470 +C 114; Character-114; B 0.00 0.0 3.61818 4.51470 +C 115; Character-115; B 0.00 0.0 3.66218 4.51470 +C 116; Character-116; B 0.00 0.0 3.61060 6.44958 +C 117; Character-117; B 0.00 0.0 5.15800 4.51470 +C 118; Character-118; B 0.00 0.0 4.90010 4.51470 +C 119; Character-119; B 0.00 0.0 6.70540 4.51470 +C 120; Character-120; B 0.00 0.0 4.90010 4.51470 +C 121; Character-121; B 0.00 0.0 4.90010 4.51470 +C 122; Character-122; B 0.00 0.0 4.12640 4.51470 +C 123; Character-123; B 0.00 0.0 4.64220 4.51470 +C 124; Character-124; B 0.00 0.0 9.28440 4.51470 +C 125; Character-125; B 0.00 0.0 4.64220 7.28178 +C 126; Character-126; B 0.00 0.0 4.64220 7.03212 +C 127; Character-127; B 0.00 0.0 4.64220 7.03212 +EndCharMetrics +EndFontMetrics diff --git a/mf/cmti10.afm.in b/mf/cmti10.afm.in new file mode 100644 index 0000000000..78e1f43073 --- /dev/null +++ b/mf/cmti10.afm.in @@ -0,0 +1,133 @@ +FontName cmr +StartFontMetrics +StartCharMetrics +C 0; Character-0; B 0.00 0.00 8.57498 7.16526 +C 1; Character-1; B 0.00 0.00 8.57498 7.16526 +C 2; Character-2; B 0.00 0.00 8.03904 7.16526 +C 3; Character-3; B 0.00 0.00 7.25843 7.16526 +C 4; Character-4; B 0.00 0.00 6.96717 7.16526 +C 5; Character-5; B 0.00 0.00 7.79437 7.16526 +C 6; Character-6; B 0.00 0.00 7.50310 7.16526 +C 7; Character-7; B 0.00 0.00 8.03904 7.16526 +C 8; Character-8; B 0.00 0.00 7.50310 7.16526 +C 9; Character-9; B 0.00 0.00 8.03904 7.16526 +C 10; Character-10; B 0.00 0.00 7.50310 7.16526 +C 11; Character-11; B 0.00 0.00 6.43123 7.28178 +C 12; Character-12; B 0.00 0.00 5.89530 7.28178 +C 13; Character-13; B 0.00 0.00 6.16326 7.28178 +C 14; Character-14; B 0.00 0.00 9.24490 7.28178 +C 15; Character-15; B 0.00 0.00 9.37888 7.28178 +C 16; Character-16; B 0.00 0.00 3.21562 4.51470 +C 17; Character-17; B 0.00 0.00 3.48358 4.51470 +C 18; Character-18; B 0.00 0.00 5.35936 7.28178 +C 19; Character-19; B 0.00 0.00 5.35936 7.28178 +C 20; Character-20; B 0.00 0.00 5.35936 6.59002 +C 21; Character-21; B 0.00 0.00 5.35936 7.28178 +C 22; Character-22; B 0.00 0.00 5.35936 5.88949 +C 23; Character-23; B 0.00 0.00 8.71672 7.28178 +C 24; Character-24; B 0.00 0.00 4.82342 0 +C 25; Character-25; B 0.00 0.00 5.62733 7.28178 +C 26; Character-26; B 0.00 0.00 7.50310 4.51470 +C 27; Character-27; B 0.00 0.00 7.50310 4.51470 +C 28; Character-28; B 0.00 0.00 5.35936 5.53416 +C 29; Character-29; B 0.00 0.00 9.25654 7.16526 +C 30; Character-30; B 0.00 0.00 10.32842 7.16526 +C 31; Character-31; B 0.00 0.00 8.03904 7.67499 +C 32; Character-32; B 0.00 0.00 2.67968 4.51470 +C 33; Character-33; B 0.00 0.00 3.21562 7.28178 +C 34; Character-34; B 0.00 0.00 5.39432 7.28178 +C 35; Character-35; B 0.00 0.00 8.57498 7.28178 +C 36; Character-36; B 0.00 0.00 8.06453 7.28178 +C 37; Character-37; B 0.00 0.00 8.57498 7.86432 +C 38; Character-38; B 0.00 0.00 8.03904 7.28178 +C 39; Character-39; B 0.00 0.00 3.21562 7.28178 +C 40; Character-40; B 0.00 0.00 4.28749 7.86432 +C 41; Character-41; B 0.00 0.00 4.28749 7.86432 +C 42; Character-42; B 0.00 0.00 5.35936 7.86432 +C 43; Character-43; B 0.00 0.00 8.03904 5.88949 +C 44; Character-44; B 0.00 0.00 3.21562 1.10683 +C 45; Character-45; B 0.00 0.00 3.75155 4.51470 +C 46; Character-46; B 0.00 0.00 3.21562 1.10683 +C 47; Character-47; B 0.00 0.00 5.35936 7.86432 +C 48; Character-48; B 0.00 0.00 5.35936 6.75749 +C 49; Character-49; B 0.00 0.00 5.35936 6.75749 +C 50; Character-50; B 0.00 0.00 5.35936 6.75749 +C 51; Character-51; B 0.00 0.00 5.35936 6.75749 +C 52; Character-52; B 0.00 0.00 5.35936 6.75749 +C 53; Character-53; B 0.00 0.00 5.35936 6.75749 +C 54; Character-54; B 0.00 0.00 5.35936 6.75749 +C 55; Character-55; B 0.00 0.00 5.35936 6.75749 +C 56; Character-56; B 0.00 0.00 5.35936 6.75749 +C 57; Character-57; B 0.00 0.00 5.35936 6.75749 +C 58; Character-58; B 0.00 0.00 3.21562 4.51470 +C 59; Character-59; B 0.00 0.00 3.21562 4.51470 +C 60; Character-60; B 0.00 0.00 3.21562 5.24288 +C 61; Character-61; B 0.00 0.00 8.03904 3.84696 +C 62; Character-62; B 0.00 0.00 5.35936 5.24288 +C 63; Character-63; B 0.00 0.00 5.35936 7.28178 +C 64; Character-64; B 0.00 0.00 8.03904 7.28178 +C 65; Character-65; B 0.00 0.00 7.79437 7.16526 +C 66; Character-66; B 0.00 0.00 7.38077 7.16526 +C 67; Character-67; B 0.00 0.00 7.50310 7.16526 +C 68; Character-68; B 0.00 0.00 7.91670 7.16526 +C 69; Character-69; B 0.00 0.00 7.11280 7.16526 +C 70; Character-70; B 0.00 0.00 6.84483 7.16526 +C 71; Character-71; B 0.00 0.00 8.11186 7.16526 +C 72; Character-72; B 0.00 0.00 7.79437 7.16526 +C 73; Character-73; B 0.00 0.00 4.04282 7.16526 +C 74; Character-74; B 0.00 0.00 5.50499 7.16526 +C 75; Character-75; B 0.00 0.00 8.06234 7.16526 +C 76; Character-76; B 0.00 0.00 6.57686 7.16526 +C 77; Character-77; B 0.00 0.00 9.40218 7.16526 +C 78; Character-78; B 0.00 0.00 7.79437 7.16526 +C 79; Character-79; B 0.00 0.00 8.03904 7.16526 +C 80; Character-80; B 0.00 0.00 7.11280 7.16526 +C 81; Character-81; B 0.00 0.00 8.03904 7.16526 +C 82; Character-82; B 0.00 0.00 7.64874 7.16526 +C 83; Character-83; B 0.00 0.00 5.89530 7.16526 +C 84; Character-84; B 0.00 0.00 7.50310 7.16526 +C 85; Character-85; B 0.00 0.00 7.79437 7.16526 +C 86; Character-86; B 0.00 0.00 7.79437 7.16526 +C 87; Character-87; B 0.00 0.00 10.47405 7.16526 +C 88; Character-88; B 0.00 0.00 7.79437 7.16526 +C 89; Character-89; B 0.00 0.00 7.79437 7.16526 +C 90; Character-90; B 0.00 0.00 6.43123 7.16526 +C 91; Character-91; B 0.00 0.00 3.21562 7.86432 +C 92; Character-92; B 0.00 0.00 5.39432 7.28178 +C 93; Character-93; B 0.00 0.00 3.21562 7.86432 +C 94; Character-94; B 0.00 0.00 5.35936 7.28178 +C 95; Character-95; B 0.00 0.00 3.21562 7.00301 +C 96; Character-96; B 0.00 0.00 3.21562 7.28178 +C 97; Character-97; B 0.00 0.00 5.35936 4.51470 +C 98; Character-98; B 0.00 0.00 4.82342 7.28178 +C 99; Character-99; B 0.00 0.00 4.82342 4.51470 +C 100; Character-100; B 0.00 0.00 5.35936 7.28178 +C 101; Character-101; B 0.00 0.00 4.82342 4.51470 +C 102; Character-102; B 0.00 0.00 3.21562 7.28178 +C 103; Character-103; B 0.00 0.00 4.82342 4.51470 +C 104; Character-104; B 0.00 0.00 5.35936 7.28178 +C 105; Character-105; B 0.00 0.00 3.21562 6.87194 +C 106; Character-106; B 0.00 0.00 3.21562 6.87194 +C 107; Character-107; B 0.00 0.00 4.82342 7.28178 +C 108; Character-108; B 0.00 0.00 2.67968 7.28178 +C 109; Character-109; B 0.00 0.00 8.57498 4.51470 +C 110; Character-110; B 0.00 0.00 5.89530 4.51470 +C 111; Character-111; B 0.00 0.00 5.35936 4.51470 +C 112; Character-112; B 0.00 0.00 5.35936 4.51470 +C 113; Character-113; B 0.00 0.00 4.82342 4.51470 +C 114; Character-114; B 0.00 0.00 4.42147 4.51470 +C 115; Character-115; B 0.00 0.00 4.28749 4.51470 +C 116; Character-116; B 0.00 0.00 3.48358 6.44958 +C 117; Character-117; B 0.00 0.00 5.62733 4.51470 +C 118; Character-118; B 0.00 0.00 4.82342 4.51470 +C 119; Character-119; B 0.00 0.00 6.96717 4.51470 +C 120; Character-120; B 0.00 0.00 4.86421 4.51470 +C 121; Character-121; B 0.00 0.00 5.09139 4.51470 +C 122; Character-122; B 0.00 0.00 4.28749 4.51470 +C 123; Character-123; B 0.00 0.00 5.35936 4.51470 +C 124; Character-124; B 0.00 0.00 10.71872 4.51470 +C 125; Character-125; B 0.00 0.00 5.35936 7.28178 +C 126; Character-126; B 0.00 0.00 5.35936 7.00301 +C 127; Character-127; B 0.00 0.00 5.35936 7.00301 +EndCharMetrics +EndFontMetrics diff --git a/mf/cmti8.afm.in b/mf/cmti8.afm.in new file mode 100644 index 0000000000..b06a7bc375 --- /dev/null +++ b/mf/cmti8.afm.in @@ -0,0 +1,133 @@ +FontName cmr +StartFontMetrics +StartCharMetrics +C 0; Character-0; B 0.00 0.00 7.73700 7.16526 +C 1; Character-1; B 0.00 0.00 7.73700 7.16526 +C 2; Character-2; B 0.00 0.00 7.22120 7.16526 +C 3; Character-3; B 0.00 0.00 6.43840 7.16526 +C 4; Character-4; B 0.00 0.00 6.18960 7.16526 +C 5; Character-5; B 0.00 0.00 6.95420 7.16526 +C 6; Character-6; B 0.00 0.00 6.70540 7.16526 +C 7; Character-7; B 0.00 0.00 7.22120 7.16526 +C 8; Character-8; B 0.00 0.00 6.70540 7.16526 +C 9; Character-9; B 0.00 0.00 7.22120 7.16526 +C 10; Character-10; B 0.00 0.00 6.70540 7.16526 +C 11; Character-11; B 0.00 0.00 5.41590 7.28178 +C 12; Character-12; B 0.00 0.00 5.15800 7.28178 +C 13; Character-13; B 0.00 0.00 5.15800 7.28178 +C 14; Character-14; B 0.00 0.00 7.73700 7.28178 +C 15; Character-15; B 0.00 0.00 7.73700 7.28178 +C 16; Character-16; B 0.00 0.00 2.57900 4.51470 +C 17; Character-17; B 0.00 0.00 2.83690 4.51470 +C 18; Character-18; B 0.00 0.00 4.64220 7.28178 +C 19; Character-19; B 0.00 0.00 4.64220 7.28178 +C 20; Character-20; B 0.00 0.00 4.64220 6.59002 +C 21; Character-21; B 0.00 0.00 4.64220 7.28178 +C 22; Character-22; B 0.00 0.00 4.64220 6.01474 +C 23; Character-23; B 0.00 0.00 6.95420 7.28178 +C 24; Character-24; B 0.00 0.00 4.12640 0 +C 25; Character-25; B 0.00 0.00 4.64220 7.28178 +C 26; Character-26; B 0.00 0.00 6.70540 4.51470 +C 27; Character-27; B 0.00 0.00 7.22120 4.51470 +C 28; Character-28; B 0.00 0.00 4.64220 5.53416 +C 29; Character-29; B 0.00 0.00 8.37720 7.16526 +C 30; Character-30; B 0.00 0.00 9.40880 7.16526 +C 31; Character-31; B 0.00 0.00 7.22120 7.67498 +C 32; Character-32; B 0.00 0.00 2.57900 4.51470 +C 33; Character-33; B 0.00 0.00 2.57900 7.28178 +C 34; Character-34; B 0.00 0.00 4.64220 7.28178 +C 35; Character-35; B 0.00 0.00 7.73700 7.28178 +C 36; Character-36; B 0.00 0.00 4.64220 7.86432 +C 37; Character-37; B 0.00 0.00 7.73700 7.86432 +C 38; Character-38; B 0.00 0.00 7.22120 7.28178 +C 39; Character-39; B 0.00 0.00 2.57900 7.28178 +C 40; Character-40; B 0.00 0.00 3.61060 7.86432 +C 41; Character-41; B 0.00 0.00 3.61060 7.86432 +C 42; Character-42; B 0.00 0.00 4.64220 7.86432 +C 43; Character-43; B 0.00 0.00 7.22120 6.33520 +C 44; Character-44; B 0.00 0.00 2.57900 1.16508 +C 45; Character-45; B 0.00 0.00 3.09480 4.51470 +C 46; Character-46; B 0.00 0.00 2.57900 1.16508 +C 47; Character-47; B 0.00 0.00 4.64220 7.86432 +C 48; Character-48; B 0.00 0.00 4.64220 6.75750 +C 49; Character-49; B 0.00 0.00 4.64220 6.75750 +C 50; Character-50; B 0.00 0.00 4.64220 6.75750 +C 51; Character-51; B 0.00 0.00 4.64220 6.75750 +C 52; Character-52; B 0.00 0.00 4.64220 6.75750 +C 53; Character-53; B 0.00 0.00 4.64220 6.75750 +C 54; Character-54; B 0.00 0.00 4.64220 6.75750 +C 55; Character-55; B 0.00 0.00 4.64220 6.75750 +C 56; Character-56; B 0.00 0.00 4.64220 6.75750 +C 57; Character-57; B 0.00 0.00 4.64220 6.75750 +C 58; Character-58; B 0.00 0.00 2.57900 4.51470 +C 59; Character-59; B 0.00 0.00 2.57900 4.51470 +C 60; Character-60; B 0.00 0.00 2.57900 5.24288 +C 61; Character-61; B 0.00 0.00 7.22120 3.96348 +C 62; Character-62; B 0.00 0.00 4.38430 5.24288 +C 63; Character-63; B 0.00 0.00 4.38430 7.28178 +C 64; Character-64; B 0.00 0.00 7.22120 7.28178 +C 65; Character-65; B 0.00 0.00 6.95420 7.16526 +C 66; Character-66; B 0.00 0.00 6.57190 7.16526 +C 67; Character-67; B 0.00 0.00 6.70540 7.16526 +C 68; Character-68; B 0.00 0.00 7.08770 7.16526 +C 69; Character-69; B 0.00 0.00 6.31400 7.16526 +C 70; Character-70; B 0.00 0.00 6.05610 7.16526 +C 71; Character-71; B 0.00 0.00 7.28340 7.16526 +C 72; Character-72; B 0.00 0.00 6.95420 7.16526 +C 73; Character-73; B 0.00 0.00 3.34360 7.16526 +C 74; Character-74; B 0.00 0.00 4.76660 7.16526 +C 75; Character-75; B 0.00 0.00 7.21210 7.16526 +C 76; Character-76; B 0.00 0.00 5.79820 7.16526 +C 77; Character-77; B 0.00 0.00 8.50160 7.16526 +C 78; Character-78; B 0.00 0.00 6.95420 7.16526 +C 79; Character-79; B 0.00 0.00 7.22120 7.16526 +C 80; Character-80; B 0.00 0.00 6.31400 7.16526 +C 81; Character-81; B 0.00 0.00 7.22120 7.16526 +C 82; Character-82; B 0.00 0.00 6.82980 7.16526 +C 83; Character-83; B 0.00 0.00 5.15800 7.16526 +C 84; Character-84; B 0.00 0.00 6.70540 7.16526 +C 85; Character-85; B 0.00 0.00 6.95420 7.16526 +C 86; Character-86; B 0.00 0.00 6.95420 7.16526 +C 87; Character-87; B 0.00 0.00 9.53320 7.16526 +C 88; Character-88; B 0.00 0.00 6.95420 7.16526 +C 89; Character-89; B 0.00 0.00 6.95420 7.16526 +C 90; Character-90; B 0.00 0.00 5.67380 7.16526 +C 91; Character-91; B 0.00 0.00 2.57900 7.86432 +C 92; Character-92; B 0.00 0.00 4.64220 7.28178 +C 93; Character-93; B 0.00 0.00 2.57900 7.86432 +C 94; Character-94; B 0.00 0.00 4.64220 7.28178 +C 95; Character-95; B 0.00 0.00 2.57900 7.03212 +C 96; Character-96; B 0.00 0.00 2.57900 7.28178 +C 97; Character-97; B 0.00 0.00 4.64220 4.51470 +C 98; Character-98; B 0.00 0.00 5.15800 7.28178 +C 99; Character-99; B 0.00 0.00 4.12640 4.51470 +C 100; Character-100; B 0.00 0.0 5.15800 7.28178 +C 101; Character-101; B 0.00 0.0 4.12640 4.51470 +C 102; Character-102; B 0.00 0.0 2.83690 7.28178 +C 103; Character-103; B 0.00 0.0 4.64220 4.51470 +C 104; Character-104; B 0.00 0.0 5.15800 7.28178 +C 105; Character-105; B 0.00 0.0 2.57900 7.03212 +C 106; Character-106; B 0.00 0.0 2.83690 7.03212 +C 107; Character-107; B 0.00 0.0 4.90010 7.28178 +C 108; Character-108; B 0.00 0.0 2.57900 7.28178 +C 109; Character-109; B 0.00 0.0 7.73700 4.51470 +C 110; Character-110; B 0.00 0.0 5.15800 4.51470 +C 111; Character-111; B 0.00 0.0 4.64220 4.51470 +C 112; Character-112; B 0.00 0.0 5.15800 4.51470 +C 113; Character-113; B 0.00 0.0 4.90010 4.51470 +C 114; Character-114; B 0.00 0.0 3.61818 4.51470 +C 115; Character-115; B 0.00 0.0 3.66218 4.51470 +C 116; Character-116; B 0.00 0.0 3.61060 6.44958 +C 117; Character-117; B 0.00 0.0 5.15800 4.51470 +C 118; Character-118; B 0.00 0.0 4.90010 4.51470 +C 119; Character-119; B 0.00 0.0 6.70540 4.51470 +C 120; Character-120; B 0.00 0.0 4.90010 4.51470 +C 121; Character-121; B 0.00 0.0 4.90010 4.51470 +C 122; Character-122; B 0.00 0.0 4.12640 4.51470 +C 123; Character-123; B 0.00 0.0 4.64220 4.51470 +C 124; Character-124; B 0.00 0.0 9.28440 4.51470 +C 125; Character-125; B 0.00 0.0 4.64220 7.28178 +C 126; Character-126; B 0.00 0.0 4.64220 7.03212 +C 127; Character-127; B 0.00 0.0 4.64220 7.03212 +EndCharMetrics +EndFontMetrics diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index b9e253e114..76ca3aa389 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -23,3 +23,6 @@ $(outdir)/%.$(XPM_RESOLUTION)gf: %.mf $(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf gftopk $< $@ +%.afm: + $(SHELL) $(depth)/buildscripts/tfmtoafm.sh $(shell basename $@ .afm) + mv $@ $@.in diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex index 99a7e13c2c..7ddeda4f76 100644 --- a/tex/lily-ps-defs.tex +++ b/tex/lily-ps-defs.tex @@ -16,13 +16,38 @@ % transplant a TeX dimension into the PS output. \def\PSsetTeXdimen#1{\expandafter\special{! /#1 (\the\csname #1\endcsname) deftexdimen}} +{% + \def\par{ }% %Ugh. Don't try this at home, kids! + % neat file-include trick by Piet van Oostrum + \newread\defin + \newtoks\toksfiledefi\newtoks\toksfiledefii + \def\ifnot#1{#1\else\expandafter\expandafter\fi\iffalse\iftrue\fi} + \def\filedef#1#2{%#1=command name, #2=file name + \openin\defin=#2\relax\def#1{} + \ifeof\defin + \message{***************** CAN NOT OPEN #2 ********************} + \end + \fi + \loop\ifnot{\ifeof\defin}\read\defin to\tempfiledef + \toksfiledefi=\expandafter{#1}% + \toksfiledefii=\expandafter{\tempfiledef}% + % \expandafter\special\expandafter{!\the\toksfiledefi\the\toksfiledefii}\repeat% + \global\edef#1{\the\toksfiledefi\the\toksfiledefii}\repeat% + } + % + % This seems a little backwards, but we don't want to include the PS + % stuff too early + % + \filedef\includelilyps{lily.ps}% + \expandafter\special{! \includelilyps} +} + -\def\turnOnPostScript{% \special{! % PS helper: convert (0.2pt) to the token 0.2 /settexdimen { - /thestring exch def + /thestring exch def thestring 0 thestring length 2 sub getinterval token @@ -35,32 +60,30 @@ def } def } -\PSsetTeXdimen{staffrulethickness} -\PSsetTeXdimen{staffheight} -% urg, no dvips.info over here... -%\special{! \input lily.ps } -\special{! -(lily.ps) findlibfile -{ - exch pop //systemdict /run get exec -} -{ - /undefinedfilename signalerror -} ifelse -} -% -\def\embeddedps##1{% + +\def\turnOnPostScript{% + \PSsetTeXdimen{stafflinethickness} + \PSsetTeXdimen{staffheight} + % This sets CTM so that you get to the currentpoint % by executing a 0 0 moveto - \special{ps: @beginspecial @setspecial ##1 @endspecial} -} -% -% -%\PSsetTeXdimen{staffrulethickness} -%\PSsetTeXdimen{staffheight} + \def\embeddedps##1{% + \special{ps: @beginspecial @setspecial ##1 @endspecial} + } + % + + \special{! +/interline \mudelapaperinterline0 def % ugh. Only works x.yyyy floats +stafflinethickness 1.2 mul /plet_t exch def +interline 3 div /bracket_b exch def +interline 2 mul /bracket_w exch def +stafflinethickness 2 mul /bracket_t exch def +interline 1.5 mul /bracket_v exch def +bracket_v /bracket_u exch def +50 /bracket_alpha exch def +staffheight 4 div /interline exch def +1 setlinecap} } -\def\turnOnExperimentalFeatures{% -\special{ps: -}} +\def\turnOnExperimentalFeatures{} -- 2.39.5