CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/03 22:22:56
Modified files:
. : ChangeLog VERSION
lily : context-def.cc lookup.cc
ly : chord-modifiers-init.ly engraver-init.ly
ps : music-drawing-routines.ps
scm : define-markup-commands.scm output-ps.scm
output-tex.scm
Removed files:
buildscripts : ps-embed-cff.py
Log message:
* lily/context-def.cc (path_to_acceptable_context): bugfix, depth
should be taken without child context.
* ly/chord-modifiers-init.ly (blackTriangleMarkup): use it.
* scm/define-markup-commands.scm (triangle): new command, as
robust replacement for unicode Delta/Triangle.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3543&tr2=1.3544&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/VERSION.diff?tr1=1.632&tr2=1.633&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/context-def.cc.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lookup.cc.diff?tr1=1.184&tr2=1.185&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/chord-modifiers-init.ly.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/engraver-init.ly.diff?tr1=1.228&tr2=1.229&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ps/music-drawing-routines.ps.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-ps.scm.diff?tr1=1.135&tr2=1.136&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-tex.scm.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3543 lilypond/ChangeLog:1.3544
--- lilypond/ChangeLog:1.3543 Tue May 3 19:07:42 2005
+++ lilypond/ChangeLog Tue May 3 22:22:55 2005
@@ -1,5 +1,19 @@
+2005-05-04 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/context-def.cc (path_to_acceptable_context): bugfix, depth
+ should be taken without child context.
+
+ * ly/chord-modifiers-init.ly (blackTriangleMarkup): use it.
+
+ * scm/define-markup-commands.scm (triangle): new command, as
+ robust replacement for unicode Delta/Triangle.
+
2005-05-03 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * ps/music-drawing-routines.ps: add fillp argument.
+
+ * lily/lookup.cc (round_filled_polygon): polygon takes filled? argument
+
* lily/font-config.cc (init_fontconfig): don't add cff/
* VERSION (PACKAGE_NAME): release 2.5.22
Index: lilypond/VERSION
diff -u lilypond/VERSION:1.632 lilypond/VERSION:1.633
--- lilypond/VERSION:1.632 Tue May 3 12:53:43 2005
+++ lilypond/VERSION Tue May 3 22:22:55 2005
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=5
-PATCH_LEVEL=22
+PATCH_LEVEL=23
MY_PATCH_LEVEL=
Index: lilypond/lily/context-def.cc
diff -u lilypond/lily/context-def.cc:1.38 lilypond/lily/context-def.cc:1.39
--- lilypond/lily/context-def.cc:1.38 Tue May 3 12:26:45 2005
+++ lilypond/lily/context-def.cc Tue May 3 22:22:56 2005
@@ -227,12 +227,9 @@
= g->path_to_acceptable_context (type_sym, odef);
if (result.size () && result.size () < best_depth)
{
+ best_depth = result.size ();
result.insert (g, 0);
best_result = result;
-
- /* this following line was added in 1.9.3, but hsould've been
- there all along... Let's hope it doesn't cause nightmares. */
- best_depth = result.size ();
}
}
Index: lilypond/lily/lookup.cc
diff -u lilypond/lily/lookup.cc:1.184 lilypond/lily/lookup.cc:1.185
--- lilypond/lily/lookup.cc:1.184 Sat Apr 30 23:43:03 2005
+++ lilypond/lily/lookup.cc Tue May 3 22:22:56 2005
@@ -308,6 +308,7 @@
SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"),
ly_quote_scm (shrinked_points_scm),
scm_make_real (blotdiameter),
+ SCM_BOOL_T,
SCM_UNDEFINED);
Stencil polygon = Stencil (box, polygon_scm);
Index: lilypond/ly/chord-modifiers-init.ly
diff -u lilypond/ly/chord-modifiers-init.ly:1.40
lilypond/ly/chord-modifiers-init.ly:1.41
--- lilypond/ly/chord-modifiers-init.ly:1.40 Fri Apr 15 23:57:21 2005
+++ lilypond/ly/chord-modifiers-init.ly Tue May 3 22:22:56 2005
@@ -4,8 +4,9 @@
whiteTriangleMarkup = \markup {
+ \triangle ##f
%% 394 capital delta
- #(ly:export (ly:wide-char->utf-8 #x0394))
+ %#(ly:export (ly:wide-char->utf-8 #x0394))
%% 2206 : delta from the symbol font.
% #(ly:export (ly:wide-char->utf-8 #x2206))
@@ -17,9 +18,10 @@
}
blackTriangleMarkup = \markup {
+ \triangle ##t
%% black up pointing triangle
- #(ly:export (ly:wide-char->utf-8 #x25B2))
+% #(ly:export (ly:wide-char->utf-8 #x25B2))
}
ignatzekExceptionMusic = {
Index: lilypond/ly/engraver-init.ly
diff -u lilypond/ly/engraver-init.ly:1.228 lilypond/ly/engraver-init.ly:1.229
--- lilypond/ly/engraver-init.ly:1.228 Tue May 3 12:13:28 2005
+++ lilypond/ly/engraver-init.ly Tue May 3 22:22:56 2005
@@ -402,7 +402,7 @@
\context {
\type Score_engraver
- \name Score
+ \name "Score"
\description "This is the top level notation context. No
other context can contain a @code{Score} context. This context
@@ -435,12 +435,12 @@
\defaultchild "Staff"
\accepts "Staff"
- \accepts "TabStaff"
+ \accepts "RhythmicStaff"
+%{ \accepts "TabStaff"
\accepts "VaticanaStaff"
\accepts "GregorianTranscriptionStaff"
\accepts "MensuralStaff"
\accepts "StaffGroup"
- \accepts "RhythmicStaff"
\accepts "DrumStaff"
\accepts "Lyrics"
\accepts "ChordNames"
@@ -450,7 +450,7 @@
\accepts "Devnull"
\accepts "NoteNames"
\accepts "FiguredBass"
-
+%}
soloText = #"Solo"
soloIIText = #"Solo II"
aDueText = #"a2"
Index: lilypond/ps/music-drawing-routines.ps
diff -u lilypond/ps/music-drawing-routines.ps:1.33
lilypond/ps/music-drawing-routines.ps:1.34
--- lilypond/ps/music-drawing-routines.ps:1.33 Wed Apr 13 00:15:06 2005
+++ lilypond/ps/music-drawing-routines.ps Tue May 3 22:22:56 2005
@@ -157,8 +157,9 @@
} ifelse
} bind def
-/draw_polygon % x(n) y(n) x(n-1) y(n-1) ... x(1) y(1) n blot
+/draw_polygon % x(n) y(n) x(n-1) y(n-1) ... x(1) y(1) n blot fill
{
+ /fillp exch def
/blot exch def
0 setlinecap
@@ -168,12 +169,12 @@
/points exch def
2 copy
moveto
- 1 1 points {pop lineto} for
- currentdict /testing known {
- %% outline only, for testing:
- stroke
+ 1 1 points { pop lineto } for
+ closepath
+ fillp {
+ gsave stroke grestore fill
}{
- closepath gsave stroke grestore fill
+ stroke
} ifelse
} bind def
Index: lilypond/scm/define-markup-commands.scm
diff -u lilypond/scm/define-markup-commands.scm:1.90
lilypond/scm/define-markup-commands.scm:1.91
--- lilypond/scm/define-markup-commands.scm:1.90 Thu Apr 21 15:59:44 2005
+++ lilypond/scm/define-markup-commands.scm Tue May 3 22:22:56 2005
@@ -25,6 +25,27 @@
optionally filled."
(make-circle-stencil radius thickness fill))
+(def-markup-command (triangle layout props filled) (boolean?)
+ "A triangle, filled or not"
+ (let*
+ ((th (chain-assoc-get 'thickness props 0.1))
+ (size (chain-assoc-get 'font-size props 0))
+ (ex (* (magstep size)
+ 0.8
+ (chain-assoc-get 'baseline-skip props 2))))
+
+ (ly:make-stencil
+ `(polygon '(0.0 0.0
+ ,ex 0.0
+ ,(* 0.5 ex)
+ ,(* 0.86 ex))
+ ,th
+ ,filled)
+
+ (cons 0 ex)
+ (cons 0 (* .86 ex))
+ )))
+
(def-markup-command (circle layout props arg) (markup?)
"Draw a circle around @var{arg}. Use @code{thickness},
@code{circle-padding} and @code{font-size} properties to determine line
Index: lilypond/scm/output-ps.scm
diff -u lilypond/scm/output-ps.scm:1.135 lilypond/scm/output-ps.scm:1.136
--- lilypond/scm/output-ps.scm:1.135 Tue May 3 11:31:51 2005
+++ lilypond/scm/output-ps.scm Tue May 3 22:22:56 2005
@@ -245,11 +245,12 @@
(string-append
(ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
-(define (polygon points blotdiameter)
+(define (polygon points blotdiameter filled?)
(string-append
(ly:numbers->string points) " "
(ly:number->string (/ (length points) 2)) " "
(ly:number->string blotdiameter)
+ (if filled? " true " " false ")
" draw_polygon"))
(define (repeat-slash wid slope thick)
Index: lilypond/scm/output-tex.scm
diff -u lilypond/scm/output-tex.scm:1.90 lilypond/scm/output-tex.scm:1.91
--- lilypond/scm/output-tex.scm:1.90 Wed Apr 27 13:00:50 2005
+++ lilypond/scm/output-tex.scm Tue May 3 22:22:56 2005
@@ -183,8 +183,8 @@
(define (resetcolor)
(string-append "\\color[rgb]{0,0,0}\n"))
-(define (polygon points blotdiameter)
- (embedded-ps (list 'polygon `(quote ,points) blotdiameter)))
+(define (polygon points blotdiameter fill)
+ (embedded-ps (list 'polygon `(quote ,points) blotdiameter fill)))
(define (draw-line thick fx fy tx ty)
(embedded-ps (list 'draw-line thick fx fy tx ty)))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
