filter LineBreak class from table cells

README.md

@@ -330,6 +330,10 @@ Here are some features we're planning to add in the future:
 
 ## Changelog
 
+### v0.7.3
+
+- Fix bug by filtering LineBreak class from table cells.
+
 ### v0.7.2
 
 - Fix bug in mermaid by fixing error image file path.

n2y/blocks.py

@@ -396,7 +396,7 @@ class RowBlock(Block):
     def __init__(self, client, notion_data, page, get_children=True):
         super().__init__(client, notion_data, page, get_children)
         self.cells = [
-            client.wrap_notion_rich_text_array(nc, self)
+            client.wrap_notion_rich_text_array(nc, self, True)
             for nc in self.notion_type_data["cells"]
         ]
 

n2y/notion.py

@@ -201,11 +201,13 @@ def wrap_notion_file(self, notion_data):
     def wrap_notion_emoji(self, notion_data):
         return self.instantiate_class("emoji", None, self, notion_data)
 
-    def wrap_notion_rich_text_array(self, notion_data, block=None):
-        return self.instantiate_class("rich_text_array", None, self, notion_data, block)
+    def wrap_notion_rich_text_array(self, notion_data, block=None, table=None):
+        return self.instantiate_class("rich_text_array", None, self, notion_data, block, table)
 
-    def wrap_notion_rich_text(self, notion_data, block=None):
-        return self.instantiate_class("rich_texts", notion_data["type"], self, notion_data, block)
+    def wrap_notion_rich_text(self, notion_data, block=None, table=None):
+        return self.instantiate_class(
+            "rich_texts", notion_data["type"], self, notion_data, block, table
+        )
 
     def wrap_notion_mention(self, notion_data, plain_text, block=None):
         # here we pass in the plain_text to avoid the need to query the page

n2y/plugins/footnotes.py

@@ -61,8 +61,8 @@ def _footnote_empty(self):
 
 
 class TextRichTextWithFootnoteRef(TextRichText):
-    def __init__(self, client, notion_data, block=None):
-        super().__init__(client, notion_data, block)
+    def __init__(self, client, notion_data, block=None, table=None):
+        super().__init__(client, notion_data, block, table)
         if not self._is_footnote():
             raise UseNextClass()
 

n2y/rich_text.py

@@ -24,14 +24,15 @@ class RichText:
     a property_value or somewhere else.
     """
 
-    def __init__(self, client, notion_data, block=None):
+    def __init__(self, client, notion_data, block=None, table=False):
         self.client = client
         self.block = block
+        self.table = table
 
         self.plain_text = notion_data['plain_text']
         self.href = notion_data.get('href', None)
         self.notion_type = notion_data['type']
-
+        self.notion_data = notion_data
         annotations = notion_data['annotations']
         self.bold = annotations["bold"]
         self.italic = annotations["italic"]
@@ -47,10 +48,9 @@ def to_markdown(self):
         return pandoc_ast_to_markdown(self.to_pandoc()).strip('\n')
 
     @classmethod
-    def plain_text_to_pandoc(klass, plain_text):
+    def plain_text_to_pandoc(klass, plain_text, table=False):
         ast = []
         match = re.findall(r"( +)|(\xa0+)|(\S+)|(\n+)|(\t+)", plain_text)
-
         for m in match:
             space, non_breaking_space, word, newline, tab = m
             for _ in range(len(space)):
@@ -60,7 +60,10 @@ def plain_text_to_pandoc(klass, plain_text):
             if word:
                 ast.append(Str(word))
             for _ in range(len(newline)):
-                ast.append(LineBreak())
+                if table:
+                    ast.append(Space())
+                else:
+                    ast.append(LineBreak())
             for _ in range(len(tab) * 4):  # 4 spaces per tab
                 ast.append(Space())
         return ast
@@ -109,8 +112,8 @@ def annotate_pandoc_ast(self, target):
 
 
 class MentionRichText(RichText):
-    def __init__(self, client, notion_data, block=None):
-        super().__init__(client, notion_data, block)
+    def __init__(self, client, notion_data, block=None, table=False):
+        super().__init__(client, notion_data, block, table)
         self.mention = client.wrap_notion_mention(
             notion_data['mention'], notion_data["plain_text"], block,
         )
@@ -123,8 +126,8 @@ def to_pandoc(self):
 
 
 class EquationRichText(RichText):
-    def __init__(self, client, notion_data, block=None):
-        super().__init__(client, notion_data, block)
+    def __init__(self, client, notion_data, block=None, table=False):
+        super().__init__(client, notion_data, block, table)
         self.expression = notion_data['equation']['expression']
 
     def to_pandoc(self):
@@ -140,17 +143,16 @@ def from_plain_text(klass, client, string, block=None):
         notion_data = mock_rich_text(string)
         return klass(client, notion_data, block)
 
-    def __init__(self, client, notion_data, block=None):
-        super().__init__(client, notion_data, block)
+    def __init__(self, client, notion_data, block=None, table=False):
+        super().__init__(client, notion_data, block, table)
 
     def to_pandoc(self):
         if not self.code:
-            plain_text_ast = self.plain_text_to_pandoc(self.plain_text)
+            plain_text_ast = self.plain_text_to_pandoc(self.plain_text, self.table)
             annotated_ast = self.annotate_pandoc_ast(plain_text_ast)
         else:
             code_ast = [Code(("", [], []), self.plain_text)]
             annotated_ast = self.annotate_pandoc_ast(code_ast)
-
         if self.href:
             return [Link(
                 ('', [], []),
@@ -181,12 +183,13 @@ class RichTextArray:
     be bolded, and the third would contain " the hot dog.".
     """
 
-    def __init__(self, client, notion_data, block=None):
+    def __init__(self, client, notion_data, block=None, table=None):
         self.client = client
         self.block = block
+        self.table = table
 
         assert isinstance(notion_data, list)
-        self.items = [client.wrap_notion_rich_text(i, block) for i in notion_data]
+        self.items = [client.wrap_notion_rich_text(i, block, table) for i in notion_data]
 
     def __len__(self):
         return len(self.items)

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='n2y',
-    version='0.7.2',
+    version='0.7.3',
     description=description,
     long_description=description,
     long_description_content_type='text/x-rst',

tests/test_plain_text_to_pandoc.py

@@ -21,3 +21,8 @@ def test_plain_text_to_pandoc_spaces_after():
 def test_plain_text_to_pandoc_spaces_after_newline():
     pandoc_ast = RichText.plain_text_to_pandoc("hello\n  world")
     assert pandoc_ast == [Str("hello"), LineBreak(), Space(), Space(), Str("world")]
+
+
+def test_plain_text_to_pandoc_table():
+    pandoc_ast = RichText.plain_text_to_pandoc("hello\n  world", True)
+    assert pandoc_ast == [Str("hello"), Space(), Space(), Space(), Str("world")]