CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/19 22:19:37
Modified files:
. : ChangeLog
python : lilylib.py
scm : define-grobs.scm define-markup-commands.scm
Log message:
(make_ps_images): switch back to png16m.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3479&tr2=1.3480&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/python/lilylib.py.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.189&tr2=1.190&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3479 lilypond/ChangeLog:1.3480
--- lilypond/ChangeLog:1.3479 Tue Apr 19 21:33:20 2005
+++ lilypond/ChangeLog Tue Apr 19 22:19:36 2005
@@ -1,3 +1,7 @@
+2005-04-20 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * python/lilylib.py (make_ps_images): switch back to png16m.
+
2005-04-19 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* scripts/lilypond-book.py (write_if_updated): Bugfix for not
Index: lilypond/python/lilylib.py
diff -u lilypond/python/lilylib.py:1.62 lilypond/python/lilylib.py:1.63
--- lilypond/python/lilylib.py:1.62 Sat Apr 16 14:36:04 2005
+++ lilypond/python/lilylib.py Tue Apr 19 22:19:36 2005
@@ -464,26 +464,22 @@
def make_ps_images (ps_name, resolution = 90, papersize = "a4",
rename_page1_p = 0):
- ## FIXME
- ## have better algorithm for deciding when to crop page,
- ## and when to show full page.
- ## Better than what, and why?
-
- base = re.sub (r'\.e?ps', '', ps_name)
+ base = os.path.basename (re.sub (r'\.e?ps', '', ps_name))
header = open (ps_name).read (1024)
png1 = base + '.png'
pngn = base + '-page%d.png'
output_file = pngn
multi_page = re.search ('\n%%Pages: ', header)
-
+
+ # png16m is because Lily produces color nowadays.
if not multi_page:
cmd = r'''gs\
-dEPSCrop\
-dGraphicsAlphaBits=4\
-dNOPAUSE\
-dTextAlphaBits=4\
- -sDEVICE=pnggray\
+ -sDEVICE=png16m\
-sOutputFile='%(output_file)s'\
-sPAPERSIZE=%(papersize)s\
-q\
@@ -497,7 +493,7 @@
-dGraphicsAlphaBits=4\
-dNOPAUSE\
-dTextAlphaBits=4\
- -sDEVICE=pnggray\
+ -sDEVICE=png16m\
-sOutputFile='%(output_file)s'\
-sPAPERSIZE=%(papersize)s\
-q\
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.189 lilypond/scm/define-grobs.scm:1.190
--- lilypond/scm/define-grobs.scm:1.189 Tue Apr 19 17:34:12 2005
+++ lilypond/scm/define-grobs.scm Tue Apr 19 22:19:36 2005
@@ -1388,7 +1388,9 @@
(height . 2.0) ;; staffspace;
(minimum-space . 5)
(font-size . -4)
- (meta . ((interfaces . (volta-bracket-interface line-interface
text-interface side-position-interface font-interface spanner-interface))))
+ (meta . ((interfaces . (volta-bracket-interface
+ line-interface text-interface
+ side-position-interface font-interface
spanner-interface))))
))
(VerticalAlignment
@@ -1397,7 +1399,6 @@
(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
(X-extent-callback . ,Axis_group_interface::group_extent_callback)
(stacking-dir . -1)
- ;; (threshold . (6 . 1000))
(meta . ((interfaces . (align-interface axis-group-interface
spanner-interface))))
))
@@ -1407,13 +1408,10 @@
(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
(X-extent-callback . ,Axis_group_interface::group_extent_callback)
- (meta . ((interfaces . (axis-group-interface
vertically-spaceable-interface spanner-interface))))
+ (meta . ((interfaces . (axis-group-interface
+ vertically-spaceable-interface
spanner-interface))))
))
- )
- )
-
-
-
+ ))
(define (completize-grob-entry x)
"transplant assoc key into 'name entry of 'meta of X
Index: lilypond/scm/define-markup-commands.scm
diff -u lilypond/scm/define-markup-commands.scm:1.88
lilypond/scm/define-markup-commands.scm:1.89
--- lilypond/scm/define-markup-commands.scm:1.88 Tue Apr 19 21:33:19 2005
+++ lilypond/scm/define-markup-commands.scm Tue Apr 19 22:19:36 2005
@@ -524,7 +524,7 @@
(def-markup-command (raise layout props amount arg) (number? markup?)
"
Raise @var{arg}, by the distance @var{amount}.
-A negative @var{amount} indicates lowering, see also @code{\lower}.
+A negative @var{amount} indicates lowering, see also @code{\\lower}.
@c
@lilypond[verbatim,fragment,relative=1]
c1^\\markup { C \\small \\raise #1.0 \\bold { \"9/7+\" }}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
