[gnome-doc-utils/mallard: 36/87] Removing mal_block__simple pattern

[Shaun McCance <shaunm src gnome org>]

commit 90758576842fe4d9acf23792087d38d3715a6358
Author: Shaun McCance <shaunm gnome org>
Date:   Wed Nov 12 11:42:45 2008 -0600

    Removing mal_block__simple pattern
---
 doc/mallard/C/mal_block.xml           |   18 ++++++------------
 doc/mallard/C/mal_block_comment.xml   |    2 +-
 doc/mallard/C/mal_block_figure.xml    |    3 +--
 doc/mallard/C/mal_block_note.xml      |    2 +-
 doc/mallard/C/mal_block_quote.xml     |    2 +-
 doc/mallard/C/mal_block_synopsis.xml  |    2 +-
 doc/mallard/C/mal_info_license.xml    |    2 +-
 doc/mallard/C/mal_list_bullet.xml     |    2 +-
 doc/mallard/C/mal_list_definition.xml |    2 +-
 doc/mallard/C/mal_list_numbered.xml   |    2 +-
 doc/mallard/C/mal_table.xml           |    2 +-
 11 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/doc/mallard/C/mal_block.xml b/doc/mallard/C/mal_block.xml
index 5fedc39..f2834d2 100644
--- a/doc/mallard/C/mal_block.xml
+++ b/doc/mallard/C/mal_block.xml
@@ -21,19 +21,16 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_block = (
+  <link xref="mal_block_code">mal_block_code</link> |
   <link xref="mal_block_comment">mal_block_comment</link> |
   <link xref="mal_block_figure">mal_block_figure</link> |
   <link xref="mal_block_media">mal_block_media</link> |
   <link xref="mal_block_note">mal_block_note</link> |
+  <link xref="mal_block_p">mal_block_p</link> |
+  <link xref="mal_block_screen">mal_block_screen</link> |
   <link xref="mal_block_synopsis">mal_block_synopsis</link> |
   <link xref="mal_list">mal_list</link> |
-  <link xref="mal_table">mal_table</link> |
-  mal_block__simple
-)
-mal_block__simple = (
-  <link xref="mal_block_code">mal_block_code</link> |
-  <link xref="mal_block_p">mal_block_p</link> |
-  <link xref="mal_block_screen">mal_block_screen</link>
+  <link xref="mal_table">mal_table</link>
 )
 </code></synopsis>
 
@@ -45,10 +42,7 @@ mal_block__simple = (
 
 <!-- BEGIN simple -->
 <section id="simple">
-<title>Simple Block Elements</title>
-
-<synopsis><code mime="application/relax-ng-compact-syntax">
-</code></synopsis>
+  <title>Simple Block Elements</title>
 
 </section>
 <!-- END simple -->
@@ -56,7 +50,7 @@ mal_block__simple = (
 
 <!-- BEGIN containers -->
 <section id="containers">
-<title>Block Container Elements</title>
+  <title>Block Container Elements</title>
 
 </section>
 <!-- END containers -->
diff --git a/doc/mallard/C/mal_block_comment.xml b/doc/mallard/C/mal_block_comment.xml
index fd1f5f1..2f6bddc 100644
--- a/doc/mallard/C/mal_block_comment.xml
+++ b/doc/mallard/C/mal_block_comment.xml
@@ -28,7 +28,7 @@ mal_block_comment = element comment {
 
   <link xref="mal_title">mal_title</link> ?,
   <link xref="mal_block_cite">mal_block_cite</link>,
-  <link xref="mal_block#simple">mal_block__simple</link> +,
+  <link xref="mal_block">mal_block</link> +,
   mal_block_comment*
 }
 </code></synopsis>
diff --git a/doc/mallard/C/mal_block_figure.xml b/doc/mallard/C/mal_block_figure.xml
index c1feb35..57b2b2c 100644
--- a/doc/mallard/C/mal_block_figure.xml
+++ b/doc/mallard/C/mal_block_figure.xml
@@ -15,8 +15,7 @@ mal_block_figure = element figure {
   attribute * - (mal:* | local:*) { text } *,
 
   <link xref="mal_title">mal_title</link> ?,
-  <link xref="mal_block#simple">mal_block__simple</link> *,
-  <link xref="mal_block_media">mal_block_media</link> *,
+  <link xref="mal_block">mal_block</link> +,
   <link xref="mal_block_caption">mal_block_caption</link> ?
 }
 </code></synopsis>
diff --git a/doc/mallard/C/mal_block_note.xml b/doc/mallard/C/mal_block_note.xml
index bc2ea4a..60d0d5c 100644
--- a/doc/mallard/C/mal_block_note.xml
+++ b/doc/mallard/C/mal_block_note.xml
@@ -15,7 +15,7 @@ mal_block_note = element note {
   attribute * - (mal:* | local:*) { text } *,
 
   <link xref="mal_title">mal_title</link> ?,
-  <link xref="mal_block#simple">mal_block__simple</link> +
+  <link xref="mal_block">mal_block</link> +
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_block_quote.xml b/doc/mallard/C/mal_block_quote.xml
index 30fe0bb..28c79fc 100644
--- a/doc/mallard/C/mal_block_quote.xml
+++ b/doc/mallard/C/mal_block_quote.xml
@@ -12,7 +12,7 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_block_quote = element quote {
   <link xref="mal_title">mal_title</link> ?,
-  <link xref="mal_block#simple">mal_block__simple</link> +,
+  <link xref="mal_block">mal_block</link> +,
   <link xref="mal_block_caption">mal_block_caption</link> ?
 }
 </code></synopsis>
diff --git a/doc/mallard/C/mal_block_synopsis.xml b/doc/mallard/C/mal_block_synopsis.xml
index 2f89503..87ac50e 100644
--- a/doc/mallard/C/mal_block_synopsis.xml
+++ b/doc/mallard/C/mal_block_synopsis.xml
@@ -15,7 +15,7 @@ mal_block_synopsis = element synopsis {
   attribute * - (mal:* | local:*) { text } *,
 
   <link xref="mal_title">mal_title</link> ?,
-  <link xref="mal_block#simple">mal_block__simple</link> +
+  <link xref="mal_block">mal_block</link> +
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_info_license.xml b/doc/mallard/C/mal_info_license.xml
index 9edd3a4..aa7bef8 100644
--- a/doc/mallard/C/mal_info_license.xml
+++ b/doc/mallard/C/mal_info_license.xml
@@ -12,7 +12,7 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_info_license = element license {
   attribute href { text } ?,
-  <link xref="mal_block#simple">mal_block__simple</link> +
+  <link xref="mal_block">mal_block</link> +
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_list_bullet.xml b/doc/mallard/C/mal_list_bullet.xml
index bd80c8e..b263e51 100644
--- a/doc/mallard/C/mal_list_bullet.xml
+++ b/doc/mallard/C/mal_list_bullet.xml
@@ -15,7 +15,7 @@ mal_list_bullet = element list {
   attribute style { text } ?,
   <link xref="mal_title">mal_title</link> ?,
   element item {
-    <link xref="mal_block#simple">mal_block__simple</link> +,
+    <link xref="mal_block">mal_block</link> +,
     <link xref="mal_list">mal_list</link> ?
   } +
 }
diff --git a/doc/mallard/C/mal_list_definition.xml b/doc/mallard/C/mal_list_definition.xml
index 483ade5..8fb3b08 100644
--- a/doc/mallard/C/mal_list_definition.xml
+++ b/doc/mallard/C/mal_list_definition.xml
@@ -15,7 +15,7 @@ mal_list_definition = element list {
   attribute style { text } ?,
   element item {
     <link xref="mal_title">mal_title</link> +,
-    <link xref="mal_block#simple">mal_block__simple</link> +,
+    <link xref="mal_block">mal_block</link> +,
     <link xref="mal_list">mal_list</link> ?
   } +
 }
diff --git a/doc/mallard/C/mal_list_numbered.xml b/doc/mallard/C/mal_list_numbered.xml
index 7fb3c1e..52566b6 100644
--- a/doc/mallard/C/mal_list_numbered.xml
+++ b/doc/mallard/C/mal_list_numbered.xml
@@ -15,7 +15,7 @@ mal_list_numbered = element list {
   attribute style { text } ?,
   <link xref="mal_title">mal_title</link> ?,
   element item {
-    <link xref="mal_block#simple">mal_block__simple</link> +,
+    <link xref="mal_block">mal_block</link> +,
     <link xref="mal_list">mal_list</link> ?
   } +,
 }
diff --git a/doc/mallard/C/mal_table.xml b/doc/mallard/C/mal_table.xml
index 6ad7a5b..d6e4920 100644
--- a/doc/mallard/C/mal_table.xml
+++ b/doc/mallard/C/mal_table.xml
@@ -46,7 +46,7 @@ mal_table_thead = element thead { mal_table_tr + }
 mal_table_tbody = element tbody { mal_table_tr + }
 mal_table_tfoot = element tfoot { mal_table_tr + }
 mal_table_tr = element tr { mal_table_td * }
-mal_table_td = element td { <link xref="mal_block#simple">mal_block__simple</link> + }
+mal_table_td = element td { <link xref="mal_block">mal_block</link> + }
 </code></synopsis>