X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=asciidoc%2Fpve-docbook.conf;fp=asciidoc%2Fpve-docbook.conf;h=ade991cef32ec79a550edf7317f35f2f32432135;hp=8c557b6ace36490f3fb029e72e7a79e4b4b285ad;hb=c7a25e7c933d32c2928e80034856853d36da91d0;hpb=69b974d9d43b30e96ed3bcf8fc7fbf34af4ceac7

diff --git a/asciidoc/pve-docbook.conf b/asciidoc/pve-docbook.conf
index 8c557b6..ade991c 100644
--- a/asciidoc/pve-docbook.conf
+++ b/asciidoc/pve-docbook.conf
@@ -44,29 +44,29 @@ endif::asciidoc7compatible[]
 <simpara><?asciidoc-pagebreak?></simpara>
 
 [blockdef-pass]
-latexmath-style=template="latexmathblock",subs=()
+latexmath-style=template="latexmathblock",subs=(),posattrs=(),filter="unwraplatex.py"
 
 [macros]
 # math macros.
-(?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[]
-(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[]
+(?s)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?:\$\s*)?(?P<passtext>.*?)(?:\s*\$)?(?<!\\)\]=[]
+^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[]
 
 [latexmath-inlinemacro]
 <inlineequation>
-<alt><![CDATA[{passtext}]]></alt>
+<alt><![CDATA[${passtext}$]]></alt>
 <inlinemediaobject><textobject><phrase></phrase></textobject></inlinemediaobject>
 </inlineequation>
 
 [latexmath-blockmacro]
 <informalequation>
-<alt><![CDATA[{passtext}]]></alt>
+<alt><![CDATA[{backslash}[{passtext}{backslash}]]]></alt>
 <mediaobject><textobject><phrase></phrase></textobject></mediaobject>
 </informalequation>
 
 [latexmathblock]
-<equation{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}"}><title>{title}</title>
+<equation{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}"}{floatstyle? floatstyle="{floatstyle}"}><title>{title}</title>
 {title%}<informalequation{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}"}>
-<alt><![CDATA[|]]></alt>
+<alt><![CDATA[\[|\]]]></alt>
 <mediaobject><textobject><phrase></phrase></textobject></mediaobject>
 {title#}</equation>
 {title%}</informalequation>
@@ -80,7 +80,7 @@ latexmath-style=template="latexmathblock",subs=()
 </inlinemediaobject>
 
 [image-blockmacro]
-<figure{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}"}{pgwide-option? pgwide="1"}><title>{title}</title>
+<figure{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}"}{floatstyle? floatstyle="{floatstyle}"}{pgwide-option? pgwide="1"}><title>{title}</title>
 {title%}<informalfigure{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}"}>{pgwide-option?<?dbfo pgwide="1"?>}
 # DocBook XSL Stylesheets custom processing instructions.
 <?dbfo keep-together="{breakable-option#auto}"?>
@@ -246,7 +246,7 @@ endif::deprecated-quotes[]
 # xref:id[text]
 [xref-inlinemacro]
 <link linkend="{target}">{0}</link>
-{2%}<xref linkend="{target}"/>
+{0%}<xref linkend="{target}"/>
 # <<id,text>>
 [xref2-inlinemacro]
 <link linkend="{1}">{2}</link>
@@ -390,7 +390,7 @@ template::[quote-open]
 template::[quote-close]
 
 [exampleblock-open]
-<{title?example}{title!informalexample}{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}"}>
+<{title?example}{title!informalexample}{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}"}{floatstyle? floatstyle="{floatstyle}"}>
 # DocBook XSL Stylesheets custom processing instructions.
 <?dbfo keep-together="{breakable-option#auto}"?>
 <?dbfo keep-together="{unbreakable-option#always}"?>
@@ -447,7 +447,7 @@ paragraph=
 paragraph=
 
 [table]
-<{title?table}{title!informaltable}{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}"}{pgwide-option? pgwide="1"}
+<{title?table}{title!informaltable}{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}{floatstyle? floatstyle="{floatstyle}"}"}{pgwide-option? pgwide="1"}
 frame="{frame=all}"
 {grid%rowsep="1" colsep="1"}
 rowsep="{grid@none|cols:0:1}" colsep="{grid@none|rows:0:1}"