From 3cf74171a88da1fa91fa82e472d216a549d93594 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Wed, 23 Aug 2023 21:43:50 +1200
Subject: [PATCH] buildmimetree.py: fix up extensions

---
 .config/neomutt/buildmimetree.py | 19 ++++++++-----------
 .config/neomutt/neomuttrc        |  3 ++-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.config/neomutt/buildmimetree.py b/.config/neomutt/buildmimetree.py
index 3528b06..0b62aa4 100755
--- a/.config/neomutt/buildmimetree.py
+++ b/.config/neomutt/buildmimetree.py
@@ -6,8 +6,10 @@
 #
 # Configuration:
 #   neomuttrc (needs to be a single line):
+#     set my_mdwn_extensions="extra,admonition,codehilite,sane_lists,smarty"
 #     macro compose B "\
-#       <enter-command> source '$my_confdir/buildmimetree.py setup --tempdir $tempdir|'<enter>\
+#       <enter-command> source '$my_confdir/buildmimetree.py setup \
+#       --tempdir $tempdir --extensions $my_mdwn_extensions|'<enter>\
 #       <enter-command> sourc e \$my_mdwn_postprocess_cmd_file<enter>\
 #     " "Convert message into a modern MIME tree with inline images"
 #
@@ -62,14 +64,10 @@ def parse_cli_args(*args, **kwargs):
     parser_massage = subp.add_parser("massage", help="Massaging phase")
 
     parser_setup.add_argument(
-        "--extension",
-        "-x",
-        metavar="EXTENSION",
-        dest="extensions",
-        nargs="?",
-        default=[],
-        action="append",
-        help="Markdown extension to add to the list of extensions use",
+        "--extensions",
+        type=str,
+        default="",
+        help="Markdown extension to use (comma-separated list)"
     )
 
     parser_setup.add_argument(
@@ -410,7 +408,6 @@ def do_setup(
     tempdir=None,
     debug_commands=False,
 ):
-    extensions = extensions or []
     temppath = temppath or pathlib.Path(
         tempfile.mkstemp(prefix="muttmdwn-", dir=tempdir)[1]
     )
@@ -418,7 +415,7 @@ def do_setup(
 
     editor = f"{sys.argv[0]} massage --write-commands-to {temppath}"
     if extensions:
-        editor = f'{editor} --extensions {",".join(extensions)}'
+        editor = f'{editor} --extensions {extensions}'
     if only_build:
         editor = f'{editor} --only-build'
     if tempdir:
diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc
index 6a7f0ad..8f48387 100644
--- a/.config/neomutt/neomuttrc
+++ b/.config/neomutt/neomuttrc
@@ -62,4 +62,5 @@ source "test -f $alias_file && cat $alias_file 2>/dev/null || echo unset alias_f
 #
 #set pager_format="<%a> %*  %J (%P)"
 
-macro compose B "<enter-command> source '$my_confdir/buildmimetree.py setup --debug-commands --tempdir $tmpdir --only-build|'<enter><enter-command> source \$my_mdwn_postprocess_cmd_file<enter>" "Convert message into a modern MIME tree with inline images"
+set my_markdown_extensions="extra,admonition,codehilite,sane_lists,smarty"
+macro compose B "<enter-command> source '$my_confdir/buildmimetree.py setup --extensions $my_markdown_extensions --tempdir $tmpdir --only-build|'<enter><enter-command> source \$my_mdwn_postprocess_cmd_file<enter>" "Convert message into a modern MIME tree with inline images"
-- 
2.39.5