From 129d7850e2f4c7ec781d6ec308e5ccb81d6a0424 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 15 Mar 2004 17:25:39 +0000
Subject: [PATCH] * GNUmakefile.in: remove stray make out=www
* input/test/bagpipe.ly (gcdg): octave fixes.
* scm/define-markup-commands.scm (number): use font-encoding
iso. font-family
* ly/chord-modifiers-init.ly (blackTriangleMarkup): set
font-encoding.
---
Documentation/topdocs/NEWS.texi | 11 +-
Documentation/user/changing-defaults.itely | 2 +-
GNUmakefile.in | 1 -
VERSION | 4 +-
input/test/bagpipe.ly | 230 ++++++++++++++-------
ly/chord-modifiers-init.ly | 4 +-
make/lilypond.redhat.spec.in | 5 -
scm/bass-figure.scm | 2 +-
scm/define-markup-commands.scm | 4 +-
9 files changed, 173 insertions(+), 90 deletions(-)
diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 5f4aaacf45..ace6ed52f5 100644
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -5,9 +5,14 @@
@node Top, , ,
@top
-@chapter New features in 2.1 since 2.0
+@unnumbered New features in 2.1 since 2.0
@itemize @bullet
+@item The code for font selection has been rewritten. In addition to
+existing font selection properties, the property @code{font-encoding}
+has been added, which makes the switch between normal @code{text} and other
+encodings like @code{braces}, @code{music} and @code{math}.
+
@item The pmx2ly script has been removed from the distribution.
@item Pedal brackets will now run to the last bar of a piece if they are not
@@ -575,7 +580,7 @@ it automagically through the new @code{lily-wins} frontend.
-@chapter New features in 1.8 since 1.6
+@unnumbered New features in 1.8 since 1.6
@itemize
@@ -752,7 +757,7 @@ The manual has been completely revised and extended.
@end itemize
-@chapter New features in 1.6 since 1.4
+@unnumbered New features in 1.6 since 1.4
@itemize @bullet
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 0b4f6affdd..842c74d678 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -3,7 +3,7 @@
@chapter Changing defaults
-The default output=
+The default output
diff --git a/GNUmakefile.in b/GNUmakefile.in
index b977c8558b..e2b3bcc097 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -45,7 +45,6 @@ install-WWW:
web-install:
$(MAKE) out=www install-WWW
- $(MAKE) out=www
uninstall-WWW:
#TODO
diff --git a/VERSION b/VERSION
index c71b24e8d6..11e9092e69 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=1
-PATCH_LEVEL=30
-MY_PATCH_LEVEL=hwn1
+PATCH_LEVEL=31
+MY_PATCH_LEVEL=
diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly
index b063ae2b00..f834b9d59a 100644
--- a/input/test/bagpipe.ly
+++ b/input/test/bagpipe.ly
@@ -1,87 +1,171 @@
\version "2.1.30"
\header {
- texidoc = "@cindex Bagpipe Music
-Bagpipe music may contain a lot of grace notes.
+ texidoc = "@cindex Bagpipe Music
+Here's an example of bagpipe music.
"
}
-% doen't work??
-%#(add-to-grace-init "Voice" 'Stem 'font-relative-size )
-
\paper {
- linewidth = 14.0 \cm
- indent = 0.0 \cm
- \context { \StaffContext
- \override TimeSignature #'style = #'C
-% \override TimeSignature #'visibility-function = #begin-of-line-visible
- \override TimeSignature #'break-visibility = #begin-of-line-visible
- }
+ linewidth = 14.0 \cm
+ indent = 0.0 \cm
+ \context {
+ \StaffContext
+ \override TimeSignature #'style = #'C
+ \override TimeSignature #'break-visibility = #begin-of-line-visible
+ }
}
-taor = \notes{ \grace { g32[ d g e]}}
-grip = \notes{ \grace { g32[ b g ]}}
-thrd = \notes{ \grace { g32[ d c] }}
-birl = \notes{ \grace { g32[ a g] }}
-gstd = \notes{ \grace { g'32[ d g] }}
- lgg = \notes{ \grace { g32 }}
- lag = \notes{ \grace { a32 }}
- fgg = \notes{ \grace { f32[ g'32] }}
-dblb = \notes{ \grace { g'32[ b d] }}
-dblc = \notes{ \grace { g'32[ c d] }}
-dble = \notes{ \grace { g'32[ e f] }}
-dblf = \notes{ \grace { g'32[ f g'] }}
-dblg = \notes{ \grace { g'32[ f] }}
-dbla = \notes{ \grace { a'32[ g'] }}
-cg = \notes{ \grace { c32 }}
-eg = \notes{ \grace { e32 }}
-gg = \notes{ \grace { g'32 }}
-dg = \notes{ \grace { d32 }}
-hag = \notes{ \grace { a'32 }}
-gefg = \notes{ \grace { g'32[ e f] }}
-efg = \notes{ \grace { e32[ f] }}
-gdcg = \notes{ \grace { g'32[ d c]}}
-gcdg = \notes{ \grace { g'32[ c d]}}
-
-
-
-%
-\score {
- \notes { \time 6/8 \partial 4
-
- #(add-grace-property 'Voice 'Stem 'length 6)
- #(add-grace-property 'Voice 'Stem 'stroke-style '())
+taor = \notes{ \grace {
+ g32[ d' g e']
+}
+ }
+grip = \notes {
+ \grace {
+ g32[ b g ]
+ }
+}
+thrd = \notes {
+ \grace {
+ g32[ d' c']
+ }
+}
+birl = \notes {
+ \grace {
+ g32[ a g]
+ }
+}
+gstd = \notes {
+ \grace {
+ g'32[ d' g]
+ }
+}
+lgg = \notes {
+ \grace {
+ g32
+ }
+}
+lag = \notes {
+ \grace {
+ a32
+ }
+}
+fgg = \notes {
+ \grace {
+ f32[ g'32]
+ }
+}
+dblb = \notes {
+ \grace {
+ g'32[ b d']
+ }
+}
+dblc = \notes {
+ \grace {
+ g'32[ c' d']
+ }
+}
+dble = \notes {
+ \grace {
+ g'32[ e' f']
+ }
+}
+dblf = \notes {
+ \grace {
+ g'32[ f' g']
+ }
+}
+dblg = \notes {
+ \grace {
+ g'32[ f']
+ }
+}
+dbla = \notes {
+ \grace {
+ a'32[ g']
+ }
+}
+cg = \notes {
+ \grace {
+ c'32
+ }
+}
+eg = \notes {
+ \grace {
+ e'32
+ }
+}
+gg = \notes {
+ \grace {
+ g'32
+ }
+}
+dg = \notes {
+ \grace {
+ d'32
+ }
+}
+hag = \notes {
+ \grace {
+ a'32
+ }
+}
+gefg = \notes {
+ \grace {
+ g'32[ e' f']
+ }
+}
+efg = \notes {
+ \grace {
+ e'32[ f']
+ }
+}
+gdcg = \notes {
+ \grace {
+ g'32[ d' c']
+ }
+}
+gcdg = \notes {
+ \grace {
+ g'32[ c' d']
+ }
+}
+
+\score {
+ \notes {
+ \time 6/8 \partial 4
+ \tieUp
+ \slurUp
+ \transpose a a' {
+ #(add-grace-property 'Voice 'Stem 'length 6)
-
- \tieUp
- \slurUp
-f4 |
-\gg f4 e8 \thrd d4. |
-\eg a4.(a4) d8 |
-\gg d4 f8 \dble e4. ( | \noBreak
-e8) d4 \gg d4 e8 |
+ f'4 |
+ \gg f'4 e'8 \thrd d'4. |
+ \eg a4.(a4) d'8 |
+ \gg d'4 f'8 \dble e'4. ( | \noBreak
+ e'8) d'4 \gg d'4 e'8 |
-\break
-\time 9/8
-\dblf f2.( f4) d8 |
-\time 6/8
-\dblg g'4 a'8 \gg a'4. |
-\thrd d4.( d4) \eg a8 |
-\time 9/8
-\dble e4 \lag e8 \gg e16[ d8. e8] \gg f4 g'8 |
+ \break
+ \time 9/8
+ \dblf f'2.( f'4) d'8 |
+ \time 6/8
+ \dblg g'4 a'8 \gg a'4. |
+ \thrd d'4.( d'4) \eg a8 |
+ \time 9/8
+ \dble e'4 \lag e'8 \gg e'16[ d'8. e'8] \gg f'4 g'8 |
-\break
-\time 6/8
-\gg f4 e8 \thrd d4. |
-\eg a4.( a4) d8 |
-\dblg g'4 a'8 \gg a'4. |
-\thrd d4.( d4) f8 |
+ \break
+ \time 6/8
+ \gg f'4 e'8 \thrd d'4. |
+ \eg a4.( a4) d'8 |
+ \dblg g'4 a'8 \gg a'4. |
+ \thrd d'4.( d'4) f'8 |
-\break
-\dblg g'4 e4 \dblf f8.[ e16] |
-\thrd d4.( d4) \cg d8 |
-\gg c4 e8 \thrd d4.( |
-d4.) \gdcg d4.
- }
+ \break
+ \dblg g'4 e'8( e'8) \dblf f'8.[ e'16] |
+ \thrd d'4.( d'4) \cg d'8 |
+ \gg c'4 e'8 \thrd d'4.( |
+ d'4.) \gdcg d'4.
+ }
+ }
}
-
diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 2f72eea818..590729b63c 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -3,10 +3,10 @@
chordmodifiers = #default-chord-modifier-list
whiteTriangleMarkup = #(make-override-markup
- '(font-family . math) (make-simple-markup "M"))
+ '(font-encoding . math) (make-simple-markup "M"))
blackTriangleMarkup = #(make-override-markup
- '(font-family . math) (make-simple-markup "N"))
+ '(font-encoding . math) (make-simple-markup "N"))
ignatzekExceptionMusic = \notes{
<c e gis>1-\markup { "+" }
diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 93cd96b9aa..ce7c2bf91d 100644
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -48,11 +48,6 @@ Documentation and example files of LilyPond. An index is available at
make all
-
-# make info
-make -C Documentation
-
-# make html
make web
make -C Documentation/user local_package_docdir=%{docdir} omf
diff --git a/scm/bass-figure.scm b/scm/bass-figure.scm
index 804198a6c9..4d7b19e247 100644
--- a/scm/bass-figure.scm
+++ b/scm/bass-figure.scm
@@ -17,7 +17,7 @@
(acc-markup #f)
(fig-markup
(if (string? fig)
- (make-simple-markup fig)
+ (make-number-markup (make-simple-markup fig))
(if align-accs (make-simple-markup " ")
(if (not (eq? acc '()))
(make-simple-markup "")
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index cef3198fb6..39b56affab 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -120,7 +120,7 @@ Use @code{\\fontsize} otherwise."
"Set font family to @code{number}, which yields the font used for
time signatures and fingerings. This font only contains numbers and
some punctuation. It doesn't have any letters. "
- (interpret-markup paper (prepend-alist-chain 'font-family 'number props) arg))
+ (interpret-markup paper (prepend-alist-chain 'font-encoding 'number props) arg))
(def-markup-command (roman paper props arg) (markup?)
"Set font family to @code{roman}."
@@ -164,7 +164,7 @@ some punctuation. It doesn't have any letters. "
normal words (like ``piu'') should be done in a different font. The
recommend font for this is bold and italic"
(interpret-markup
- paper (prepend-alist-chain 'font-family 'dynamic props) arg))
+ paper (prepend-alist-chain 'font-encoding 'dynamic props) arg))
(def-markup-command (italic paper props arg) (markup?)
"Use italic @code{font-shape} for @var{arg}. "
--
2.39.5