From ecba695a03868b44c9605fda42ac5585d20b85b1 Mon Sep 17 00:00:00 2001 From: Tom Cato Amundsen Date: Thu, 8 Apr 1999 18:12:05 +0200 Subject: [PATCH] patch::: 1.1.38.tca1 pl 38.tca1 - added scm/accordion-script.scm and update ly/accordion-defs.ly - renamed some accordion symbols to make them more english and less norwenglish. - removed dot from \accBayanbase --- Generated by tomcato@xoommail.com using package-diff 0.62, From = lilypond-1.1.38, To = lilypond-1.1.38.tca1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.38.tca1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure and possibly make outdirs. --state 1.1.38 1.1.38.tca1 ++state --- NEWS | 12 +++++- VERSION | 2 +- ly/accordion-defs.ly | 88 ++++++++++++++++++++-------------------- mf/feta-accordion.mf | 66 +++++++++++++++--------------- scm/accordion-script.scm | 54 ++++++++++++++++++++++++ 5 files changed, 144 insertions(+), 78 deletions(-) create mode 100644 scm/accordion-script.scm diff --git a/NEWS b/NEWS index 1c1e56b0b9..2b3e0b41cc 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,14 @@ -pl 38.uu1 +--- ../lilypond-1.1.38/NEWS Tue Apr 6 10:26:06 1999 +++ b/NEWS Thu Apr 8 18:12:05 1999 +@@ -1,3 +1,8 @@ +pl 38.tca1 + - added scm/accordion-script.scm and update ly/accordion-defs.ly + - renamed some accordion symbols to make them more english and less + norwenglish. + - removed dot from \accBayanbase + pl 37.script2 + - bf: AFM for BlueSky AFM files. + - \penalty = 4278 -> \penalty 4278pl 38.uu1 - bf: clef_8 - bf: barnumbers. diff --git a/VERSION b/VERSION index 1aa2572085..339e1058e0 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=38 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=tca1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/ly/accordion-defs.ly b/ly/accordion-defs.ly index 12c4723467..6755df855b 100644 --- a/ly/accordion-defs.ly +++ b/ly/accordion-defs.ly @@ -6,50 +6,52 @@ % 16' = S % -accDiscant = \script{ "accDiscant" 0 0 1 0 0 } -accDiscantF = \script{ "accDiscantF" 0 0 1 0 0 } -accDiscantE = \script{ "accDiscantE" 0 0 1 0 0 } -accDiscantEh = \script{ "accDiscantEh" 0 0 1 0 0 } -accDiscantFE = \script{ "accDiscantFE" 0 0 1 0 0 } -accDiscantFEh = \script{ "accDiscantFEh" 0 0 1 0 0 } -accDiscantEE = \script{ "accDiscantEE" 0 0 1 0 0 } -accDiscantFEE = \script{ "accDiscantFEE" 0 0 1 0 0 } -accDiscantEEE = \script{ "accDiscantEEE" 0 0 1 0 0 } -accDiscantFEEE = \script{ "accDiscantFEEE" 0 0 1 0 0 } -accDiscantS = \script{ "accDiscantS" 0 0 1 0 0 } -accDiscantFS = \script{ "accDiscantFS" 0 0 1 0 0 } -accDiscantES = \script{ "accDiscantES" 0 0 1 0 0 } -accDiscantEhS = \script{ "accDiscantEhS" 0 0 1 0 0 } -accDiscantFES = \script{ "accDiscantFES" 0 0 1 0 0 } -accDiscantFEhS = \script{ "accDiscantFEhS" 0 0 1 0 0 } -accDiscantEES = \script{ "accDiscantEES" 0 0 1 0 0 } -accDiscantFEES = \script{ "accDiscantFEES" 0 0 1 0 0 } -accDiscantEEES = \script{ "accDiscantEEES" 0 0 1 0 0 } -accDiscantFEEES = \script{ "accDiscantFEEES" 0 0 1 0 0 } -accDiscantSS = \script{ "accDiscantSS" 0 0 1 0 0 } -accDiscantESS = \script{ "accDiscantESS" 0 0 1 0 0 } -accDiscantEESS = \script{ "accDiscantEESS" 0 0 1 0 0 } -accDiscantEEESS = \script{ "accDiscantEEESS" 0 0 1 0 0 } +\scmfile "accordion-script.scm"; -accFreebass = \script{ "accFreebass" 0 0 1 0 0 } -accFreebassF = \script{ "accFreebassF" 0 0 1 0 0 } -accFreebassE = \script{ "accFreebassE" 0 0 1 0 0 } -accFreebassFE = \script{ "accFreebassFE" 0 0 1 0 0 } +accDiscant = \script "accDiscant" +accDiscantF = \script "accDiscantF" +accDiscantE = \script "accDiscantE" +accDiscantEh = \script "accDiscantEh" +accDiscantFE = \script "accDiscantFE" +accDiscantFEh = \script "accDiscantFEh" +accDiscantEE = \script "accDiscantEE" +accDiscantFEE = \script "accDiscantFEE" +accDiscantEEE = \script "accDiscantEEE" +accDiscantFEEE = \script "accDiscantFEEE" +accDiscantS = \script "accDiscantS" +accDiscantFS = \script "accDiscantFS" +accDiscantES = \script "accDiscantES" +accDiscantEhS = \script "accDiscantEhS" +accDiscantFES = \script "accDiscantFES" +accDiscantFEhS = \script "accDiscantFEhS" +accDiscantEES = \script "accDiscantEES" +accDiscantFEES = \script "accDiscantFEES" +accDiscantEEES = \script "accDiscantEEES" +accDiscantFEEES = \script "accDiscantFEEES" +accDiscantSS = \script "accDiscantSS" +accDiscantESS = \script "accDiscantESS" +accDiscantEESS = \script "accDiscantEESS" +accDiscantEEESS = \script "accDiscantEEESS" -accBayanbass = \script{ "accBayanbass" 0 0 1 0 0 } -accBayanbassT = \script{ "accBayanbassT" 0 0 1 0 0 } -accBayanbassE = \script{ "accBayanbassE" 0 0 1 0 0 } -accBayanbassTE = \script{ "accBayanbassTE" 0 0 1 0 0 } -accBayanbassEE = \script{ "accBayanbassEE" 0 0 1 0 0 } -accBayanbassTEE = \script{ "accBayanbassTEE" 0 0 1 0 0 } +accFreebase = \script "accFreebase" +accFreebaseF = \script "accFreebaseF" +accFreebaseE = \script "accFreebaseE" +accFreebaseFE = \script "accFreebaseFE" -accStdbass = \script{ "accStdbass" 0 0 1 0 0 } -accStdbassTp = \script{ "accStdbassTp" 0 0 1 0 0 } -accStdbassT = \script{ "accStdbassT" 0 0 1 0 0 } -accStdbassBp = \script{ "accStdbassBp" 0 0 1 0 0 } -accStdbassM = \script{ "accStdbassM" 0 0 1 0 0 } +accBayanbase = \script "accBayanbase" +accBayanbaseT = \script "accBayanbaseT" +accBayanbaseE = \script "accBayanbaseE" +accBayanbaseTE = \script "accBayanbaseTE" +accBayanbaseEE = \script "accBayanbaseEE" +accBayanbaseTEE = \script "accBayanbaseTEE" -accSB = \script{ "accSB" 0 0 1 0 0 } -accBB = \script{ "accBB" 0 0 1 0 0 } -accOldEE = \script{ "accOldEE" 0 0 1 0 0 } -accOldEES = \script{ "accOldEES" 0 0 1 0 0 } +accStdbase = \script "accStdbase" +accStdbaseTp = \script "accStdbaseTp" +accStdbaseT = \script "accStdbaseT" +accStdbaseBp = \script "accStdbaseBp" +accStdbaseM = \script "accStdbaseM" + +accSB = \script "accSB" +accBB = \script "accBB" +accOldEE = \script "accOldEE" +accOldEES = \script "accOldEES" diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf index 0a12435817..3974a52342 100644 --- a/mf/feta-accordion.mf +++ b/mf/feta-accordion.mf @@ -35,7 +35,7 @@ def draw_discant_reg(expr A, B, C, D, E, F) = currentpicture := currentpicture shifted (0, r); enddef; -def draw_freebass_reg(expr rFour, rEight) = +def draw_freebase_reg(expr rFour, rEight) = save r; r#= accreg_lh#; define_pixels(r); @@ -49,7 +49,7 @@ def draw_freebass_reg(expr rFour, rEight) = currentpicture := currentpicture shifted (0, r); enddef; -def draw_stdbass_reg(expr A, B, C, D, E) = +def draw_stdbase_reg(expr A, B, C, D, E) = save r, sx; r# = 2accreg_lh#; define_pixels(r); @@ -69,7 +69,7 @@ def draw_stdbass_reg(expr A, B, C, D, E) = currentpicture := currentpicture shifted (0, r); enddef; -def draw_bayanbass_reg_sign(expr nTwo, nEight) = +def draw_bayanbase_reg_sign(expr nTwo, nEight) = save lh; lh = accreg_lh; % set_char_box(accreg_lh#, accreg_lh#, 3accreg_lh#, 0); @@ -182,64 +182,64 @@ fet_beginchar("accDiscantEEESS", "accDiscantEEESS", "accDiscantEEESS") draw_discant_reg(0, 1, 1, 1, 0, 1); fet_endchar; -fet_beginchar("accFreebass", "accFreebass", "accFreebass") - draw_freebass_reg(0, 0); +fet_beginchar("accFreebase", "accFreebase", "accFreebase") + draw_freebase_reg(0, 0); fet_endchar; -fet_beginchar("accFreebassF", "accFreebassF", "accFreebassF") - draw_freebass_reg(1, 0); +fet_beginchar("accFreebaseF", "accFreebaseF", "accFreebaseF") + draw_freebase_reg(1, 0); fet_endchar; -fet_beginchar("accFreebassE", "accFreebassE", "accFreebassE") - draw_freebass_reg(0, 1); +fet_beginchar("accFreebaseE", "accFreebaseE", "accFreebaseE") + draw_freebase_reg(0, 1); fet_endchar; -fet_beginchar("accFreebassFE", "accFreebassFE", "accFreebassFE") - draw_freebass_reg(1, 1); +fet_beginchar("accFreebaseFE", "accFreebaseFE", "accFreebaseFE") + draw_freebase_reg(1, 1); fet_endchar; -fet_beginchar("accStdbass", "accStdbass", "accStdbass") - draw_stdbass_reg(0, 0, 0, 0, 0); +fet_beginchar("accStdbase", "accStdbase", "accStdbase") + draw_stdbase_reg(0, 0, 0, 0, 0); fet_endchar; -fet_beginchar("accStdbassM", "accStdbassM", "accStdbassM") - draw_stdbass_reg(1, 1, 1, 1, 1); +fet_beginchar("accStdbaseM", "accStdbaseM", "accStdbaseM") + draw_stdbase_reg(1, 1, 1, 1, 1); fet_endchar; -fet_beginchar("accStdbassBp", "accStdbassBp", "accStdbassBp") - draw_stdbass_reg(1, 1, 0, 0, 1); +fet_beginchar("accStdbaseBp", "accStdbaseBp", "accStdbaseBp") + draw_stdbase_reg(1, 1, 0, 0, 1); fet_endchar; -fet_beginchar("accStdbassT", "accStdbassT", "accStdbassT") - draw_stdbass_reg(0, 1, 1, 1, 0); +fet_beginchar("accStdbaseT", "accStdbaseT", "accStdbaseT") + draw_stdbase_reg(0, 1, 1, 1, 0); fet_endchar; -fet_beginchar("accStdbassTp", "accStdbassTp", "accStdbassTp") - draw_stdbass_reg(0, 1, 1, 0, 0); +fet_beginchar("accStdbaseTp", "accStdbaseTp", "accStdbaseTp") + draw_stdbase_reg(0, 1, 1, 0, 0); fet_endchar; -fet_beginchar("accBayanbass", "accBayanbass", "accBayanbass") - draw_bayanbass_reg_sign(1, 0); +fet_beginchar("accBayanbase", "accBayanbase", "accBayanbase") + draw_bayanbase_reg_sign(0, 0); fet_endchar; -fet_beginchar("accBayanbassT", "accBayanbassT", "accBayanbassT") - draw_bayanbass_reg_sign(1, 0); +fet_beginchar("accBayanbaseT", "accBayanbaseT", "accBayanbaseT") + draw_bayanbase_reg_sign(1, 0); fet_endchar; -fet_beginchar("accBayanbassE", "accBayanbassE", "accBayanbassE") - draw_bayanbass_reg_sign(0, 1); +fet_beginchar("accBayanbaseE", "accBayanbaseE", "accBayanbaseE") + draw_bayanbase_reg_sign(0, 1); fet_endchar; -fet_beginchar("accBayanbassTE", "accBayanbassTE", "accBayanbassTE") - draw_bayanbass_reg_sign(1, 1); +fet_beginchar("accBayanbaseTE", "accBayanbaseTE", "accBayanbaseTE") + draw_bayanbase_reg_sign(1, 1); fet_endchar; -fet_beginchar("accBayanbassEE", "accBayanbassEE", "accBayanbassEE") - draw_bayanbass_reg_sign(0, 2); +fet_beginchar("accBayanbaseEE", "accBayanbaseEE", "accBayanbaseEE") + draw_bayanbase_reg_sign(0, 2); fet_endchar; -fet_beginchar("accBayanbassTEE", "accBayanbassTEE", "accBayanbassTEE") - draw_bayanbass_reg_sign(1, 2); +fet_beginchar("accBayanbaseTEE", "accBayanbaseTEE", "accBayanbaseTEE") + draw_bayanbase_reg_sign(1, 2); fet_endchar; def def_B(expr w, h) = diff --git a/scm/accordion-script.scm b/scm/accordion-script.scm new file mode 100644 index 0000000000..2252c25d52 --- /dev/null +++ b/scm/accordion-script.scm @@ -0,0 +1,54 @@ +;; (name . '((downindexstring . upindexstring) +;; follow-into-staff :: bool +;; dir-relative-to-stem :: int +;; force-dir :: int +;; priority :: int + + +(set! script-alist + (append + '(("accDiscant" . (("accDiscant" . "accDiscant") #f 0 1 0)) + ("accDiscantF" . (("accDiscantF" . "accDiscantF") #f 0 1 0)) + ("accDiscantE" . (("accDiscantE" . "accDiscantE") #f 0 1 0)) + ("accDiscantEh" . (("accDiscantEh" . "accDiscantEh") #f 0 1 0)) + ("accDiscantFE" . (("accDiscantFE" . "accDiscantFE") #f 0 1 0)) + ("accDiscantFEh" . (("accDiscantFEh" . "accDiscantFEh") #f 0 1 0)) + ("accDiscantEE" . (("accDiscantEE" . "accDiscantEE") #f 0 1 0)) + ("accDiscantFEE" . (("accDiscantFEE" . "accDiscantFEE") #f 0 1 0)) + ("accDiscantEEE" . (("accDiscantEEE" . "accDiscantEEE") #f 0 1 0)) + ("accDiscantFEEE" . (("accDiscantFEEE" . "accDiscantFEEE") #f 0 1 0)) + ("accDiscantS" . (("accDiscantS" . "accDiscantS") #f 0 1 0)) + ("accDiscantFS" . (("accDiscantFS" . "accDiscantFS") #f 0 1 0)) + ("accDiscantES" . (("accDiscantES" . "accDiscantES") #f 0 1 0)) + ("accDiscantEhS" . (("accDiscantEhS" . "accDiscantEhS") #f 0 1 0)) + ("accDiscantFES" . (("accDiscantFES" . "accDiscantFES") #f 0 1 0)) + ("accDiscantFEhS" . (("accDiscantFEhS" . "accDiscantFEhS") #f 0 1 0)) + ("accDiscantEES" . (("accDiscantEES" . "accDiscantEES") #f 0 1 0)) + ("accDiscantFEES" . (("accDiscantFEES" . "accDiscantFEES") #f 0 1 0)) + ("accDiscantEEES" . (("accDiscantEEES" . "accDiscantEEES") #f 0 1 0)) + ("accDiscantFEEES" . (("accDiscantFEEES" . "accDiscantFEEES") #f 0 1 0)) + ("accDiscantSS" . (("accDiscantSS" . "accDiscantSS") #f 0 1 0)) + ("accDiscantESS" . (("accDiscantESS" . "accDiscantESS") #f 0 1 0)) + ("accDiscantEESS" . (("accDiscantEESS" . "accDiscantEESS") #f 0 1 0)) + ("accDiscantEEESS" . (("accDiscantEEESS" . "accDiscantEEESS") #f 0 1 0)) + ("accFreebase" . (("accFreebase" . "accFreebase") #f 0 1 0)) + ("accFreebaseF" . (("accFreebaseF" . "accFreebaseF") #f 0 1 0)) + ("accFreebaseE" . (("accFreebaseE" . "accFreebaseE") #f 0 1 0)) + ("accFreebaseFE" . (("accFreebaseFE" . "accFreebaseFE") #f 0 1 0)) + ("accBayanbase" . (("accBayanbase" . "accBayanbase") #f 0 1 0)) + ("accBayanbaseT" . (("accBayanbaseT" . "accBayanbaseT") #f 0 1 0)) + ("accBayanbaseE" . (("accBayanbaseE" . "accBayanbaseE") #f 0 1 0)) + ("accBayanbaseTE" . (("accBayanbaseTE" . "accBayanbaseTE") #f 0 1 0)) + ("accBayanbaseEE" . (("accBayanbaseEE" . "accBayanbaseEE") #f 0 1 0)) + ("accBayanbaseTEE" . (("accBayanbaseTEE" . "accBayanbaseTEE") #f 0 1 0)) + ("accStdbase" . (("accStdbase" . "accStdbase") #f 0 1 0)) + ("accStdbaseTp" . (("accStdbaseTp" . "accStdbaseTp") #f 0 1 0)) + ("accStdbaseT" . (("accStdbaseT" . "accStdbaseT") #f 0 1 0)) + ("accStdbaseBp" . (("accStdbaseBp" . "accStdbaseBp") #f 0 1 0)) + ("accStdbaseM" . (("accStdbaseM" . "accStdbaseM") #f 0 1 0)) + ("accSB" . (("accSB" . "accSB") #f 0 1 0)) + ("accBB" . (("accBB" . "accBB") #f 0 1 0)) + ("accOldEE" . (("accOldEE" . "accOldEE") #f 0 1 0)) + ("accOldEES" . (("accOldEES" . "accOldEES") #f 0 1 0))) + script-alist) + ) -- 2.39.2