nbsync 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

nbsync/cell.py

@@ -50,10 +50,8 @@ class Cell:
                 include_attrs=True,
                 include_identifier=bool(identifier),
             )
-            result, self.image.url = self.content, ""
-            result = result.rstrip()
-            if escape and self.mime == "text/plain":
-                result = html.escape(result)
+            self.image.url = ""
+            result = get_text_markdown(self, escape=escape)
 
         else:
             source = get_source(
@@ -61,7 +59,7 @@ class Cell:
                 include_attrs=False,
                 include_identifier=bool(identifier),
             )
-            result = get_result(self)
+            result = get_image_markdown(self)
 
         if markdown := get_markdown(kind, source, result, tabs):
             return textwrap.indent(markdown, self.image.indent)
@@ -77,7 +75,8 @@ def get_source(
 ) -> str:
     attrs = [cell.language]
     if include_attrs:
-        attrs.extend(cell.image.iter_parts())
+        parts = cell.image.iter_parts(exclude_attributes=["result"])
+        attrs.extend(parts)
     attr = " ".join(attrs)
 
     source = cell.image.source
@@ -87,7 +86,19 @@ def get_source(
     return f"```{attr}\n{source}\n```"
 
 
-def get_result(cell: Cell) -> str:
+def get_text_markdown(cell: Cell, *, escape: bool = False) -> str:
+    text = str(cell.content.rstrip())
+
+    if lang := cell.image.attributes.get("result", ""):
+        return f"```{lang}\n{text}\n```"
+
+    if escape and cell.mime == "text/plain":
+        return html.escape(text)
+
+    return text
+
+
+def get_image_markdown(cell: Cell) -> str:
     msg = f"{cell.image.url}#{cell.image.identifier} [{cell.mime}]"
     logger.debug(f"Converting image: {msg}")
 
@@ -115,7 +126,7 @@ def get_markdown(kind: str, source: str, result: str, tabs: str) -> str:
         return f"{result}\n\n{source}"
 
     if kind == "material-block":
-        result = f'<div class="result" markdown="1">{result}</div>'
+        result = f'<div class="result" markdown="1">\n{result}\n</div>'
         return f"{source}\n\n{result}"
 
     if kind == "tabbed-left":

nbsync/markdown.py

@@ -15,7 +15,7 @@ Element: TypeAlias = str | CodeBlock | Image
 def convert_code_block(code_block: CodeBlock) -> Iterator[Element]:
     for elem in _convert_code_block_tabbed(code_block):
         if isinstance(elem, CodeBlock):
-            yield _convert_code_block_exec(elem)
+            yield _convert_code_block_attrs(elem)
         else:
             yield elem
 
@@ -35,7 +35,7 @@ def _convert_code_block_tabbed(code_block: CodeBlock) -> Iterator[Element]:
     yield from nbstore.markdown.parse(text)
 
 
-def _convert_code_block_exec(code_block: CodeBlock) -> CodeBlock | Image:
+def _convert_code_block_attrs(code_block: CodeBlock) -> CodeBlock | Image:
     exec_ = code_block.attributes.get("exec", None)
     if exec_ != "1" or not code_block.classes:
         return code_block

{nbsync-0.3.4.dist-info → nbsync-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbsync
-Version: 0.3.4
+Version: 0.3.6
 Summary: A core library to synchronize Jupyter notebooks and Markdown documents, enabling seamless integration and dynamic content execution
 Project-URL: Documentation, https://daizutabi.github.io/nbsync/
 Project-URL: Source, https://github.com/daizutabi/nbsync
@@ -39,7 +39,7 @@ Classifier: Topic :: Documentation
 Classifier: Topic :: Software Development :: Documentation
 Classifier: Topic :: Text Processing :: Markup :: Markdown
 Requires-Python: >=3.10
-Requires-Dist: nbstore>=0.4.11
+Requires-Dist: nbstore>=0.5.2
 Description-Content-Type: text/markdown
 
 # nbsync

{nbsync-0.3.4.dist-info → nbsync-0.3.6.dist-info}/RECORD

@@ -1,11 +1,11 @@
 nbsync/__init__.py,sha256=3NuWx9D0LcBnXjEKrC-uypNDOz8rLWXI7mIjdN9xSeE,126
-nbsync/cell.py,sha256=bXzchf46DP0pxhgL1W98f9jfOGVJi4-EoK2b1RX0N1c,3921
+nbsync/cell.py,sha256=9e-Qo0VC-X_HN81IUJzXlK-8EB6EX4uOYNnPqipvCW4,4196
 nbsync/logger.py,sha256=snNRqi9xESj4B-Z9GQffCBlgqeVujvuXuBveWAebIWM,736
-nbsync/markdown.py,sha256=xcPhQKWpFDyVQ_xtZCpFrnR0QED_hYs4PAyaT7dF3t4,3830
+nbsync/markdown.py,sha256=6jDaDtCEkDLsukInF0EnauJ2pUki6nVswjyu3Zg2AUE,3832
 nbsync/notebook.py,sha256=4F3V1KDHfJnIR5ZSb1xWdN9JGiC6mWUVimXXK1BFsbc,1450
 nbsync/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nbsync/sync.py,sha256=vISzn8D_Dae-jdJABRnvvD02aL35bYIWx52OinAORVo,3990
-nbsync-0.3.4.dist-info/METADATA,sha256=9TEbtLM655UYB7rQ7YoxFuSkrBodGzf4ox41Nz8tsEo,6552
-nbsync-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nbsync-0.3.4.dist-info/licenses/LICENSE,sha256=wy1pqn52upuo_qYwY-epWmspwE-3UWJso0xodciGXYc,1062
-nbsync-0.3.4.dist-info/RECORD,,
+nbsync-0.3.6.dist-info/METADATA,sha256=5QDV8YWYNWpb3miXM_nU6jI5qFrV3ktYWIJBS6Dlt_k,6551
+nbsync-0.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nbsync-0.3.6.dist-info/licenses/LICENSE,sha256=wy1pqn52upuo_qYwY-epWmspwE-3UWJso0xodciGXYc,1062
+nbsync-0.3.6.dist-info/RECORD,,