parsing stage.
+[Linux ppc, egcs-1.0.2]
+
+All compiling with -O2 is suspect, in particular guile-1.3, and
+Lily herself will break.
+
+
[All platforms]
When dealing with beaming that is not correct (eg quarter notes in
(eval-string (string-append s \"-\" o)))
;;; output definitions
+
+(define
+ (beam o width slope thick)
+ ((invoke-output o \"beam\") width slope thick))
+
+(define
+ (beam-ps width slope thick)
+ (string-append
+ (numbers->string (list width slope thick)) \" draw_beam \" ))
+
+(define
+ (beam-tex width slope thick)
+ (string-append
+ \"\\\\embeddedps{\"
+ (beam-ps width slope thick)
+ \"}\"))
+
(define
(char o n)
((invoke-output o \"char\") n))
(define
(generalmeter-ps num den)
- (string-append num \" \" den \" generalmeter \"))
+ (string-append (number->string (inexact->exact num)) \" \" (number->string (inexact->exact den)) \" generalmeter \"))
(define
(generalmeter-tex num den)
(string-append
- \"\\\\generalmeter{\" num \"}{\" den \"}\"))
+ \"\\\\generalmeter{\" (number->string (inexact->exact num)) \"}{\" (number->string (inexact->exact den)) \"}\"))
(define
(header o creator generate)
\"\\\\rulesym{\" (number->dim-tex x) \"}{\" (number->dim-tex y) \"}\"))
(define
- (setitalic o s) (empty o))
+ (setbold o s)
+ ((invoke-output o \"text\") \"bold\" s))
+
+(define
+ (setfinger o s)
+ ((invoke-output o \"text\") \"finger\" s))
(define
- (settext o s) (empty o))
+ (sethuge o s)
+ ((invoke-output o \"text\") \"huge\" s))
+
+(define
+ (setitalic o s)
+ ((invoke-output o \"text\") \"italic\" s))
+
+(define
+ (setlarge o s)
+ ((invoke-output o \"text\") \"large\" s))
+
+(define
+ (setLarge o s)
+ ((invoke-output o \"text\") \"Large\" s))
+
+(define
+ (settext o s)
+ ((invoke-output o \"text\") \"text\" s))
(define
(slur o l)
(stop-line-tex)
\"}\\\\interscoreline\")
+(define
+ (text-ps f s)
+ (string-append \"(\" s \") set\" f \" \"))
+
+(define
+ (text-tex f s)
+ (string-append \"\\\\set\" f \"{\" s \"}\"))
+
(define
(urg-fix-font-ps)
\"/fontA { /feta20 findfont 12 scalefont setfont} bind def fontA\n\")
Atom afm_find (String) const;
Atom ball (int) const;
Atom bar (String, Real height) const;
- Atom beam (Real,Real, Real) const;
+ Atom beam (Real, Real, Real) const;
Atom clef (String) const;
Atom dashed_slur (Array<Offset> controls, Real thick, Real dash) const;
Atom dots () const;
Atom hairpin (Real width, bool decresc, bool continued) const;
Atom plet (Real dy, Real dx, Direction dir) const;
void print () const;
- Atom ps_beam (Real slope, Real width, Real thick) const;
Atom rest (int, bool outside) const;
Atom rule_symbol (Real height, Real width) const;
Atom script (String idx) const;
Atom text (String style, String text) const;
Atom vbrace (Real &dy) const;
Atom vbracket (Real &dy) const;
- Atom special_time_signature (String, Array<Scalar>) const;
- Atom time_signature (Array<Scalar>) const;
+ Atom special_time_signature (String, Array<Real>) const;
+ Atom time_signature (Array<Real>) const;
Paper_def * paper_l_;
Symtables *symtables_p_;
#ifndef METER_HH
#define METER_HH
+
#include "item.hh"
#include "array.hh"
-#include "scalar.hh"
+#include "real.hh"
/**
Print a time_signature sign.
virtual Molecule*brew_molecule_p() const;
public:
Time_signature () ;
- Array<Scalar> args_;
+ Array<Real> args_;
String time_sig_type_str_;
DECLARE_MY_RUNTIME_TYPEINFO;
{
if (!scope_p_->elem_b (s))
error (_f ("unknown paper variable: `%s\'", s));
- Real * p = scope_p_->elem (s)->access_Real (false);
+ Real * p = scope_p_->elem (s)->access_content_Real (false);
if (!p)
{
error (_ ("not a real variable"));
for (Dictionary_iter<Identifier*> i (*head); i.ok (); i++)
{
- if (!i.val ()->access_String_identifier ())
+ if (!i.val ()->access_content_String (false))
continue;
- String val = *i.val()->access_String_identifier ()->data_p_;
+ String val = *i.val()->access_content_String (false);
output_def (p, i.key (), val);
}
}
{
for (Dictionary_iter<Identifier*> i (*scope_p_); i.ok (); i++)
output_def (p, String ("mudelapaper") + i.key (), i.val ()->str ());
- p->output_string (*scope_p_->elem (String (output_global_ch) + "setting")->access_String ());
+ p->output_string (*scope_p_->elem (String (output_global_ch) + "setting")->access_content_String (false));
}
Paper_outputter*
{
if (time_sig_type_str_[0]=='1')
{
- Array<Scalar> tmparr=args_;
- tmparr[1]=Scalar(0);
+ Array<Real> tmparr = args_;
+ tmparr[1]= 0;
s = lookup_l ()->time_signature (tmparr);
}
else
{
- s = lookup_l ()-> special_time_signature (time_sig_type_str_,args_);
+ s = lookup_l ()-> special_time_signature (time_sig_type_str_ ,args_);
}
}
else
grestore
} bind def
-/settext
+/settext % '(' text ')'
{
gsave
% urg
grestore
} bind def
+/setfinger % '(' text ')'
+{
+ gsave
+ % urg
+ /feta-nummer5 findfont 12 scalefont setfont
+ show
+ grestore
+} bind def
+
+/setitalic % '(' text ')'
+{
+ gsave
+ % urg
+ /Times-Italic findfont 12 scalefont setfont
+ show
+ grestore
+} bind def
+
/vrule % width height depth
{
gsave
grestore
} bind def
-/draw_beam
+/draw_beam % width slope thick
{
2 div /beam_thick exch def
/beam_slope exch def