Added the 'role' element to xhtml11 backend block elements.

3 files changed, 37 insertions, 34 deletions

diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt
index 87ebf27..5ed3ea5 100644
--- a/doc/asciidoc.txt
+++ b/doc/asciidoc.txt
@@ -640,7 +640,7 @@ _Emphasized text_::
 #Unquoted text#::
         Placing \#hashes around text# does nothing, it is a mechanism
         to allow inline attributes to be applied to otherwise
-        unformatted text (see example below).
+        unformatted text (see examples below).
 
 .Quoted text behavior
 - Quoting cannot be overlapped.
@@ -955,9 +955,12 @@ Can also be set by the 'BlockId' element.
 |role |html4, xhtml11, docbook |
 Role contains a string used to classify or subclassify an element:
 
-- Adds 'role' attribute to DocBook block elements.
-- Adds 'role' attribute to DocBook and HTML <<X51,quoted inline
-  elements>>.
+- Adds 'role' attribute to block elements ('docbook' and 'xhtml11'
+  backends).
+- Adds 'role' attribute to <<X51,quoted inline elements>> ('docbook',
+  'xhtml11' and 'html4' backends).
+- The AsciiDoc 'role' attribute is sets the 'role' attribute in
+  DocBook elements and sets the 'class' attribute in HTML elements.
 
 |reftext |docbook |
 'reftext' is used to set the DocBook 'xreflabel' attribute.
diff --git a/xhtml11-quirks.conf b/xhtml11-quirks.conf
index 633708c..a62e79a 100644
--- a/xhtml11-quirks.conf
+++ b/xhtml11-quirks.conf
@@ -5,7 +5,7 @@
 #

 

 [image-blockmacro]

-<div class="imageblock{style? {style}}"{id? id="{id}"}{align? style="text-align:{align};"}{float? style="float:{float};"}>

+<div class="imageblock{style? {style}}{role? {role}}"{id? id="{id}"}{align? style="text-align:{align};"}{float? style="float:{float};"}>

 <div class="content">

 <a class="image" href="{link}">

 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} />

@@ -17,14 +17,14 @@
 </div>

 

 [sidebarblock]

-<div class="sidebarblock"{id? id="{id}"}>

+<div class="sidebarblock{role? {role}}"{id? id="{id}"}>

 <div class="sidebar-content">

 <div class="sidebar-title">{title}</div>

 |

 </div></div>

 

 [quoteblock]

-<div class="quoteblock"{id? id="{id}"}>

+<div class="quoteblock{role? {role}}"{id? id="{id}"}>

 <div class="title">{title}</div>

 <div class="quoteblock-content">

 |

@@ -35,7 +35,7 @@
 </div></div>

 

 [verseblock]

-<div class="verseblock"{id? id="{id}"}>

+<div class="verseblock{role? {role}}"{id? id="{id}"}>

 <div class="title">{title}</div>

 <pre class="verseblock-content">

 |

@@ -46,7 +46,7 @@
 </div></div>

 

 [exampleblock]

-<div class="exampleblock"{id? id="{id}"}>

+<div class="exampleblock{role? {role}}"{id? id="{id}"}>

 <div class="title">{caption={example-caption} {counter:example-number}: }{title}</div>

 <div class="exampleblock-content">

 |

diff --git a/xhtml11.conf b/xhtml11.conf
index 30da42e..ee8e0c7 100644
--- a/xhtml11.conf
+++ b/xhtml11.conf
@@ -44,14 +44,14 @@ latexmath-style=template="latexmathblock",subs=[]
 `{passtext}`

 

 [asciimath-blockmacro]

-<div class="mathblock"{id? id="{id}"}>

+<div class="mathblock{role? {role}}"{id? id="{id}"}>

 <div class="content">

 <div class="title">{title}</div>

 `{passtext}`

 </div></div>

 

 [asciimathblock]

-<div class="mathblock"{id? id="{id}"}>

+<div class="mathblock{role? {role}}"{id? id="{id}"}>

 <div class="content">

 <div class="title">{title}</div>

 `|`

@@ -61,21 +61,21 @@ latexmath-style=template="latexmathblock",subs=[]
 {passtext}

 

 [latexmath-blockmacro]

-<div class="mathblock"{id? id="{id}"}>

+<div class="mathblock{role? {role}}"{id? id="{id}"}>

 <div class="content">

 <div class="title">{title}</div>

 {passtext}

 </div></div>

 

 [latexmathblock]

-<div class="mathblock"{id? id="{id}"}>

+<div class="mathblock{role? {role}}"{id? id="{id}"}>

 <div class="content">

 <div class="title">{title}</div>

 |

 </div></div>

 

 [image-inlinemacro]

-<span class="image">

+<span class="image{role? {role}}">

 <a class="image" href="{link}">

 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} />

 {data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} src="data:image/{eval:os.path.splitext('{target}')[1][1:]};base64,

@@ -84,7 +84,7 @@ latexmath-style=template="latexmathblock",subs=[]
 </span>

 

 [image-blockmacro]

-<div class="imageblock{style? {style}}"{id? id="{id}"}{align? style="text-align:{align};"}{float? style="float:{float};"}>

+<div class="imageblock{style? {style}}{role? {role}}"{id? id="{id}"}{align? style="text-align:{align};"}{float? style="float:{float};"}>

 <div class="content">

 <a class="image" href="{link}">

 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} />

@@ -134,17 +134,17 @@ ifdef::icons[<img src="{iconsdir}/callouts/{index}.png" alt="{index}" />]
 

 # List tags.

 [listtags-bulleted]

-list=<div class="ulist{style? {style}}{compact-option? compact}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ul>|</ul></div>

+list=<div class="ulist{style? {style}}{compact-option? compact}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ul>|</ul></div>

 item=<li>|</li>

 text=<p>|</p>

 

 [listtags-numbered]

-list=<div class="olist{style? {style}}{compact-option? compact}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol class="{style}">|</ol></div>

+list=<div class="olist{style? {style}}{compact-option? compact}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol class="{style}">|</ol></div>

 item=<li>|</li>

 text=<p>|</p>

 

 [listtags-labeled]

-list=<div class="dlist{compact-option? compact}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<dl>|</dl></div>

+list=<div class="dlist{compact-option? compact}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<dl>|</dl></div>

 entry=

 label=

 term=<dt class="hdlist1{strong-option? strong}">|</dt>

@@ -152,7 +152,7 @@ item=<dd>|</dd>
 text=<p>|</p>

 

 [listtags-horizontal]

-list=<div class="hdlist{compact-option? compact}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<table>{labelwidth?<col width="{labelwidth}%" />}{itemwidth?<col width="{itemwidth}%" />}|</table></div>

+list=<div class="hdlist{compact-option? compact}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<table>{labelwidth?<col width="{labelwidth}%" />}{itemwidth?<col width="{itemwidth}%" />}|</table></div>

 label=<td class="hdlist1{strong-option? strong}">|</td>

 term=|<br />

 entry=<tr>|</tr>

@@ -160,7 +160,7 @@ item=<td class="hdlist2">|</td>
 text=<p style="margin-top: 0;">|</p>

 

 [listtags-qanda]

-list=<div class="qlist{style? {style}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol>|</ol></div>

+list=<div class="qlist{style? {style}}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol>|</ol></div>

 entry=<li>|</li>

 label=

 term=<p><em>|</em></p>

@@ -169,18 +169,18 @@ text=<p>|</p>
 

 [listtags-callout]

 ifndef::icons[]

-list=<div class="colist{style? {style}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol>|</ol></div>

+list=<div class="colist{style? {style}}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol>|</ol></div>

 item=<li>|</li>

 text=<p>|</p>

 endif::icons[]

 ifdef::icons[]

-list=<div class="colist{style? {style}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<table>|</table></div>

+list=<div class="colist{style? {style}}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<table>|</table></div>

 item=<tr><td><img src="{iconsdir}/callouts/{listindex}.png" alt="{listindex}" /></td><td>|</td></tr>

 text=|

 endif::icons[]

 

 [listtags-glossary]

-list=<div class="dlist{style? {style}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<dl>|</dl></div>

+list=<div class="dlist{style? {style}}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<dl>|</dl></div>

 label=

 entry=

 term=<dt>|</dt>

@@ -188,7 +188,7 @@ item=<dd>|</dd>
 text=<p>|</p>

 

 [listtags-bibliography]

-list=<div class="ulist{style? {style}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ul>|</ul></div>

+list=<div class="ulist{style? {style}}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ul>|</ul></div>

 item=<li>|</li>

 text=<p>|</p>

 

@@ -246,7 +246,7 @@ subscript={role?<span class="{role}">}<sub{1,2,3? style="}{1?color:{1};}{2?backg
 

 # Paragraph substitution.

 [paragraph]

-<div class="paragraph"{id? id="{id}"}>{title?<div class="title">{title}</div>}<p>

+<div class="paragraph{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<p>

 |

 </p></div>

 

@@ -264,7 +264,7 @@ template::[admonitionblock]
 

 # Delimited blocks.

 [listingblock]

-<div class="listingblock"{id? id="{id}"}>

+<div class="listingblock{role? {role}}"{id? id="{id}"}>

 <div class="title">{caption=}{title}</div>

 <div class="content">

 <pre><tt>

@@ -273,7 +273,7 @@ template::[admonitionblock]
 </div></div>

 

 [literalblock]

-<div class="literalblock"{id? id="{id}"}>

+<div class="literalblock{role? {role}}"{id? id="{id}"}>

 <div class="title">{title}</div>

 <div class="content">

 <pre><tt>

@@ -282,7 +282,7 @@ template::[admonitionblock]
 </div></div>

 

 [sidebarblock]

-<div class="sidebarblock"{id? id="{id}"}>

+<div class="sidebarblock{role? {role}}"{id? id="{id}"}>

 <div class="content">

 <div class="title">{title}</div>

 |

@@ -292,7 +292,7 @@ template::[admonitionblock]
 template::[quoteblock]

 

 [quoteblock]

-<div class="quoteblock"{id? id="{id}"}>

+<div class="quoteblock{role? {role}}"{id? id="{id}"}>

 <div class="title">{title}</div>

 <div class="content">

 |

@@ -303,7 +303,7 @@ template::[quoteblock]
 </div></div>

 

 [verseblock]

-<div class="verseblock"{id? id="{id}"}>

+<div class="verseblock{role? {role}}"{id? id="{id}"}>

 <div class="title">{title}</div>

 <pre class="content">

 |

@@ -314,14 +314,14 @@ template::[quoteblock]
 </div></div>

 

 [exampleblock]

-<div class="exampleblock"{id? id="{id}"}>

+<div class="exampleblock{role? {role}}"{id? id="{id}"}>

 <div class="title">{caption={example-caption} {counter:example-number}. }{title}</div>

 <div class="content">

 |

 </div></div>

 

 [admonitionblock]

-<div class="admonitionblock"{id? id="{id}"}>

+<div class="admonitionblock{role? {role}}"{id? id="{id}"}>

 <table><tr>

 <td class="icon">

 {data-uri%}{icons#}<img src="{icon={iconsdir}/{name}.png}" alt="{caption}" />

@@ -369,7 +369,7 @@ bodydata=<td {colspan@1::colspan="{colspan}" }{rowspan@1::rowspan="{rowspan}" }a
 paragraph=

 

 [table]

-<div class="tableblock"{id? id="{id}"}>

+<div class="tableblock{role? {role}}"{id? id="{id}"}>

 <table rules="{grid=all}"

 style="margin-left:{align@left:0}{align@center|right:auto}; margin-right:{align@left|center:auto}{align@right:0};"

 style="float:{float};"

@@ -437,7 +437,7 @@ cellspacing="0" cellpadding="4">
 

 [preamble]

 # Untitled elements between header and first section title.

-<div id="preamble"{id? id="{id}"}>

+<div id="preamble{role? {role}}"{id? id="{id}"}>

 <div class="sectionbody">

 |

 </div>