From cad05c87a0737c3a037ab7b5003c13a61db6ff57 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 25 Jan 2004 23:24:07 +0000 Subject: [PATCH] * buildscripts/lilypond.words.py, input/puer-fragment.ly, input/test/vaticana.ly, input/test/ancient-font.ly, input/test/mensural-ligatures.ly, input/test/gregorian-scripts.ly, lily/include/staff-symbol.hh, lily/breathing-sign.cc, ly/params-as-init.ly, scm/define-grobs.scm, scm/define-grob-properties.scm: s/stafflinethickness/linethickness/. * ly/params-as-init.ly: Removed. Obsolete. * buildscripts/lilypond.words.py: Updated. --- ChangeLog | 12 ++++++++++++ buildscripts/lilypond.words.py | 1 - input/puer-fragment.ly | 4 ++-- input/test/ancient-font.ly | 4 ++-- input/test/gregorian-scripts.ly | 4 ++-- input/test/mensural-ligatures.ly | 4 ++-- input/test/vaticana.ly | 4 ++-- lily/breathing-sign.cc | 2 +- lily/include/staff-symbol.hh | 2 +- scm/define-grob-properties.scm | 6 +++--- scm/define-grobs.scm | 6 +++--- 11 files changed, 30 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d8354fba6..6fb3b6f561 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-01-25 Werner Lemberg + + * buildscripts/lilypond.words.py, input/puer-fragment.ly, + input/test/vaticana.ly, input/test/ancient-font.ly, + input/test/mensural-ligatures.ly, input/test/gregorian-scripts.ly, + lily/include/staff-symbol.hh, lily/breathing-sign.cc, + ly/params-as-init.ly, scm/define-grobs.scm, + scm/define-grob-properties.scm: s/stafflinethickness/linethickness/. + + * ly/params-as-init.ly: Removed. Obsolete. + * buildscripts/lilypond.words.py: Updated. + 2004-01-25 Han-Wen Nienhuys * mf/parmesan-clefs.mf: switch off mensural G clefs. diff --git a/buildscripts/lilypond.words.py b/buildscripts/lilypond.words.py index 64045a1445..21b936dfb1 100755 --- a/buildscripts/lilypond.words.py +++ b/buildscripts/lilypond.words.py @@ -56,7 +56,6 @@ for name in [ for name in [ 'ly/declarations-init.ly', 'ly/params-init.ly', -'ly/params-as-init.ly', ]: F = open(name, 'r') for line in F.readlines(): diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index b2a356a0ea..4dbb109c80 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,4 +1,4 @@ -\version "2.1.13" +\version "2.1.14" \header { title = "Puer natus est nobis (excerptum)" subtitle = "Antiphona ad introitum VII" @@ -97,7 +97,7 @@ verba = \context Lyrics = verba \lyrics { \verba >> \paper { - stafflinethickness = \staffspace / 7.0 + linethickness = \staffspace / 7.0 linewidth = 137.0\mm width = 137.0\mm indent = 0.0 diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index faa151109d..295cf63f13 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -1,4 +1,4 @@ -\version "2.1.7" +\version "2.1.14" % TODO: split ancient-font into seperate files; possibly in % different locations. \header { @@ -219,7 +219,7 @@ lowerStaff = \context MensuralStaff = lowerStaff << % do we want to keep these settings? -gp linewidth = 17.25\cm textheight = 26.0\cm - stafflinethickness = #(/ staffspace 5.0) + linethickness = #(/ staffspace 5.0) indent = 0.0 \translator { \ScoreContext diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly index 94ea6065d4..5a52dc3c62 100644 --- a/input/test/gregorian-scripts.ly +++ b/input/test/gregorian-scripts.ly @@ -1,4 +1,4 @@ -\version "2.1.7" +\version "2.1.14" \header { title = "Gregorian Scripts" texidoc = "@cindex Gregorian Scripts @@ -40,7 +40,7 @@ FIXME: padding/minimum-distance is fragile. } \paper { linewidth = 70.0 - stafflinethickness = \staffspace / 5.0 + linethickness = \staffspace / 5.0 width = 60.0 indent = 0.0 raggedright = ##t diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly index 87e4387641..9b66211095 100644 --- a/input/test/mensural-ligatures.ly +++ b/input/test/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "2.1.7" +\version "2.1.14" % TODO: % check with ancient- stuff. rename, merge, something. -gp @@ -45,7 +45,7 @@ voice = \notes \transpose c c' { >> >> \paper { - stafflinethickness = \staffspace / 5.0 + linethickness = \staffspace / 5.0 \translator { \VoiceContext \name MensuralVoice diff --git a/input/test/vaticana.ly b/input/test/vaticana.ly index e1f82afdc9..f6cbb808a5 100644 --- a/input/test/vaticana.ly +++ b/input/test/vaticana.ly @@ -1,4 +1,4 @@ -\version "2.1.7" +\version "2.1.14" % possible rename to ancient-something. \header { texidoc = "Ancient Vaticana @@ -27,7 +27,7 @@ verba = \context Lyrics = verba \lyrics { \verba >> \paper { - stafflinethickness = \staffspace / 7.0 + linethickness = \staffspace / 7.0 linewidth = 137.0 \mm width = 137.0 \mm indent = 0.0 diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 0935effb82..7aef7b1e68 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -24,7 +24,7 @@ #include "font-interface.hh" /* - TODO: thickness should be a grob property (unit: stafflinethickness) + TODO: thickness should be a grob property (unit: linethickness) rather than hardwired to (staff_space / 6). */ diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh index c27f633540..d9816b1ecf 100644 --- a/lily/include/staff-symbol.hh +++ b/lily/include/staff-symbol.hh @@ -14,7 +14,7 @@ #include "lily-proto.hh" /** - TODO: add stafflinethickness as parameter. + TODO: add linethickness as parameter. */ class Staff_symbol { diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index e34e063285..0d8892e53b 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -255,7 +255,7 @@ name of character within font.") (grob-property-description 'gap-count integer? "Number of gapped beams for tremolo.") (grob-property-description 'grow-direction ly:dir? "crescendo or decrescendo?.") -(grob-property-description 'hair-thickness number? "thickness, measured in stafflinethickness.") +(grob-property-description 'hair-thickness number? "thickness, measured in linethickness.") (grob-property-description 'head-pair pair? "Pair of grob pointers, pointing to the two heads of the tie.") (grob-property-description 'heads grob-list? "List of note heads.") (grob-property-description 'height ly:dimension? "in staffspace.") @@ -460,8 +460,8 @@ the Nth element of the list gives the amount stem shortening of a note with N fl "Repeat text on broken text-spanner?") (grob-property-description 'text markup? "Text markup. See the notation manual for more information.") -(grob-property-description 'thick-thickness number? "thickness, measured in stafflinethickness.") -(grob-property-description 'thickness number? "thickness, measured in stafflinethickness.") +(grob-property-description 'thick-thickness number? "thickness, measured in linethickness.") +(grob-property-description 'thickness number? "thickness, measured in linethickness.") (grob-property-description 'thin-kern number? "space after a hair-line.") (grob-property-description 'forced-distance ly:dimension? "forced distance for an alignment.") diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index bb73bcef85..ec4977d958 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -5,7 +5,7 @@ ;;;; (c) 1998--2003 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen -;;;; distances are given in stafflinethickness (thicknesses) and +;;;; distances are given in linethickness (thicknesses) and ;;;; staffspace (distances) ;;;; WARNING: the meta field should be the last one. @@ -480,7 +480,7 @@ (LyricExtender . ( (molecule-callback . ,Lyric_extender::brew_molecule) - (thickness . 0.8) ; stafflinethickness; + (thickness . 0.8) ; linethickness (minimum-length . 1.5) (Y-extent-callback . ,Grob::point_dimension_callback) (meta . ((interfaces . (lyric-extender-interface spanner-interface)))) @@ -1206,7 +1206,7 @@ (padding . 1) (font-family . number) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) - (thickness . 1.6) ; stafflinethickness + (thickness . 1.6) ; linethickness (height . 2.0) ; staffspace; (minimum-space . 5) (font-family . number) -- 2.39.5