CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/12 18:42:49
Modified files:
. : ChangeLog
buildscripts : mutopia-index.py
elisp : lilypond-mode.el
input : sakura-sakura.ly
input/mutopia/W.A.Mozart: mozart-hrn3-allegro.ily
scm : backend-library.scm
ttftool : ps.c test.c util.c
Log message:
* elisp/lilypond-mode.el (LilyPond-command-alist): remove 2midi
(LilyPond-command-alist): use -f ps (thanks to Pal Benko)
* input/sakura-sakura.ly: add \midi.
* buildscripts/mutopia-index.py (find): use /usr/bin/find
iso. python find.
* ttftool/test.c (main): cosmetics.
* ttftool/util.c (surely_lseek): use stdio FILE's for I/O
* ttftool/test.c: new file. If compiled with -DTEST_TTFTOOL,
create a ttf2ps binary.
* scm/backend-library.scm (postscript->png): set rename-page-1 to
true.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3768&tr2=1.3769&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/mutopia-index.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/elisp/lilypond-mode.el.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/sakura-sakura.ly.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/backend-library.scm.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/ps.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/test.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/util.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3768 lilypond/ChangeLog:1.3769
--- lilypond/ChangeLog:1.3768 Sun Jun 12 16:33:20 2005
+++ lilypond/ChangeLog Sun Jun 12 18:42:48 2005
@@ -1,5 +1,15 @@
2005-06-12 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * elisp/lilypond-mode.el (LilyPond-command-alist): remove 2midi
+ (LilyPond-command-alist): use -f ps (thanks to Pal Benko)
+
+ * input/sakura-sakura.ly: add \midi.
+
+ * buildscripts/mutopia-index.py (find): use /usr/bin/find
+ iso. python find.
+
+ * ttftool/test.c (main): cosmetics.
+
* ttftool/util.c (surely_lseek): use stdio FILE's for I/O
* ttftool/test.c: new file. If compiled with -DTEST_TTFTOOL,
Index: lilypond/buildscripts/mutopia-index.py
diff -u lilypond/buildscripts/mutopia-index.py:1.31
lilypond/buildscripts/mutopia-index.py:1.32
--- lilypond/buildscripts/mutopia-index.py:1.31 Tue Apr 12 22:49:29 2005
+++ lilypond/buildscripts/mutopia-index.py Sun Jun 12 18:42:49 2005
@@ -9,30 +9,15 @@
import stat
import sys
-_debug = 0
-_prune = ['(*)']
+def find (pat, dir):
+ f = os.popen ('find %s -name "%s"'% (dir, pat))
+ lst = []
+ for a in f.readlines():
+ a = a[:-1]
+ lst.append (a)
+ return lst
+
-def find (pattern, dir = os.curdir):
- lst = []
- names = os.listdir (dir)
- names.sort ()
- for name in names:
- if name in (os.curdir, os.pardir):
- continue
- fullname = os.path.join (dir, name)
- if fnmatch.fnmatch (name, pattern):
- lst.append (fullname)
- if os.path.isdir (fullname) and not os.path.islink (fullname):
- for p in _prune:
- if fnmatch.fnmatch (name, p):
- if _debug:
- print "skip", `fullname`
- break
- else:
- if _debug:
- print "descend into", `fullname`
- lst = lst + find (pattern, fullname)
- return lst
headertext= r"""
@@ -124,6 +109,8 @@
list.write (headertext_nopics)
for ex in inputs:
+ print ex
+
(base, ext) = os.path.splitext (ex)
(base, ext2) = os.path.splitext (base)
ext = ext2 + ext
@@ -163,13 +150,25 @@
% (type, size))
pictures = ['jpeg', 'png', 'xpm']
lst.write ('\n')
+ else:
+ print "can't find" , `file_name`
list_item (base + ext, 'The input', 'ASCII')
+
+ pages_found = 0
for page in range (1, 100):
+ pages_found += 1
f = base + '-page%d.png' % page
- if not os.path.isfile (f):
+
+ if not os.path.isfile (f):
break
list_item (f, 'See a picture of page %d' % page, 'png')
+
+ if pages_found == 0 and os.path.exists (base + '.png'):
+ list_item (base + ".png",
+ 'See a picture', 'png')
+
+
list_item (base + '.pdf', 'Print', 'PDF')
list_item (base + '.midi', 'Listen', 'MIDI')
list.write ('</ul>\n');
Index: lilypond/elisp/lilypond-mode.el
diff -u lilypond/elisp/lilypond-mode.el:1.16
lilypond/elisp/lilypond-mode.el:1.17
--- lilypond/elisp/lilypond-mode.el:1.16 Tue Apr 19 17:18:10 2005
+++ lilypond/elisp/lilypond-mode.el Sun Jun 12 18:42:49 2005
@@ -425,8 +425,7 @@
("LilyPond" . (,(concat LilyPond-lilypond-command " %s") "%s" "%l" "View"))
("TeX" . ("tex '\\nonstopmode\\input %t'" "%t" "%d" "ViewDVI"))
("2Dvi" . (,(concat LilyPond-lilypond-command " -b tex %s") "%s" "%d"
"LaTeX"))
- ("2PS" . (,(concat LilyPond-lilypond-command "-b ps %s") "%s" "%p"
"ViewPS"))
- ("2Midi" . (,(concat LilyPond-lilypond-command " -m %s") "%s" "%m" "Midi"))
+ ("2PS" . (,(concat LilyPond-lilypond-command "-f ps %s") "%s" "%p"
"ViewPS"))
("2Gnome" . (,(concat LilyPond-lilypond-command " -b gnome %s")))
("Book" . ("lilypond-book %x" "%x" "%l" "LaTeX"))
Index: lilypond/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily
diff -u lilypond/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily:1.5
lilypond/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily:1.6
--- lilypond/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily:1.5 Sat Oct
30 20:55:15 2004
+++ lilypond/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily Sun Jun 12
18:42:49 2005
@@ -127,7 +127,9 @@
\override Stem #'stroke-style = #"grace"
\longgrace d16( \endlonggrace
\revert Stem #'stroke-style }
- c8[) b16 c)]
+
+%% todo: should insert grace slur here.
+ c8[ b16 c)]
\grace {
\override Stem #'stroke-style = #"grace"
\longgrace c16 \endlonggrace
Index: lilypond/input/sakura-sakura.ly
diff -u lilypond/input/sakura-sakura.ly:1.2 lilypond/input/sakura-sakura.ly:1.3
--- lilypond/input/sakura-sakura.ly:1.2 Mon May 30 14:18:22 2005
+++ lilypond/input/sakura-sakura.ly Sun Jun 12 18:42:49 2005
@@ -7,30 +7,36 @@
subtitle = "(Sakura, sakura)"
}
-<<
- \relative c'' {
- %% Beams are melismata, no autobeams.
- \set Staff.autoBeaming = ##f
- | a4 a b2 | a4 a b2
- | a4 b c b | a4 b8[ a] f2
- | e4 c e f | e4 e8[ c] b2
- | a'4 b c b | a4 b8[ a] f2
- | e4 c e f | e4 e8[ c] b2
- | a'4 a b2 | a4 a b2
- | d,4 e b'8[ a] f4 | e1 \bar "|."
- }
- \addlyrics {
- さ く ら さ く ら
- の や ま も さ と も
- み わ た す か ぎ り
- か す み か く も か
- あ さ ひ に に を う
- さ く ら さ く ら
- は な ざ か り
- }
->>
+\score {
+ <<
+ \relative c'' {
+ %% Beams are melismata, no autobeams.
+ \set Staff.autoBeaming = ##f
+
+ | a4 a b2 | a4 a b2
+ | a4 b c b | a4 b8[ a] f2
+ | e4 c e f | e4 e8[ c] b2
+ | a'4 b c b | a4 b8[ a] f2
+ | e4 c e f | e4 e8[ c] b2
+ | a'4 a b2 | a4 a b2
+ | d,4 e b'8[ a] f4 | e1 \bar "|."
+ }
+ \addlyrics {
+ さ く ら さ く ら
+ の や ま も さ と も
+ み わ た す か ぎ り
+ か す み か く も か
+ あ さ ひ に に を う
+ さ く ら さ く ら
+ は な ざ か り
+ }
+ >>
+ \layout { }
+ \midi { \tempo 4=120 }
+ }
+
%%% Local Variables:
%%% coding: utf-8
%%% End:
Index: lilypond/scm/backend-library.scm
diff -u lilypond/scm/backend-library.scm:1.36
lilypond/scm/backend-library.scm:1.37
--- lilypond/scm/backend-library.scm:1.36 Sun Jun 12 14:11:19 2005
+++ lilypond/scm/backend-library.scm Sun Jun 12 18:42:49 2005
@@ -94,7 +94,7 @@
;; (string-append (basename name ".ps") "-page1.png" )))
(let ((paper-size (sanitize-command-option paper-size-name))
(verbose (ly:get-option 'verbose))
- (rename-page-1 #t))
+ (rename-page-1 #f))
(ly:message (_ "Converting to ~a...") "PNG")
(make-ps-images name resolution paper-size rename-page-1 verbose)
(ly:progress "\n")))
Index: lilypond/ttftool/ps.c
diff -u lilypond/ttftool/ps.c:1.8 lilypond/ttftool/ps.c:1.9
--- lilypond/ttftool/ps.c:1.8 Sun Jun 12 16:33:21 2005
+++ lilypond/ttftool/ps.c Sun Jun 12 18:42:49 2005
@@ -8,7 +8,6 @@
#include "proto.h"
#include "ttftool.h"
-#include "libc-extension.hh"
#define CHUNKSIZE 65534
Index: lilypond/ttftool/test.c
diff -u lilypond/ttftool/test.c:1.1 lilypond/ttftool/test.c:1.2
--- lilypond/ttftool/test.c:1.1 Sun Jun 12 16:33:21 2005
+++ lilypond/ttftool/test.c Sun Jun 12 18:42:49 2005
@@ -12,7 +12,7 @@
FILE *in, *out;
if (argc != 3)
{
- fprintf (stderr, "test foo.ttf bar.pfa");
+ fprintf (stderr, "%s input.ttf output.pfa", argv[0]);
exit (2);
}
Index: lilypond/ttftool/util.c
diff -u lilypond/ttftool/util.c:1.12 lilypond/ttftool/util.c:1.13
--- lilypond/ttftool/util.c:1.12 Sun Jun 12 16:33:21 2005
+++ lilypond/ttftool/util.c Sun Jun 12 18:42:49 2005
@@ -9,7 +9,6 @@
#include "types.h"
#include "proto.h"
-#include "libc-extension.hh"
#include "ttftool.h"
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
