From: Werner Lemberg Date: Wed, 19 Nov 2008 06:42:13 +0000 (+0100) Subject: Whitespace issues. X-Git-Tag: release/2.11.65-1~32 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cdc06869e2f9aa9f6cf0ca6a42aa4024d9fddb10;p=lilypond.git Whitespace issues. Add some missing escape characters to abc2ly.py. --- diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index c7440e5154..f2b5833d59 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -262,8 +262,8 @@ LY_DEFINE (ly_find_accidentals_simple, "ly:find-accidentals-simple", 5, 0, 0, " key signature. The @var{laziness} is the number of bars for which reminder" " accidentals are used (ie. if @var{laziness} is zero, we only cancel accidentals" " in the same bar; if @var{laziness} is three, we cancel accidentals up to three" - " bars after they first appear. @var{octaveness} is either " - " @code{'same-octave} or @code{'any-octave} and it specifies whether " + " bars after they first appear. @var{octaveness} is either" + " @code{'same-octave} or @code{'any-octave} and it specifies whether" " accidentals should be canceled in different octaves.") { LY_ASSERT_TYPE (unsmob_pitch, pitch_scm, 2); diff --git a/lily/bar-line.cc b/lily/bar-line.cc index a7a50a8531..304d541666 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -337,14 +337,14 @@ ADD_INTERFACE (Bar_line, " is a string which specifies the kind of bar line to print." " Options are @code{:|}, @code{|:}, @code{:|:}, @code{:|.|:}," " @code{:|.:}, @code{||}, @code{|.}, @code{.|}, @code{.|.}," - " @code{|.|}, @code{:} and @code{\"dashed\"}.\n" + " @code{|.|}, @code{:} and @code{dashed}.\n" "\n" "These produce, respectively, a right repeat, a left repeat," " a thick double repeat, a thin-thick-thin double repeat," " a thin-thick double repeat, a double bar, a start bar," " an end bar, a thick double bar, a thin-thick-thin bar," - " a dotted bar and a dashed bar. " - " In addition, there is an option" + " a dotted bar and a dashed bar." + " In addition, there is an option" " @code{||:} which is equivalent to @code{|:} except at line" " breaks, where it produces a double bar (@code{||}) at the" " end of the line and a repeat sign (@code{|:}) at the" @@ -367,5 +367,3 @@ ADD_INTERFACE (Bar_line, "bar-size " "bar-extent " ); - - diff --git a/lily/dot-configuration.cc b/lily/dot-configuration.cc index c4cf852d1a..584273df8b 100644 --- a/lily/dot-configuration.cc +++ b/lily/dot-configuration.cc @@ -48,7 +48,7 @@ Dot_configuration::print () const for (Dot_configuration::const_iterator i (begin ()); i != end (); i++) printf ("%d, ", i->first); - printf ("} \n"); + printf ("}\n"); } /* diff --git a/lily/scale.cc b/lily/scale.cc index aa17285510..924208486c 100644 --- a/lily/scale.cc +++ b/lily/scale.cc @@ -18,9 +18,9 @@ */ LY_DEFINE (ly_make_scale, "ly:make-scale", 1, 0, 0, (SCM steps), - "Create a scale. " - "The argument is a vector of rational numbers, each of which " - "represents the number of tones of a pitch above the tonic.") + "Create a scale." + " The argument is a vector of rational numbers, each of which" + " represents the number of tones of a pitch above the tonic.") { bool type_ok = scm_is_vector (steps); diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc index de39fca5c3..36f13e783c 100644 --- a/lily/stencil-scheme.cc +++ b/lily/stencil-scheme.cc @@ -341,11 +341,11 @@ LY_DEFINE (ly_round_filled_box, "ly:round-filled-box", } LY_DEFINE (ly_round_filled_polygon, "ly:round-filled-polygon", - 2, 0, 0, - (SCM points, SCM blot), - "Make a @code{Stencil} object that prints a black polygon with " - "corners at the points defined by @var{points} (list of coordinate " - "pairs) and roundness @var{blot}.") + 2, 0, 0, + (SCM points, SCM blot), + "Make a @code{Stencil} object that prints a black polygon with" + " corners at the points defined by @var{points} (list of coordinate" + " pairs) and roundness @var{blot}.") { SCM_ASSERT_TYPE (scm_ilength (points) > 0, points, SCM_ARG1, __FUNCTION__, "list of coordinate pairs"); LY_ASSERT_TYPE (scm_is_number, blot, 2); diff --git a/python/convertrules.py b/python/convertrules.py index c0ae536a02..2384699cea 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2823,7 +2823,7 @@ def conv (str): str = re.sub (r"\\bigger", r"\\larger", str) return str -@rule ((2, 11, 64), "systemSeparatorMarkup -> system-separator-markup, \n\ +@rule ((2, 11, 64), "systemSeparatorMarkup -> system-separator-markup,\n\ InnerStaffGroup -> StaffGroup, InnerChoirStaff -> ChoirStaff") def conv (str): str = re.sub (r'systemSeparatorMarkup', r'system-separator-markup', str) diff --git a/scm/document-backend.scm b/scm/document-backend.scm index 8d7bb3bc25..dcaf5dcee1 100644 --- a/scm/document-backend.scm +++ b/scm/document-backend.scm @@ -120,9 +120,9 @@ node." engraver-list)) "." - "\n\nStandard settings: \n\n" + "\n\nStandard settings:\n\n" (grob-alist->texi description) - "\n\nThis object supports the following interface(s): \n" + "\n\nThis object supports the following interface(s):\n" (human-listify ifacedoc) ".")))) diff --git a/scm/font.scm b/scm/font.scm index eefc1c26ee..65ee3fec13 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -34,7 +34,7 @@ (define-method (display (leaf ) port) (map (lambda (x) (display x port)) (list - "#" @@ -47,7 +47,7 @@ (display x port)) (list - "Font_node { \nqual: " + "Font_node {\nqual: " (font-qualifier node) "(def: " (font-default node) @@ -59,7 +59,7 @@ (display "=" port) (display (cdr x) port)) (hash-table->alist (font-children node))) - (display "} } \n")) + (display "} }\n")) (define default-qualifier-order diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index c7214da3c5..7486d5f64c 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -118,7 +118,7 @@ "set-ps-scale-to-lily-scale " "\n")) (ly:outputter-dump-stencil outputter page) - (ly:outputter-dump-string outputter "stroke grestore \nshowpage\n")) + (ly:outputter-dump-string outputter "stroke grestore\nshowpage\n")) (define (supplies-or-needs paper load-fonts?) (define (extract-names font) @@ -331,7 +331,7 @@ (if (not embed) (begin - (set! embed "% failed \n") + (set! embed "% failed\n") (ly:warning (_ "cannot extract file matching ~a from ~a") name filename))) embed)) @@ -567,7 +567,7 @@ (display header port) (write-preamble paper load-fonts port) - (display "gsave set-ps-scale-to-lily-scale \n" port) + (display "gsave set-ps-scale-to-lily-scale\n" port) (ly:outputter-dump-stencil outputter dump-me) (display "stroke grestore\n%%Trailer\n%%EOF\n" port) (ly:outputter-close outputter))) diff --git a/scm/memory-trace.scm b/scm/memory-trace.scm index 0b636377cc..39bedc1804 100644 --- a/scm/memory-trace.scm +++ b/scm/memory-trace.scm @@ -106,7 +106,7 @@ (format graph-out "~a ~a\n" time mem) (if stack (begin - (format stacks-out "~5a t = ~5a - delta-mem: ~15a - ~a \n" i + (format stacks-out "~5a t = ~5a - delta-mem: ~15a - ~a\n" i time (- mem last-mem) proc) (do diff --git a/scm/output-ps.scm b/scm/output-ps.scm index 9274279a2c..da3c25a211 100644 --- a/scm/output-ps.scm +++ b/scm/output-ps.scm @@ -244,7 +244,7 @@ (list r g b))) ;; restore color from stack -(define (resetcolor) "grestore \n") +(define (resetcolor) "grestore\n") ;; rotation around given point (define (setrotation ang x y) diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 749baed3c8..f272b8f299 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -216,7 +216,7 @@ def dump_slyrics (outf): m = k for i in range (len(slyrics[voice_idx_dict[k]])): l= alphabet(i) - outf.write ("\nwords%sV%s = \lyricmode {" % (m, l)) + outf.write ("\nwords%sV%s = \\lyricmode {" % (m, l)) outf.write ("\n" + slyrics [voice_idx_dict[k]][i]) outf.write ("\n}") @@ -254,7 +254,7 @@ def try_parse_q(a): denominator=array2[0] perminute=array2[1] duration = str (int (denominator) / int (numerator)) - midi_specs = ' '.join([" \n\t\t\context {\n\t\t \Score tempoWholesPerMinute = #(ly:make-moment ", perminute, " ", duration, ")\n\t\t }\n"]) + midi_specs = ' '.join(["\n\t\t\\context {\n\t\t \\Score tempoWholesPerMinute = #(ly:make-moment ", perminute, " ", duration, ")\n\t\t }\n"]) else: sys.stderr.write("abc2ly: Warning, unable to parse Q specification: %s\n" % a) @@ -282,7 +282,7 @@ def dump_score (outf): l = ord( 'A' ) for lyrics in slyrics [voice_idx_dict[k]]: - outf.write ("\n\t\\addlyrics { \n") + outf.write ("\n\t\\addlyrics {\n") if re.match('[1-9]',k): m = alphabet (int (k)) else: @@ -650,12 +650,12 @@ def try_parse_header_line (ln, state): if a == 'C': if not state.common_time: state.common_time = 1 - voices_append (" \\override Staff.TimeSignature #\'style = #'C\n") + voices_append (" \\override Staff.TimeSignature #'style = #'C\n") a = '4/4' if a == 'C|': if not state.common_time: state.common_time = 1 - voices_append ("\\override Staff.TimeSignature #\'style = #'C\n") + voices_append ("\\override Staff.TimeSignature #'style = #'C\n") a = '2/2' if not length_specified: set_default_len_from_time_sig (a) @@ -779,7 +779,7 @@ def duration_to_lilypond_duration (multiply_tup, defaultlen, dots): base = '\\breve' dots = 1 if (multiply_tup[0] / multiply_tup[1]) == 4: - base = '\longa' + base = '\\longa' return '%s%s' % ( base, '.'* dots) class Parser_state: diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py index 39a6fba4ab..c23075055d 100644 --- a/scripts/etf2ly.py +++ b/scripts/etf2ly.py @@ -508,7 +508,7 @@ class Frame: if left[0]: str = str + rational_to_lily_skip (left) - str = str + ' | \n' + str = str + ' |\n' return str def encodeint (i): @@ -615,7 +615,7 @@ class Staff: fr = m.frames[x] except IndexError: sys.stderr.write ("Skipping nonexistent frame %d\n" % x) - laystr = laystr + "%% non existent frame %d (skipped) \n" % x + laystr = laystr + "%% non existent frame %d (skipped)\n" % x if fr: first_frame = fr if gap <> (0,1): diff --git a/scripts/lilypond-invoke-editor.scm b/scripts/lilypond-invoke-editor.scm index d847be27e9..194d51fa49 100644 --- a/scripts/lilypond-invoke-editor.scm +++ b/scripts/lilypond-invoke-editor.scm @@ -42,7 +42,7 @@ (define-public (_ x) x)) (define (show-version port) - (format port "~a (GNU LilyPond) ~a \n" PROGRAM-NAME TOPLEVEL-VERSION)) + (format port "~a (GNU LilyPond) ~a\n" PROGRAM-NAME TOPLEVEL-VERSION)) (define (show-help port) (format port (_ "Usage: lilypond-invoke-editor [textedit://]FILE:LINE:CHAR:COLUMN