formatting fixes.

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index c6a3504bef9e2735b60b092a0ac65da00ec07bea..5758226ef0cada966fe1c18d6221648b3a668d61 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -389,7 +389,9 @@ files relative to the top-directory of the source archive. For
 example, @file{input/test/bla.ly} may refer to the file
 @file{lilypond-1.7.19/input/test/bla.ly}.  On binary packages for the
 Unix platform, these can typically be found somewhere below
-@file{/usr/share/doc/lilypond/}.
+@file{/usr/share/doc/lilypond/}. Initialization files, for example
+@file{scm/lily.scm}, or @file{ly/engraver-init.ly}, are usually found
+in the directory @file{/usr/share/lilypond/}.
 
 @cindex adjusting output
 @cindex variables

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 18a9cad8d592103776ebbfade7e4be7e89c33634..c4092ebcc7167cb717ba6375d5457dd359fcce30 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1738,19 +1738,10 @@ Bracket endings should be angled/slanted. (TODO)
  
 
 
-@node Ornaments
-@section Ornaments
-@cindex Ornaments
-
-[TODO: ornaments vs. expressive marks]
-
-@menu
-* Articulations::               
-@end menu
 
 
 @node Articulations
-@subsection Articulations
+@section Articulations
 @cindex Articulations
 
 @cindex articulations
@@ -1772,6 +1763,8 @@ put them up:
 @end lilypond
 
 
+
+
 Other symbols can be added using the syntax
 @var{note}@code{-\}@var{name}. Again, they can be forced up or down
 using @code{^} and @code{_}.

diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly
index 7a0e37994f413fd2bb3be758747198a0cf324435..0004a291d46fbe9786f886af556acff551e05694 100644 (file)
--- a/input/regression/lyrics-melisma-beam.ly
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -1,4 +1,3 @@
-
 \version "1.7.18"
 \header
 {

diff --git a/scm/chords-ignatzek.scm b/scm/chords-ignatzek.scm
index 05508c06efe2d34db06ea99d41beaf080e73005d..48f51523807b7d8c88ba52e1c2bd31f6a56bae5f 100644 (file)
--- a/scm/chords-ignatzek.scm
+++ b/scm/chords-ignatzek.scm
@@ -79,8 +79,8 @@
        (if (< (ly:pitch-steps (car ps)) (- x 1))
            (remove-uptil-step x (cdr ps))
            ps)
-       )
-    )
+       ))
+  
   (define name-root (ly:get-context-property context 'chordRootNamer))
   (define name-note 
     (let ((nn (ly:get-context-property context 'chordNoteNamer)))
@@ -93,8 +93,7 @@
          nn)))
 
   (define (is-natural-alteration? p)
-    (= (natural-chord-alteration p)  (ly:pitch-alteration p))
-    )
+    (= (natural-chord-alteration p)  (ly:pitch-alteration p)))
   
   
   (define (ignatzek-format-chord-name

diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm
index 103f8693ee92c9228cb5ad9fd0b4562a85a86db5..df21108d1646fa246ce2ce077a13e80fca43d730 100644 (file)
--- a/scm/documentation-lib.scm
+++ b/scm/documentation-lib.scm
@@ -178,7 +178,6 @@
   (display (string-append "\nWriting " x " ... ") (current-error-port)))
 
 
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; property  stuff.
 
@@ -211,7 +210,6 @@
        "(unset)"
        (scm->texi (cdr handle)))))
 
-
 (define (backend-property->texi sym)
   (property->texi 'backend sym))
 
@@ -222,14 +220,11 @@ containing default values."
       ((without (property->texi where sym))
        (rv
 
-    (cons (car without)
-         (if (eq? alist #f)
-             (cdr without)
-             (string-append
-              (cdr without)
-              "\nDefault value: "
-              (document-property-value sym alist)))))
-
-       )
-;    (display rv)
-    rv  ))
+       (cons (car without)
+             (if (eq? alist #f)
+                 (cdr without)
+                 (string-append
+                  (cdr without)
+                  "\nDefault value: "
+                  (document-property-value sym alist))))))
+    rv))

diff --git a/scm/double-plus-new-chord-name.scm b/scm/double-plus-new-chord-name.scm
index c9743e1d5cc6db7803999125ff486d9991416935..5446a04e0280156fd5e67e5d421d5437e34fb8ae 100644 (file)
--- a/scm/double-plus-new-chord-name.scm
+++ b/scm/double-plus-new-chord-name.scm
@@ -4,6 +4,7 @@
 ;;;; 
 ;;;; (c) 2003 Jan Nieuwenhuizen <janneke@gnu.org>
 
+
 ;;;; NOTE: this is experimental code
 ;;;; Base and inversion are ignored.
 ;;;; Naming of the base chord (steps 1-5) is handled by exceptions only
@@ -19,8 +20,7 @@
       (make-line-markup
        (list (make-hspace-markup amount)
             markup))
-      markup
-      ))
+      markup))
 
 (define-public (double-plus-new-chord->markup-banter . args)
   (apply double-plus-new-chord->markup (cons 'banter args)))
@@ -260,4 +260,4 @@ input/test/dpncnt.ly).
        
        (else empty-markup))))
 
-  
+