From b9b40f154d0dfa9c3fcd44028bd8b745b87e4873 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 16 Jun 2002 12:25:09 +0000 Subject: [PATCH] * lily/lookup.cc (slur): Invoke bezier-bow. * scm/tex.scm (bezier-bow): * scm/ps.scm (bezier-bow): Bezier sandwich with rounded endings (Previously named bezier-sandwich). * scm/tex.scm (bezier-sandwich): * scm/ps.scm (bezier-sandwich): Plain bezier sandwich. * make/lilypond.mandrake.spec.in (post): * make/lilypond.suse.spec.in (post): * make/lilypond.redhat.spec.in (post): Also remove parmesan fonts. * ly/espanol.ly: Spanish note names by Carlos Garc'ia Su'arez . --- ChangeLog | 13 ++++- Documentation/windows/post-lilypond.sh | 4 ++ lily/lookup.cc | 2 +- ly/espanol.ly | 70 ++++++++++++++++++++++++++ make/lilypond.mandrake.spec.in | 2 +- make/lilypond.redhat.spec.in | 2 +- make/lilypond.suse.spec.in | 2 +- scm/ascii-script.scm | 2 +- scm/pdf.scm | 4 ++ scm/pdftex.scm | 3 ++ scm/ps.scm | 9 ++++ scm/sketch.scm | 3 ++ scm/tex.scm | 3 ++ 13 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 ly/espanol.ly diff --git a/ChangeLog b/ChangeLog index 32ff909025..8c38697d2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,18 @@ 2002-06-16 Jan Nieuwenhuizen - * make/lilypond.redhat.spec.in (post): Also remove parmesan fonts. + * lily/lookup.cc (slur): Invoke bezier-bow. + + * scm/tex.scm (bezier-bow): + * scm/ps.scm (bezier-bow): Bezier sandwich with rounded endings + (Previously named bezier-sandwich). + + * scm/tex.scm (bezier-sandwich): + * scm/ps.scm (bezier-sandwich): Plain bezier sandwich. + * make/lilypond.mandrake.spec.in (post): + * make/lilypond.suse.spec.in (post): + * make/lilypond.redhat.spec.in (post): Also remove parmesan fonts. + * tex/lilyponddefs.tex: Uncomment feta character support. * Documentation/user/refman.itely (Pitches): Add espanol.ly diff --git a/Documentation/windows/post-lilypond.sh b/Documentation/windows/post-lilypond.sh index 8259c90f64..a94028275c 100644 --- a/Documentation/windows/post-lilypond.sh +++ b/Documentation/windows/post-lilypond.sh @@ -1,6 +1,10 @@ #!@SHELL@ # /etc/profile.d/post-lily.sh -- Setup LilyPond +# touch /tmp/.lilypond-install -- from redhat.spec, why? +rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm' -print'` +# rm /tmp/.lilypond-install + rm -f /usr/lilypond lily=@prefix@ ln -s $lily /usr/lilypond diff --git a/lily/lookup.cc b/lily/lookup.cc index e59699292d..157b474ade 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -217,7 +217,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) } - SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"), + SCM at = (scm_list_n (ly_symbol2scm ("bezier-bow"), ly_quote_scm (list), gh_double2scm (linethick), SCM_UNDEFINED)); diff --git a/ly/espanol.ly b/ly/espanol.ly new file mode 100644 index 0000000000..be0bc22073 --- /dev/null +++ b/ly/espanol.ly @@ -0,0 +1,70 @@ +%{ + + Common Spanish names for notes. "b" means flat (bemol), "s" means + sharp (sostenido). + + Adapted from italiano.ly. + + English: a b c d e f g + Spanish: la si do re mi fa sol + + For some strange reason, dutch.ly and german.ly were renamed to + follow the (ms-dos?) norsk naming convention. + + For spanish.ly, it should actually be "espa~nol.ly" with a "n with + tilde on top" As the n with tilde is possibly not a good character to + have I would write without the tilde, that is "espanol.ly" + +%} + +% contributed by Carlos Garc'ia Su'arez + + +% For using "sostingut" notation, which is also correct +\pitchnames #`( + (dobb . ,(make-pitch -1 0 -2 )) + (dob . ,(make-pitch -1 0 -1 )) + (do . ,(make-pitch -1 0 0 )) + (dos . ,(make-pitch -1 0 1 )) + (doss . ,(make-pitch -1 0 2 )) + + (rebb . ,(make-pitch -1 1 -2 )) + (reb . ,(make-pitch -1 1 -1 )) + (re . ,(make-pitch -1 1 0 )) + (res . ,(make-pitch -1 1 1 )) + (ress . ,(make-pitch -1 1 2 )) + + (mibb . ,(make-pitch -1 2 -2 )) + (mib . ,(make-pitch -1 2 -1 )) + (mi . ,(make-pitch -1 2 0 )) + (mis . ,(make-pitch -1 2 1 )) + (miss . ,(make-pitch -1 2 2 )) + + (fabb . ,(make-pitch -1 3 -2 )) + (fab . ,(make-pitch -1 3 -1 )) + (fa . ,(make-pitch -1 3 0 )) + (fas . ,(make-pitch -1 3 1 )) + (fass . ,(make-pitch -1 3 2 )) + + (solbb . ,(make-pitch -1 4 -2 )) + (solb . ,(make-pitch -1 4 -1 )) + (sol . ,(make-pitch -1 4 0 )) + (sols . ,(make-pitch -1 4 1 )) + (solss . ,(make-pitch -1 4 2 )) + + (labb . ,(make-pitch -1 5 -2 )) + (lab . ,(make-pitch -1 5 -1 )) + (la . ,(make-pitch -1 5 0 )) + (las . ,(make-pitch -1 5 1 )) + (lass . ,(make-pitch -1 5 2 )) + + (sibb . ,(make-pitch -1 6 -2 )) + (sib . ,(make-pitch -1 6 -1 )) + (si . ,(make-pitch -1 6 0 )) + (sis . ,(make-pitch -1 6 1 )) + (siss . ,(make-pitch -1 6 2 )) +) + + + +\version "1.5.49" diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in index 073071203e..90e57085c8 100644 --- a/make/lilypond.mandrake.spec.in +++ b/make/lilypond.mandrake.spec.in @@ -96,7 +96,7 @@ cp AUTHORS.txt CHANGES COPYING DEDICATION FAQ.txt NEWS README.txt VERSION README %post touch /tmp/.lilypond-install -rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install +rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm' -print'` /tmp/.lilypond-install /usr/bin/mktexlsr %_install_info lilypond.info %_install_info lilypond-internals.info diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 10858db7a5..9dc6c3f125 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -81,7 +81,7 @@ tar -C web -xzf out/web.tar.gz %post touch /tmp/.lilypond-install -rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install +rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm' -print'` /tmp/.lilypond-install %if info=="yes" /sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir diff --git a/make/lilypond.suse.spec.in b/make/lilypond.suse.spec.in index c020772e43..ebe46c3ecf 100644 --- a/make/lilypond.suse.spec.in +++ b/make/lilypond.suse.spec.in @@ -185,7 +185,7 @@ fi %post touch /tmp/.lilypond-install -rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install +rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm' -print'` /tmp/.lilypond-install %if info=="yes" /usr/bin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true %endif diff --git a/scm/ascii-script.scm b/scm/ascii-script.scm index 5413ee1b98..760b6096be 100644 --- a/scm/ascii-script.scm +++ b/scm/ascii-script.scm @@ -91,7 +91,7 @@ )) ; simple flat slurs -(define (bezier-sandwich l thick) +(define (bezier-bow l thick) (let ( (c0 (cadddr l)) (c1 (cadr l)) diff --git a/scm/pdf.scm b/scm/pdf.scm index 834e217ea3..684a986fbf 100644 --- a/scm/pdf.scm +++ b/scm/pdf.scm @@ -183,6 +183,10 @@ (define (placebox x y s) "") +;; TODO: bezier-ending, see ps.scm +(define (bezier-bow l thick) + (bezier-sandwich l thick)) + (define (bezier-sandwich l thick) (string-append (setlinewidth thick) (moveto-pair (list-ref l 7)) diff --git a/scm/pdftex.scm b/scm/pdftex.scm index 871841d81d..f193a37ed7 100644 --- a/scm/pdftex.scm +++ b/scm/pdftex.scm @@ -184,6 +184,9 @@ "\\placebox{" (number->dim y) "}{" (number->dim x) "}{" s "}\n")) +(define (bezier-bow l thick) + (embedded-pdf (list 'bezier-bow `(quote ,l) thick))) + (define (bezier-sandwich l thick) (embedded-pdf (list 'bezier-sandwich `(quote ,l) thick))) diff --git a/scm/ps.scm b/scm/ps.scm index 3fd3ad1828..b0f1bdb41d 100644 --- a/scm/ps.scm +++ b/scm/ps.scm @@ -229,7 +229,15 @@ (string-append (ly-number->string x) " " (ly-number->string y) " {" s "} place-box\n")) +;; two beziers (define (bezier-sandwich l thick) + (string-append + (apply string-append (map control->string l)) + (ly-number->string thick) + " draw_bezier_sandwich ")) + +;; two beziers with round endings +(define (bezier-bow l thick) (string-append (apply string-append (map control->string l)) (ly-number->string thick) @@ -237,6 +245,7 @@ (bezier-ending (list-ref l 3) (list-ref l 0) (list-ref l 5)) (bezier-ending (list-ref l 7) (list-ref l 0) (list-ref l 5)))) +;; two beziers with round endings (define (bezier-ending z0 z1 z2) (let ((x0 (car z0)) (y0 (cdr z0)) diff --git a/scm/sketch.scm b/scm/sketch.scm index 5ecc07d96b..9e784d5d8b 100644 --- a/scm/sketch.scm +++ b/scm/sketch.scm @@ -230,6 +230,9 @@ layer('Layer 1',1,1,0,0,(0,0,0)) (define (invoke-char s i) "") +;; TODO: bezier-ending, see ps.scm +(define (bezier-bow x y l thick) + (bezier-sandwich x y l thick)) (define (bezier-sandwich x y l thick) (apply diff --git a/scm/tex.scm b/scm/tex.scm index 1f0a22b403..4df648dd0b 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -223,6 +223,9 @@ "\\placebox{" (number->dim y) "}{" (number->dim x) "}{" s "}%\n")) +(define (bezier-bow l thick) + (embedded-ps (list 'bezier-bow `(quote ,l) thick))) + (define (bezier-sandwich l thick) (embedded-ps (list 'bezier-sandwich `(quote ,l) thick))) -- 2.39.5