txt2ebook 0.1.137__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.137.dist-info → txt2ebook-0.1.139.dist-info}/METADATA

@@ -1,45 +1,44 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: txt2ebook
-Version: 0.1.137
+Version: 0.1.139
 Summary: CLI tool to convert txt file to ebook format
-Home-page: https://github.com/kianmeng/txt2ebook
-License: AGPL-3.0-or-later
-Keywords: txt,ebook,epub,cjk
-Author: Kian-Meng Ang
-Author-email: kianmeng@cpan.org
-Requires-Python: >=3.9,<4.0
+Project-URL: Homepage, https://github.com/kianmeng/txt2ebook
+Project-URL: Repository, https://github.com/kianmeng/txt2ebook
+Author-email: Kian-Meng Ang <kianmeng@cpan.org>
+License-Expression: AGPL-3.0-or-later
+License-File: LICENSE.md
+Keywords: cjk,ebook,epub,txt
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
 Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Natural Language :: Chinese (Traditional)
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Text Processing
 Classifier: Topic :: Text Processing :: Filters
 Classifier: Topic :: Text Processing :: General
 Classifier: Topic :: Text Processing :: Markup :: HTML
 Classifier: Topic :: Text Processing :: Markup :: Markdown
-Requires-Dist: CJKwrap (>=2.2,<3.0)
-Requires-Dist: EbookLib (>=0.17.1,<0.18.0)
-Requires-Dist: bs4 (>=0.0.1,<0.0.2)
-Requires-Dist: importlib-resources (>=6.1.1,<7.0.0)
-Requires-Dist: jieba (>=0.42.1,<0.43.0)
-Requires-Dist: langdetect (>=1.0.9,<2.0.0)
-Requires-Dist: lxml (>=5.2.2,<6.0.0)
-Requires-Dist: pylatex (>=1.4.2,<2.0.0)
-Requires-Dist: pypandoc (>=1.11,<2.0)
-Requires-Dist: regex (>=2021.11.10,<2022.0.0)
-Requires-Dist: reportlab (>=4.0.0,<5.0.0)
-Requires-Dist: typing-extensions (>=4.5.0,<5.0.0)
-Requires-Dist: typst (>=0.12.0,<0.13.0)
-Project-URL: Repository, https://github.com/kianmeng/txt2ebook
+Requires-Python: ~=3.9
+Requires-Dist: bs4<0.0.2,>=0.0.1
+Requires-Dist: cjkwrap~=2.2
+Requires-Dist: ebooklib<0.18,>=0.17.1
+Requires-Dist: importlib-resources<7,>=6.1.1
+Requires-Dist: jieba<0.43,>=0.42.1
+Requires-Dist: langdetect<2,>=1.0.9
+Requires-Dist: lxml<6,>=5.2.2
+Requires-Dist: pylatex<2,>=1.4.2
+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
 Description-Content-Type: text/markdown
 
 # txt2ebook
@@ -158,4 +157,3 @@ The fish logo used in the documentation generated by Sphinx is a public domain
 drawing of Troschel's parrotfish (Chlorurus troschelii Var. A.) from
 <https://commons.wikimedia.org/entity/M18506436>.
 18506436>.
-

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

@@ -2,28 +2,31 @@ 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=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
 txt2ebook/formats/epub.py,sha256=IVz-FmYQlcChOw38YqfKy46bPVSIrHyxA_94iz06N3Y,6941
 txt2ebook/formats/gmi.py,sha256=kKyYzqS4NkucyhdBmT8cPEu6DGnNf95vVvXYdFnC6-s,6791
 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=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
 txt2ebook/formats/templates/epub/condense.css,sha256=Fz80ZqkPsFRmGdURduAxqMV8drD0CCUlrv41P8rUsm8,477
 txt2ebook/formats/templates/epub/noindent.css,sha256=_O5Tv90TKyyPBRdgjuNKFwtKFbdheh2V9PtDhgRUg3U,483
-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/helpers/__init__.py,sha256=-Awv2qDnsDHnku_XunOCsn-HDLvkBDpI0b24WFs0H74,1379
 txt2ebook/languages/__init__.py,sha256=1AfDn-D0q-dvODGP-9KxPHY_Wtk-ifZdN1FutZMT9-Q,763
 txt2ebook/languages/en.py,sha256=e5VzZwfrO2kABMwEB0l--eo4XbOre6f6uJ-ySU3ORT8,960
 txt2ebook/languages/zh_cn.py,sha256=lcbgPFO4Uaog8sKHKF5fQtvRwkKiQ3v5wMvYNEvNk9k,1943
 txt2ebook/languages/zh_tw.py,sha256=_fdXOOSLK0nTMuBe1Om2qjb4zr2PVd6N4xi2rrYkNTI,1515
+txt2ebook/locales/txt2ebook.pot,sha256=NyqRL3frKSw9bry_vriA1pdXh1gh1qAUpi5_wzLb7jc,641
 txt2ebook/locales/en/LC_MESSAGES/txt2ebook.mo,sha256=Ym6soeijV3zsv9FUPWlJnu18-CNb5tcOTN5JsMOfV9c,672
 txt2ebook/locales/en/LC_MESSAGES/txt2ebook.po,sha256=YhI4ZnZVWIqR3WpbLL940xXdLwAAp9-OBQShD6QtSWU,698
-txt2ebook/locales/txt2ebook.pot,sha256=NyqRL3frKSw9bry_vriA1pdXh1gh1qAUpi5_wzLb7jc,641
 txt2ebook/locales/zh-cn/LC_MESSAGES/txt2ebook.mo,sha256=rRGW7HByDVZV8WpQkhyIFOWYNTQc4NnStrn0eGJX8Wc,675
 txt2ebook/locales/zh-cn/LC_MESSAGES/txt2ebook.po,sha256=zVvD8AEL6gcxg4QPfc_NnDy22Qf9_AdeYejiVzbLsFc,698
 txt2ebook/locales/zh-tw/LC_MESSAGES/txt2ebook.mo,sha256=1GIuOcO_bISiFcfhFez-A7mSi11Mo-x3PBobBENgMEc,675
@@ -32,7 +35,6 @@ txt2ebook/models/__init__.py,sha256=Z3zClWLj08Q8HgaWV1RRgIKatEhIUfYBAVWm-j4m05w,
 txt2ebook/models/book.py,sha256=OkYg9ogOyH6mizP4qACTBTq4x6OAfY01gmaEzlerhLw,2788
 txt2ebook/models/chapter.py,sha256=6YvUDHzR6amGMZgkQl_xHWrYZUmlfpF7mnDLilG2BpA,1686
 txt2ebook/models/volume.py,sha256=koz1KfWjvGWLFbmGEQlZ23frsP93cDsuBMySYBHiXm8,1597
-txt2ebook/parser.py,sha256=IOSTbkvLQ9Uvo1hUBDTKozMQagA547N3qr-xU8aE0RI,9009
 txt2ebook/subcommands/__init__.py,sha256=ldhzvsrMsR8lZmhZef77JFz0jValpV3pytFfwJSkjls,1146
 txt2ebook/subcommands/env.py,sha256=gEzra4b6guy7pRZUTCWX1_eiR7JmrtR1Z-J-vxljvMY,1549
 txt2ebook/subcommands/epub.py,sha256=WiCah28BV3iS-MjgS7wLWvrInTrglTVcLpRK8mFxfLs,3562
@@ -43,10 +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/tokenizer.py,sha256=H9AaZVmNP43L3ONvj58u_5weZAjFG9SzQSeS9upGN1U,9642
-txt2ebook/zh_utils.py,sha256=0Yq9r-JL4HntW68vFR6TBP9yQim1a07mfsh_sp-XmaE,4887
-txt2ebook-0.1.137.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-txt2ebook-0.1.137.dist-info/METADATA,sha256=xdXDHKv1Ea1W8LTQocp1jcvkrTTlB4iLoR2xYOnns-8,4968
-txt2ebook-0.1.137.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-txt2ebook-0.1.137.dist-info/entry_points.txt,sha256=AFikuCV6fqf8_GHwsvWuo9jTGNrCkWY1TJWk5GfMWSk,71
-txt2ebook-0.1.137.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,,

{txt2ebook-0.1.137.dist-info → txt2ebook-0.1.139.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

txt2ebook-0.1.139.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+tte = txt2ebook.cli:main
+txt2ebook = txt2ebook.cli:main

txt2ebook-0.1.137.dist-info/entry_points.txt

@@ -1,4 +0,0 @@
-[console_scripts]
-tte=txt2ebook.cli:main
-txt2ebook=txt2ebook.cli:main
-