From: David Kastrup Date: Sun, 25 Jun 2017 10:35:01 +0000 (+0200) Subject: Run scripts/auxiliar/makelsr.py X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=79c17e0eaedca79e5f7605f5b9f92db27c68e679;p=lilypond.git Run scripts/auxiliar/makelsr.py --- diff --git a/Documentation/snippets/analysis-brackets-with-labels.ly b/Documentation/snippets/analysis-brackets-with-labels.ly index 750ba8bd5a..fde149bceb 100644 --- a/Documentation/snippets/analysis-brackets-with-labels.ly +++ b/Documentation/snippets/analysis-brackets-with-labels.ly @@ -35,12 +35,12 @@ Bracket text will be parenthesized after a line break. \once\override HorizontalBracketText.text = "a'" e''\startGroup d''\stopGroup c'' - -\tweak text \markup \bold \huge "b" \startGroup - -\tweak text "a" \startGroup + -\tweak HorizontalBracketText.text \markup \bold \huge "b" \startGroup + -\tweak HorizontalBracketText.text "a" \startGroup d''\stopGroup - e''-\tweak text "a'" \startGroup + e''-\tweak HorizontalBracketText.text "a'" \startGroup d''\stopGroup\stopGroup - c''-\tweak text foo \startGroup d'' e'' f'' + c''-\tweak HorizontalBracketText.text foo \startGroup d'' e'' f'' \break g'' a'' b'' c'''\stopGroup } diff --git a/Documentation/snippets/three-sided-box.ly b/Documentation/snippets/three-sided-box.ly index 3e1080dcb7..dd7f46a30a 100644 --- a/Documentation/snippets/three-sided-box.ly +++ b/Documentation/snippets/three-sided-box.ly @@ -1,9 +1,10 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.unimi.it -%% Make any changes in LSR itself, or in Documentation/snippets/new/ , -%% and then run scripts/auxiliar/makelsr.py -%% -%% This file is in the public domain. +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.18.0 \version "2.18.0" \header { @@ -36,15 +37,13 @@ around some text (or other markup). % The corresponding markup command, based on the \box command defined % in scm/define-markup-commands.scm #(define-markup-command (NWS-box layout props arg) (markup?) + #:properties ((thickness 0.1) (font-size 0) (box-padding 0.2)) "Draw a box round @var{arg}. Looks at @code{thickness}, @code{box-padding} and @code{font-size} properties to determine line thickness and padding around the markup." - (let* ((th (chain-assoc-get 'thickness props 0.1)) - (size (chain-assoc-get 'font-size props 0)) - (pad (* (magstep size) - (chain-assoc-get 'box-padding props 0.2))) - (m (interpret-markup layout props arg))) - (NWS-box-stencil m th pad))) + (let ((pad (* (magstep font-size) box-padding)) + (m (interpret-markup layout props arg))) + (NWS-box-stencil m thickness pad))) % Test it: