GNOME.org
 

[gnome-doc-utils/mallard: 24/87] Removing mal_inline__simple and mal_inline__text

commit 6f8ac010088a39f0372ce7da22dafd88b515472f
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Nov 10 12:23:41 2008 -0600

    Removing mal_inline__simple and mal_inline__text
    
    It seemed nice at first to have restrictive inline models to prevent
    nesting of complex inline elements.  In practice, however, it becomes
    prohibitively difficult to enforce this while still allowing arbitrary
    nesting of span and external-namespace elements, which is a necessity
    for internationalization.
---
 doc/mallard/C/mal_cite.xml           |    4 ++--
 doc/mallard/C/mal_info_copyright.xml |    4 ++--
 doc/mallard/C/mal_info_credit.xml    |    4 ++--
 doc/mallard/C/mal_inline.xml         |    8 --------
 doc/mallard/C/mal_inline_app.xml     |    3 ++-
 doc/mallard/C/mal_inline_cmd.xml     |    8 ++++++--
 doc/mallard/C/mal_inline_code.xml    |    6 +++++-
 doc/mallard/C/mal_inline_em.xml      |    5 ++++-
 doc/mallard/C/mal_inline_file.xml    |    5 ++++-
 doc/mallard/C/mal_inline_gui.xml     |   11 +++++++----
 doc/mallard/C/mal_inline_guiseq.xml  |    3 +++
 doc/mallard/C/mal_inline_input.xml   |   11 +++++++----
 doc/mallard/C/mal_inline_key.xml     |    5 ++++-
 doc/mallard/C/mal_inline_keyseq.xml  |    3 +++
 doc/mallard/C/mal_inline_link.xml    |    6 +++---
 doc/mallard/C/mal_inline_output.xml  |    5 ++++-
 doc/mallard/C/mal_inline_quote.xml   |    5 ++++-
 doc/mallard/C/mal_inline_span.xml    |    5 ++++-
 doc/mallard/C/mal_inline_sys.xml     |    5 ++++-
 doc/mallard/C/mal_inline_var.xml     |    5 ++++-
 20 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/doc/mallard/C/mal_cite.xml b/doc/mallard/C/mal_cite.xml
index 04e351b..f9ebefc 100644
--- a/doc/mallard/C/mal_cite.xml
+++ b/doc/mallard/C/mal_cite.xml
@@ -21,8 +21,8 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_cite = element cite {
   attribute date { xsd:date } ?,
-  element name { <link xref="mal_inline">mal_inline__text</link> + },
-  element email { <link xref="mal_inline">mal_inline__text</link> + } ?
+  element name { <link xref="mal_inline">mal_inline</link> + },
+  element email { <link xref="mal_inline">mal_inline</link> + } ?
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_info_copyright.xml b/doc/mallard/C/mal_info_copyright.xml
index 8d8d574..5312466 100644
--- a/doc/mallard/C/mal_info_copyright.xml
+++ b/doc/mallard/C/mal_info_copyright.xml
@@ -24,8 +24,8 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_info_copyright = element copyright {
   element year { text } +,
-  element name { <link xref="mal_inline">mal_inline__text</link> + },
-  element email { <link xref="mal_inline">mal_inline__text</link> + } ?
+  element name { <link xref="mal_inline">mal_inline</link> + },
+  element email { <link xref="mal_inline">mal_inline</link> + } ?
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_info_credit.xml b/doc/mallard/C/mal_info_credit.xml
index 233f099..db40cc1 100644
--- a/doc/mallard/C/mal_info_credit.xml
+++ b/doc/mallard/C/mal_info_credit.xml
@@ -16,8 +16,8 @@ mal_info_credit = element credit {
     "maintainer" | "collaborator" |
     "translator" | "publisher"    },
   attribute date { xsd:date } ?,
-  element name { <link xref="mal_inline">mal_inline__text</link> + },
-  element email { <link xref="mal_inline">mal_inline__text</link> + } ?
+  element name { <link xref="mal_inline">mal_inline</link> + },
+  element email { <link xref="mal_inline">mal_inline</link> + } ?
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline.xml b/doc/mallard/C/mal_inline.xml
index 055aaad..7d05c22 100644
--- a/doc/mallard/C/mal_inline.xml
+++ b/doc/mallard/C/mal_inline.xml
@@ -31,14 +31,6 @@ mal_inline = mixed {
   <link xref="mal_inline_var">mal_inline_var</link> *,
   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 } *
-}
 </code></synopsis>
 
 <comment>
diff --git a/doc/mallard/C/mal_inline_app.xml b/doc/mallard/C/mal_inline_app.xml
index b077e8a..6c8897d 100644
--- a/doc/mallard/C/mal_inline_app.xml
+++ b/doc/mallard/C/mal_inline_app.xml
@@ -31,7 +31,8 @@ mal_inline_app = element app {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
   attribute style { xsd:NMTOKENS } ?,
   attribute * - (mal:* | local:*) { text } *,
-  <link xref="mal_inline#simple">mal_inline__simple</link>+
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_cmd.xml b/doc/mallard/C/mal_inline_cmd.xml
index 502f451..2b5fd80 100644
--- a/doc/mallard/C/mal_inline_cmd.xml
+++ b/doc/mallard/C/mal_inline_cmd.xml
@@ -25,8 +25,12 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_cmd = element cmd {
-  <link xref="mal_attr_link">mal_attr_link</link>?,
-  <link xref="mal_inline#simple">mal_inline__simple</link>
+  <link xref="mal_attr_link">mal_attr_link</link> ?,
+  attribute style { xsd:NMTOKENS } ?,
+  attribute mime { text } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_code.xml b/doc/mallard/C/mal_inline_code.xml
index 397a46a..db2512e 100644
--- a/doc/mallard/C/mal_inline_code.xml
+++ b/doc/mallard/C/mal_inline_code.xml
@@ -23,7 +23,11 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_code = element code {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
-  <link xref="mal_inline#simple">mal_inline__simple</link>
+  attribute style { xsd:NMTOKENS } ?,
+  attribute mime { text } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_em.xml b/doc/mallard/C/mal_inline_em.xml
index 4cbb996..fef29c2 100644
--- a/doc/mallard/C/mal_inline_em.xml
+++ b/doc/mallard/C/mal_inline_em.xml
@@ -23,7 +23,10 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_em = element em {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
-  <link xref="mal_inline#simple">mal_inline__simple</link>
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_file.xml b/doc/mallard/C/mal_inline_file.xml
index 8e85c4e..2041b54 100644
--- a/doc/mallard/C/mal_inline_file.xml
+++ b/doc/mallard/C/mal_inline_file.xml
@@ -23,7 +23,10 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_file = element file {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
-  <link xref="mal_inline#simple">mal_inline__simple</link> +
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_gui.xml b/doc/mallard/C/mal_inline_gui.xml
index 001fec8..f936f61 100644
--- a/doc/mallard/C/mal_inline_gui.xml
+++ b/doc/mallard/C/mal_inline_gui.xml
@@ -21,10 +21,13 @@
 <title>GUI Labels</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_inline_gui = element gui
-  { <link xref="mal_attr_link">mal_attr_link</link>?,
-    <link xref="mal_inline#simple">mal_inline__simple</link>+
-  }
+mal_inline_gui = element gui {
+  <link xref="mal_attr_link">mal_attr_link</link> ?,
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
+}
 </code></synopsis>
 
 <section id="examples">
diff --git a/doc/mallard/C/mal_inline_guiseq.xml b/doc/mallard/C/mal_inline_guiseq.xml
index c95d3b2..d91a479 100644
--- a/doc/mallard/C/mal_inline_guiseq.xml
+++ b/doc/mallard/C/mal_inline_guiseq.xml
@@ -21,6 +21,9 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_guiseq = element guiseq {
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
   mixed { <link xref="mal_inline_gui">mal_inline_gui</link> + }
 }
 </code></synopsis>
diff --git a/doc/mallard/C/mal_inline_input.xml b/doc/mallard/C/mal_inline_input.xml
index a082ebe..62247f7 100644
--- a/doc/mallard/C/mal_inline_input.xml
+++ b/doc/mallard/C/mal_inline_input.xml
@@ -22,10 +22,13 @@
 <title>User Input</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_inline_input = element input
-  { <link xref="mal_attr_link">mal_attr_link</link>?,
-    <link xref="mal_inline#simple">mal_inline__simple</link>+
-  }
+mal_inline_input = element input {
+  <link xref="mal_attr_link">mal_attr_link</link> ?,
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
+}
 </code></synopsis>
 
 </page>
diff --git a/doc/mallard/C/mal_inline_key.xml b/doc/mallard/C/mal_inline_key.xml
index 1cfa482..964d6bf 100644
--- a/doc/mallard/C/mal_inline_key.xml
+++ b/doc/mallard/C/mal_inline_key.xml
@@ -14,7 +14,10 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_key = element key {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
-  <link xref="mal_inline#simple">mal_inline__simple</link> +
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_keyseq.xml b/doc/mallard/C/mal_inline_keyseq.xml
index 1fb9d05..f83d195 100644
--- a/doc/mallard/C/mal_inline_keyseq.xml
+++ b/doc/mallard/C/mal_inline_keyseq.xml
@@ -21,6 +21,9 @@
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_keyseq = element keyseq {
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
   mixed { <link xref="mal_inline_gui">mal_inline_key</link> + }
 }
 </code></synopsis>
diff --git a/doc/mallard/C/mal_inline_link.xml b/doc/mallard/C/mal_inline_link.xml
index 69f67ab..bbbc430 100644
--- a/doc/mallard/C/mal_inline_link.xml
+++ b/doc/mallard/C/mal_inline_link.xml
@@ -24,14 +24,14 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_link = element link
   { ( attribute xref { text }
-    , <link xref="mal_inline">mal_inline__simple</link> ?
+    , <link xref="mal_inline">mal_inline</link> ?
     )
   | ( attribute dref { text }
     , attribute href { text }?
-    , <link xref="mal_inline">mal_inline__text</link>
+    , <link xref="mal_inline">mal_inline</link>
     )
   | ( attribute href { text }
-    , <link xref="mal_inline">mal_inline__text</link>
+    , <link xref="mal_inline">mal_inline</link>
     )
   }
 </code></synopsis>
diff --git a/doc/mallard/C/mal_inline_output.xml b/doc/mallard/C/mal_inline_output.xml
index 9edbb5c..d7201ad 100644
--- a/doc/mallard/C/mal_inline_output.xml
+++ b/doc/mallard/C/mal_inline_output.xml
@@ -23,7 +23,10 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_output = element output {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
-  <link xref="mal_inline#simple">mal_inline__simple</link> +
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_quote.xml b/doc/mallard/C/mal_inline_quote.xml
index 0589bf6..f543ac9 100644
--- a/doc/mallard/C/mal_inline_quote.xml
+++ b/doc/mallard/C/mal_inline_quote.xml
@@ -26,7 +26,10 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_quote = element quote {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
-  <link xref="mal_inline">mal_inline</link> +
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_span.xml b/doc/mallard/C/mal_inline_span.xml
index 44ebbd4..acc413a 100644
--- a/doc/mallard/C/mal_inline_span.xml
+++ b/doc/mallard/C/mal_inline_span.xml
@@ -14,7 +14,10 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_span = element span {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
-  <link xref="mal_inline#simple">mal_inline__simple</link> +
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_sys.xml b/doc/mallard/C/mal_inline_sys.xml
index e94f0c1..391b1c0 100644
--- a/doc/mallard/C/mal_inline_sys.xml
+++ b/doc/mallard/C/mal_inline_sys.xml
@@ -14,7 +14,10 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_sys = element sys {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
-  <link xref="mal_inline#simple">mal_inline__simple</link> +
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_var.xml b/doc/mallard/C/mal_inline_var.xml
index fc66c97..9c597fa 100644
--- a/doc/mallard/C/mal_inline_var.xml
+++ b/doc/mallard/C/mal_inline_var.xml
@@ -14,7 +14,10 @@
 <synopsis><code mime="application/relax-ng-compact-syntax">
 mal_inline_var = element var {
   <link xref="mal_attr_link">mal_attr_link</link> ?,
-  <link xref="mal_inline#simple">mal_inline__simple</link> +
+  attribute style { xsd:NMTOKENS } ?,
+  attribute * - (mal:* | local:*) { text } *,
+
+  <link xref="mal_inline">mal_inline</link>+
 }
 </code></synopsis>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]