patch::: 1.3.122.jcn1

1.3.122.jcn1
============

* Doco fixes.

* Small fixes for guile-1.4.1 snapshot.

diff --git a/CHANGES b/CHANGES
index 6673ef34650d8ab916a3cbb7063ae6479cee2c30..41c544017befbaeabe9ab5d8f7b31a4701b8ebc6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1.3.122.jcn1
+============
+
+* Doco fixes.
+
+* Small fixes for guile-1.4.1 snapshot.
+
 1.3.121.hwn1
 ============
 

diff --git a/Documentation/user/bugs.itexi b/Documentation/user/bugs.itexi
index e6500cc39e6354874366bbb62e7725b0e9e43a86..e9fb63e084ba8084e137c5b361ca92977542bdc8 100644 (file)
--- a/Documentation/user/bugs.itexi
+++ b/Documentation/user/bugs.itexi
@@ -1,6 +1,7 @@
-@node Reporting Bugs, , , top
+@node Bug reports
 @chapter Bug reports
 @cindex bugs
+@cindex bug reports
 @cindex reporting bugs
 
 LilyPond development moves quickly, so if you have a problem, it is

diff --git a/Documentation/user/convert-ly.itexi b/Documentation/user/convert-ly.itexi
index e1658dbbc6a49401d7e5bad923aa912c3d791cb0..d8cda19993591641de4b651b98fdee07bce6613b 100644 (file)
--- a/Documentation/user/convert-ly.itexi
+++ b/Documentation/user/convert-ly.itexi
@@ -1,6 +1,7 @@
-
-@node convert-ly, , , Top
+@node convert-ly
 @chapter convert-ly
+
+
 @code{convert-ly} sequentially applies different
 lilypond-conversions to upgrade a Lilypond input file.  It uses
 @code{\version} statements in the file to detect the old version

diff --git a/Documentation/user/development.itexi b/Documentation/user/development.itexi
index 56a37a4d9cdb508d9faca65fc383f1b9d6edbae2..0de65f4d4569dae33b365f3db6a179bc64433010 100644 (file)
--- a/Documentation/user/development.itexi
+++ b/Documentation/user/development.itexi
@@ -1,4 +1,5 @@
-@node Internals, , , Top
+@node Internals
+@chapter Internals
 
 @menu
 * Conversion stages::              Lilypond is a multi-pass program.
@@ -382,7 +383,7 @@ Molecule.
 
 
 
-@node  Development, , , top
+@node Development
 @chapter Development
 
 @menu
@@ -392,7 +393,7 @@ Molecule.
 * Helping with development:: 
 @end menu
 
-@node CodingStyle, , , Development
+@node CodingStyle
 @section CodingStyle - standards while programming for GNU LilyPond
 
 As a general rule, you should always try to continue computations, even
@@ -621,7 +622,7 @@ files, doing a release.
 
 Use them.
 
-@node Making patches, , , Development
+@node Making patches
 @section Making patches
 
 @unnumberedsec  Track and distribute your code changes
@@ -721,7 +722,7 @@ and don't forget to make automatically generated files:
  
 @end example 
 
-@node Localisation, , , Development
+@node Localisation
 @section Localisation - User messages in LilyPond
 
 This document provides some guidelines for uniformising user messages.
@@ -883,9 +884,8 @@ Please don't run make po/po-update with GNU gettext < 0.10.35
 
 @end itemize
 
-@node Helping with development, , , Development
-
-@chapter Getting involved
+@node Helping with development
+@section Getting involved
 
 If you want to help developing  LilyPond your  efforts are appreciated.
 You can help LilyPond in several ways. Not all tasks requiring
@@ -958,5 +958,3 @@ tools}
 @item Helping @uref{primrose.sourceforge.net,primrose}, a tool for
 scanning sheet music.
 @end itemize
-
-

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 2f24bdaefe2f6931ee52029ac79e621a98a851df..9c35990006fb3d9a4fa11d5566ef4119b79bb975 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -1,4 +1,4 @@
-@node Invoking LilyPond, , , top
+@node Invoking LilyPond
 
 @chapter Invoking LilyPond
 @cindex Invoking LilyPond

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 4b47b0a6e5ed9b4aaf946c35af8abaaa4a09274b..412acc343d7fa6262e7b6b09b63cb1f764096156 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -106,7 +106,7 @@ this and other documentation.
 @menu
 * Tutorial::                       A tutorial introduction to lilypond.
 * Invoking LilyPond::              Operation.
-* Reporting Bugs::                 Where to report bugs.
+* Bug reports::                   Where to report bugs.
 * Reference Manual::               Reference Manual.
 @c Move to Reference Manual?
 * Internals:(lilypond-internals).  Auto generated detailed documentation.
@@ -119,11 +119,13 @@ this and other documentation.
 @contents
 
 @macro keyindex {word}
-@cindex \\@code{\word\}
+@cindex @code{ \word\ }
+
 @end macro
 
 @macro indexcode {word}
-@cindex @code{\word\}
+@cindex @code{ \word\ }
+
 @end macro
 
 
@@ -139,7 +141,7 @@ this and other documentation.
 
 @mbinclude development.itexi
 
-@node Index, , , top
+@node Index
 @unnumbered Index
 
 @printindex cp

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 33a734826d0af7f8061ca7b7ddba927f4d82d1df..94252fb529f580e353a011cf227f7bae906d58a6 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -8,7 +8,7 @@
 
 @c ugh: because of @include, we need to fill in these nodes
 
-@node Reference Manual, , , top
+@node Reference Manual
 @chapter Reference Manual
 
 @menu
@@ -52,11 +52,13 @@
 @node Overview
 @section Overview
 
+
 This document@footnote{This document has been revised for LilyPond 1.2.}
 describes the the GNU LilyPond input format This format represents a
 piece of music in an elegant way, but contains enough information for
 both automatic typesetting and automatic performances.
 
+
 LilyPond input can be classified  into three types:
 @itemize @bullet
   @item musical expressions: a musical expression is some combination of
@@ -109,6 +111,7 @@ It is customary to put the @code{\header} at the top of the file.
 @node Pitch names
 @section Pitch names
 
+
 @cindex pitch names
 @cindex note names
 @cindex chord modifier names
@@ -123,7 +126,7 @@ languages and conventions.  The syntax is as follows.
 See @file{ly/nederlands.ly} and @file{ly/chord-modifiers.ly} for
 specific examples how to do this.  tables can be tailored specified
 using. Some national note names have been provided, see
-@ref{Other languages}.
+section @ref{Other languages}.
 A @code{\paper} block at top level sets the default paper block.  A
 @code{\midi} block at top level works similarly.
 
@@ -132,14 +135,12 @@ forbidden after top level assignments.
 
 @cindex assignments
 
-
 @node Lexical conventions
 @section Lexical conventions
 
 @cindex lexical conventions
 
 
-
 @unnumberedsubsec Comments
 
 @cindex comment
@@ -520,9 +521,7 @@ corresponding to C and 7 corresponding to B.  The shift is zero for a
 natural, negative to add flats, or positive to add sharps.
 
 In Note and Chord mode, pitches may be designated by names.  See
-section
- @c @ref{Other languages} FIXME
- for pitch names in different languages.
+section @ref{Other languages} for pitch names in different languages.
 
 The syntax for duration specification is
 
@@ -569,7 +568,7 @@ and `@code{ees}' are contracted to `@code{as}' and `@code{es}' in Dutch,
 but both forms will be accepted.
 
 LilyPond has predefined sets of notenames for various languages.  See
-@ref{Other languages}.
+section @ref{Other languages}.
 
 The optional octave specification takes the form of a series of
 single quote (`@code{'}@indexcode{'}') characters or a series of comma
@@ -1499,6 +1498,7 @@ their written length:
 A grace note expression has duration 0; the next real note is
 assumed to be the main note.
 
+
 You cannot have the grace note after the main note, in terms of
 duration, and main notes, but you can typeset the grace notes to the
 right of the main note using the property
@@ -2318,6 +2318,7 @@ built of.  These modules are called @emph{translators}.  Translators for
 notation are called @emph{engravers}, and translators for sound are
 called @emph{performers}.
 
+
 @mbinclude properties.itely
 
 @node Page layout
@@ -2374,9 +2375,8 @@ where each of the items is one of
        See @file{font.scm} for details of @var{alist}.
 @end itemize
 
-@subsection Paper variables 
-
 
+@subsection Paper variables 
 
 The paper block has some variables you may want to use or change:
 
@@ -2753,7 +2753,6 @@ piano.
 @c @end quotation
 
 
-
 @node Pre-defined Identifiers
 
 @section Pre-defined Identifiers
@@ -2794,3 +2793,4 @@ set different shift values.
 
 @end table
 
+

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index cbdf7e76c073fe90842b92354332004555862176..6b6a0606f644cc93b8099bf7c7fb073c1ce73a62 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 
 @c ugh: because of @include, we need to fill in these nodes?
-@node Tutorial, , , Top
+@node Tutorial
 @chapter Tutorial
 
 @menu

diff --git a/VERSION b/VERSION
index 3391de22605220a0bd77aa031f34ad4f11df0b93..08224c987200d7985990ae7bc54de9222410245d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=122
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index eac4cd26595e9cd3aa803f1c39923eadfcb8cd31..900532aaccaad4b18561beb270f5fb1130d3f01d 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -487,7 +487,8 @@
 ;;
 ;; CHORD: (pitches (base . inversion))
 (define (default-chord-name-function style chord)
-  (let* ((pitches (map new-to-old-pitch (car chord)))
+  (let* ((style-string (symbol->string style))
+        (pitches (map new-to-old-pitch (car chord)))
         (modifiers (cdr chord))
         (base-and-inversion (if (pair? modifiers)
                                 (cons (new-to-old-pitch (car modifiers))
@@ -495,9 +496,9 @@
                                 '(() . ())))
         (diff (pitch::diff '(0 0 0) (car pitches)))
         (name-func 
-         (ly-eval (string->symbol (string-append "chord::name-" style))))
+         (ly-eval (string->symbol (string-append "chord::name-" style-string))))
         (names-alist 
-         (ly-eval (string->symbol (string-append "chord::names-alist-" style)))))
+         (ly-eval (string->symbol (string-append "chord::names-alist-" style-string)))))
   (let loop ((note-names (reverse pitches))
             (chord '())
             (user-name #f))

diff --git a/scm/engraver-documentation-lib.scm b/scm/engraver-documentation-lib.scm
index e886d6fb648ed22f7f4b9f5dea2a696d1fba3be4..12d3100f63ab83efdf8f6b61ea7f6dfa2f08fe7d 100644 (file)
--- a/scm/engraver-documentation-lib.scm
+++ b/scm/engraver-documentation-lib.scm
@@ -26,7 +26,7 @@
         (props (car (cdddr engraver-descr)))
         (name (car engraver-descr))
         (desc (cadr engraver-descr))
-        (objs (caddr engraver-descr))
+        (objs (map symbol->string (caddr engraver-descr)))
         )
 
     (string-append
@@ -131,12 +131,14 @@
      (texi-section 2 (context-name name) #f)
       doc)))
 
+(define (symbol<? l r)
+  (string<? (symbol->string l) (symbol->string r)))
 
 (define (document-paper name)
   (let* ((paper-alist
          (sort (My_lily_parser::paper_description)
-               (lambda (x y) (string<? (car x) (car y)))))
-        (names (sort (map car paper-alist) string<?))
+               (lambda (x y) (symbol<? (car x) (car y)))))
+        (names (sort (map symbol->string (map car paper-alist)) string<?))
         (contexts (map cdr paper-alist))
         (doc (apply string-append
                     (map (lambda (x) (document-context name x)) contexts))))