cdata and pi macros and blocks now substitute attributes by default.

1 files changed, 7 insertions, 5 deletions

diff --git a/asciidoc.conf b/asciidoc.conf
index bcbed06..0b08f5a 100644
--- a/asciidoc.conf
+++ b/asciidoc.conf
@@ -213,8 +213,9 @@ endif::asciidoc7compatible[]
 [\\]?&lt;(?P<index>\d+)&gt;=callout

 

 # Passthrough macros.

-(?su)[\\]?(?P<name>cdata|pass):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[]

-(?su)[\\]?(?P<name>pi):(?P<target>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[]

+(?su)[\\]?(?P<name>pass):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[]

+(?su)[\\]?(?P<name>cdata):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[attributes]

+(?su)[\\]?(?P<name>pi):(?P<target>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[attributes]

 

 # Triple-plus and double-dollar inline passthroughs.

 (?su)[\\]?\+\+\+(?P<passtext>.*?)\+\+\+=pass[]

@@ -233,8 +234,9 @@ endif::asciidoc7compatible[]
 ^//([^/].*|)$=#comment

 

 # Passthrough macros.

-(?u)^(?P<name>cdata|pass)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[]

-(?u)^(?P<name>pi)::(?P<target>\S*?)(\[(?P<passtext>.*?)\])$=#[]

+(?u)^(?P<name>pass)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[]

+(?u)^(?P<name>cdata)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[attributes]

+(?u)^(?P<name>pi)::(?P<target>\S*?)(\[(?P<passtext>.*?)\])$=#[attributes]

 

 (?u)^(?P<name>image)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#

 

@@ -277,7 +279,7 @@ template=passblock
 subs=attributes,macros

 posattrs=style

 pass-style=template="passblock",subs=[]

-cdata-style=template="cdatablock",subs=[]

+cdata-style=template="cdatablock",subs="attributes"

 

 [blockdef-listing]

 delimiter=^-{4,}$