.

readme.md

@@ -36,6 +36,13 @@ This code will be executed
 ```
 
 # Changelog
+#### 0.14 (2024-11-15)
+- Add support for all options from code block
+- Reworked how blocks and options are processed
+
+#### 0.13 (2024-10-15)
+- Add support for python 3.13
+
 #### 0.12 (2024-01-09)
 - Error when providing invalid options
 

src/sphinx_exec_code/__version__.py

@@ -1 +1 @@
-__version__ = '0.13'
+__version__ = '0.14'

src/sphinx_exec_code/sphinx_exec.py

@@ -1,6 +1,5 @@
 import traceback
 from pathlib import Path
-from typing import Any, Final, Tuple
 
 from docutils.statemachine import StringList
 from sphinx.directives.code import CodeBlock
@@ -82,7 +81,7 @@ def _run(self) -> list:
             raise ExtensionError(msg, orig_exc=e) from None
 
         # Show the code from the user
-        self.create_literal_block(output, code_show, code_spec, str(file), line)
+        self.create_literal_block(output, code_show, code_spec, line)
 
         try:
             code_results = execute_code(code_exec, file, line)
@@ -98,10 +97,10 @@ def _run(self) -> list:
             raise ExtensionError(msg) from None
 
         # Show the output from the code execution
-        self.create_literal_block(output, code_results, output_spec, str(file), line)
+        self.create_literal_block(output, code_results, output_spec, line)
         return output
 
-    def create_literal_block(self, objs: list, code: str, spec: SphinxSpecBase, file: str, line: int) -> None:
+    def create_literal_block(self, objs: list, code: str, spec: SphinxSpecBase, line: int) -> None:
         if spec.hide or not code:
             return None
 
@@ -111,18 +110,9 @@ def create_literal_block(self, objs: list, code: str, spec: SphinxSpecBase, file
             line,
             # I'm not sure what these two do
             self.content_offset, '',
-            # Make the state machine report the proper source file because we support loading from files
-            self.state, DummyStateMachine(file, self.state_machine.reporter)
+            # Let's hope these are just for producing error messages and not for anything else
+            self.state, self.state_machine
         )
 
         objs.extend(c.run())
         return None
-
-
-class DummyStateMachine:
-    def __init__(self, source: str, reporter: Any) -> None:
-        self._source: Final = source
-        self.reporter: Final = reporter
-
-    def get_source_and_line(self, line: int) -> Tuple[str, int]:
-        return self._source, line