Release v2.19.1: repair managed font references

test/content-references.test.js

@@ -38,6 +38,20 @@ test('content reference extraction deduplicates repeated references within a reg
   ]);
 });
 
+test('content reference extraction decodes HTML-encoded font names before parsing CSS', () => {
+  const references = collectContentReferences('slide', 12, {
+    numeric: { value: '<span style="font-family: &#39;Ubuntu&#39;;">Ubuntu</span>', font_family: 'Arial' },
+    named: { value: '<span style="font-family: &quot;Ubuntu Sans&quot;, sans-serif;">Ubuntu</span>' },
+    hex: { value: '<span style="font-family: &#x27;Ubuntu&#x27;;">Ubuntu</span>', font_family: 'Ubuntu' }
+  });
+
+  assert.deepEqual(references.map(reference => [reference.owner_key, reference.reference_value]), [
+    ['numeric', 'ubuntu'],
+    ['named', 'ubuntu sans'],
+    ['hex', 'ubuntu']
+  ]);
+});
+
 test('content reference replacement preserves unchanged rows and only deletes or inserts the delta', async () => {
   const calls = [];
   const connection = {
@@ -66,4 +80,44 @@ test('content reference replacement preserves unchanged rows and only deletes or
   assert.equal(insertion[1][0].length, 2);
   assert.deepEqual(insertion[1][0].map(row => [row[3], row[4]]), [['api-request', '5'], ['rss-feed', '8']]);
   assert.ok(!calls.some(([sql]) => sql === 'DELETE FROM c_content_references WHERE owner_type = ? AND owner_id = ?'));
+});
+
+test('content reference replacement repairs encoded font references and removes the base font', async () => {
+  const calls = [];
+  const connection = {
+    async query(sql, params) {
+      calls.push([sql, params]);
+      if (sql.startsWith('SELECT id, owner_key')) {
+        return [[
+          { id: 101, owner_key: 'second_place', reference_type: 'font-family', reference_value: '&#39' },
+          { id: 102, owner_key: 'second_place', reference_type: 'font-family', reference_value: 'arial' }
+        ]];
+      }
+      return [{}];
+    }
+  };
+
+  await replaceContentReferences(connection, 'slide', 22, {
+    second_place: { value: '<span style="font-family: &#39;Ubuntu&#39;;">Second</span>', font_family: 'Arial' }
+  });
+
+  const deletion = calls.find(([sql]) => sql.startsWith('DELETE FROM c_content_references'));
+  assert.deepEqual(deletion[1], ['slide', 22, [101, 102]]);
+  const insertion = calls.find(([sql]) => sql.startsWith('INSERT IGNORE INTO c_content_references'));
+  assert.deepEqual(insertion[1][0].map(row => [row[2], row[3], row[4]]), [
+    ['second_place', 'font-family', 'ubuntu']
+  ]);
+});
+
+test('content references omit built-in font stacks but retain managed font families', () => {
+  const references = collectContentReferences('slide', 117, {
+    base: { font_family: 'Arial, Helvetica, sans-serif' },
+    quoted: { fontFamily: "'TREBUCHET MS', Geneva, sans-serif" },
+    generic: { value: '<p style="font-family: system-ui, serif, monospace, cursive, fantasy;">Base</p>' },
+    managed: { font_family: 'Arial', value: '<span style="font-family: &#39;Ubuntu Regular&#39;, Helvetica, sans-serif;">Second</span>' }
+  });
+
+  assert.deepEqual(references.map(reference => [reference.owner_key, reference.reference_value]), [
+    ['managed', 'ubuntu regular']
+  ]);
 });