diff --git a/doc_utils.py b/doc_utils.py index ae2c57b..f9228a7 100644 --- a/doc_utils.py +++ b/doc_utils.py @@ -118,12 +118,28 @@ class DocsHelper: """ Run pandoc to convert a given file to typst """ + # enable/disable certain extensions + # see all with `pandoc --list-extensions=markdown` + # documentation at https://pandoc.org/MANUAL.html + # in general, these extensions should offer some additional formatting options whilst still + # remaining similar to github flavoured markdown + pandoc_extensions = [ + "-auto_identifiers", + "+autolink_bare_uris", + "-citations", + "-definition_lists", + "+emoji", + "-example_lists", + "-fancy_lists", + "+lists_without_preceding_blankline", + "-fenced_divs", + ] pandoc_command = [ "pandoc", path, "--shift-heading-level-by=-1", "-f", - "gfm-gfm_auto_identifiers", + f"markdown{''.join(pandoc_extensions)}", "-t", "typst-citations", "--wrap=preserve", @@ -305,6 +321,10 @@ class DocsHelper: content["is_wokwi"] = True content["project_wokwi_id"] = info["wokwi_id"] + if info["is_analog"]: + content["is_analog"] = True + content["analog_pins"] = DocsHelper.format_analog_pins(info["analog_pins"]) + return content @staticmethod diff --git a/docs/typst/src/datasheet.typ b/docs/typst/src/datasheet.typ index 0588ba3..e5ec810 100644 --- a/docs/typst/src/datasheet.typ +++ b/docs/typst/src/datasheet.typ @@ -494,20 +494,23 @@ }) // add funding/sponsor page - page(context { - let funding_content = _funding_content.final() - let alt_title = _funding_alt_title.final() + context { + // check if funding has been provided, otherwise we risk adding an empty page instead + if _funding_content.final() != [] { + page({ + let funding_content = _funding_content.final() + let alt_title = _funding_alt_title.final() - if funding_content != [] { - if alt_title != none { - heading(level: 1, alt_title) - } else { - heading(level: 1, "Funding") - } + if alt_title != none { + heading(level: 1, alt_title) + } else { + heading(level: 1, "Funding") + } + + funding_content + }) } - - funding_content - }) + } page(include "../chapters/team.typ") page(include "../chapters/using-this-datasheet.typ")