figures in terms

SteveLLamb · SteveLLamb · commit 8365bb7cdc6c · 2025-09-23T13:38:34.000-07:00
diff --git a/js/validate.mjs b/js/validate.mjs
@@ -270,6 +270,22 @@ class DefinitionNoteMatcher {
   }
 }
 
+class DefinitionFigureMatcher {
+  static match(element, logger) {
+    if (element.localName !== "dd" || !element.classList.contains("figure"))
+      return false;
+
+    // Must contain exactly one figure child
+    const children = Array.from(element.children);
+    if (children.length !== 1 || children[0].localName !== "figure") {
+      logger.error(`Definition figure must contain a single figure element`, element);
+      return true; 
+    }
+
+    return true;
+  }
+}
+
 
 class UlMatcher {
   static match(element, logger) {
@@ -658,6 +674,12 @@ class InternalDefinitionsMatcher {
         count++;
       }
 
+      /* look for definition figure */
+
+      if (children.length > 0 && DefinitionFigureMatcher.match(children[0], logger)) {
+        children.shift();
+      }
+
     }
 
     return true;
diff --git a/test/resources/html/validation/terms-4-invalid.html b/test/resources/html/validation/terms-4-invalid.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<html>
+  <head itemscope="itemscope" itemtype="http://smpte.org/standards/documents">
+    <meta charset="utf-8" />
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <script type="module" src="../../../../smpte.js"></script>
+    <meta itemprop="test" content="invalid" />
+    <meta itemprop="pubType" content="AG" />
+    <meta itemprop="pubNumber" content="99" />
+    <meta itemprop="pubState" content="draft" />
+    <title>Title of the document</title>
+  </head>
+  <body>
+    <section id="sec-scope">
+      <p>This is the scope of the document.</p>
+    </section>
+
+    <section id="sec-normative-references">
+      <ul>
+        <li>
+          <cite id="bib-smpte-standards-operations-manual">SMPTE OM</cite></li>
+      </ul>
+    </section>
+
+    <section id="sec-terms-and-definitions">
+      <ul id="terms-ext-defs">
+        <li><a href="#bib-smpte-standards-operations-manual"></a></li>
+      </ul>
+      <dl id="terms-int-defs">
+        <dt><dfn>Clear</dfn></dt>
+        <dt>CLR</dt>
+        <dd>When something is clean</dd>
+        <dd><a href="#bib-smpte-standards-operations-manual"></a></dd>
+        <dd class="note">The term shall not be used to refer to clarity of mind, see <a href="#figure-1"></a> and <a href="#figure-2"><</a>.</dd>
+        <dd class="figure">
+          <figure id="figure-1">
+            <img src="../../../../doc/media/sample.png">
+            <figcaption>This figure show an example</figcaption>
+          </figure>
+          <figure id="figure-2">
+            <img src="../../../../doc/media/sample.png">
+            <figcaption>This figure show an example</figcaption>
+          </figure>
+        </dd>
+      </dl>
+    </section>
+  </body>
+</html>
diff --git a/test/resources/html/validation/terms-valid.html b/test/resources/html/validation/terms-valid.html
@@ -32,7 +32,13 @@
         <dt>CLR</dt>
         <dd>When something is clean</dd>
         <dd><a href="#bib-smpte-standards-operations-manual"></a></dd>
-        <dd class="note">The term shall not be used to refer to clarity of mind.</dd>
+        <dd class="note">The term shall not be used to refer to clarity of mind, see <a href="#figure-1"></a>.</dd>
+        <dd class="figure">
+          <figure id="figure-1">
+            <img src="../../../../doc/media/sample.png">
+            <figcaption>This figure show an example</figcaption>
+          </figure>
+        </dd>
       </dl>
     </section>
   </body>
