remove.

diff --git a/ChangeLog b/ChangeLog
index fb28f3b39207b59fd39cc2443109af69873b0639..c4076924bb69c927b966a1513e9ac882bc15a5f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-06-14  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       *  input/test/dpncnt.ly,part-combine-score.ly: remove.
+
        * VERSION (PACKAGE_NAME): release 1.7.21
 
        * input/regression/stem-shorten.ly: new file.

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 5758226ef0cada966fe1c18d6221648b3a668d61..5239df22a0de76633b1c138c757bb88e6a2fc04d 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -10,9 +10,9 @@ codes in a file.  Then you run the program on the file, and the music
 is produced without any further intervention.  For example, something
 like this:
 
-@lilypond[fragment,verbatim, relative 1, intertext="produces this
 
-"]
+@c newlines in intertext choke on lilypond.org? 
+@lilypond[fragment,verbatim, relative 1, intertext="produces this:"]
 \key c \minor r8 c16 b c8 g as c16 b c8 d | g,4
 @end lilypond
 

diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly
index 7416cf51c506d36b442504c9fa6852de34f6a2ed..9376f3ab1f16bd46db8cc221188bf7a8cfd923ed 100644 (file)
--- a/input/regression/accidental-cautionary.ly
+++ b/input/regression/accidental-cautionary.ly
@@ -16,5 +16,8 @@ parentheses (default) or smaller accidentals.
     cis''?4
     \property Staff.Accidental \set #'cautionary-style = #'parentheses
     cis''?4
-    }}
+    }
+
+\paper { raggedright = ##t }
+}
 %% new-chords-done %%

diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly
index 70163091fb23286da3a505e3f35d28e2136e0c29..22fb639c6c995d27d63d564f2711f8b010f29391 100644 (file)
--- a/input/regression/accidental-single-double.ly
+++ b/input/regression/accidental-single-double.ly
@@ -11,14 +11,6 @@ natural sign.
 
 thenotes =  \notes \relative cis' { \time 4/4
 gisis'4 gis gisis ges |
-geses ges geses gis |
-gisis g geses g |
-gis ges gis g |
-\key a \major
-gisis4 gis gisis ges |
-geses ges geses gis |
-gisis g geses g |
-gis ges gis g |
 }
 
 \score { < \context Staff \thenotes
@@ -28,4 +20,4 @@ gis ges gis g |
        }
        >
 }
-%% new-chords-done %%
\ No newline at end of file
+%% new-chords-done %%

diff --git a/input/test/dpncnt.ly b/input/test/dpncnt.ly
deleted file mode 100644 (file)
index 4d7f5e7..0000000
--- a/input/test/dpncnt.ly
+++ /dev/null
@@ -1,113 +0,0 @@
-\version "1.7.18"
-
-\header {
-
-texidoc = "test file for new-new-chord names, ie, chord-generic-names
-    "
-    
-}
-
-efullmusic = \notes {
-
-    %% ? what 'bout maj7?
-    %% c:7 = \markup { \normal-size-super "maj7" }
-
-    %% Choose your symbol for the fully diminished chord
-    %% American:
-    %% c:3-.5-.7- = \markup { "dim" }
-    %% Jazz:
-    %% c:3-.5-.7-
-    <<c es ges bes>>-\markup { \super " o" }
-
-    %% Hmm, this ok?
-    %% c:7+
-    <<c e g b>>-\markup { \normal-size-super
-                         \override #'(font-family . math) "N" }
-    %%c:3.5.7 = \markup { \override #'(font-family . math) "M" }
-    %%c:3.5.7 = \markup { \normal-size-super "maj7" }
-}
-
-efull = #(sequential-music-to-chord-exceptions efullmusic #f)
-
-epartialmusic = \notes {
-    %c:2^3 =
-    <<c d>>-\markup { \normal-size-super "2" }
-    %c:3-
-    <<c es>>-\markup { "m" }
-    %c:4
-    <<c f>>-\markup { \normal-size-super "sus4" }
-    %c:5^3
-    <<c g>>-\markup { \normal-size-super "5" }
-}
-
-epartial = #(sequential-music-to-chord-exceptions epartialmusic #f)
-
-% ugh FIXME?
-% default octave \chord mode has changed to c'
-ch = \notes \transpose c c' 
-{
-       <<c e g>>1
-       <<c es g>>
-       <<c e gis>>
-       <<c es ges>> \break
-       <<c e g bes>>
-       <<c es g bes>>
-       <<c e g b>>
-       <<c es ges beses>> 
-       <<c es ges b>> \break
-       <<c e gis bes>>
-       <<c es g b>>
-       <<c e gis b>> 
-       <<c es ges bes>>\break
-       <<c e g a>>
-       <<c es g a>>
-       <<c e g bes d'>> % ?? 
-       <<c es g bes d'>> \break
-       <<c es g bes d' f' a' >>
-       <<c es g bes d' f' >>
-       <<c es ges bes d' >> 
-       <<c e g bes des' >> \break
-       <<c e g bes dis'>>
-       <<c e g bes d' f'>>
-       <<c e g bes d' fis'>>
-       <<c e g bes d' f' a'>>\break
-       <<c e g bes d' fis' as'>>
-       <<c e gis bes dis'>>
-       <<c e g bes dis' fis'>>
-       <<c e g bes d' f' as'>>\break
-       <<c e g bes des' f' as'>>
-       <<c e g bes d' fis'>>
-       <<c e g b d'>>
-       <<c e g bes d' f' as'>>\break
-       <<c e g bes des' f' as'>>
-       <<c e g bes des' f' a'>>
-       <<c e g b d'>>
-       <<c e g b d' f' a'>>\break
-       <<c e g b d' fis'>>
-       <<c e g bes des' f ' a'>>
-       <<c f g>>
-       <<c f g bes>>\break
-       <<c f g bes d'>>
-       <<c e g d'>>
-       <<c es g f'>>
-}
-
-
-\score{
-    <
-       \context ChordNames {
-       \property ChordNames.chordNameFunction = #banter-chord-names
-       \ch
-       \property ChordNames.chordNameFunction = #jazz-chord-names
-       
-       \ch
-    }
-       \context Staff \notes \transpose c c' { \ch \ch}
-    >
-    \paper{
-       \translator { 
-           \ChordNamesContext
-           ChordName \override #'word-space = #1 
-       }
-    }
-}

diff --git a/input/test/part-combine-score.ly b/input/test/part-combine-score.ly
deleted file mode 100644 (file)
index d69aae3..0000000
--- a/input/test/part-combine-score.ly
+++ /dev/null
@@ -1,288 +0,0 @@
-\version "1.7.19"
-
-\header {
-texidoc="Template for part-combining orchestral scores"
-}
-  
-                               
-raisedFlat = \markup { \raise #0.4 \smaller \smaller \musicglyph #"accidentals--1"  }
-
-
-
-End = { \skip 1*9 \bar "|." }
-
-flautoI = \notes\relative c'' {
-  c4-\pp d e f
-  b,4 d c d
-  r2 e4 f
-  \break
-  \context Score \outputproperty #(make-type-checker 'paper-column-interface)
-  #'between-system-string = #"\\eject"
-
-  c4 d e f
-  c4 r e f
-  c4 r e f
-  \break
-  c4 r a r
-  a a r a
-  a2 \property VoiceCombineThread.soloADue = ##f a
-}
-
-flautoII = \notes\relative c'' {
-  g4-\ff b d f
-  r2 c4 d
-  a c c d
-  a4. b8 c4 d
-  c r e r
-  r2 s2
-  a,4 r a r
-  a r r a
-  a2 \property VoiceCombineThread.soloADue = ##f a
-}
-          
-flautiStaff =  \notes \context VoiceCombineStaff = flauti <
-  \property VoiceCombineStaff.midiInstrument = #"flute"
-%  \property VoiceCombineStaff.instrument = #"2 Flauti"
-%  \property VoiceCombineStaff.instr = #"Fl."
-
-  \property VoiceCombineStaff.instrument =
-    \markup { \column << "Clarinetti" { "in B" \raisedFlat } >> }
-
-  \property VoiceCombineStaff.instr
-       = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
-
-  %\global
-  \context VoiceCombineVoice=one \partcombine VoiceCombineVoice
-    \context VoiceCombineThread=one \flautoI
-    \context VoiceCombineThread=two \flautoII
->
-
-legniGroup =  \context StaffGroup = legni_group <
-  \flautiStaff
-  %\oboiStaff
-  %\clarinettiStaff
-  %\fagottiStaff
->
-
-violinoI = \notes\relative c'' {
-  c4 d e f
-  c d e f
-  c d e f
-  c d e f
-  c d e f
-  c d e f
-  c4 d e f
-  a8 a a a b b b b
-  d1
-}      
-
-violinoII = \notes\relative c'' { 
-  c4 d e f
-  c d e f
-  c d e f
-  c2 e2
-  c4 d e f
-  c2 e2
-  c,4 d e f
-  a8 a a a b b b b
-  b1
-}
-
-violinoIStaff =  \context Staff = oneViolini <
- \property Staff.midiInstrument = #"violin"
-  \property Staff.instrument = #"Violino I"
-  \property Staff.instr = #"Vl. I"
-  \violinoI
-  \End
->
-
-violinoIIStaff =  \context Staff = twoViolini <
-  % MIDI hoort geeneens verschil tussen een
-  % eerste en tweede viool -)
-  \property Staff.midiInstrument = #"violin"
-  \property Staff.instrument = #"Violino II"
-  \property Staff.instr = #"Vl II"
-  \violinoII
-  \End
->
-
-violaI = \notes\transpose c' c, \violinoI
-
-violaII = \notes\transpose c' c, \violinoII
-
-violeGroup =  \notes \context VoiceCombineStaff = oneViole <
-  \property VoiceCombineStaff.midiInstrument = #"viola"
-  \property VoiceCombineStaff.instrument = #"Viola"
-  \property VoiceCombineStaff.instr = #"Vla."
-  %\clef "alto"
-  % Ugh, clef broken in 1.3.125
-  \property VoiceCombineStaff.clefGlyph = #"clefs-C"
-  \property VoiceCombineStaff.clefPosition = #0
-  \key f \major
-  \End
-
-  \context VoiceCombineVoice=oneViole \partcombine VoiceCombineVoice
-    \context VoiceCombineThread=oneViole \violaI
-    \context VoiceCombineThread=twoViole \violaII
->
-
-violoncello = \notes\relative c {
-  c1-\ff d e f c d e f c
-}
-
-contrabasso = \notes\relative c {
-  c1-\pp
-  d4 e d e
-  e1
-  f4 g f g
-  c1
-  d4 e d e
-  e1
-  f4 g f g
-  c1
-}
-
-
-bassiGroup =  \context PianoStaff = bassi_group \notes <
-  \context StaffCombineStaff=oneBassi {
-    \property StaffCombineStaff.midiInstrument = #"cello"
-
-    % Ugh, markup burps
-    \property StaffCombineStaff.instrument     = \markup \column << "Violoncello" "e" "Contrabasso" >>
-  \property StaffCombineStaff.instr            = \markup \column <<  "Vc." "Cb." >>
-
-    
-    %\clef "bass"
-    % Ugh, clef broken in 1.3.125
-    \property StaffCombineStaff.clefGlyph = #"clefs-F"
-    \property StaffCombineStaff.clefPosition = #2
-
-    \key es \major
-    \End
-  }
-  \context StaffCombineStaff=twoBassi {
-    \property StaffCombineStaff.midiInstrument = #"contrabass"
-    \property StaffCombineStaff.instrument = #"Contrabasso"
-    \property StaffCombineStaff.instr = #"Cb."
-    
-    %\clef "bass"
-    % Ugh, clef broken in 1.3.125
-    \property StaffCombineStaff.clefGlyph = #"clefs-F"
-    \property StaffCombineStaff.clefPosition = #2
-    
-    \key as \major
-    \End
-  }
-
-  \context StaffCombineStaff=oneBassi \partcombine StaffCombineStaff
-    \context StaffCombineVoice=oneBassi \violoncello
-    \context StaffCombineVoice=twoBassi \contrabasso
->
-
-
-violiniGroup =  \context GrandStaff = violini_group <
-  \violinoIStaff
-  \violinoIIStaff
->
-
-archiGroup =  \context StaffGroup = archi_group <
-  \violiniGroup
-  \violeGroup
-  \bassiGroup
->
-
-
-\score{
-  <
-    \legniGroup
-    %\ottoniGroup
-    %\timpaniGroup
-    \archiGroup
-  >
-  \header {
-    title = "Coriolan"
-    subtitle = "Ouverture" 
-    opus = "Opus 62"
-    composer = "Ludwig van Beethoven (1770-1827)"
-    enteredby = "JCN"
-    copyright = "public domain"
-  }
-  \paper{
-    \paperSixteen
-
-    %textheight = 290.0\mm
-    %linewidth = 195.0\mm
-    textheight = 285.0\mm
-    linewidth = 190.0\mm
-
-    \translator{ \RemoveEmptyStaffContext }
-    %
-    % The Voice combine hierarchy
-    %
-    \translator{
-      \ThreadContext
-      \name "VoiceCombineThread"
-      \consists "Rest_engraver"
-    }
-    \translator{
-      \VoiceContext
-      \name "VoiceCombineVoice"
-      soloText = #"I."
-      soloIIText = #"II."
-      \remove "Rest_engraver"
-      \accepts "VoiceCombineThread"
-    }
-    \translator{
-      \RemoveEmptyStaffContext
-      \consists "Mark_engraver"
-      \name "VoiceCombineStaff"
-      \accepts "VoiceCombineVoice"
-    }
-
-    %
-    % The Staff combine hierarchy
-    %
-    \translator{
-      \ThreadContext
-      \name "StaffCombineThread"
-    }
-    \translator{
-      \VoiceContext
-      \name "StaffCombineVoice"
-      \accepts "StaffCombineThread"
-      \consists "Thread_devnull_engraver"
-    }
-    \translator {
-      \RemoveEmptyStaffContext
-      \name "StaffCombineStaff"
-      \accepts "StaffCombineVoice"
-
-      soloADue = ##t
-      soloText = #""
-      soloIIText = #""
-      % This is non-conventional, but currently it is
-      % the only way to tell the difference.
-      aDueText = #"\\`a2"
-      splitInterval = #'(1 . 0)
-      changeMoment = #`(,(ly:make-moment 1 1) . ,(ly:make-moment 1 1))
-    }
-    \translator {
-      \StaffGroupContext
-      \accepts "VoiceCombineStaff"
-      \accepts "StaffCombineStaff"
-    }
-    \translator{ \RemoveEmptyStaffContext }
-
-    \translator {
-      %\ScoreContext
-      \OrchestralScoreContext
-      \accepts "VoiceCombineStaff"
-      \accepts "StaffCombineStaff"
-      TimeSignature \override #'style = #'C
-      skipBars = ##t 
-      BarNumber \override #'padding = #3
-      RestCollision \override #'maximum-rest-count = #1
-    }
-  }
-}
-%% new-chords-done %%