From 48637e8df57033e5249e8150eff981fa814c82c2 Mon Sep 17 00:00:00 2001 From: Shaun McCance Date: Wed, 11 Mar 2015 17:33:21 -0400 Subject: [PATCH] Allow linking attrs on guiseq and keyseq, fixes #20 --- 1.1/changes.page | 4 ++++ 1.1/mal_inline_guiseq.page | 4 ++++ 1.1/mal_inline_keyseq.page | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/1.1/changes.page b/1.1/changes.page index 4a96dea..b2b7fd1 100644 --- a/1.1/changes.page +++ b/1.1/changes.page @@ -24,6 +24,10 @@ Changes in Mallard 1.1 +

The guiseq and + keyseq elements allow linking attributes + like other inline elements.

+

The links element accepts a role attribute, allowing you to specify a link title role to try before using the standard link title role for the particular type of links element.

diff --git a/1.1/mal_inline_guiseq.page b/1.1/mal_inline_guiseq.page index 2b87598..04b76eb 100644 --- a/1.1/mal_inline_guiseq.page +++ b/1.1/mal_inline_guiseq.page @@ -39,6 +39,9 @@ items.

basic block elements, and certain informational elements.

+

The guiseq element can link to other pages or documents. + See for more information.

+

The style attribute takes a space-separated list of style hints. Processing tools should adjust their behavior according to those style hints they understand.

@@ -123,6 +126,7 @@ mal_inline_guiseq = element guiseq { mal_inline_guiseq_inline } mal_inline_guiseq_attr = ( + mal_attr_link *, attribute style { xsd:NMTOKENS } ?, mal_inline_attr, mal_attr_external * diff --git a/1.1/mal_inline_keyseq.page b/1.1/mal_inline_keyseq.page index cc74b8f..2ff7d34 100644 --- 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 ("combo") or in sequence ("sequence"). The default is "combo".

+

The keyseq element can link to other pages or documents. + See for more information.

+

The style attribute takes a space-separated list of style hints. Processing tools should adjust their behavior according to those style hints they understand.

@@ -175,6 +178,7 @@ mal_inline_keyseq = element keyseq { mal_inline_keyseq_inline } mal_inline_keyseq_attr = ( + mal_attr_link *, attribute type { "combo" | "sequence" } ?, attribute style { xsd:NMTOKENS } ?, mal_inline_attr,