CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/05 22:13:58
Modified files:
. : ChangeLog
Documentation/user: introduction.itely
programming-interface.itely
lily : note-head.cc pango-font.cc
Added files:
lily/include : context-handle.hh
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3553&tr2=1.3554&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/introduction.itely.diff?tr1=1.135&tr2=1.136&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/programming-interface.itely.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-head.cc.diff?tr1=1.137&tr2=1.138&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/pango-font.cc.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/context-handle.hh?rev=1.1
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3553 lilypond/ChangeLog:1.3554
--- lilypond/ChangeLog:1.3553 Wed May 4 16:11:59 2005
+++ lilypond/ChangeLog Thu May 5 22:13:57 2005
@@ -1,3 +1,8 @@
+2005-05-05 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * Documentation/user/programming-interface.itely (How markups work
+ internally ): remove \encoding reference.
+
2005-05-04 Mats Bengtsson <[EMAIL PROTECTED]>
* scripts/convert-ly.py: Attempt to do a smarter update of
Index: lilypond/Documentation/user/introduction.itely
diff -u lilypond/Documentation/user/introduction.itely:1.135
lilypond/Documentation/user/introduction.itely:1.136
--- lilypond/Documentation/user/introduction.itely:1.135 Wed May 4
03:58:36 2005
+++ lilypond/Documentation/user/introduction.itely Thu May 5 22:13:58 2005
@@ -665,7 +665,7 @@
The
@end ifhtml
@[EMAIL PROTECTED] notation}}
[EMAIL PROTECTED]
[EMAIL PROTECTED]
chapter
@end ifhtml
discusses topics grouped by notation construct. This section gives
@@ -677,7 +677,7 @@
The
@end ifhtml
@[EMAIL PROTECTED] notation}}
[EMAIL PROTECTED]
[EMAIL PROTECTED]
chapter
@end ifhtml
discusses topics grouped by notation construct. This section gives
@@ -689,7 +689,7 @@
The
@end ifhtml
@[EMAIL PROTECTED] notation}}
[EMAIL PROTECTED]
[EMAIL PROTECTED]
chapter
@end ifhtml
discusses topics grouped by notation construct. This section gives
Index: lilypond/Documentation/user/programming-interface.itely
diff -u lilypond/Documentation/user/programming-interface.itely:1.32
lilypond/Documentation/user/programming-interface.itely:1.33
--- lilypond/Documentation/user/programming-interface.itely:1.32 Thu Mar
31 03:42:06 2005
+++ lilypond/Documentation/user/programming-interface.itely Thu May 5
22:13:58 2005
@@ -501,13 +501,9 @@
function. The markup expression is stored as
@example
-(list raise-markup 0.5 (list simple-markup 'latin1 "foo"))
+(list raise-markup 0.5 (list simple-markup "foo"))
@end example
[EMAIL PROTECTED]
-In this case, @code{latin1} is the input encoding, which is set with
-the @code{\encoding} command.
-
When the markup is converted to printable objects (Stencils), the
@code{raise-markup} function is called as
@@ -519,10 +515,10 @@
@var{the "foo" markup})
@end example
-The @code{raise-markup} first creates the stencil for the @code{foo}
-string, and then it raises that Stencil by 0.5 staff space. This is a
-rather simple example; more complex examples are in the rest of this
-section, and in @file{scm/@/define@/-markup@/-commands@/.scm}.
+The @code{raise-markup} function first creates the stencil for the
[EMAIL PROTECTED] string, and then it raises that Stencil by 0.5 staff space.
+This is a rather simple example; more complex examples are in the rest
+of this section, and in @file{scm/@/define@/-markup@/-commands@/.scm}.
@node Markup command definition
@subsection Markup command definition
Index: lilypond/lily/note-head.cc
diff -u lilypond/lily/note-head.cc:1.137 lilypond/lily/note-head.cc:1.138
--- lilypond/lily/note-head.cc:1.137 Wed May 4 11:03:11 2005
+++ lilypond/lily/note-head.cc Thu May 5 22:13:58 2005
@@ -165,7 +165,7 @@
Note_head::get_balltype (Grob *me)
{
SCM s = me->get_property ("duration-log");
- return scm_is_number (s) ? min ((int) scm_to_int (s), (int) 2) : 0;
+ return scm_is_number (s) ? min (scm_to_int (s), 2) : 0;
}
ADD_INTERFACE (Note_head, "note-head-interface",
Index: lilypond/lily/pango-font.cc
diff -u lilypond/lily/pango-font.cc:1.30 lilypond/lily/pango-font.cc:1.31
--- lilypond/lily/pango-font.cc:1.30 Wed May 4 10:11:32 2005
+++ lilypond/lily/pango-font.cc Thu May 5 22:13:58 2005
@@ -24,6 +24,7 @@
PangoFontDescription *description,
Real output_scale)
{
+ (void) fontmap;
physical_font_tab_ = scm_c_make_hash_table (11);
PangoDirection pango_dir = (dir == RIGHT)
? PANGO_DIRECTION_LTR
@@ -142,8 +143,8 @@
*/
String name = filename;
- int idx = String (filename).index (".otf")
- >? String (filename).index (".cff");
+ int idx = max (String (filename).index (".otf"),
+ String (filename).index (".cff"));
name = name.left_string (idx);
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
