From: Carl Sorensen <c_sorensen@byu.edu>
Date: Fri, 4 Dec 2009 00:26:59 +0000 (-0700)
Subject: Doc -- add links on script columns
X-Git-Tag: release/2.13.9-1~34
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=32f4f9e832ded3ed6fd7ec6c92800a40e85bb3e8;p=lilypond.git

Doc -- add links on script columns
---

diff --git a/Documentation/contributor/issues.itexi b/Documentation/contributor/issues.itexi
index 9bf1f22120..6febab0471 100644
--- a/Documentation/contributor/issues.itexi
+++ b/Documentation/contributor/issues.itexi
@@ -6,9 +6,9 @@ This chapter deals with defects, feature requests, and
 miscellaneous development tasks.
 
 @menu
-* Introduction to issues::      
-* Issue classification::        
-* Adding issues to the tracker::  
+* Introduction to issues::
+* Issue classification::
+* Adding issues to the tracker::
 * Checking and verifying issues::
 * Summary of project status::
 * Finding the cause of a regression::
@@ -117,9 +117,9 @@ like Ancient notation, which nobody wants to touch.
 
 @end itemize
 
-Opsys lables: pretty self-explanatory.
+Opsys labels: pretty self-explanatory.
 
-Other lables:
+Other labels:
 
 @itemize
 
@@ -163,7 +163,7 @@ false/misleading warning message.
 @node Adding issues to the tracker
 @section Adding issues to the tracker
 
-FIXME: prettify.
+TODO: prettify.
 
 only done by Bug Meister, unless you're really certain you know
 what you're doing.
@@ -233,7 +233,6 @@ else about LilyPond development.
 @uref{http://code.google.com/p/lilypond/issues/list?can=2&q=label:Frog&mode=grid&y=Priority&x=Type&cells=ids}
 @end example
 
-
 @node Finding the cause of a regression
 @section Finding the cause of a regression
 
diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely
index 223bab244f..9a707d6e88 100644
--- a/Documentation/notation/expressive.itely
+++ b/Documentation/notation/expressive.itely
@@ -110,6 +110,14 @@ in @file{scm/@/script@/.scm}.  Articulations and ornamentations
 may be manually placed above or below the staff; see
 @ref{Direction and placement}.
 
+Articulations are @code{Script} objects.  Their properties are
+described more fully in @rinternals{Script}.
+
+In addition to articulations, text and markups can be attached to
+notes.  See @ref{Text scripts}.
+
+For more information about the ordering of Scripts and TextScripts that
+are attached to the notes, see @rlearning{Placement of objects}.
 
 @snippets
 
@@ -129,7 +137,12 @@ Music Glossary:
 @rglos{staccato},
 @rglos{portato}.
 
+Learning Manual:
+@rlearning{Placement of objects}.
+
+
 Notation Reference:
+@ref{Text scripts},
 @ref{Direction and placement},
 @ref{List of articulations},
 @ref{Trills}.
diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 599990edb6..2a11b04e62 100644
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -82,6 +82,11 @@ a8^"pizz." g f e
 a4_"scherzando" f
 @end lilypond
 
+In addition to text scripts, articulations can be attached to notes.
+For more information, see @ref{Articulations and ornamentations}.
+
+For more information about the relative ordering of text scripts and
+articulations, see @rlearning{Placement of objects}.
 
 @funindex \textLengthOn
 @funindex textLengthOn
@@ -95,6 +100,9 @@ a4_"scherzando" f
 
 
 @seealso
+Learning Manual:
+@rlearning{Placement of objects}.
+
 Notation Reference:
 @ref{Formatting text},
 @ref{Direction and placement}.