-pl 3.hwn2,1
+pl 3.jcn1
+ - moved bracket vars to params
+ - reverted broken lilypond-devel
+
+pl 1.uu1
+ - David's patches:
+ * mfplain.mp detection
+ * Graphical_element::common_refpoint() robuster.
+ * fixes for mudela-mode.el
+ - Dirk's patches:
+ * key signature placement,
+ * tied accidentals.
+
+pl 1.hwn2
+ - extra-offset elt property.
+ - junked Chord_tremolo
+
+pl 1.hwn1
+ - changed calling convention for {get,set,remove}_elt_property()
+ - rm'd some mutopia examples.
+
+*******
+pl 0.hwn2,1
- Generic properties and Property_engraver. Moved most of the
properties.
}
-# . ./stepmake/bin/package-zet.sh
-sourcetree=`basename \`pwd\``
-(cd .. ; rm lilypond-devel ; showln -s $sourcetree lilypond-devel)
+. ./stepmake/bin/package-zet.sh
+#urg. LILYPOND_PREFIX, _SOURCEDIR, PATH, *INPUTS all broken
+#sourcetree=`basename \`pwd\``
+#(cd .. ; rm lilypond-devel ; showln -s $sourcetree lilypond-devel)
echo You should add the following to your profile script
Molecule fill (Box b) const;
Molecule filledbox (Box b) const;
Molecule hairpin (Real width, Real height, Real thick, bool decresc, bool continued) const;
- Molecule tuplet_bracket (Real dy, Real dx, Real gap, Real thick,Real interline, Direction dir) const;
+ Molecule tuplet_bracket (Real dy, Real dx, Real gap, Real thick,Real height, Direction dir) const;
Molecule rest (int, bool outside, String) const;
Molecule accordion (SCM arg, Real interline_f) const;
Molecule slur (Array<Offset> controls, Real thick) const;
Molecule text (String style, String text, Paper_def*) const;
Molecule staff_brace (Real dy, int) const;
- Molecule staff_bracket (Real dy) const;
+ Molecule staff_bracket (Real height, Paper_def* paper_l) const;
Molecule volta (Real h, Real w, Real thick, bool vert_start, bool vert_end) const;
Molecule special_time_signature (String, int,int, Paper_def*) const;
Molecule time_signature (int n,int d, Paper_def*) const;
interbeam = (2.0 * \interline + \stafflinethickness - \beam_thickness) / 2.0;
interbeam4 = (3.0 * \interline - \beam_thickness) / 3.0;
+
+
% stems and beams
%
% poor man's array size
% * MEAN : mean centre distance of all notes
% * MEDIAN : mean centre distance weighted per note
%
-% enum Dir_algorithm { DOWN=-1, UP=1, MAJORITY=2, MEAN, MEDIAN };
-%
-DOWN = -1.0;
-UP = 1.0;
-MAJORITY = 2.0;
-MEAN = 3.0;
-MEDIAN = 4.0;
-#'beam_dir_algorithm = #'majority
-#'slope_quantisation = #'normal
+#'slope-quantisation = #'normal
+#'beam-dir-algorithm = #'majority %urg.
%{
selection is used, based on the median center distance.
%}
-% [Ross]: majority
-beam_dir_algorithm = \MAJORITY;
% catch suspect beam slopes, set slope to zero if
% outer stem is lengthened more than
barthick_thin = 1.6*\stafflinethickness;
barthick_score = 1.6*\stafflinethickness;
+bracket_arch_thick = \interline / 3.0;
+bracket_width = 2.0 * \interline;
+bracket_thick = 2.0 * \stafflinethickness;
+bracket_arch_height = 1.5 * \interline;
+bracket_arch_width = \bracket_arch_height;
+bracket_arch_angle = 50.0;
+
tuplet_spanner_gap = 2.0 * \interline;
tuplet_thick = 1.0*\stafflinethickness;
volta_thick = 1.6*\stafflinethickness;
%
%
%
-/half_bracket
+/half_bracket
{
%6
0 0
%5a
- bracket_b bracket_v add bracket_h bracket_t sub bracket_u add
- bracket_alpha bracket_v -0.15 mul bracket_traject
+ arch_thick arch_height add half_height bracket_thick sub arch_width add
+ arch_angle arch_height -0.15 mul bracket_traject
%5b
- 1 bracket_h
- 0 bracket_v 0.5 mul bracket_traject
+ 1 half_height
+ 0 arch_height 0.5 mul bracket_traject
%5c
- 0 bracket_h
+ 0 half_height
%4a
- bracket_b bracket_h bracket_t sub
- 0 bracket_v 0.4 mul bracket_traject
+ arch_thick half_height bracket_thick sub
+ 0 arch_height 0.4 mul bracket_traject
%4b
- bracket_b bracket_v add bracket_h bracket_t sub bracket_u add
- bracket_alpha bracket_v -0.25 mul bracket_traject
+ arch_thick arch_height add half_height bracket_thick sub arch_width add
+ arch_angle arch_height -0.25 mul bracket_traject
%4c
- bracket_b bracket_v add bracket_h bracket_t sub bracket_u add
+ arch_thick arch_height add half_height bracket_thick sub arch_width add
%3
- bracket_b bracket_h bracket_t sub
+ arch_thick half_height bracket_thick sub
%2
- bracket_b 0
+ arch_thick 0
%1
0 0
} bind def
grestore
} bind def
%
-/draw_bracket % height
+/draw_bracket % arch_angle arch_width arch_height bracket_width bracket_height arch_thick bracket_thick
{
- 2 div bracket_b add /bracket_h exch def
- bracket_t setlinewidth
+ % urg
+ /bracket_thick exch def
+ /arch_thick exch def
+ /bracket_height exch def
+ /bracket_width exch def
+ /arch_height exch def
+ /arch_width exch def
+ /arch_angle exch def
+%
+ bracket_height 2 div arch_thick add /half_height exch def
% urg: the only Level-2 PS, check effect in print
% true setstrokeadjust
1 setlinecap
(define space-alist
'(
- (("" "Clef_item") . (minimum_space 1.0))
- (("" "Staff_bar") . (minimum_space 0.0))
- (("" "Clef_item") . (minimum_space 1.0))
- (("" "Key_item") . (minimum_space 0.5))
- (("" "Span_bar") . (extra_space 0.0))
- (("" "Time_signature") . (extra_space 0.0))
- (("" "begin-of-note") . (minimum_space 1.5))
- (("Clef_item" "Key_item") . (minimum_space 4.0))
- (("Key_item" "Time_signature") . (extra_space 1.0))
- (("Clef_item" "Time_signature") . (minimum_space 3.5))
- (("Staff_bar" "Clef_item") . (minimum_space 1.0))
- (("Clef_item" "Staff_bar") . (minimum_space 3.7))
- (("Time_signature" "Staff_bar") . (minimum_space 2.0))
- (("Key_item" "Staff_bar") . (extra_space 1.0))
- (("Span_bar" "Clef_item") . (extra_space 1.0))
- (("Clef_item" "Span_bar") . (minimum_space 3.7))
- (("Time_signature" "Span_bar") . (minimum_space 2.0))
- (("Key_item" "Span_bar") . (minimum_space 2.5))
- (("Staff_bar" "Time_signature") . (minimum_space 1.5)) ;double check this.
- (("Time_signature" "begin-of-note") . (extra_space 2.0)) ;double check this.
- (("Key_item" "begin-of-note") . (extra_space 2.5))
- (("Staff_bar" "begin-of-note") . (extra_space 1.0))
- (("Clef_item" "begin-of-note") . (minimum_space 5.0))
- (("" "Breathing_sign") . (minimum_space 0.0))
- (("Breathing_sign" "Key_item") . (minimum_space 1.5))
- (("Breathing_sign" "begin-of-note") . (minimum_space 1.0))
- (("Breathing_sign" "Staff_bar") . (minimum_space 1.5))
- (("Breathing_sign" "Clef_item") . (minimum_space 2.0))
+ (("" "Clef_item") . (minimum-space 1.0))
+ (("" "Staff_bar") . (minimum-space 0.0))
+ (("" "Clef_item") . (minimum-space 1.0))
+ (("" "Key_item") . (minimum-space 0.5))
+ (("" "Span_bar") . (extra-space 0.0))
+ (("" "Time_signature") . (extra-space 0.0))
+ (("" "begin-of-note") . (minimum-space 1.5))
+ (("Clef_item" "Key_item") . (minimum-space 4.0))
+ (("Key_item" "Time_signature") . (extra-space 1.0))
+ (("Clef_item" "Time_signature") . (minimum-space 3.5))
+ (("Staff_bar" "Clef_item") . (minimum-space 1.0))
+ (("Clef_item" "Staff_bar") . (minimum-space 3.7))
+ (("Time_signature" "Staff_bar") . (minimum-space 2.0))
+ (("Key_item" "Staff_bar") . (extra-space 1.0))
+ (("Span_bar" "Clef_item") . (extra-space 1.0))
+ (("Clef_item" "Span_bar") . (minimum-space 3.7))
+ (("Time_signature" "Span_bar") . (minimum-space 2.0))
+ (("Key_item" "Span_bar") . (minimum-space 2.5))
+ (("Staff_bar" "Time_signature") . (minimum-space 1.5)) ;double check this.
+ (("Time_signature" "begin-of-note") . (extra-space 2.0)) ;double check this.
+ (("Key_item" "begin-of-note") . (extra-space 2.5))
+ (("Staff_bar" "begin-of-note") . (extra-space 1.0))
+ (("Clef_item" "begin-of-note") . (minimum-space 5.0))
+ (("" "Breathing_sign") . (minimum-space 0.0))
+ (("Breathing_sign" "Key_item") . (minimum-space 1.5))
+ (("Breathing_sign" "begin-of-note") . (minimum-space 1.0))
+ (("Breathing_sign" "Staff_bar") . (minimum-space 1.5))
+ (("Breathing_sign" "Clef_item") . (minimum-space 2.0))
)
)
(if entry
(cdr entry)
(begin (ly-warn (string-append "Unknown spacing pair `" this "', `" next "'"))
- '(minimum_space 0.0)))))
+ '(minimum-space 0.0)))))
(define (beam width slope thick)
(embedded-ps ((ps-scm 'beam) width slope thick)))
- (define (bracket h)
- (embedded-ps ((ps-scm 'bracket) h)))
+ (define (bracket arch_angle arch_width arch_height width height arch_thick thick)
+ (embedded-ps ((ps-scm 'bracket) arch_angle arch_width arch_height width height arch_thick thick)))
(define (dashed-slur thick dash l)
(embedded-ps ((ps-scm 'dashed-slur) thick dash l)))
(regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post)
s))
-
(define (lily-def key val)
(string-append
"\\def\\"
(string-append
(numbers->string (list width slope thick)) " draw_beam" ))
- (define (bracket h)
- (invoke-dim1 " draw_bracket" h))
+ (define (bracket arch_angle arch_width arch_height width height arch_thick thick)
+ (string-append
+ (numbers->string (list arch_angle arch_width arch_height width height arch_thick thick)) " draw_bracket" ))
(define (char i)
(invoke-char " show" i))
# and create links to here, if necessary
#
sourcetree=`basename \`pwd\``
-(cd ..; rm -f $package 2>&1 > /dev/null)
-(cd ..; ln -s $sourcetree $package)
+if [ "xsourcetree" != "x$package" ]; then
+ (cd ..; rm -f $package 2>&1 > /dev/null)
+ (cd ..; ln -s $sourcetree $package)
+fi
#
if [ ! -r $sources ]; then
(cd ..; ln -s `pwd` $sources)
% note the ! sign. See dvips.info for details.
%
-% ARG. Fix brackets
\def\turnOnPostScript{%
% This sets CTM so that you get to the currentpoint
% by executing a 0 0 moveto
\def\embeddedps##1{%
\special{ps: @beginspecial @setspecial ##1 @endspecial}
}
- %
- \special{!
-/stafflinethickness \mudelapaperstafflinethickness\space def
-/interline \mudelapaperinterline\space def
-interline 3 div /bracket_b exch def
-interline 2 mul /bracket_w exch def
-stafflinethickness 2 mul /bracket_t exch def
-interline 1.5 mul /bracket_v exch def
-bracket_v /bracket_u exch def
-50 /bracket_alpha exch def
-1 setlinecap}
}
\def\turnOnExperimentalFeatures{}
projects / lilypond.git / commitdiff