From 21366dd8ddec170ae4af0d18f061be0f2eceb240 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 19 Aug 2002 01:55:07 +0000 Subject: [PATCH] Various fixes for anal typechecking. ARGH--Ancient notation sucks --- ChangeLog | 38 ++++++++++++++++++++++++++ Documentation/user/lilypond-book.itely | 11 ++------ Documentation/user/lilypond.tely | 14 +++++++++- Documentation/user/refman.itely | 2 +- Documentation/user/tutorial.itely | 4 +-- input/mutopia/J.S.Bach/wtk1-fugue2.ly | 2 ++ lily/chord-name.cc | 2 +- lily/custos.cc | 2 +- lily/ligature-engraver.cc | 2 +- lily/ligature-head.cc | 5 +++- lily/mensural-ligature-engraver.cc | 2 +- lily/rhythmic-column-engraver.cc | 5 ++++ scm/generate-documentation.scm | 6 ++-- scm/grob-description.scm | 15 ++++++---- scm/grob-property-description.scm | 2 +- scm/lily.scm | 5 +++- 16 files changed, 89 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 195a737566..4efc49a0cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +2002-08-19 janneke + + * regular-spacing-engraver.cc: + * scm/grob-property-description.scm: Remove regular-distance-to. + + * input/test/spacing-regular.ly: + * lily/regular-spacing-engraver.cc: Remove. + +2002-08-18 janneke + + * mensural-ligature.cc: *** empty log message *** + + * tab-note-heads-engraver.cc: * lily/tab-note-heads-engraver.cc: + * scm/translator-property-description.scm: Add tablatureFormat. + + * input/test/staff-bracket.ly: Update. + + * regular-spacing-engraver.cc: + * lily/regular-spacing-engraver.cc: Add regular-distance-to. + + * ligature-bracket.cc, ligature-engraver.cc, ligature-head.cc, mensural-ligature-engraver.cc, mensural-ligature.cc: + * lily/mensural-ligature-engraver.cc: + * scm/grob-property-description.scm: Add head-width, join-left, + primitive. + +2002-08-18 Han-Wen Nienhuys + + * ambitus.cc, parser.yy: + * Documentation/user/introduction.itely: small corrections. + + * lily/parser.yy (property_def): Ugh. Switch off + internal-type-checking for autoBeamSettings. + +2002-08-18 janneke + + * music.cc (internal_set_mus_property): [!NDEBUG] Remove, use + abort instead of assert. + 2002-08-19 Jan Nieuwenhuizen * scm/grob-property-description.scm: Remove regular-distance-to. diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index cf01cd5725..181df66ae4 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -11,13 +11,8 @@ TODO: cleanup @end ignore -@c @node Merging text and music with lilypond-book -@c @chapter Merging text and music with lilypond-book - -@c fix this node name , this is too long. - -@node lilypond-book: Integrating text and music -@chapter lilypond-book: Integrating text and music +@node Integrating text and music with lilypond-book +@chapter Integrating text and music with lilypond-book If you want to add pictures of music to a document, you can simply do it the way you would do with other types of pictures. You write @@ -32,7 +27,7 @@ The line width and font size definitions for the music are adjusted so they match the layout of your document. It can work on La@TeX{}, @code{html} or texinfo documents. A tutorial -on using lilypond-book is in @ref{integrating text and music}. +on using lilypond-book is in @ref{Integrating text and music}. @menu * Integrating Texinfo and music:: diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index e21020707a..cbecdf53f0 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -85,7 +85,19 @@ this and other documentation. @mbinclude dedication.itely @menu -* Index:: Unified index. +* Preface:: Preface. +* Introduction:: What, Why, How. +* Tutorial:: A tutorial introduction to LilyPond. +* Reference Manual:: Reference Manual. +* Advanced Topics:: How it all works. +* Invoking LilyPond:: Operation. +* Converting from other formats:: Converting to lilypond source format. +* Integrating text and music with lilypond-book:: + The lilypond-book manual. +* Literature:: Additional reading material. +* Index:: Unified index. +* Refman appendix:: +* GNU Free Documentation License:: FDL. @end menu @end ifnottex diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index aa864ff096..d1f716f14d 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -4501,7 +4501,7 @@ value assigned in the @code{\paper} block), systems are evenly distributed vertically on the last page. This might produce ugly results in case there are not enough systems on the last page. Note that @command{lilypond-book} ignores @code{lastpagefill}. See -@ref{lilypond-book: integrating text and music} for +@ref{Integrating text and music with lilypond-book} for more information. @cindex @code{lastpagefill} diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index b5cb1e0bf6..8a1b71d293 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -2762,8 +2762,8 @@ However, there is a also an automated procedure: If you use HTML, La@TeX{} or texinfo, you can mix text and LilyPond code. A script called @code{lilypond-book} will extract the music fragments, run LilyPond on them, and put back the resulting notation. -This utility program is described fully in the chapter @ref{Insert -music snippets into your texts using lilypond-book}. Here we show a +This utility program is described fully in the chapter +@ref{Integrating text and music with lilypond-book}. Here we show a small example. Since the example also contains explanatory text, we won't comment on the contents. diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index f9c6f2a63f..0fdaa32057 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -83,8 +83,10 @@ dux = \context Voice=two \notes \relative c''{ c16 f es d c \translator Staff = bass + \stemUp bes! as g f8 \translator Staff = treble + \stemDown as' g f | es d es f b, c d b | c4 r8 e8 f f16 e f8 c | diff --git a/lily/chord-name.cc b/lily/chord-name.cc index e2ec6929e9..861121054d 100644 --- a/lily/chord-name.cc +++ b/lily/chord-name.cc @@ -65,5 +65,5 @@ Chord_name::brew_molecule (SCM smob) ADD_INTERFACE (Chord_name, "chord-name-interface", "generate a chord name", - "pitches chord chord-name-function inversion bass begin-of-line-visible"); + "pitches chord style chord-name-function inversion bass begin-of-line-visible"); diff --git a/lily/custos.cc b/lily/custos.cc index b69617f8f1..a96e509d7f 100644 --- a/lily/custos.cc +++ b/lily/custos.cc @@ -126,4 +126,4 @@ ADD_INTERFACE (Custos, "custos-interface", beginning of the 20th century. [TODO: add to glossary]", - "style adjust-if-on-staffline neutral-position"); + "style adjust-if-on-staffline neutral-direction neutral-position"); diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc index 799ea1f0bc..f6e64da3e7 100644 --- a/lily/ligature-engraver.cc +++ b/lily/ligature-engraver.cc @@ -193,4 +193,4 @@ ENTER_DESCRIPTION (Ligature_engraver, /* creats*/ "Ligature", /* acks */ "ligature-head-interface rest-interface", /* reads */ "", -/* write */ "ligature-primitive-callback"); +/* write */ ""); diff --git a/lily/ligature-head.cc b/lily/ligature-head.cc index 1352f4100b..ee1690ac4a 100644 --- a/lily/ligature-head.cc +++ b/lily/ligature-head.cc @@ -43,5 +43,8 @@ Ligature_head::brew_molecule (SCM smob) } } +/* + UGH primitive is only used within the engraver. +*/ ADD_INTERFACE (Ligature_head,"ligature-head-interface","Ligature head", - "ligature-primitive-callback"); + "primitive ligature-primitive-callback thickness flexa-width head-width delta-pitch join-left"); diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index 9c7d8690ba..999ea817a4 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -580,4 +580,4 @@ ENTER_DESCRIPTION (Mensural_ligature_engraver, /* creats*/ "MensuralLigature", /* acks */ "ligature-head-interface note-head-interface rest-interface", /* reads */ "", -/* write */ "head-width join-left primitive"); +/* write */ ""); diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 7099ecae8b..edea4d8a95 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -90,6 +90,11 @@ Rhythmic_column_engraver::process_acknowledged_grobs () spacing_ = new Item (get_property ("NoteSpacing")); spacing_->set_grob_property ("left-items", gh_cons (note_column_->self_scm (), SCM_EOL)); + + /* + Should insert a cause. Collision warnings go into the void. + + */ announce_grob(spacing_, SCM_EOL); if (last_spacing_) diff --git a/scm/generate-documentation.scm b/scm/generate-documentation.scm index 158e5280c3..860301dd68 100644 --- a/scm/generate-documentation.scm +++ b/scm/generate-documentation.scm @@ -9,10 +9,9 @@ ;;; Running LilyPond on this file generates the documentation - +(debug-enable 'debug) (debug-enable 'backtrace) - - +(read-enable 'positions) ;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;; TODO : make modules of these! @@ -24,7 +23,6 @@ "music-documentation-lib.scm" "backend-documentation-lib.scm" )) - (map load-from-path load-files) diff --git a/scm/grob-description.scm b/scm/grob-description.scm index da46eb95c9..6f72730b9b 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -252,7 +252,10 @@ (space-alist . ( (first-note . (minimum-space . 0.0)) )) - (meta . ((interfaces . (custos-interface staff-symbol-referencer-interface break-aligned-interface item-interface )))) + (meta . ((interfaces + . (custos-interface staff-symbol-referencer-interface + font-interface + break-aligned-interface item-interface )))) )) @@ -434,7 +437,9 @@ (stem-attachment-function . ,note-head-style->attachment-coordinates) (font-family . ancient) (style . mensural) - (meta . ((interfaces . (ligature-head-interface rhythmic-head-interface note-head-interface staff-symbol-referencer-interface)))) + (meta . ((interfaces . (ligature-head-interface rhythmic-head-interface + font-interface + note-head-interface staff-symbol-referencer-interface)))) )) (LyricHyphen @@ -481,7 +486,7 @@ (ligature-primitive-callback . ,Mensural_ligature::brew_ligature_primitive) (molecule-callback . ,Mensural_ligature::brew_molecule) (font-family . ancient) - (meta . ((interfaces . (mensural-ligature-interface)))) + (meta . ((interfaces . (mensural-ligature-interface font-interface)))) )) (Porrectus @@ -777,7 +782,8 @@ (thin-kern . 3.0) (hair-thickness . 1.6) (thick-thickness . 6.0) - (meta . ((interfaces . (span-bar-interface bar-line-interface item-interface )))) + (meta . ((interfaces . (span-bar-interface font-interface + bar-line-interface item-interface )))) )) (StanzaNumber @@ -1148,7 +1154,6 @@ (define (completize-grob-entry x) "transplant assoc key into 'name entry of 'meta of X " - (let* ((name-sym (car x)) (grob-entry (cdr x)) (metaentry (cdr (assoc 'meta grob-entry))) diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index 35ae3bc95f..28bdce85bf 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -575,7 +575,7 @@ columns. -- can be stored for debugging") (grob-property-description 'least-squares-dy number? "ideal beam slope, without damping.") -(grob-property-description 'ligature-primitive-callback number? "DOCME") +(grob-property-description 'ligature-primitive-callback procedure? "DOCME") (grob-property-description 'stem-info pair? "caching of stem parameters") (grob-property-description 'note-columns pair? "list of NoteColumn grobs.") diff --git a/scm/lily.scm b/scm/lily.scm index b5ff19cd69..6771baa6c4 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -16,8 +16,11 @@ ;;; General settings +;; debugging evaluator is slower. -(debug-enable 'backtrace) +;(debug-enable 'debug) +;(debug-enable 'backtrace) +;(read-enable 'positions) (define point-and-click #f) -- 2.39.5