Allow linking attrs on guiseq and keyseq, fixes #20

projectmallard · Mar 11, 2015 · 48637e8 · 48637e8
1 parent e1ee5c8
commit 48637e8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/1.1/changes.page b/1.1/changes.page
@@ -24,6 +24,10 @@
 <title>Changes in Mallard 1.1</title>
 
 <list>
+  <item><p>The <code xref="mal_inline_guiseq">guiseq</code> and
+  <code xref="mal_inline_keyseq">keyseq</code> elements allow linking attributes
+  like other inline elements.</p></item>
+
   <item><p>The <code xref="mal_links">links</code> element accepts a <code>role</code>
   attribute, allowing you to specify a link title role to try before using the standard
   link title role for the particular type of <code>links</code> element.</p></item>

diff --git a/1.1/mal_inline_guiseq.page b/1.1/mal_inline_guiseq.page
@@ -39,6 +39,9 @@ items.</p>
     <link xref="mal_block#basic">basic block elements</link>, and certain
     <link xref="mal_info">informational elements</link>.</p></item>
 
+    <item><p>The <code>guiseq</code> element can link to other pages or documents.
+    See <link xref="mal_attr_link"/> for more information.</p></item>
+
     <item><p>The <code>style</code> attribute takes a space-separated list of
     style hints.  Processing tools should adjust their behavior according to
     those style hints they understand.</p></item>
@@ -123,6 +126,7 @@ mal_inline_guiseq = element guiseq {
   mal_inline_guiseq_inline
 }
 mal_inline_guiseq_attr = (
+  <link xref="mal_attr_link">mal_attr_link</link> *,
   attribute style { xsd:NMTOKENS } ?,
   <link xref="mal_inline">mal_inline_attr</link>,
   <link xref="mal_external">mal_attr_external</link> *

diff --git a/1.1/mal_inline_keyseq.page b/1.1/mal_inline_keyseq.page
@@ -45,6 +45,9 @@ key press.  You can use text without markup to indicate a class of keys, such as
     pressed together (<code>"combo"</code>) or in sequence (<code>"sequence"</code>).
     The default is <code>"combo"</code>.</p></item>
 
+    <item><p>The <code>keyseq</code> element can link to other pages or documents.
+    See <link xref="mal_attr_link"/> for more information.</p></item>
+
     <item><p>The <code>style</code> attribute takes a space-separated list of
     style hints.  Processing tools should adjust their behavior according to
     those style hints they understand.</p></item>
@@ -175,6 +178,7 @@ mal_inline_keyseq = element keyseq {
   mal_inline_keyseq_inline
 }
 mal_inline_keyseq_attr = (
+  <link xref="mal_attr_link">mal_attr_link</link> *,
   attribute type { "combo" | "sequence" } ?,
   attribute style { xsd:NMTOKENS } ?,
   <link xref="mal_inline">mal_inline_attr</link>,