CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/01 23:31:34
Modified files:
. : ChangeLog
lily : paper-system-scheme.cc paper-system.cc
lily/include : paper-system.hh
scm : framework-tex.scm lily-library.scm
output-lib.scm page-layout.scm safe-lily.scm
Log message:
(LY_DEFINE): remove ly:paper-system-{extent,stencil}
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4147&tr2=1.4148&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-system-scheme.cc.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-system.cc.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/paper-system.hh.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-tex.scm.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily-library.scm.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-lib.scm.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/page-layout.scm.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/safe-lily.scm.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4147 lilypond/ChangeLog:1.4148
--- lilypond/ChangeLog:1.4147 Sat Oct 1 23:06:52 2005
+++ lilypond/ChangeLog Sat Oct 1 23:31:34 2005
@@ -1,5 +1,7 @@
2005-10-02 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/paper-system-scheme.cc (LY_DEFINE): remove
ly:paper-system-{extent,stencil}
+
* Documentation/user/global.itely (Paper size): explain how to add
sizes.
Index: lilypond/lily/include/paper-system.hh
diff -u lilypond/lily/include/paper-system.hh:1.15
lilypond/lily/include/paper-system.hh:1.16
--- lilypond/lily/include/paper-system.hh:1.15 Tue Sep 27 12:32:12 2005
+++ lilypond/lily/include/paper-system.hh Sat Oct 1 23:31:34 2005
@@ -20,7 +20,6 @@
class Paper_system
{
DECLARE_SMOBS (Paper_system,);
- Stencil stencil_;
SCM mutable_property_alist_;
SCM immutable_property_alist_;
@@ -28,12 +27,8 @@
public:
Paper_system (Stencil, SCM);
- Stencil to_stencil () const;
- SCM stencils () const;
SCM internal_get_property (SCM sym) const;
void internal_set_property (SCM sym, SCM val);
- bool is_title () const;
-
Real break_before_penalty () const;
};
Index: lilypond/lily/paper-system-scheme.cc
diff -u lilypond/lily/paper-system-scheme.cc:1.8
lilypond/lily/paper-system-scheme.cc:1.9
--- lilypond/lily/paper-system-scheme.cc:1.8 Tue Sep 27 11:33:28 2005
+++ lilypond/lily/paper-system-scheme.cc Sat Oct 1 23:31:34 2005
@@ -8,26 +8,6 @@
#include "paper-system.hh"
-LY_DEFINE (ly_paper_system_height, "ly:paper-system-extent",
- 2, 0, 0, (SCM system, SCM axis),
- "Return the extent of @var{system}.")
-{
- Paper_system *ps = unsmob_paper_system (system);
- SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
- SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
- Axis ax = (Axis)scm_to_int (axis);
- return ly_interval2scm (ps->to_stencil ().extent (ax));
-}
-
-LY_DEFINE (ly_paper_system_stencil, "ly:paper-system-stencil",
- 1, 0, 0, (SCM system),
- "Return the height of @var{system}.")
-{
- Paper_system *ps = unsmob_paper_system (system);
- SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system");
- return ps->to_stencil ().smobbed_copy ();
-}
-
LY_DEFINE (ly_paper_system_property, "ly:paper-system-property",
Index: lilypond/lily/paper-system.cc
diff -u lilypond/lily/paper-system.cc:1.22 lilypond/lily/paper-system.cc:1.23
--- lilypond/lily/paper-system.cc:1.22 Tue Sep 27 12:32:11 2005
+++ lilypond/lily/paper-system.cc Sat Oct 1 23:31:34 2005
@@ -20,10 +20,19 @@
mutable_property_alist_ = SCM_EOL;
immutable_property_alist_ = immutable_init;
smobify_self ();
- stencil_ = s;
- init_vars ();
-}
+ SCM yext = get_property ("Y-extent");
+
+ if (is_number_pair (yext))
+ {
+
+ Box b = s.extent_box();
+ b[Y_AXIS] = ly_scm2interval (yext);
+
+ s = Stencil (b, s.expr ());
+ }
+ set_property ("stencil", s.smobbed_copy ());
+}
Paper_system::~Paper_system ()
{
@@ -34,8 +43,7 @@
{
Paper_system *system = (Paper_system *) SCM_CELL_WORD_1 (smob);
scm_gc_mark (system->mutable_property_alist_);
- scm_gc_mark (system->immutable_property_alist_);
- return system->stencil_.expr ();
+ return system->immutable_property_alist_;
}
int
@@ -51,25 +59,10 @@
return 1;
}
-
-Stencil
-Paper_system::to_stencil () const
-{
- return stencil_;
-}
-
void
Paper_system::init_vars ()
{
- SCM yext = get_property ("Y-extent");
- if (is_number_pair (yext))
- {
- Box b = stencil_.extent_box();
- b[Y_AXIS] = ly_scm2interval (yext);
-
- stencil_ = Stencil (b, stencil_.expr ());
- }
}
SCM
Index: lilypond/scm/framework-tex.scm
diff -u lilypond/scm/framework-tex.scm:1.86 lilypond/scm/framework-tex.scm:1.87
--- lilypond/scm/framework-tex.scm:1.86 Sun Aug 7 07:17:37 2005
+++ lilypond/scm/framework-tex.scm Sat Oct 1 23:31:34 2005
@@ -218,9 +218,9 @@
putter
(format "\\lybox{~a}{~a}{%\n"
(ly:number->string
- (max 0 (interval-end (ly:paper-system-extent line X))))
+ (max 0 (interval-end (paper-system-extent line X))))
(ly:number->string
- (interval-length (ly:paper-system-extent line Y)))))
+ (interval-length (paper-system-extent line Y)))))
(ly:outputter-dump-stencil putter (ly:paper-system-stencil line))
(ly:outputter-dump-string
Index: lilypond/scm/lily-library.scm
diff -u lilypond/scm/lily-library.scm:1.49 lilypond/scm/lily-library.scm:1.50
--- lilypond/scm/lily-library.scm:1.49 Tue Sep 27 10:50:17 2005
+++ lilypond/scm/lily-library.scm Sat Oct 1 23:31:34 2005
@@ -116,9 +116,12 @@
))
-(define-public (paper-system-title? ps)
- (equal? #t (ly:paper-system-property ps 'is-title)
+(define-public (paper-system-title? system)
+ (equal? #t (ly:paper-system-property system 'is-title)
))
+
+(define-public (paper-system-extent system axis)
+ (ly:stencil-extent (ly:paper-system-property system 'stencil) axis))
;;;;;;;;;;;;;;;;
;; alist
Index: lilypond/scm/output-lib.scm
diff -u lilypond/scm/output-lib.scm:1.85 lilypond/scm/output-lib.scm:1.86
--- lilypond/scm/output-lib.scm:1.85 Fri Sep 30 21:38:18 2005
+++ lilypond/scm/output-lib.scm Sat Oct 1 23:31:34 2005
@@ -221,7 +221,8 @@
(define-public (shift-right-at-line-begin g)
"Shift an item to the right, but only at the start of the line."
- (if (and (ly:item? g) (equal? (ly:item-break-dir g) RIGHT))
+ (if (and (ly:item? g)
+ (equal? (ly:item-break-dir g) RIGHT))
(ly:grob-translate-axis! g 3.5 X)))
Index: lilypond/scm/page-layout.scm
diff -u lilypond/scm/page-layout.scm:1.83 lilypond/scm/page-layout.scm:1.84
--- lilypond/scm/page-layout.scm:1.83 Tue Sep 27 12:32:12 2005
+++ lilypond/scm/page-layout.scm Sat Oct 1 23:31:34 2005
@@ -36,6 +36,7 @@
(define-public (paper-system-staff-extents ps)
(ly:paper-system-property ps 'refpoint-Y-extent '(0 . 0)))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (page-headfoot layout scopes number sym sepsym dir last?)
@@ -256,7 +257,7 @@
(list->vector
(append
(map
- (lambda (sys) (ly:paper-system-extent sys Y)) lines)
+ (lambda (sys) (paper-system-extent sys Y)) lines)
(if (= (length lines) 1)
'((0 . 0))
'()))))
Index: lilypond/scm/safe-lily.scm
diff -u lilypond/scm/safe-lily.scm:1.37 lilypond/scm/safe-lily.scm:1.38
--- lilypond/scm/safe-lily.scm:1.37 Tue Sep 27 10:50:17 2005
+++ lilypond/scm/safe-lily.scm Sat Oct 1 23:31:34 2005
@@ -100,7 +100,6 @@
ly:layout-def?
ly:paper-get-font
ly:paper-get-number
- ly:paper-system-extent
ly:paper-system-stencil
ly:paper-system?
ly:output-def-lookup
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
