CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/01 23:06:53
Modified files:
. : ChangeLog
Documentation/user: global.itely
python : convertrules.py
scm : paper.scm
Log message:
* Documentation/user/global.itely (Paper size): explain how to add
sizes.
* scm/paper.scm (paper-alist): rename tabloid paper to 11x17 to
correspond to GS's definition.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4146&tr2=1.4147&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/global.itely.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/python/convertrules.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/paper.scm.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4146 lilypond/ChangeLog:1.4147
--- lilypond/ChangeLog:1.4146 Sat Oct 1 22:57:16 2005
+++ lilypond/ChangeLog Sat Oct 1 23:06:52 2005
@@ -1,5 +1,11 @@
2005-10-02 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * Documentation/user/global.itely (Paper size): explain how to add
+ sizes.
+
+ * scm/paper.scm (paper-alist): rename tabloid paper to 11x17 to
+ correspond to GS's definition.
+
* lily/tuplet-bracket.cc (after_line_breaking): suicide empty
tuplet bracket.
(print): only connect to next bracket if the next one is alive.
Index: lilypond/Documentation/user/global.itely
diff -u lilypond/Documentation/user/global.itely:1.35
lilypond/Documentation/user/global.itely:1.36
--- lilypond/Documentation/user/global.itely:1.35 Tue Sep 27 10:01:15 2005
+++ lilypond/Documentation/user/global.itely Sat Oct 1 23:06:53 2005
@@ -220,8 +220,12 @@
@code{\paper} block is inside a @code{\book}, then the paper size will only
apply to that book.
-The following paper sizes are supported: @code{a6}, @code{a5}, @code{a4},
[EMAIL PROTECTED], @code{legal}, @code{letter}, @code{tabloid}.
+Support for the following paper sizes are included by default,
[EMAIL PROTECTED], @code{a5}, @code{a4}, @code{a3}, @code{legal}, @code{letter},
[EMAIL PROTECTED] (also known as tabloid).
+
+Extra sizes may be added by editing the definition for
[EMAIL PROTECTED] in the initialization file @file{scm/paper.scm}.
@cindex orientation
@cindex landscape
Index: lilypond/python/convertrules.py
diff -u lilypond/python/convertrules.py:1.15
lilypond/python/convertrules.py:1.16
--- lilypond/python/convertrules.py:1.15 Tue Sep 27 10:50:12 2005
+++ lilypond/python/convertrules.py Sat Oct 1 23:06:53 2005
@@ -2566,3 +2566,12 @@
conversions.append (((2, 7, 10), conv,
'''\\applyxxx -> \\applyXxx'''))
+
+
+
+def conv (str):
+ str = re.sub(r'\"tabloid\"', '"11x17"', str)
+ return str
+
+conversions.append (((2, 7, 11), conv,
+ '''\"tabloid\" -> \"11x17\"'''))
Index: lilypond/scm/paper.scm
diff -u lilypond/scm/paper.scm:1.58 lilypond/scm/paper.scm:1.59
--- lilypond/scm/paper.scm:1.58 Tue Sep 27 11:33:28 2005
+++ lilypond/scm/paper.scm Sat Oct 1 23:06:53 2005
@@ -79,7 +79,8 @@
("a3" . (cons (* 297.9 mm) (* 420 mm)))
("legal" . (cons (* 8.5 in) (* 14.0 in)))
("letter" . (cons (* 8.5 in) (* 11.0 in)))
- ("tabloid" . (cons (* 11.0 in) (* 17.0 in)))))
+ ("11x17" . (cons (* 11.0 in) (* 17.0 in)))
+ ))
;; todo: take dimension arguments.
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
