Various fixes for passthroughs and substitutions

acdc-parser/CHANGELOG.md

@@ -9,10 +9,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Expand attributes inside `pass:a[]` content when macros disabled via `subs=-macros`,
+  matching asciidoctor behavior
+- Fixed passthrough preprocessor bypassing `subs=-macros` gating — `pass:[]` macros and
+  inline passthrough syntax (`+...+`, `++...++`, `+++...+++`) are now treated as literal
+  text when macros are disabled, matching asciidoctor behavior
 - Fixed non-monotonic inline positions for subscript/superscript text preceded by short plain text
 
 ### Added
 
+- **`subs=macros` substitution type** — `[subs=-macros]` and explicit lists without `macros`
+  now gate macro grammar rules at parse time. When macros are disabled, inline macros
+  (links, xrefs, images, footnotes, index terms, etc.) are treated as plain text.
+  Requires the `pre-spec-subs` feature flag.
 - **Include `indent` attribute** — `include::file.rb[indent=2]` now re-indents included content
   to the specified level, matching asciidoctor behavior. Strips existing leading whitespace and
   prepends the specified number of spaces. `indent=0` removes all leading whitespace.

acdc-parser/fixtures/tests/subs_explicit_no_macros.adoc

@@ -0,0 +1,2 @@
+[subs=specialchars]
+This has link:https://example.com[text] and macro text.

acdc-parser/fixtures/tests/subs_explicit_no_macros.json

@@ -0,0 +1,52 @@
+{
+  "name": "document",
+  "type": "block",
+  "blocks": [
+    {
+      "name": "paragraph",
+      "type": "block",
+      "inlines": [
+        {
+          "name": "text",
+          "type": "string",
+          "value": "This has link:https://example.com[text] and macro text.",
+          "location": [
+            {
+              "line": 2,
+              "col": 1
+            },
+            {
+              "line": 2,
+              "col": 55
+            }
+          ]
+        }
+      ],
+      "metadata": {
+        "substitutions": [
+          "special_chars"
+        ]
+      },
+      "location": [
+        {
+          "line": 1,
+          "col": 1
+        },
+        {
+          "line": 2,
+          "col": 55
+        }
+      ]
+    }
+  ],
+  "location": [
+    {
+      "line": 1,
+      "col": 1
+    },
+    {
+      "line": 2,
+      "col": 55
+    }
+  ]
+}

acdc-parser/fixtures/tests/subs_macros_disabled.adoc

@@ -0,0 +1,2 @@
+[subs=-macros]
+This has link:https://example.com[a link] and xref:section[cross ref] and image:photo.png[alt] and footnote:[a note] and [[myanchor]]anchor and [[[bibref]]]biblio as plain text.

acdc-parser/fixtures/tests/subs_macros_disabled.json

@@ -0,0 +1,52 @@
+{
+  "name": "document",
+  "type": "block",
+  "blocks": [
+    {
+      "name": "paragraph",
+      "type": "block",
+      "inlines": [
+        {
+          "name": "text",
+          "type": "string",
+          "value": "This has link:https://example.com[a link] and xref:section[cross ref] and image:photo.png[alt] and footnote:[a note] and [[myanchor]]anchor and [[[bibref]]]biblio as plain text.",
+          "location": [
+            {
+              "line": 2,
+              "col": 1
+            },
+            {
+              "line": 2,
+              "col": 177
+            }
+          ]
+        }
+      ],
+      "metadata": {
+        "substitutions": [
+          "-macros"
+        ]
+      },
+      "location": [
+        {
+          "line": 1,
+          "col": 1
+        },
+        {
+          "line": 2,
+          "col": 177
+        }
+      ]
+    }
+  ],
+  "location": [
+    {
+      "line": 1,
+      "col": 1
+    },
+    {
+      "line": 2,
+      "col": 177
+    }
+  ]
+}

acdc-parser/fixtures/tests/subs_pass_attributes_macros_disabled.adoc

@@ -0,0 +1,4 @@
+:version: 1.0.0
+
+[subs=-macros]
+Use pass:a[{version}] here.

acdc-parser/fixtures/tests/subs_pass_attributes_macros_disabled.json

@@ -0,0 +1,55 @@
+{
+  "name": "document",
+  "type": "block",
+  "attributes": {
+    "version": "1.0.0"
+  },
+  "blocks": [
+    {
+      "name": "paragraph",
+      "type": "block",
+      "inlines": [
+        {
+          "name": "text",
+          "type": "string",
+          "value": "Use pass:a[1.0.0] here.",
+          "location": [
+            {
+              "line": 4,
+              "col": 1
+            },
+            {
+              "line": 4,
+              "col": 27
+            }
+          ]
+        }
+      ],
+      "metadata": {
+        "substitutions": [
+          "-macros"
+        ]
+      },
+      "location": [
+        {
+          "line": 3,
+          "col": 1
+        },
+        {
+          "line": 4,
+          "col": 27
+        }
+      ]
+    }
+  ],
+  "location": [
+    {
+      "line": 1,
+      "col": 1
+    },
+    {
+      "line": 4,
+      "col": 27
+    }
+  ]
+}

acdc-parser/fixtures/tests/subs_pass_macros_disabled.adoc

@@ -0,0 +1,2 @@
+[subs=-macros]
+Use pass:[<b>bold</b>] for raw HTML.

acdc-parser/fixtures/tests/subs_pass_macros_disabled.json

@@ -0,0 +1,52 @@
+{
+  "name": "document",
+  "type": "block",
+  "blocks": [
+    {
+      "name": "paragraph",
+      "type": "block",
+      "inlines": [
+        {
+          "name": "text",
+          "type": "string",
+          "value": "Use pass:[<b>bold</b>] for raw HTML.",
+          "location": [
+            {
+              "line": 2,
+              "col": 1
+            },
+            {
+              "line": 2,
+              "col": 36
+            }
+          ]
+        }
+      ],
+      "metadata": {
+        "substitutions": [
+          "-macros"
+        ]
+      },
+      "location": [
+        {
+          "line": 1,
+          "col": 1
+        },
+        {
+          "line": 2,
+          "col": 36
+        }
+      ]
+    }
+  ],
+  "location": [
+    {
+      "line": 1,
+      "col": 1
+    },
+    {
+      "line": 2,
+      "col": 36
+    }
+  ]
+}

acdc-parser/fixtures/tests/subs_specialchars_no_attributes.adoc

@@ -0,0 +1,4 @@
+:version: 1.0.0
+
+[subs=specialchars]
+The version is {version} here.

acdc-parser/fixtures/tests/subs_specialchars_no_attributes.json

@@ -0,0 +1,55 @@
+{
+  "name": "document",
+  "type": "block",
+  "attributes": {
+    "version": "1.0.0"
+  },
+  "blocks": [
+    {
+      "name": "paragraph",
+      "type": "block",
+      "inlines": [
+        {
+          "name": "text",
+          "type": "string",
+          "value": "The version is {version} here.",
+          "location": [
+            {
+              "line": 4,
+              "col": 1
+            },
+            {
+              "line": 4,
+              "col": 30
+            }
+          ]
+        }
+      ],
+      "metadata": {
+        "substitutions": [
+          "special_chars"
+        ]
+      },
+      "location": [
+        {
+          "line": 3,
+          "col": 1
+        },
+        {
+          "line": 4,
+          "col": 30
+        }
+      ]
+    }
+  ],
+  "location": [
+    {
+      "line": 1,
+      "col": 1
+    },
+    {
+      "line": 4,
+      "col": 30
+    }
+  ]
+}