[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Lily 1.3.126
From: |
Mats Bengtsson |
Subject: |
Re: Lily 1.3.126 |
Date: |
Sun, 28 Jan 2001 20:25:59 +0100 |
Here's a patch for 1.3.126.
/Mats
Generated by (address unknown),
>From = lilypond-1.3.126, To = lilypond-1.3.126.mb1
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.126.mb1.diff
Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
diff -urN ../lilypond-1.3.126/CHANGES ./CHANGES
--- ../lilypond-1.3.126/CHANGES Sun Jan 28 15:19:53 2001
+++ ./CHANGES Sun Jan 28 20:20:25 2001
@@ -1,3 +1,10 @@
+1.3.126.mb1
+=======
+* ly2dvi: bugfix --number.
+ Added header field latexpackages, see input/test/orchestscore.ly
+
+* \mark: add possibility to use font selection markup, see input/test/mark.ly
+
1.3.126
=======
* Doco:
diff -urN ../lilypond-1.3.126/VERSION ./VERSION
--- ../lilypond-1.3.126/VERSION Sun Jan 28 15:38:23 2001
+++ ./VERSION Sun Jan 28 18:43:11 2001
@@ -2,7 +2,7 @@
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=126
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
diff -urN ../lilypond-1.3.126/input/test/mark.ly ./input/test/mark.ly
--- ../lilypond-1.3.126/input/test/mark.ly Sun Dec 17 18:54:32 2000
+++ ./input/test/mark.ly Sun Jan 28 20:18:04 2001
@@ -4,12 +4,14 @@
s1 | \mark "A";
s1 | \mark ;
s1 | \mark "12";
+ s1 | \mark ;
s1 | \mark "A2";
+ s1 | \mark #'(music "scripts-segno") ;
s1
}
one = \notes \relative c {
- c''1 c c c c
+ c''1 c c c c c c
}
diff -urN ../lilypond-1.3.126/input/test/orchestscore.ly
./input/test/orchestscore.ly
--- ../lilypond-1.3.126/input/test/orchestscore.ly Fri Jan 26 16:56:27 2001
+++ ./input/test/orchestscore.ly Sun Jan 28 18:51:04 2001
@@ -1,4 +1,8 @@
-\version "1.3.120";
+\header{
+ latexpackages="graphicx";
+}
+
+\version "1.3.126";
m = \notes \relative c''{
@@ -13,7 +17,7 @@
\score{ <
\context StaffGroup = wood <
\context Staff = flauto <
- \property Staff.instrument = "Flauto"
+ \property Staff.instrument = "\\rotatebox[origin=c]{90}{Flauto}"
\property Staff.instr = "Fl."
\m
>
@@ -97,7 +101,7 @@
\OrchestralScoreContext
skipBars = ##t
markScriptPadding = #4.0
- BarNumber \override $'padding = #3
+ BarNumber \override #'padding = #3
RestCollision \override #'maximum-rest-count = #1
marginScriptHorizontalAlignment = #1
}
diff -urN ../lilypond-1.3.126/lily/mark-engraver.cc ./lily/mark-engraver.cc
--- ../lilypond-1.3.126/lily/mark-engraver.cc Thu Nov 30 15:28:05 2000
+++ ./lily/mark-engraver.cc Sun Jan 28 20:14:52 2001
@@ -149,51 +149,56 @@
*/
SCM m = mark_req_l_->get_mus_property ("label");
- if (!gh_string_p (m))
- m = get_property ("rehearsalMark");
-;
-
- if (gh_number_p (m))
+ if (gh_pair_p (m)) // markup text
+ text_p_->set_grob_property ("text",m);
+ else
{
- int mark_count = gh_scm2int (m);
- t = to_str (mark_count);
- mark_count ++;
- m = gh_int2scm (mark_count);
- }
- else if (gh_string_p (m))
- {
- t = ly_scm2string (m);
- String next;
- if (t.length_i ())
+ if (!gh_string_p (m))
+ m = get_property ("rehearsalMark");
+ ;
+
+ if (gh_number_p (m))
{
- char c = t[0];
- c++;
- next = to_str (c);
+ int mark_count = gh_scm2int (m);
+ t = to_str (mark_count);
+ mark_count ++;
+ m = gh_int2scm (mark_count);
+ }
+ else if (gh_string_p (m))
+ {
+ t = ly_scm2string (m);
+ String next;
+ if (t.length_i ())
+ {
+ char c = t[0];
+ c++;
+ next = to_str (c);
+ }
+ m = ly_str02scm (next.ch_C());
+ }
+ else
+ {
+ m = gh_int2scm (1);
}
- m = ly_str02scm (next.ch_C());
- }
- else
- {
- m = gh_int2scm (1);
- }
- daddy_trans_l_->set_property ("rehearsalMark", m);
-
-
- text_p_->set_grob_property ("text",
- ly_str02scm ( t.ch_C()));
+ daddy_trans_l_->set_property ("rehearsalMark", m);
+
+ text_p_->set_grob_property ("text",
+ ly_str02scm ( t.ch_C()));
- String style = "mark";
- for (int i=0; i < t.length_i(); i++)
- {
- if (!isdigit(t[i]))
+ String style = "mark";
+ for (int i=0; i < t.length_i(); i++)
{
- style = "large";
- break;
+ if (!isdigit(t[i]))
+ {
+ style = "large";
+ break;
+ }
}
+ SCM st = ly_symbol2scm (style.ch_C());
+ text_p_->set_grob_property ("font-style", st);
}
- SCM st = ly_symbol2scm (style.ch_C());
- text_p_->set_grob_property ("font-style", st);
+
}
}
diff -urN ../lilypond-1.3.126/lily/parser.yy ./lily/parser.yy
--- ../lilypond-1.3.126/lily/parser.yy Sun Jan 21 23:22:26 2001
+++ ./lily/parser.yy Sun Jan 28 18:56:11 2001
@@ -1149,16 +1149,11 @@
Mark_req * m = new Mark_req;
$$ = m;
}
- | MARK STRING {
+ | MARK scalar {
Mark_req *m = new Mark_req;
m->set_mus_property ("label", $2);
$$ = m;
- }
- | MARK bare_unsigned {
- Mark_req *m = new Mark_req;
- m->set_mus_property ("label", gh_int2scm ($2));
- $$ = m;
}
| PENALTY bare_int {
Break_req * b = new Break_req;
diff -urN ../lilypond-1.3.126/scripts/ly2dvi.py ./scripts/ly2dvi.py
--- ../lilypond-1.3.126/scripts/ly2dvi.py Fri Jan 26 16:56:28 2001
+++ ./scripts/ly2dvi.py Sun Jan 28 18:40:40 2001
@@ -7,7 +7,7 @@
# * (c) on page 1
# * more helpful info on lily crashes
# * Should use files in /tmp/ only. This potentially messes with
-# usergenerated files in the CWD
+# user generated files in the CWD
"""
@@ -25,8 +25,6 @@
name = 'ly2dvi'
version = '@TOPLEVEL_VERSION@'
-if version == '@' + 'TOPLEVEL_VERSION' + '@':
- version = '(unknown version)' # uGUHGUHGHGUGH
errorlog = ''
import sys
@@ -147,6 +145,7 @@
# ------ ----------
( 'language', Props.setLanguage ),
( 'latexheaders', Props.setHeader ),
+ ( 'latexpackages', Props.setPackages ),
( 'paperorientation', Props.setOrientation ),
( 'paperpapersize', Props.setPaperZize ),
( 'papertextheight', Props.setTextHeight ),
@@ -261,7 +260,6 @@
\usepackage[latin1]{inputenc}
%%\usepackage[T1]{fontenc}
%%
-%s
%% don not waste unused space at bottom of page
%% (unless we have footnotes ...)
%%\headheight9pt
@@ -276,10 +274,11 @@
%% UGR.
address@hidden,}\quad\textbf{\thepage}}\hfil}%%
address@hidden
+%s
\begin{document}
""" % ( program_id(), Props.get('filename'), now, Props.get('papersize'),
- Props.get('language'), Props.get('pagenumber'), Props.get('linewidth'),
- textheightsetting, Props.get('orientation'), Props.get('header') )
+ Props.get('language'), Props.get('linewidth'), textheightsetting,
+ Props.get('orientation'), Props.get('header'), Props.get('pagenumber'))
base, ext = os.path.splitext(file)
this.__base = base
@@ -574,6 +573,7 @@
( 'KEEPLY2DVI', this.setKeeply2dvi ),
( 'LANGUAGE', this.setLanguage ),
( 'LATEXHF', this.setHeader ),
+ ( 'LATEXPKG', this.setPackages ),
( 'LILYINCLUDE', this.setInclude ),
( 'LILYPONDPREFIX', this.setRoot ),
( 'NONUMBER', this.setNonumber ),
@@ -822,7 +822,13 @@
# Set latex header name
#
def setHeader(this,head, requester):
- this.__set('header','\\input{' + head + '}',requester)
+ this.__set('header','\\input{' + head +
'}'+this.get('header'),requester)
+
+ #
+ # Set latex package name
+ #
+ def setPackages(this,pkgs, requester):
+ this.__set('header','\\usepackage{' + pkgs +
'}'+this.get('header'),requester)
#
# Set or Clear Dependencies flag to generate makefile dependencies
- Re: Lily 1.3.126,
Mats Bengtsson <=