Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  recommend more precise rounding

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index 69fac25f0c710a38f16c25c10890fa56e7ea907a..480da8cc7517ca70af4f90fa647adeb256243bfc 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -27,7 +27,7 @@ TAGS.extend (['vocal-music', 'chords', 'piano-music',
 
 # other
 TAGS.extend (['contexts-and-engravers', 'tweaks-and-overrides', 'paper-and-layout', 'breaks',
-'spacing', 'midi', 'titles', 'other'])
+'spacing', 'midi', 'titles', 'template', 'other'])
 
 def exit_with_usage (n=0):
        sys.stderr.write (USAGE)

diff --git a/input/lsr/snippets.tely b/input/lsr/snippets.tely
index 3df2c1c95fc500fb20233fe0b642fbd304c6941a..464b8a8d9db9c79f876b029dcbe302f667f24723 100644 (file)
--- a/input/lsr/snippets.tely
+++ b/input/lsr/snippets.tely
@@ -97,9 +97,14 @@ Other collections
 * Titles::
 * Spacing::
 * MIDI::
+* Templates::
 * Other::
 @end menu
 
+
+@c Please take care of naming every .itely
+@c with an existing tag name.
+
 @include pitches.itely
 @include rhythms.itely
 @include expressive-marks.itely
@@ -125,6 +130,9 @@ Other collections
 @include titles.itely
 @include spacing.itely
 @include midi.itely
+@include template.itely
+
+@c temporary input/new tag, will be deleted
 @include other.itely
 
 @bye

diff --git a/input/lsr/template-intro.itely b/input/lsr/template-intro.itely
new file mode 100644 (file)
index 0000000..22c9952
--- /dev/null
+++ b/input/lsr/template-intro.itely
@@ -0,0 +1,5 @@
+@node Templates
+@unnumbered Templates
+
+@lysnippets
+

diff --git a/input/new/paper-and-layout/toc.ly b/input/new/paper-and-layout/toc.ly
index e6164ea602f36382764e6cfeb06f5127ff262080..93886b2a7060698928a03ff22010bbb6b67430c6 100644 (file)
--- a/input/new/paper-and-layout/toc.ly
+++ b/input/new/paper-and-layout/toc.ly
@@ -26,4 +26,4 @@ the @code{\\tocItem} command."
     { e' }
     \header { piece = "Second score" }
   }
-}
\ No newline at end of file
+}

diff --git a/input/new/spacing/page-label.ly b/input/new/spacing/page-label.ly
index cb023872dc64d1adcb0d8b0da51baf851eb25b0b..e4f9cc6947a2a95bc290f36c218b28f29f60b387 100644 (file)
--- a/input/new/spacing/page-label.ly
+++ b/input/new/spacing/page-label.ly
@@ -43,4 +43,4 @@ and refered to in markups."
     }
     \header { piece = "First score" }
   }
-}
\ No newline at end of file
+}

diff --git a/input/new/text/utf-8.ly b/input/new/text/utf-8.ly
index abd4227671ac18f736a69a72be1f1717063c6d07..c057887ca13486b7c2ea3c2e3594bd2df916dcc8 100644 (file)
--- a/input/new/text/utf-8.ly
+++ b/input/new/text/utf-8.ly
@@ -29,6 +29,8 @@ will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese.
   
 }
 
+% end verbatim - this comment is a hack to prevent texinfo.tex
+% from choking on non-European UTF-8 subsets
 % Cyrillic font
 bulgarian = \lyricmode {
   Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.