From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 7 Jun 2005 15:13:06 +0000 (+0000)
Subject: * flower/include/axis.hh: rename from axes.hh
X-Git-Tag: release/2.5.30~32
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=26380ed75fbd7b32781715c043dfa5dd96dfbe4a;p=lilypond.git

* 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 7f0f69dfab..0c51f0c834 100644
--- 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 12cb19156a..9f63cc4cff 100644
--- 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
index bafd572cb6..0000000000
--- 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
index 0000000000..bafd572cb6
--- /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 82161f675a..0ea760c168 100644
--- 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 8ea8c85815..bf05ab95b6 100644
--- 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 2a2594ee92..df2cf7d30c 100644
--- 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 236e4cff3d..868470c3b5 100644
--- 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 b1d3ff1165..724ab9cc13 100644
--- 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 e5814b4fac..0b244431b5 100644
--- 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 360edb5648..ac7d92f4d7 100644
--- 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 89d0138f9c..5ed1f00cae 100644
--- 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 f6cca95535..ab150d1621 100644
--- 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 8c001bb4db..82115d8212 100644
--- 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 d4f7e8a6fb..5b1eda0e09 100644
--- 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 40ef912844..c996ab38d4 100644
--- 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
index 0000000000..ce7d61d66d
--- /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
index 4f442b59cc..0000000000
--- 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 e5ac0fe8fe..cb59170316 100644
--- 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 03748d10b5..92bf4952c2 100644
--- 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 f343047994..f774170684 100644
--- 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 e5d04bb1d1..4d6a148b4a 100644
--- 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 a424b66cf4..cf1585bcd9 100644
--- 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 14de60d2dc..26e7f5d0b6 100644
--- 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 9982ba6690..9afd1e5be4 100644
--- 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 9bd1a12085..191fd30b52 100644
--- 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 c4acdd1694..044bdec6f1 100644
--- 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 f1d83168f1..1766ac64b7 100644
--- 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 b1cd6a66da..cb3484fb79 100644
--- 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 fe43ea8007..207c9f2087 100644
--- 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 d560b8d226..5d98010035 100644
--- 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 9ba46e559f..29d9916497 100644
--- 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 eafb4fbb52..76cce1605e 100644
--- 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"