@amermathsoc/texml-to-html 17.0.1 → 17.1.0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [17.1.0](https://github.com/AmerMathSoc/texml-to-html/compare/v17.0.1...v17.1.0) (2024-07-04)
+
+
+### Features
+
+* **toc-entry.js:** add label/title wrappers ([2165072](https://github.com/AmerMathSoc/texml-to-html/commit/2165072dc60ff9fd7c40ad6f65221eaa6f0924a2)), closes [#451](https://github.com/AmerMathSoc/texml-to-html/issues/451)
+
 ### [17.0.1](https://github.com/AmerMathSoc/texml-to-html/compare/v17.0.0...v17.0.1) (2024-06-07)
 
 

package/lib/elements/toc-entry.js

@@ -27,13 +27,14 @@ export default function (htmlParentNode, xmlnode) {
     "data-ams-ref": xmlnode.getAttribute('specific-use') // NOTE: specific-use contains `ref@ref-type`-like information (e.g., 'chapter', 'section')
   });
   li.appendChild(anchor);
-  // NOTE unify label/title processing with label() - requires some form of new wrapper around content in lieu of heading (or have it add the anchor but then the nav-pointer will be odd to pull in). See #398
-  // NOTE [...].find() HACK for bug with ':scope > ...', jsdom/jsdom#2998
+  // NOTE: label/title handling must stay aligned with other cases
   const label = xmlnode.querySelector(':scope>label');
   const title = xmlnode.querySelector(':scope>title');
   const altTitle = xmlnode.querySelector(':scope>alt-title');
   if (label && label.innerHTML.trim() !== '') {
-    this.passThrough(anchor, label);
+    const labelSpan = this.createNode('span', '', { 'data-ams-doc': 'label' });
+    anchor.appendChild(labelSpan);
+    this.passThrough(labelSpan, label);
     anchor.insertAdjacentText('beforeend', '. ');
   }
   if (altTitle) {
@@ -43,7 +44,11 @@ export default function (htmlParentNode, xmlnode) {
       anchor.textContent + altTitleContent
     );
   }
-  if (title) this.passThrough(anchor, title);
+  if (title) {
+    const titleSpan = this.createNode('span', '', { 'data-ams-doc': 'title' });
+    anchor.appendChild(titleSpan);
+    this.passThrough(titleSpan, title);
+  }
   // NOTE we expect very simple markup: one contrib group, string-names only
   const contribGroup = xmlnode.querySelector(':scope>contrib-group');
   if (contribGroup) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amermathsoc/texml-to-html",
-  "version": "17.0.1",
+  "version": "17.1.0",
   "type": "module",
   "description": "A NodeJS library for converting AMS-style JATS XML to HTML",
   "scripts": {

package/test/element-toc-toc-entry.js

@@ -17,7 +17,7 @@
 import { book } from './helper.js';
 import tape from 'tape';
 
-tape('Template: (book) toc, toc-entry', async function(t) {
+tape('Template: (book) toc, toc-entry', async function (t) {
   t.plan(14);
   const document = book;
 
@@ -30,28 +30,28 @@ tape('Template: (book) toc, toc-entry', async function(t) {
   t.equal(list.children.length, 6, 'Nested toc-entries remain nested')
   t.equal(
     list.querySelector('li a[href="#tocid1"][data-ams-ref="chapter"]').innerHTML,
-    'Chunk',
+    '<span data-ams-doc="title">Chunk</span>',
     'toc-entry and nav-pointer with href and data-ams-ref'
   );
   t.equal(
     list.querySelector('li a[href="#tocid2"]').innerHTML,
-    '2. Chunk',
+    '<span data-ams-doc="label">2</span>. <span data-ams-doc="title">Chunk</span>',
     'toc-entry, label, nav-pointer'
   );
   t.equal(list.querySelector('ol').children.length, 1, 'Doubly nested toc-entries remain nested');
   t.equal(
     list.querySelector('li a[href="#tocid2"]+ol li a[href="#tocid3"]').innerHTML,
-    '1. SubChunk',
+    '<span data-ams-doc="label">1</span>. <span data-ams-doc="title">SubChunk</span>',
     'Nested toc-entry, label, nav-pointer'
   );
   t.equal(
     list.querySelector('li a[href="#tocid4"]').innerHTML,
-    '1. SubSubChunk with <span data-ams-href="chapter">Link</span>',
+    '<span data-ams-doc="label">1</span>. <span data-ams-doc="title">SubSubChunk with <span data-ams-href="chapter">Link</span></span>',
     'toc-entry with xref in title'
   );
   t.equal(
     list.querySelector('li a[href="#tocid5"]').innerHTML,
-    'Chunk with alt title',
+    '<span data-ams-doc="title">Chunk with alt title</span>',
     'toc-entry with alt-title: content'
   );
   t.equal(
@@ -61,7 +61,7 @@ tape('Template: (book) toc, toc-entry', async function(t) {
   );
   t.equal(
     list.querySelector('li a[href="#tocid6"]').innerHTML,
-    'Chunk without label but subchunk with label',
+    '<span data-ams-doc="title">Chunk without label but subchunk with label</span>',
     'toc-entry without label but sub-entry with label'
   );
   t.equal(