CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/03 11:31:51
Modified files:
. : ChangeLog
lily : beam-quanting.cc main.cc stencil.cc
make : lilypond.fedora.spec.in
mf : GNUmakefile
scm : backend-library.scm framework-eps.scm lily.scm
output-gnome.scm output-ps.scm
scripts : GNUmakefile
Added files:
scripts : lilypond-ps2png.py
Removed files:
scripts : ps2png.py
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3533&tr2=1.3534&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/beam-quanting.cc.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.244&tr2=1.245&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/stencil.cc.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/lilypond.fedora.spec.in.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/GNUmakefile.diff?tr1=1.159&tr2=1.160&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/backend-library.scm.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-eps.scm.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.330&tr2=1.331&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-gnome.scm.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-ps.scm.diff?tr1=1.134&tr2=1.135&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/lilypond-ps2png.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/GNUmakefile.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3533 lilypond/ChangeLog:1.3534
--- lilypond/ChangeLog:1.3533 Tue May 3 11:29:34 2005
+++ lilypond/ChangeLog Tue May 3 11:31:50 2005
@@ -26,6 +26,15 @@
2005-05-03 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/beam-quanting.cc (quanting): robustness fix, don't produce
+ infinity for unfeasible beams.
+
+ * make/lilypond.fedora.spec.in (Group): idem.
+
+ * scripts/GNUmakefile (SEXECUTABLES): rename ps2png to lilypond-ps2png
+
+ * mf/GNUmakefile (ALL_GEN_FILES): remove .map
+
* scm/framework-ps.scm (write-preamble): extract CFF from OTF
fonts directly.
Index: lilypond/lily/beam-quanting.cc
diff -u lilypond/lily/beam-quanting.cc:1.70 lilypond/lily/beam-quanting.cc:1.71
--- lilypond/lily/beam-quanting.cc:1.70 Sat Apr 30 23:43:03 2005
+++ lilypond/lily/beam-quanting.cc Tue May 3 11:31:50 2005
@@ -77,12 +77,6 @@
}
}
- if (best_idx < 0)
- {
- programming_error ("no best beam quant score");
- best_idx = 0;
- }
-
return best_idx;
}
@@ -265,10 +259,10 @@
}
int best_idx = best_quant_score_idx (qscores);
-
+
#if DEBUG_QUANTING
SCM inspect_quants = me->get_property ("inspect-quants");
- if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm
("debug-beam-quanting")))
+ if ( to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm
("debug-beam-quanting")))
&& scm_is_pair (inspect_quants))
{
Drul_array<Real> ins = ly_scm2interval (inspect_quants);
@@ -289,12 +283,18 @@
programming_error ("can't find quant");
}
#endif
-
- me->set_property ("positions",
- ly_interval2scm (Drul_array<Real> (qscores[best_idx].yl,
- qscores[best_idx].yr)));
+ if (best_idx < 0)
+ {
+ warning (_ ("no feasible beam position"));
+ me->set_property ("positions", ly_interval2scm (Interval (0,0)));
+ }
+ else
+ me->set_property ("positions",
+ ly_interval2scm (Drul_array<Real> (qscores[best_idx].yl,
+
qscores[best_idx].yr)));
#if DEBUG_QUANTING
- if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm
("debug-beam-quanting"))))
+ if (best_idx >= 0
+ && to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm
("debug-beam-quanting"))))
{
qscores[best_idx].score_card_ += to_string ("i%d", best_idx);
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.244 lilypond/lily/main.cc:1.245
--- lilypond/lily/main.cc:1.244 Mon May 2 12:39:28 2005
+++ lilypond/lily/main.cc Tue May 3 11:31:50 2005
@@ -607,6 +607,8 @@
scm_boot_guile (argc, argv, main_with_guile, 0);
- /* Unreachable */
- return 0;
+ /*
+ If we get here, GUILE exited. This is an error.
+ */
+ return 1;
}
Index: lilypond/lily/stencil.cc
diff -u lilypond/lily/stencil.cc:1.39 lilypond/lily/stencil.cc:1.40
--- lilypond/lily/stencil.cc:1.39 Thu Mar 17 07:41:01 2005
+++ lilypond/lily/stencil.cc Tue May 3 11:31:50 2005
@@ -87,7 +87,11 @@
Axis a = X_AXIS;
while (a < NO_AXES)
{
- if (isinf (o[a]) || isnan (o[a]))
+ if (isinf (o[a])
+ || isnan (o[a])
+
+ // ugh, hardcoded.
+ || fabs (o[a]) > 1e6)
{
programming_error (String_convert::form_string ("Improbable offset
for stencil: %f staff space", o[a])
+ "\n"
Index: lilypond/make/lilypond.fedora.spec.in
diff -u lilypond/make/lilypond.fedora.spec.in:1.13
lilypond/make/lilypond.fedora.spec.in:1.14
--- lilypond/make/lilypond.fedora.spec.in:1.13 Tue Apr 5 15:51:06 2005
+++ lilypond/make/lilypond.fedora.spec.in Tue May 3 11:31:50 2005
@@ -155,7 +155,7 @@
%{_bindir}/midi2ly
%{_bindir}/lilypond-book
%{_bindir}/mup2ly
-%{_bindir}/ps2png
+%{_bindir}/lilypond-ps2png
%{_bindir}/lilypond-pdfpc-helper
%doc THANKS
@@ -177,7 +177,7 @@
%{_mandir}/man1/midi2ly.1.gz
%{_mandir}/man1/lilypond-book.1.gz
%{_mandir}/man1/mup2ly.1.gz
-%{_mandir}/man1/ps2png.1.gz
+%{_mandir}/man1/lilypond-ps2png.1.gz
%{_mandir}/man1/lilypond-pdfpc-helper.1.gz
%{_datadir}/lilypond/@TOPLEVEL_VERSION@/
Index: lilypond/mf/GNUmakefile
diff -u lilypond/mf/GNUmakefile:1.159 lilypond/mf/GNUmakefile:1.160
--- lilypond/mf/GNUmakefile:1.159 Mon May 2 23:49:18 2005
+++ lilypond/mf/GNUmakefile Tue May 3 11:31:51 2005
@@ -127,7 +127,7 @@
# Make tfm files first, log files last,
# so that normally log files aren't made twice
-ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES)
$(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(PFA_FILES)
$(outdir)/lilypond.map $(OTF_FILES) $(SVG_FILES)
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES)
$(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(PFA_FILES)
$(OTF_FILES) $(SVG_FILES)
#PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source
Index: lilypond/scm/backend-library.scm
diff -u lilypond/scm/backend-library.scm:1.18
lilypond/scm/backend-library.scm:1.19
--- lilypond/scm/backend-library.scm:1.18 Mon Apr 18 13:29:15 2005
+++ lilypond/scm/backend-library.scm Tue May 3 11:31:51 2005
@@ -45,10 +45,11 @@
(define-public (postscript->png resolution papersizename name)
(let* ((prefix (ly:effective-prefix))
- ;; FIXME: should scripts/ps2png.py be installed in PREFIX?
+
+ ;; run the source, if we are in the build-directory
(ps2png-source (if prefix
- (format "~a/scripts/ps2png.py" prefix)
- "ps2png"))
+ (format "~a/scripts/lilypond-ps2png.py" prefix)
+ "lilypond-ps2png"))
(cmd (format #f
"~a --resolution=~S --papersize=~a~a '~a'"
(if (file-exists? ps2png-source)
Index: lilypond/scm/framework-eps.scm
diff -u lilypond/scm/framework-eps.scm:1.10 lilypond/scm/framework-eps.scm:1.11
--- lilypond/scm/framework-eps.scm:1.10 Sat Apr 16 12:52:29 2005
+++ lilypond/scm/framework-eps.scm Tue May 3 11:31:51 2005
@@ -30,6 +30,7 @@
(if (pair? stencils)
(let* ((line (car stencils))
(rest (cdr stencils)))
+
(dump-stencil-as-EPS
paper
line (format "~a-~a" basename count)
@@ -68,6 +69,7 @@
(define-public (output-classic-framework basename book scopes fields)
(output-scopes scopes fields basename)
+
(dump-stencils-as-EPSes
(map ly:paper-system-stencil (ly:paper-book-systems book))
book
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.330 lilypond/scm/lily.scm:1.331
--- lilypond/scm/lily.scm:1.330 Sat Apr 30 22:42:54 2005
+++ lilypond/scm/lily.scm Tue May 3 11:31:51 2005
@@ -317,7 +317,9 @@
files)
(if (pair? failed)
- (ly:error (_ "failed files: ~S") (string-join failed))
+ (begin
+ (ly:error (_ "failed files: ~S") (string-join failed))
+ (exit 1))
(begin
;; HACK: be sure to exit with single newline
(ly:message "")
Index: lilypond/scm/output-gnome.scm
diff -u lilypond/scm/output-gnome.scm:1.91 lilypond/scm/output-gnome.scm:1.92
--- lilypond/scm/output-gnome.scm:1.91 Tue Apr 12 22:49:25 2005
+++ lilypond/scm/output-gnome.scm Tue May 3 11:31:51 2005
@@ -79,8 +79,6 @@
;;; point-and-click: (mouse-1) click on a graphical object;
;;; grob-property-list: (mouse-3) click on a graphical object.
-(debug-enable 'backtrace)
-
(define-module (scm output-gnome))
(define this-module (current-module))
Index: lilypond/scm/output-ps.scm
diff -u lilypond/scm/output-ps.scm:1.134 lilypond/scm/output-ps.scm:1.135
--- lilypond/scm/output-ps.scm:1.134 Mon Apr 25 19:34:59 2005
+++ lilypond/scm/output-ps.scm Tue May 3 11:31:51 2005
@@ -62,7 +62,6 @@
;;(write (ly:all-output-backend-commands))
;;(write (ly:all-stencil-expressions))
-
;;; helper functions, not part of output interface
(define (escape-parentheses s)
(regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post))
Index: lilypond/scripts/GNUmakefile
diff -u lilypond/scripts/GNUmakefile:1.24 lilypond/scripts/GNUmakefile:1.25
--- lilypond/scripts/GNUmakefile:1.24 Wed Apr 13 15:29:00 2005
+++ lilypond/scripts/GNUmakefile Tue May 3 11:31:51 2005
@@ -1,6 +1,6 @@
depth = ..
-SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly mup2ly midi2ly ps2png
lilypond-pdfpc-helper
+SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly mup2ly midi2ly
lilypond-ps2png lilypond-pdfpc-helper
STEPMAKE_TEMPLATES=script help2man po
LOCALSTEPMAKE_TEMPLATES = lilypond
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
