From 61d4210a962ea860d4d2a37f788cbccd167b155d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 21 May 2003 23:05:56 +0000 Subject: [PATCH] formatting fixes. --- Documentation/user/introduction.itely | 4 +++- Documentation/user/refman.itely | 13 +++---------- input/regression/lyrics-melisma-beam.ly | 1 - scm/chords-ignatzek.scm | 7 +++---- scm/documentation-lib.scm | 21 ++++++++------------- scm/double-plus-new-chord-name.scm | 6 +++--- 6 files changed, 20 insertions(+), 32 deletions(-) diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index c6a3504bef..5758226ef0 100644 --- 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 18a9cad8d5..c4092ebcc7 100644 --- 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 7a0e37994f..0004a291d4 100644 --- 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 05508c06ef..48f5152380 100644 --- 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 103f8693ee..df21108d16 100644 --- 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 c9743e1d5c..5446a04e02 100644 --- a/scm/double-plus-new-chord-name.scm +++ b/scm/double-plus-new-chord-name.scm @@ -4,6 +4,7 @@ ;;;; ;;;; (c) 2003 Jan Nieuwenhuizen + ;;;; 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)))) - + -- 2.39.5