[XML] Improve the fidelity of DocBook flavor export

Map 'class' attribute to 'role'
0x8000-0000 · Apr 22, 2020 · fe1a489 · fe1a489
1 parent 3ffdd67
commit fe1a489
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'net.signbit.samx'
-version '0.3.7'
+version '0.3.8'
 
 sourceCompatibility = 1.8
 

diff --git a/src/main/java/net/signbit/samx/AttributeVisitor.java b/src/main/java/net/signbit/samx/AttributeVisitor.java
@@ -84,26 +84,28 @@ public Void visitReferenceAttr(SamXParser.ReferenceAttrContext ctx)
       return null;
    }
 
-   private boolean wantsClassAttributes()
-   {
-       return (! docBookMode) && (! classAttributes.isEmpty());
-   }
-
    @Override
    public String toString()
    {
       StringBuilder builder = new StringBuilder();
 
       boolean isEmpty = true;
 
-      if (wantsClassAttributes() || (idAttribute != null) || (nameAttribute != null))
+      if ((! classAttributes.isEmpty()) || (idAttribute != null) || (nameAttribute != null))
       {
          builder.append(' ');
       }
 
-      if (wantsClassAttributes())
+      if (! classAttributes.isEmpty())
       {
-         builder.append("class=\"");
+         if (docBookMode)
+         {
+            builder.append("role=\"");
+         }
+         else
+         {
+            builder.append("class=\"");
+         }
          boolean firstElement = true;
          for (String className : classAttributes)
          {

diff --git a/src/test/resources/grids/simple-docbook.samx b/src/test/resources/grids/simple-docbook.samx
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xl="http://www.w3.org/1999/xlink" version="5.1">
   <para>This document contains a grid.</para>
-  <table xml:id="the-grid">
+  <table role="fancy" xml:id="the-grid">
     <title>Example table</title>
     <tgroup cols="6">
     <thead>
-      <row>
+      <row role="header">
         <entry>Name</entry>
         <entry>Position</entry>
-        <entry><phrase>Office</phrase></entry>
-        <entry><phrase>Age</phrase></entry>
+        <entry><phrase role="location">Office</phrase></entry>
+        <entry><phrase role="numeric">Age</phrase></entry>
         <entry>Start date</entry>
         <entry>Salary</entry>
       </row>
@@ -23,7 +23,7 @@
       <entry>2008/11/28</entry>
       <entry>$162,700</entry>
     </row>
-    <row>
+    <row role="highlight">
       <entry>Angelica Ramos</entry>
       <entry>Chief Executive Officer (CEO)</entry>
       <entry>London</entry>
@@ -42,7 +42,7 @@
     <row>
       <entry>Bradley Greer</entry>
       <entry>Software Engineer</entry>
-      <entry><phrase>London</phrase></entry>
+      <entry><phrase role="expensive">London</phrase></entry>
       <entry>41</entry>
       <entry>2012/10/13</entry>
       <entry>$132,000</entry>
@@ -55,7 +55,7 @@
       <entry>2011/06/07</entry>
       <entry>$206,850</entry>
     </row>
-    <row>
+    <row role="highlight extra">
       <entry>Brielle Williamson</entry>
       <entry>Integration Specialist</entry>
       <entry>New York</entry>