From 7dfd01bf92557e33629fcc6930a4f97031470fc8 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 25 Jul 2004 09:28:41 +0000 Subject: [PATCH] *** empty log message *** --- Documentation/user/GNUmakefile | 6 +++--- Documentation/user/macros.itexi | 3 ++- Documentation/user/programming-interface.itely | 6 ++++-- flower/include/interval.hh | 1 + lily/GNUmakefile | 2 +- lily/break-substitution.cc | 2 +- lily/lily-guile.cc | 2 +- lily/moment.cc | 8 ++++---- scripts/GNUmakefile | 2 +- 9 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index f06890b465..06d5272685 100644 --- 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 4e7f0bac02..cbf3ce2acf 100644 --- 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 a29c1f2e5d..535714da98 100644 --- 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 c4c36d084e..5ccb91feae 100644 --- a/flower/include/interval.hh +++ b/flower/include/interval.hh @@ -19,6 +19,7 @@ template struct Interval_t : public Drul_array { Drul_array::elem; + Drul_array::elem_ref; static T infinity (); static String T_to_string (T arg); diff --git a/lily/GNUmakefile b/lily/GNUmakefile index 66ed748b46..235dc8ad0f 100644 --- 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 f7dee18a75..6c4e9daae2 100644 --- 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 (sc); Direction d = to_dir (break_criterion); diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 07d3266d9c..9490490ac0 100644 --- 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 54ee65c184..e8c47c37e2 100644 --- 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 2c0ad847fe..022ccf4448 100644 --- 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) -- 2.39.2