Merge master into nested-bookparts

[lilypond.git] / input / new / drawing-circles-around-various-objects.ly

diff --git a/input/new/drawing-circles-around-various-objects.ly b/input/new/drawing-circles-around-various-objects.ly
index 8b8a09ee2d69abae460acf9c1eea7d6940b8ae1d..2ed0bde504a7dc1382380dabcdd2259aa6d473cc 100644 (file)
--- a/input/new/drawing-circles-around-various-objects.ly
+++ b/input/new/drawing-circles-around-various-objects.ly
@@ -1,14 +1,11 @@
-\version "2.11.23"
+\version "2.11.61"
 \header {
   lsrtags = "tweaks-and-overrides"
   texidoc = "
-The @code{\circle} command allows you to draw circles around various objects,
-for example fingering indications. However, some objects require
-specific tweaks: rehearsal marks depend on the @code{Score.markFormatter}
-context, bar numbers on the @code{Score.BarNumber} context, and so on.
-
-You can tweak the printing of your circles by setting some properties
-such as @code{#'thickness}, @code{#'circle-padding} or @code{#'font-size}.
+The @code{\circle} markup command draws circles around various objects,
+for example fingering indications. For other objects, specific tweaks
+may be required: this example demonstrates two strategies for rehearsal
+marks and measure numbers.
 "
   doctitle = "Drawing circles around various objects"
 }
@@ -19,8 +16,12 @@ such as @code{#'thickness}, @code{#'circle-padding} or @code{#'font-size}.
     #(lambda (mark context)
              (make-circle-markup (format-mark-numbers mark context)))
   \mark \default
-  c2 d^\markup { \circle \finger 2 }
+  c2 d^\markup {
+    \override #'(thickness . 3) {
+      \circle \finger 2
+    }
+  }
   \override Score.BarNumber #'break-visibility = #all-visible
-  \override Score.BarNumber  #'stencil =
+  \override Score.BarNumber #'stencil =
     #(make-stencil-circler 0.1 0.25 ly:text-interface::print)
 }