From: Jan Nieuwenhuizen Date: Mon, 19 Mar 2001 15:38:27 +0000 (+0100) Subject: patch::: 1.3.140.jcn2 X-Git-Tag: release/1.3.141~6 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a50dee8c5a1609056cf47df2e17996a85ab358bd;p=lilypond.git patch::: 1.3.140.jcn2 1.3.140.jcn2 ============ * Small documentation fixes. * Removed default (font-shape . italic) settings from TextScript and TextSpanner. --- diff --git a/CHANGES b/CHANGES index 3f3e30a2a5..a7491de9cb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +1.3.140.jcn2 +============ + +* Small documentation fixes. + +* Removed default (font-shape . italic) settings from TextScript and +TextSpanner. + 1.3.140.jcn1 ============ diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index d4a668bc27..28ef926078 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -133,7 +133,7 @@ The verbose syntax for pitch specification is @example \pitch @var{scmpitch} @end example -9 + @var{scmpitch} is a pitch scheme object, see @ref{Pitch data type}. In Note and Chord mode, pitches may be designated by names. The default @@ -350,8 +350,7 @@ If you dislike the amount of ties created for a chord, you set @code{Voice.sparseTies} to true, resulting in a smaller number of ties: @lilypond[fragment,verbatim,center] -%oops: core dump -% \property Voice.sparseTies = ##t + \property Voice.sparseTies = ##t ~ @end lilypond @@ -464,6 +463,7 @@ numbers in this mode. @menu * Key signature:: +* Clef:: * Time signature:: * Unmetered music:: * Bar lines:: @@ -507,13 +507,14 @@ This command sets context property @code{Staff.keySignature}. @cindex @code{keySignature} @c . {Clef} -@subsection Clef changes +@node Clef +@subsection Clef @cindex @code{\clef} @example \clef @var{clefname} @code{;} @end example -Short-cut for +Shortcut for @example \property Staff.clefGlyph = @var{glyph associated with clefname} @@ -580,7 +581,7 @@ The time signature is changed by the @code{\time} command. Syntax: @example \time @var{numerator}@code{/}@var{denominator} @code{;} @end example -Internally, this is a short-cut for doing +Internally, this is a shortcut for doing @example \property Score.timeSignatureFraction = #'(@var{numerator} . @var{denominator}) @end example @@ -602,7 +603,7 @@ Partial measures are entered using the @code{\partial} command: \partial @var{duration} @code{;} @end example -Internally, this is a short cut for +Internally, this is a shortcut for @example \property Score.measurePosition = -@var{length of duration} @@ -643,7 +644,7 @@ achieve the same effect. \bar @var{bartype}; @end example -This is a short-cut for doing +This is a shortcut for doing @example \property Score.whichBar = @var{bartype} @end example @@ -2796,16 +2797,16 @@ LilyPond has an internal mechanism to typeset texts. You can form text markup expressions by composing scheme expressions in the following way. - -[BUG] - @lilypond[verbatim, singleline] \relative c' { - b_#"italic" - c^#'(upright "upright") - c_#'((bold upright) "bold") - d^#'(lines "one" ((bold upright) "two")) - e_#'(music (named "noteheads-2" "flags-u3")) + \fatText + a^#"upright" + b_#'(bold "bold") + c^#'(italic "italic") + d_#'((bold italic) "ff") + e^#'(dynamic "ff") + f_#'(lines "one" (bold "two")) + g^#'(music "noteheads-2" "flags-u3") } @end lilypond @@ -2815,17 +2816,17 @@ of a grob. Formally, it is defined as follows: @example text: string | (head? text+) head: markup | (markup+) -markup-item: property | abbrev | @var{fontstyle} +markup-item: property | abbrev property: (@var{key} . @var{value}) abbrev: @code{rows lines roman music bold italic named super sub text} + @code{finger volta timesig mmrest mark script large Large dynamic} @end example The markup is broken down and converted into a list of grob properties, which are prepended to the property list. The @var{key}-@var{value} pair is a grob property. -The following abbreviations are currently -defined: +The following abbreviations are currently defined: @table @code @item rows @@ -2848,14 +2849,26 @@ horizontal mode: set all text on one line (default) superscript @item sub subscript +@item finger + select fingering number fontstyle +@item volta + select volta number fontstyle +@item timesig + select time signature number fontstyle +@item mmrest + select multi measure rest number fontstyle +@item mark + select mark number fontstyle +@item script + select scriptsize roman fontstyle +@item large + select large roman fontstyle +@item Large + select Large roman fontstyle +@item dynamic + select dynamics fontstyle @end table -@var{fontstyle} may be any of @code{finger volta timesig mmrest mark -script large Large dynamic} - -[wat is het verschil tussen fontstyle en abbrev? ] - - It is possible to use @TeX{} commands in the strings, but this should be avoided because this makes it impossible for LilyPond to compute the exact length of the string, which may lead to collisions. Also, @TeX{} @@ -3297,7 +3310,7 @@ package) to @file{emacsclient.c} and @file{server.el} from the emacs source code. Recompile and stick the recompiled emacsclient into a bin directory, and put @file{server.el} into a elisp directory (eg. @file{~/usr/share/emacs/}). Add the following to your @file{.emacs} -init file, beifore invoking server-start. +init file, before invoking server-start. @example (setq load-path (cons "~/usr/share/emacs" load-path)) diff --git a/VERSION b/VERSION index b9c4f45a45..10c1d01d4e 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=140 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly index 4f39211ffa..76e7c949fe 100644 --- a/mutopia/Coriolan/coriolan-paper.ly +++ b/mutopia/Coriolan/coriolan-paper.ly @@ -60,6 +60,7 @@ %%%devNullThread = #'never TimeSignature \override #'style = #'C + TextSpanner \override #'font-shape = #'italic BarNumber \override #'padding = #3 RestCollision \override #'maximum-rest-count = #1 } diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly index ab00c576ec..9db2de15cb 100644 --- a/mutopia/Coriolan/coriolan-part-paper.ly +++ b/mutopia/Coriolan/coriolan-part-paper.ly @@ -58,6 +58,7 @@ %%%devNullThread = #'never TimeSignature \override #'style = #'C + TextSpanner \override #'font-shape = #'italic BarNumber \override #'padding = #3 RestCollision \override #'maximum-rest-count = #1 } diff --git a/scm/font.scm b/scm/font.scm index dc5dfeba9a..b92027cdd1 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -90,6 +90,12 @@ ((-1 bold upright roman cmbx 8) . "cmbx8") ((-2 bold upright roman cmbx 7) . "cmbx7") + ((2 bold italic roman cmbxti 12) . "cmbxti12") + ((1 bold italic roman cmbxti 12) . "cmbxti12") + ((0 bold italic roman cmbxti 10) . "cmbxti10") + ((-1 bold italic roman cmbxti 8) . "cmbxti8") + ((-2 bold italic roman cmbxti 7) . "cmbxti7") + ((4 medium upright typewriter cmtt 17) . "cmtt17") ((3 medium upright typewriter cmtt 17) . "cmtt17") ((2 medium upright typewriter cmtt 12) . "cmtt12") @@ -199,8 +205,8 @@ (mark . ((font-family . number) (font-relative-size . 1))) (script . ((font-family . roman) (font-relative-size . -1))) (large . ((font-family . roman) (font-relative-size . 1))) - (Large . ((font-series . bold) (font-shape . upright) - (font-family . roman) (font-relative-size . 2))) + (Large . ((font-series . bold) (font-family . roman) + (font-relative-size . 2))) (dynamic . ((font-family . dynamic) (font-relative-size . 0))) )) (properties-to-font . diff --git a/scm/grob-description.scm b/scm/grob-description.scm index ab3b20afbc..2a5c40e861 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -620,12 +620,10 @@ (padding . 0.5) (baseline-skip . 2) (font-family . roman) - (font-shape . italic) (meta . ,(grob-description "TextScript" text-script-interface text-interface side-position-interface font-interface )) )) (TextSpanner . ( (molecule-callback . ,Text_spanner::brew_molecule) - (font-shape . italic) (font-family . roman) (type . "line") diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index cd2b66ce71..1b5dfc0d43 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -269,10 +269,10 @@ Scheme markup text. It is defined as follows: @example text: string | (head? text+) head: markup | (markup+) -markup-item: property | abbrev | @var{fontstyle} +markup-item: property | abbrev property: (@var{key} . @var{value}) abbrev: @code{rows lines roman music bold italic named super sub text} - + @code{finger volta timesig mmrest mark script large Large dynamic} @end example @@ -298,8 +298,24 @@ horizontal mode: set all text on one line (default) superscript @item sub subscript -@item any font-style - finger volta timesig mmrest mark script large Large dynamic +@item finger + select fingering number fontstyle +@item volta + select volta number fontstyle +@item timesig + select time signature number fontstyle +@item mmrest + select multi measure rest number fontstyle +@item mark + select mark number fontstyle +@item script + select scriptsize roman fontstyle +@item large + select large roman fontstyle +@item Large + select Large roman fontstyle +@item dynamic + select dynamics fontstyle @end table .") (grob-property-description 'thick number? "thickness, in stafflinethickness.")