From 662f4cfaa784e6252dc3c2a85d15ac15bf4a44b6 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 2 Jan 2007 21:53:41 +0100 Subject: [PATCH] cleanup input/no-notation/ --- .../midi-absolute-volume.ly} | 0 input/no-notation/bar-check.ly | 13 ---------- input/no-notation/beam-warn.ly | 11 --------- input/no-notation/die-staff.ly | 23 ------------------ input/no-notation/display-lily-tests.ly | 4 ++-- input/no-notation/dos-guile.ly | 14 ----------- input/no-notation/dos-ps.ly | 13 ---------- input/no-notation/dos-tex.ly | 12 ---------- input/no-notation/embedded-scm.ly | 22 ----------------- input/no-notation/parse.ly | 5 ---- input/no-notation/parse2.ly | 9 ------- input/no-notation/parse3.ly | 9 ------- input/no-notation/parse4.ly | 12 ---------- input/no-notation/recording.ly | 24 ------------------- input/no-notation/safe-ps.ly | 10 -------- input/no-notation/safe-tex.ly | 16 ------------- .../no-notation/skiptypesetting-bar-check.ly | 17 +++++++++++++ input/no-notation/textcresc.ly | 15 ------------ ....ly => warn-conflicting-key-signatures.ly} | 0 input/regression/context-die-staff.ly | 16 +++++++++++++ lily/translator-group-ctors.cc | 7 ++++-- 21 files changed, 40 insertions(+), 212 deletions(-) rename input/{no-notation/dynamic-absolute-volume.ly => midi/midi-absolute-volume.ly} (100%) delete mode 100644 input/no-notation/bar-check.ly delete mode 100644 input/no-notation/beam-warn.ly delete mode 100644 input/no-notation/die-staff.ly delete mode 100644 input/no-notation/dos-guile.ly delete mode 100644 input/no-notation/dos-ps.ly delete mode 100644 input/no-notation/dos-tex.ly delete mode 100644 input/no-notation/embedded-scm.ly delete mode 100644 input/no-notation/parse.ly delete mode 100644 input/no-notation/parse2.ly delete mode 100644 input/no-notation/parse3.ly delete mode 100644 input/no-notation/parse4.ly delete mode 100644 input/no-notation/recording.ly delete mode 100644 input/no-notation/safe-ps.ly delete mode 100644 input/no-notation/safe-tex.ly create mode 100644 input/no-notation/skiptypesetting-bar-check.ly delete mode 100644 input/no-notation/textcresc.ly rename input/no-notation/{parse5.ly => warn-conflicting-key-signatures.ly} (100%) create mode 100644 input/regression/context-die-staff.ly diff --git a/input/no-notation/dynamic-absolute-volume.ly b/input/midi/midi-absolute-volume.ly similarity index 100% rename from input/no-notation/dynamic-absolute-volume.ly rename to input/midi/midi-absolute-volume.ly diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly deleted file mode 100644 index e9a714eae9..0000000000 --- a/input/no-notation/bar-check.ly +++ /dev/null @@ -1,13 +0,0 @@ -\version "2.10.0" - -\header { - -texidoc = "skipTypesetting doesn't affect bar checks." - -} - -\score { { - \set Score.skipTypesetting = ##t - c4 c4 - | - c4 c4 }} diff --git a/input/no-notation/beam-warn.ly b/input/no-notation/beam-warn.ly deleted file mode 100644 index 3a6586de06..0000000000 --- a/input/no-notation/beam-warn.ly +++ /dev/null @@ -1,11 +0,0 @@ -\version "2.10.0" - -\header { - -texidoc = "The first duration following a beam-open request is checked if it is short enough." - -} - -\score { - { [c4 c] } -} diff --git a/input/no-notation/die-staff.ly b/input/no-notation/die-staff.ly deleted file mode 100644 index 4f94b3bd14..0000000000 --- a/input/no-notation/die-staff.ly +++ /dev/null @@ -1,23 +0,0 @@ -\version "2.10.0" - -\header { -texidoc = "a staff should really die, if no one's referencing it." -} -\score { - { - \new Staff = "q" { - { a' b' c' d' } - } - - \break - - \context PianoStaff << - \new Staff = "i" { - { a' b' c' d' } - } - \new Staff = "ii" { - { \clef "bass" a b c d } - } - >> - } -} diff --git a/input/no-notation/display-lily-tests.ly b/input/no-notation/display-lily-tests.ly index 014f63ccdb..a6b1dacac7 100644 --- a/input/no-notation/display-lily-tests.ly +++ b/input/no-notation/display-lily-tests.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.6" #(use-modules (srfi srfi-13) (ice-9 format)) @@ -15,7 +15,7 @@ (char=? (peek-char port) #\])) (read-char port)) (display c out)))))) - `(let* ((parser-clone (ly:clone-parser parser)) + `(let* ((parser-clone (ly:parser-clone parser)) (input-str (string-trim-both ,lily-string)) (music (car (ly:music-property (parse-string-result input-str parser-clone) diff --git a/input/no-notation/dos-guile.ly b/input/no-notation/dos-guile.ly deleted file mode 100644 index 9858a594f1..0000000000 --- a/input/no-notation/dos-guile.ly +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.10.0" - -\header{ - - texidoc = "This should not hang lilypond --safe-mode." - -} - -% DOS -#(do () (#f)) - -\score{ - c'' -} \ No newline at end of file diff --git a/input/no-notation/dos-ps.ly b/input/no-notation/dos-ps.ly deleted file mode 100644 index 31c0da1b99..0000000000 --- a/input/no-notation/dos-ps.ly +++ /dev/null @@ -1,13 +0,0 @@ -\version "2.10.0" - -\header{ - - texidoc = "This should not hang lilypond --safe-mode --no-pdf - --png run. - -} - -\score{ - % DOS - c''-"\\embeddedps{ { 0 0 moveto } loop }" -} diff --git a/input/no-notation/dos-tex.ly b/input/no-notation/dos-tex.ly deleted file mode 100644 index 859df66f83..0000000000 --- a/input/no-notation/dos-tex.ly +++ /dev/null @@ -1,12 +0,0 @@ -\version "2.10.0" - -\header{ - - texidoc = "This should not hang lilypond --safe-mode run." - -} - -\score{ - % DOS - c''-"\\loop\\iftrue\\repeat" -} diff --git a/input/no-notation/embedded-scm.ly b/input/no-notation/embedded-scm.ly deleted file mode 100644 index b84dfc82d9..0000000000 --- a/input/no-notation/embedded-scm.ly +++ /dev/null @@ -1,22 +0,0 @@ -\version "2.10.0" -\header { - - texidoc = "@cindex Embedded scm - -You can embed scheme functions in your scores. While generating the -output, ``hello world'' is printed to the console. -" - % see also: --safe-mode -} - -#(begin - (newline) - (display "hello world") - (newline)) - -\score { - \relative c' { c } - \layout {ragged-right = ##t} -} - - diff --git a/input/no-notation/parse.ly b/input/no-notation/parse.ly deleted file mode 100644 index b85132308e..0000000000 --- a/input/no-notation/parse.ly +++ /dev/null @@ -1,5 +0,0 @@ -\version "2.10.0" - -% Test parser error - -\score{ diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly deleted file mode 100644 index 5096c6c69a..0000000000 --- a/input/no-notation/parse2.ly +++ /dev/null @@ -1,9 +0,0 @@ -\version "2.10.0" - -% Test parser error - -foo = { - - -\score{ -} diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly deleted file mode 100644 index cdf9626309..0000000000 --- a/input/no-notation/parse3.ly +++ /dev/null @@ -1,9 +0,0 @@ -\version "2.10.0" - -% Test parser error - -foo = { - - -\score{ - diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly deleted file mode 100644 index cee8a6a7c5..0000000000 --- a/input/no-notation/parse4.ly +++ /dev/null @@ -1,12 +0,0 @@ -\version "2.10.0" - -% Test parser error - -foo = { -} - - -\score{ - burp -} - diff --git a/input/no-notation/recording.ly b/input/no-notation/recording.ly deleted file mode 100644 index 39ea07dfa3..0000000000 --- a/input/no-notation/recording.ly +++ /dev/null @@ -1,24 +0,0 @@ -\version "2.10.0" -\header { - -texidoc = "The @code{Recording_group_engraver} will record events -synchronized in time, collecting them in a list. This file also shows -how to skip the rendering and outputting step of the process, using -@code{ly:run-translator}." - -} - -theMusic = \context Staff { c4 d8-. } - -#(define (notice-the-events context lst) - (map (lambda (x) (display x) (newline)) lst)) - -listener = \layout { - \context { - \Voice - \type "Recording_group_engraver" - recordEventSequence = #notice-the-events - } -} - -#(ly:run-translator theMusic listener) diff --git a/input/no-notation/safe-ps.ly b/input/no-notation/safe-ps.ly deleted file mode 100644 index 8a0ccca602..0000000000 --- a/input/no-notation/safe-ps.ly +++ /dev/null @@ -1,10 +0,0 @@ -\version "2.10.0" - -\header{ - texidoc = "This should not survive lilypond --safe-mode - --no-pdf --png run, and certainly not write /tmp/safe-ps.ps" -} - -\score{ - c''-"\\embeddedps{ (/tmp/safe-ps.ps) (w) file (hallo) writestring }" -} diff --git a/input/no-notation/safe-tex.ly b/input/no-notation/safe-tex.ly deleted file mode 100644 index 516146ee42..0000000000 --- a/input/no-notation/safe-tex.ly +++ /dev/null @@ -1,16 +0,0 @@ -\version "2.10.0" - -\header{ - - texidoc = "This should not survive lilypond --safe-mode run, and - certainly not write /tmp/safe-tex.tex" - - % beware - % openout_any=y lilypond --keep --safe-mode -S latexoptions=']{article} - % \let\nofiles\relax%' input/no-notation/safe-tex.ly - -} - -\score{ - c''-"\\newwrite\\barf\\immediate\\openout\\barf=/tmp/safe-tex.tex\\immediate\\write\\barf{hallo}" -} diff --git a/input/no-notation/skiptypesetting-bar-check.ly b/input/no-notation/skiptypesetting-bar-check.ly new file mode 100644 index 0000000000..e4181833e4 --- /dev/null +++ b/input/no-notation/skiptypesetting-bar-check.ly @@ -0,0 +1,17 @@ +\version "2.10.0" + +\header { + +texidoc = "skipTypesetting doesn't affect bar checks." + +} + +\relative { + c4 + \set Score.skipTypesetting = ##t + c4 c4 + | + c4 c4 + \set Score.skipTypesetting = ##f + d +} diff --git a/input/no-notation/textcresc.ly b/input/no-notation/textcresc.ly deleted file mode 100644 index 08b1fde3cc..0000000000 --- a/input/no-notation/textcresc.ly +++ /dev/null @@ -1,15 +0,0 @@ -\version "2.10.0" -\header{ -texidoc="crashes lily" -} - -\score { { - \context Voice { - \set crescendoText = "cresc." - \set crescendoSpanner = #'dashed-line - c2. r8 c8 \< \break \! c1 - } -} -\layout { line-width = 5.\cm} -} - diff --git a/input/no-notation/parse5.ly b/input/no-notation/warn-conflicting-key-signatures.ly similarity index 100% rename from input/no-notation/parse5.ly rename to input/no-notation/warn-conflicting-key-signatures.ly diff --git a/input/regression/context-die-staff.ly b/input/regression/context-die-staff.ly new file mode 100644 index 0000000000..b36ae93cf7 --- /dev/null +++ b/input/regression/context-die-staff.ly @@ -0,0 +1,16 @@ +\version "2.10.0" + +\header { +texidoc = "a staff should die if there is reference to it." +} +\layout { + ragged-right = ##t + line-width = 2.5 \cm + indent = 0.0 +} + +{ + << \new Staff = "q" \new Voice ="V" c1 >> + %% no \break, BreakEvent causes spurious staff + \new RhythmicStaff = "R" \new Voice = "RV" c +} diff --git a/lily/translator-group-ctors.cc b/lily/translator-group-ctors.cc index 83feef1634..bca809281b 100644 --- a/lily/translator-group-ctors.cc +++ b/lily/translator-group-ctors.cc @@ -9,6 +9,7 @@ #include "score-engraver.hh" #include "score-performer.hh" #include "warn.hh" +#include "international.hh" /* Quick & dirty. @@ -25,11 +26,13 @@ get_translator_group (SCM sym) else if (sym == ly_symbol2scm ("Score_performer")) return new Score_performer (); - programming_error ("Couldn't find type"); + error (_f ("fatal error. Couldn't find type: %s", + ly_symbol2string (sym).c_str ())); scm_flush (scm_current_error_port ()); scm_display (sym, scm_current_error_port ()); scm_flush (scm_current_error_port ()); - assert (0); + exit (2); + return 0; } -- 2.39.2