From 9b8b5c2e05183a82ff687db186eb3eb3ff57f94e Mon Sep 17 00:00:00 2001
From: Urs Liska <ul@openlilylib.org>
Date: Mon, 21 Dec 2015 21:50:09 +0100
Subject: [PATCH] 4704: Add regtests and improve wording

---
 .../beam-subdivide-quarter-notes.ly           |  7 ++---
 .../beam-subdivide-shortened-beam.ly          | 28 +++++++++++++++++++
 .../beam-subdivide-trailing-stem.ly           | 22 +++++++++++++++
 input/regression/beam-subdivision.ly          |  4 +--
 4 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 input/regression/beam-subdivide-shortened-beam.ly
 create mode 100644 input/regression/beam-subdivide-trailing-stem.ly

diff --git a/input/regression/beam-subdivide-quarter-notes.ly b/input/regression/beam-subdivide-quarter-notes.ly
index af28282aca..a69dcf0390 100644
--- a/input/regression/beam-subdivide-quarter-notes.ly
+++ b/input/regression/beam-subdivide-quarter-notes.ly
@@ -4,10 +4,9 @@
   
   doctitle = "Beam subdivide over quarter notes"
 
-  texidoc = "Beam subdivisions should match the durations of the subdivided
-groups, as established by baseMoment.  However, if the groups are equal or
-longer than quarter notes, one beam should be left
-"
+  texidoc = "Beam count at subdivisions should match the location 
+of the current subdivision.  However, if the groups are equal or
+longer than quarter notes, one beam should always be left."
 
 }
 
diff --git a/input/regression/beam-subdivide-shortened-beam.ly b/input/regression/beam-subdivide-shortened-beam.ly
new file mode 100644
index 0000000000..665d837442
--- /dev/null
+++ b/input/regression/beam-subdivide-shortened-beam.ly
@@ -0,0 +1,28 @@
+\version "2.19.34"
+
+\header {
+  
+  doctitle = "Beam subdivide with incomplete remainder"
+
+  texidoc = "Beam count at subdivisions should match the count corresponding 
+to the location of the current subdivision.  However, if the remainder of the
+beam is shorter than that the beam count should be adopted accordingly."
+
+}
+
+\paper {
+  indent = 0
+}
+
+\relative c'' {
+  \omit Staff.TimeSignature
+  \time 1/4
+  \set subdivideBeams = ##t
+  \set baseMoment = #(ly:make-moment 1/32)
+  c64 ^\markup "Full beam (1/32 division)" [ c c c  c c c c  c c c c  c c c c ] 
+  c64 ^\markup "Shortened by 1/32" [ c c c  c c c c  c c c c  c c ] r32
+  c64 ^\markup "Shortened by 3/32" [ c c c  c c c c  c c  ] r16.
+  \set baseMoment = #(ly:make-moment 1/16)
+  c32 ^\markup "Full beam (1/16 division)" [ c c c c c c c ]
+  c32 ^\markup "Shortened by 1/16" [ c c c c c] r16
+}
diff --git a/input/regression/beam-subdivide-trailing-stem.ly b/input/regression/beam-subdivide-trailing-stem.ly
new file mode 100644
index 0000000000..de6d6bd1d2
--- /dev/null
+++ b/input/regression/beam-subdivide-trailing-stem.ly
@@ -0,0 +1,22 @@
+\version "2.19.34"
+
+\header {
+  
+  doctitle = "Beam subdivide over quarter notes"
+
+  texidoc = "If in a subdivided beam one single stem follows a subdivision
+the beam count should reflect the beam count of the subdivision as usual.
+That is, the beam count should not be increased according to the remaining
+length of the beam. The appended single stem has beamlets to the left."
+
+}
+
+\relative c' {
+  \time 1/4
+  \set subdivideBeams = ##t
+  \set baseMoment = #(ly:make-moment 1/16)
+  c32 [ c c c c32 ] r16.
+  c32 [ c c c c64 ] r32. r16
+  c32 [ c c32 ] r32 r8
+  c32 [ c c64 ] r32. r8
+}
\ No newline at end of file
diff --git a/input/regression/beam-subdivision.ly b/input/regression/beam-subdivision.ly
index 2aa8e2be62..e7dd0a7b73 100644
--- a/input/regression/beam-subdivision.ly
+++ b/input/regression/beam-subdivision.ly
@@ -1,7 +1,7 @@
 \header {
 
-  texidoc = "Beam subdivisions should match the durations of the subdivided
-groups, as established by baseMoment."
+  texidoc = "Beam count at subdivisions should match the location 
+of the current subdivision."
   }
 
 \version "2.19.19"
-- 
2.39.2