From: John Mandereau Date: Fri, 29 Feb 2008 21:40:50 +0000 (+0100) Subject: Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into dev/jmandereau X-Git-Tag: release/2.11.42-1~7^2~15^2~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e44f9f849d05d3169088f71f4960923b1da826c3;hp=c84b7e4a957a8c2224f6a1ddef236bbccb4943b6;p=lilypond.git Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into dev/jmandereau * 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond: Misc small administrative changes. Remove remaining "user manual" strings. Small reminders and formatting tweaks. Conflicts: Please use @w{...} when @version{} is not followed by a white space character. Documentation/user/fundamental.itely Documentation/user/macros.itexi Documentation/user/tutorial.itely Documentation/user/working.itely --- diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely index 1ccf9bcf02..f9f9343f5f 100644 --- a/Documentation/user/fundamental.itely +++ b/Documentation/user/fundamental.itely @@ -1589,7 +1589,7 @@ engraver is removed from a context it can no longer produce its output. This is a crude way of modifying the output, but it can sometimes be useful. -@subsubsection Changing a single context +@subsubheading Changing a single context To remove an engraver from a single context we use the @code{\with} command placed immediately after the context creation @@ -1670,7 +1670,7 @@ the notes in all the voices on that staff: >> @end lilypond -@subsubsection Changing all contexts of the same type +@subsubheading Changing all contexts of the same type The examples above show how to remove or add engravers to individual contexts. It is also possible to remove or add diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely index 0a02af5d37..9ad929c4af 100644 --- a/Documentation/user/input.itely +++ b/Documentation/user/input.itely @@ -548,6 +548,11 @@ Also mention \override Foo #'direction = #'DOWN. also mention the typical \fooDown, \fooNeutral predefined commands. +also mention that some directions are (without other tweaking) +always up or always down (like dynamics or fermata), while other +things can alternate between up or down based on the stem direction +(like slurs or accents). + @node Distances and measurements MAYBE MOVE @subsection Distances and measurements MAYBE MOVE diff --git a/Documentation/user/lilypond-learning.tely b/Documentation/user/lilypond-learning.tely index ca8f2b0cc4..f700ed61c6 100644 --- a/Documentation/user/lilypond-learning.tely +++ b/Documentation/user/lilypond-learning.tely @@ -25,7 +25,7 @@ @c don't remove this comment. @ignore @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival -@omfdescription User manual of the LilyPond music engraving system +@omfdescription Learning Manual of the LilyPond music engraving system @omftype program usage @omfcategory Applications|Publishing @omflanguage English diff --git a/Documentation/user/lilypond-program.tely b/Documentation/user/lilypond-program.tely index 18ced37734..1ddba147e4 100644 --- a/Documentation/user/lilypond-program.tely +++ b/Documentation/user/lilypond-program.tely @@ -25,7 +25,7 @@ @c don't remove this comment. @ignore @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival -@omfdescription User manual of the LilyPond music engraving system +@omfdescription Program Usage of the LilyPond music engraving system @omftype program usage @omfcategory Applications|Publishing @omflanguage English diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 7c203800d7..59713a05d7 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore @setfilename lilypond.info -@settitle GNU LilyPond user manual +@settitle GNU LilyPond User Manual @documentencoding UTF-8 @documentlanguage en @@ -60,7 +60,7 @@ Distributions will want to install lilypond.info in postinstall, doing: @c don't remove this comment. @ignore @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival -@omfdescription User manual of the LilyPond music engraving system +@omfdescription Notation Reference of the LilyPond music engraving system @omftype user manual @omfcategory Applications|Publishing @omflanguage English @@ -84,7 +84,7 @@ This document is also available as a @titlepage @title LilyPond @subtitle The music typesetter -@titlefont{User manual} +@titlefont{Notation Reference} @author The LilyPond development team Copyright @copyright{} 1999--2007 by the authors @@ -136,7 +136,7 @@ Free Documentation License''. @top GNU LilyPond --- The music typesetter @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX. -This is the user manual for GNU LilyPond version @version{}. +This is the User Manual for GNU LilyPond version @version{}. @cindex web site @cindex URL diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 45378ffd61..8bc021c3a3 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -50,9 +50,9 @@ Copyright @copyright{} 1999--2007 by the authors @c TODO: multiple omfcreators? @ignore -@omfcreator Christian Mondrup +@omfcreator Christian Mondrup, Kurt Kroon @omfdescription Glossary of musical terms with translations -@omftype user's guide +@omftype glossary @omfcategory Applications|Publishing @omflanguage English @end ignore