GNOME.org
 

[gnome-doc-utils/mallard: 21/87] Adjusting and fixing links on inline pages

commit 34969cc6d43cbf08a594d1327b863d95041d12d9
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Nov 10 11:15:23 2008 -0600

    Adjusting and fixing links on inline pages
---
 doc/mallard/C/mal_inline.xml        |   20 +++++++++++++++++++-
 doc/mallard/C/mal_inline_app.xml    |    2 +-
 doc/mallard/C/mal_inline_cmd.xml    |    2 +-
 doc/mallard/C/mal_inline_code.xml   |    2 +-
 doc/mallard/C/mal_inline_em.xml     |    2 +-
 doc/mallard/C/mal_inline_file.xml   |    2 +-
 doc/mallard/C/mal_inline_gui.xml    |    2 +-
 doc/mallard/C/mal_inline_guiseq.xml |    2 +-
 doc/mallard/C/mal_inline_input.xml  |    2 +-
 doc/mallard/C/mal_inline_key.xml    |    5 +++--
 doc/mallard/C/mal_inline_keyseq.xml |    2 +-
 doc/mallard/C/mal_inline_link.xml   |    2 +-
 doc/mallard/C/mal_inline_media.xml  |    3 ++-
 doc/mallard/C/mal_inline_output.xml |    2 +-
 doc/mallard/C/mal_inline_quote.xml  |    2 +-
 doc/mallard/C/mal_inline_span.xml   |    7 ++++---
 doc/mallard/C/mal_inline_sys.xml    |    5 +++--
 doc/mallard/C/mal_inline_var.xml    |    5 +++--
 18 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/doc/mallard/C/mal_inline.xml b/doc/mallard/C/mal_inline.xml
index 1804d31..055aaad 100644
--- a/doc/mallard/C/mal_inline.xml
+++ b/doc/mallard/C/mal_inline.xml
@@ -32,10 +32,13 @@ mal_inline = mixed {
   element * - (mal:* | local:*) { text } *
 }
 mal_inline__simple = mixed {
+  <link xref="mal_inline_span">mal_inline_span</link> *,
   <link xref="mal_inline_var">mal_inline_var</link> *,
   element * - (mal:* | local:*) { text } *
 }
-mal_inline__text = mixed { element * - (mal:* | local:*) { text } * }
+mal_inline__text = mixed {
+  element * - (mal:* | local:*) { text } *
+}
 </code></synopsis>
 
 <comment>
@@ -43,4 +46,19 @@ mal_inline__text = mixed { element * - (mal:* | local:*) { text } * }
   <p>Add some intro text and general processing expectations</p>
 </comment>
 
+<section id="elements">
+  <info>
+    <title type="link">Inline Elements</title>
+  </info>
+  <title>Elements</title>
+</section>
+
+<section id="processing">
+  <title>Processing Expectations</title>
+  <comment>
+    <cite date="2008-11-10"><name>Shaun McCance</name></cite>
+    <p>Add processing expectations</p>
+  </comment>
+</section>
+
 </page>
diff --git a/doc/mallard/C/mal_inline_app.xml b/doc/mallard/C/mal_inline_app.xml
index 0855622..8fa1e97 100644
--- a/doc/mallard/C/mal_inline_app.xml
+++ b/doc/mallard/C/mal_inline_app.xml
@@ -4,7 +4,7 @@
       id="mal_inline_app">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
   <link type="seealso" xref="mal_attr_link"/>
 
   <version number="0.1" date="2007-02-08" status="review"/>
diff --git a/doc/mallard/C/mal_inline_cmd.xml b/doc/mallard/C/mal_inline_cmd.xml
index 685c696..502f451 100644
--- a/doc/mallard/C/mal_inline_cmd.xml
+++ b/doc/mallard/C/mal_inline_cmd.xml
@@ -3,7 +3,7 @@
       id="mal_inline_cmd">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
   <link type="seealso" xref="mal_block_screen"/>
   <link type="seealso" xref="mal_attr_link"/>
 
diff --git a/doc/mallard/C/mal_inline_code.xml b/doc/mallard/C/mal_inline_code.xml
index e797a2c..397a46a 100644
--- a/doc/mallard/C/mal_inline_code.xml
+++ b/doc/mallard/C/mal_inline_code.xml
@@ -3,7 +3,7 @@
       id="mal_inline_code">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
   <link type="seealso" xref="mal_attr_link"/>
 
   <credit type="author">
diff --git a/doc/mallard/C/mal_inline_em.xml b/doc/mallard/C/mal_inline_em.xml
index f52f473..4cbb996 100644
--- a/doc/mallard/C/mal_inline_em.xml
+++ b/doc/mallard/C/mal_inline_em.xml
@@ -3,7 +3,7 @@
       id="mal_inline_em">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
   <link type="seealso" xref="mal_attr_link"/>
 
   <credit type="author">
diff --git a/doc/mallard/C/mal_inline_file.xml b/doc/mallard/C/mal_inline_file.xml
index 96bf6df..8e85c4e 100644
--- a/doc/mallard/C/mal_inline_file.xml
+++ b/doc/mallard/C/mal_inline_file.xml
@@ -3,7 +3,7 @@
       id="mal_inline_file">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
   <link type="seealso" xref="mal_attr_link"/>
 
   <credit type="author">
diff --git a/doc/mallard/C/mal_inline_gui.xml b/doc/mallard/C/mal_inline_gui.xml
index b69b201..001fec8 100644
--- a/doc/mallard/C/mal_inline_gui.xml
+++ b/doc/mallard/C/mal_inline_gui.xml
@@ -3,7 +3,7 @@
       id="mal_inline_gui">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
   <link type="seealso" xref="mal_attr_link"/>
 
   <credit type="author">
diff --git a/doc/mallard/C/mal_inline_guiseq.xml b/doc/mallard/C/mal_inline_guiseq.xml
index 1515b9d..c95d3b2 100644
--- a/doc/mallard/C/mal_inline_guiseq.xml
+++ b/doc/mallard/C/mal_inline_guiseq.xml
@@ -3,7 +3,7 @@
       id="mal_inline_guiseq">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
 
   <credit type="author">
     <name>Shaun McCance</name>
diff --git a/doc/mallard/C/mal_inline_input.xml b/doc/mallard/C/mal_inline_input.xml
index 3c634d2..a082ebe 100644
--- a/doc/mallard/C/mal_inline_input.xml
+++ b/doc/mallard/C/mal_inline_input.xml
@@ -3,7 +3,7 @@
       id="mal_inline_input">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
   <link type="seealso" xref="mal_attr_link"/>
   <link type="seealso" xref="mal_inline_output"/>
 
diff --git a/doc/mallard/C/mal_inline_key.xml b/doc/mallard/C/mal_inline_key.xml
index 760a9bb..1cfa482 100644
--- a/doc/mallard/C/mal_inline_key.xml
+++ b/doc/mallard/C/mal_inline_key.xml
@@ -3,8 +3,9 @@
       id="mal_inline_key">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
-  <link type="seealso" xref="mal_link#ubiquitous"/>
+  <link type="guide" xref="mal_inline#elements"/>
+  <link type="seealso" xref="mal_attr_link"/>
+
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_inline_keyseq.xml b/doc/mallard/C/mal_inline_keyseq.xml
index aa9a6d4..1fb9d05 100644
--- a/doc/mallard/C/mal_inline_keyseq.xml
+++ b/doc/mallard/C/mal_inline_keyseq.xml
@@ -3,7 +3,7 @@
       id="mal_inline_keyseq">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
 
   <credit type="author">
     <name>Shaun McCance</name>
diff --git a/doc/mallard/C/mal_inline_link.xml b/doc/mallard/C/mal_inline_link.xml
index 56a5ab8..69f67ab 100644
--- a/doc/mallard/C/mal_inline_link.xml
+++ b/doc/mallard/C/mal_inline_link.xml
@@ -3,7 +3,7 @@
       id="mal_inline_link">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
 
   <version number="0.1" date="2007-02-05" status="incomplete"/>
 
diff --git a/doc/mallard/C/mal_inline_media.xml b/doc/mallard/C/mal_inline_media.xml
index e6c8886..a218ec7 100644
--- a/doc/mallard/C/mal_inline_media.xml
+++ b/doc/mallard/C/mal_inline_media.xml
@@ -3,7 +3,8 @@
       id="mal_inline_media">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
+
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_inline_output.xml b/doc/mallard/C/mal_inline_output.xml
index 2f5d831..9edbb5c 100644
--- a/doc/mallard/C/mal_inline_output.xml
+++ b/doc/mallard/C/mal_inline_output.xml
@@ -3,7 +3,7 @@
       id="mal_inline_output">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
   <link type="seealso" xref="mal_attr_link"/>
 
   <credit type="author">
diff --git a/doc/mallard/C/mal_inline_quote.xml b/doc/mallard/C/mal_inline_quote.xml
index 2a3411e..0589bf6 100644
--- a/doc/mallard/C/mal_inline_quote.xml
+++ b/doc/mallard/C/mal_inline_quote.xml
@@ -3,7 +3,7 @@
       id="mal_inline_quote">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
+  <link type="guide" xref="mal_inline#elements"/>
   <link type="seealso" xref="mal_block_quote"/>
   <link type="seealso" xref="mal_attr_link"/>
 
diff --git a/doc/mallard/C/mal_inline_span.xml b/doc/mallard/C/mal_inline_span.xml
index f414b53..44ebbd4 100644
--- a/doc/mallard/C/mal_inline_span.xml
+++ b/doc/mallard/C/mal_inline_span.xml
@@ -3,15 +3,16 @@
       id="mal_inline_span">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
-  <link type="seealso" xref="mal_link#ubiquitous"/>
+  <link type="guide" xref="mal_inline#elements"/>
+  <link type="seealso" xref="mal_attr_link"/>
+
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
 <title>Spans</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_inline_span = element em {
+mal_inline_span = element span {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
   <link xref="mal_inline#simple">mal_inline__simple</link> +
 }
diff --git a/doc/mallard/C/mal_inline_sys.xml b/doc/mallard/C/mal_inline_sys.xml
index 1fcf41b..e94f0c1 100644
--- a/doc/mallard/C/mal_inline_sys.xml
+++ b/doc/mallard/C/mal_inline_sys.xml
@@ -3,8 +3,9 @@
       id="mal_inline_sys">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
-  <link type="seealso" xref="mal_link#ubiquitous"/>
+  <link type="guide" xref="mal_inline#elements"/>
+  <link type="seealso" xref="mal_attr_link"/>
+
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_inline_var.xml b/doc/mallard/C/mal_inline_var.xml
index 40fae8a..fc66c97 100644
--- a/doc/mallard/C/mal_inline_var.xml
+++ b/doc/mallard/C/mal_inline_var.xml
@@ -3,8 +3,9 @@
       id="mal_inline_var">
 
 <info>
-  <link type="guide" xref="mal_inline"/>
-  <link type="seealso" xref="mal_link#ubiquitous"/>
+  <link type="guide" xref="mal_inline#elements"/>
+  <link type="seealso" xref="mal_attr_link"/>
+
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]