From: Graham Percival <graham@percival-music.ca>
Date: Tue, 30 Aug 2011 06:03:43 +0000 (+0100)
Subject: Regtests: combine accidental-forced-tie*.ly
X-Git-Tag: release/2.15.9-1^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=49f4fb6f68ad50d9e00d3bbaa63d4e9dec7bad27;p=lilypond.git

Regtests: combine accidental-forced-tie*.ly
---

diff --git a/input/regression/accidental-forced-tie-barline.ly b/input/regression/accidental-forced-tie-barline.ly
deleted file mode 100644
index b62d22a11f..0000000000
--- a/input/regression/accidental-forced-tie-barline.ly
+++ /dev/null
@@ -1,17 +0,0 @@
-\version "2.14.0"
-
-\header {
-  texidoc = "Cautionary accidentals applied to tied notes after a
-bar line are valid for the whole measure."
-}
-
-notes = \relative c' {
-  fis1 ~
-  fis!2 fis ~
-  fis?2 fis
-}
-
-<<
-  \new NoteNames \notes
-  \new Staff \notes
->>
diff --git a/input/regression/accidental-forced-tie.ly b/input/regression/accidental-forced-tie.ly
index c875dc81e0..1b33cc9a87 100644
--- a/input/regression/accidental-forced-tie.ly
+++ b/input/regression/accidental-forced-tie.ly
@@ -1,7 +1,10 @@
 \version "2.14.0"
 
 \header {
-  texidoc = "Accidentals can be forced with ! and ? even if the notes are tied."
+  texidoc = "Accidentals can be forced with ! and ? even if the
+notes are tied.  Cautionary accidentals applied to tied notes
+after a bar line are valid for the whole measure.
+"
 }
 
 \layout {
@@ -9,5 +12,9 @@
 }
 
 \relative c'' {
-  gis4 ~ gis!~ gis?
+  gis4 ~ gis!~ gis? r4
+  fis1 ~
+  fis!2 fis ~
+  fis?2 fis
 }
+