Merge commit 'origin' into includes

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

diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly
index 810f2d67542f1e0421d1ca32d2587b4532b310d6..d3db013fa6e4fd60107a3d022377243366565c66 100644 (file)
--- a/input/lsr/drawing-circles-around-various-objects.ly
+++ b/input/lsr/drawing-circles-around-various-objects.ly
@@ -1,26 +1,30 @@
-%% Do not edit this file; it is auto-generated from LSR!
-%% Tags: other
-%%  Do not edit this file; it is auto-generated from LSR!
-\version "2.11.35"
+%% Do not edit this file; it is auto-generated from input/new
+%% This file is in the public domain.
+\version "2.12.0"
+\header {
+  lsrtags = "tweaks-and-overrides"
+  texidoc = "
+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"
+} % begin verbatim
 
-\header { texidoc = "
-The \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 Score.markFormatter
-context, bar numbers on the Score.BarNumber context, and so on.
 
-You can tweak the printing of your circles by setting some properties
-such as #'thickness, #'circle-padding or #'font-size.
-" }
-
-\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)
 }