CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/07 15:13:06
Modified files:
. : ChangeLog
flower : axis.cc
flower/include : direction.hh offset.hh
lily : balloon.cc beam.cc book.cc breathing-sign.cc
chord-name.cc dynamic-text-spanner.cc
easy-notation.cc figured-bass-engraver.cc
hairpin.cc instrument-name-engraver.cc
mark-engraver.cc multi-measure-rest.cc
ottava-bracket.cc paper-book.cc paper-column.cc
parser.yy part-combine-engraver.cc slur.cc
text-engraver.cc text-interface.cc
text-spanner.cc time-signature.cc
tuplet-bracket.cc volta-bracket.cc
lily/include : dimension-cache-callback.hh
Added files:
flower/include : axis.hh
lily/include : text-interface.hh
Removed files:
flower/include : axes.hh
lily/include : text-item.hh
Log message:
* flower/include/axis.hh: rename from axes.hh
* lily/include/text-interface.hh (Module): rename from text-item.hh
* scm/framework-ps.scm (font-file-as-ps-string): new function.
(handle-macfont): new function. Call fondu for Native mac fonts.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3735&tr2=1.3736&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/axis.cc.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/axis.hh?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/direction.hh.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/offset.hh.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/balloon.cc.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/beam.cc.diff?tr1=1.301&tr2=1.302&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/book.cc.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/breathing-sign.cc.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/chord-name.cc.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/dynamic-text-spanner.cc.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/easy-notation.cc.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/figured-bass-engraver.cc.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/hairpin.cc.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/instrument-name-engraver.cc.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/mark-engraver.cc.diff?tr1=1.98&tr2=1.99&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/multi-measure-rest.cc.diff?tr1=1.124&tr2=1.125&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ottava-bracket.cc.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-book.cc.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-column.cc.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parser.yy.diff?tr1=1.471&tr2=1.472&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/part-combine-engraver.cc.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur.cc.diff?tr1=1.217&tr2=1.218&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/text-engraver.cc.diff?tr1=1.93&tr2=1.94&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/text-interface.cc.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/text-spanner.cc.diff?tr1=1.113&tr2=1.114&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/time-signature.cc.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tuplet-bracket.cc.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/volta-bracket.cc.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/text-interface.hh?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/dimension-cache-callback.hh.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3735 lilypond/ChangeLog:1.3736
--- lilypond/ChangeLog:1.3735 Tue Jun 7 14:38:07 2005
+++ lilypond/ChangeLog Tue Jun 7 15:13:05 2005
@@ -1,5 +1,9 @@
2005-06-07 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * flower/include/axis.hh: rename from axes.hh
+
+ * lily/include/text-interface.hh (Module): rename from text-item.hh
+
* VERSION (PATCH_LEVEL): release 2.5.29
* ttftool/parse.c (readNamingTable): handle Apple/8bit encoding too.
Index: lilypond/flower/axis.cc
diff -u lilypond/flower/axis.cc:1.16 lilypond/flower/axis.cc:1.17
--- lilypond/flower/axis.cc:1.16 Mon Jun 6 23:31:21 2005
+++ lilypond/flower/axis.cc Tue Jun 7 15:13:05 2005
@@ -4,7 +4,7 @@
(c) 1997--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
*/
-#include "axes.hh"
+#include "axis.hh"
#include "string.hh"
String
Index: lilypond/flower/include/direction.hh
diff -u lilypond/flower/include/direction.hh:1.12
lilypond/flower/include/direction.hh:1.13
--- lilypond/flower/include/direction.hh:1.12 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/include/direction.hh Tue Jun 7 15:13:06 2005
@@ -9,7 +9,7 @@
#ifndef DIRECTION_HH
#define DIRECTION_HH
-#include "axes.hh"
+#include "axis.hh"
enum Direction
{
Index: lilypond/flower/include/offset.hh
diff -u lilypond/flower/include/offset.hh:1.17
lilypond/flower/include/offset.hh:1.18
--- lilypond/flower/include/offset.hh:1.17 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/include/offset.hh Tue Jun 7 15:13:06 2005
@@ -7,7 +7,7 @@
#ifndef OFFSET_HH
#define OFFSET_HH
-#include "axes.hh"
+#include "axis.hh"
#include "string.hh"
Offset complex_multiply (Offset, Offset);
Index: lilypond/lily/balloon.cc
diff -u lilypond/lily/balloon.cc:1.22 lilypond/lily/balloon.cc:1.23
--- lilypond/lily/balloon.cc:1.22 Thu Mar 10 14:36:15 2005
+++ lilypond/lily/balloon.cc Tue Jun 7 15:13:06 2005
@@ -6,7 +6,7 @@
(c) 2004--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
*/
-#include "text-item.hh"
+#include "text-interface.hh"
#include "grob.hh"
#include "line-interface.hh"
#include "lookup.hh"
Index: lilypond/lily/beam.cc
diff -u lilypond/lily/beam.cc:1.301 lilypond/lily/beam.cc:1.302
--- lilypond/lily/beam.cc:1.301 Wed Jun 1 23:39:43 2005
+++ lilypond/lily/beam.cc Tue Jun 7 15:13:06 2005
@@ -42,7 +42,7 @@
#include "warn.hh"
#if DEBUG_QUANTING
-#include "text-item.hh" // debug output.
+#include "text-interface.hh" // debug output.
#include "font-interface.hh" // debug output.
#endif
Index: lilypond/lily/book.cc
diff -u lilypond/lily/book.cc:1.40 lilypond/lily/book.cc:1.41
--- lilypond/lily/book.cc:1.40 Mon Apr 18 12:10:37 2005
+++ lilypond/lily/book.cc Tue Jun 7 15:13:06 2005
@@ -20,7 +20,7 @@
#include "paper-book.hh"
#include "score.hh"
#include "stencil.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "warn.hh"
#include "performance.hh"
Index: lilypond/lily/breathing-sign.cc
diff -u lilypond/lily/breathing-sign.cc:1.59
lilypond/lily/breathing-sign.cc:1.60
--- lilypond/lily/breathing-sign.cc:1.59 Thu Mar 10 14:36:15 2005
+++ lilypond/lily/breathing-sign.cc Tue Jun 7 15:13:06 2005
@@ -18,7 +18,7 @@
#include "lookup.hh"
#include "dimensions.hh"
#include "direction.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "font-interface.hh"
/*
Index: lilypond/lily/chord-name.cc
diff -u lilypond/lily/chord-name.cc:1.55 lilypond/lily/chord-name.cc:1.56
--- lilypond/lily/chord-name.cc:1.55 Thu Mar 10 14:36:15 2005
+++ lilypond/lily/chord-name.cc Tue Jun 7 15:13:06 2005
@@ -13,7 +13,7 @@
#include "paper-column.hh"
#include "system.hh"
#include "staff-symbol-referencer.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
MAKE_SCHEME_CALLBACK (Chord_name, after_line_breaking, 1);
SCM
Index: lilypond/lily/dynamic-text-spanner.cc
diff -u lilypond/lily/dynamic-text-spanner.cc:1.15
lilypond/lily/dynamic-text-spanner.cc:1.16
--- lilypond/lily/dynamic-text-spanner.cc:1.15 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/dynamic-text-spanner.cc Tue Jun 7 15:13:06 2005
@@ -8,7 +8,7 @@
Revised over good by Han-Wen.
*/
-#include "text-item.hh"
+#include "text-interface.hh"
#include "text-spanner.hh"
#include "line-spanner.hh"
#include "spanner.hh"
Index: lilypond/lily/easy-notation.cc
diff -u lilypond/lily/easy-notation.cc:1.2 lilypond/lily/easy-notation.cc:1.3
--- lilypond/lily/easy-notation.cc:1.2 Thu Jun 2 14:28:53 2005
+++ lilypond/lily/easy-notation.cc Tue Jun 7 15:13:06 2005
@@ -9,7 +9,7 @@
#include "note-head.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "grob.hh"
#include "output-def.hh"
#include "music.hh"
Index: lilypond/lily/figured-bass-engraver.cc
diff -u lilypond/lily/figured-bass-engraver.cc:1.34
lilypond/lily/figured-bass-engraver.cc:1.35
--- lilypond/lily/figured-bass-engraver.cc:1.34 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/figured-bass-engraver.cc Tue Jun 7 15:13:06 2005
@@ -7,7 +7,7 @@
*/
#include "engraver.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "item.hh"
#include "context.hh"
Index: lilypond/lily/hairpin.cc
diff -u lilypond/lily/hairpin.cc:1.51 lilypond/lily/hairpin.cc:1.52
--- lilypond/lily/hairpin.cc:1.51 Tue Apr 12 23:38:49 2005
+++ lilypond/lily/hairpin.cc Tue Jun 7 15:13:06 2005
@@ -17,7 +17,7 @@
#include "warn.hh"
#include "paper-column.hh"
#include "lookup.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
MAKE_SCHEME_CALLBACK(Hairpin,after_line_breaking,1);
Index: lilypond/lily/include/dimension-cache-callback.hh
diff -u lilypond/lily/include/dimension-cache-callback.hh:1.13
lilypond/lily/include/dimension-cache-callback.hh:1.14
--- lilypond/lily/include/dimension-cache-callback.hh:1.13 Thu Mar 10
14:36:12 2005
+++ lilypond/lily/include/dimension-cache-callback.hh Tue Jun 7 15:13:06 2005
@@ -9,7 +9,7 @@
#ifndef DIMENSION_CACHE_CALLBACK_HH
#define DIMENSION_CACHE_CALLBACK_HH
-#include "axes.hh"
+#include "axis.hh"
typedef Interval (*Dim_cache_callback) (Grob *, Axis);
typedef Real (*Offset_callback) (Grob *, Axis);
Index: lilypond/lily/instrument-name-engraver.cc
diff -u lilypond/lily/instrument-name-engraver.cc:1.65
lilypond/lily/instrument-name-engraver.cc:1.66
--- lilypond/lily/instrument-name-engraver.cc:1.65 Thu May 12 09:30:49 2005
+++ lilypond/lily/instrument-name-engraver.cc Tue Jun 7 15:13:06 2005
@@ -13,7 +13,7 @@
#include "align-interface.hh"
#include "axis-group-interface.hh"
#include "context.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
class Instrument_name_engraver : public Engraver
{
Index: lilypond/lily/mark-engraver.cc
diff -u lilypond/lily/mark-engraver.cc:1.98 lilypond/lily/mark-engraver.cc:1.99
--- lilypond/lily/mark-engraver.cc:1.98 Sun May 8 23:30:50 2005
+++ lilypond/lily/mark-engraver.cc Tue Jun 7 15:13:06 2005
@@ -13,7 +13,7 @@
#include "engraver-group-engraver.hh"
#include "item.hh"
#include "warn.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
/**
put stuff over or next to bars. Examples: bar numbers, marginal notes,
Index: lilypond/lily/multi-measure-rest.cc
diff -u lilypond/lily/multi-measure-rest.cc:1.124
lilypond/lily/multi-measure-rest.cc:1.125
--- lilypond/lily/multi-measure-rest.cc:1.124 Sat Apr 30 23:43:03 2005
+++ lilypond/lily/multi-measure-rest.cc Tue Jun 7 15:13:06 2005
@@ -16,7 +16,7 @@
#include "misc.hh"
#include "spanner.hh"
#include "staff-symbol-referencer.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "percent-repeat-item.hh"
#include "lookup.hh"
#include "separation-item.hh"
Index: lilypond/lily/ottava-bracket.cc
diff -u lilypond/lily/ottava-bracket.cc:1.33
lilypond/lily/ottava-bracket.cc:1.34
--- lilypond/lily/ottava-bracket.cc:1.33 Sat Apr 30 23:43:03 2005
+++ lilypond/lily/ottava-bracket.cc Tue Jun 7 15:13:06 2005
@@ -6,7 +6,7 @@
(c) 2004--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
*/
-#include "text-item.hh"
+#include "text-interface.hh"
#include "line-spanner.hh"
#include "spanner.hh"
#include "font-interface.hh"
Index: lilypond/lily/paper-book.cc
diff -u lilypond/lily/paper-book.cc:1.107 lilypond/lily/paper-book.cc:1.108
--- lilypond/lily/paper-book.cc:1.107 Mon Apr 18 13:35:13 2005
+++ lilypond/lily/paper-book.cc Tue Jun 7 15:13:06 2005
@@ -12,7 +12,7 @@
#include "output-def.hh"
#include "paper-score.hh"
#include "paper-system.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "warn.hh"
#include "ly-smobs.icc"
Index: lilypond/lily/paper-column.cc
diff -u lilypond/lily/paper-column.cc:1.76 lilypond/lily/paper-column.cc:1.77
--- lilypond/lily/paper-column.cc:1.76 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/paper-column.cc Tue Jun 7 15:13:06 2005
@@ -13,7 +13,7 @@
#include "warn.hh"
#include "axis-group-interface.hh"
#include "spaceable-grob.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "lookup.hh"
#include "font-interface.hh"
#include "output-def.hh"
Index: lilypond/lily/parser.yy
diff -u lilypond/lily/parser.yy:1.471 lilypond/lily/parser.yy:1.472
--- lilypond/lily/parser.yy:1.471 Tue May 31 15:25:26 2005
+++ lilypond/lily/parser.yy Tue Jun 7 15:13:06 2005
@@ -43,7 +43,7 @@
#include "scm-hash.hh"
#include "scm-option.hh"
#include "score.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "warn.hh"
#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
Index: lilypond/lily/part-combine-engraver.cc
diff -u lilypond/lily/part-combine-engraver.cc:1.18
lilypond/lily/part-combine-engraver.cc:1.19
--- lilypond/lily/part-combine-engraver.cc:1.18 Sun May 8 23:30:50 2005
+++ lilypond/lily/part-combine-engraver.cc Tue Jun 7 15:13:06 2005
@@ -9,7 +9,7 @@
*/
#include "engraver.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "note-head.hh"
#include "stem.hh"
#include "side-position-interface.hh"
Index: lilypond/lily/slur.cc
diff -u lilypond/lily/slur.cc:1.217 lilypond/lily/slur.cc:1.218
--- lilypond/lily/slur.cc:1.217 Wed Jun 1 15:04:56 2005
+++ lilypond/lily/slur.cc Tue Jun 7 15:13:06 2005
@@ -24,7 +24,7 @@
#include "staff-symbol-referencer.hh"
#include "staff-symbol.hh"
#include "stem.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "warn.hh"
#include "slur-scoring.hh"
Index: lilypond/lily/text-engraver.cc
diff -u lilypond/lily/text-engraver.cc:1.93 lilypond/lily/text-engraver.cc:1.94
--- lilypond/lily/text-engraver.cc:1.93 Sun May 8 23:30:51 2005
+++ lilypond/lily/text-engraver.cc Tue Jun 7 15:13:06 2005
@@ -11,7 +11,7 @@
#include "side-position-interface.hh"
#include "stem.hh"
#include "rhythmic-head.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
/**
typeset directions that are plain text.
Index: lilypond/lily/text-interface.cc
diff -u lilypond/lily/text-interface.cc:1.2 lilypond/lily/text-interface.cc:1.3
--- lilypond/lily/text-interface.cc:1.2 Tue Apr 12 22:49:27 2005
+++ lilypond/lily/text-interface.cc Tue Jun 7 15:13:06 2005
@@ -1,5 +1,5 @@
/*
- text-item.cc -- implement Text_interface
+ text-interface.cc -- implement Text_interface
source file of the GNU LilyPond music typesetter
@@ -7,7 +7,7 @@
Jan Nieuwenhuizen <[EMAIL PROTECTED]>
*/
-#include "text-item.hh"
+#include "text-interface.hh"
#include <math.h>
Index: lilypond/lily/text-spanner.cc
diff -u lilypond/lily/text-spanner.cc:1.113 lilypond/lily/text-spanner.cc:1.114
--- lilypond/lily/text-spanner.cc:1.113 Mon Apr 18 12:29:24 2005
+++ lilypond/lily/text-spanner.cc Tue Jun 7 15:13:06 2005
@@ -10,7 +10,7 @@
#include "text-spanner.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "line-spanner.hh"
#include "spanner.hh"
#include "font-interface.hh"
Index: lilypond/lily/time-signature.cc
diff -u lilypond/lily/time-signature.cc:1.88
lilypond/lily/time-signature.cc:1.89
--- lilypond/lily/time-signature.cc:1.88 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/time-signature.cc Tue Jun 7 15:13:06 2005
@@ -8,7 +8,7 @@
#include "time-signature.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "output-def.hh"
#include "font-interface.hh"
#include "warn.hh"
Index: lilypond/lily/tuplet-bracket.cc
diff -u lilypond/lily/tuplet-bracket.cc:1.83
lilypond/lily/tuplet-bracket.cc:1.84
--- lilypond/lily/tuplet-bracket.cc:1.83 Tue Apr 12 22:49:27 2005
+++ lilypond/lily/tuplet-bracket.cc Tue Jun 7 15:13:06 2005
@@ -37,7 +37,7 @@
#include "warn.hh"
#include "font-interface.hh"
#include "output-def.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "stem.hh"
#include "note-column.hh"
#include "group-interface.hh"
Index: lilypond/lily/volta-bracket.cc
diff -u lilypond/lily/volta-bracket.cc:1.42 lilypond/lily/volta-bracket.cc:1.43
--- lilypond/lily/volta-bracket.cc:1.42 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/volta-bracket.cc Tue Jun 7 15:13:06 2005
@@ -13,7 +13,7 @@
#include "line-interface.hh"
#include "paper-column.hh"
#include "output-def.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "volta-bracket.hh"
#include "group-interface.hh"
#include "side-position-interface.hh"
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
