Add entities for a couple of common sections and use them where appropriate

Move Track Display section to separate file

Move section on track controls to a separate file


git-svn-id: svn://localhost/ardour2/trunk@1895 d708f5d6-7413-0410-9779-e7cbd77b26cf

9 files changed, 57 insertions, 29 deletions

diff --git a/manual/xml/editor_window.xml b/manual/xml/editor_window.xml
index 8f56afaa2e..006882d5a5 100644
--- a/manual/xml/editor_window.xml
+++ b/manual/xml/editor_window.xml
@@ -51,15 +51,8 @@
       sections.
     </para>
   </section>
-
-  <section id="editor-window-track-display">
-    <title>Track Display</title>
-    <para>
-      This is the main area within the editor. Each track or bus is
-      represented by a horizontal "stripe", with a set of controls on the
-      left side, with the timeline above them all.
-    </para>
-  </section>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+	  	href="track_display.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="editor_window_timeline.xml" />
   <section id="editor-window-track-controls">
diff --git a/manual/xml/entities.ent b/manual/xml/entities.ent
index f21530b9f4..95cd0ef2a5 100644
--- a/manual/xml/entities.ent
+++ b/manual/xml/entities.ent
@@ -9,3 +9,12 @@
 <!ENTITY ARDOUR_COMMAND "<command>ardour-&ARDOUR_VERSION;</command>">
 <!ENTITY ARDOUR_APPLICATION "<application>&ARDOUR_NAME;</application>">
 <!ENTITY COPYRIGHT_HOLDER "&ARDOUR_NAME; Foundation">
+
+<!ENTITY MIX_WIN '<link linkend="sn-mixer-window">Mixer Window</link>'>
+<!ENTITY EDIT_WIN '<link linkend="sn-editor-window">Editor Window</link>'>
+
+<!ENTITY MIXER_STRIP '<link linkend="sn-mixer-strips">Mixer Strip</link>'>
+<!ENTITY MIXER_STRIP_LIST '<link linkend="sn-mixer-strip-list">Mixer Strip List</link>'>
+
+<!ENTITY TRACK_DISPLAY '<link linkend="sn-track-display">Track Display</link>'>
+<!ENTITY TRACK_CONTROLS '<link linkend="sn-track-controls">Track Controls</link>'>
diff --git a/manual/xml/mixer_strip_list.xml b/manual/xml/mixer_strip_list.xml
index ca72916e85..4f1d4c1d9f 100644
--- a/manual/xml/mixer_strip_list.xml
+++ b/manual/xml/mixer_strip_list.xml
@@ -4,7 +4,7 @@
 
 ]>
 
-<section id="mixer-window-strip-list">
+<section id="sn-mixer-strip-list">
   <title> Strip List </title>
   <para>
     The Strip List provides a simple interface to the layout of the mixer
diff --git a/manual/xml/mixer_strips.xml b/manual/xml/mixer_strips.xml
index e6d4617774..502dbd64d3 100644
--- a/manual/xml/mixer_strips.xml
+++ b/manual/xml/mixer_strips.xml
@@ -6,7 +6,7 @@
 
 <!-- XXX lots to do on this page -->
 
-<section id="mixer-strips">
+<section id="sn-mixer-strips">
   <title>Mixer Strips</title>
   <para>
     Each track and bus is represented in the mixer window by a
diff --git a/manual/xml/removing_tracks.xml b/manual/xml/removing_tracks.xml
index 67d3fc69fb..5297ae05ae 100644
--- a/manual/xml/removing_tracks.xml
+++ b/manual/xml/removing_tracks.xml
@@ -14,11 +14,9 @@
     <secondary>Removing</secondary>
   </indexterm>
   <para>
-    A track can be removed from within the
-    <link linkend="sn-editor-window">Editor Window</link> by right-clicking
-    in the empty space in the <link linkend="track-controls">Track
-    Controls</link> to bring up the track context menu and choosing
-    <guimenuitem>Remove</guimenuitem>.
+    A track can be removed from within the &MIX_WIN; by right-clicking in
+    the empty space in the &TRACK_CONTROLS; to bring up the track context
+    menu and choosing <guimenuitem>Remove</guimenuitem>.
   </para>
   <mediaobject>
     <imageobject>
@@ -26,9 +24,9 @@
     </imageobject>
   </mediaobject>
   <para>
-    Alternatively a track can also be removed from within the
-    <link linkend="sn-mixer-window">Mixer Window</link> by clicking on the
-    track name button and choosing <guimenuitem>Remove</guimenuitem>.
+    Alternatively a track can also be removed from within the &MIX_WIN; by
+    clicking on the track name button and choosing
+    <guimenuitem>Remove</guimenuitem>.
   </para>
 
   <note>
diff --git a/manual/xml/renaming_tracks.xml b/manual/xml/renaming_tracks.xml
index 22aa34e72b..6d1bfb9701 100644
--- a/manual/xml/renaming_tracks.xml
+++ b/manual/xml/renaming_tracks.xml
@@ -2,21 +2,21 @@
 
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
+<!ENTITY % BOOK_ENTITIES SYSTEM "./entities.ent">
+%BOOK_ENTITIES;
+
 ]>
 
 <section id="renaming-tracks">
   <title>Renaming Tracks</title>
   <para>
-    Tracks can be renamed from within the
-    <link linkend="sn-editor-window">Editor Window</link> or the
-    <link linkend="sn-mixer-window">Mixer Window</link>.
+    Tracks can be renamed from within the &EDIT_WIN; or the &MIX_WIN;.
   </para>
 
   <para>
     To change the name of a track in the Editor Window click within the
-    track name field in the <link linkend="track-controls">Track
-    Controls</link>, enter the new track name and press the
-    <keycap>Enter</keycap> key to confirm the change.
+    track name field in the &TRACK_CONTROLS;, enter the new track name and
+    press the <keycap>Enter</keycap> key to confirm the change.
   </para>
   <mediaobject>
     <imageobject>
diff --git a/manual/xml/track_controls.xml b/manual/xml/track_controls.xml
new file mode 100644
index 0000000000..77a5447c32
--- /dev/null
+++ b/manual/xml/track_controls.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!ENTITY % BOOK_ENTITIES SYSTEM "./entities.ent">
+%BOOK_ENTITIES;
+
+]>
+
+<section id="sn-track-controls">
+  <title>Track Controls</title>
+  <para></para>
+</section>
diff --git a/manual/xml/track_display.xml b/manual/xml/track_display.xml
new file mode 100644
index 0000000000..603bc919c0
--- /dev/null
+++ b/manual/xml/track_display.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!ENTITY % BOOK_ENTITIES SYSTEM "./entities.ent">
+%BOOK_ENTITIES;
+
+]>
+
+<section id="sn-track-display">
+  <title>Track Display</title>
+  <para>
+    This is the main area within the editor. Each track or bus is
+    represented by a horizontal "stripe", with a set of controls on the left
+    side, with the timeline above them all.
+  </para>
+</section>
diff --git a/manual/xml/tracks_and_busses.xml b/manual/xml/tracks_and_busses.xml
index 37e1fce313..4e1ac6adb5 100644
--- a/manual/xml/tracks_and_busses.xml
+++ b/manual/xml/tracks_and_busses.xml
@@ -255,10 +255,8 @@
     </section>
   </section>
 
-  <section id="track-controls">
-    <title>Track Controls</title>
-    <para></para>
-  </section>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		href="track_controls.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="default_track_names.xml" />
 <!--