From: fred Date: Tue, 26 Mar 2002 21:49:27 +0000 (+0000) Subject: lilypond-1.1.42 X-Git-Tag: release/1.5.59~2459 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=510d1dddd3d422b4633da6c2ff8e81814841fcd5;p=lilypond.git lilypond-1.1.42 --- diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf index 3974a52342..190e7e576d 100644 --- a/mf/feta-accordion.mf +++ b/mf/feta-accordion.mf @@ -1,19 +1,18 @@ % -*- Fundamental -*- - - -accreg_dot_size# := .7interline#; +accreg_dot_size# := .6interline#; accreg_linethickness# := 1.3stafflinethickness#; % This dimention is the same on all registersymbols. % The different symbols should calculate their other % dimensions from this and accreg_dot_size -accreg_lh# := 1.2interline#; +accreg_lh# := 1.0interline#; define_pixels(accreg_dot_size, accreg_linethickness, accreg_lh); pen accreg_pen; accreg_pen := pencircle xscaled accreg_linethickness yscaled 0.7accreg_linethickness; -def draw_discant_reg(expr A, B, C, D, E, F) = + +fet_beginchar("accDiscant", "accDiscant", "accDiscant") save r, sx; r# = 3/2accreg_lh#; define_pixels(r); @@ -24,18 +23,16 @@ def draw_discant_reg(expr A, B, C, D, E, F) = sx = cosd(19.471221); draw (-sx*r, r/3)--(sx*r, r/3); draw (-sx*r, -r/3)--(sx*r, -r/3); + currentpicture := currentpicture shifted (0, r); +fet_endchar; +fet_beginchar("accDot", "accDot", "accDot") + set_char_box(accreg_dot_size#, accreg_dot_size#, 0, 0); pickup pencircle scaled accreg_dot_size; - if A = 1: drawdot (0, 2/3r); fi - if B = 1: drawdot (r/2, 0); fi - if C = 1: drawdot (0, 0); fi - if D = 1: drawdot (-r/2, 0); fi - if E = 1: drawdot (0, -2/3r); fi - if F = 1: drawdot (-.25r, -.642r); drawdot (.25r, -.642r); fi - currentpicture := currentpicture shifted (0, r); -enddef; + draw(0, 0); +fet_endchar; -def draw_freebase_reg(expr rFour, rEight) = +fet_beginchar("accFreebase", "accFreebase", "accFreebase") save r; r#= accreg_lh#; define_pixels(r); @@ -43,13 +40,10 @@ def draw_freebase_reg(expr rFour, rEight) = pickup accreg_pen; draw fullcircle scaled 2r; draw (-r, 0)--(r, 0); - pickup pencircle scaled accreg_dot_size; - if rFour = 1: draw (0, r/2); fi - if rEight = 1: draw (0, -r/2); fi currentpicture := currentpicture shifted (0, r); -enddef; +fet_endchar; -def draw_stdbase_reg(expr A, B, C, D, E) = +fet_beginchar("accStdbase", "accStdbase", "accStdbase") save r, sx; r# = 2accreg_lh#; define_pixels(r); @@ -60,16 +54,10 @@ def draw_stdbase_reg(expr A, B, C, D, E) = draw (-r, 0)--(r, 0); draw (-sx*r, r/2)--(sx*r, r/2); draw (-sx*r, -r/2)--(sx*r, -r/2); - pickup pencircle scaled accreg_dot_size; - if A = 1: draw (0, -3/4r); fi - if B = 1: draw (0, -1/4r); fi - if C = 1: draw (0, 1/4r); fi - if D = 1: draw (0, 3/4r); fi - if E = 1: draw (1/2r, 0); fi currentpicture := currentpicture shifted (0, r); -enddef; +fet_endchar; -def draw_bayanbase_reg_sign(expr nTwo, nEight) = +fet_beginchar("accBayanbase", "accBayanbase", "accBayanbase") save lh; lh = accreg_lh; % set_char_box(accreg_lh#, accreg_lh#, 3accreg_lh#, 0); @@ -78,168 +66,7 @@ def draw_bayanbase_reg_sign(expr nTwo, nEight) = draw (0, 0)--(2w, 0)--(2w, 3accreg_lh)--(0, 3accreg_lh)--(0, 0); draw (0, accreg_lh)--(2w, accreg_lh); draw (0, 2accreg_lh)--(2w, 2accreg_lh); - - pickup pencircle scaled accreg_dot_size; - if nTwo = 1: draw (w, 5/2lh); fi - if nEight = 1: draw (w, lh/2); fi - if nEight = 2: draw (5/8w, lh/2); draw (11/8w, lh/2); fi currentpicture := currentpicture shifted (-w, 0);% -3lh); -enddef; - -fet_beginchar("accDiscant", "accDiscant", "accDiscant") - draw_discant_reg(0, 0, 0, 0, 0, 0); -fet_endchar; - -fet_beginchar("accDiscantF", "accDiscantF", "accDiscantF") - draw_discant_reg(1, 0, 0, 0, 0, 0); -fet_endchar; - -fet_beginchar("accDiscantEh", "accDiscantEh", "accDiscantEh") - draw_discant_reg(0, 1, 0, 0, 0, 0); -fet_endchar; - -fet_beginchar("accDiscantE", "accDiscantE", "accDiscantE") - draw_discant_reg(0, 0, 1, 0, 0, 0); -fet_endchar; - -fet_beginchar("accDiscantFE", "accDiscantFE", "accDiscantFE") - draw_discant_reg(1, 0, 1, 0, 0, 0); -fet_endchar; - -fet_beginchar("accDiscantFEh", "accDiscantFEh", "accDiscantFEh") - draw_discant_reg(1, 1, 0, 0, 0, 0); -fet_endchar; - -fet_beginchar("accDiscantEE", "accDiscantEE", "accDiscantEE") - draw_discant_reg(0, 1, 0, 1, 0, 0); -fet_endchar; - -fet_beginchar("accDiscantFEE", "accDiscantFEE", "accDiscantFEE") - draw_discant_reg(1, 1, 0, 1, 0, 0); -fet_endchar; - -fet_beginchar("accDiscantEEE", "accDiscantEEE", "accDiscantEEE") - draw_discant_reg(0, 1, 1, 1, 0, 0); -fet_endchar; - -fet_beginchar("accDiscantFEEE", "accDiscantFEEE", "accDiscantFEEE") - draw_discant_reg(1, 1, 1, 1, 0, 0); -fet_endchar; - -fet_beginchar("accDiscantS", "accDiscantS", "accDiscantS") - draw_discant_reg(0, 0, 0, 0, 1, 0); -fet_endchar; - -fet_beginchar("accDiscantFS", "accDiscantFS", "accDiscantFS") - draw_discant_reg(1, 0, 0, 0, 1, 0); -fet_endchar; - -fet_beginchar("accDiscantES", "accDiscantES", "accDiscantES") - draw_discant_reg(0, 0, 1, 0, 1, 0); -fet_endchar; - -fet_beginchar("accDiscantEhS", "accDiscantEhS", "accDiscantEhS") - draw_discant_reg(0, 1, 0, 0, 1, 0); -fet_endchar; - -fet_beginchar("accDiscantFES", "accDiscantFES", "accDiscantFES") - draw_discant_reg(1, 0, 1, 0, 1, 0); -fet_endchar; - -fet_beginchar("accDiscantFEhS", "accDiscantFEhS", "accDiscantFEhS") - draw_discant_reg(1, 1, 0, 0, 1, 0); -fet_endchar; - -fet_beginchar("accDiscantEES", "accDiscantEES", "accDiscantEES") - draw_discant_reg(0, 1, 0, 1, 1, 0); -fet_endchar; - -fet_beginchar("accDiscantFEES", "accDiscantFEES", "accDiscantFEES") - draw_discant_reg(1, 1, 0, 1, 1, 0); -fet_endchar; - -fet_beginchar("accDiscantEEES", "accDiscantEEES", "accDiscantEEES") - draw_discant_reg(0, 1, 1, 1, 1, 0); -fet_endchar; - -fet_beginchar("accDiscantFEEES", "accDiscantFEEES", "accDiscantFEEES") - draw_discant_reg(1, 1, 1, 1, 1, 0); -fet_endchar; - -fet_beginchar("accDiscantSS", "accDiscantSS", "accDiscantSS") - draw_discant_reg(0, 0, 0, 0, 0, 1); -fet_endchar; - -fet_beginchar("accDiscantESS", "accDiscantESS", "accDiscantESS") - draw_discant_reg(0, 0, 1, 0, 0, 1); -fet_endchar; - -fet_beginchar("accDiscantEESS", "accDiscantEESS", "accDiscantEESS") - draw_discant_reg(0, 1, 0, 1, 0, 1); -fet_endchar; - -fet_beginchar("accDiscantEEESS", "accDiscantEEESS", "accDiscantEEESS") - draw_discant_reg(0, 1, 1, 1, 0, 1); -fet_endchar; - -fet_beginchar("accFreebase", "accFreebase", "accFreebase") - draw_freebase_reg(0, 0); -fet_endchar; - -fet_beginchar("accFreebaseF", "accFreebaseF", "accFreebaseF") - draw_freebase_reg(1, 0); -fet_endchar; - -fet_beginchar("accFreebaseE", "accFreebaseE", "accFreebaseE") - draw_freebase_reg(0, 1); -fet_endchar; - -fet_beginchar("accFreebaseFE", "accFreebaseFE", "accFreebaseFE") - draw_freebase_reg(1, 1); -fet_endchar; - -fet_beginchar("accStdbase", "accStdbase", "accStdbase") - draw_stdbase_reg(0, 0, 0, 0, 0); -fet_endchar; - -fet_beginchar("accStdbaseM", "accStdbaseM", "accStdbaseM") - draw_stdbase_reg(1, 1, 1, 1, 1); -fet_endchar; - -fet_beginchar("accStdbaseBp", "accStdbaseBp", "accStdbaseBp") - draw_stdbase_reg(1, 1, 0, 0, 1); -fet_endchar; - -fet_beginchar("accStdbaseT", "accStdbaseT", "accStdbaseT") - draw_stdbase_reg(0, 1, 1, 1, 0); -fet_endchar; - -fet_beginchar("accStdbaseTp", "accStdbaseTp", "accStdbaseTp") - draw_stdbase_reg(0, 1, 1, 0, 0); -fet_endchar; - -fet_beginchar("accBayanbase", "accBayanbase", "accBayanbase") - draw_bayanbase_reg_sign(0, 0); -fet_endchar; - -fet_beginchar("accBayanbaseT", "accBayanbaseT", "accBayanbaseT") - draw_bayanbase_reg_sign(1, 0); -fet_endchar; - -fet_beginchar("accBayanbaseE", "accBayanbaseE", "accBayanbaseE") - draw_bayanbase_reg_sign(0, 1); -fet_endchar; - -fet_beginchar("accBayanbaseTE", "accBayanbaseTE", "accBayanbaseTE") - draw_bayanbase_reg_sign(1, 1); -fet_endchar; - -fet_beginchar("accBayanbaseEE", "accBayanbaseEE", "accBayanbaseEE") - draw_bayanbase_reg_sign(0, 2); -fet_endchar; - -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 index 388d3e6c96..c1a5d0605d 100644 --- a/scm/accordion-script.scm +++ b/scm/accordion-script.scm @@ -7,49 +7,65 @@ (set! script-alist (append - '(("accDiscant" . ((accordion ("accDiscant" . "accDiscant")) #f 0 1 0)) - ("accDiscantF" . ((accordion ("accDiscantF" . "accDiscantF")) #f 0 1 0)) - ("accDiscantE" . ((accordion ("accDiscantE" . "accDiscantE")) #f 0 1 0)) - ("accDiscantEh" . ((accordion ("accDiscantEh" . "accDiscantEh")) #f 0 1 0)) - ("accDiscantFE" . ((accordion ("accDiscantFE" . "accDiscantFE")) #f 0 1 0)) - ("accDiscantFEh" . ((accordion ("accDiscantFEh" . "accDiscantFEh")) #f 0 1 0)) - ("accDiscantEE" . ((accordion ("accDiscantEE" . "accDiscantEE")) #f 0 1 0)) - ("accDiscantFEE" . ((accordion ("accDiscantFEE" . "accDiscantFEE")) #f 0 1 0)) - ("accDiscantEEE" . ((accordion ("accDiscantEEE" . "accDiscantEEE")) #f 0 1 0)) - ("accDiscantFEEE" . ((accordion ("accDiscantFEEE" . "accDiscantFEEE")) #f 0 1 0)) - ("accDiscantS" . ((accordion ("accDiscantS" . "accDiscantS")) #f 0 1 0)) - ("accDiscantFS" . ((accordion ("accDiscantFS" . "accDiscantFS")) #f 0 1 0)) - ("accDiscantES" . ((accordion ("accDiscantES" . "accDiscantES")) #f 0 1 0)) - ("accDiscantEhS" . ((accordion ("accDiscantEhS" . "accDiscantEhS")) #f 0 1 0)) - ("accDiscantFES" . ((accordion ("accDiscantFES" . "accDiscantFES")) #f 0 1 0)) - ("accDiscantFEhS" . ((accordion ("accDiscantFEhS" . "accDiscantFEhS")) #f 0 1 0)) - ("accDiscantEES" . ((accordion ("accDiscantEES" . "accDiscantEES")) #f 0 1 0)) - ("accDiscantFEES" . ((accordion ("accDiscantFEES" . "accDiscantFEES")) #f 0 1 0)) - ("accDiscantEEES" . ((accordion ("accDiscantEEES" . "accDiscantEEES")) #f 0 1 0)) - ("accDiscantFEEES" . ((accordion ("accDiscantFEEES" . "accDiscantFEEES")) #f 0 1 0)) - ("accDiscantSS" . ((accordion ("accDiscantSS" . "accDiscantSS")) #f 0 1 0)) - ("accDiscantESS" . ((accordion ("accDiscantESS" . "accDiscantESS")) #f 0 1 0)) - ("accDiscantEESS" . ((accordion ("accDiscantEESS" . "accDiscantEESS")) #f 0 1 0)) - ("accDiscantEEESS" . ((accordion ("accDiscantEEESS" . "accDiscantEEESS")) #f 0 1 0)) - ("accFreebase" . ((accordion ("accFreebase" . "accFreebase")) #f 0 1 0)) - ("accFreebaseF" . ((accordion ("accFreebaseF" . "accFreebaseF")) #f 0 1 0)) - ("accFreebaseE" . ((accordion ("accFreebaseE" . "accFreebaseE")) #f 0 1 0)) - ("accFreebaseFE" . ((accordion ("accFreebaseFE" . "accFreebaseFE")) #f 0 1 0)) - ("accBayanbase" . ((accordion ("accBayanbase" . "accBayanbase")) #f 0 1 0)) - ("accBayanbaseT" . ((accordion ("accBayanbaseT" . "accBayanbaseT")) #f 0 1 0)) - ("accBayanbaseE" . ((accordion ("accBayanbaseE" . "accBayanbaseE")) #f 0 1 0)) - ("accBayanbaseTE" . ((accordion ("accBayanbaseTE" . "accBayanbaseTE")) #f 0 1 0)) - ("accBayanbaseEE" . ((accordion ("accBayanbaseEE" . "accBayanbaseEE")) #f 0 1 0)) - ("accBayanbaseTEE" . ((accordion ("accBayanbaseTEE" . "accBayanbaseTEE")) #f 0 1 0)) - ("accStdbase" . ((accordion ("accStdbase" . "accStdbase")) #f 0 1 0)) - ("accStdbaseTp" . ((accordion ("accStdbaseTp" . "accStdbaseTp")) #f 0 1 0)) - ("accStdbaseT" . ((accordion ("accStdbaseT" . "accStdbaseT")) #f 0 1 0)) - ("accStdbaseBp" . ((accordion ("accStdbaseBp" . "accStdbaseBp")) #f 0 1 0)) - ("accStdbaseM" . ((accordion ("accStdbaseM" . "accStdbaseM")) #f 0 1 0)) - ("accSB" . ((accordion ("accSB" . "accSB")) #f 0 1 0)) - ("accBB" . ((accordion ("accBB" . "accBB")) #f 0 1 0)) - ("accOldEE" . ((accordion ("accOldEE" . "accOldEE")) #f 0 1 0)) - ("accOldEES" . ((accordion ("accOldEES" . "accOldEES")) #f 0 1 0))) + '(("accDiscant" . ((accordion "Discant" "") #f 0 1 0)) + ("accDiscantF" . ((accordion "Discant" "F") #f 0 1 0)) + ("accDiscantE" . ((accordion "Discant" "E") #f 0 1 0)) + ("accDiscantEh" . ((accordion "Discant" "Eh") #f 0 1 0)) + ("accDiscantFE" . ((accordion "Discant" "FE") #f 0 1 0)) + ("accDiscantFEh" . ((accordion "Discant" "FEh") #f 0 1 0)) + ("accDiscantEE" . ((accordion "Discant" "EE") #f 0 1 0)) + ("accDiscantFEE" . ((accordion "Discant" "FEE") #f 0 1 0)) + ("accDiscantEEE" . ((accordion "Discant" "EEE") #f 0 1 0)) + ("accDiscantFEEE" . ((accordion "Discant" "FEEE") #f 0 1 0)) + ("accDiscantS" . ((accordion "Discant" "S") #f 0 1 0)) + ("accDiscantFS" . ((accordion "Discant" "FS") #f 0 1 0)) + ("accDiscantES" . ((accordion "Discant" "ES") #f 0 1 0)) + ("accDiscantEhS" . ((accordion "Discant" "EhS") #f 0 1 0)) + ("accDiscantFES" . ((accordion "Discant" "FES") #f 0 1 0)) + ("accDiscantFEhS" . ((accordion "Discant" "FEhS") #f 0 1 0)) + ("accDiscantEES" . ((accordion "Discant" "EES") #f 0 1 0)) + ("accDiscantFEES" . ((accordion "Discant" "FEES") #f 0 1 0)) + ("accDiscantEEES" . ((accordion "Discant" "EEES") #f 0 1 0)) + ("accDiscantFEEES" . ((accordion "Discant" "FEEES") #f 0 1 0)) + ("accDiscantSS" . ((accordion "Discant" "SS") #f 0 1 0)) + ("accDiscantESS" . ((accordion "Discant" "ESS") #f 0 1 0)) + ("accDiscantEESS" . ((accordion "Discant" "EESS") #f 0 1 0)) + ("accDiscantEEESS" . ((accordion "Discant" "EEESS") #f 0 1 0)) + ("accFreebase" . ((accordion "Freebase" "") #f 0 -1 0)) + ("accFreebaseF" . ((accordion "Freebase" "F") #f 0 -1 0)) + ("accFreebaseE" . ((accordion "Freebase" "E") #f 0 -1 0)) + ("accFreebaseFE" . ((accordion "Freebase" "FE") #f 0 -1 0)) + ("accBayanbase" . ((accordion "Bayanbase" "") #f 0 -1 0)) + ("accBayanbaseT" . ((accordion "Bayanbase" "T") #f 0 -1 0)) + ("accBayanbaseE" . ((accordion "Bayanbase" "E") #f 0 -1 0)) + ("accBayanbaseTE" . ((accordion "Bayanbase" "TE") #f 0 -1 0)) + ("accBayanbaseEE" . ((accordion "Bayanbase" "EE") #f 0 -1 0)) + ("accBayanbaseTEE" . ((accordion "Bayanbase" "TFEE") #f 0 -1 0)) +;; I don't know what naming of standard base registers is best? +;; The 'tenor-piano' style of names has been used in some old accordion +;; scores I have seen. But you never name the registers. These four are +;; the symbols that are most used then typesetting music, but in the real +;; world it differs a lot from instrument to instrument what registers +;; are available. + ("accStdbase" . ((accordion "Stdbase" "") #f 0 -1 0)) +;; tenor-piano + ("accStdbaseTp" . ((accordion "Stdbase" "FE") #f 0 -1 0)) +;; tenor + ("accStdbaseT" . ((accordion "Stdbase" "TFE") #f 0 -1 0)) +;; bass-piano + ("accStdbaseBp" . ((accordion "Stdbase" "MES") #f 0 -1 0)) +;; master (changed from accStdbaseM) + ("accStdbaseMa" . ((accordion "Stdbase" "TFMES") #f 0 -1 0)) + + ("accStdbaseFE" . ((accordion "Stdbase" "FE") #f 0 -1 0)) + ("accStdbaseTFE" . ((accordion "Stdbase" "TFE") #f 0 -1 0)) + ("accStdbaseMES" . ((accordion "Stdbase" "MES") #f 0 -1 0)) + ("accStdbaseTFMES" . ((accordion "Stdbase" "TFMES") #f 0 -1 0)) + + ("accSB" . ((accordion "SB" "") #f 0 -1 0)) + ("accBB" . ((accordion "BB" "") #f 0 -1 0)) + ("accOldEE" . ((accordion "OldEE" "") #f 0 -1 0)) + ("accOldEES" . ((accordion "OldEES" "") #f 0 -1 0))) script-alist) )