*** empty log message ***

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index f06890b465d412a571e6c84b2a866c4c430f33f5..06d5272685489d3775b70ec05522a5d98d177ecf 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -165,15 +165,15 @@ ifneq ($(CROSS),yes)
 # of lilypond-internals every time.  however, this triggers
 # compilation during install, which is a bad thing (tm).
 
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(builddir)/lily/$(outconfbase)/lilypond-bin
-       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond-bin --verbose $(abs-srcdir)/ly/generate-documentation
+$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(builddir)/lily/$(outconfbase)/lilypond
+       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond --verbose $(abs-srcdir)/ly/generate-documentation
        rm -f $(outdir)/lilypond-internals.nexi
        -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 
 
 ## unused
 $(outdir)/interfaces.itexi: dummy
-       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond-bin $(abs-srcdir)/ly/generate-interface-doc
+       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond $(abs-srcdir)/ly/generate-interface-doc
 
 else
 

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 4e7f0bac026061ebe5e0e89eff278b354decaf72..cbf3ce2acfc9fd1f70df316ae6cb0f744b2e4dde 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -69,7 +69,8 @@ b
 @ifhtml
 @macro internalsref{NAME}
 @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
-@cindex \NAME\@c
+@c should we do this? 
+@cindex @code{\NAME\}
 @end macro
 
 

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index a29c1f2e5debec9d3ab3e876ccdacdf5b81afc14..535714da983c53fde169f9f9b0621f18c6d95282 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -109,8 +109,10 @@ expressions}.
 
 @item
   `type' or interface: Each music name has several `types' or interface,
-  for example, a note is an @code{event}, but it is also a @code{note-event},
-  a @code{rhythmic-event} and a @code{melodic-event}.
+  for example, a note is an @code{event},
+  but it is also a @code{note-event},
+  a @code{rhythmic-event} and
+   a @code{melodic-event}.
 
   All classes of music are listed in the internals manual, under
   @internalsref{Music classes}.

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index c4c36d084e7064627de5ba93d0dba65277e31792..5ccb91feaea3c1580857f776b9333fc942e5c501 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -19,6 +19,7 @@ template<class T>
 struct Interval_t : public Drul_array<T>
 {
   Drul_array<T>::elem;
+  Drul_array<T>::elem_ref;
 
   static T infinity ();
   static String T_to_string (T arg);

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 66ed748b465f952bee646720fd3abff5cec05541..235dc8ad0feb30a1ec827a0432cb29fe37f50e62 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -9,7 +9,7 @@ MODULE_INCLUDES= $(depth)/flower/include
 MODULE_CXXFLAGS= 
 
 
-HELP2MAN_EXECS = lilypond-bin
+HELP2MAN_EXECS = lilypond
 STEPMAKE_TEMPLATES= c++ executable po help2man
 
 include $(depth)/make/stepmake.make 

diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index f7dee18a75b9e204699bb7440c1eb96a08b58f1a..6c4e9daae2fc7cc1dcc33fd4b9dff4a009f3a114 100644 (file)
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -19,7 +19,7 @@ set_break_subsititution (SCM criterion)
 SCM
 substitute_grob (Grob *sc)
 {
-  if (SCM_INUMP (break_criterion))
+  if (scm_is_integer (break_criterion))
     {
       Item * i = dynamic_cast<Item*> (sc);
       Direction d = to_dir (break_criterion);

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 07d3266d9c62d90b9b50854f46cc42af9b776f83..9490490ac02db0f7fd4e09799771d3b07fa3b8b2 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -265,7 +265,7 @@ is_axis (SCM s)
 Direction
 to_dir (SCM s)
 {
-  return SCM_INUMP (s) ? (Direction) ly_scm2int (s) : CENTER;
+  return scm_is_integer (s) ? (Direction) ly_scm2int (s) : CENTER;
 }
 
 Interval

diff --git a/lily/moment.cc b/lily/moment.cc
index 54ee65c1842ec074cb034167bbe76c2b0636d8a6..e8c47c37e2dfa09dcd430a3d77e388f88390007d 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -69,20 +69,20 @@ LY_DEFINE (ly_make_moment, "ly:make-moment",
           "notes, and @var{g} the timing for grace notes.  "
           "In absence of grace notes, @var{g} is zero.\n")
 {
-  SCM_ASSERT_TYPE (SCM_INUMP (n), n, SCM_ARG1, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (SCM_INUMP (d), d, SCM_ARG2, __FUNCTION__, "integer");
+  SCM_ASSERT_TYPE (scm_is_integer (n), n, SCM_ARG1, __FUNCTION__, "integer");
+  SCM_ASSERT_TYPE (scm_is_integer (d), d, SCM_ARG2, __FUNCTION__, "integer");
 
   int grace_num = 0;
   if (gn != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (SCM_INUMP (gn), gn, SCM_ARG3, __FUNCTION__, "integer");
+      SCM_ASSERT_TYPE (scm_is_integer (gn), gn, SCM_ARG3, __FUNCTION__, "integer");
       grace_num = ly_scm2int (gn);
     }
 
   int grace_den = 1;
   if (gd != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (SCM_INUMP (gd), gd, SCM_ARG4, __FUNCTION__, "integer");
+      SCM_ASSERT_TYPE (scm_is_integer (gd), gd, SCM_ARG4, __FUNCTION__, "integer");
       grace_den = ly_scm2int (gd);
     }
 

diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
index 2c0ad847fecc1c302b534bdefd751156178d2831..022ccf4448eb2baf250754fff772de14f845b369 100644 (file)
--- a/scripts/GNUmakefile
+++ b/scripts/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-SEXECUTABLES=convert-ly lilypond-book lilypond abc2ly etf2ly musedata2ly  mup2ly midi2ly
+SEXECUTABLES=convert-ly lilypond-book lilypond-latex abc2ly etf2ly musedata2ly  mup2ly midi2ly
 STEPMAKE_TEMPLATES=script help2man po
 LOCALSTEPMAKE_TEMPLATES = lilypond
 HELP2MAN_EXECS = $(SEXECUTABLES)