feature: Inject block attributes into labelled list text.

src/rimu/blockattributes.py

@@ -70,7 +70,7 @@ def parse(attrs: str) -> bool:
     return True
 
 
-def injectHtmlAttributes(tag: str) -> str:
+def injectHtmlAttributes(tag: str, consume: bool=True) -> str:
     '''Inject HTML attributes into the HTML `tag` and return result.
        Consume HTML attributes unless the 'tag' argument is blank.'''
     global classes, id, css, attributes, opts, ids
@@ -114,11 +114,12 @@ def injectHtmlAttributes(tag: str) -> str:
             before = result[:len(match[0])]
             after = result[len(match[0]):]
             result = before + ' ' + attrs + after
-    # Consume the attributes.
-    classes = ''
-    id = ''
-    css = ''
-    attributes = ''
+    if consume:
+        # Consume the attributes.
+        classes = ''
+        id = ''
+        css = ''
+        attributes = ''
     return result
 
 

src/rimu/lists.py

@@ -1,9 +1,9 @@
+import re
+from typing import List, Match, Optional, Pattern
+
 from rimu import (blockattributes, delimitedblocks, expansion, io, lineblocks,
                   options, utils)
-
-from typing import Optional, Pattern, Match, List
 from rimu.expansion import Expand
-import re
 
 
 class Def:
@@ -112,13 +112,12 @@ def renderListItem(item: ItemInfo, reader: io.Reader, writer: io.Writer) -> Opti
     match = item.match
     text: str
     if d.termOpenTag:  # => definition list.
-        writer.write(blockattributes.injectHtmlAttributes(d.termOpenTag))
+        writer.write(blockattributes.injectHtmlAttributes(d.termOpenTag, consume=False))
+        blockattributes.id=''
         text = utils.replaceInline(match[1], Expand(macros=True, spans=True))
         writer.write(text)
         writer.write(d.termCloseTag)
-        writer.write(d.itemOpenTag)
-    else:
-        writer.write(blockattributes.injectHtmlAttributes(d.itemOpenTag))
+    writer.write(blockattributes.injectHtmlAttributes(d.itemOpenTag))
     # Process item text from first line.
     itemLines = io.Writer()
     text = match[match.re.groups]

tests/rimu-tests.json

@@ -2468,7 +2468,7 @@
     }
   },
   {
-    "unsupported": "go,kt,dart",
+    "unsupported": "go,kt,dart,py",
     "description": "line block macro expression value definition",
     "input": "{foo} = `(parseInt(40) + parseInt(2)) + 'px'`\n{foo}",
     "expectedOutput": "<p>42px</p>",
@@ -2478,7 +2478,7 @@
     }
   },
   {
-    "unsupported": "go,kt,dart",
+    "unsupported": "go,kt,dart,py",
     "description": "multi-line macro expression value definition",
     "input": "{foo} = `(parseInt(40) + parseInt(2)) \n+ 'px'`\n{foo}",
     "expectedOutput": "<p>42px</p>",
@@ -2488,7 +2488,7 @@
     }
   },
   {
-    "unsupported": "go,kt,dart",
+    "unsupported": "go,kt,dart,py",
     "description": "delimited block macro expression line continuation",
     "input": "{foo} = `(parseInt(40) + parseInt(2)) + ` \\\npx``\n{foo}",
     "expectedOutput": "<p>42\npx</p>",
@@ -2498,7 +2498,7 @@
     }
   },
   {
-    "unsupported": "go,kt,dart",
+    "unsupported": "go,kt,dart,py",
     "description": "delimited block macro expression escaped line continuation",
     "input": "{foo} = `(parseInt(40) + parseInt(2)) + ` \\\\\npx``\n{foo}",
     "expectedOutput": "<p>42 px</p>",
@@ -2508,7 +2508,7 @@
     }
   },
   {
-    "unsupported": "go,kt,dart",
+    "unsupported": "go,kt,dart,py",
     "description": "illegal macro expression",
     "input": "{foo} = `1 + x`",
     "expectedOutput": "",
@@ -2601,7 +2601,7 @@
   {
     "description": "Block Attributes applied labelled list terms",
     "input": ".#id1\nOne:: Item one.\n\n.#id2\n.class\nTwo:: Item two.",
-    "expectedOutput": "<dl id=\"id1\"><dt>One</dt><dd>Item one.</dd><dt class=\"class\" id=\"id2\">Two</dt><dd>Item two.</dd></dl>",
+    "expectedOutput": "<dl id=\"id1\"><dt>One</dt><dd>Item one.</dd><dt class=\"class\" id=\"id2\">Two</dt><dd class=\"class\">Item two.</dd></dl>",
     "expectedCallback": "",
     "options": {
       "reset": true