@antora/assembler 1.0.0-beta.15 → 1.0.0-beta.16

package/lib/produce-assembly-file.js

@@ -318,6 +318,10 @@ function mergeAsciiDoc (
       }
     }
     const refs = doc.getCatalog().refs
+    const scannedInlineAnchors = Object.values(refs.$$smap).reduce((accum, it) => {
+      if (it.node_name === 'inline_anchor') accum[it.id] = it
+      return accum
+    }, {})
     allBlocks.forEach((block) => {
       const contentModel = block.content_model
       if (
@@ -376,16 +380,22 @@ function mergeAsciiDoc (
           if (!refs['$key?'](refid) && (~refid.indexOf(' ') || refid.toLowerCase() !== refid)) {
             if ((refid = doc.$resolve_id(refid))['$nil?']()) return m
           }
-          return `<<${idPrefix}${refid}${text ? ',' + text : ''}>>`
+          const alphaPrefix = !(refid in scannedInlineAnchors) || /^[\p{Alpha}_:]/u.test(idPrefix) ? '' : 'iid-'
+          return `<<${alphaPrefix}${idPrefix}${refid}${text ? ',' + text : ''}>>`
         })
       }
       // NOTE: the next check takes care of inline and block anchors
       if (~line.indexOf('[[')) {
-        line = line.replace(/\[\[([\p{Alpha}_:][\p{Alpha}0-9_\-:.]*)(|, *.+?)\]\]/gu, `[[${idPrefix}$1$2]]`)
+        line = line.replace(/\[\[([\p{Alpha}_:][\p{Alpha}0-9_\-:.]*)(|, *.+?)\]\]/gu, (m, refid, text) => {
+          const alphaPrefix = !(refid in scannedInlineAnchors) || /^[\p{Alpha}_:]/u.test(idPrefix) ? '' : 'iid-'
+          return `[[${alphaPrefix}${idPrefix}${refid}${text}]]`
+        })
       }
       if (~line.indexOf('xref:')) {
         // Q: should we allow : as first character of target?
-        line = line.replace(/(?<![\\+])xref:((?:\.\/)?[\p{Alpha}0-9_/.{#].*?)\[(|.*?[^\\])\]/gu, (_, target, text) => {
+        line = line.replace(/(?<![\\+])xref:((?:\.\/)?[\p{Alpha}0-9_/.{#].*?)\[(|.*?[^\\])\]/gu, (_, target_, text) => {
+          let target = target_
+          if (~target.indexOf('{')) target = doc.$sub_attributes(target, Opal.hash({ attribute_missing: 'skip' }))
           let fragment, resource, resourceRef
           const hashIdx = target.indexOf('#')
           if (~hashIdx) {
@@ -402,21 +412,21 @@ function mergeAsciiDoc (
           const resourceId = parseResourceRef(resourceRef, page.src, 'page', contentCatalog)
           if (resourceId.family !== 'page' || !(resource = pagesInOutline.get(createResourceKey(resourceId)))) {
             if ((resource = contentCatalog.getById(resourceId))?.pub) {
-              text ||= resource.asciidoc?.xreftext || target
+              text ||= resource.asciidoc?.xreftext || target_
               if (siteRoot || linkRefStyle === 'relative') {
                 return `${resolveLinkTarget(resource, siteRoot, pubRoot, linkRefStyle)}${fragment && '#' + fragment}[${text}]`
               }
               asciidoctorLogger.warn(
                 doc.createLogMessage(
-                  `Cannot create external ${resourceId.family} reference in assembly because site URL is unknown: ${target}`,
+                  `Cannot create external ${resourceId.family} reference in assembly because site URL is unknown: ${target_}`,
                   { source_location: { file: relative, lineno: idx + 1 } }
                 )
               )
             }
             const linkAttrlist = text
               ? (~text.indexOf(',') ? `"${text}"` : text) + ',role=unresolved'
-              : 'role=unresolved'
-            return `link:${target}[${linkAttrlist}]`
+              : (~target.indexOf(':') ? `${target},` : '') + 'role=unresolved'
+            return `link:${target_}[${linkAttrlist}]`
           }
           if (fragment === resource.asciidoc.id) fragment = ''
           if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/assembler",
-  "version": "1.0.0-beta.15",
+  "version": "1.0.0-beta.16",
   "description": "A JavaScript library that merges AsciiDoc content from multiple pages in an Antora site into assembly files and delegates to an exporter to convert those files to another format, such as PDF.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",