From 22b7b74c681f5b29f2a3e4837d76f77903ccfacb Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Mon, 10 Jun 2013 12:29:19 +0200 Subject: [PATCH] Use Emacs comment convention (";; " instead of ";") in several files Or reformat in other ways. --- scm/chord-entry.scm | 2 +- scm/define-grobs.scm | 10 ++++----- scm/define-markup-commands.scm | 40 +++++++++++++++++----------------- scm/framework-eps.scm | 2 +- scm/framework-scm.scm | 2 +- scm/harp-pedals.scm | 8 +++---- scm/output-lib.scm | 4 ++-- scm/paper.scm | 2 +- scm/song.scm | 7 +++--- scm/to-xml.scm | 2 +- 10 files changed, 40 insertions(+), 39 deletions(-) diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm index 28ae97442c..f8531e3f0f 100644 --- a/scm/chord-entry.scm +++ b/scm/chord-entry.scm @@ -196,7 +196,7 @@ DURATION, and INVERSION." nots)) ;;;;;;;;;;;;;;;; -; chord modifiers change the pitch list. +;; chord modifiers change the pitch list. (define (aug-modifier pitches) (set! pitches (replace-step (ly:make-pitch 0 4 SHARP) pitches)) diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index c1afa7dda2..860879bcde 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1693,8 +1693,8 @@ (bound-alignment-interfaces . (note-column-interface)) (horizontal-skylines . ,ly:separation-item::calc-skylines) (keep-inside-line . #t) - ; 0.08 comes from spacing-horizontal-skyline.ly - ; allows double flat of F to be nestled over dots of C + ;; 0.08 comes from spacing-horizontal-skyline.ly + ;; allows double flat of F to be nestled over dots of C (skyline-vertical-padding . 0.08) ;; (stencil . ,ly:paper-column::print) (X-extent . ,ly:axis-group-interface::width) @@ -2017,8 +2017,8 @@ (X-extent . ,(grob::inherit-parent-property X 'X-extent)) (extra-spacing-height . ,pure-from-neighbor-interface::extra-spacing-height) - ; we want this to be ignored, so empty, but the extra spacing height - ; should preserve the span bar's presence for horizontal spacing + ;; we want this to be ignored, so empty, but the extra spacing height + ;; should preserve the span bar's presence for horizontal spacing (Y-extent . ,pure-from-neighbor-interface::height-if-pure) (meta . ((class . Item) (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) @@ -2093,7 +2093,7 @@ ;; The 'normal' minima (beamed-minimum-free-lengths . (1.83 1.5 1.25)) - ;(beamed-minimum-free-lengths . (2.0 1.83 1.25)) + ;;(beamed-minimum-free-lengths . (2.0 1.83 1.25)) ;; The 'extreme case' minima (beamed-extreme-minimum-free-lengths . (2.0 1.25)) diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index 9184d6eeba..923212367e 100755 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -3036,11 +3036,11 @@ and continue with double letters. (define-public (horizontal-slash-interval num forward number-interval mag) (if forward - (cond ;((= num 6) (interval-widen number-interval (* mag 0.5))) - ;((= num 5) (interval-widen number-interval (* mag 0.5))) + (cond ;; ((= num 6) (interval-widen number-interval (* mag 0.5))) + ;; ((= num 5) (interval-widen number-interval (* mag 0.5))) (else (interval-widen number-interval (* mag 0.25)))) (cond ((= num 6) (interval-widen number-interval (* mag 0.5))) - ;((= num 5) (interval-widen number-interval (* mag 0.5))) + ;; ((= num 5) (interval-widen number-interval (* mag 0.5))) (else (interval-widen number-interval (* mag 0.25)))) )) @@ -3050,15 +3050,15 @@ and continue with double letters. (ly:stencil-translate stencil (cons (* mag -0.00) (* mag 0.2)))) ((= num 3) (ly:stencil-translate stencil (cons (* mag -0.00) (* mag 0.2)))) - ;((= num 5) - ;(ly:stencil-translate stencil (cons (* mag -0.00) (* mag -0.07)))) - ;((= num 7) - ; (ly:stencil-translate stencil (cons (* mag -0.00) (* mag -0.15)))) + ;; ((= num 5) + ;; (ly:stencil-translate stencil (cons (* mag -0.00) (* mag -0.07)))) + ;; ((= num 7) + ;; (ly:stencil-translate stencil (cons (* mag -0.00) (* mag -0.15)))) (else stencil)) (cond ((= num 6) (ly:stencil-translate stencil (cons (* mag -0.00) (* mag 0.15)))) - ;((= num 8) - ; (ly:stencil-translate stencil (cons (* mag -0.00) (* mag -0.15)))) + ;; ((= num 8) + ;; (ly:stencil-translate stencil (cons (* mag -0.00) (* mag -0.15)))) (else stencil)) ) ) @@ -3068,15 +3068,15 @@ and continue with double letters. (thickness (* mag (ly:output-def-lookup layout 'line-thickness) thickness)) - ; backward slashes might use slope and point in the other direction! + ;; backward slashes might use slope and point in the other direction! (dy (* mag (if forward 0.4 -0.4))) (number-stencil (interpret-markup layout (prepend-alist-chain 'font-encoding 'fetaText props) (number->string num))) (num-x (horizontal-slash-interval num forward (ly:stencil-extent number-stencil X) mag)) (center (interval-center (ly:stencil-extent number-stencil Y))) - ; Use the real extents of the slash, not the whole number, because we - ; might translate the slash later on! + ;; Use the real extents of the slash, not the whole number, + ;; because we might translate the slash later on! (num-y (interval-widen (cons center center) (abs dy))) (is-sane (and (interval-sane? num-x) (interval-sane? num-y))) (slash-stencil (if is-sane @@ -3086,8 +3086,8 @@ and continue with double letters. #f))) (if (ly:stencil? slash-stencil) (begin - ; for some numbers we need to shift the slash/backslash up or down to make - ; the slashed digit look better + ;; for some numbers we need to shift the slash/backslash up or + ;; down to make the slashed digit look better (set! slash-stencil (adjust-slash-stencil num forward slash-stencil mag)) (set! number-stencil (ly:stencil-add number-stencil slash-stencil))) @@ -3298,7 +3298,7 @@ Supported flag-styles are @code{default}, @code{old-straight-flag} and ;; From /scm/flag-styles.scm, modified to fit here. (let* ((stem-up (> dir 0)) - ; scale with the note size + ;; scale with the note size (factor (magstep font-size)) (stem-thickness (* factor 0.1)) (line-thickness (ly:output-def-lookup layout 'line-thickness)) @@ -3311,9 +3311,9 @@ Supported flag-styles are @code{default}, @code{old-straight-flag} and (thickness-offset (cons 0 (* -1 thickness dir))) (spacing (* -1 flag-spacing factor dir)) (start (cons (- half-stem-thickness) (* half-stem-thickness dir))) - ; The points of a round-filled-polygon need to be given in - ; clockwise order, otherwise the polygon will be enlarged by - ; blot-size*2! + ;; The points of a round-filled-polygon need to be given in + ;; clockwise order, otherwise the polygon will be enlarged by + ;; blot-size*2! (points (if stem-up (list start flag-end (offset-add flag-end thickness-offset) (offset-add start thickness-offset)) @@ -3322,7 +3322,7 @@ Supported flag-styles are @code{default}, @code{old-straight-flag} and (offset-add flag-end thickness-offset) flag-end))) (stencil (ly:round-filled-polygon points half-stem-thickness)) - ; Log for 1/8 is 3, so we need to subtract 3 + ;; Log for 1/8 is 3, so we need to subtract 3 (flag-stencil (buildflags stencil (- log 3) stencil spacing))) flag-stencil)) @@ -3354,7 +3354,7 @@ Supported flag-styles are @code{default}, @code{old-straight-flag} and (attach-off (cons (interval-index (ly:stencil-extent head-glyph X) (* (sign dir) (car attach-indices))) - ; fixme, this is inconsistent between X & Y. + ;; fixme, this is inconsistent between X & Y. (* (sign dir) (interval-index (ly:stencil-extent head-glyph Y) diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm index 697073642d..44985d6568 100644 --- a/scm/framework-eps.scm +++ b/scm/framework-eps.scm @@ -152,7 +152,7 @@ alignment." book basename)) -; redefine to imports from framework-ps +;; redefine to imports from framework-ps (define convert-to-pdf convert-to-pdf) diff --git a/scm/framework-scm.scm b/scm/framework-scm.scm index a47eb185fd..e50d69cfe7 100644 --- a/scm/framework-scm.scm +++ b/scm/framework-scm.scm @@ -24,7 +24,7 @@ (lambda (page) (display ";;;;;;;;;;;;;;;;;;;;;;;;;;\n;;;PAGE\n" file) ;; The following two lines are alternates - ;(pretty-print (ly:stencil-expr page) file) + ;;(pretty-print (ly:stencil-expr page) file) (write (ly:stencil-expr page) file) ) (map page-stencil (ly:paper-book-pages book))))) diff --git a/scm/harp-pedals.scm b/scm/harp-pedals.scm index c2cfd49991..2842269170 100644 --- a/scm/harp-pedals.scm +++ b/scm/harp-pedals.scm @@ -89,7 +89,7 @@ spacing after the divider). (stencils '()) (circled #f) (space spacebeforedivider)) - ; Terminal condition of the recursion, return (final-x . stencil-list) + ;; Terminal condition of the recursion, return (final-x . stencil-list) (if (null? remaining) (cons (+ prev-x space) (reverse stencils)) @@ -123,7 +123,7 @@ spacing after the divider). prev-x stencils circled space)))))) (final-x (car result)) (stencils (cdr result))) - ; Add the horizontal line and combine all stencils: + ;; Add the horizontal line and combine all stencils: (box-stencil (apply ly:stencil-add (cons @@ -163,10 +163,10 @@ spacing after the divider). (define (harp-pedal-check pedal-list) "Perform some sanity checks for harp pedals (7 pedals, divider after third)" (let ((info (harp-pedal-info pedal-list))) - ; 7 pedals: + ;; 7 pedals: (if (not (equal? (car info) 7)) (ly:warning "Harp pedal diagram contains ~a pedals rather than the usual 7." (car info))) - ; One divider after third pedal: + ;; One divider after third pedal: (if (null? (cdr info)) (ly:warning "Harp pedal diagram does not contain a divider (usually after third pedal).") (if (not (equal? (cdr info) '(3))) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 6e2d06a66a..d005de637b 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -625,7 +625,7 @@ and duration-log @var{log}." (define-public (rgb-color r g b) (list r g b)) -; predefined colors +;; predefined colors (define-public black '(0.0 0.0 0.0)) (define-public white '(1.0 1.0 1.0)) (define-public red '(1.0 0.0 0.0)) @@ -1039,7 +1039,7 @@ and draws the stencil based on its coordinates. 1.0 #f #f)) - ; outer let to trigger suicide + ;; outer let to trigger suicide (let ((sten (ly:hairpin::print grob))) (if (grob::is-live? grob) (let* ((decresc? (eq? (ly:grob-property grob 'grow-direction) LEFT)) diff --git a/scm/paper.scm b/scm/paper.scm index 4cd029b75e..83c4046096 100644 --- a/scm/paper.scm +++ b/scm/paper.scm @@ -15,7 +15,7 @@ ;;;; You should have received a copy of the GNU General Public License ;;;; along with LilyPond. If not, see . -; for define-safe-public when byte-compiling using Guile V2 +;; for define-safe-public when byte-compiling using Guile V2 (use-modules (scm safe-utility-defs)) (define-public (set-paper-dimension-variables mod) diff --git a/scm/song.scm b/scm/song.scm index 35b7f2f6fa..21cff9cfed 100644 --- a/scm/song.scm +++ b/scm/song.scm @@ -259,9 +259,10 @@ ) (defstruct score-notes - note/rest-list ; list of note and rest instances - (verse-block-list '()) ; lyrics attached to notes -- multiple elements are - ; possible for multiple stanzas + note/rest-list ; list of note and rest instances + (verse-block-list '()) ; lyrics attached to notes -- multiple + ; elements are possible for + ; multiple stanzas ) (defstruct note diff --git a/scm/to-xml.scm b/scm/to-xml.scm index ea7ce7a0fc..6b6266d740 100644 --- a/scm/to-xml.scm +++ b/scm/to-xml.scm @@ -26,7 +26,7 @@ " Todo: this is a quick hack; it makes more sense to define a GOOPS class of a documentnode (similar to how -; the documentation is generated.) +the documentation is generated.) That is much cleaner: building the document, and dumping it to output is then separated. -- 2.39.5