Fold convert-aasvg.lua into convert-diagrams.lua

build.sh

@@ -772,7 +772,6 @@ do_latex() {
 		--highlight-style=${SYNTAX_HIGHLIGHT_STYLE}
 		--template=${TEMPLATE_PDF}
 		--lua-filter=convert-diagrams.lua
-		--lua-filter=convert-aasvg.lua
 		--lua-filter=convert-images.lua
 		--lua-filter=center-images.lua
 		--lua-filter=informative-sections.lua
@@ -883,7 +882,6 @@ do_docx() {
 		--embed-resources
 		--standalone
 		--lua-filter=convert-diagrams.lua
-		--lua-filter=convert-aasvg.lua
 		--lua-filter=convert-images.lua
 		--lua-filter=parse-html.lua
 		--lua-filter=apply-classes-to-tables.lua
@@ -927,7 +925,6 @@ do_html() {
 		--template=${TEMPLATE_HTML}
 		${HTML_STYLESHEET_ARGS}
 		--lua-filter=convert-diagrams.lua
-		--lua-filter=convert-aasvg.lua
 		--lua-filter=parse-html.lua
 		--lua-filter=apply-classes-to-tables.lua
 		--lua-filter=landscape-pages.lua

filter/convert-diagrams.lua

@@ -1,5 +1,5 @@
--- Turn mermaid and plantuml code blocks into figures, retaining other classes
--- on the code block as classes on the figure.
+-- Turn aasvg, mermaid, or plantuml code blocks into figures, retaining
+-- other classes on the code block as classes on the figure.
 
 -- Patch the path to include the current script's directory.
 package.path = package.path .. ";" .. debug.getinfo(1).source:match("@?(.*/)") .. "?.lua"
@@ -71,6 +71,10 @@ function convertFigure(code, caption, attrs, extension, convert_command)
     return pandoc.Figure(img, caption, attrs)
 end
 
+function aasvgFigure(code, caption, attrs)
+    return convertFigure(code, caption, attrs, ".aasvg.svg", "aasvg --fill > %s 2>&1")
+end
+
 function mermaidFigure(code, caption, attrs)
     return convertFigure(code, caption, attrs, mermaid_extension[FORMAT] or mermaid_extension["pdf"],
         "mmdc --configFile /resources/filters/mermaid-config.json --puppeteerConfigFile ./.puppeteer.json --width 2000 --height 2000 --backgroundColor transparent --pdfFit --input - --output %s 2>&1")
@@ -86,7 +90,7 @@ function CodeBlock(el)
 
     local figure_classes = pandoc.List({})
     for i, class in ipairs(el.classes) do
-        if class == 'mermaid' or class == 'plantuml' then
+        if class == 'aasvg' or class == 'mermaid' or class == 'plantuml' then
             diagramType = class
         else
             figure_classes:insert(class)
@@ -97,6 +101,9 @@ function CodeBlock(el)
         local caption = {long = pandoc.Plain(pandoc.Str(el.attributes.caption))}
         local attrs = pandoc.Attr(el.identifier, figure_classes)
 
+        if diagramType == 'aasvg' then
+            return aasvgFigure(el.text, caption, attrs)
+        end
         if diagramType == 'mermaid' then
             return mermaidFigure(el.text, caption, attrs)
         end

guide.tcg

@@ -605,7 +605,7 @@ Users are encouraged to use AES instead.
 
 # Figures {#sec:figures}
 
-There are various ways to include a figure in a document: as an image file checked into the repository, as a [Mermaid](http://mermaid.js.org) diagram, and as an [aasvg](https://github.com/martinthomson/aasvg) diagram.
+There are various ways to include a figure in a document: as an image file checked into the repository, or as a [Mermaid](http://mermaid.js.org) or [PlantUML](https://plantuml.com) or [aasvg](https://github.com/martinthomson/aasvg) diagram.
 
 ## Images