From: fred Date: Tue, 26 Mar 2002 21:28:29 +0000 (+0000) Subject: lilypond-1.1.1 X-Git-Tag: release/1.5.59~2808 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=30a53fe4737ba071a9f3c31faa8f6f7d85fe3a51;p=lilypond.git lilypond-1.1.1 --- diff --git a/BUGS b/BUGS index 054d425246..1651e800d6 100644 --- a/BUGS +++ b/BUGS @@ -9,6 +9,12 @@ Compiling with -O2 -finline-functions will cause crashes during 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 diff --git a/init/scm.ly b/init/scm.ly index bd27dec6f4..f576ea8875 100644 --- a/init/scm.ly +++ b/init/scm.ly @@ -44,6 +44,23 @@ (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)) @@ -159,12 +176,12 @@ (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) @@ -257,10 +274,32 @@ \"\\\\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) @@ -324,6 +363,14 @@ (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\") diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index 6b7047651d..1781679920 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -34,7 +34,7 @@ public: 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 controls, Real thick, Real dash) const; Atom dots () const; @@ -44,7 +44,6 @@ public: 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; @@ -54,8 +53,8 @@ public: Atom text (String style, String text) const; Atom vbrace (Real &dy) const; Atom vbracket (Real &dy) const; - Atom special_time_signature (String, Array) const; - Atom time_signature (Array) const; + Atom special_time_signature (String, Array) const; + Atom time_signature (Array) const; Paper_def * paper_l_; Symtables *symtables_p_; diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh index ed079a29ff..55c8133d38 100644 --- a/lily/include/time-signature.hh +++ b/lily/include/time-signature.hh @@ -6,9 +6,10 @@ #ifndef METER_HH #define METER_HH + #include "item.hh" #include "array.hh" -#include "scalar.hh" +#include "real.hh" /** Print a time_signature sign. @@ -25,7 +26,7 @@ protected: virtual Molecule*brew_molecule_p() const; public: Time_signature () ; - Array args_; + Array args_; String time_sig_type_str_; DECLARE_MY_RUNTIME_TYPEINFO; diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 5ce8b04cd9..85abdd931b 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -57,7 +57,7 @@ Paper_def::get_var (String s) const { 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")); @@ -247,10 +247,10 @@ output_header (Paper_outputter* p, Scope *head) for (Dictionary_iter 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); } } @@ -260,7 +260,7 @@ Paper_def::output_settings (Paper_outputter* p) const { for (Dictionary_iter 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* diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 7e18f0e05d..edee3d9fbe 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -26,13 +26,13 @@ Time_signature::brew_molecule_p () const { if (time_sig_type_str_[0]=='1') { - Array tmparr=args_; - tmparr[1]=Scalar(0); + Array 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 diff --git a/tex/lilyponddefs.ps b/tex/lilyponddefs.ps index 467dc4589a..07e3845d15 100644 --- a/tex/lilyponddefs.ps +++ b/tex/lilyponddefs.ps @@ -22,7 +22,7 @@ grestore } bind def -/settext +/settext % '(' text ')' { gsave % urg @@ -31,6 +31,24 @@ 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 @@ -125,7 +143,7 @@ grestore } bind def -/draw_beam +/draw_beam % width slope thick { 2 div /beam_thick exch def /beam_slope exch def