2002-06-16 Jan Nieuwenhuizen <janneke@gnu.org>
- * 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
#!@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
}
- 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));
--- /dev/null
+%{
+
+ 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 <cgscqmp@terra.es>
+
+
+% 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"
%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
%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
%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
))
; simple flat slurs
-(define (bezier-sandwich l thick)
+(define (bezier-bow l thick)
(let (
(c0 (cadddr l))
(c1 (cadr l))
(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))
"\\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)))
(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)
(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))
(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
"\\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)))
projects / lilypond.git / commitdiff