From: fred Date: Wed, 27 Mar 2002 00:58:18 +0000 (+0000) Subject: lilypond-1.3.140 X-Git-Tag: release/1.5.59~847 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6a808c7ed925b1392e620dac1265de5f40b3a32d;p=lilypond.git lilypond-1.3.140 --- diff --git a/CHANGES b/CHANGES index 482f4c356b..9cc8901a9c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,57 @@ -1.3.138.jcn1 +1.3.139.jcn5 ============ +* Coriolan gets mutopia-id 57. + +* Experimental start of ports to mutopia archive. + +* Bugfix: ly2dvi: added letter support, catch indexing with unknown +papersize names. + +* ly2dvi: removed warning message and changed --set=papersizename= to +--set=papersize=. This fixes mutopia letter-targets. + +* Small fixes to Coriolan. + +* Bugfix: don't typeset suicided multi-measure-rests, don't set +multi-measure-rests spanning less than one measure. + +* Bugfix: line-column-location. + +* Allow markup text for crecscendoText and decrescendoText. + +* Changed part combiner's a due text: `a2 to a2. + +* Bugfix: info direntries. + +* Automated fixing of info structure. Build now stops on info errors. +This should robustify documentation and website builds. To undo this, +remove the target `info: check-info' from Documentation/user/GNUmakefile. + +1.3.139.hwn1 +============= + +* Move Multi_measure_rest up/down in combined parts. + +* Renamed FollowThread into VoiceFollower, followThread into +followVoice. + +* lilypond-book: changed nonfragment into nofragment + +* Cleanups for ledgered rests. + +* Bugfix; don't create RhythmicStaff if asking for Staff. + +* Bugfix: sparseTies. + +* Reference manual: hara kiri, font selection + +* changed font-point-size into font-design-size + + +1.3.139 +======= + * Documentation build fixes. 1.3.138.hwn1 diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 5e7d8f9b5c..d4a668bc27 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -7,12 +7,6 @@ @c before saving changes -@ignore - TODO: - -@end ignore - - @macro refbugs @unnumberedsubsec Bugs @@ -139,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 @@ -353,10 +347,11 @@ warning message will appear and no ties will be created. @end lilypond If you dislike the amount of ties created for a chord, you set -@code{Thread.sparseTies} to true, resulting in a smaller number of +@code{Voice.sparseTies} to true, resulting in a smaller number of ties: @lilypond[fragment,verbatim,center] - \property Thread.sparseTies = ##t +%oops: core dump +% \property Voice.sparseTies = ##t ~ @end lilypond @@ -470,6 +465,7 @@ numbers in this mode. @menu * Key signature:: * Time signature:: +* Unmetered music:: * Bar lines:: @end menu @@ -613,6 +609,27 @@ Internally, this is a short cut for @end example @cindex @code{|} + +@node Unmetered music +@subsection Unmetered music + +Bar lines and bar numbers are calculated automatically. For unmetered +music (e.g. cadenzas), this is not desirable. The property +@code{Score.timing} can be used to switch off this automatic timing + +@lilypond[fragment,relative,singleline,verbatim] +c'2. +\property Score.timing = ##f +c4 c4 c4 +\property Score.timing = ##t +c4 c4 c4 +@end lilypond + +The identifiers @code{\cadenzaOn} and @code{\cadenzaOff} can be used to +achieve the same effect. + + + @c . {Bar lines} @node Bar lines @subsection Bar lines @@ -659,7 +676,7 @@ settings. @cindex Polyphony [TODO: collisions, rest-collisinos, voiceX identifiers, how to -which contexts to instantiate.] +which contexts to instantiate. some small examples? ] @table @code @@ -702,6 +719,23 @@ Aand for ties use @code{\tieDown}, @code{\tieUp}. +@cindex @code{\voiceOne} +@cindex @code{\voiceTwo} +@cindex @code{\voiceThree} +@cindex @code{\voiceFour} +@cindex @code{\oneVoice} +@cindex @code{\shiftOn} +@cindex @code{\shiftOff} + +If two voices sharing one staff have the same stem directions, their +note heads may collide. You can shift the note heads of one voice by +setting @code{\shiftOn}. This can be undone by setting +@code{\shiftOff}. + +For simple polyphonic music, shorthands are available that combine +directions and shift settings: @code{\voiceOne}, @code{\voiceTwo}, +@code{\voiceThree}, @code{\voiceFour} and @code{\oneVoice}. + @node Beaming @section Beaming @@ -824,9 +858,31 @@ control the number of beams through the properties @end quotation @cindex @code{stemRightBeamCount} +The beam symbol can be tweaked through @code{Voice.Beam}'s +grob-properties @code{height} and @code{staff-position}, +in staff-spaces. -[TODO: explain common tweaks.] +Set @code{height} to zero, to get horizontal beams: +@quotation +@lilypond[fragment,relative,verbatim] + \property Voice.Beam \set #'direction = #1 + \property Voice.Beam \set #'height = #0 + [a''8 e' d c] +@end lilypond +@end quotation + +Here's how you'd specify a weird looking beam that instead of being +horizontal, falls two staff spaces: + +@quotation +@lilypond[fragment,relative,verbatim] + \property Voice.Beam \set #'staff-position = #2 + \property Voice.Beam \set #'height = #-2 + [c'8 c] +@end lilypond +@end quotation +@cindex @code{default-neutral-direction} @node Expressive marks @section Expressive marks @@ -837,6 +893,7 @@ control the number of beams through the properties * Phrasing slur:: * Breath marks:: * Tempo:: +* Text spanner:: @end menu @node Slur @@ -886,45 +943,25 @@ stems might look better: Similarly, the curvature of a slur is adjusted to stay clear of note heads and stems. When that would increase the curvature too much, the slur is reverted to its default shape. The threshold for this decision -is in @code{Voice.Slur}'s grob-property @code{beautiful}. In some -cases, you may prefer curved slurs to vertically moved ones. You can +is in @code{Voice.Slur}'s grob-property @code{beautiful}. It is loosely +related to the enclosed area between the slur and the notes. Usually, +the default setting works well, but in some cases you may prefer a +curved slur when LilyPond decides for a vertically moved one. You can express this by increasing the @code{beautiful} value: -[hoe gedefd?? wat betekent beautiful = X?] +@lilypond[verbatim,singleline,relative] + \property Voice.Beam \override #'direction = #-1 + \property Voice.Slur \override #'direction = #1 + c'16( a' f' a a f a, )c, + c( a' f' a a f d, )c + \property Voice.Slur \override #'beautiful = #5.0 + c( a' f' a a f d, )c +@end lilypond -[dit voorbeeld is te lang: junken, of inkorten] +@refbugs -@quotation -@lilypond[verbatim,singleline] -\score { - \notes \context PianoStaff < - \time 6/4; - \context Staff=up { s1 * 6/4 } - \context Staff=down < - \clef bass; - \autochange Staff \context Voice - \notes \relative c { - d,8( a' d f a d f d a f d )a - } - > - > - \paper { - \translator { - \VoiceContext - Slur \override #'beautiful = #5.0 - Slur \override #'direction = #1 - Stem \override #'direction = #-1 - autoBeamSettings \override #'(end * * * *) - = #(make-moment 1 2) - } - \translator { - \PianoStaffContext - VerticalAlignment \override #'threshold = #'(5 . 5) - } - } -} -@end lilypond -@end quotation +The definition for @code{beautiful} is vague, the default setting is +experimental computer science. @cindex Adusting slurs @@ -1198,7 +1235,7 @@ stem. This behavior can be controlled with the @lilypond[fragment,verbatim] \relative c'' { \grace c8 c4 \grace { [c16 c16] } c4 - \grace { \property Grace.Stem \override #'flag-style = ##f c16 } c4 + \grace { \property Grace.Stem \override #'flag-style = #'() c16 } c4 } @end lilypond @@ -1565,11 +1602,6 @@ are squashed, and the staff itself looks has a single staff line: @end lilypond - -[TODO: explain perc notation, if it's finished in time.] - - - @c . {Piano music} @node Piano music @section Piano music @@ -1585,7 +1617,7 @@ other pianistic peculiarities. * Manual staff switches:: * Pedals:: * Arpeggio:: -* Follow Thread:: +* VoiceFollower:: @end menu @@ -1711,26 +1743,24 @@ This command creates @code{Arpeggio} grobs. connected arpeggios and unconnected arpeggios at the same time. -@c . {Follow Thread} -@node Follow Thread -@subsection Follow Thread +@c . {VoiceFollower} +@node VoiceFollower +@subsection VoiceFollower -@cindex follow thread +@cindex follow voice @cindex staff switching @cindex cross staff -[todo: figure out different name, eg. voice line, switch indicator ? ] - -@cindex @code{followThread} +@cindex @code{followVoice} Whenever a voice switches to another staff a line connecting the notes can be printed automatically. This is enabled if the property -@code{PianoStaff.followThread} is set to true: +@code{PianoStaff.followVoice} is set to true: @quotation @lilypond[fragment,relative,verbatim] \context PianoStaff < - \property PianoStaff.followThread = ##t + \property PianoStaff.followVoice = ##t \context Staff \context Voice { c'1 \translator Staff=two @@ -2338,7 +2368,7 @@ Automatic part combining is used to merge two parts of music onto on staff in an intelligent way. It is aimed primarily at typesetting Hymns and orchestral scores. When the two parts are identical for a period of time, only one is shown. In places where the two parts differ, stem -directions are set automatically. Also, soli and @`{a} due parts can be +directions are set automatically. Also, soli and @emph{a due} parts can be identified and marke. The syntax for part combining is @@ -2359,11 +2389,11 @@ one voice, as common for wind parts in orchestral scores: @lilypond[verbatim,singleline,fragment] \context Staff < \context Voice=one \partcombine Voice - \context Thread=one \notes\relative c'' { - g g a b r2 + \context Thread=one \relative c'' { + g a b r } - \context Thread=two \notes\relative c'' { - g g r2 g4 f4 + \context Thread=two \relative c'' { + g r2 f4 } > @end lilypond @@ -2371,20 +2401,30 @@ one voice, as common for wind parts in orchestral scores: Notice that the first @code{g} appears only once, although it was specified twice (once in each Thread). Also note that stem, slur and tie directions are set automatically, depending whether there is a solo or -unisono. - -There is actually a third engraver involved in part combining; the -@code{Voice_devnull_engraver}. This one takes care of removing -redundant spanners such as beams, slurs, ties, crescendi, etc. Note that -the Thread called one always gets up stems, and "solo", while @code{two} -always gets down stems and "Solo II". +unisono. The Thread called @code{one} always gets up stems, and "solo", +while @code{two} always gets down stems and "Solo II". If you just want the splitting of Threads and setting of directions, and not the textual markings, you may set the property @var{soloADue} to -false. There are a number of other properties that you can use to tweak +false. This mode can be used to set hymns: + +@lilypond[verbatim,singleline,fragment] + \context Staff < + \property Staff.soloADue = ##f + \context Voice=one \partcombine Voice + \context Thread=one \relative c'' { + b4 a c g + } + \context Thread=two \relative c'' { + d,2 a4 g' + } + > +@end lilypond + +There are a number of other properties that you can use to tweak the behavior of part combining, refer to the automatically generated documentation. Look for @code{Thread_devnull_engraver} -@code{Voice_engraver} and @code{A2_engraver}. +@code{Voice_devnull_engraver} and @code{A2_engraver}. @cindex @code{Thread_devnull_engraver} @cindex @code{Voice_engraver} @@ -2393,9 +2433,31 @@ documentation. Look for @code{Thread_devnull_engraver} @node Hara-kiri staffs @subsection Hara-kiri staffs +In orchestral scores, staffs that only have rests are usually removed. +This saves some space. LilyPond also supports this through the +hara-kiri@footnote{Hara kiri, also called Seppuku, is the ritual suicide +of the Japanese Samourai warriors.} staff. This staff commits suicide +when it finds itself to be empty after the line-breaking process---note +that it will not disappear when it contains normal rests, you must use +multi measure rests. + +The hara kiri staff is specialized version of the Staff context. It is +available as the context identifier @code{\HaraKiriStaffContext}. +Observe how the second staff in this example disappears in the second +line. -[TODO]@footnote{Harakiri, also called Seppuku, is the ritual suicide of -the Japanese Samourai warriors.} +@lilypond[verbatim] +\score { + \notes \relative c' < + \context Staff = SA { e4 f g a \break c1 } + \context Staff = SB { c4 d e f \break R1 } + > + \paper { + linewidth = 6.\cm ; + \translator { \HaraKiriStaffContext } + } +} +@end lilypond @@ -2484,6 +2546,7 @@ grob property. * Tuning groups of grobs :: * Tuning per grob :: * What to tune?:: +* Font selection:: * Text markup:: @end menu @@ -2642,6 +2705,87 @@ There is also a master list of contexts. Clicking each takes you to an overview of the context, listing which grob types are created there. +@node Font selection +@subsection Font selection + +Most graphics in LilyPond are composed of characters of fonts. You can +alter the characteristics of the font by setting certain grob +properties. The mechanism that is used for this resembles LaTeX's New +Font Selection Scheme. Within this scheme, a font is entirely +characterized by its font name. + +For each grob that uses fonts (in other words, each grob that supports +@code{font-interface}) a font-name must be selected before it can be +printed. The font name is selected by looking at a number of grob +properties: + +@table @code +@item font-family + The general class of the typeface. Supported are roman (Computer +Modern), braces (for piano staff braces), music (the standard music +font), dynamic (font for dynamic signs) and typewriter + +@item font-shape + A symbol indicating the shape of the font, a finer gradation than + font-family. Choices are italic and upright +@item font-series + Symbol indicating the serie of the font. Series form a finer gradation + than font-shape. Choices are medium and bold. + +@item font-relative-size + A number indicating the size relative the standard size. For example, + with 20pt staff height, relative size -1 corresponds to 16pt staff + height, and relative size +1 corresponds to 23 pt staff height. + +@item font-design-size +A number indicating the design size of the font. + +This is a feature of the Computer Modern Font: each point size has a +slightly different design. Smaller design sizes are relatively wider, +which enhances readability. Scalable type faces such TrueType and Adobe +Type1 usually come as ``one design fits all sizes''. + +@item font-name + The name of the font, without the design size, eg. @code{cmr}, +@code{cmti}, etc. Setting this overrides font-family, font-shape and +font-series. + +@end table + +The font is selected by taking the first font that satisfies all +qualifiers specified. You can override any of these fields through +@code{\override} and @code{\revert}. The special value @code{*} matches +any value for that qualifier. + +@example + \property Lyrics.LyricText \override #'font-series = #'bold + \property Lyrics.LyricText \override #'font-shape = #'* +@end example + +@cindex @code{font-style} + +There are also pre-cooked font selection qualifiers. These are selected +through the grob property @code{font-style}. For example, the style +@code{finger} selects family @code{number} and relative size @code{-3}. +Styles available include: volta, finger, tuplet, timesig, mmrest, +script, large, Large and dynamic. + +The style sheets and tables for selecting fonts are located in +@file{scm/font.scm}. Refer to this file for more information. + +@refbugs + +Relative size is not linked to any real size. There is no mechanism to +select magnifications of fonts, meaning that you can not scale fonts +continuoussly. There is no style sheet provided for other fonts besides +the @TeX{} family. + +@cindex font selection +@cindex font magnification +@cindex @code{font-interface} + +@refbugs + @node Text markup @subsection Text markup @@ -2709,7 +2853,7 @@ horizontal mode: set all text on one line (default) @var{fontstyle} may be any of @code{finger volta timesig mmrest mark script large Large dynamic} -[wat is het verschil tussen fontstyle en abbrev?] +[wat is het verschil tussen fontstyle en abbrev? ] It is possible to use @TeX{} commands in the strings, but this should be @@ -2758,7 +2902,7 @@ where each of the items is one of @end example See @file{scm/font.scm} for details of @var{alist}. -@item an \elementdescriptions declaration. + @item an \elementdescriptions declaration. @example \elementdescriptions @var{alist} @end example @@ -3123,7 +3267,7 @@ To use it, you need the following software @itemize @item @uref{ftp://ftp.math.berkeley.edu/pub/Software/TeX/xdvi.tar.gz,plain -Xdvi} version 22.28 or better. +Xdvi} version 22.36 or newer. Note that most @TeX{} distributions ship with xdvik, which is a different and less well maintained program. To find out which xdvi you @@ -3148,29 +3292,30 @@ In the emacs startup file (usually @file{~/.emacs}), add the following If you want emacs to jump to the exact spot (and not just the line) on a click, you must enable column positioning. To do so, you need to patch -emacsclient. Apply @uref{this patch, -http://www.cs.uu.nl/~hanwen/public/software/emacsclient-column} to -@file{emacsclient.c} and @file{server.el} from the emacs source -code. Stick the compiled emacsclient into a bin directory, and put -@file{server.el} into a elisp directory +emacsclient. Apply @file{emacsclient.patch} (included with the source +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, before invoking server-start. +init file, beifore invoking server-start. @example - (setq load-path (cons (concat (getenv "HOME") "/usr/share/emacs") - load-path)) + (setq load-path (cons "~/usr/share/emacs" load-path)) @end example Xdvi must be configured to use the emacs editor. Before starting, set -the environment variable @code{XEDITOR} to @code{emacsclient --no-wait -+%c:%l %f}. Xdvi also must be configured to find the fonts. Refer to the +the environment variable @code{XEDITOR} to +@example +emacsclient --no-wait +%c:%l %f +@end example +Xdvi also must be configured to find the fonts. Refer to the xdvi documentation for more information. -[TODO: is that so?] +When viewing, control-mousebutton 1 will take you to the originating +line and column. Control-mousebutton 2 will show all clickable boxes. -When viewing, control-mousebutton 1 will take you to the correct -line/column. Control-mousebutton 2 will show all clickable boxes. +@refbugs When you convert the TeX file to PostScript using dvips, dvips will complain about not finding @code{src:X:Y} files. Those complaints are diff --git a/lily/font-interface.cc b/lily/font-interface.cc index 3793f54d42..f801cefa01 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -15,6 +15,23 @@ #include "warn.hh" +/* + TODO revise font handling. + + +* relative sizes should relate to staff-space, eg. font-staff-space += 1.2 ^ relative-size + +* If a relative size is given, lily should magnify the closest +design size font to match that. (ie. fonts should have variable +scaling) + +(this requires that fonts are stored as (filename , designsize)) + + + + */ + SCM Font_interface::font_alist_chain (Grob *me) { @@ -113,7 +130,7 @@ so a 14% speedup. */ -static SCM name_sym, shape_sym, family_sym, series_sym, rel_sz_sym, pt_sz_sym, wild_sym; +static SCM name_sym, shape_sym, family_sym, series_sym, rel_sz_sym, design_sz_sym, wild_sym; static void @@ -124,7 +141,7 @@ init_syms () family_sym = scm_permanent_object (ly_symbol2scm ("font-family")); series_sym = scm_permanent_object (ly_symbol2scm ("font-series")); rel_sz_sym = scm_permanent_object (ly_symbol2scm ("font-relative-size")); - pt_sz_sym = scm_permanent_object (ly_symbol2scm ("font-point-size")); + design_sz_sym = scm_permanent_object (ly_symbol2scm ("font-design-size")); wild_sym = scm_permanent_object (ly_symbol2scm ("*")); scm_make_gsubr ("ly-get-default-font", 1 , 0, 0, (Scheme_function_unknown) ly_font_interface_get_default_font); @@ -151,7 +168,7 @@ Font_interface::properties_to_font_name (SCM fonts, SCM alist_chain) SCM series = SCM_BOOL_F; - SCM point_sz = ly_assoc_chain (pt_sz_sym, alist_chain); + SCM point_sz = ly_assoc_chain (design_sz_sym, alist_chain); SCM rel_sz = SCM_BOOL_F; if (!gh_pair_p (name)) diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 283e5aac4d..24a608fa02 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -167,6 +167,8 @@ Tie_engraver::create_grobs () SCM pair = gh_list_ref (head_list, gh_int2scm (i/2)); Spanner * p = new Spanner (basic); + + Tie::set_interface (p); Tie::set_head (p,LEFT, dynamic_cast (unsmob_grob (gh_car (pair)))); Tie::set_head (p,RIGHT, dynamic_cast (unsmob_grob (gh_cdr (pair)))); diff --git a/lily/translator-def.cc b/lily/translator-def.cc index 6150a66d11..aa33ce33fa 100644 --- a/lily/translator-def.cc +++ b/lily/translator-def.cc @@ -181,14 +181,11 @@ Translator_def::path_to_acceptable_translator (SCM type_str, Music_output_def* o Link_array best_result; for (int i=0; i < accepted_arr.size (); i++) { - bool found =false; - if (scm_equal_p (accepted_arr[i]->type_name_, type_str) == SCM_BOOL_T) - found = true; - for (SCM s = accepted_arr[i]->type_aliases_; !found && gh_pair_p (s); s = gh_cdr (s)) - found = found || (gh_equal_p (gh_car (s), type_str)); - - if (found) + /* + don't check aliases, because \context Staff should not create RhythmicStaff. + */ + if (gh_equal_p (accepted_arr[i]->type_name_, type_str)) { best_result.push (accepted_arr[i]); return best_result; diff --git a/scm/font.scm b/scm/font.scm index 59bfb5458d..dc5dfeba9a 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -19,7 +19,7 @@ ((eq? name 'font-shape) 2) ((eq? name 'font-family) 3) ((eq? name 'font-name) 4) - ((eq? name 'font-point-size) 5) + ((eq? name 'font-design-size) 5) (else (ly-warning "unknown font field name")) ) )) @@ -305,7 +305,7 @@ and warn if the selected font is not unique. (define (properties-to-font-name fonts properties-alist-list) (let* ( ;; change order to change priorities of qualifiers. - (q-order '(font-name font-family font-series font-shape font-point-size font-relative-size)) + (q-order '(font-name font-family font-series font-shape font-design-size font-relative-size)) (rawqualifiers (map (lambda (x) (chain-assoc x properties-alist-list)) q-order)) (qualifiers (filter-list pair? rawqualifiers)) diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 3b302aa63d..ab3b20afbc 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -304,6 +304,7 @@ (MultiMeasureRest . ( (spacing-procedure . ,Multi_measure_rest::set_spacing_rods) (molecule-callback . ,Multi_measure_rest::brew_molecule) + (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (staff-position . 0) (expand-limit . 10) (padding . 2.0) ; staffspace @@ -344,14 +345,14 @@ (meta . ,(grob-description "Glissando" line-spanner-interface)) )) - (FollowThread . ( + (VoiceFollower . ( (type . line) (gap . 0.5) (breakable . #t) (X-extent-callback . #f) (Y-extent-callback . #f) (molecule-callback . ,Line_spanner::brew_molecule) - (meta . ,(grob-description "FollowThread" + (meta . ,(grob-description "VoiceFollower" line-spanner-interface)) )) @@ -607,7 +608,7 @@ ;; if you want to set point-size, you cannot set ;; relative-size, as no font will be found for other ;; sheets than 20 - ;;(font-point-size . 20) + ;;(font-design-size . 20) ;;(font-relative-size . #f) (meta . ,(grob-description "SystemStartDelimiter" system-start-delimiter-interface font-interface)) )) diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index c54f6befba..cd2b66ce71 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -136,7 +136,7 @@ procedure is tried.") definition: music roman braces dynamic math ...") (grob-property-description 'font-name symbol? "partial font definition: base name of font file FIXME: should override other partials.") -(grob-property-description 'font-point-size number? "partial font definition: exact font size in points FIXME: should override font-relative-size.") +(grob-property-description 'font-design-size number? "partial font definition: exact font size in points FIXME: should override font-relative-size.") (grob-property-description 'font-relative-size number? "partial font definition: the relative size compared the `normal' size. 0 is style-sheet's normal size, -1 is smaller, +1 is bigger, -1 is smaller.") (grob-property-description 'font-series symbol? "partial font definition: medium, bold.") diff --git a/scm/interface-description.scm b/scm/interface-description.scm index a16c61a49b..3116029953 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -429,7 +429,7 @@ are a party in collision resolution. 'font-interface "Any symbol that is typeset through fixed sets of glyphs (ie. fonts)" '(font-style font-series font-shape font-family font-name -font-point-size font-relative-size) +font-design-size font-relative-size) ) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 36f9573217..aada9feac1 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -691,6 +691,21 @@ if 1: conversions.append (((1,3,138), conv, 'point-and-click argument changed to procedure.')) +if 1: + def conv (str): + str = re.sub ('followThread', 'followVoice', str) + str = re.sub ('FollowThread', 'VoiceFollower', str) + return str + + conversions.append (((1,3,138), conv, 'followThread -> followVoice.')) + +if 1: + def conv (str): + str = re.sub ('font-point-size', 'font-design-size', str) + return str + + conversions.append (((1,3,139), conv, 'font-point-size -> font-design-size.')) + ############################