Merge pull request #7 from redbow-kimee/html-converter-next-lists

ggrossetie · Feb 6, 2024 · 5e1201e · 5e1201e
2 parents e1bc556 + c8ba326
commit 5e1201e
Show file tree

Hide file tree

Showing 25 changed files with 151 additions and 107 deletions.
diff --git a/lib/asciidoctor/converter/semantic_html5.rb b/lib/asciidoctor/converter/semantic_html5.rb
@@ -99,9 +99,9 @@ def convert_thematic_break node
   def convert_ulist node
     attributes = common_html_attributes node.id, node.role
     ret = [%(<ul#{attributes}>)]
-    ret << %(<strong class="title">#{node.title}</strong>) if node.title?
+    ret << %(<header><strong class="title">#{node.title}</strong><header>) if node.title?
     node.items.each do |item|
-      ret << %(<li>#{item.text}#{item.blocks? ? %(
+      ret << %(<li><span class="principal">#{item.text}</span>#{item.blocks? ? %(
 #{item.content}
 ) : ''}</li>)
     end
@@ -122,9 +122,9 @@ def convert_olist node
       olist_attributes << %( reversed="true")
     end
     ret = [%(<ol#{attributes}#{olist_attributes.join}>)]
-    ret << %(<strong class="title">#{node.title}</strong>) if node.title?
+    ret << %(<header><strong class="title">#{node.title}</strong></header>) if node.title?
     node.items.each do |item|
-      ret << %(<li>#{item.text}#{item.blocks? ? %(
+      ret << %(<li><span class="principal">#{item.text}</span>#{item.blocks? ? %(
 #{item.content}
 ) : ''}</li>)
     end
@@ -143,12 +143,12 @@ def convert_dlist node
       dlist_attributes << %( type="#{node.list_marker_keyword}")
     end
     ret = [%(<dl#{attributes}#{dlist_attributes.join}>)]
-    ret << %(<strong class="title">#{node.title}</strong>) if node.title?
+    ret << %(<header><strong class="title">#{node.title}</strong></header>) if node.title?
     node.items.each do |terms, desc|
       terms.each do |term|
         ret << %(<dt>#{term.text}</dt>)
       end
-      ret << %(<dd>#{desc.text}#{ desc.blocks? ? %(
+      ret << %(<dd><span class="principal">#{desc.text}</span>#{ desc.blocks? ? %(
 #{desc.content}
 ) : ''}</dd>)
     end

diff --git a/test/fixtures/semantic-html5-scenarios/description-list-horizontal.html b/test/fixtures/semantic-html5-scenarios/description-list-horizontal.html
@@ -1,8 +1,8 @@
 <dl class="horizontal">
 <dt>Description Term 1</dt>
-<dd>Description Body 1.</dd>
+<dd><span class="principal">Description Body 1.</span></dd>
 <dt>Description Term 2</dt>
-<dd>Description Body 2.</dd>
+<dd><span class="principal">Description Body 2.</span></dd>
 <dt>Description Term 3</dt>
-<dd>Description Body 3.</dd>
-</dl>
+<dd><span class="principal">Description Body 3.</span></dd>
+</dl>
diff --git a/test/fixtures/semantic-html5-scenarios/description-list-qanda-with-id-roles.html b/test/fixtures/semantic-html5-scenarios/description-list-qanda-with-id-roles.html
@@ -1,8 +1,8 @@
 <dl id="the_dl" class="qanda style1 style2">
 <dt>Question 1?</dt>
-<dd>Answer 1.</dd>
+<dd><span class="principal">Answer 1.</span></dd>
 <dt>Question 2?</dt>
-<dd>Answer 2.</dd>
+<dd><span class="principal">Answer 2.</span></dd>
 <dt>Question 3?</dt>
-<dd>Answer 3.</dd>
-</dl>
+<dd><span class="principal">Answer 3.</span></dd>
+</dl>
diff --git a/test/fixtures/semantic-html5-scenarios/description-list-qanda-with-id.html b/test/fixtures/semantic-html5-scenarios/description-list-qanda-with-id.html
@@ -1,8 +1,8 @@
 <dl id="the_dl" class="qanda">
 <dt>Question 1?</dt>
-<dd>Answer 1.</dd>
+<dd><span class="principal">Answer 1.</span></dd>
 <dt>Question 2?</dt>
-<dd>Answer 2.</dd>
+<dd><span class="principal">Answer 2.</span></dd>
 <dt>Question 3?</dt>
-<dd>Answer 3.</dd>
-</dl>
+<dd><span class="principal">Answer 3.</span></dd>
+</dl>
diff --git a/test/fixtures/semantic-html5-scenarios/description-list-qanda-with-roles.html b/test/fixtures/semantic-html5-scenarios/description-list-qanda-with-roles.html
@@ -1,8 +1,8 @@
 <dl class="qanda style1 style2">
 <dt>Question 1?</dt>
-<dd>Answer 1.</dd>
+<dd><span class="principal">Answer 1.</span></dd>
 <dt>Question 2?</dt>
-<dd>Answer 2.</dd>
+<dd><span class="principal">Answer 2.</span></dd>
 <dt>Question 3?</dt>
-<dd>Answer 3.</dd>
-</dl>
+<dd><span class="principal">Answer 3.</span></dd>
+</dl>
diff --git a/test/fixtures/semantic-html5-scenarios/description-list-qanda.html b/test/fixtures/semantic-html5-scenarios/description-list-qanda.html
@@ -1,8 +1,8 @@
 <dl class="qanda">
 <dt>Question 1?</dt>
-<dd>Answer 1.</dd>
+<dd><span class="principal">Answer 1.</span></dd>
 <dt>Question 2?</dt>
-<dd>Answer 2.</dd>
+<dd><span class="principal">Answer 2.</span></dd>
 <dt>Question 3?</dt>
-<dd>Answer 3.</dd>
-</dl>
+<dd><span class="principal">Answer 3.</span></dd>
+</dl>
diff --git a/test/fixtures/semantic-html5-scenarios/description-list-with-title.html b/test/fixtures/semantic-html5-scenarios/description-list-with-title.html
@@ -1,9 +1,9 @@
 <dl>
-<strong class="title">The Description List</strong>
+<header><strong class="title">The Description List</strong></header>
 <dt>Description Term 1</dt>
-<dd>Description Body 1.</dd>
+<dd><span class="principal">Description Body 1.</span></dd>
 <dt>Description Term 2</dt>
-<dd>Description Body 2.</dd>
+<dd><span class="principal">Description Body 2.</span></dd>
 <dt>Description Term 3</dt>
-<dd>Description Body 3.</dd>
-</dl>
+<dd><span class="principal">Description Body 3.</span></dd>
+</dl>
diff --git a/test/fixtures/semantic-html5-scenarios/description-list.html b/test/fixtures/semantic-html5-scenarios/description-list.html
@@ -1,8 +1,8 @@
 <dl>
 <dt>Description Term 1</dt>
-<dd>Description Body 1.</dd>
+<dd><span class="principal">Description Body 1.</span></dd>
 <dt>Description Term 2</dt>
-<dd>Description Body 2.</dd>
+<dd><span class="principal">Description Body 2.</span></dd>
 <dt>Description Term 3</dt>
-<dd>Description Body 3.</dd>
-</dl>
+<dd><span class="principal">Description Body 3.</span></dd>
+</dl>
diff --git a/test/fixtures/semantic-html5-scenarios/nested-ordered-list-with-title.adoc b/test/fixtures/semantic-html5-scenarios/nested-ordered-list-with-title.adoc
@@ -0,0 +1,7 @@
+.The List
+. alice
+.. subpoint 1
+.. subpoint 2
+. bob
+.. subpoint 1
+.. subpoint 2
diff --git a/test/fixtures/semantic-html5-scenarios/nested-ordered-list-with-title.html b/test/fixtures/semantic-html5-scenarios/nested-ordered-list-with-title.html
@@ -0,0 +1,15 @@
+<ol>
+<header><strong class="title">The List</strong></header>
+<li><span class="principal">alice</span>
+<ol type="a">
+<li><span class="principal">subpoint 1</span></li>
+<li><span class="principal">subpoint 2</span></li>
+</ol>
+</li>
+<li><span class="principal">bob</span>
+<ol type="a">
+<li><span class="principal">subpoint 1</span></li>
+<li><span class="principal">subpoint 2</span></li>
+</ol>
+</li>
+</ol>
diff --git a/test/fixtures/semantic-html5-scenarios/nested-ordered-list.html b/test/fixtures/semantic-html5-scenarios/nested-ordered-list.html
@@ -1,14 +1,14 @@
 <ol>
-<li>alice
+<li><span class="principal">alice</span>
 <ol type="a">
-<li>subpoint 1</li>
-<li>subpoint 2</li>
+<li><span class="principal">subpoint 1</span></li>
+<li><span class="principal">subpoint 2</span></li>
 </ol>
 </li>
-<li>bob
+<li><span class="principal">bob</span>
 <ol type="a">
-<li>subpoint 1</li>
-<li>subpoint 2</li>
+<li><span class="principal">subpoint 1</span></li>
+<li><span class="principal">subpoint 2</span></li>
 </ol>
 </li>
-</ol>
+</ol>
diff --git a/test/fixtures/semantic-html5-scenarios/nested-unordered-list-with-title.adoc b/test/fixtures/semantic-html5-scenarios/nested-unordered-list-with-title.adoc
@@ -0,0 +1,7 @@
+.List Title
+* alice
+** subpoint 1
+** subpoint 2
+* bob
+** subpoint 1
+** subpoint 2
diff --git a/test/fixtures/semantic-html5-scenarios/nested-unordered-list-with-title.html b/test/fixtures/semantic-html5-scenarios/nested-unordered-list-with-title.html
@@ -0,0 +1,15 @@
+<ul>
+<header><strong class="title">List Title</strong><header>
+<li><span class="principal">alice</span>
+<ul>
+<li><span class="principal">subpoint 1</span></li>
+<li><span class="principal">subpoint 2</span></li>
+</ul>
+</li>
+<li><span class="principal">bob</span>
+<ul>
+<li><span class="principal">subpoint 1</span></li>
+<li><span class="principal">subpoint 2</span></li>
+</ul>
+</li>
+</ul>
diff --git a/test/fixtures/semantic-html5-scenarios/nested-unordered-list.html b/test/fixtures/semantic-html5-scenarios/nested-unordered-list.html
@@ -1,14 +1,14 @@
 <ul>
-<li>alice
+<li><span class="principal">alice</span>
 <ul>
-<li>subpoint 1</li>
-<li>subpoint 2</li>
+<li><span class="principal">subpoint 1</span></li>
+<li><span class="principal">subpoint 2</span></li>
 </ul>
 </li>
-<li>bob
+<li><span class="principal">bob</span>
 <ul>
-<li>subpoint 1</li>
-<li>subpoint 2</li>
+<li><span class="principal">subpoint 1</span></li>
+<li><span class="principal">subpoint 2</span></li>
 </ul>
 </li>
-</ul>
+</ul>
diff --git a/test/fixtures/semantic-html5-scenarios/ordered-list-roman.html b/test/fixtures/semantic-html5-scenarios/ordered-list-roman.html
@@ -1,10 +1,10 @@
 <ol type="I">
-<li>step 1</li>
-<li>step 2</li>
-<li>step 3</li>
+<li><span class="principal">step 1</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 3</span></li>
 </ol>
 <ol type="i">
-<li>step 1</li>
-<li>step 2</li>
-<li>step 3</li>
-</ol>
+<li><span class="principal">step 1</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 3</span></li>
+</ol>
diff --git a/test/fixtures/semantic-html5-scenarios/ordered-list-with-id-roles.html b/test/fixtures/semantic-html5-scenarios/ordered-list-with-id-roles.html
@@ -1,10 +1,10 @@
 <ol id="list_a" class="class_a class_b">
-<li>step 1</li>
-<li>step 2</li>
-<li>step 3</li>
+<li><span class="principal">step 1</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 3</span></li>
 </ol>
 <ol id="list_b" class="class_c class_d">
-<li>step 1</li>
-<li>step 2</li>
-<li>step 3</li>
-</ol>
+<li><span class="principal">step 1</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 3</span></li>
+</ol>
diff --git a/test/fixtures/semantic-html5-scenarios/ordered-list-with-id.html b/test/fixtures/semantic-html5-scenarios/ordered-list-with-id.html
@@ -1,10 +1,10 @@
 <ol id="list_a">
-<li>step 1</li>
-<li>step 2</li>
-<li>step 3</li>
+<li><span class="principal">step 1</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 3</span></li>
 </ol>
 <ol id="list_b">
-<li>step 1</li>
-<li>step 2</li>
-<li>step 3</li>
-</ol>
+<li><span class="principal">step 1</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 3</span></li>
+</ol>
diff --git a/test/fixtures/semantic-html5-scenarios/ordered-list-with-reverse.html b/test/fixtures/semantic-html5-scenarios/ordered-list-with-reverse.html
@@ -1,5 +1,5 @@
 <ol reversed="true">
-<li>step 3</li>
-<li>step 2</li>
-<li>step 1</li>
-</ol>
+<li><span class="principal">step 3</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 1</span></li>
+</ol>
diff --git a/test/fixtures/semantic-html5-scenarios/ordered-list-with-start.html b/test/fixtures/semantic-html5-scenarios/ordered-list-with-start.html
@@ -1,5 +1,5 @@
 <ol start="3">
-<li>step 3</li>
-<li>step 4</li>
-<li>step 5</li>
-</ol>
+<li><span class="principal">step 3</span></li>
+<li><span class="principal">step 4</span></li>
+<li><span class="principal">step 5</span></li>
+</ol>
diff --git a/test/fixtures/semantic-html5-scenarios/ordered-list-with-title.html b/test/fixtures/semantic-html5-scenarios/ordered-list-with-title.html
@@ -1,12 +1,12 @@
 <ol>
-<strong class="title">List A</strong>
-<li>step 1</li>
-<li>step 2</li>
-<li>step 3</li>
+<header><strong class="title">List A</strong></header>
+<li><span class="principal">step 1</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 3</span></li>
 </ol>
 <ol>
-<strong class="title">List B</strong>
-<li>step 1</li>
-<li>step 2</li>
-<li>step 3</li>
-</ol>
+<header><strong class="title">List B</strong></header>
+<li><span class="principal">step 1</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 3</span></li>
+</ol>
diff --git a/test/fixtures/semantic-html5-scenarios/ordered-list.html b/test/fixtures/semantic-html5-scenarios/ordered-list.html
@@ -1,10 +1,10 @@
 <ol>
-<li>step 1</li>
-<li>step 2</li>
-<li>step 3</li>
+<li><span class="principal">step 1</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 3</span></li>
 </ol>
 <ol>
-<li>step 1</li>
-<li>step 2</li>
-<li>step 3</li>
-</ol>
+<li><span class="principal">step 1</span></li>
+<li><span class="principal">step 2</span></li>
+<li><span class="principal">step 3</span></li>
+</ol>
diff --git a/test/fixtures/semantic-html5-scenarios/unordered-list-with-id-roles.html b/test/fixtures/semantic-html5-scenarios/unordered-list-with-id-roles.html
@@ -1,4 +1,4 @@
 <ul id="my_list" class="role1 role2">
-<li>alice</li>
-<li>bob</li>
-</ul>
+<li><span class="principal">alice</span></li>
+<li><span class="principal">bob</span></li>
+</ul>
diff --git a/test/fixtures/semantic-html5-scenarios/unordered-list-with-id.html b/test/fixtures/semantic-html5-scenarios/unordered-list-with-id.html
@@ -1,4 +1,4 @@
 <ul id="my_list">
-<li>alice</li>
-<li>bob</li>
-</ul>
+<li><span class="principal">alice</span></li>
+<li><span class="principal">bob</span></li>
+</ul>
diff --git a/test/fixtures/semantic-html5-scenarios/unordered-list-with-title.html b/test/fixtures/semantic-html5-scenarios/unordered-list-with-title.html
@@ -1,5 +1,5 @@
 <ul>
-<strong class="title">baby names</strong>
-<li>alice</li>
-<li>bob</li>
-</ul>
+<header><strong class="title">baby names</strong><header>
+<li><span class="principal">alice</span></li>
+<li><span class="principal">bob</span></li>
+</ul>
diff --git a/test/fixtures/semantic-html5-scenarios/unordered-list.html b/test/fixtures/semantic-html5-scenarios/unordered-list.html
@@ -1,4 +1,4 @@
 <ul>
-<li>alice</li>
-<li>bob</li>
-</ul>
+<li><span class="principal">alice</span></li>
+<li><span class="principal">bob</span></li>
+</ul>