txt2ebook 0.1.156__py3-none-any.whl → 0.1.157__py3-none-any.whl

txt2ebook/subcommands/massage.py

@@ -210,7 +210,7 @@ def run(args: argparse.Namespace) -> None:
     """Run massage subcommand.
 
     Args:
-        args (argparse.Namespace): args.from command line arguments
+        args (argparse.Namespace): arguments from command line arguments
 
     Returns:
         None
@@ -472,7 +472,6 @@ def extract_metadata_and_body(_args, content: str) -> tuple:
         metadata = match.group(0).strip()
         body = content.replace(metadata, "", 1)
 
-
     metadata_block = metadata.split("---")[1]
 
     metadata_dict = {}
@@ -492,33 +491,38 @@ def extract_metadata_and_body(_args, content: str) -> tuple:
     return (meta_str, body)
 
 
-def do_single_newline(args, content: str) -> str:
+def do_single_newline(args: argparse.Namespace, content: str) -> str:
     """Set single newline.
 
     Args:
-        content (str): The formatted book content.
+        args (argparse.Namespace): arguments from command line arguments
+        content (str): The formatted book content
 
     Returns:
         str: The formatted book content.
     """
-    modified_content = re.sub(r"\n+", "\n\n", content)
+    unwrap_content = _unwrap_content(args, content)
+    modified_content = re.sub(r"\n+", "\n\n", unwrap_content)
     return modified_content
 
 
-def do_wrapping(args, content: str) -> str:
+def do_wrapping(args: argparse.Namespace, content: str) -> str:
     """Wrap or fill CJK text.
 
     Args:
-        content (str): The formatted book content.
+        args (argparse.Namespace): arguments from command line arguments
+        content (str): The formatted book content
 
     Returns:
         str: The formatted book content.
     """
     logger.info("Wrapping paragraph to width: %s", args.width)
 
+    unwrap_content = _unwrap_content(args, content)
+
+    # don't remove empty line and keep all formatting as it
     paragraphs = []
-    # We don't remove empty line and keep all formatting as it.
-    for paragraph in content.split("\n"):
+    for paragraph in unwrap_content.split("\n"):
         paragraph = paragraph.strip()
 
         lines = cjkwrap.wrap(paragraph, width=args.width)
@@ -527,3 +531,20 @@ def do_wrapping(args, content: str) -> str:
 
     wrapped_content = "\n".join(paragraphs)
     return wrapped_content
+
+
+def _unwrap_content(args: argparse.Namespace, content: str) -> str:
+    """
+    Args:
+        args (argparse.Namespace): arguments from command line arguments
+        content (str): The formatted book content
+
+    Returns:
+        str: The formatted book content.
+    """
+    paragraphs = content.split(args.paragraph_separator)
+    processed_paragraphs = []
+    for paragraph in paragraphs:
+        single_line_paragraph = " ".join(paragraph.splitlines())
+        processed_paragraphs.append(single_line_paragraph.strip())
+    return args.paragraph_separator.join(processed_paragraphs)

{txt2ebook-0.1.156.dist-info → txt2ebook-0.1.157.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2ebook
-Version: 0.1.156
+Version: 0.1.157
 Summary: CLI tool to convert txt file to ebook format
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later
@@ -39,6 +39,22 @@ 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
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-randomly; extra == "test"
+Requires-Dist: pytest-xdist; extra == "test"
+Requires-Dist: scripttest; extra == "test"
+Provides-Extra: doc
+Requires-Dist: myst-parser; extra == "doc"
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: sphinx-autobuild; extra == "doc"
+Requires-Dist: sphinx-autodoc-typehints; extra == "doc"
+Requires-Dist: sphinx-copybutton; extra == "doc"
+Provides-Extra: lint
+Requires-Dist: pre-commit; extra == "lint"
+Requires-Dist: ruff; extra == "lint"
+Requires-Dist: mypy; extra == "lint"
 Dynamic: license-file
 
 # txt2ebook

{txt2ebook-0.1.156.dist-info → txt2ebook-0.1.157.dist-info}/RECORD

@@ -29,15 +29,15 @@ txt2ebook/subcommands/__init__.py,sha256=ldhzvsrMsR8lZmhZef77JFz0jValpV3pytFfwJS
 txt2ebook/subcommands/env.py,sha256=gEzra4b6guy7pRZUTCWX1_eiR7JmrtR1Z-J-vxljvMY,1549
 txt2ebook/subcommands/epub.py,sha256=oVk00rypqN53UAOIYhOofkAPbjrdlvkszLDIdVqexvE,4706
 txt2ebook/subcommands/gmi.py,sha256=ANnPg-RFsylTo44fUzFOSHN1fC3Ce82gBzrv-sBv5fU,3318
-txt2ebook/subcommands/massage.py,sha256=cjeee4wJJ6xPV76efnlWRVdeVkEtJYIBDaKhFMPjKTg,14643
+txt2ebook/subcommands/massage.py,sha256=WmHHJQLowdjSDQnEqxVKsU9YsabY7fw4mBkfddsFZpI,15535
 txt2ebook/subcommands/md.py,sha256=PmIqrqrnzLywvN4qTkle0V9N3FTIJGRWpC0Xbk76B5o,3329
 txt2ebook/subcommands/parse.py,sha256=xjhW8I9zS5DL3n3m04RyFofgci-6-_L6aF3d4N7c7M4,2938
 txt2ebook/subcommands/pdf.py,sha256=1JQtpugzAIaho6G3CK1rGYk74hotAexXZxPH9PHpRps,2980
 txt2ebook/subcommands/tex.py,sha256=8XqTV5GsOEr7sGSLUJB-B1KefIMxW3_BDq_Jm96Bt1Y,4369
 txt2ebook/subcommands/typ.py,sha256=xeJ_cPmyq_uouUBiH2kbcscckHLqewPmu9j0WO36sXY,4814
-txt2ebook-0.1.156.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-txt2ebook-0.1.156.dist-info/METADATA,sha256=FmlT-uz7lE9ZU6vp0U3X96lRMQSeNHEcuAu6NdQn7dw,4664
-txt2ebook-0.1.156.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-txt2ebook-0.1.156.dist-info/entry_points.txt,sha256=3jm5vpUsDRgoM6S3CQVMMiP7tJQqfq1vfV0sh_KaK9s,74
-txt2ebook-0.1.156.dist-info/top_level.txt,sha256=pesdk4CJRlfhUXVD9vH3Dd_F8ATlLQoqlUsUnU8SJMw,10
-txt2ebook-0.1.156.dist-info/RECORD,,
+txt2ebook-0.1.157.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+txt2ebook-0.1.157.dist-info/METADATA,sha256=WSRHi5sIRSNXPlUpUSYK7GWueOhHAdczDQfC3XSUHX4,5295
+txt2ebook-0.1.157.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+txt2ebook-0.1.157.dist-info/entry_points.txt,sha256=3jm5vpUsDRgoM6S3CQVMMiP7tJQqfq1vfV0sh_KaK9s,74
+txt2ebook-0.1.157.dist-info/top_level.txt,sha256=pesdk4CJRlfhUXVD9vH3Dd_F8ATlLQoqlUsUnU8SJMw,10
+txt2ebook-0.1.157.dist-info/RECORD,,