txt2ebook 0.1.138__py3-none-any.whl → 0.1.139__py3-none-any.whl

txt2ebook/formats/typ.py

@@ -113,8 +113,11 @@ class TypWriter(BaseWriter):
         ]
 
         #set par(
-          first-line-indent: 2em,
-          justify: true
+          first-line-indent: (
+            amount: 2em,
+            all:true,
+          ),
+          justify: true,
         )
 
         #set text(

txt2ebook/parser.py

@@ -35,8 +35,8 @@ logger = logging.getLogger(__name__)
 class Parser:
     """Parser class to massage and parse a text content."""
 
-    raw_content: str = field()
-    config: argparse.Namespace = field()
+    raw_content: str
+    config: argparse.Namespace
 
     def __init__(self, raw_content: str, config: argparse.Namespace) -> None:
         """Set the constructor for the Parser."""

txt2ebook/tokenizer.py

@@ -171,12 +171,27 @@ class Tokenizer:
 
 
     def _tokenize_content(self) -> None:
-        # TODO: split by metadata and content
-        content = self.raw_content.split(f"{self.metadata_marker}\n\n")[1]
-        content = content.strip(self.config.paragraph_separator)
-        lines = content.split(self.config.paragraph_separator)
+        # Determine the actual content part, after any metadata block
+        metadata_block_re = (
+            rf"^(?:{self.metadata_marker})\n(.*)\n(?:{self.metadata_marker})$"
+        )
+        match = re.search(
+            metadata_block_re, self.raw_content, re.MULTILINE | re.DOTALL
+        )
 
-        if len(lines) <= 1:
+        if match:
+            # Content starts after the matched metadata block
+            content_str = self.raw_content[match.end(0) :]
+        else:
+            # No metadata block found according to the pattern,
+            # so assume all raw_content is the actual content.
+            # _extract_metadata would have already logged/warned if metadata was expected.
+            content_str = self.raw_content
+
+        content_str = content_str.strip(self.config.paragraph_separator)
+        lines = content_str.split(self.config.paragraph_separator)
+
+        if len(lines) <= 1 and content_str:  # Avoid warning for empty content
             msg = (
                 "Cannot split content by "
                 f"{repr(self.config.paragraph_separator)}. "

{txt2ebook-0.1.138.dist-info → txt2ebook-0.1.139.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2ebook
-Version: 0.1.138
+Version: 0.1.139
 Summary: CLI tool to convert txt file to ebook format
 Project-URL: Homepage, https://github.com/kianmeng/txt2ebook
 Project-URL: Repository, https://github.com/kianmeng/txt2ebook
@@ -38,7 +38,7 @@ Requires-Dist: pypandoc~=1.11
 Requires-Dist: regex<2022,>=2021.11.10
 Requires-Dist: reportlab<5,>=4.0.0
 Requires-Dist: typing-extensions<5,>=4.5.0
-Requires-Dist: typst<0.13,>=0.12.0
+Requires-Dist: typst>=0.13.0
 Description-Content-Type: text/markdown
 
 # txt2ebook

{txt2ebook-0.1.138.dist-info → txt2ebook-0.1.139.dist-info}/RECORD

@@ -2,8 +2,8 @@ txt2ebook/__init__.py,sha256=wnrJownTB3sKXv3BpcXn4exkpWRSCXhKYWKJib5APNI,3073
 txt2ebook/__main__.py,sha256=L29rlfPSx9XMnVaHBYP2dyYgDmutJvONR3yUejjYwRY,855
 txt2ebook/cli.py,sha256=X91GnzdSTZI4Cl2ttskMmQpBy6QuyENuX_VnwOHtA7Q,4423
 txt2ebook/exceptions.py,sha256=PT3m85PE5QopHHUfRwEQzp0kJ4AA9yjLO6V6lYC8WhQ,858
-txt2ebook/parser.py,sha256=IOSTbkvLQ9Uvo1hUBDTKozMQagA547N3qr-xU8aE0RI,9009
-txt2ebook/tokenizer.py,sha256=H9AaZVmNP43L3ONvj58u_5weZAjFG9SzQSeS9upGN1U,9642
+txt2ebook/parser.py,sha256=Crtx8_c85j8LPYAmJlsI7631vKuw0wx-8S1Q_H9u4Dw,8989
+txt2ebook/tokenizer.py,sha256=CEmIcindFG1hUrdYn1_RCYOhJEpwkY2NGzZCBmSEAHY,10300
 txt2ebook/zh_utils.py,sha256=0Yq9r-JL4HntW68vFR6TBP9yQim1a07mfsh_sp-XmaE,4887
 txt2ebook/formats/__init__.py,sha256=yNF426_jHKNCKenKj1JTbOs22vEBuGScEk6TKhFaZUk,1716
 txt2ebook/formats/base.py,sha256=ODguJ7OBPXfRQLLeoL-G66NZihroXb4kG5-56ZrlygI,5819
@@ -13,7 +13,7 @@ txt2ebook/formats/md.py,sha256=9RWv_7cfXfAGC1MdYm0WTkjpgtXKQJTQjYOf0MqQmsc,6537
 txt2ebook/formats/pdf.py,sha256=tr_ozVlL976yo7Ggny71zjOwzSd6tSnHTl7mcsLII_g,7263
 txt2ebook/formats/tex.py,sha256=V5B1nPR-WzGc4jqWu-BqxfQhtQsUTKM_sZZJsCcDBAk,5897
 txt2ebook/formats/txt.py,sha256=j5RWF41WQfLdm-APwi8u-OE8snenDEJLzxHD_i9mxeg,7541
-txt2ebook/formats/typ.py,sha256=_a3PKFh5jlHvaqRes6XvtPoDJI_HJaH7pCBbBRFeYyM,6647
+txt2ebook/formats/typ.py,sha256=MNclD5RdCnYAmPRzAaI6ZE6NnI8GdHKJla54wyfTUdc,6705
 txt2ebook/formats/templates/__init__.py,sha256=f3K7pJByNmmvu-wvziks6qb2QnnLmkDjUACXyw2s60E,760
 txt2ebook/formats/templates/epub/__init__.py,sha256=-XVLvnknTJTmQZY9UTH705vMcHgy56rQVRTusYawEZ4,766
 txt2ebook/formats/templates/epub/clean.css,sha256=AnEwMckzUSKcjKsDiWtJW1oaceuklt2tyuS1VbpVK1s,462
@@ -45,8 +45,8 @@ txt2ebook/subcommands/parse.py,sha256=FaYTWa2yqkowwPAmHWJC7iCii2Rnus3SUHG10GjjJp
 txt2ebook/subcommands/pdf.py,sha256=KS3rzxPJG6ovt8GPJj8u1Bum5ye3zrEI0LPz21EMLZo,2981
 txt2ebook/subcommands/tex.py,sha256=X6ZBfuAs_mcJe8PNjzoW339ecPynZduVbcCq0henjiA,3131
 txt2ebook/subcommands/typ.py,sha256=r4Xf7xSINbYfaIKkVzdyQDlUMWPvOIcbvOwC71spu6w,3682
-txt2ebook-0.1.138.dist-info/METADATA,sha256=G7pFnLaDciAOsy4QaboVHeT6_MGWvIwvEWnLBviBt-A,4873
-txt2ebook-0.1.138.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-txt2ebook-0.1.138.dist-info/entry_points.txt,sha256=3jm5vpUsDRgoM6S3CQVMMiP7tJQqfq1vfV0sh_KaK9s,74
-txt2ebook-0.1.138.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-txt2ebook-0.1.138.dist-info/RECORD,,
+txt2ebook-0.1.139.dist-info/METADATA,sha256=-j5Q8uMTzj2N8bCv3dJtYFF4Ij5snzy4vxvueu6FK8o,4867
+txt2ebook-0.1.139.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+txt2ebook-0.1.139.dist-info/entry_points.txt,sha256=3jm5vpUsDRgoM6S3CQVMMiP7tJQqfq1vfV0sh_KaK9s,74
+txt2ebook-0.1.139.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+txt2ebook-0.1.139.dist-info/RECORD,,