Merge commit 'origin' into beamlets2

[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 07b9033b3869f67ea354bc203e5b109058ef9a96..27318e7b78778cb02462be4dd2b9a67aa248c857 100644 (file)
--- a/input/new/drawing-circles-around-various-objects.ly
+++ b/input/new/drawing-circles-around-various-objects.ly
@@ -1,26 +1,27 @@
-\version "2.11.23"
-\layout { ragged-right= ##t }
+\version "2.12.0"
 \header {
-  doctitle = "Drawing circles around various objects"
   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"
+}
 
-\relative c'{
-c1
-\set Score.markFormatter
-  = #(lambda (mark context)
+\relative c' {
+  c1
+  \set Score.markFormatter =
+    #(lambda (mark context)
              (make-circle-markup (format-mark-numbers mark context)))
-\mark \default
-c2 d^\markup{\circle \finger "2"}
-\override Score.BarNumber #'break-visibility = #all-visible
-\override Score.BarNumber  #'stencil
-  = #(make-stencil-circler 0.1 0.25 ly:text-interface::print)
+  \mark \default
+  c2 d^\markup {
+    \override #'(thickness . 3) {
+      \circle \finger 2
+    }
+  }
+  \override Score.BarNumber #'break-visibility = #all-visible
+  \override Score.BarNumber #'stencil =
+    #(make-stencil-circler 0.1 0.25 ly:text-interface::print)
 }