From 03166b077427a230be791d5555c2f24fcdfcc4be Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 18 Jan 2004 20:48:41 +0000 Subject: [PATCH] remove asciscript. --- ChangeLog | 4 +- Documentation/topdocs/NEWS.texi | 4 +- make/asciifont-rules.make | 4 - make/asciifont-targets.make | 1 - make/asciifont-vars.make | 2 - make/lilypond.redhat.spec.in | 2 - make/lilypond.suse.spec.in | 2 - mf/GNUmakefile | 1 - mf/as-braces5.af | 126 --------- mf/as-braces9.af | 126 --------- mf/as-dummy.af | 279 -------------------- mf/as-dummy1.af | 279 -------------------- mf/as-number1.af | 47 ---- mf/as-number4.af | 91 ------- mf/as5.af | 214 ---------------- mf/as9.af | 295 --------------------- scm/lily.scm | 1 - scm/output-ascii-script.scm | 191 -------------- scripts/GNUmakefile | 2 +- scripts/as2text.scm | 441 -------------------------------- 20 files changed, 6 insertions(+), 2106 deletions(-) delete mode 100644 make/asciifont-rules.make delete mode 100644 make/asciifont-targets.make delete mode 100644 make/asciifont-vars.make delete mode 100644 mf/as-braces5.af delete mode 100644 mf/as-braces9.af delete mode 100644 mf/as-dummy.af delete mode 100644 mf/as-dummy1.af delete mode 100644 mf/as-number1.af delete mode 100644 mf/as-number4.af delete mode 100644 mf/as5.af delete mode 100644 mf/as9.af delete mode 100644 scm/output-ascii-script.scm delete mode 100644 scripts/as2text.scm diff --git a/ChangeLog b/ChangeLog index df9602dfc7..520f002838 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-01-18 Han-Wen Nienhuys + * mf/,scripts/,make/,ly/,scm/: remove AsciiScript remnants. + * lily/lily-guile.cc (robust_scm2double): new function. Use throughout. * lily/line-interface.cc (line): remove thickness from calling interface. @@ -55,7 +57,7 @@ * ps/music-drawing-routines.ps: take blot as 4th argument. * lily/beam.cc (brew_molecule): fix beam offsets: overlap with the - stem do avoid small dents. + stem to avoid small dents. 2004-01-17 Han-Wen Nienhuys diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index 2c0e54171f..c15d2df8d9 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -17,6 +17,8 @@ Version 2.1.9 @end ignore @itemize @bullet +@item Formatting of ottava brackets has been much improved. + @item Objects in the output can now be documented: the following fragment boxes the note head, and adds the text ``heads or tails?'' three spaces below the box. @@ -79,8 +81,6 @@ With this mechanism, @code{LyricVoice}s can be put melodies individually, allowing for different melismatic sections in every @code{LyricVoice}. See @file{input/regression/lyric-combine-new.ly}. -@item Formatting of ottava brackets has been improved. - @item Bar lines may now be dotted. diff --git a/make/asciifont-rules.make b/make/asciifont-rules.make deleted file mode 100644 index f7eb2ed82b..0000000000 --- a/make/asciifont-rules.make +++ /dev/null @@ -1,4 +0,0 @@ - -$(outdir)/%.afm: %.af - grep '[[:cntrl:]]' $< | sed 's/^[[:cntrl:]] *//' > $@ -# grep '[[:cntrl:]]' $< | sed 's/^. *//' > $@ diff --git a/make/asciifont-targets.make b/make/asciifont-targets.make deleted file mode 100644 index 1bb8bf6d7f..0000000000 --- a/make/asciifont-targets.make +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/make/asciifont-vars.make b/make/asciifont-vars.make deleted file mode 100644 index f414fcf639..0000000000 --- a/make/asciifont-vars.make +++ /dev/null @@ -1,2 +0,0 @@ -AF_FILES := $(wildcard *.af) -EXTRA_DIST_FILES += $(AF_FILES) diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 164a66ac17..fbc31225ea 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -121,7 +121,6 @@ scrollkeeper-update %{_datadir}/emacs/site-lisp/site-start.d/lilypond* %{_bindir}/abc2ly -%{_bindir}/as2text %{_bindir}/convert-ly %{_bindir}/etf2ly %{_bindir}/lilypond @@ -145,7 +144,6 @@ scrollkeeper-update %endif %{_mandir}/man1/abc2ly.1.gz -%{_mandir}/man1/as2text.1.gz %{_mandir}/man1/convert-ly.1.gz %{_mandir}/man1/etf2ly.1.gz %{_mandir}/man1/lilypond-bin.1.gz diff --git a/make/lilypond.suse.spec.in b/make/lilypond.suse.spec.in index 0465755d2d..059a922f98 100644 --- a/make/lilypond.suse.spec.in +++ b/make/lilypond.suse.spec.in @@ -224,7 +224,6 @@ touch var/adm/SuSEconfig/run-texhash %ifnos cygwin %{_prefix}/bin/abc2ly -%{_prefix}/bin/as2text %{_prefix}/bin/convert-ly %{_prefix}/bin/etf2ly %{_prefix}/bin/lilypond-bin @@ -244,7 +243,6 @@ touch var/adm/SuSEconfig/run-texhash %endif %{_prefix}/man/man1/abc2ly.1.gz -%{_prefix}/man/man1/as2text.1.gz %{_prefix}/man/man1/convert-ly.1.gz %{_prefix}/man/man1/etf2ly.1.gz %{_prefix}/man/man1/lilypond-bin.1.gz diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 19583e3c72..54407dfc52 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -1,7 +1,6 @@ depth = .. STEPMAKE_TEMPLATES=metafont install install-out -LOCALSTEPMAKE_TEMPLATES=asciifont include $(depth)/make/stepmake.make diff --git a/mf/as-braces5.af b/mf/as-braces5.af deleted file mode 100644 index f6212cddf1..0000000000 --- a/mf/as-braces5.af +++ /dev/null @@ -1,126 +0,0 @@ - Comment as-braces5.af -- AsciiFont: braces for height 5 - - Comment part of LilyPond's [ascii music font] - - Comment (c) 2000--2003 Jan Nieuwenhuizen - - Comment Lines that start with TAB or FF make up the .afm - Comment TABs are comments - Comment `Comment' is the afm comment prefix - Comment which makes `TAB Comment' an .afm comment - - StartFontMetrics 2.0 - FontName as-braces 5 - FontFamily as-braces - StartCharMetrics 10 - - Comment BBox: (llx lly urx ury) * 1000 - C 0; WX 1; N Brace-9; B 0 -4500 1000 4500; -/ -| -| -| -| -| -| -| -| -| -\ - C 1; WX 1; N Brace-10; B 0 -5000 1000 5000; -/ -| -| -| -| -| -| -| -| -| -| -\ - C 2; WX 1; N Brace-11; B 0 -5500 1000 5500; -/ -| -| -| -| -| -| -| -| -| -| -| -\ - C 3; WX 1; N Brace-12; B 0 -6000 1000 6000; -/ -| -| -| -| -| -| -| -| -| -| -| -| -\ - C 4; WX 1; N Brace-13; B 0 -6500 1000 6500; -/ -| -| -| -| -| -| -| -| -| -| -| -| -| -\ - C 5; WX 1; N Brace-14; B -1000 -3000 1000 14000; -X5 - C 6; WX 1; N Brace-15; B -1000 -3000 1000 14000; -X6 - C 7; WX 1; N Brace-16; B -1000 -3000 1000 14000; -/ -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -\ - C 8; WX 1; N Brace-17; B -1000 -3000 1000 14000; -X8 - C 9; WX 1; N Brace-18; B -1000 -3000 1000 14000; -X9 - EndCharMetrics - EndFontMetrics %d - diff --git a/mf/as-braces9.af b/mf/as-braces9.af deleted file mode 100644 index 7d3e953c39..0000000000 --- a/mf/as-braces9.af +++ /dev/null @@ -1,126 +0,0 @@ - Comment as-braces9.af -- AsciiFont: braces for height 9 - - Comment part of LilyPond's [ascii music font] - - Comment (c) 2000--2003 Jan Nieuwenhuizen - - Comment Lines that start with TAB or FF make up the .afm - Comment TABs are comments - Comment `Comment' is the afm comment prefix - Comment which makes `TAB Comment' an .afm comment - - StartFontMetrics 2.0 - FontName as-braces 9 - FontFamily as-braces - StartCharMetrics 10 - - Comment BBox: (llx lly urx ury) * 1000 - C 0; WX 1; N Brace-9; B 0 -4500 1000 4500; -/ -| -| -| -| -| -| -| -| -| -\ - C 1; WX 1; N Brace-10; B 0 -5000 1000 5000; -/ -| -| -| -| -| -| -| -| -| -| -\ - C 2; WX 1; N Brace-11; B 0 -5500 1000 5500; -/ -| -| -| -| -| -| -| -| -| -| -| -\ - C 3; WX 1; N Brace-12; B 0 -6000 1000 6000; -/ -| -| -| -| -| -| -| -| -| -| -| -| -\ - C 4; WX 1; N Brace-13; B 0 -6500 1000 6500; -/ -| -| -| -| -| -| -| -| -| -| -| -| -| -\ - C 5; WX 1; N Brace-14; B -1000 -3000 1000 14000; -X5 - C 6; WX 1; N Brace-15; B -1000 -3000 1000 14000; -X6 - C 7; WX 1; N Brace-16; B -1000 -3000 1000 14000; -/ -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -\ - C 8; WX 1; N Brace-17; B -1000 -3000 1000 14000; -X8 - C 9; WX 1; N Brace-18; B -1000 -3000 1000 14000; -X9 - EndCharMetrics - EndFontMetrics %d - diff --git a/mf/as-dummy.af b/mf/as-dummy.af deleted file mode 100644 index f92f9a5cdf..0000000000 --- a/mf/as-dummy.af +++ /dev/null @@ -1,279 +0,0 @@ - Comment as-dummy.af -- AsciiFont: sane metrics for LilyPond - - Comment part of LilyPond's [ascii music font] - - Comment (c) 2000--2003 Jan Nieuwenhuizen - - Comment Lines that start with TAB or FF make up the .afm - Comment TABs are comments - Comment `Comment' is the afm comment prefix - Comment which makes `TAB Comment' an .afm comment - - Comment Urg: this should be generated - Comment It only serves as a generic catch-all metric file - Comment for LilyPond - - StartFontMetrics 2.0 - FontName as-dummy - FontFamily as-dummy - StartCharMetrics 256 - - Comment BBox: (llx lly urx ury) * 1000 - C 0; WX 1; N Char-0; B 0 0 1000 1000; - C 1; WX 1; N Char-1; B 0 0 1000 1000; - C 2; WX 1; N Char-2; B 0 0 1000 1000; - C 3; WX 1; N Char-3; B 0 0 1000 1000; - C 4; WX 1; N Char-4; B 0 0 1000 1000; - C 5; WX 1; N Char-5; B 0 0 1000 1000; - C 6; WX 1; N Char-6; B 0 0 1000 1000; - C 7; WX 1; N Char-7; B 0 0 1000 1000; - C 8; WX 1; N Char-8; B 0 0 1000 1000; - C 9; WX 1; N Char-9; B 0 0 1000 1000; - C 10; WX 1; N Char-10; B 0 0 1000 1000; - C 11; WX 1; N Char-11; B 0 0 1000 1000; - C 12; WX 1; N Char-12; B 0 0 1000 1000; - C 13; WX 1; N Char-13; B 0 0 1000 1000; - C 14; WX 1; N Char-14; B 0 0 1000 1000; - C 15; WX 1; N Char-15; B 0 0 1000 1000; - C 16; WX 1; N Char-16; B 0 0 1000 1000; - C 17; WX 1; N Char-17; B 0 0 1000 1000; - C 18; WX 1; N Char-18; B 0 0 1000 1000; - C 19; WX 1; N Char-19; B 0 0 1000 1000; - C 20; WX 1; N Char-20; B 0 0 1000 1000; - C 21; WX 1; N Char-21; B 0 0 1000 1000; - C 22; WX 1; N Char-22; B 0 0 1000 1000; - C 23; WX 1; N Char-23; B 0 0 1000 1000; - C 24; WX 1; N Char-24; B 0 0 1000 1000; - C 25; WX 1; N Char-25; B 0 0 1000 1000; - C 26; WX 1; N Char-26; B 0 0 1000 1000; - C 27; WX 1; N Char-27; B 0 0 1000 1000; - C 28; WX 1; N Char-28; B 0 0 1000 1000; - C 29; WX 1; N Char-29; B 0 0 1000 1000; - C 30; WX 1; N Char-30; B 0 0 1000 1000; - C 31; WX 1; N Char-31; B 0 0 1000 1000; - C 32; WX 1; N Char-32; B 0 0 1000 1000; - C 33; WX 1; N Char-33; B 0 0 1000 1000; - C 34; WX 1; N Char-34; B 0 0 1000 1000; - C 35; WX 1; N Char-35; B 0 0 1000 1000; - C 36; WX 1; N Char-36; B 0 0 1000 1000; - C 37; WX 1; N Char-37; B 0 0 1000 1000; - C 38; WX 1; N Char-38; B 0 0 1000 1000; - C 39; WX 1; N Char-39; B 0 0 1000 1000; - C 40; WX 1; N Char-40; B 0 0 1000 1000; - C 41; WX 1; N Char-41; B 0 0 1000 1000; - C 42; WX 1; N Char-42; B 0 0 1000 1000; - C 43; WX 1; N Char-43; B 0 0 1000 1000; - C 44; WX 1; N Char-44; B 0 0 1000 1000; - C 45; WX 1; N Char-45; B 0 0 1000 1000; - C 46; WX 1; N Char-46; B 0 0 1000 1000; - C 47; WX 1; N Char-47; B 0 0 1000 1000; - C 48; WX 1; N Char-48; B 0 0 1000 1000; - C 49; WX 1; N Char-49; B 0 0 1000 1000; - C 50; WX 1; N Char-50; B 0 0 1000 1000; - C 51; WX 1; N Char-51; B 0 0 1000 1000; - C 52; WX 1; N Char-52; B 0 0 1000 1000; - C 53; WX 1; N Char-53; B 0 0 1000 1000; - C 54; WX 1; N Char-54; B 0 0 1000 1000; - C 55; WX 1; N Char-55; B 0 0 1000 1000; - C 56; WX 1; N Char-56; B 0 0 1000 1000; - C 57; WX 1; N Char-57; B 0 0 1000 1000; - C 58; WX 1; N Char-58; B 0 0 1000 1000; - C 59; WX 1; N Char-59; B 0 0 1000 1000; - C 60; WX 1; N Char-60; B 0 0 1000 1000; - C 61; WX 1; N Char-61; B 0 0 1000 1000; - C 62; WX 1; N Char-62; B 0 0 1000 1000; - C 63; WX 1; N Char-63; B 0 0 1000 1000; - C 64; WX 1; N Char-64; B 0 0 1000 1000; - C 65; WX 1; N Char-65; B 0 0 1000 1000; - C 66; WX 1; N Char-66; B 0 0 1000 1000; - C 67; WX 1; N Char-67; B 0 0 1000 1000; - C 68; WX 1; N Char-68; B 0 0 1000 1000; - C 69; WX 1; N Char-69; B 0 0 1000 1000; - C 70; WX 1; N Char-70; B 0 0 1000 1000; - C 71; WX 1; N Char-71; B 0 0 1000 1000; - C 72; WX 1; N Char-72; B 0 0 1000 1000; - C 73; WX 1; N Char-73; B 0 0 1000 1000; - C 74; WX 1; N Char-74; B 0 0 1000 1000; - C 75; WX 1; N Char-75; B 0 0 1000 1000; - C 76; WX 1; N Char-76; B 0 0 1000 1000; - C 77; WX 1; N Char-77; B 0 0 1000 1000; - C 78; WX 1; N Char-78; B 0 0 1000 1000; - C 79; WX 1; N Char-79; B 0 0 1000 1000; - C 80; WX 1; N Char-80; B 0 0 1000 1000; - C 81; WX 1; N Char-81; B 0 0 1000 1000; - C 82; WX 1; N Char-82; B 0 0 1000 1000; - C 83; WX 1; N Char-83; B 0 0 1000 1000; - C 84; WX 1; N Char-84; B 0 0 1000 1000; - C 85; WX 1; N Char-85; B 0 0 1000 1000; - C 86; WX 1; N Char-86; B 0 0 1000 1000; - C 87; WX 1; N Char-87; B 0 0 1000 1000; - C 88; WX 1; N Char-88; B 0 0 1000 1000; - C 89; WX 1; N Char-89; B 0 0 1000 1000; - C 90; WX 1; N Char-90; B 0 0 1000 1000; - C 91; WX 1; N Char-91; B 0 0 1000 1000; - C 92; WX 1; N Char-92; B 0 0 1000 1000; - C 93; WX 1; N Char-93; B 0 0 1000 1000; - C 94; WX 1; N Char-94; B 0 0 1000 1000; - C 95; WX 1; N Char-95; B 0 0 1000 1000; - C 96; WX 1; N Char-96; B 0 0 1000 1000; - C 97; WX 1; N Char-97; B 0 0 1000 1000; - C 98; WX 1; N Char-98; B 0 0 1000 1000; - C 99; WX 1; N Char-99; B 0 0 1000 1000; - C 100; WX 1; N Char-100; B 0 0 1000 1000; - C 101; WX 1; N Char-101; B 0 0 1000 1000; - C 102; WX 1; N Char-102; B 0 0 1000 1000; - C 103; WX 1; N Char-103; B 0 0 1000 1000; - C 104; WX 1; N Char-104; B 0 0 1000 1000; - C 105; WX 1; N Char-105; B 0 0 1000 1000; - C 106; WX 1; N Char-106; B 0 0 1000 1000; - C 107; WX 1; N Char-107; B 0 0 1000 1000; - C 108; WX 1; N Char-108; B 0 0 1000 1000; - C 109; WX 1; N Char-109; B 0 0 1000 1000; - C 110; WX 1; N Char-110; B 0 0 1000 1000; - C 111; WX 1; N Char-111; B 0 0 1000 1000; - C 112; WX 1; N Char-112; B 0 0 1000 1000; - C 113; WX 1; N Char-113; B 0 0 1000 1000; - C 114; WX 1; N Char-114; B 0 0 1000 1000; - C 115; WX 1; N Char-115; B 0 0 1000 1000; - C 116; WX 1; N Char-116; B 0 0 1000 1000; - C 117; WX 1; N Char-117; B 0 0 1000 1000; - C 118; WX 1; N Char-118; B 0 0 1000 1000; - C 119; WX 1; N Char-119; B 0 0 1000 1000; - C 120; WX 1; N Char-120; B 0 0 1000 1000; - C 121; WX 1; N Char-121; B 0 0 1000 1000; - C 122; WX 1; N Char-122; B 0 0 1000 1000; - C 123; WX 1; N Char-123; B 0 0 1000 1000; - C 124; WX 1; N Char-124; B 0 0 1000 1000; - C 125; WX 1; N Char-125; B 0 0 1000 1000; - C 126; WX 1; N Char-126; B 0 0 1000 1000; - C 127; WX 1; N Char-127; B 0 0 1000 1000; - C 128; WX 1; N Char-128; B 0 0 1000 1000; - C 129; WX 1; N Char-129; B 0 0 1000 1000; - C 130; WX 1; N Char-130; B 0 0 1000 1000; - C 131; WX 1; N Char-131; B 0 0 1000 1000; - C 132; WX 1; N Char-132; B 0 0 1000 1000; - C 133; WX 1; N Char-133; B 0 0 1000 1000; - C 134; WX 1; N Char-134; B 0 0 1000 1000; - C 135; WX 1; N Char-135; B 0 0 1000 1000; - C 136; WX 1; N Char-136; B 0 0 1000 1000; - C 137; WX 1; N Char-137; B 0 0 1000 1000; - C 138; WX 1; N Char-138; B 0 0 1000 1000; - C 139; WX 1; N Char-139; B 0 0 1000 1000; - C 140; WX 1; N Char-140; B 0 0 1000 1000; - C 141; WX 1; N Char-141; B 0 0 1000 1000; - C 142; WX 1; N Char-142; B 0 0 1000 1000; - C 143; WX 1; N Char-143; B 0 0 1000 1000; - C 144; WX 1; N Char-144; B 0 0 1000 1000; - C 145; WX 1; N Char-145; B 0 0 1000 1000; - C 146; WX 1; N Char-146; B 0 0 1000 1000; - C 147; WX 1; N Char-147; B 0 0 1000 1000; - C 148; WX 1; N Char-148; B 0 0 1000 1000; - C 149; WX 1; N Char-149; B 0 0 1000 1000; - C 150; WX 1; N Char-150; B 0 0 1000 1000; - C 151; WX 1; N Char-151; B 0 0 1000 1000; - C 152; WX 1; N Char-152; B 0 0 1000 1000; - C 153; WX 1; N Char-153; B 0 0 1000 1000; - C 154; WX 1; N Char-154; B 0 0 1000 1000; - C 155; WX 1; N Char-155; B 0 0 1000 1000; - C 156; WX 1; N Char-156; B 0 0 1000 1000; - C 157; WX 1; N Char-157; B 0 0 1000 1000; - C 158; WX 1; N Char-158; B 0 0 1000 1000; - C 159; WX 1; N Char-159; B 0 0 1000 1000; - C 160; WX 1; N Char-160; B 0 0 1000 1000; - C 161; WX 1; N Char-161; B 0 0 1000 1000; - C 162; WX 1; N Char-162; B 0 0 1000 1000; - C 163; WX 1; N Char-163; B 0 0 1000 1000; - C 164; WX 1; N Char-164; B 0 0 1000 1000; - C 165; WX 1; N Char-165; B 0 0 1000 1000; - C 166; WX 1; N Char-166; B 0 0 1000 1000; - C 167; WX 1; N Char-167; B 0 0 1000 1000; - C 168; WX 1; N Char-168; B 0 0 1000 1000; - C 169; WX 1; N Char-169; B 0 0 1000 1000; - C 170; WX 1; N Char-170; B 0 0 1000 1000; - C 171; WX 1; N Char-171; B 0 0 1000 1000; - C 172; WX 1; N Char-172; B 0 0 1000 1000; - C 173; WX 1; N Char-173; B 0 0 1000 1000; - C 174; WX 1; N Char-174; B 0 0 1000 1000; - C 175; WX 1; N Char-175; B 0 0 1000 1000; - C 176; WX 1; N Char-176; B 0 0 1000 1000; - C 177; WX 1; N Char-177; B 0 0 1000 1000; - C 178; WX 1; N Char-178; B 0 0 1000 1000; - C 179; WX 1; N Char-179; B 0 0 1000 1000; - C 180; WX 1; N Char-180; B 0 0 1000 1000; - C 181; WX 1; N Char-181; B 0 0 1000 1000; - C 182; WX 1; N Char-182; B 0 0 1000 1000; - C 183; WX 1; N Char-183; B 0 0 1000 1000; - C 184; WX 1; N Char-184; B 0 0 1000 1000; - C 185; WX 1; N Char-185; B 0 0 1000 1000; - C 186; WX 1; N Char-186; B 0 0 1000 1000; - C 187; WX 1; N Char-187; B 0 0 1000 1000; - C 188; WX 1; N Char-188; B 0 0 1000 1000; - C 189; WX 1; N Char-189; B 0 0 1000 1000; - C 190; WX 1; N Char-190; B 0 0 1000 1000; - C 191; WX 1; N Char-191; B 0 0 1000 1000; - C 192; WX 1; N Char-192; B 0 0 1000 1000; - C 193; WX 1; N Char-193; B 0 0 1000 1000; - C 194; WX 1; N Char-194; B 0 0 1000 1000; - C 195; WX 1; N Char-195; B 0 0 1000 1000; - C 196; WX 1; N Char-196; B 0 0 1000 1000; - C 197; WX 1; N Char-197; B 0 0 1000 1000; - C 198; WX 1; N Char-198; B 0 0 1000 1000; - C 199; WX 1; N Char-199; B 0 0 1000 1000; - C 200; WX 1; N Char-200; B 0 0 1000 1000; - C 201; WX 1; N Char-201; B 0 0 1000 1000; - C 202; WX 1; N Char-202; B 0 0 1000 1000; - C 203; WX 1; N Char-203; B 0 0 1000 1000; - C 204; WX 1; N Char-204; B 0 0 1000 1000; - C 205; WX 1; N Char-205; B 0 0 1000 1000; - C 206; WX 1; N Char-206; B 0 0 1000 1000; - C 207; WX 1; N Char-207; B 0 0 1000 1000; - C 208; WX 1; N Char-208; B 0 0 1000 1000; - C 209; WX 1; N Char-209; B 0 0 1000 1000; - C 210; WX 1; N Char-210; B 0 0 1000 1000; - C 211; WX 1; N Char-211; B 0 0 1000 1000; - C 212; WX 1; N Char-212; B 0 0 1000 1000; - C 213; WX 1; N Char-213; B 0 0 1000 1000; - C 214; WX 1; N Char-214; B 0 0 1000 1000; - C 215; WX 1; N Char-215; B 0 0 1000 1000; - C 216; WX 1; N Char-216; B 0 0 1000 1000; - C 217; WX 1; N Char-217; B 0 0 1000 1000; - C 218; WX 1; N Char-218; B 0 0 1000 1000; - C 219; WX 1; N Char-219; B 0 0 1000 1000; - C 220; WX 1; N Char-220; B 0 0 1000 1000; - C 221; WX 1; N Char-221; B 0 0 1000 1000; - C 222; WX 1; N Char-222; B 0 0 1000 1000; - C 223; WX 1; N Char-223; B 0 0 1000 1000; - C 224; WX 1; N Char-224; B 0 0 1000 1000; - C 225; WX 1; N Char-225; B 0 0 1000 1000; - C 226; WX 1; N Char-226; B 0 0 1000 1000; - C 227; WX 1; N Char-227; B 0 0 1000 1000; - C 228; WX 1; N Char-228; B 0 0 1000 1000; - C 229; WX 1; N Char-229; B 0 0 1000 1000; - C 230; WX 1; N Char-230; B 0 0 1000 1000; - C 231; WX 1; N Char-231; B 0 0 1000 1000; - C 232; WX 1; N Char-232; B 0 0 1000 1000; - C 233; WX 1; N Char-233; B 0 0 1000 1000; - C 234; WX 1; N Char-234; B 0 0 1000 1000; - C 235; WX 1; N Char-235; B 0 0 1000 1000; - C 236; WX 1; N Char-236; B 0 0 1000 1000; - C 237; WX 1; N Char-237; B 0 0 1000 1000; - C 238; WX 1; N Char-238; B 0 0 1000 1000; - C 239; WX 1; N Char-239; B 0 0 1000 1000; - C 240; WX 1; N Char-240; B 0 0 1000 1000; - C 241; WX 1; N Char-241; B 0 0 1000 1000; - C 242; WX 1; N Char-242; B 0 0 1000 1000; - C 243; WX 1; N Char-243; B 0 0 1000 1000; - C 244; WX 1; N Char-244; B 0 0 1000 1000; - C 245; WX 1; N Char-245; B 0 0 1000 1000; - C 246; WX 1; N Char-246; B 0 0 1000 1000; - C 247; WX 1; N Char-247; B 0 0 1000 1000; - C 248; WX 1; N Char-248; B 0 0 1000 1000; - C 249; WX 1; N Char-249; B 0 0 1000 1000; - C 250; WX 1; N Char-250; B 0 0 1000 1000; - C 251; WX 1; N Char-251; B 0 0 1000 1000; - C 252; WX 1; N Char-252; B 0 0 1000 1000; - C 253; WX 1; N Char-253; B 0 0 1000 1000; - C 254; WX 1; N Char-254; B 0 0 1000 1000; - C 255; WX 1; N Char-255; B 0 0 1000 1000; - EndCharMetrics - EndFontMetrics %d diff --git a/mf/as-dummy1.af b/mf/as-dummy1.af deleted file mode 100644 index f92f9a5cdf..0000000000 --- a/mf/as-dummy1.af +++ /dev/null @@ -1,279 +0,0 @@ - Comment as-dummy.af -- AsciiFont: sane metrics for LilyPond - - Comment part of LilyPond's [ascii music font] - - Comment (c) 2000--2003 Jan Nieuwenhuizen - - Comment Lines that start with TAB or FF make up the .afm - Comment TABs are comments - Comment `Comment' is the afm comment prefix - Comment which makes `TAB Comment' an .afm comment - - Comment Urg: this should be generated - Comment It only serves as a generic catch-all metric file - Comment for LilyPond - - StartFontMetrics 2.0 - FontName as-dummy - FontFamily as-dummy - StartCharMetrics 256 - - Comment BBox: (llx lly urx ury) * 1000 - C 0; WX 1; N Char-0; B 0 0 1000 1000; - C 1; WX 1; N Char-1; B 0 0 1000 1000; - C 2; WX 1; N Char-2; B 0 0 1000 1000; - C 3; WX 1; N Char-3; B 0 0 1000 1000; - C 4; WX 1; N Char-4; B 0 0 1000 1000; - C 5; WX 1; N Char-5; B 0 0 1000 1000; - C 6; WX 1; N Char-6; B 0 0 1000 1000; - C 7; WX 1; N Char-7; B 0 0 1000 1000; - C 8; WX 1; N Char-8; B 0 0 1000 1000; - C 9; WX 1; N Char-9; B 0 0 1000 1000; - C 10; WX 1; N Char-10; B 0 0 1000 1000; - C 11; WX 1; N Char-11; B 0 0 1000 1000; - C 12; WX 1; N Char-12; B 0 0 1000 1000; - C 13; WX 1; N Char-13; B 0 0 1000 1000; - C 14; WX 1; N Char-14; B 0 0 1000 1000; - C 15; WX 1; N Char-15; B 0 0 1000 1000; - C 16; WX 1; N Char-16; B 0 0 1000 1000; - C 17; WX 1; N Char-17; B 0 0 1000 1000; - C 18; WX 1; N Char-18; B 0 0 1000 1000; - C 19; WX 1; N Char-19; B 0 0 1000 1000; - C 20; WX 1; N Char-20; B 0 0 1000 1000; - C 21; WX 1; N Char-21; B 0 0 1000 1000; - C 22; WX 1; N Char-22; B 0 0 1000 1000; - C 23; WX 1; N Char-23; B 0 0 1000 1000; - C 24; WX 1; N Char-24; B 0 0 1000 1000; - C 25; WX 1; N Char-25; B 0 0 1000 1000; - C 26; WX 1; N Char-26; B 0 0 1000 1000; - C 27; WX 1; N Char-27; B 0 0 1000 1000; - C 28; WX 1; N Char-28; B 0 0 1000 1000; - C 29; WX 1; N Char-29; B 0 0 1000 1000; - C 30; WX 1; N Char-30; B 0 0 1000 1000; - C 31; WX 1; N Char-31; B 0 0 1000 1000; - C 32; WX 1; N Char-32; B 0 0 1000 1000; - C 33; WX 1; N Char-33; B 0 0 1000 1000; - C 34; WX 1; N Char-34; B 0 0 1000 1000; - C 35; WX 1; N Char-35; B 0 0 1000 1000; - C 36; WX 1; N Char-36; B 0 0 1000 1000; - C 37; WX 1; N Char-37; B 0 0 1000 1000; - C 38; WX 1; N Char-38; B 0 0 1000 1000; - C 39; WX 1; N Char-39; B 0 0 1000 1000; - C 40; WX 1; N Char-40; B 0 0 1000 1000; - C 41; WX 1; N Char-41; B 0 0 1000 1000; - C 42; WX 1; N Char-42; B 0 0 1000 1000; - C 43; WX 1; N Char-43; B 0 0 1000 1000; - C 44; WX 1; N Char-44; B 0 0 1000 1000; - C 45; WX 1; N Char-45; B 0 0 1000 1000; - C 46; WX 1; N Char-46; B 0 0 1000 1000; - C 47; WX 1; N Char-47; B 0 0 1000 1000; - C 48; WX 1; N Char-48; B 0 0 1000 1000; - C 49; WX 1; N Char-49; B 0 0 1000 1000; - C 50; WX 1; N Char-50; B 0 0 1000 1000; - C 51; WX 1; N Char-51; B 0 0 1000 1000; - C 52; WX 1; N Char-52; B 0 0 1000 1000; - C 53; WX 1; N Char-53; B 0 0 1000 1000; - C 54; WX 1; N Char-54; B 0 0 1000 1000; - C 55; WX 1; N Char-55; B 0 0 1000 1000; - C 56; WX 1; N Char-56; B 0 0 1000 1000; - C 57; WX 1; N Char-57; B 0 0 1000 1000; - C 58; WX 1; N Char-58; B 0 0 1000 1000; - C 59; WX 1; N Char-59; B 0 0 1000 1000; - C 60; WX 1; N Char-60; B 0 0 1000 1000; - C 61; WX 1; N Char-61; B 0 0 1000 1000; - C 62; WX 1; N Char-62; B 0 0 1000 1000; - C 63; WX 1; N Char-63; B 0 0 1000 1000; - C 64; WX 1; N Char-64; B 0 0 1000 1000; - C 65; WX 1; N Char-65; B 0 0 1000 1000; - C 66; WX 1; N Char-66; B 0 0 1000 1000; - C 67; WX 1; N Char-67; B 0 0 1000 1000; - C 68; WX 1; N Char-68; B 0 0 1000 1000; - C 69; WX 1; N Char-69; B 0 0 1000 1000; - C 70; WX 1; N Char-70; B 0 0 1000 1000; - C 71; WX 1; N Char-71; B 0 0 1000 1000; - C 72; WX 1; N Char-72; B 0 0 1000 1000; - C 73; WX 1; N Char-73; B 0 0 1000 1000; - C 74; WX 1; N Char-74; B 0 0 1000 1000; - C 75; WX 1; N Char-75; B 0 0 1000 1000; - C 76; WX 1; N Char-76; B 0 0 1000 1000; - C 77; WX 1; N Char-77; B 0 0 1000 1000; - C 78; WX 1; N Char-78; B 0 0 1000 1000; - C 79; WX 1; N Char-79; B 0 0 1000 1000; - C 80; WX 1; N Char-80; B 0 0 1000 1000; - C 81; WX 1; N Char-81; B 0 0 1000 1000; - C 82; WX 1; N Char-82; B 0 0 1000 1000; - C 83; WX 1; N Char-83; B 0 0 1000 1000; - C 84; WX 1; N Char-84; B 0 0 1000 1000; - C 85; WX 1; N Char-85; B 0 0 1000 1000; - C 86; WX 1; N Char-86; B 0 0 1000 1000; - C 87; WX 1; N Char-87; B 0 0 1000 1000; - C 88; WX 1; N Char-88; B 0 0 1000 1000; - C 89; WX 1; N Char-89; B 0 0 1000 1000; - C 90; WX 1; N Char-90; B 0 0 1000 1000; - C 91; WX 1; N Char-91; B 0 0 1000 1000; - C 92; WX 1; N Char-92; B 0 0 1000 1000; - C 93; WX 1; N Char-93; B 0 0 1000 1000; - C 94; WX 1; N Char-94; B 0 0 1000 1000; - C 95; WX 1; N Char-95; B 0 0 1000 1000; - C 96; WX 1; N Char-96; B 0 0 1000 1000; - C 97; WX 1; N Char-97; B 0 0 1000 1000; - C 98; WX 1; N Char-98; B 0 0 1000 1000; - C 99; WX 1; N Char-99; B 0 0 1000 1000; - C 100; WX 1; N Char-100; B 0 0 1000 1000; - C 101; WX 1; N Char-101; B 0 0 1000 1000; - C 102; WX 1; N Char-102; B 0 0 1000 1000; - C 103; WX 1; N Char-103; B 0 0 1000 1000; - C 104; WX 1; N Char-104; B 0 0 1000 1000; - C 105; WX 1; N Char-105; B 0 0 1000 1000; - C 106; WX 1; N Char-106; B 0 0 1000 1000; - C 107; WX 1; N Char-107; B 0 0 1000 1000; - C 108; WX 1; N Char-108; B 0 0 1000 1000; - C 109; WX 1; N Char-109; B 0 0 1000 1000; - C 110; WX 1; N Char-110; B 0 0 1000 1000; - C 111; WX 1; N Char-111; B 0 0 1000 1000; - C 112; WX 1; N Char-112; B 0 0 1000 1000; - C 113; WX 1; N Char-113; B 0 0 1000 1000; - C 114; WX 1; N Char-114; B 0 0 1000 1000; - C 115; WX 1; N Char-115; B 0 0 1000 1000; - C 116; WX 1; N Char-116; B 0 0 1000 1000; - C 117; WX 1; N Char-117; B 0 0 1000 1000; - C 118; WX 1; N Char-118; B 0 0 1000 1000; - C 119; WX 1; N Char-119; B 0 0 1000 1000; - C 120; WX 1; N Char-120; B 0 0 1000 1000; - C 121; WX 1; N Char-121; B 0 0 1000 1000; - C 122; WX 1; N Char-122; B 0 0 1000 1000; - C 123; WX 1; N Char-123; B 0 0 1000 1000; - C 124; WX 1; N Char-124; B 0 0 1000 1000; - C 125; WX 1; N Char-125; B 0 0 1000 1000; - C 126; WX 1; N Char-126; B 0 0 1000 1000; - C 127; WX 1; N Char-127; B 0 0 1000 1000; - C 128; WX 1; N Char-128; B 0 0 1000 1000; - C 129; WX 1; N Char-129; B 0 0 1000 1000; - C 130; WX 1; N Char-130; B 0 0 1000 1000; - C 131; WX 1; N Char-131; B 0 0 1000 1000; - C 132; WX 1; N Char-132; B 0 0 1000 1000; - C 133; WX 1; N Char-133; B 0 0 1000 1000; - C 134; WX 1; N Char-134; B 0 0 1000 1000; - C 135; WX 1; N Char-135; B 0 0 1000 1000; - C 136; WX 1; N Char-136; B 0 0 1000 1000; - C 137; WX 1; N Char-137; B 0 0 1000 1000; - C 138; WX 1; N Char-138; B 0 0 1000 1000; - C 139; WX 1; N Char-139; B 0 0 1000 1000; - C 140; WX 1; N Char-140; B 0 0 1000 1000; - C 141; WX 1; N Char-141; B 0 0 1000 1000; - C 142; WX 1; N Char-142; B 0 0 1000 1000; - C 143; WX 1; N Char-143; B 0 0 1000 1000; - C 144; WX 1; N Char-144; B 0 0 1000 1000; - C 145; WX 1; N Char-145; B 0 0 1000 1000; - C 146; WX 1; N Char-146; B 0 0 1000 1000; - C 147; WX 1; N Char-147; B 0 0 1000 1000; - C 148; WX 1; N Char-148; B 0 0 1000 1000; - C 149; WX 1; N Char-149; B 0 0 1000 1000; - C 150; WX 1; N Char-150; B 0 0 1000 1000; - C 151; WX 1; N Char-151; B 0 0 1000 1000; - C 152; WX 1; N Char-152; B 0 0 1000 1000; - C 153; WX 1; N Char-153; B 0 0 1000 1000; - C 154; WX 1; N Char-154; B 0 0 1000 1000; - C 155; WX 1; N Char-155; B 0 0 1000 1000; - C 156; WX 1; N Char-156; B 0 0 1000 1000; - C 157; WX 1; N Char-157; B 0 0 1000 1000; - C 158; WX 1; N Char-158; B 0 0 1000 1000; - C 159; WX 1; N Char-159; B 0 0 1000 1000; - C 160; WX 1; N Char-160; B 0 0 1000 1000; - C 161; WX 1; N Char-161; B 0 0 1000 1000; - C 162; WX 1; N Char-162; B 0 0 1000 1000; - C 163; WX 1; N Char-163; B 0 0 1000 1000; - C 164; WX 1; N Char-164; B 0 0 1000 1000; - C 165; WX 1; N Char-165; B 0 0 1000 1000; - C 166; WX 1; N Char-166; B 0 0 1000 1000; - C 167; WX 1; N Char-167; B 0 0 1000 1000; - C 168; WX 1; N Char-168; B 0 0 1000 1000; - C 169; WX 1; N Char-169; B 0 0 1000 1000; - C 170; WX 1; N Char-170; B 0 0 1000 1000; - C 171; WX 1; N Char-171; B 0 0 1000 1000; - C 172; WX 1; N Char-172; B 0 0 1000 1000; - C 173; WX 1; N Char-173; B 0 0 1000 1000; - C 174; WX 1; N Char-174; B 0 0 1000 1000; - C 175; WX 1; N Char-175; B 0 0 1000 1000; - C 176; WX 1; N Char-176; B 0 0 1000 1000; - C 177; WX 1; N Char-177; B 0 0 1000 1000; - C 178; WX 1; N Char-178; B 0 0 1000 1000; - C 179; WX 1; N Char-179; B 0 0 1000 1000; - C 180; WX 1; N Char-180; B 0 0 1000 1000; - C 181; WX 1; N Char-181; B 0 0 1000 1000; - C 182; WX 1; N Char-182; B 0 0 1000 1000; - C 183; WX 1; N Char-183; B 0 0 1000 1000; - C 184; WX 1; N Char-184; B 0 0 1000 1000; - C 185; WX 1; N Char-185; B 0 0 1000 1000; - C 186; WX 1; N Char-186; B 0 0 1000 1000; - C 187; WX 1; N Char-187; B 0 0 1000 1000; - C 188; WX 1; N Char-188; B 0 0 1000 1000; - C 189; WX 1; N Char-189; B 0 0 1000 1000; - C 190; WX 1; N Char-190; B 0 0 1000 1000; - C 191; WX 1; N Char-191; B 0 0 1000 1000; - C 192; WX 1; N Char-192; B 0 0 1000 1000; - C 193; WX 1; N Char-193; B 0 0 1000 1000; - C 194; WX 1; N Char-194; B 0 0 1000 1000; - C 195; WX 1; N Char-195; B 0 0 1000 1000; - C 196; WX 1; N Char-196; B 0 0 1000 1000; - C 197; WX 1; N Char-197; B 0 0 1000 1000; - C 198; WX 1; N Char-198; B 0 0 1000 1000; - C 199; WX 1; N Char-199; B 0 0 1000 1000; - C 200; WX 1; N Char-200; B 0 0 1000 1000; - C 201; WX 1; N Char-201; B 0 0 1000 1000; - C 202; WX 1; N Char-202; B 0 0 1000 1000; - C 203; WX 1; N Char-203; B 0 0 1000 1000; - C 204; WX 1; N Char-204; B 0 0 1000 1000; - C 205; WX 1; N Char-205; B 0 0 1000 1000; - C 206; WX 1; N Char-206; B 0 0 1000 1000; - C 207; WX 1; N Char-207; B 0 0 1000 1000; - C 208; WX 1; N Char-208; B 0 0 1000 1000; - C 209; WX 1; N Char-209; B 0 0 1000 1000; - C 210; WX 1; N Char-210; B 0 0 1000 1000; - C 211; WX 1; N Char-211; B 0 0 1000 1000; - C 212; WX 1; N Char-212; B 0 0 1000 1000; - C 213; WX 1; N Char-213; B 0 0 1000 1000; - C 214; WX 1; N Char-214; B 0 0 1000 1000; - C 215; WX 1; N Char-215; B 0 0 1000 1000; - C 216; WX 1; N Char-216; B 0 0 1000 1000; - C 217; WX 1; N Char-217; B 0 0 1000 1000; - C 218; WX 1; N Char-218; B 0 0 1000 1000; - C 219; WX 1; N Char-219; B 0 0 1000 1000; - C 220; WX 1; N Char-220; B 0 0 1000 1000; - C 221; WX 1; N Char-221; B 0 0 1000 1000; - C 222; WX 1; N Char-222; B 0 0 1000 1000; - C 223; WX 1; N Char-223; B 0 0 1000 1000; - C 224; WX 1; N Char-224; B 0 0 1000 1000; - C 225; WX 1; N Char-225; B 0 0 1000 1000; - C 226; WX 1; N Char-226; B 0 0 1000 1000; - C 227; WX 1; N Char-227; B 0 0 1000 1000; - C 228; WX 1; N Char-228; B 0 0 1000 1000; - C 229; WX 1; N Char-229; B 0 0 1000 1000; - C 230; WX 1; N Char-230; B 0 0 1000 1000; - C 231; WX 1; N Char-231; B 0 0 1000 1000; - C 232; WX 1; N Char-232; B 0 0 1000 1000; - C 233; WX 1; N Char-233; B 0 0 1000 1000; - C 234; WX 1; N Char-234; B 0 0 1000 1000; - C 235; WX 1; N Char-235; B 0 0 1000 1000; - C 236; WX 1; N Char-236; B 0 0 1000 1000; - C 237; WX 1; N Char-237; B 0 0 1000 1000; - C 238; WX 1; N Char-238; B 0 0 1000 1000; - C 239; WX 1; N Char-239; B 0 0 1000 1000; - C 240; WX 1; N Char-240; B 0 0 1000 1000; - C 241; WX 1; N Char-241; B 0 0 1000 1000; - C 242; WX 1; N Char-242; B 0 0 1000 1000; - C 243; WX 1; N Char-243; B 0 0 1000 1000; - C 244; WX 1; N Char-244; B 0 0 1000 1000; - C 245; WX 1; N Char-245; B 0 0 1000 1000; - C 246; WX 1; N Char-246; B 0 0 1000 1000; - C 247; WX 1; N Char-247; B 0 0 1000 1000; - C 248; WX 1; N Char-248; B 0 0 1000 1000; - C 249; WX 1; N Char-249; B 0 0 1000 1000; - C 250; WX 1; N Char-250; B 0 0 1000 1000; - C 251; WX 1; N Char-251; B 0 0 1000 1000; - C 252; WX 1; N Char-252; B 0 0 1000 1000; - C 253; WX 1; N Char-253; B 0 0 1000 1000; - C 254; WX 1; N Char-254; B 0 0 1000 1000; - C 255; WX 1; N Char-255; B 0 0 1000 1000; - EndCharMetrics - EndFontMetrics %d diff --git a/mf/as-number1.af b/mf/as-number1.af deleted file mode 100644 index a9b4dae3d3..0000000000 --- a/mf/as-number1.af +++ /dev/null @@ -1,47 +0,0 @@ - Comment as-number1.af -- AsciiFont: numerals of height 1 - - Comment part of LilyPond's [ascii music font] - - Comment (c) 2000--2003 Jan Nieuwenhuizen - - Comment Lines that start with TAB or FF make up the .afm - Comment TABs are comments - Comment `Comment' is the afm comment prefix - Comment which makes `TAB Comment' an .afm comment - - StartFontMetrics 2.0 - FontName as-number 1 - FontFamily as-number - StartCharMetrics 14 - - Comment BBox: (llx lly urx ury) * 1000 - C 44; WX 1; N Comma; B 0 0 1000 1000; -, - C 45; WX 1; N Dash; B 0 0 1000 1000; -- - C 46; WX 1; N Dot; B 0 0 1000 1000; -. - C 47; WX 1; N Slash; B 0 0 1000 1000; -/ - C 48; WX 1; N Numeral-0; B 0 0 1000 1000; -0 - C 49; WX 1; N Numeral-1; B 0 0 1000 1000; -1 - C 50; WX 1; N Numeral-2; B 0 0 1000 1000; -2 - C 51; WX 1; N Numeral-3; B 0 0 1000 1000; -3 - C 52; WX 1; N Numeral-4; B 0 0 1000 1000; -4 - C 53; WX 1; N Numeral-5; B 0 0 1000 1000; -5 - C 54; WX 1; N Numeral-6; B 0 0 1000 1000; -6 - C 55; WX 1; N Numeral-7; B 0 0 1000 1000; -7 - C 56; WX 1; N Numeral-8; B 0 0 1000 1000; -8 - C 57; WX 1; N Numeral-9; B 0 0 1000 1000; -9 - EndCharMetrics - EndFontMetrics %d diff --git a/mf/as-number4.af b/mf/as-number4.af deleted file mode 100644 index bb6510d278..0000000000 --- a/mf/as-number4.af +++ /dev/null @@ -1,91 +0,0 @@ - Comment as-number4.af -- AsciiFont: numerals of height 4 - - Comment part of LilyPond's [ascii music font] - - Comment (c) 2000--2003 Jan Nieuwenhuizen - - Comment Lines that start with TAB or FF make up the .afm - Comment TABs are comments - Comment `Comment' is the afm comment prefix - Comment which makes `TAB Comment' an .afm comment - - StartFontMetrics 2.0 - FontName as-number 4 - FontFamily as-number - StartCharMetrics 14 - - Comment BBox: (llx lly urx ury) * 1000 - C 44; WX 1; N Comma; B 0 -1000 1000 1000; -** - / - C 45; WX 1; N Dash; B 0 -1000 1000 1000; -** - C 46; WX 1; N Dot; B 0 -1000 1000 1000; -** -** - C 47; WX 1; N Slash; B 0 -1000 1000 1000; - / - / - / -/ - C 48; WX 1; N Numeral-0; B 0 1000 5000 5000; - __ - / \ -| | - \__/ - C 49; WX 1; N Numeral-1; B 0 1000 5000 5000; - _ - /| -/ | -__|__ - C 50; WX 1; N Numeral-2; B 0 1000 5000 5000; - ___ - / ) - _.-' -(____. - C 51; WX 1; N Numeral-3; B 0 0 5000 5000; - ___ -' ) - --( -.___) - C 52; WX 1; N Numeral-4; B 0 0 5000 5000; - _ - / | -/__|_ -___|_ - C 53; WX 1; N Numeral-5; B 0 1000 5000 5000; - ____ -(___ - \ -.___/ - C 54; WX 1; N Numeral-6; B 0 1000 5000 5000; - ___ - /__ -/ \ -\___/ - C 55; WX 1; N Numeral-7; B 0 1000 5000 5000; -____ - / - -/- - / - C 56; WX 1; N Numeral-8; B 0 1000 5000 5000; - __ - (__) -/ \ -\____/ - C 57; WX 1; N Numeral-9; B 0 1000 5000 5000; - ___ -/ \ -\___/ -___/ - EndCharMetrics - EndFontMetrics %d ----------------------------------------------------------------------- - __ _ ___ ___ _ ____ ___ ____ __ ___ - / \ /| / ) ' ) / | (___ /__ / (__) / \ -| | / | _.-' --( /__|_ \ / \ -/- / \ \___/ - \__/ __|__ (____. .___) ___|_ .___/ \___/ / \____/ ___/ ----------------------------------------------------------------------- - - - diff --git a/mf/as5.af b/mf/as5.af deleted file mode 100644 index 71d313273a..0000000000 --- a/mf/as5.af +++ /dev/null @@ -1,214 +0,0 @@ - Comment as5.af -- AsciiFont: music font of height 5 - - Comment part of LilyPond's [ascii music font] - - Comment (c) 2000--2003 Jan Nieuwenhuizen - - Comment Thanks go to out to participants in discussions on - Comment alt.ascii-art and rec.music.compose - - Comment noteheads-0 by llizard/ejm - Comment and Shaun Mead - - Comment Lines that start with TAB or FF make up the .afm - Comment TABs are comments - Comment `Comment' is the afm comment prefix - Comment which makes `TAB Comment' an .afm comment - - StartFontMetrics 2.0 - FontName as 5 - FontFamily as - StartCharMetrics 59 - - Comment BBox: (llx lly urx ury) * 1000 - C 0; WX 7; N rests-0; B 0 0 1000 1000; -R - C 1; WX 7; N rests-1; B 0 0 1000 1000; -R - C 7; WX 5; N rests-2; B 0 0 1000 1000; -R - C 8; WX 6; N rests-3; B 0 0 1000 1000; -r - C 9; WX 7; N rests-4; B 0 0 1000 1000; -r - C 10; WX 8; N rests-5; B 0 0 1000 1000; -r - C 10; WX 8; N rests-5; B 0 0 1000 1000; -r - C 11; WX 9; N rests-6; B 0 0 1000 1000; -r - C 16; WX 5; N accidentals-1; B 0 0 1000 1000; -# - C 17; WX 3; N accidentals-0; B 0 0 1000 1000; -H - C 18; WX 4; N accidentals--1; B 0 0 1000 1000; -b - C 19; WX 7; N accidentals--2; B 0 0 1000 1000; -bb - C 20; WX 5; N accidentals-2; B 0 0 1000 1000; -x - C 21; WX 3; N accidentals-); B 0 -5000 3000 5000; -( - C 22; WX 3; N accidentals-(; B -3000 -5000 0 5000; -) - C 23; WX 2; N dots-dot; B 0 0 1000 1000; -. - C 24; WX 1; N dots-repeatcolon; B 0 1000 1000 4000; -: - C 31; WX 5; N noteheads-ledgerending; B -1500 -500 1500 500; -- - C 33; WX 1; N noteheads-0; B 0 -500 1000 500; -O - C 33.5; WX 1; N noteheads-0; B -1000 -500 1000 2000; -,-, -`-' - C 34; WX 1; N noteheads-1; B -1000 -500 0 500; -o - C 34.5; WX 1; N noteheads-1; B -1000 -500 0 500; -° - C 35; WX 1; N noteheads-2; B -1000 0 0 1000; -x - C 35.5; WX 1; N noteheads-2.5; B -1000 0 0 1000; -* - C 36; WX 9; N noteheads-0diamond; B 0 -2750 9900 2750; -V - C 37; WX 7; N noteheads-1diamond; B 0 -2750 7081 2750; -v - C 38; WX 6; N noteheads-2diamond; B 0 -2750 6605 2750; -v - C 39; WX 6; N noteheads-2cross; B 0 -2750 6605 2750; -x - C 40; WX 13; N scripts-ufermata; B -6625 -375 6625 7250; - _ -/.\ - C 41; WX 13; N scripts-dfermata; B -6625 -7250 6625 375; - . -\_/ - C 43; WX 8; N scripts-sforzato; B -4499 -2500 4499 2500; -> - C 44; WX 1; N scripts-staccato; B 0 0 1000 1000; -. - C 45; WX 2; N scripts-ustaccatissimo; B -1000 -200 1000 5000; -^ - C 46; WX 2; N scripts-dstaccatissimo; B -1000 -5000 1000 200; -v - C 47; WX 6; N scripts-tenuto; B -3000 -350 3000 350; ---- - C 48; WX 5; N scripts-umarcato; B -2500 0 2500 5500; -| - C 49; WX 5; N scripts-dmarcato; B -2500 -5500 2500 0; -| - C 50; WX 4; N scripts-open; B -2000 -2500 2000 2500; -o - C 51; WX 5; N scripts-stopped; B -2750 -2750 2750 2750; -+ - C 52; WX 6; N scripts-upbow; B -3250 0 3250 10400; -\/ - C 53; WX 7; N scripts-downbow; B -3750 0 3750 6666; - _ -| | - C 56; WX 10; N scripts-trill; B -5000 0 5000 11250; -\/\ - C 61; WX 5; N scripts-flageolet; B -2666 -2666 2666 2666; -o - C 81; WX 6; N flags-u3; B 1000 -1000 3000 -1000; -\ - ) - C 82; WX 6; N flags-u4; B 1000 -2000 3000 0; -\ -\) - C 83; WX 6; N flags-u5; B 0 0 3000 5000; -\ -\) - C 84; WX 6; N flags-u6; B 0 0 3000 5000; -\ -)) - C 86; WX 7; N flags-d3; B 1000 5000 3000 0; - ) -/ - C 87; WX 7; N flags-d4; B 1000 5000 3000 0; -)) -/ - C 88; WX 7; N flags-d5; B 1000 5000 3000 0; -)) -/ - C 89; WX 7; N flags-d6; B 1000 5000 3000 0; -)) -/ - C 91; WX 13; N clefs-C; B 0 7000 7000 -3000; -|__ -| _) -|<_ -|__) -| - C 92; WX 10; N clefs-C_change; B 0 7000 7000 -3000; -B: - C 93; WX 10; N clefs-F; B 0 -3000 5000 2000; - __ -(, ): - / -_/ - C 94; WX 8; N clefs-F_change; B 0 7000 7000 -3000; -F: - C 95; WX 1; N clefs-G; B 0 -2000 6000 5000; - |\ - |/ - /| - / |_ -| /| \ - \_|_/ - *_| - C 96; WX 10; N clefs-G_change; B 0 7000 7000 -3000; -G: - C 97; WX 17; N timesig-C4/4; B 0 7000 7000 -3000; -C - C 98; WX 17; N timesig-C2/2; B 0 7000 7000 -3000; -C| - EndCharMetrics - EndFontMetrics %d - - Comment Missing characters -C 2; WX 7; N rests-0o; B 0 -3125 7500 500; -C 3; WX 7; N rests-1o; B 0 -500 7500 3125; -C 4; WX 3; N rests--1; B 0 0 3000 5000; -C 5; WX 3; N rests--2; B 0 -5000 3000 5000; -C 6; WX 40; N rests--4; B -20000 -5000 20000 5000; -C 12; WX 10; N rests-7; B 0 -15000 10447 14208; -C 54; WX 10; N scripts-reverseturn; B -5468 -2647 5468 2647; -C 55; WX 10; N scripts-turn; B -5468 -2647 5468 2647; -C 13; WX 4; N rests-2mensural; B 0 0 4000 4000; -C 14; WX 4; N rests-3mensural; B 0 0 4000 4000; -C 15; WX 4; N rests-4mensural; B 0 0 4000 5000; -C 32; WX 9; N noteheads--1; B 0 -2750 9900 2750; -C 62; WX 10; N scripts-repeatsign; B -5000 -5000 5000 5000; -C 63; WX 10; N scripts-segno; B -5000 -7500 5000 7500; -C 64; WX 10; N scripts-coda; B -5083 -6750 5083 6750; -C 65; WX 4; N scripts-trilelement; B -3333 -2500 1306 2500; -C 66; WX 11; N scripts-prall; B -5653 -2500 5653 2500; -C 67; WX 11; N scripts-mordent; B -5653 -2500 5653 2500; -C 68; WX 15; N scripts-prallprall; B -7973 -2500 7973 2500; -C 69; WX 15; N scripts-prallmordent; B -7973 -2500 7973 2500; -C 70; WX 15; N scripts-upprall; B -7973 -2500 7973 2500; -C 71; WX 15; N scripts-downprall; B -7973 -2500 7973 2500; -C 72; WX 15; N scripts-accDiscant; B -7500 0 7500 15000; -C 73; WX 5; N scripts-accDot; B -2500 0 2500 0; -C 74; WX 10; N scripts-accFreebase; B -5000 0 5000 10000; -C 75; WX 20; N scripts-accStdbase; B -10000 0 10000 20000; -C 76; WX 10; N scripts-accBayanbase; B -5000 0 5000 15000; -C 77; WX 15; N scripts-accSB; B -7999 0 7999 11999; -C 78; WX 15; N scripts-accBB; B -7999 0 7999 11999; -C 79; WX 10; N scripts-accOldEE; B -5000 0 5000 10000; -C 80; WX 10; N scripts-accOldEES; B -5000 0 5000 10000; -C 85; WX 9; N flags-ugrace; B -3512 -10800 6169 -5000; -C 90; WX 10; N flags-dgrace; B -3907 4950 6827 10260; -C 99; WX 17; N timesig-old4/4; B -8750 -3750 8750 3750; -C 100; WX 17; N timesig-old2/2; B -8750 -5000 8750 5000; -C 101; WX 17; N timesig-old3/2; B -8750 -3750 8750 3750; -C 102; WX 17; N timesig-old6/4; B -8750 -3750 8750 3750; -C 103; WX 17; N timesig-old9/4; B -8750 -3750 8750 3750; -C 104; WX 17; N timesig-old3/4; B -8750 -5000 8750 5000; -C 105; WX 17; N timesig-old6/8; B -8750 -5000 8750 5000; -C 106; WX 17; N timesig-old9/8; B -8750 -5000 8750 5000; -C 107; WX 17; N timesig-old4/8; B -8750 -3750 8750 3750; -C 108; WX 17; N timesig-old6/8alt; B -8750 -3750 8750 3750; -C 109; WX 17; N timesig-old2/4; B -8750 -5000 8750 5000; diff --git a/mf/as9.af b/mf/as9.af deleted file mode 100644 index b4c95257e2..0000000000 --- a/mf/as9.af +++ /dev/null @@ -1,295 +0,0 @@ - Comment as9.af -- AsciiFont: music font of height 9 - - Comment part of LilyPond's [ascii music font] - - Comment (c) 2000--2003 Jan Nieuwenhuizen - - Comment Thanks go to out to participants in discussions on - Comment alt.ascii-art and rec.music.compose - - Comment first noteheads-2 (although erroneously named) by - Comment Wesley Clifford - Comment rests-2 by Ben Norwood - Comment accidentals--1 and suggestions for noteheads by - Comment Ben Norwood - - - Comment Lines that start with TAB or FF make up the .afm - Comment TABs are comments - Comment `Comment' is the afm comment prefix - Comment which makes `TAB Comment' an .afm comment - - StartFontMetrics 2.0 - FontName as 9 - FontFamily as - StartCharMetrics 56 - - Comment BBox: (llx lly urx ury) * 1000 - C 0; WX 7; N rests-0; B 0 -1000 5000 1000; ------ - ''' - C 1; WX 7; N rests-1; B 0 0 5000 2000; - ,,, ------ - C 7; WX 5; N rests-2; B 0 0 1000 3000; -\ -< -( - C 8; WX 6; N rests-3; B 0 0 1000 2000; -__ -\ - C 9; WX 7; N rests-4; B 0 -10000 7756 4208; -__ -\_ - \ - C 10; WX 8; N rests-5; B 0 -10000 8752 9208; -__ -\_ - \_ - \ - C 10; WX 8; N rests-5; B 0 -10000 8752 9208; -__ -\_ - \_ - \_ - \ - C 11; WX 9; N rests-6; B 0 -15000 9384 9208; -__ -\_ - \_ - \_ - \_ - \ - C 16; WX 5; N accidentals-1; B 0 0 1000 1000; -# - C 17; WX 3; N accidentals-0; B 0 0 1000 1000; -H - C 18; WX 4; N accidentals--1; B 0 0 1000 2000; -| -|) - C 19; WX 7; N accidentals--2; B 0 0 2000 3000; -|| -|)) - C 20; WX 5; N accidentals-2; B 0 -2500 5000 2500; -x - C 21; WX 3; N accidentals-); B 0 -5000 3000 5000; -( - C 22; WX 3; N accidentals-(; B -3000 -5000 0 5000; -) - C 23; WX 2; N dots-dot; B -500 -500 500 500; -. - C 24; WX 1; N dots-repeatcolon; B 0 -1000 1000 2000; -* - -* - C 31; WX 5; N noteheads-ledgerending; B -2500 -500 2500 500; -- - C 33; WX 9; N noteheads-0; B 1000 -500 5000 500; -(O) - C 34; WX 6; N noteheads-1; B 1000 -500 5000 500; -(O) - C 35; WX 6; N noteheads-2; B 1000 0 5000 1000; -(*) - C 36; WX 9; N noteheads-0diamond; B 0 -1000 4000 1000; - - C 37; WX 7; N noteheads-1diamond; B 0 -2750 7081 2750; - - C 38; WX 6; N noteheads-2diamond; B 0 -2750 6605 2750; -<*> - C 39; WX 6; N noteheads-2cross; B 0 -2750 6605 2750; -[x] - C 40; WX 13; N scripts-ufermata; B -6625 -375 6625 7250; - ___ -/ . \ - C 41; WX 13; N scripts-dfermata; B -6625 -7250 6625 375; - . -\___/ - C 43; WX 8; N scripts-sforzato; B -4499 -2500 4499 2500; -> - C 44; WX 1; N scripts-staccato; B -750 -750 750 750; -. - C 45; WX 2; N scripts-ustaccatissimo; B -1000 -200 1000 5000; -^ - C 46; WX 2; N scripts-dstaccatissimo; B -1000 -5000 1000 200; -v - C 47; WX 6; N scripts-tenuto; B -3000 -350 3000 350; ---- - C 48; WX 5; N scripts-umarcato; B -2500 0 2500 5500; -| - C 49; WX 5; N scripts-dmarcato; B -2500 -5500 2500 0; -| - C 50; WX 4; N scripts-open; B -2000 -2500 2000 2500; -o - C 51; WX 5; N scripts-stopped; B -2750 -2750 2750 2750; -+ - C 52; WX 6; N scripts-upbow; B -3250 0 3250 10400; -\/ - C 53; WX 7; N scripts-downbow; B -3750 0 3750 6666; - _ -| | - C 56; WX 10; N scripts-trill; B -5000 0 5000 11250; -\/\ - C 61; WX 5; N scripts-flageolet; B -2666 -2666 2666 2666; -o - C 81; WX 6; N flags-u3; B 1000 -5000 4000 0; -\ - \ - | - | - / - C 82; WX 6; N flags-u4; B 1000 -5000 4000 0; -\ -\\ - \| - | - / - C 83; WX 6; N flags-u5; B 1000 -5000 4000 0; -\ -\\ -\\| - \| - / - C 84; WX 6; N flags-u6; B 1000 -5000 4000 0; -\ -\\ -\\| -\\| - / - C 86; WX 7; N flags-d3; B 1000 0 4000 5000; - \ - | - | - / -/ - C 87; WX 7; N flags-d4; B 1000 5000 3000 0; - \ - | - /| -// -/ - C 88; WX 7; N flags-d5; B 1000 5000 3000 0; - \ - /| -//| -// -/ - C 89; WX 7; N flags-d6; B 1000 5000 3000 0; - \ -//| -//| -// -/ - C 91; WX 13; N clefs-C; B 0 7000 7000 -3000; -#| __ -#| * \ -#| | -#| ___/ -#|<___ -#| \ -#| | -#| *__/ -#| - C 92; WX 10; N clefs-C_change; B 0 7000 7000 -3000; - __ -#|* \ -#| __/ -#|<__ -#| \ -#|*__/ - C 93; WX 10; N clefs-F; B 0 -3000 7000 3000; - ___ - / \ . - \* | - / . - / - / - / -_/ - C 94; WX 8; N clefs-F_change; B 0 7000 7000 -3000; - __ -(* |: - / - / -/ - C 95; WX 1; N clefs-G; B 0 -3000 7000 10000; - _ - / \ - | / - |/ - | - /| - / | - / | -| .+._ -| ( | | - \__|_/ - | - *_| - C 96; WX 10; N clefs-G_change; B 0 7000 7000 -3000; - /\ - |/ - / - /| - / |_ -| (| \ - \_|_/ - *_| - C 97; WX 17; N timesig-C4/4; B 0 7000 7000 -3000; - ___ - / \ -| - \___/ - C 98; WX 17; N timesig-C2/2; B 0 7000 7000 -3000; - _|_ - / | \ -| | - \_|_/ - | - EndCharMetrics - EndFontMetrics %d - - Comment Missing characters -C 2; WX 7; N rests-0o; B 0 -3125 7500 500; -C 3; WX 7; N rests-1o; B 0 -500 7500 3125; -C 4; WX 3; N rests--1; B 0 0 3000 5000; -C 5; WX 3; N rests--2; B 0 -5000 3000 5000; -C 6; WX 40; N rests--4; B -20000 -5000 20000 5000; -C 12; WX 10; N rests-7; B 0 -15000 10447 14208; -C 54; WX 10; N scripts-reverseturn; B -5468 -2647 5468 2647; -C 55; WX 10; N scripts-turn; B -5468 -2647 5468 2647; -C 13; WX 4; N rests-2mensural; B 0 0 4000 4000; -C 14; WX 4; N rests-3mensural; B 0 0 4000 4000; -C 15; WX 4; N rests-4mensural; B 0 0 4000 5000; -C 32; WX 9; N noteheads--1; B 0 -2750 9900 2750; -C 62; WX 10; N scripts-repeatsign; B -5000 -5000 5000 5000; -C 63; WX 10; N scripts-segno; B -5000 -7500 5000 7500; -C 64; WX 10; N scripts-coda; B -5083 -6750 5083 6750; -C 65; WX 4; N scripts-trilelement; B -3333 -2500 1306 2500; -C 66; WX 11; N scripts-prall; B -5653 -2500 5653 2500; -C 67; WX 11; N scripts-mordent; B -5653 -2500 5653 2500; -C 68; WX 15; N scripts-prallprall; B -7973 -2500 7973 2500; -C 69; WX 15; N scripts-prallmordent; B -7973 -2500 7973 2500; -C 70; WX 15; N scripts-upprall; B -7973 -2500 7973 2500; -C 71; WX 15; N scripts-downprall; B -7973 -2500 7973 2500; -C 72; WX 15; N scripts-accDiscant; B -7500 0 7500 15000; -C 73; WX 5; N scripts-accDot; B -2500 0 2500 0; -C 74; WX 10; N scripts-accFreebase; B -5000 0 5000 10000; -C 75; WX 20; N scripts-accStdbase; B -10000 0 10000 20000; -C 76; WX 10; N scripts-accBayanbase; B -5000 0 5000 15000; -C 77; WX 15; N scripts-accSB; B -7999 0 7999 11999; -C 78; WX 15; N scripts-accBB; B -7999 0 7999 11999; -C 79; WX 10; N scripts-accOldEE; B -5000 0 5000 10000; -C 80; WX 10; N scripts-accOldEES; B -5000 0 5000 10000; -C 85; WX 9; N flags-ugrace; B -3512 -10800 6169 -5000; -C 90; WX 10; N flags-dgrace; B -3907 4950 6827 10260; -C 99; WX 17; N timesig-old4/4; B -8750 -3750 8750 3750; -C 100; WX 17; N timesig-old2/2; B -8750 -5000 8750 5000; -C 101; WX 17; N timesig-old3/2; B -8750 -3750 8750 3750; -C 102; WX 17; N timesig-old6/4; B -8750 -3750 8750 3750; -C 103; WX 17; N timesig-old9/4; B -8750 -3750 8750 3750; -C 104; WX 17; N timesig-old3/4; B -8750 -5000 8750 5000; -C 105; WX 17; N timesig-old6/8; B -8750 -5000 8750 5000; -C 106; WX 17; N timesig-old9/8; B -8750 -5000 8750 5000; -C 107; WX 17; N timesig-old4/8; B -8750 -3750 8750 3750; -C 108; WX 17; N timesig-old6/8alt; B -8750 -3750 8750 3750; -C 109; WX 17; N timesig-old2/4; B -8750 -5000 8750 5000; diff --git a/scm/lily.scm b/scm/lily.scm index 8f1529a9bc..3c207413ed 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -322,7 +322,6 @@ L1 is copied, L2 not. ("tex" . ("TeX output. The default output form." ,tex-output-expression)) ("ps" . ("Direct postscript. Requires setting GS_LIB and GS_FONTPATH" ,ps-output-expression)) ("scm" . ("Scheme dump: debug scheme molecule expressions" ,write)) - ("as" . ("Asci-script. Postprocess with as2txt to get ascii art" ,as-output-expression)) ("sketch" . ("Bare bones Sketch output." ,sketch-output-expression)) ("sodipodi" . ("Bare bones Sodipodi output." ,sodipodi-output-expression)) ("pdftex" . ("PDFTeX output. Was last seen nonfunctioning." ,pdftex-output-expression)) diff --git a/scm/output-ascii-script.scm b/scm/output-ascii-script.scm deleted file mode 100644 index 42c7be9e6f..0000000000 --- a/scm/output-ascii-script.scm +++ /dev/null @@ -1,191 +0,0 @@ -(define-module (scm output-ascii-script) - ) - -(use-modules (guile) - (lily)) - -(define this-module (current-module)) - -(define font-name-alist '()) - -(define-public (as-output-expression expr port) - (display (eval expr this-module) port) - ) - - -(debug-enable 'backtrace) - -(define (tex-encoded-fontswitch name-mag) - (let* ((iname-mag (car name-mag)) - (ename-mag (cdr name-mag))) - (cons iname-mag - (cons ename-mag - (string-append "magfont" - (string-encode-integer - (hashq (car ename-mag) 1000000)) - "m" - (string-encode-integer - (inexact->exact (round (* 1000 (cdr ename-mag)))))))))) - -(define (fontify name-mag-pair exp) - (string-append (select-font name-mag-pair) - exp)) - - -(define (define-fonts internal-external-name-mag-pairs) - (set! font-name-alist (map tex-encoded-fontswitch - internal-external-name-mag-pairs)) - (apply string-append - (map (lambda (x) - (font-load-command (car x) (cdr x))) - (map cdr font-name-alist)))) - -(define (dot x y radius) "") ;; TODO - -(define (beam width slope thick) - (string-append - (func "set-line-char" "#") - (func "rline-to" width (* width slope)) - )) - - ; simple flat slurs -(define (bezier-sandwich thick) - (let ( - (c0 (cadddr l)) - (c1 (cadr l)) - (c3 (caddr l))) - (let* ((x (car c0)) - (dx (- (car c3) x)) - (dy (- (cdr c3) (cdr c0))) - (rc (/ dy dx)) - (c1-dx (- (car c1) x)) - (c1-line-y (+ (cdr c0) (* c1-dx rc))) - (dir (if (< c1-line-y (cdr c1)) 1 -1)) - (y (+ -1 (* dir (max (* dir (cdr c0)) (* dir (cdr c3))))))) - (string-append - (func "rmove-to" x y) - (func "put" (if (< 0 dir) "/" "\\\\")) - (func "rmove-to" 1 (if (< 0 dir) 1 0)) - (func "set-line-char" "_") - (func "h-line" (- dx 1)) - (func "rmove-to" (- dx 1) (if (< 0 dir) -1 0)) - (func "put" (if (< 0 dir) "\\\\" "/")))))) - - -(define (bracket arch_angle arch_width arch_height height arch_thick thick) - ;; width now fixed? - (let ((width 1)) - (string-append - (func "rmove-to" (+ width 1) (- (/ height -2) 1)) - (func "put" "\\\\") - (func "set-line-char" "|") - (func "rmove-to" 0 1) - (func "v-line" (+ height 1)) - (func "rmove-to" 0 (+ height 1)) - (func "put" "/") - ))) - -(define (polygon points blotdiameter) "") ;; TODO - -(define (char i) - (func "char" i)) - -(define (define-origin a b c ) "") - -(define (end-output) - (func "end-output")) - -(define (experimental-on) - "") - -(define (horizontal-line x1 x2 th) - (filledbox (- x1) (- x2 x1) (* .5 th) (* .5 th ))) - - -(define (filledbox breapth width depth height) - (let ((dx (+ width breapth)) - (dy (+ depth height))) - (string-append - (func "rmove-to" (* -1 breapth) (* -1 depth)) - (if (< dx dy) - (string-append - (func "set-line-char" - (if (<= dx 1) "|" "#")) - (func "v-line" dy)) - (string-append - (func "set-line-char" - (if (<= dy 1) "-" "=")) - (func "h-line" dx)))))) - -(define (round-filled-box breapth width depth height blot) - (filledbox breapth width depth height)) - -(define (draw-line thick x1 y1 x2 y2) - (let ((dx (- x2 x1)) - (dy (- y2 y1))) - (string-append - (func ("rmove-to" x1 y1)) - (filledbox 0 dx 0 dy)))) - -(define (font-load-command name-mag command) - ;; (display "name-mag: ") - ;; (write name-mag) - ;; (display "command: ") - ;; (write command) - (func "load-font" (car name-mag) (cdr name-mag))) - -(define (header creator generate) - (func "header" creator generate)) - -(define (header-end) - (func "header-end")) - -;; urg: this is good for half of as2text's execution time -(define (xlily-def key val) - (string-append "(define " key " " (arg->string val) ")\n")) - -(define (lily-def key val) - (if - ;; let's not have all bloody definitions - (or (equal? key "lilypondpaperlinewidth") - (equal? key "lilypondpaperstaffheight") - (equal? key "lilypondpaperoutputscale")) - (string-append "(define " key " " (arg->string val) ")\n") - "")) - -(define (no-origin) "") - -(define (placebox x y s) - (let ((ey (inexact->exact (round y)))) - (string-append "(move-to " (number->string (inexact->exact (round x))) " " - (if (= 0.5 (- (abs y) (abs ey))) - (number->string y) - (number->string ey)) - ")\n" s))) - -(define (select-font name-mag-pair) - (let* ((c (assoc name-mag-pair font-name-alist))) - (if (eq? c #f) - (begin - (ly:warn - (string-append - "Programming error: No such font known " - (car name-mag-pair)))) - "") ; issue no command - (func "select-font" (car name-mag-pair)))) - -(define (start-system width height) - (func "start-system" width height)) - -(define (stop-system) - (func "stop-system")) - -(define (stop-last-system) - (func "stop-system")) - - -(define (text s) - (func "text" s)) - -(define (tuplet ht gap dx dy thick dir) "") - diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile index bb8376f835..d196b692e5 100644 --- a/scripts/GNUmakefile +++ b/scripts/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SEXECUTABLES=convert-ly lilypond-book lilypond abc2ly as2text etf2ly musedata2ly pmx2ly mup2ly midi2ly +SEXECUTABLES=convert-ly lilypond-book lilypond abc2ly etf2ly musedata2ly pmx2ly mup2ly midi2ly STEPMAKE_TEMPLATES=script help2man po LOCALSTEPMAKE_TEMPLATES = lilypond HELP2MAN_EXECS = $(SEXECUTABLES) diff --git a/scripts/as2text.scm b/scripts/as2text.scm deleted file mode 100644 index 1079528e9c..0000000000 --- a/scripts/as2text.scm +++ /dev/null @@ -1,441 +0,0 @@ -#!@GUILE@ \ --e main -s -!# -;;;; as2text.scm -- Translate AsciiScript to Text -;;;; -;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 2000--2003 Jan Nieuwenhuizen - -;;;; library funtions -(use-modules - (ice-9 debug) - (ice-9 getopt-long) - (ice-9 string-fun) - (ice-9 rdelim) - (ice-9 regex)) - -;;; Script stuff -(define program-name "as2text") - -(define lily-home "/usr/share/lilypond") -(define cur-output-name "-") -(define cur-output-file '()) - -(define subst-version "@TOPLEVEL_VERSION@") - -(define program-version - (if (eq? subst-version (string-append "@" "TOPLEVEL_VERSION" "@")) - "unknown" - subst-version)) - -(define (show-version port) - (display (string-append - program-name " - LilyPond version " program-version "\n") - port)) - -(define (show-help) - (display "Convert AsciiScript to text. - -Usage: as2text [OPTIONS]... AS-FILE - -Options: - -h,--help show this help - -o,--output=FILE set output file - -v,--version show version - -")) - -;; -;; FIXME: use (separate-fields-discarding-char) and (read-delimited "") -;; -(define (gulp-file name) - (let ((port (if (equal? name "-") - (current-input-port) - (catch 'system-error (lambda () (open-file name "r")) - (lambda args #f))))) - (if port - (begin - (display (string-append "[" name) (current-error-port)) - (let ((content (let loop ((text "")) - (let ((line (read-line port))) - (if (or (eof-object? line) - (not line)) - text - (loop (string-append text line "\n"))))))) - (close port) - (display "]" (current-error-port)) - content)) - (begin - (display - (string-append "warning: no such file: " name "\n") - (current-error-port)) - "")))) - -(define (with-extention name ext) - (if (or (equal? name "-") - (equal? ext (substring name (max 0 (- (string-length name) - (string-length ext)))))) - name - (string-append name ext))) - -(define (do-file file-name output-name) - (let ((ascii-script (gulp-file (with-extention file-name ".as")))) - ;; urg - (set! cur-output-name output-name) - (eval-string ascii-script))) - -;;; Script entry point -(define (main args) - (set! lily-home (string-append - (dirname (dirname (car args))) - "/share/lilypond")) - (let ((options (getopt-long args - `((output (single-char #\o) - (value #t)) - (help (single-char #\h)) - (version (single-char #\v)))))) - (define (opt tag default) - (let ((pair (assq tag options))) - (if pair (cdr pair) default))) - - (if (assq 'help options) - (begin (show-version (current-output-port)) (show-help) (exit 0))) - - (if (assq 'version options) - (begin (show-version (current-output-port)) (exit 0))) - - (show-version (current-error-port)) - (let ((output-name (opt 'output "-")) - (files (let ((foo (opt '() '()))) - (if (null? foo) - (list "-") - foo)))) - (do-file (car files) output-name)))) - -;;;; -;;;; Ascii Script plotting -;;;; - -;;; Global variables - -;; Ascii-Art signature -(define tag-line "lily") - -(define first-line #t) - -(define scaling 1) - -;; cursor -(define cur-x 0) -(define cur-y 0) - -;; canvas dimensions -(define canvas-width 65) -(define canvas-height 20) - -;; font database -(define fonts '()) - -;; current font -(define cur-font "") - -;; -(define line-char "-") - -;; -(define half-char-kludge #f) - -;; the plotting fields -(define canvas 0) -;; urg: -;; make-uniform array of characters, -;; or 1-dim array of strings? -;; (set! canvas (make-array " " canvas-height canvas-width)) - -;; urg, this kind of naming costs too much indenting -(define (split c s r) - (separate-fields-discarding-char c s r)) - -(define (strip s) - (sans-surrounding-whitespace s)) - - -;;; Helper functions - -(define (af-gulp-file name) - ;; urg - (let ((old-load-path %load-path)) - (set! %load-path - (cons (string-append - (or (getenv "LILYPONDPREFIX") ".") "/mf") - (cons (string-append lily-home "/mf") %load-path))) - (let* ((path (%search-load-path name)) - (text (if path - (gulp-file path) - (gulp-file name)))) - (set! %load-path old-load-path) - text))) - -(define (char-width c) - (let ((bbox (car c))) - (inexact->exact (* .001 (caddr bbox))))) - -;; urg: use smart table -(define (xmerge-chars old new) - (cond ((equal? new " ") old) - ((and (equal? old "|") (equal? new "-")) "+") - ((and (equal? old "-") (equal? new "|")) "+") - (else new))) - -(define (merge-chars old new) - (cond ((equal? new " ") old) - (else new))) - -(define (plot-raw x y c) - (if (array-in-bounds? canvas y x) - (array-set! canvas (merge-chars (array-ref canvas y x) c) y x) - (display (string-append "ouch: " (number->string x) "," - (number->string y) "\n") - (current-error-port)))) - -(define (plot x neg-y c) - (let ((y (- (* -1 neg-y) 1))) - (plot-raw (inexact->exact x) (inexact->exact y) c))) - -(define (plot-char c) - (let ((bbox (car c)) - (glyph (cadr c)) - (scur-x (* scaling cur-x)) - (scur-y (* scaling cur-y))) - ;; BBox: (llx lly urx ury) * 1000 - (let ((dx (inexact->exact (* .001 (car bbox)))) - ;;(dy (inexact->exact (* .001 (cadr bbox)))) - (dy (inexact->exact (- (* .001 (cadddr bbox)) 1))) - (len (length glyph))) - ;;(display "Bbox: ") (display bbox) (newline) - ;;(display "dy: ") (display dy) (newline) - (do ((line glyph (cdr line)) - (i 0 (+ i 1))) - ((= i len)) - (plot-string (+ scur-x dx) (+ (- scur-y i) dy) (car line)))))) - -(define (plot-string x y s) - (do ((i 0 (+ i 1))) - ((= i (string-length s))) - (plot (+ x i) y (substring s i (+ i 1))))) - -(define (show-char char) - (display char)) - -(define (show-font name) - (let ((font (assoc name fonts))) - (map (lambda (x) (show-char x)) font))) - -(define (sign x) - (if (= x 0) - 1 - (inexact->exact (/ x (abs x))))) - -(define (generate-default-font) - (let loop ((chars '()) (i 0)) - (if (= 256 i) - chars - (loop - (cons (list i '(0 0 1000 1000) - (list (make-string 1 (integer->char i)))) - chars) - (+ i 1))))) - -(define (get-font name) - ;; urg - (if (equal? (substring name 0 (min (string-length name) 8)) "as-dummy") - (get-font "default") - (let ((entry (assoc name fonts))) - (if entry - (cdr entry) - (begin - (display - (string-append "warning: no such font: " name "\n") - (current-error-port)) - (get-font "default")))))) - -(define (get-char font n) - (let ((entry (assoc n font))) - (if entry - (cdr entry) - (begin - (display - (string-append "warning: no such char: (" - cur-font - ", " - (number->string n ) ")\n") - (current-error-port)) - '())))) - - -;;; AsciiScript commands - -(define (char n) - (let* ((font (get-font cur-font)) - (c - (if (and half-char-kludge - (assoc (+ n 0.5) font)) - (get-char font (+ n 0.5)) - (get-char font n)))) - (if (pair? c) - (plot-char c)))) - -(define (end-output) - (display (string-append - (make-string - (- canvas-width (string-length tag-line)) #\space) - tag-line "\n") - cur-output-file) - (close cur-output-file) - (set! cur-output-file '())) - -;; use plot-string -(define (h-line len) - (let ((scur-x (* scaling cur-x)) - (scur-y (* scaling cur-y)) - (slen (* scaling len))) - (let ((step (sign len))) - (do ((i 0 (+ i step))) - ((= i slen)) - (plot (+ scur-x i) scur-y line-char))))) - -(define (v-line len) - (let ((scur-x (* scaling cur-x)) - (scur-y (* scaling cur-y)) - (slen (* scaling len))) - (let ((step (sign len))) - (do ((i 0 (+ i step))) - ((= i len)) - (plot scur-x (+ scur-y i) line-char))))) - -(define (header x y) - ;(display (string-append x y "\n") (current-error-port)) - "") - -(define (header-end) "") - -;; FIXME: scale -(define (rline-to dx dy) - (plot (inexact->exact cur-x) (inexact->exact cur-y) line-char) - (plot (inexact->exact (+ cur-x dx)) (inexact->exact (+ cur-y dy)) line-char) - (if (or (> (abs dx) 1) (> (abs dy) 1)) - (let ((x cur-x) - (y cur-y) - (hx (/ dx 2)) - (hy (/ dy 2)) - ) - (plot (inexact->exact (+ cur-x hx)) (inexact->exact (+ cur-y hy)) line-char) - (rline-to hx hy) - (move-to x y) - (rmove-to hx hy) - (rline-to hx hy) - ))) - -(define (dissect-char text) - (let* ((char (split #\nl text list)) - (id (car char)) - (code (string->number - (strip - (substring id - (+ (string-index id #\C) 1) - (string-index id #\;))))) - (bbox (map string->number - (split #\space (strip (substring - id - (+ (string-rindex id #\B) 1) - (string-rindex id #\;))) - list)))) - (list (list code bbox (cdr char))))) - -(define (load-font name mag) - ;; urg: don't load dummy font - (if (not (equal? (substring name 0 (min (string-length name) 8)) "as-dummy")) - (let ((text (af-gulp-file (string-append name ".af")))) - (if (< 0 (string-length text)) - (let* ((char-list (cdr - (split #\np - (regexp-substitute/global - #f "\t[^\n]*\n" text 'pre "" 'post) - list))) - (font (apply append (map dissect-char char-list)))) - (if (< 0 (length font)) - (set! fonts (cons (cons name font) fonts)))))))) - -(define (number->rounded-exact x) - (* (sign x) (inexact->exact (abs x)))) - -(define (move-to x y) - (set! cur-x x) - (let ((ey (number->rounded-exact y))) - (if (= 0.5 (- (abs ey) (abs y))) - (set! half-char-kludge #t) - (set! half-char-kludge #f)) - (set! cur-y ey))) - -(define (put c) - (plot cur-x cur-y c)) - -(define (rmove-to dx dy) - (set! cur-x (+ cur-x dx)) - (set! cur-y (+ cur-y dy))) - -(define (select-font name) - (set! cur-font name)) - -(define (set-line-char c) - (set! line-char c)) - -(define (start-system width height) - (if first-line - (begin - (set! fonts (cons (cons "default" (generate-default-font)) fonts)) - (display "\n" (current-error-port)) - (if (defined? 'lilypondpaperoutputscale) - (set! scaling (inexact->exact (string->number lilypondpaperoutputscale)))) - (if (defined? 'lilypondpaperlinewidth) - (let ((width (inexact->exact - (string->number lilypondpaperlinewidth)))) - (if (> width 0) - (set! canvas-width width) - ;; need long line... - ;;(set! canvas-width 200) - (set! canvas-width 80) - ))) - )) - (set! canvas-height (inexact->exact (* scaling height))) - (set! canvas (make-array " " canvas-height canvas-width))) - -(define (stop-system) - (if first-line - (let ((output-file (if (equal? cur-output-name "-") - (current-output-port) - (open-file cur-output-name "w"))) - (output-name (if (equal? cur-output-name "-") - "" - cur-output-name))) - (set! first-line #f) - (set! cur-output-file output-file) - (display (string-append "text output to " output-name "...\n") - (current-error-port)))) - (display - (apply string-append - (map (lambda (x) (string-append (apply string-append x) "\n")) - (array->list canvas))) - cur-output-file)) - -(define (text s) - (let ((n (string-length s)) - (font (get-font cur-font))) - (do ((i 0 (+ i 1))) - ((= i n)) - (let* ((n (char->integer (string-ref s i))) - (c (get-char font n))) - (if (pair? c) (plot-char c)) - (rmove-to (char-width c) 0))))) - -- 2.39.2