Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  GDP: NR 2 Reorganisation: Ancient comments
  \rounded-box, final take
  GDP: NR 2 Reorganisation: Chords comments
  GDP: NR 2 Reorganisation: Fretted-string comments
  \rounded-box corrections
  GDP: NR 2 Reorganisation: Keyboard comments
  Do not scale the size of open and mute symbols ("X", "O") twice with the "size" property. Thanks to Frank.

diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely
index cc8de79d4b9cd495a819a1fad46eba5d6b71936c..bda9e15e12ad825b299023d37986325ca7adb66e 100644 (file)
--- a/Documentation/user/ancient.itely
+++ b/Documentation/user/ancient.itely
@@ -2035,6 +2035,8 @@ TBC
 
 @c TODO Add text
 @c clefs, mensuration signs etc from lsr and -user
+@c use snippet Transcription-of-ancient-music-with-incipit
+
 TBC
 
 
@@ -2107,4 +2109,16 @@ the @internalsref{AccidentalSuggestion} object.
 
 @c TODO Add text
 @c try Till Rettig
+@c Add example of white noteheads:
+@c In the french baroque some composers used white noteheads in slow pieces,
+@c mainly in 3/2-time.  A quarter looks there like a eighth with a white 
+@c notehead.  (Franz-Rudolf Kuhnen)
+
+@c TODO Add example of this:
+@c I was referring to e.g. notated a8. a16, which should, if I
+@c remember correctly, be interpreted more like a8.. a32 (in the french
+@c style). The editor might want to show that rythmic figure above the
+@c staff as an hint to performers. (Karl Hammer)
+
+
 TBC
\ No newline at end of file

diff --git a/Documentation/user/chords.itely b/Documentation/user/chords.itely
index 7954d6c37901d36fa749d7a3530e17eff697a27e..c1f956dae6d351a131ce3d76a4e91ae7caad419c 100644 (file)
--- a/Documentation/user/chords.itely
+++ b/Documentation/user/chords.itely
@@ -128,6 +128,37 @@ Note that the duration of chords must be specified outside the
 <c e g>2
 @end example
 
+@c TODO Generate snippet based on the following
+@c      and add explanation -td
+
+Custom chord names may be generated:
+
+@lilypond[quote,ragged-right,verbatim,ragged-right]
+FGGChordNames = {
+  <c e g b d'>1-\markup { \super "maj9" }
+  <c e g a d'>1-\markup { \super "6(add9)" }
+}
+chExceptions = #(append
+(sequential-music-to-chord-exceptions
+FGGChordNames #t) ignatzekExceptions)
+
+chordStuff = \chordmode
+{
+% standard names
+g1:maj9
+g1:6.9
+% names with FGG's custom exceptions
+\set chordNameExceptions = #chExceptions
+g1:maj9
+g1:6.9
+}
+
+\score
+{
+\new ChordNames \chordStuff
+}
+@end lilypond
+
 @node Building chords
 @subsubsection Building chords
 

diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely
index c7bc91148dba0e1424d55c186e253b6785dccd30..0543cad7bc6034d7ad4099e4a8373d99af48dda8 100644 (file)
--- a/Documentation/user/fretted-strings.itely
+++ b/Documentation/user/fretted-strings.itely
@@ -300,6 +300,10 @@ Internals Reference: @internalsref{StrokeFinger}
 @node Guitar
 @subsection Guitar
 
+@c TODO Make a snippet based on
+@c http://www.nabble.com/Creating-a-nice-formatted-Chords-%2B-Lyrics-layout-for-guitar-players-to13829430.html
+@c and include it somewhere -td
+
 @menu
 * Guitar tablatures::
 * Indicating position and barring::

diff --git a/Documentation/user/keyboards.itely b/Documentation/user/keyboards.itely
index a9dccb2fe5ed9597fc97e921142089c59159c513..d31b67a552f6e246b0b3a444b4d5e101ff80d15a 100644 (file)
--- a/Documentation/user/keyboards.itely
+++ b/Documentation/user/keyboards.itely
@@ -287,6 +287,14 @@ of the note head
 c\sostenutoDown d e c, f g a\sostenutoUp
 @end lilypond
 
+@noindent
+Note that overrides must be placed before the note at which the 
+pedal bracket starts.
+
+@c TODO Check relative positions of the sustain pedal and
+@c      dynamics are correct (they collided in 2.11.44).
+@c      Give example showing this.
+
 @seealso
 
 Notation Reference: @ref{Ties} (laissez vibrer).

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 3fb91c199e76d461901b443133095ea102f8c738..c767e09a71868cde81b18b979b2fece8b0a977e5 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -152,6 +152,10 @@ this grob looks as a continued break.")
      (control-points ,list? "List of offsets (number pairs) that form
 control points for the tie, slur, or bracket shape.  For B@'eziers,
 this should list the control points of a third-order B@'ezier curve.")
+     (corner-radius ,number? "The diameter of a blot, in rounded
+boxes. If set to #0, the corners will we completely sharp; default is
+#1. If set to a too big value, it will be ignored and the shortest
+edges of the box will be drawn as semicircles."
 
      (damping ,number? "Amount of beam slope damping.")
      (dash-fraction ,number? "Size of the dashes, relative to

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 9ddfa4982096cf906a1c99f26c5eacb8e111251e..3ec32d7335bba9e7c0bce9dfdef6ec89371cae3b 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -206,7 +206,12 @@ circle of diameter@tie{}0 (i.e. sharp corners)."
 Draw a box with rounded corners around @var{arg}.  Looks at @code{thickness},
 @code{box-padding} and @code{font-size} properties to determine line
 thickness and padding around the markup; the @code{corner-radius} property
-makes possible to define another shape for the corners (default is 1)." 
+makes possible to define another shape for the corners (default is 1).
+
+@lilypond[quote,verbatim,fragment,relative=2]
+c^\\markup{ \\rounded-box Overtura }
+c,8. c16 c4 r
+@end lilypond" 
   (let* ((th (*
              (ly:output-def-lookup layout 'line-thickness)
              (chain-assoc-get 'thickness props 1)))

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index 2fe8f33605d36e3a1ca28cc0d8dedaf1eb5204de..a133d189af8e3e477272c236a1776e948e3cf072 100644 (file)
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -256,8 +256,8 @@ Line thickness is given by @var{th}, fret & string spacing by
 (define (draw-xo layout props string-count fret-range size xo-list orientation)
 "Put open and mute string indications on diagram, as contained in @var{xo-list}."
     (let* ((fret-count (+ (- (cadr fret-range) (car fret-range) 1)))
-           (xo-font-mag (* size (chain-assoc-get 'xo-font-magnification props 0.5)))
-;           (xo-font-mag (* size 0.5))
+           (xo-font-mag (chain-assoc-get 'xo-font-magnification props 0.5))
+;           (xo-font-mag 0.5)
 ;           (xo-horizontal-offset (* size (chain-assoc-get 'xo-horizontal-offset props -0.35)))
            (xo-horizontal-offset (* size -0.35))
            (mypair (car xo-list))

diff --git a/scm/stencil.scm b/scm/stencil.scm
index baa8fe8ccd626685b0f67e7e4da313a69fc0d1a8..536425b9c680ce5a44b0c7bcbe9f8924d94142fd 100644 (file)
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -134,11 +134,16 @@ encloses the contents.
 
   (let* ((xext (interval-widen (ly:stencil-extent stencil 0) padding))
         (yext (interval-widen (ly:stencil-extent stencil 1) padding))
+   (min-ext (min (-(cdr xext) (car xext)) (-(cdr yext) (car yext))))
+   (ideal-blot (min blot (/ min-ext 2)))
+   (ideal-thickness (min thickness (/ min-ext 2)))
         (outer (ly:round-filled-box
-                 (interval-widen xext thickness) (interval-widen yext thickness) blot))
-        (inner (ly:make-stencil (list 'color (x11-color 'white) (ly:stencil-expr (ly:round-filled-box 
-       (cons (+ (car xext) thickness) (- (cdr xext) thickness)) 
-       (cons (+ (car yext) thickness) (- (cdr yext) thickness)) (* blot 0.8)))))))
+            (interval-widen xext ideal-thickness) 
+            (interval-widen yext ideal-thickness) 
+               ideal-blot))
+        (inner (ly:make-stencil (list 'color (x11-color 'white) 
+            (ly:stencil-expr (ly:round-filled-box 
+               xext yext (- ideal-blot ideal-thickness)))))))
     (set! stencil (ly:stencil-add outer inner))
     stencil))