* 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.

diff --git a/ChangeLog b/ChangeLog
index 7f0f69dfab0075f7251db62feff65c36bc4f4fa9..0c51f0c834a93f180e7518485ea83ce3cece7f48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-06-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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.

diff --git a/flower/axis.cc b/flower/axis.cc
index 12cb19156a6dea9c0b0024ffc1744d4950946c5d..9f63cc4cff13bbc453b43c2e3f14e56cea6784a7 100644 (file)
--- a/flower/axis.cc
+++ b/flower/axis.cc
@@ -4,7 +4,7 @@
   (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "axes.hh"
+#include "axis.hh"
 #include "string.hh"
 
 String

diff --git a/flower/include/axes.hh b/flower/include/axes.hh
deleted file mode 100644 (file)
index bafd572..0000000
--- a/flower/include/axes.hh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  axes.hh -- declare Axis
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#ifndef AXES_HH
-#define AXES_HH
-
-#include <cassert>
-
-enum Axis
-  {
-    X_AXIS = 0,
-    Y_AXIS = 1,
-    NO_AXES = 2,
-  };
-
-static inline
-Axis
-incr (Axis &a)
-{
-  assert (a < NO_AXES);
-  a = Axis (int (a) + 1);
-  return a;
-}
-
-static inline
-Axis
-other_axis (Axis a)
-{
-  return a == Y_AXIS ? X_AXIS : Y_AXIS;
-}
-
-#endif // AXES_HH

diff --git a/flower/include/axis.hh b/flower/include/axis.hh
new file mode 100644 (file)
index 0000000..bafd572
--- /dev/null
+++ b/flower/include/axis.hh
@@ -0,0 +1,37 @@
+/*
+  axes.hh -- declare Axis
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#ifndef AXES_HH
+#define AXES_HH
+
+#include <cassert>
+
+enum Axis
+  {
+    X_AXIS = 0,
+    Y_AXIS = 1,
+    NO_AXES = 2,
+  };
+
+static inline
+Axis
+incr (Axis &a)
+{
+  assert (a < NO_AXES);
+  a = Axis (int (a) + 1);
+  return a;
+}
+
+static inline
+Axis
+other_axis (Axis a)
+{
+  return a == Y_AXIS ? X_AXIS : Y_AXIS;
+}
+
+#endif // AXES_HH

diff --git a/flower/include/direction.hh b/flower/include/direction.hh
index 82161f675ab09e99625a49b2cc56ee3a584d4f33..0ea760c168f712da244459e0bb87cd99b7133adf 100644 (file)
--- a/flower/include/direction.hh
+++ b/flower/include/direction.hh
@@ -9,7 +9,7 @@
 #ifndef DIRECTION_HH
 #define DIRECTION_HH
 
-#include "axes.hh"
+#include "axis.hh"
 
 enum Direction
   {

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index 8ea8c8581523329b7d4bb36ea751cd4d8f667bda..bf05ab95b6d34eef52d7aee17a6bf1d9f26aac51 100644 (file)
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -7,7 +7,7 @@
 #ifndef OFFSET_HH
 #define OFFSET_HH
 
-#include "axes.hh"
+#include "axis.hh"
 #include "string.hh"
 
 Offset complex_multiply (Offset, Offset);

diff --git a/lily/balloon.cc b/lily/balloon.cc
index 2a2594ee92f7be678644dcc5262d6b7afe47aad8..df2cf7d30cb292f3ba6cf4561ffa8af73ce265e4 100644 (file)
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -6,7 +6,7 @@
   (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "grob.hh"
 #include "line-interface.hh"
 #include "lookup.hh"

diff --git a/lily/beam.cc b/lily/beam.cc
index 236e4cff3d6f9023f73c017e4e88c288f3008137..868470c3b52ae07a6339570c3b7ab32f4e49c870 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -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
 

diff --git a/lily/book.cc b/lily/book.cc
index b1d3ff11659f05efa42843f26f63a1d6bfd89e8b..724ab9cc13ad14ded6c74f5872cc7918df64b5c0 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -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"

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index e5814b4fac52b61142ab1a36671df5c971151ef8..0b244431b52fbc71350ee30a6932da302953af6b 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -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"
 
 /*

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 360edb564813c3aed5394165a2db6cf4cc40bf94..ac7d92f4d7cba3d872e6bb80189590a734c2b7df 100644 (file)
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -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

diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc
index 89d0138f9c0423f65298be4d9ee5779302a72cbf..5ed1f00caeeebdedc3f771cd9897573880594079 100644 (file)
--- a/lily/dynamic-text-spanner.cc
+++ b/lily/dynamic-text-spanner.cc
@@ -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"

diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc
index f6cca955353975e9be87331e470ff97d43d164e3..ab150d16215fd0494e074d1e6fec6cb8177288e4 100644 (file)
--- a/lily/easy-notation.cc
+++ b/lily/easy-notation.cc
@@ -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"

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 8c001bb4dbc6795f464d6690580ce05001ed17fc..82115d8212009196855dbf0e764072c427463ec2 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -7,7 +7,7 @@
 */
 
 #include "engraver.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "item.hh"
 #include "context.hh"
 

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index d4f7e8a6fb04c0f64872dae83c2a05ef4c6e4263..5b1eda0e091c7184dc716445bf0eeb12172e2320 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -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);

diff --git a/lily/include/dimension-cache-callback.hh b/lily/include/dimension-cache-callback.hh
index 40ef9128441acfc0a30877c16a47e84b4e09fe40..c996ab38d474aa0e06bb9175737b53e691c159cf 100644 (file)
--- a/lily/include/dimension-cache-callback.hh
+++ b/lily/include/dimension-cache-callback.hh
@@ -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);

diff --git a/lily/include/text-interface.hh b/lily/include/text-interface.hh
new file mode 100644 (file)
index 0000000..ce7d61d
--- /dev/null
+++ b/lily/include/text-interface.hh
@@ -0,0 +1,25 @@
+/*
+  text-interface.hh -- declare markup functions
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#ifndef TEXT_ITEM
+#define TEXT_ITEM
+
+#include "stencil.hh"
+
+class Text_interface
+{
+public:
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (interpret_markup, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (interpret_string, (SCM, SCM, SCM));
+  static bool has_interface (Grob *);
+  static bool markup_p (SCM);
+};
+
+#endif /* TEXT_ITEM */

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
deleted file mode 100644 (file)
index 4f442b5..0000000
--- a/lily/include/text-item.hh
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-  text-item.hh -- declare markup functions
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  Jan Nieuwenhuizen <janneke@gnu.org>
-*/
-
-#ifndef TEXT_ITEM
-#define TEXT_ITEM
-
-#include "stencil.hh"
-
-class Text_interface
-{
-public:
-  DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (interpret_markup, (SCM, SCM, SCM));
-  DECLARE_SCHEME_CALLBACK (interpret_string, (SCM, SCM, SCM));
-  static bool has_interface (Grob *);
-  static bool markup_p (SCM);
-};
-
-#endif /* TEXT_ITEM */

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index e5ac0fe8fe91921e4a3dcf40257e15c1e3b1fdeb..cb59170316359cc18c77760acd235c287fc7266a 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -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
 {

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 03748d10b5ecbb2fa7938351a2ed86c70e4b59b3..92bf4952c265902d89695fb477a0996f46cecf37 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -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,

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index f3430479944c9571993a6c526304ce22d70a6ce9..f7741706849709bba3e861c9a9fc4b014e6aaf26 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -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"

diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index e5d04bb1d111da141d0d636ede8714e3d3e58cda..4d6a148b4a424201977ad3379197d33dbf905f8e 100644 (file)
--- a/lily/ottava-bracket.cc
+++ b/lily/ottava-bracket.cc
@@ -6,7 +6,7 @@
   (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "line-spanner.hh"
 #include "spanner.hh"
 #include "font-interface.hh"

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index a424b66cf4602ab960155d1981cf9a992173774a..cf1585bcd909b5cde59d717c824de0c405e0861e 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -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"

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 14de60d2dcebd156f0607748ea43beb23c8364e7..26e7f5d0b67ad832a2ba3dd97152ab09905a5d78 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -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"

diff --git a/lily/parser.yy b/lily/parser.yy
index 9982ba66903dfeac6401e0dc672607f573163cb5..9afd1e5be4f0cc2b8332fec6998bf84db1359e2c 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -43,7 +43,7 @@ FIXME:
 #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))

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index 9bd1a12085dc46c10b88b872b1fb195a9dc5c201..191fd30b5243603753cd5642ed51d4cdc7cd49be 100644 (file)
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -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"

diff --git a/lily/slur.cc b/lily/slur.cc
index c4acdd1694d9505e5a832df072351bce166f2ae5..044bdec6f187fb7c2b6e5cd190f2a66dc67479dd 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -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"
 

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index f1d83168f1f698d1eff74668dfd2e6253f5ac596..1766ac64b710a3a5c937af577d776033ac360876 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -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.

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index b1cd6a66da10693597f7be203ceaa3a1caad2644..cb3484fb790f67a39d434d1feae6638c4f6a2e61 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -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 <janneke@gnu.org>
 */
 
-#include "text-item.hh"
+#include "text-interface.hh"
 
 #include <math.h>
 

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index fe43ea80074d2f5017fc697a340eec26b35df2b9..207c9f2087460130c3c571d7bbcc1004d1b3bc58 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -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"

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index d560b8d226ccd426fde05f2b1ad9889d9c6a94ee..5d98010035e38adbec9c2d09e0f705abb3cef632 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -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"

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 9ba46e559f4938f32d12e3ec8914974ed79d813e..29d9916497baa66a0a9f3a47acb6633fda11b5e3 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -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"

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index eafb4fbb52871645ee4a1b1ddd30fdd6defe42f2..76cce1605ec9501fb25312ea02ab77be0c1da84d 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -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"