Various fixes for anal typechecking. ARGH--Ancient notation sucks

diff --git a/ChangeLog b/ChangeLog
index 195a7375665b9f65bd19f6e6216084b5d6d595eb..4efc49a0cc2c40d48e073bb39a2ad73bd9d09752 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2002-08-19  janneke  <janneke@blauw.xs4all.nl>
+
+       * 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  <janneke@blauw.xs4all.nl>
+
+       * 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  <hanwen@cs.uu.nl>
+
+       * 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  <janneke@blauw.xs4all.nl>
+
+       * music.cc (internal_set_mus_property): [!NDEBUG] Remove, use
+       abort instead of assert.
+
 2002-08-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/grob-property-description.scm: Remove regular-distance-to.

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index cf01cd57250681dbb73afed5d2bf9f6e5db1f718..181df66ae418302ca0a1fc90eef515cc45845894 100644 (file)
--- 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 e21020707ae0fa15ed1e2de2802647351302f9dc..cbecdf53f02aab41e48fcd9a13024c7583d29001 100644 (file)
--- 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 aa864ff09675a1e3807a30ed5d558b441091a113..d1f716f14de708169a8fa4c43d403e9801bbd0ed 100644 (file)
--- 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 b5cb1e0bf62ef295b2049e9c1baa893579249400..8a1b71d2935f4616ff5cdc6072525fe67db7ebeb 100644 (file)
--- 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 f9c6f2a63f9f7c761709cf06e495a8586f5ed7b7..0fdaa320570d999baa9b619be8d51cf652218864 100644 (file)
--- 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 e2ec6929e9dda58a4a9e60f47edd58d7613271ee..861121054df05bce1c88df576e7d190f94498295 100644 (file)
--- 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 b69617f8f12e71b56928c7d534b34cda04abdd6d..a96e509d7f7e1f3100ca1c3d32837a8c14703ead 100644 (file)
--- 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 799ea1f0bce13f1645829d8ba365c89d2aae391e..f6e64da3e7197b6d8840ceb7a7931760f0fdd28c 100644 (file)
--- 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 1352f4100bdb0f58be204bd9593c256ddd095c7f..ee1690ac4ab8ffcc60ea6e596113a8492857b95b 100644 (file)
--- 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 9c7d8690ba6f2150215999a0c4849256b25bc0d3..999ea817a4c9dcc3b44fb9af2508d35194a6a758 100644 (file)
--- 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 7099ecae8b804247a947184e2c19892145f2087b..edea4d8a95b69bcdfb50b23dc3c802e1c9e464ec 100644 (file)
--- 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 158e5280c3f33c6cbc4d2f554a97a8c0dde3d9e3..860301dd6883515c1b27818716dc846c5f848fee 100644 (file)
--- 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 da46eb95c98d2e1e8845982941ca4d05fcf8e3d0..6f72730b9b857264aa0ccb251e9eb28ba87156ec 100644 (file)
--- 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 35ae3bc95f796327638dc967ff2f24df7bb6bb79..28bdce85bff520ea60d5e405eff39bdfc3efab3f 100644 (file)
--- 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 b5ff19cd69db3f85205120477f59683e25526ceb..6771baa6c40bb07332ccb936e5058b8fac8afa36 100644 (file)
--- 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)