From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 26 Jul 2003 13:34:16 +0000 (+0000)
Subject: rename from poly-metric
X-Git-Tag: release/1.7.30~68
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5d8cf49b6e587e27c789e917272c288507102da6;p=lilypond.git

rename from poly-metric
add example with disparate note value.
---

diff --git a/ChangeLog b/ChangeLog
index d6e0c2c0f7..f74710ec71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-07-26  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* input/test/polymetric.ly: rename from poly-metric
+	add example with disparate note value.
+
 	* scripts/ly2dvi.py (include_path): bugfix: use outbase
 	iso. outname.
 
diff --git a/input/test/poly-metric.ly b/input/test/poly-metric.ly
deleted file mode 100644
index 86286d5b8e..0000000000
--- a/input/test/poly-metric.ly
+++ /dev/null
@@ -1,43 +0,0 @@
-\version "1.7.18"
-
-\header{ texidoc="@cindex Time Signature Multiple
-You can have multiple time signatures occuring at the same time.
-
-This is done by moving the timing engraver to staff context. Also,
-Staff should be given the alias @code{Timing} to make @code{\time}
-command work correctly.
-
-Barlines distort the regular spacing, though.
-
-" }
-
-\score{
-    \notes \relative c'  <
-    	\context Staff= AS {
-	    \time 3/4
-	    c4 c c | c c c |
-	}
-    	\context Staff=BS {
-	    \time 2/4
-	    c4 c | c c | c c
-	}
-    	\context Staff =CS {
-	    \time 3/8
-	    c4. c8 c c   c4. c8 c c
-	}
-    >
-
-    \paper{
-    	raggedright = ##t
-	\translator{
-	    \ScoreContext
-	    \remove "Timing_engraver"
-	}
-	\translator{
-	    \StaffContext
-	    \consists "Timing_engraver"
-	    \alias "Timing"
-	}
-    }
-}
-
diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly
new file mode 100644
index 0000000000..e3b17665a5
--- /dev/null
+++ b/input/test/polymetric.ly
@@ -0,0 +1,55 @@
+\version "1.7.18"
+
+\header{ texidoc="@cindex Time Signature Multiple
+
+@cindex polymetric music
+
+You can have multiple time signatures occuring at the same time.
+
+This is done by moving the timing engraver to staff context. Also,
+Staff should be given the alias @code{Timing} to make @code{\time}
+command work correctly. Barlines distort the regular spacing, though.
+
+If the note durations do not line up, \times can be used to scale up a
+staff. The second staff has a 3/4 signature with a 3/5 tuplet over all
+of the notes. Switching off the tuplet bracket, and manually printing
+a 10/8 sign gives the desired effect.
+
+" }
+
+\score{
+    \notes \relative c'  <
+    	\context Staff= AS {
+	    \time 3/4
+	    c4 c c | c c c |
+	}
+    	\context Staff= DS {
+	    \time 3/4
+	    \property Staff.timeSignatureFraction= #'(10 . 8)
+	    \property Staff.tupletInvisible = ##t
+	    \times 3/5 { c4. c4. c4 c4 |  c4. c4. c4 c4  }
+	}
+    	\context Staff=BS {
+	    \time 2/4
+	    c4 c | c c | c c
+	}
+    	\context Staff =CS {
+	    \time 3/8
+	    c4. c8 c c   c4. c8 c c
+	}
+    >
+
+    \paper{
+    	raggedright = ##t
+	\translator{
+	    \ScoreContext
+	    \remove "Timing_engraver"
+	}
+	\translator{
+	    \StaffContext
+	    \consists "Timing_engraver"
+	    \alias "Timing"
+	}
+    }
+}
+