From 24c7d404da8d79032e767c8441b6f0329d87eb56 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 13 Feb 2004 18:31:00 +0000 Subject: [PATCH] * mf/feta-bolletjes.mf (overdone_heads): make note heads more elliptical, to 1.49. * input/GNUmakefile (SUBDIRS): remove ascii-art --- ChangeLog | 5 + mf/feta-bolletjes.mf | 4 +- scm/define-grobs.scm | 2 +- scm/define-music-properties.scm | 156 ++++++++++++++++---------------- scm/document-backend.scm | 18 ++-- scm/document-translation.scm | 24 ++--- 6 files changed, 108 insertions(+), 101 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83766b2b40..5bdb4069bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-02-13 Han-Wen Nienhuys + * mf/feta-bolletjes.mf (overdone_heads): make note heads more + elliptical, to 1.49. + * lily/rest.cc (polyphonic_offset_callback): new function. Do vertical positioning for polyphony, without RestCollision object. @@ -14,6 +17,8 @@ * lily/simple-spacer.cc (solve): cleanup: remove code for linelen < 0 case. + * VERSION: 2.1.22 released + * input/GNUmakefile (SUBDIRS): remove ascii-art 2004-02-13 Jan Nieuwenhuizen diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf index 9cef053267..69f8977f19 100644 --- a/mf/feta-bolletjes.mf +++ b/mf/feta-bolletjes.mf @@ -180,8 +180,8 @@ fet_endchar; fet_beginchar("Quart notehead", "2", "quarthead") - % used to have 32. With 30, they are slightly bolder. - draw_outside_ellipse (1.42 - puff_up_factor / 3.0, 30, 0.707, 0); + % used to have 32. With 31, they are slightly bolder. + draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31, 0.707, 0); black_notehead_width# := charwd; fet_endchar; diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 9c141f4d1b..4cd43d3de9 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1194,7 +1194,7 @@ (TupletBracket . ( - (gap . 1.0) + (gap . 1.5) (padding . 1.1) (thickness . 1.6) (edge-height . (0.7 . 0.7)) diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm index a849eb37a6..928c6a6e76 100644 --- a/scm/define-music-properties.scm +++ b/scm/define-music-properties.scm @@ -6,107 +6,109 @@ ;;;; Jan Nieuwenhuizen -(define-public all-music-properties '()) (define (music-property-description symbol type? description) - (if (not (equal? #f (object-property symbol 'music-doc))) + (if (not (equal? #f (object-property symbol 'music-doc))) (begin (ly:warn (string-append "Redefining " (symbol->string symbol) "\n")) (exit 2) - )) - (set-object-property! symbol 'music-type? type?) - (set-object-property! symbol 'music-doc description) - (set! all-music-properties (cons symbol all-music-properties)) - ) + )) + (set-object-property! symbol 'music-type? type?) + (set-object-property! symbol 'music-doc description) + symbol ) - -(music-property-description 'iterator-ctor procedure? "Function to construct music-event-iterator object for this Music") -(music-property-description 'duration ly:duration? "Duration of this note/lyric.") -(music-property-description 'metronome-count number? "How many beats in a minute?") -(music-property-description 'span-type string? "What kind of spanner should be created? +(define-public all-music-properties + (map + (lambda (x) (apply music-property-description x)) + `( + (iterator-ctor ,procedure? "Function to construct music-event-iterator object for this Music") + (duration ,ly:duration? "Duration of this note/lyric.") + (metronome-count ,number? "How many beats in a minute?") + (span-type ,string? "What kind of spanner should be created? TODO: consider making type into symbol") -(music-property-description 'absolute-octave integer? - "The absolute octave for a octave check note.") -(music-property-description 'articulations music-list? - "Articulation events specifically for this note.") -(music-property-description 'articulation-type string? "key for script definitions alist. + (absolute-octave integer? + "The absolute octave for a octave check note.") + (articulations music-list? + "Articulation events specifically for this note.") + (articulation-type ,string? "key for script definitions alist. TODO: consider making type into symbol ") -(music-property-description 'associated-context string? "Name of the Voice context associated with this \\newaddlyrics section") -(music-property-description 'bass boolean? "Set if this note is a bass note in a chord") -(music-property-description 'cautionary boolean? "If set, this alteration needs cautionary accidental") -(music-property-description 'change-to-id string? "name of the context to change to ") -(music-property-description 'change-to-type symbol? "type of the context to change to.") -(music-property-description 'compress-procedure procedure? "compress this music expression. Argument 1: the music, arg 2: factor") -(music-property-description 'context-id string? "name of context") -(music-property-description 'context-type symbol? "type of context") -(music-property-description 'denominator integer? "denominator in a time signature") -(music-property-description 'digit integer? "digit for fingering") -(music-property-description 'direction ly:dir? "Print this up or down?") -(music-property-description 'drum-type symbol? "Which percussion instrument to play this note on.") + (associated-context ,string? "Name of the Voice context associated with this \\newaddlyrics section") + (bass ,boolean? "Set if this note is a bass note in a chord") + (cautionary ,boolean? "If set, this alteration needs cautionary accidental") + (change-to-id ,string? "name of the context to change to ") + (change-to-type ,symbol? "type of the context to change to.") + (compress-procedure ,procedure? "compress this music expression. Argument 1: the music, arg 2: factor") + (context-id ,string? "name of context") + (context-type ,symbol? "type of context") + (denominator ,integer? "denominator in a time signature") + (digit ,integer? "digit for fingering") + (direction ,ly:dir? "Print this up or down?") + (drum-type ,symbol? "Which percussion instrument to play this note on.") -(music-property-description 'tags list? "List of symbols that for denoting extra details, + (tags ,list? "List of symbols that for denoting extra details, eg. @code{\\tag #'part ...} could tag a piece of music as only being active in a part.") -(music-property-description 'text-type symbol? "Particular type of text script (eg. finger, dynamic).") -(music-property-description 'tempo-unit ly:duration? "The unit for the metronome count.") -(music-property-description 'tonic ly:pitch? "Base of the scale") -(music-property-description 'element ly:music? "The single child of a Music_wrapper music object, or the body of a repeat.") -(music-property-description 'elements music-list? "A list of elements for sequential of simultaneous music, or the alternatives of repeated music. ") -(music-property-description 'force-accidental boolean? "If set, a cautionary accidental should always be printed on this note") -(music-property-description 'grob-property symbol? "The symbol of the grob property to set. ") -(music-property-description 'grob-value scheme? "The value of the grob property to set") -(music-property-description 'inversion boolean? "If set, this chord note is inverted.") -(music-property-description 'label markup? "label of a mark.") -(music-property-description 'last-pitch ly:pitch? "The last pitch after relativization.") -(music-property-description 'length procedure? "How to compute the duration of this music") -(music-property-description 'internal-class-name string? "C++ class to use for this Music object") -(music-property-description 'name symbol? "Name of this music object") -(music-property-description 'numerator integer? "numerator of a time signature") -(music-property-description 'once boolean? "Apply this operation only during one time step?") -(music-property-description 'octavation integer? - "This pitch was octavated by how many octaves? + (text-type ,symbol? "Particular type of text script (eg. finger, dynamic).") + (tempo-unit ,ly:duration? "The unit for the metronome count.") + (tonic ,ly:pitch? "Base of the scale") + (element ,ly:music? "The single child of a Music_wrapper music object, or the body of a repeat.") + (elements ,music-list? "A list of elements for sequential of simultaneous music, or the alternatives of repeated music. ") + (force-accidental ,boolean? "If set, a cautionary accidental should always be printed on this note") + (grob-property ,symbol? "The symbol of the grob property to set. ") + (grob-value ,scheme? "The value of the grob property to set") + (inversion ,boolean? "If set, this chord note is inverted.") + (label ,markup? "label of a mark.") + (last-pitch ,ly:pitch? "The last pitch after relativization.") + (length ,procedure? "How to compute the duration of this music") + (internal-class-name ,string? "C++ class to use for this Music object") + (name ,symbol? "Name of this music object") + (numerator ,integer? "numerator of a time signature") + (once ,boolean? "Apply this operation only during one time step?") + (octavation integer? + "This pitch was octavated by how many octaves? For chord inversions, this is negative.") -(music-property-description 'origin ly:input-location? "where was this piece of music defined?") -(music-property-description 'penalty number? "Penalty for break hint.") -(music-property-description 'pitch ly:pitch? "the pitch of this note") -(music-property-description 'pitch-alist list? "list of pitches jointly forming the scale of a key signature") -(music-property-description 'pop-first boolean? "Do a revert before we try to do a override on some grob property.") -(music-property-description 'procedure procedure? - "The function to run with \\applycontext. It must take a single argument, being the context.") -(music-property-description 'property-operations list? - "Do these operations for instantiating the context.") -(music-property-description 'predicate procedure? "the predicate of a \\outputproperty") -(music-property-description 'type symbol? "The type of this music object. Determines iteration in some cases.") -(music-property-description 'types list? "The types of this music + (origin ,ly:input-location? "where was this piece of music defined?") + (penalty ,number? "Penalty for break hint.") + (pitch ,ly:pitch? "the pitch of this note") + (pitch-alist ,list? "list of pitches jointly forming the scale of a key signature") + (pop-first ,boolean? "Do a revert before we try to do a override on some grob property.") + (procedure procedure? + "The function to run with \\applycontext. It must take a single argument, being the context.") + (property-operations list? + "Do these operations for instantiating the context.") + (predicate ,procedure? "the predicate of a \\outputproperty") + (type ,symbol? "The type of this music object. Determines iteration in some cases.") + (types ,list? "The types of this music object; determines by what engraver this music expression is processed.") -(music-property-description 'repeat-count integer? "do a @code{\repeat} how ofen?") -(music-property-description 'span-direction ly:dir? "Does this start or stop a spanner?") -(music-property-description 'split-list list? "splitting moments for part combiner.") + (repeat-count ,integer? "do a @code{\repeat} how ofen?") + (span-direction ,ly:dir? "Does this start or stop a spanner?") + (split-list ,list? "splitting moments for part combiner.") -(music-property-description 'start-moment-function procedure? "Function to compute the negative length of + (start-moment-function ,procedure? "Function to compute the negative length of starting grace notes.") -(music-property-description 'string-number integer? "The number of the string in a String_number_req") -(music-property-description 'symbol symbol? "Grob name to perform an override/revert on.") -(music-property-description 'text markup? "markup expression to be printed") -;; markup? -(music-property-description 'tremolo-type integer? "") -(music-property-description 'value scheme? "Assignment value for a + (string-number ,integer? "The number of the string in a String_number_req") + (symbol ,symbol? "Grob name to perform an override/revert on.") + (text ,markup? "markup expression to be printed") + ;; markup? + (tremolo-type ,integer? "") + (value ,scheme? "Assignment value for a translation property") -(music-property-description 'what symbol? "What to change for auto-change. FIXME, naming") -(music-property-description 'part-combine-status symbol? - "Change to what kind of state? Options are + (what ,symbol? "What to change for auto-change. FIXME, naming") + (part-combine-status symbol? + "Change to what kind of state? Options are solo1, solo2 and unisono") -(music-property-description 'figure string? "a `figure' (which may be + (figure ,string? "a `figure' (which may be a string) for figured bass") -(music-property-description 'alteration number? "alteration for figured bass") -(music-property-description 'bracket-start boolean? "start a bracket + (alteration ,number? "alteration for figured bass") + (bracket-start ,boolean? "start a bracket here. TODO: use span requests?") -(music-property-description 'bracket-stop boolean? "stop a bracket here.") + (bracket-stop ,boolean? "stop a bracket here.") + ))) diff --git a/scm/document-backend.scm b/scm/document-backend.scm index 12432f1422..35fdfcd2cb 100644 --- a/scm/document-backend.scm +++ b/scm/document-backend.scm @@ -181,12 +181,6 @@ node." ) texi)) -(define (all-backend-properties-doc) - (make - #:name "All backend properties" - #:desc "All grob properties in a big list" - #:text (backend-properties-doc-string all-backend-properties))) - ;(dump-node (grob-doc (cdadr all-grob-descriptions)) (current-output-port) 0 ) (define (backend-doc-node) @@ -197,6 +191,12 @@ node." (list (all-grobs-doc) (all-interfaces-doc) - (all-backend-properties-doc) - ) - )) + (make + #:name "User backend properties" + #:desc "All tunable properties in a big list" + #:text (backend-properties-doc-string all-internal-grob-properties)) + (make + #:name "Internal backend properties" + #:desc "All internal layout properties in a big list" + #:text (backend-properties-doc-string all-user-grob-properties)) + ))) diff --git a/scm/document-translation.scm b/scm/document-translation.scm index d0de542f8d..e7e8cdd5d3 100644 --- a/scm/document-translation.scm +++ b/scm/document-translation.scm @@ -286,15 +286,6 @@ texi )) -(define (all-translation-properties-doc) - (make - #:name "Context properties" - #:desc "All context properties" - #:text (translation-properties-doc-string all-translation-properties)) - ) - - -;(dump-node (all-contexts-doc) (current-output-port) 0 ) (define (translation-doc-node) (make @@ -304,6 +295,15 @@ (list (all-contexts-doc) (all-engravers-doc) - (all-translation-properties-doc) - ) - )) + (make + #:name "Tunable context properties" + #:desc "All tunable context properties" + #:text (translation-properties-doc-string + all-user-translation-properties)) + + (make + #:name "Internal context properties" + #:desc "All internal context properties" + #:text (translation-properties-doc-string + all-internal-translation-properties)) + ) ) ) -- 2.39.2