Use multiple patches for sphinxcontrib.asciinema

Author: spoorcc

dfetch.yaml

@@ -20,4 +20,6 @@ manifest:
     repo-path: divi255/sphinxcontrib.asciinema.git
     dst: doc/_ext/sphinxcontrib_asciinema
     src: sphinxcontrib/asciinema
-    patch: doc/_ext/sphinxcontrib_asciinema.patch
+    patch:
+     - doc/_ext/patches/001-autoformat-sphinxcontrib.asciinema.patch
+     - doc/_ext/patches/002-fix-options-sphinxcontrib.asciinema.patch

doc/_ext/sphinxcontrib_asciinema.patch …autoformat-sphinxcontrib.asciinema.patchdoc/_ext/sphinxcontrib_asciinema.patch renamed to doc/_ext/patches/001-autoformat-sphinxcontrib.asciinema.patch doc/_ext/sphinxcontrib_asciinema.patch renamed to doc/_ext/patches/001-autoformat-sphinxcontrib.asciinema.patch

@@ -1,20 +1,20 @@
 diff --git a/asciinema.py b/asciinema.py
-index 8644220..44dad26 100644
+index 8644220..0b73d80 100644
 --- a/asciinema.py
 +++ b/asciinema.py
 @@ -2,20 +2,20 @@ import os
-
+ 
  from docutils import nodes
  from docutils.parsers.rst import directives
 -from sphinx.util.fileutil import copy_asset
 -from sphinx.util.docutils import SphinxDirective
  from sphinx.util import logging
 +from sphinx.util.docutils import SphinxDirective
 +from sphinx.util.fileutil import copy_asset
-
+ 
  logger = logging.getLogger(__name__)
-
-
+ 
+ 
  def copy_asset_files(app, exc):
 -    asset_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 -                             '_static')
@@ -26,56 +26,34 @@ index 8644220..44dad26 100644
 +            copy_asset(
 +                os.path.join(asset_dir, file), os.path.join(app.outdir, "_static")
 +            )
-
-
+ 
+ 
  class Asciinema(nodes.General, nodes.Element):
-@@ -24,22 +24,37 @@ class Asciinema(nodes.General, nodes.Element):
-
- def visit_html(self, node):
-     rst_to_js_option_names: dict[str, str] = {
-+        "autoplay": "autoPlay",
-+        "idle-time-limit": "idleTimeLimit",
-         "terminalfontsize": "terminalFontSize",
--        "terminallineheigth": "terminalLineHeigth",
-+        "terminallineheight": "terminalLineHeight",
-         "terminalfontfamily": "terminalFontFamily",
+@@ -30,16 +30,17 @@ def visit_html(self, node):
          "audiourl": "audioUrl",
      }
-
+ 
 -    options_raw = ['markers']
--
++    options_raw = ["markers"]
+ 
 -    gen = ((rst_option_name, js_option_name)
 -           for (rst_option_name,
 -                js_option_name) in rst_to_js_option_names.items()
 -           if rst_option_name in node["options"])
-+    options_raw = [
-+        "markers",
-+        "loop",
-+        "autoPlay",
-+        "preload",
-+        "pauseOnMarkers",
-+        "cols",
-+        "rows",
-+        "speed",
-+    ]
-+
-+    for option, value in node["options"].items():
-+        node["options"][option] = ASCIINemaDirective.option_spec[option](value)
-+
 +    gen = (
 +        (rst_option_name, js_option_name)
 +        for (rst_option_name, js_option_name) in rst_to_js_option_names.items()
 +        if rst_option_name in node["options"]
 +    )
      for rst_option_name, js_option_name in gen:
          node["options"][js_option_name] = node["options"].pop(rst_option_name)
-
+ 
 -    if node['type'] == 'local':
 +    if node["type"] == "local":
          template = """<div id="asciicast-{id}"></div>
              <script>
                  document.addEventListener("DOMContentLoaded", function() {{
-@@ -50,7 +65,7 @@ def visit_html(self, node):
+@@ -50,7 +51,7 @@ def visit_html(self, node):
                  }});
              </script>"""
          option_template = '{}: "{}", '
@@ -84,7 +62,7 @@ index 8644220..44dad26 100644
      else:
          template = """<script async id="asciicast-{src}" {options}
                  src="https://asciinema.org/a/{src}.js"></script>"""
-@@ -58,14 +73,17 @@ def visit_html(self, node):
+@@ -58,14 +59,17 @@ def visit_html(self, node):
          option_template_raw = 'data-{}="{}" '
      options = ""
      for n, v in node["options"].items():
@@ -97,64 +75,16 @@ index 8644220..44dad26 100644
 +        )
      tag = template.format(options=options, src=node["content"], id=node["id"])
      self.body.append(tag)
-
-
+ 
+ 
  def visit_unsupported(self, node):
 -    logger.warning('asciinema: unsupported output format (node skipped)')
 +    logger.warning("asciinema: unsupported output format (node skipped)")
      raise nodes.SkipNode
-
-
-@@ -73,15 +91,35 @@ def depart(self, node):
-     pass
-
-
-+def bool_parse(argument):
-+    """Parse the option as boolean."""
-+    if argument is None:
-+        raise ValueError("Boolean option must have a value")
-+
-+    val = str(argument).strip().lower()
-+
-+    if val in ("true", "false"):
-+        return val
-+    raise ValueError("Must be boolean; True or False")
-+
-+
-+def bool_or_positive_int(argument):
-+    """Parse the option as boolean or positive integer."""
-+    try:
-+        return bool_parse(argument)
-+    except ValueError:
-+        return directives.positive_int(argument)
-+
-+
- class ASCIINemaDirective(SphinxDirective):
-     has_content = True
-     final_argument_whitespace = False
-     option_spec = {
-         "cols": directives.positive_int,
-         "rows": directives.positive_int,
--        "autoplay": directives.unchanged,
--        "preload": directives.unchanged,
--        "loop": directives.unchanged,
-+        "autoplay": bool_parse,
-+        "preload": bool_parse,
-+        "loop": bool_or_positive_int,
-         "start-at": directives.unchanged,
-         "speed": directives.unchanged,
-         "idle-time-limit": directives.unchanged,
-@@ -90,7 +128,7 @@ class ASCIINemaDirective(SphinxDirective):
-         "fit": directives.unchanged,
-         "controls": directives.unchanged,
-         "markers": directives.unchanged,
--        "pauseOnMarkers": directives.unchanged,
-+        "pauseOnMarkers": bool_parse,
-         "terminalfontsize": directives.unchanged,
-         "terminalfontfamily": directives.unchanged,
-         "terminallineheight": directives.unchanged,
-@@ -102,25 +140,25 @@ class ASCIINemaDirective(SphinxDirective):
-
+ 
+ 
+@@ -102,25 +106,25 @@ class ASCIINemaDirective(SphinxDirective):
+ 
      def run(self):
          arg = self.arguments[0]
 -        options = dict(self.env.config['sphinxcontrib_asciinema_defaults'])
@@ -193,10 +123,10 @@ index 8644220..44dad26 100644
 +        if "path" in kw["options"]:
 +            del kw["options"]["path"]
          return [Asciinema(**kw)]
-
+ 
      def is_file(self, rel_file):
-@@ -129,17 +167,18 @@ class ASCIINemaDirective(SphinxDirective):
-
+@@ -129,17 +133,18 @@ class ASCIINemaDirective(SphinxDirective):
+ 
      def to_b64(self, filename):
          import base64
 +
@@ -206,8 +136,8 @@ index 8644220..44dad26 100644
              content = file.read()
          b64encoded = base64.b64encode(content)
          return b64encoded.decode()
-
-
+ 
+ 
  _NODE_VISITORS = {
 -    'html': (visit_html, depart),
 -    'latex': (visit_unsupported, None),

doc/_ext/patches/002-fix-options-sphinxcontrib.asciinema.patch

@@ -0,0 +1,82 @@
+diff --git a/asciinema.py b/asciinema.py
+index 0b73d80..44dad26 100644
+--- a/asciinema.py
++++ b/asciinema.py
+@@ -24,13 +24,27 @@ class Asciinema(nodes.General, nodes.Element):
+ 
+ def visit_html(self, node):
+     rst_to_js_option_names: dict[str, str] = {
++        "autoplay": "autoPlay",
++        "idle-time-limit": "idleTimeLimit",
+         "terminalfontsize": "terminalFontSize",
+-        "terminallineheigth": "terminalLineHeigth",
++        "terminallineheight": "terminalLineHeight",
+         "terminalfontfamily": "terminalFontFamily",
+         "audiourl": "audioUrl",
+     }
+ 
+-    options_raw = ["markers"]
++    options_raw = [
++        "markers",
++        "loop",
++        "autoPlay",
++        "preload",
++        "pauseOnMarkers",
++        "cols",
++        "rows",
++        "speed",
++    ]
++
++    for option, value in node["options"].items():
++        node["options"][option] = ASCIINemaDirective.option_spec[option](value)
+ 
+     gen = (
+         (rst_option_name, js_option_name)
+@@ -77,15 +91,35 @@ def depart(self, node):
+     pass
+ 
+ 
++def bool_parse(argument):
++    """Parse the option as boolean."""
++    if argument is None:
++        raise ValueError("Boolean option must have a value")
++
++    val = str(argument).strip().lower()
++
++    if val in ("true", "false"):
++        return val
++    raise ValueError("Must be boolean; True or False")
++
++
++def bool_or_positive_int(argument):
++    """Parse the option as boolean or positive integer."""
++    try:
++        return bool_parse(argument)
++    except ValueError:
++        return directives.positive_int(argument)
++
++
+ class ASCIINemaDirective(SphinxDirective):
+     has_content = True
+     final_argument_whitespace = False
+     option_spec = {
+         "cols": directives.positive_int,
+         "rows": directives.positive_int,
+-        "autoplay": directives.unchanged,
+-        "preload": directives.unchanged,
+-        "loop": directives.unchanged,
++        "autoplay": bool_parse,
++        "preload": bool_parse,
++        "loop": bool_or_positive_int,
+         "start-at": directives.unchanged,
+         "speed": directives.unchanged,
+         "idle-time-limit": directives.unchanged,
+@@ -94,7 +128,7 @@ class ASCIINemaDirective(SphinxDirective):
+         "fit": directives.unchanged,
+         "controls": directives.unchanged,
+         "markers": directives.unchanged,
+-        "pauseOnMarkers": directives.unchanged,
++        "pauseOnMarkers": bool_parse,
+         "terminalfontsize": directives.unchanged,
+         "terminalfontfamily": directives.unchanged,
+         "terminallineheight": directives.unchanged,

doc/_ext/sphinxcontrib_asciinema/.dfetch_data.yaml

@@ -2,9 +2,11 @@
 # For more info see https://dfetch.rtfd.io/en/latest/getting_started.html
 dfetch:
   branch: master
-  hash: c26afa0279fa96392fd7f46d516060a4
-  last_fetch: 21/12/2025, 13:39:42
-  patch: doc/_ext/sphinxcontrib_asciinema.patch
+  hash: dcd1473e1a3ca613b804e3e51e7ee342
+  last_fetch: 07/01/2026, 21:38:48
+  patch:
+  - doc/_ext/patches/001-autoformat-sphinxcontrib.asciinema.patch
+  - doc/_ext/patches/002-fix-options-sphinxcontrib.asciinema.patch
   remote_url: https://github.com/divi255/sphinxcontrib.asciinema.git
   revision: 5ee0c5be62236a5dee0032e1d8dd59957a0c1d4c
   tag: ''