From 82fb2b651b1e38c99342c6163176237e1ea0ec3f Mon Sep 17 00:00:00 2001 From: Dan Eble Date: Thu, 1 Jan 2015 15:56:57 -0500 Subject: [PATCH] Issue 4186: Remove the single-C time signature style Remove the single-C time signature style that was added in commit 40b0982cb4f00317c3d50c7f1d4e26fde912f3cd to address Issue 3286. The later commit 145389636e81237d560aba4d04abcb89fa60cd9c allows the user to define new time signature styles, which is a more flexible solution. --- input/regression/time-signature-single-c.ly | 20 -------------------- scm/time-signature-settings.scm | 9 --------- 2 files changed, 29 deletions(-) delete mode 100644 input/regression/time-signature-single-c.ly diff --git a/input/regression/time-signature-single-c.ly b/input/regression/time-signature-single-c.ly deleted file mode 100644 index 5e115e4070..0000000000 --- a/input/regression/time-signature-single-c.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.19.16" - -\header { - texidoc = "The single-C time signature style prints a C for any time signature with 4 in the numerator and prints a cut-C for any time signature with 2 in the numerator." -} - -\layout { indent = 0 } - -\new Staff { - \relative f' { - \override Staff.TimeSignature.style = #'single-C - \time 1/2 f2^"1/2" - \time 2/2 f2^"2/2" f - \time 2/1 f1^"2/1" f - \time 3/4 f4^"3/4" f f - \time 4/4 f4^"4/4" f f f - \time 4/2 f2^"4/2" f f f - \time 4/1 f1^"4/1" f f f - } -} diff --git a/scm/time-signature-settings.scm b/scm/time-signature-settings.scm index 083d18b9a1..2649092593 100644 --- a/scm/time-signature-settings.scm +++ b/scm/time-signature-settings.scm @@ -394,15 +394,6 @@ a fresh copy of the list-head is made." (add-simple-time-signature-style 'C make-c-time-signature-markup) (add-simple-time-signature-style 'default make-c-time-signature-markup) -(define-public (make-single-c-time-signature-markup fraction) - "Make markup for the `single-C' time signature style." - (let ((n (car fraction))) - (if (or (= n 2) (= n 4)) ; numerator only - (make-glyph-time-signature-markup 'C (cons n n)) - (make-compound-meter-markup n)))) - -(add-simple-time-signature-style 'single-C make-single-c-time-signature-markup) - ;;;%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ;;; Measure length calculation of (possibly complex) compound time signatures -- 2.39.5