From: Phil Holmes Date: Wed, 18 Jul 2012 10:52:38 +0000 (+0100) Subject: Fixes black bars in NR X-Git-Tag: release/2.15.42-1~56 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=844e5387a003bde2c10389ad863184defe893b6c;p=lilypond.git Fixes black bars in NR --- diff --git a/Documentation/included/chord-names-jazz.ly b/Documentation/included/chord-names-jazz.ly index 5ef6039053..6a3519778b 100644 --- a/Documentation/included/chord-names-jazz.ly +++ b/Documentation/included/chord-names-jazz.ly @@ -146,7 +146,6 @@ banterProperties = \sequential { \new Staff \transpose c c' { \chs } >> \layout { - indent = 3.\cm \context { \ChordNames \consists Instrument_name_engraver diff --git a/Documentation/included/display-predefined-fretboards.ly b/Documentation/included/display-predefined-fretboards.ly index 03d91d79d2..98b1d86f1c 100644 --- a/Documentation/included/display-predefined-fretboards.ly +++ b/Documentation/included/display-predefined-fretboards.ly @@ -57,18 +57,15 @@ chordsline = { } \score { -<< - \context ChordNames { - \chordsline - } - \context FretBoards { - \chordsline - } - \context Staff { - \chordsline - } ->> - \layout { - indent = 0 - } + << + \context ChordNames { + \chordsline + } + \context FretBoards { + \chordsline + } + \context Staff { + \chordsline + } + >> } diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely index 1348e2761a..9c06638b11 100644 --- a/Documentation/notation/ancient.itely +++ b/Documentation/notation/ancient.itely @@ -834,8 +834,10 @@ The style for accidentals and key signatures is controlled by the @code{glyph-name-alist} property of the grobs @code{Accidental} and @code{KeySignature}, respectively; e.g.: -@code{\override Staff.Accidental #'glyph-name-alist = -#alteration-mensural-glyph-name-alist} +@example +\override Staff.Accidental #'glyph-name-alist = + #alteration-mensural-glyph-name-alist +@end example @seealso Music Glossary: @@ -1261,8 +1263,10 @@ The style for accidentals and key signatures is controlled by the @code{glyph-name-alist} property of the grobs @code{Accidental} and @code{KeySignature}, respectively; e.g.: -@code{\override Staff.Accidental #'glyph-name-alist = -#alteration-mensural-glyph-name-alist} +@example +\override Staff.Accidental #'glyph-name-alist = + #alteration-mensural-glyph-name-alist +@end example @seealso Music Glossary: diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely index 5be9b2f0e2..b0cfac035c 100644 --- a/Documentation/notation/changing-defaults.itely +++ b/Documentation/notation/changing-defaults.itely @@ -3123,7 +3123,7 @@ by pre-defined functions, defined in @file{scm/output-lib.scm}, where the last three columns indicate whether the layout objects will be visible in the positions shown at the head of the columns: -@multitable {@code{begin-of-line-invisible}} {@code{'#(#t #t #t)}} {yes} {yes} {yes} +@multitable {@code{begin-of-line-invisible}} {@code{'#(#t #t #t)}} {Before} {At no} {After} @headitem Function @tab Vector @tab Before @tab At no @tab After @headitem form @tab form @tab break @tab break @tab break diff --git a/Documentation/notation/chords.itely b/Documentation/notation/chords.itely index 2a360698cb..0effab0b99 100644 --- a/Documentation/notation/chords.itely +++ b/Documentation/notation/chords.itely @@ -785,7 +785,8 @@ myChords = \relative c' { @node Figured bass @subsection Figured bass -@lilypondfile[quote]{figured-bass-headword.ly} +@c Line width hack because of instrument names +@lilypondfile[quote,staffsize=18,line-width=14.5\cm]{figured-bass-headword.ly} Figured bass notation can be displayed. diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely index db24f3d0cd..cb60a7c127 100644 --- a/Documentation/notation/fretted-strings.itely +++ b/Documentation/notation/fretted-strings.itely @@ -1131,7 +1131,7 @@ diagrams can be added for other instruments or other tunings by following the examples found in @file{predefined-guitar-fretboards.ly}. -Fret diagrams for the ukulele are contained in the file +Fret diagrams for the ukulele are contained in the file @* @file{predefined-ukulele-fretboards.ly}. @lilypond[verbatim, ragged-right, quote] @@ -1149,7 +1149,7 @@ myChords = \chordmode { a1 a:m a:aug } } @end lilypond -Fret diagrams for the mandolin are contained in the file +Fret diagrams for the mandolin are contained in the file @* @file{predefined-mandolin-fretboards.ly}. @lilypond[verbatim, ragged-right, quote] @@ -1401,9 +1401,9 @@ Notation Reference: @ref{Predefined fretboard diagrams}. Installed Files: -@file{ly/predefined-guitar-fretboards.ly}, -@file{ly/predefined-guitar-ninth-fretboards.ly}, -@file{ly/predefined-ukulele-fretboards.ly}, +@file{ly/predefined-guitar-fretboards.ly}, @* +@file{ly/predefined-guitar-ninth-fretboards.ly}, @* +@file{ly/predefined-ukulele-fretboards.ly}, @* @file{ly/predefined-mandolin-fretboards.ly}. Snippets: diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely index 1ef37b17d6..fe0af3b5da 100644 --- a/Documentation/notation/input.itely +++ b/Documentation/notation/input.itely @@ -1356,7 +1356,7 @@ command, either at top-level or inside music. This label can then be referred to in a markup, to get the number of the page where the marked point is placed, using the @code{\page-ref} markup command. -@lilypond[verbatim] +@lilypond[verbatim,papersize=a8landscape] \header { tagline = ##f } \book { \label #'firstScore @@ -1474,7 +1474,7 @@ tocAct = (add-toc-item! 'tocActMarkup text)) @end verbatim -@lilypond[line-width=11.0\cm] +@lilypond[line-width=10.0\cm] \header { tagline = ##f } \paper { tocActMarkup = \markup \large \column { @@ -1502,7 +1502,7 @@ tocAct = Dots can be added to fill the line between an item and its page number: -@lilypond[verbatim,quote] +@lilypond[verbatim,line-width=10.0\cm] \header { tagline = ##f } \paper { tocItemMarkup = \tocItemWithDotsMarkup diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely index 30756c9d2f..5d4ad9769a 100644 --- a/Documentation/notation/notation-appendices.itely +++ b/Documentation/notation/notation-appendices.itely @@ -45,7 +45,8 @@ The following chart shows two standard systems for printing chord names, along with the pitches they represent. -@lilypondfile{chord-names-jazz.ly} +@c The line width is a hack to allow space for instrument names +@lilypondfile[quote,line-width=15\cm]{chord-names-jazz.ly} @node Common chord modifiers @appendixsec Common chord modifiers @@ -72,7 +73,7 @@ Major third, perfect fifth @tab @code{5} or nothing @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:5 } @@ -85,7 +86,7 @@ Minor third, perfect fifth @tab @code{m} or @code{m5} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:m } @@ -98,7 +99,7 @@ Major third, augmented fifth @tab @code{aug} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:aug } @@ -111,7 +112,7 @@ Minor third, diminished fifth @tab @code{dim} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:dim } @@ -124,7 +125,7 @@ Major triad, minor seventh @tab @code{7} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:7 } @@ -137,7 +138,7 @@ Major triad, major seventh @tab @code{maj7} or @code{maj} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:maj7 } @@ -150,7 +151,7 @@ Minor triad, minor seventh @tab @code{m7} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:m7 } @@ -163,7 +164,7 @@ Diminished triad, diminished seventh @tab @code{dim7} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:dim7 } @@ -176,7 +177,7 @@ Augmented triad, minor seventh @tab @code{aug7} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:aug7 } @@ -189,7 +190,7 @@ Diminished triad, minor seventh @tab @code{m7.5-} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:m7.5- } @@ -202,7 +203,7 @@ Minor triad, major seventh @tab @code{m7+} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:m7+ } @@ -215,7 +216,7 @@ Major triad, sixth @tab @code{6} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:6 } @@ -228,7 +229,7 @@ Minor triad, sixth @tab @code{m6} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:m6 } @@ -241,7 +242,7 @@ Dominant seventh, major ninth @tab @code{9} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:9 } @@ -254,7 +255,7 @@ Major seventh, major ninth @tab @code{maj9} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:maj9 } @@ -267,7 +268,7 @@ Minor seventh, major ninth @tab @code{m9} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:m9 } @@ -280,7 +281,7 @@ Dominant ninth, perfect eleventh @tab @code{11} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:11 } @@ -293,7 +294,7 @@ Major ninth, perfect eleventh @tab @code{maj11} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:maj11 } @@ -306,7 +307,7 @@ Minor ninth, perfect eleventh @tab @code{m11} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:m11 } @@ -319,7 +320,7 @@ Dominant ninth, major thirteenth @tab @code{13} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:13 } @@ -332,7 +333,7 @@ Dominant eleventh, major thirteenth @tab @code{13.11} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:13.11 } @@ -345,7 +346,7 @@ Major eleventh, major thirteenth @tab @code{maj13.11} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:maj13.11 } @@ -358,7 +359,7 @@ Minor eleventh, major thirteenth @tab @code{m13.11} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:m13.11 } @@ -371,7 +372,7 @@ Major second, perfect fifth @tab @code{sus2} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:sus2 } @@ -384,7 +385,7 @@ Perfect fourth, perfect fifth @tab @code{sus4} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { c1:sus4 } @@ -397,7 +398,7 @@ Perfect fifth @tab @code{1.5} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { \powerChords c1:1.5 @@ -411,7 +412,7 @@ Perfect fifth, octave @tab @code{1.5.8} @tab -@lilypond[line-width=3\cm,noragged-right, notime] +@lilypond[line-width=2.8\cm,noragged-right, notime] \chordmode { \powerChords c1:1.5.8 @@ -432,15 +433,15 @@ The chart below shows the predefined string tunings. The chart below shows the predefined fretboard diagrams for guitar. -@lilypondfile{display-predefined-fretboards.ly} +@lilypondfile[line-width=15.5\cm]{display-predefined-fretboards.ly} The chart below shows the predefined fretboard diagrams for ukulele. -@lilypondfile{display-predefined-ukulele-fretboards.ly} +@lilypondfile[line-width=15.5\cm]{display-predefined-ukulele-fretboards.ly} The chart below shows the predefined fretboard diagrams for mandolin. -@lilypondfile{display-predefined-mandolin-fretboards.ly} +@lilypondfile[line-width=15.5\cm]{display-predefined-mandolin-fretboards.ly} @node Predefined paper sizes diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely index be5c34edae..42643abde9 100644 --- a/Documentation/notation/pitches.itely +++ b/Documentation/notation/pitches.itely @@ -2356,7 +2356,7 @@ Accidentals are printed like with @code{modern}, but cautionary accidentals are added for all sharp or flat tones specified by the key signature, except if the note is immediately repeated. -@lilypond[quote] +@lilypond[quote,staffsize=18] musicA = { << \relative c' { diff --git a/Documentation/notation/repeats.itely b/Documentation/notation/repeats.itely index 1aeebd69d5..8696a75009 100644 --- a/Documentation/notation/repeats.itely +++ b/Documentation/notation/repeats.itely @@ -414,7 +414,8 @@ then include the markup in a Scheme list. voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } } \relative c'' { c1 - \set Score.repeatCommands = #(list(list 'volta voltaAdLib) 'start-repeat) + \set Score.repeatCommands = + #(list(list 'volta voltaAdLib) 'start-repeat) c4 b d e \set Score.repeatCommands = #'((volta #f) (volta "4.") end-repeat) f1 diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely index 4ded8656e0..f633877ac2 100644 --- a/Documentation/notation/simultaneous.itely +++ b/Documentation/notation/simultaneous.itely @@ -13,7 +13,7 @@ @node Simultaneous notes @section Simultaneous notes -@lilypondfile[quote]{simultaneous-headword.ly} +@lilypondfile[quote,ragged-right,line-width=16\cm]{simultaneous-headword.ly} Polyphony in music refers to having more than one voice occurring in a piece of music. Polyphony in LilyPond refers to having more @@ -67,7 +67,8 @@ The notes within the chord themselves can also be followed by articulation and ornamentation. @lilypond[verbatim,quote,relative=2] -1 c-^ e>2 4 8. 16 +1 c-^ e>2 4 +8. 16 @end lilypond However some notation, such as dynamics, hairpins and slurs must be @@ -75,7 +76,8 @@ attached to the chord, rather than notes within the chord, otherwise they will not print. @lilypond[verbatim,quote,relative=2] -1 \f ( ) \< \! +1 \f ( ) +\< \! @end lilypond @cindex chords, empty diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely index 0078a7839d..dba9dbbae2 100644 --- a/Documentation/notation/spacing.itely +++ b/Documentation/notation/spacing.itely @@ -2658,7 +2658,7 @@ The vertical padding between an outside-staff object and the previously-positioned grobs can be controlled with @code{outside-staff-padding}. -@lilypond[quote,ragged-right,relative=2,verbatim] +@lilypond[quote,ragged-right,relative=2,verbatim,staffsize=18] \once \override TextScript #'outside-staff-padding = #0 a'^"This text is placed very close to the note" \once \override TextScript #'outside-staff-padding = #3 diff --git a/Documentation/notation/staff.itely b/Documentation/notation/staff.itely index b6c06c5690..cd0b1073e8 100644 --- a/Documentation/notation/staff.itely +++ b/Documentation/notation/staff.itely @@ -12,7 +12,9 @@ @node Staff notation @section Staff notation -@lilypondfile[quote]{staff-headword.ly} +@c The line width is a bit of a hack to allow space for the +@c instrument names. +@lilypondfile[quote,ragged-right,line-width=14.5\cm,staffsize=16]{staff-headword.ly} This section explains how to influence the appearance of staves, how to print scores with more than one staff, and how to add tempo diff --git a/Documentation/notation/wind.itely b/Documentation/notation/wind.itely index 72bb5255f6..ade4986b78 100644 --- a/Documentation/notation/wind.itely +++ b/Documentation/notation/wind.itely @@ -397,10 +397,11 @@ can be displayed on the console using @code{#(print-keys-verbose 'flute (current-error-port))}, although they will not show up in the music output. -New diagrams can be created by following the patterns in +Creating new diagrams is possible, although this will require +Scheme ability and may not be accessible to all users. The +patterns for the diagrams are in @file{scm/define-woodwind-diagrams.scm} and -@file{scm/display-woodwind-diagrams.scm}. However, this will -require Scheme ability and may not be accessible to all users. +@file{scm/display-woodwind-diagrams.scm}. @predefined @endpredefined @@ -420,7 +421,7 @@ require Scheme ability and may not be accessible to all users. @seealso Installed Files: -@file{scm/define-woodwind-diagrams.scm}, +@file{scm/define-woodwind-diagrams.scm}, @* @file{scm/display-woodwind-diagrams.scm}. Snippets: diff --git a/Documentation/notation/world.itely b/Documentation/notation/world.itely index cdc2b0fe30..7059fbc5bf 100644 --- a/Documentation/notation/world.itely +++ b/Documentation/notation/world.itely @@ -280,7 +280,7 @@ maqam. Here is one suggested grouping that maps the more common maqams to key signatures: -@multitable @columnfractions 0.1 0.1 0.1 0.6 +@multitable @columnfractions 0.15 0.1 0.1 0.6 @headitem maqam group @tab key @tab finalis diff --git a/Documentation/snippets/new/chant-or-psalms-notation.ly b/Documentation/snippets/new/chant-or-psalms-notation.ly index 3a9b702206..95230aa318 100644 --- a/Documentation/snippets/new/chant-or-psalms-notation.ly +++ b/Documentation/snippets/new/chant-or-psalms-notation.ly @@ -11,8 +11,15 @@ aren't always the same length. doctitle = "Chant or psalms notation" } -stemOn = { \revert Staff.Stem #'transparent \revert Staff.Flag #'transparent } -stemOff = { \override Staff.Stem #'transparent = ##t \override Staff.Flag #'transparent = ##t } +stemOn = { + \revert Staff.Stem #'transparent + \revert Staff.Flag #'transparent +} + +stemOff = { + \override Staff.Stem #'transparent = ##t + \override Staff.Flag #'transparent = ##t +} \score { \new Staff \with { \remove "Time_signature_engraver" } diff --git a/Documentation/snippets/new/chords-headword.ly b/Documentation/snippets/new/chords-headword.ly index ce0724c93c..f0e7a0c972 100644 --- a/Documentation/snippets/new/chords-headword.ly +++ b/Documentation/snippets/new/chords-headword.ly @@ -1,10 +1,4 @@ \version "2.15.20" -#(set-global-staff-size 15) -\paper { - ragged-right = ##f - line-width = 15\cm - indent = 0\cm -} \header { lsrtags = "headwords" diff --git a/Documentation/snippets/new/fretted-headword.ly b/Documentation/snippets/new/fretted-headword.ly index 1e6e556b4f..5f49532a3a 100644 --- a/Documentation/snippets/new/fretted-headword.ly +++ b/Documentation/snippets/new/fretted-headword.ly @@ -5,12 +5,6 @@ \version "2.15.18" -#(set-global-staff-size 15) -\paper { - line-width = 17\cm - indent = 0\cm -} - \header { lsrtags = "headwords" texidoc = "" diff --git a/Documentation/snippets/new/staff-headword.ly b/Documentation/snippets/new/staff-headword.ly index 3dbed3282b..30c6709bf0 100644 --- a/Documentation/snippets/new/staff-headword.ly +++ b/Documentation/snippets/new/staff-headword.ly @@ -1,12 +1,5 @@ \version "2.15.32" \include "catalan.ly" -#(set-global-staff-size 15) -\paper{ - ragged-right=##t - line-width=17\cm - indent=0\cm -} - \header { lsrtags = "headwords"