chgksuite 0.27.0__py3-none-any.whl → 0.27.0b3__py3-none-any.whl

chgksuite/cli.py

@@ -596,15 +596,6 @@ class ArgparseBuilder:
             caption="Имя 4s-файла",
             filetypes=[("chgksuite markup files", "*.4s")],
         )
-        cmdcompose_markdown = cmdcompose_filetype.add_parser("markdown")
-        self.add_argument(
-            cmdcompose_markdown,
-            "filename",
-            nargs="*",
-            help="file(s) to compose from.",
-            caption="Имя 4s-файла",
-            filetypes=[("chgksuite markup files", "*.4s")],
-        )
         cmdcompose_pptx = cmdcompose_filetype.add_parser("pptx")
         self.add_argument(
             cmdcompose_pptx,

chgksuite/common.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import argparse
+import codecs
 import csv
 import itertools
 import json
@@ -113,7 +114,7 @@ class DefaultArgs:
 def set_lastdir(path):
     chgksuite_dir = get_chgksuite_dir()
     lastdir = os.path.join(chgksuite_dir, "lastdir")
-    with open(lastdir, "w", encoding="utf-8") as f:
+    with codecs.open(lastdir, "w", "utf8") as f:
         f.write(path)
 
 
@@ -121,7 +122,7 @@ def get_lastdir():
     chgksuite_dir = get_chgksuite_dir()
     lastdir = os.path.join(chgksuite_dir, "lastdir")
     if os.path.isfile(lastdir):
-        with open(lastdir, "r", encoding="utf-8") as f:
+        with codecs.open(lastdir, "r", "utf8") as f:
             return f.read().rstrip()
     return "."
 

chgksuite/composer/__init__.py

@@ -1,5 +1,6 @@
 #!usr/bin/env python
 # -*- coding: utf-8 -*-
+import codecs
 import json
 import os
 import shutil
@@ -21,7 +22,7 @@ from chgksuite.composer.docx import DocxExporter
 from chgksuite.composer.latex import LatexExporter
 from chgksuite.composer.lj import LjExporter
 from chgksuite.composer.pptx import PptxExporter
-from chgksuite.composer.markdown import MarkdownExporter
+from chgksuite.composer.reddit import RedditExporter
 from chgksuite.composer.stats import StatsAdder
 from chgksuite.composer.telegram import TelegramExporter
 from chgksuite.composer.openquiz import OpenquizExporter
@@ -74,13 +75,10 @@ def process_file_wrapper(filename, sourcedir, targetdir, args):
 
 def parse_filepath(filepath, args=None):
     args = args or DefaultArgs()
-    with open(filepath, "r", encoding="utf-8") as input_file:
+    with codecs.open(filepath, "r", "utf8") as input_file:
         input_text = input_file.read()
     input_text = input_text.replace("\r", "")
-    debug_dir = os.path.dirname(os.path.abspath(filepath))
-    return parse_4s(
-        input_text, randomize=args.randomize, debug=args.debug, debug_dir=debug_dir
-    )
+    return parse_4s(input_text, randomize=args.randomize, debug=args.debug)
 
 
 def make_merged_filename(filelist):
@@ -107,7 +105,7 @@ def process_file(filename, tmp_dir, targetdir, args=None, logger=None):
             targetdir,
             make_filename(os.path.basename(filename), "dbg", args),
         )
-        with open(debug_fn, "w", encoding="utf-8") as output_file:
+        with codecs.open(debug_fn, "w", "utf8") as output_file:
             output_file.write(json.dumps(structure, indent=2, ensure_ascii=False))
 
     if not args.filetype:
@@ -148,8 +146,8 @@ def process_file(filename, tmp_dir, targetdir, args=None, logger=None):
         outfilename = os.path.join(targetdir, make_filename(filename, "txt", args))
         exporter.export(outfilename)
 
-    if args.filetype in ("redditmd", "markdown"):
-        exporter = MarkdownExporter(structure, args, dir_kwargs)
+    if args.filetype == "redditmd":
+        exporter = RedditExporter(structure, args, dir_kwargs)
         outfilename = os.path.join(targetdir, make_filename(filename, "md", args))
         exporter.export(outfilename)
 

chgksuite/composer/chgksuite_parser.py

@@ -1,15 +1,9 @@
-import os
+import codecs
 import random
 import re
 from collections import defaultdict
 
-from chgksuite.common import (
-    QUESTION_LABELS,
-    check_question,
-    get_chgksuite_dir,
-    init_logger,
-    log_wrap,
-)
+from chgksuite.common import QUESTION_LABELS, check_question, init_logger, log_wrap
 from chgksuite.typotools import remove_excessive_whitespace as rew
 
 REQUIRED_LABELS = set(["question", "answer"])
@@ -95,7 +89,7 @@ def replace_counters(string_):
     return string_
 
 
-def parse_4s(s, randomize=False, debug=False, logger=None, debug_dir=None):
+def parse_4s(s, randomize=False, debug=False, logger=None):
     logger = logger or init_logger("composer")
     mapping = {
         "#": "meta",
@@ -121,11 +115,8 @@ def parse_4s(s, randomize=False, debug=False, logger=None, debug_dir=None):
     if s[0] == "\ufeff" and len(s) > 1:
         s = s[1:]
 
-    if debug:
-        debug_dir = debug_dir or get_chgksuite_dir()
-        debug_path = os.path.join(debug_dir, "raw.debug")
-        with open(debug_path, "w", encoding="utf-8") as debugf:
-            debugf.write(log_wrap(s.split("\n")))
+    with codecs.open("raw.debug", "w", "utf8") as debugf:
+        debugf.write(log_wrap(s.split("\n")))
 
     s = replace_counters(s)
 
@@ -146,7 +137,7 @@ def parse_4s(s, randomize=False, debug=False, logger=None, debug_dir=None):
     counter = 1
 
     if debug:
-        with open("debug1st.debug", "w", encoding="utf-8") as debugf:
+        with codecs.open("debug1st.debug", "w", "utf8") as debugf:
             debugf.write(log_wrap(structure))
 
     for element in structure:
@@ -239,7 +230,7 @@ def parse_4s(s, randomize=False, debug=False, logger=None, debug_dir=None):
                 i += 1
 
     if debug:
-        with open("debug.debug", "w", encoding="utf-8") as debugf:
+        with codecs.open("debug.debug", "w", "utf8") as debugf:
             debugf.write(log_wrap(final_structure))
 
     for element in final_structure:

chgksuite/composer/db.py

@@ -1,3 +1,4 @@
+import codecs
 import datetime
 import os
 import re
@@ -210,7 +211,7 @@ class DbExporter(BaseExporter):
             if res:
                 result.append(res)
         text = "".join(result)
-        with open(outfilename, "w", encoding="utf-8") as f:
+        with codecs.open(outfilename, "w", "utf8") as f:
             f.write(text)
         self.logger.info("Output: {}".format(outfilename))
         if self.args.clipboard:

chgksuite/composer/docx.py

@@ -102,7 +102,7 @@ def remove_square_brackets_standalone(s, regexes):
     s = s.replace("\\[", "LEFTSQUAREBRACKET")
     s = s.replace("\\]", "RIGHTSQUAREBRACKET")
     # Use placeholder to preserve handout brackets during removal
-    s = re.sub(f"\\[({hs}.+?)\\]", "{HANDOUT_PLACEHOLDER\\1}", s, flags=re.DOTALL)
+    s = re.sub(f"\\[{hs}(.+?)\\]", "{HANDOUT_PLACEHOLDER\\1}", s, flags=re.DOTALL)
     i = 0
     while "[" in s and "]" in s and i < 10:
         s = re.sub(" *\\[.+?\\]", "", s, flags=re.DOTALL)

chgksuite/composer/latex.py

@@ -1,3 +1,4 @@
+import codecs
 import hashlib
 import os
 import re
@@ -220,7 +221,7 @@ class LatexExporter(BaseExporter):
 
         tex += "\\end{document}"
 
-        with open(outfilename, "w", encoding="utf-8") as outfile:
+        with codecs.open(outfilename, "w", "utf8") as outfile:
             outfile.write(tex)
         cwd = os.getcwd()
         os.chdir(self.dir_kwargs["tmp_dir"])

chgksuite/composer/lj.py

@@ -1,3 +1,4 @@
+import codecs
 import datetime
 import os
 import random
@@ -239,7 +240,7 @@ class LjExporter(BaseExporter):
                 "general_impressions_text"
             ]
         if self.args.debug:
-            with open("lj.debug", "w", encoding="utf-8") as f:
+            with codecs.open("lj.debug", "w", "utf8") as f:
                 f.write(log_wrap(final_structure))
         return final_structure
 

chgksuite/composer/openquiz.py

@@ -1,3 +1,4 @@
+import codecs
 import copy
 import re
 import json
@@ -174,5 +175,5 @@ class OpenquizExporter(BaseExporter):
         result = []
         for q in questions:
             result.append(self.oq_format_question(q))
-        with open(outfilename, "w", encoding="utf-8") as f:
+        with codecs.open(outfilename, "w", "utf8") as f:
             f.write(json.dumps(result, indent=2, ensure_ascii=False))

chgksuite/composer/{markdown.py → reddit.py}

@@ -1,3 +1,4 @@
+import codecs
 import os
 
 from chgksuite.composer.composer_common import (
@@ -8,20 +9,20 @@ from chgksuite.composer.composer_common import (
 )
 
 
-class MarkdownExporter(BaseExporter):
+class RedditExporter(BaseExporter):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.im = Imgur(self.args.imgur_client_id or IMGUR_CLIENT_ID)
         self.qcount = 1
 
-    def markdownyapper(self, e):
+    def reddityapper(self, e):
         if isinstance(e, str):
-            return self.markdown_element_layout(e)
+            return self.reddit_element_layout(e)
         elif isinstance(e, list):
             if not any(isinstance(x, list) for x in e):
-                return self.markdown_element_layout(e)
+                return self.reddit_element_layout(e)
             else:
-                return "  \n".join([self.markdown_element_layout(x) for x in e])
+                return "  \n".join([self.reddit_element_layout(x) for x in e])
 
     def parse_and_upload_image(self, path):
         parsed_image = parseimg(
@@ -36,13 +37,11 @@ class MarkdownExporter(BaseExporter):
             imglink = uploaded_image["data"]["link"]
             return imglink
 
-    def markdownformat(self, s):
+    def redditformat(self, s):
         res = ""
         for run in self.parse_4s_elem(s):
-            if run[0] == "":
+            if run[0] in ("", "hyperlink"):
                 res += run[1]
-            if run[0] == "hyperlink":
-                res += "<{}>".format(run[1])
             if run[0] == "screen":
                 res += run[1]["for_screen"]
             if run[0] == "italic":
@@ -52,70 +51,61 @@ class MarkdownExporter(BaseExporter):
                     imglink = run[1]
                 else:
                     imglink = self.parse_and_upload_image(run[1])
-                if self.args.filetype == "redditmd":
-                    res += "[картинка]({})".format(imglink)
-                else:
-                    res += "![]({})".format(imglink)
+                res += "[картинка]({})".format(imglink)
         while res.endswith("\n"):
             res = res[:-1]
         res = res.replace("\n", "  \n")
         return res
 
-    def markdown_element_layout(self, e):
+    def reddit_element_layout(self, e):
         res = ""
         if isinstance(e, str):
-            res = self.markdownformat(e)
+            res = self.redditformat(e)
             return res
         if isinstance(e, list):
             res = "  \n".join(
                 [
-                    "{}\\. {}".format(i + 1, self.markdown_element_layout(x))
+                    "{}\\. {}".format(i + 1, self.reddit_element_layout(x))
                     for i, x in enumerate(e)
                 ]
             )
         return res
 
-    def markdown_format_element(self, pair):
+    def reddit_format_element(self, pair):
         if pair[0] == "Question":
-            return self.markdown_format_question(pair[1])
+            return self.reddit_format_question(pair[1])
 
-    def markdown_format_question(self, q):
+    def reddit_format_question(self, q):
         if "setcounter" in q:
             self.qcount = int(q["setcounter"])
         res = "__Вопрос {}__: {}  \n".format(
             self.qcount if "number" not in q else q["number"],
-            self.markdownyapper(q["question"]),
+            self.reddityapper(q["question"]),
         )
         if "number" not in q:
             self.qcount += 1
-        spoiler_start = ">!" if self.args.filetype == "redditmd" else ""
-        spoiler_end = "!<" if self.args.filetype == "redditmd" else ""
-        res += "__Ответ:__ {}{}  \n".format(
-            spoiler_start, self.markdownyapper(q["answer"])
-        )
+        res += "__Ответ:__ >!{}  \n".format(self.reddityapper(q["answer"]))
         if "zachet" in q:
-            res += "__Зачёт:__ {}  \n".format(self.markdownyapper(q["zachet"]))
+            res += "__Зачёт:__ {}  \n".format(self.reddityapper(q["zachet"]))
         if "nezachet" in q:
-            res += "__Незачёт:__ {}  \n".format(self.markdownyapper(q["nezachet"]))
+            res += "__Незачёт:__ {}  \n".format(self.reddityapper(q["nezachet"]))
         if "comment" in q:
-            res += "__Комментарий:__ {}  \n".format(self.markdownyapper(q["comment"]))
+            res += "__Комментарий:__ {}  \n".format(self.reddityapper(q["comment"]))
         if "source" in q:
-            res += "__Источник:__ {}  \n".format(self.markdownyapper(q["source"]))
+            res += "__Источник:__ {}  \n".format(self.reddityapper(q["source"]))
         if "author" in q:
-            res += "{}\n__Автор:__ {}  \n".format(
-                spoiler_end, self.markdownyapper(q["author"])
-            )
+            res += "!<\n__Автор:__ {}  \n".format(self.reddityapper(q["author"]))
         else:
-            res += spoiler_end + "\n"
+            res += "!<\n"
         return res
 
     def export(self, outfile):
         result = []
         for pair in self.structure:
-            res = self.markdown_format_element(pair)
+            res = self.reddit_format_element(pair)
             if res:
                 result.append(res)
         text = "\n\n".join(result)
-        with open(outfile, "w", encoding="utf-8") as f:
+        with codecs.open(outfile, "w", "utf8") as f:
             f.write(text)
         self.logger.info("Output: {}".format(outfile))

chgksuite/handouter/runner.py

@@ -14,9 +14,6 @@ from chgksuite.handouter.gen import generate_handouts
 from chgksuite.handouter.pack import pack_handouts
 from chgksuite.handouter.installer import get_tectonic_path, install_tectonic
 from chgksuite.handouter.tex_internals import (
-    EDGE_DASHED,
-    EDGE_NONE,
-    EDGE_SOLID,
     GREYTEXT,
     HEADER,
     IMG,
@@ -64,28 +61,7 @@ class HandoutGenerator:
         )
         return GREYTEXT.replace("<GREYTEXT>", handout_text)
 
-    def make_tikzbox(self, block, edges=None, ext=None):
-        """
-        Create a TikZ box with configurable edge styles and extensions.
-        edges is a dict with keys 'top', 'bottom', 'left', 'right'
-        values are EDGE_DASHED or EDGE_SOLID
-        ext is a dict with edge extensions to close gaps at boundaries
-        """
-        if edges is None:
-            edges = {
-                "top": EDGE_DASHED,
-                "bottom": EDGE_DASHED,
-                "left": EDGE_DASHED,
-                "right": EDGE_DASHED,
-            }
-        if ext is None:
-            ext = {
-                "top": ("0pt", "0pt"),
-                "bottom": ("0pt", "0pt"),
-                "left": ("0pt", "0pt"),
-                "right": ("0pt", "0pt"),
-            }
-
+    def make_tikzbox(self, block):
         if block.get("no_center"):
             align = ""
         else:
@@ -103,206 +79,19 @@ class HandoutGenerator:
             .replace("<ALIGN>", align)
             .replace("<TEXTWIDTH>", textwidth)
             .replace("<FONTSIZE>", fontsize)
-            .replace("<TOP>", edges["top"])
-            .replace("<BOTTOM>", edges["bottom"])
-            .replace("<LEFT>", edges["left"])
-            .replace("<RIGHT>", edges["right"])
-            .replace("<TOP_EXT_L>", ext["top"][0])
-            .replace("<TOP_EXT_R>", ext["top"][1])
-            .replace("<BOTTOM_EXT_L>", ext["bottom"][0])
-            .replace("<BOTTOM_EXT_R>", ext["bottom"][1])
-            .replace("<LEFT_EXT_T>", ext["left"][0])
-            .replace("<LEFT_EXT_B>", ext["left"][1])
-            .replace("<RIGHT_EXT_T>", ext["right"][0])
-            .replace("<RIGHT_EXT_B>", ext["right"][1])
         )
 
     def get_page_width(self):
         return self.args.paperwidth - self.args.margin_left - self.args.margin_right - 2
 
-    def get_cut_direction(self, columns, num_rows, handouts_per_team):
-        """
-        Determine whether to cut vertically or horizontally.
-        Returns (direction, team_size) where:
-        - direction is 'vertical', 'horizontal', or None
-        - team_size is the number of columns (vertical) or rows (horizontal) per team
-
-        Falls back to None if handouts can't be evenly divided into teams.
-        """
-        total = columns * num_rows
-
-        # Check if total handouts can be evenly divided
-        if total % handouts_per_team != 0:
-            return None, None
-
-        num_teams = total // handouts_per_team
-        if num_teams < 2:
-            return None, None  # Only 1 team, no cuts needed
-
-        # Try vertical layout (teams as column groups)
-        # Each team gets team_cols columns × all rows
-        if handouts_per_team % num_rows == 0:
-            team_cols = handouts_per_team // num_rows
-            if columns % team_cols == 0:
-                return "vertical", team_cols
-
-        # Try horizontal layout (teams as row groups)
-        # Each team gets all columns × team_rows rows
-        if handouts_per_team % columns == 0:
-            team_rows = handouts_per_team // columns
-            if num_rows % team_rows == 0:
-                return "horizontal", team_rows
-
-        return None, None
-
-    def get_edge_styles(
-        self, row_idx, col_idx, num_rows, columns, cut_direction, team_size
-    ):
-        """
-        Determine edge styles and extensions for a box at position (row_idx, col_idx).
-        Outer edges of team rectangles are solid (thicker), inner edges are dashed.
-        Extensions are used to close gaps in ALL solid lines.
-        Duplicate dashed edges are skipped to avoid double lines.
-
-        team_size is the number of columns (vertical) or rows (horizontal) per team.
-        """
-        # Default: all dashed, no extension
-        edges = {
-            "top": EDGE_DASHED,
-            "bottom": EDGE_DASHED,
-            "left": EDGE_DASHED,
-            "right": EDGE_DASHED,
-        }
-        ext = {
-            "top": ("0pt", "0pt"),
-            "bottom": ("0pt", "0pt"),
-            "left": ("0pt", "0pt"),
-            "right": ("0pt", "0pt"),
-        }
-
-        # Gap sizes (half of spacing to extend into)
-        h_gap = "0.75mm"  # half of SPACE (1.5mm)
-        v_gap = "0.5mm"  # half of vspace (1mm)
-
-        # Helper functions to check if position is at a team boundary
-        def is_at_right_team_boundary():
-            """Is this box at the right edge of its team (but not at grid edge)?"""
-            if cut_direction != "vertical" or not team_size:
-                return False
-            return (col_idx + 1) % team_size == 0 and col_idx < columns - 1
-
-        def is_at_left_team_boundary():
-            """Is this box at the left edge of its team (but not at grid edge)?"""
-            if cut_direction != "vertical" or not team_size:
-                return False
-            return col_idx % team_size == 0 and col_idx > 0
-
-        def is_at_bottom_team_boundary():
-            """Is this box at the bottom edge of its team (but not at grid edge)?"""
-            if cut_direction != "horizontal" or not team_size:
-                return False
-            return (row_idx + 1) % team_size == 0 and row_idx < num_rows - 1
-
-        def is_at_top_team_boundary():
-            """Is this box at the top edge of its team (but not at grid edge)?"""
-            if cut_direction != "horizontal" or not team_size:
-                return False
-            return row_idx % team_size == 0 and row_idx > 0
-
-        # Determine which edges are solid
-        # Only apply solid edges if we have a valid cut direction
-        # Otherwise fall back to all-dashed (default)
-        if cut_direction is not None:
-            # Outer edges of the entire grid
-            if row_idx == 0:
-                edges["top"] = EDGE_SOLID
-            if row_idx == num_rows - 1:
-                edges["bottom"] = EDGE_SOLID
-            if col_idx == 0:
-                edges["left"] = EDGE_SOLID
-            if col_idx == columns - 1:
-                edges["right"] = EDGE_SOLID
-
-            # Team boundary edges
-            if is_at_right_team_boundary():
-                edges["right"] = EDGE_SOLID
-            if is_at_left_team_boundary():
-                edges["left"] = EDGE_SOLID
-            if is_at_bottom_team_boundary():
-                edges["bottom"] = EDGE_SOLID
-            if is_at_top_team_boundary():
-                edges["top"] = EDGE_SOLID
-
-        # Skip duplicate dashed edges (to avoid double lines between adjacent boxes)
-        if edges["left"] == EDGE_DASHED and col_idx > 0:
-            edges["left"] = EDGE_NONE
-
-        if edges["top"] == EDGE_DASHED and row_idx > 0:
-            edges["top"] = EDGE_NONE
-
-        # Calculate extensions for solid edges to close gaps
-        # But don't extend into team boundary gaps!
-
-        if edges["top"] == EDGE_SOLID:
-            at_left_boundary = is_at_left_team_boundary()
-            ext_left = "-" + h_gap if col_idx > 0 and not at_left_boundary else "0pt"
-            at_right_boundary = is_at_right_team_boundary()
-            ext_right = (
-                h_gap if col_idx < columns - 1 and not at_right_boundary else "0pt"
-            )
-            ext["top"] = (ext_left, ext_right)
-
-        if edges["bottom"] == EDGE_SOLID:
-            at_left_boundary = is_at_left_team_boundary()
-            ext_left = "-" + h_gap if col_idx > 0 and not at_left_boundary else "0pt"
-            at_right_boundary = is_at_right_team_boundary()
-            ext_right = (
-                h_gap if col_idx < columns - 1 and not at_right_boundary else "0pt"
-            )
-            ext["bottom"] = (ext_left, ext_right)
-
-        if edges["left"] == EDGE_SOLID:
-            at_top_boundary = is_at_top_team_boundary()
-            ext_top = v_gap if row_idx > 0 and not at_top_boundary else "0pt"
-            at_bottom_boundary = is_at_bottom_team_boundary()
-            ext_bottom = (
-                "-" + v_gap
-                if row_idx < num_rows - 1 and not at_bottom_boundary
-                else "0pt"
-            )
-            ext["left"] = (ext_top, ext_bottom)
-
-        if edges["right"] == EDGE_SOLID:
-            at_top_boundary = is_at_top_team_boundary()
-            ext_top = v_gap if row_idx > 0 and not at_top_boundary else "0pt"
-            at_bottom_boundary = is_at_bottom_team_boundary()
-            ext_bottom = (
-                "-" + v_gap
-                if row_idx < num_rows - 1 and not at_bottom_boundary
-                else "0pt"
-            )
-            ext["right"] = (ext_top, ext_bottom)
-
-        return edges, ext
-
     def generate_regular_block(self, block_):
         block = block_.copy()
         if not (block.get("image") or block.get("text")):
             return
         columns = block["columns"]
-        num_rows = block.get("rows") or 1
-        handouts_per_team = block.get("handouts_per_team") or 3
-
-        # Determine cut direction
-        cut_direction, cut_after = self.get_cut_direction(
-            columns, num_rows, handouts_per_team
-        )
-        if self.args.debug:
-            print(f"cut_direction: {cut_direction}, cut_after: {cut_after}")
-
-        spaces = columns - 1
+        spaces = block["columns"] - 1
         boxwidth = self.args.boxwidth or round(
-            (self.get_page_width() - spaces * self.SPACE) / columns,
+            (self.get_page_width() - spaces * self.SPACE) / block["columns"],
             3,
         )
         total_width = boxwidth * columns + spaces * self.SPACE
@@ -315,6 +104,7 @@ class HandoutGenerator:
             r"\setlength{\boxwidth}{<Q>mm}%".replace("<Q>", str(boxwidth)),
             r"\setlength{\boxwidthinner}{<Q>mm}%".replace("<Q>", str(boxwidthinner)),
         ]
+        rows = []
         contents = []
         if block.get("image"):
             img_qwidth = block.get("resize_image") or 1.0
@@ -329,18 +119,10 @@ class HandoutGenerator:
             block["centering"] = ""
         else:
             block["centering"] = "\\centering"
-
-        rows = []
-        for row_idx in range(num_rows):
-            row_boxes = []
-            for col_idx in range(columns):
-                edges, ext = self.get_edge_styles(
-                    row_idx, col_idx, num_rows, columns, cut_direction, cut_after
-                )
-                row_boxes.append(self.make_tikzbox(block, edges, ext))
+        for _ in range(block.get("rows") or 1):
             row = (
                 TIKZBOX_START.replace("<CENTERING>", block["centering"])
-                + "\n".join(row_boxes)
+                + "\n".join([self.make_tikzbox(block)] * block["columns"])
                 + TIKZBOX_END
             )
             rows.append(row)

chgksuite/handouter/tex_internals.py

@@ -13,7 +13,7 @@ HEADER = r"""
 \begin{document}
 \fontsize{14pt}{16pt}\selectfont
 \setlength\parindent{0pt}
-\tikzstyle{box}=[rectangle, inner sep=<TIKZ_MM>mm]
+\tikzstyle{box}=[draw, dashed, rectangle, inner sep=<TIKZ_MM>mm]
 \raggedright
 \raggedbottom
 """.strip()
@@ -25,20 +25,10 @@ TIKZBOX_START = r"""{<CENTERING>
 
 TIKZBOX_INNER = r"""
 \begin{tikzpicture}
-\node[box, minimum width=\boxwidth<TEXTWIDTH><ALIGN>] (b) {<FONTSIZE><CONTENTS>\par};
-\useasboundingbox (b.south west) rectangle (b.north east);
-\draw[<TOP>] ([xshift=<TOP_EXT_L>]b.north west) -- ([xshift=<TOP_EXT_R>]b.north east);
-\draw[<BOTTOM>] ([xshift=<BOTTOM_EXT_L>]b.south west) -- ([xshift=<BOTTOM_EXT_R>]b.south east);
-\draw[<LEFT>] ([yshift=<LEFT_EXT_T>]b.north west) -- ([yshift=<LEFT_EXT_B>]b.south west);
-\draw[<RIGHT>] ([yshift=<RIGHT_EXT_T>]b.north east) -- ([yshift=<RIGHT_EXT_B>]b.south east);
+\node[box, minimum width=\boxwidth<TEXTWIDTH><ALIGN>] {<FONTSIZE><CONTENTS>\par};
 \end{tikzpicture}
 """.strip()
 
-# Line styles for box edges
-EDGE_SOLID = "line width=0.8pt"
-EDGE_DASHED = "dashed"
-EDGE_NONE = "draw=none"  # Don't draw this edge (to avoid double dashed lines)
-
 TIKZBOX_END = "\n}"
 
 IMG = r"""\includegraphics<IMGWIDTH>{<IMGPATH>}"""

chgksuite/parser.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import base64
+import codecs
 import datetime
 import hashlib
 import itertools
@@ -17,9 +18,8 @@ import time
 
 import bs4
 import chardet
+import dashtable
 import mammoth
-
-from chgksuite._html2md import html2md
 import pypandoc
 import requests
 import toml
@@ -61,7 +61,7 @@ def partition(alist, indices):
 
 
 def load_regexes(regexfile):
-    with open(regexfile, "r", encoding="utf-8") as f:
+    with codecs.open(regexfile, "r", "utf8") as f:
         regexes = json.loads(f.read())
     return {k: re.compile(v) for k, v in regexes.items()}
 
@@ -526,7 +526,7 @@ class ChgkParser:
             )
 
         if debug:
-            with open("debug_0.txt", "w", encoding="utf-8") as f:
+            with codecs.open("debug_0.txt", "w", "utf8") as f:
                 f.write(text)
 
         # 1.
@@ -558,7 +558,7 @@ class ChgkParser:
         i = 0
 
         if debug:
-            with open("debug_1.json", "w", encoding="utf-8") as f:
+            with codecs.open("debug_1.json", "w", "utf8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         self.process_single_number_lines()
@@ -574,7 +574,7 @@ class ChgkParser:
                 element[0] = "question"
 
         if debug:
-            with open("debug_1a.json", "w", encoding="utf-8") as f:
+            with codecs.open("debug_1a.json", "w", "utf8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         # 2.
@@ -584,7 +584,7 @@ class ChgkParser:
         self.merge_to_x_until_nextfield("comment")
 
         if debug:
-            with open("debug_2.json", "w", encoding="utf-8") as f:
+            with codecs.open("debug_2.json", "w", "utf8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         # 3.
@@ -647,7 +647,7 @@ class ChgkParser:
         self.merge_to_x_until_nextfield("nezachet")
 
         if debug:
-            with open("debug_3.json", "w", encoding="utf-8") as f:
+            with codecs.open("debug_3.json", "w", "utf8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         # 4.
@@ -660,7 +660,7 @@ class ChgkParser:
             self.merge_to_next(0)
 
         if debug:
-            with open("debug_3a.json", "w", encoding="utf-8") as f:
+            with codecs.open("debug_3a.json", "w", "utf8") as f:
                 f.write(
                     json.dumps(
                         list(enumerate(self.structure)), ensure_ascii=False, indent=4
@@ -718,7 +718,7 @@ class ChgkParser:
             idx += 1
 
         if debug:
-            with open("debug_4.json", "w", encoding="utf-8") as f:
+            with codecs.open("debug_4.json", "w", "utf8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         # 5.
@@ -798,7 +798,7 @@ class ChgkParser:
                 )
 
         if debug:
-            with open("debug_5.json", "w", encoding="utf-8") as f:
+            with codecs.open("debug_5.json", "w", "utf8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         # 6.
@@ -853,7 +853,7 @@ class ChgkParser:
             final_structure.append(["Question", current_question])
 
         if debug:
-            with open("debug_6.json", "w", encoding="utf-8") as f:
+            with codecs.open("debug_6.json", "w", "utf8") as f:
                 f.write(json.dumps(final_structure, ensure_ascii=False, indent=4))
 
         # 7.
@@ -899,7 +899,7 @@ class ChgkParser:
                 element[1] = self._process_images_in_text(element[1])
 
         if debug:
-            with open("debug_final.json", "w", encoding="utf-8") as f:
+            with codecs.open("debug_final.json", "w", "utf8") as f:
                 f.write(json.dumps(final_structure, ensure_ascii=False, indent=4))
         return final_structure
 
@@ -982,8 +982,8 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
             with open(docxfile, "rb") as docx_file:
                 html = mammoth.convert_to_html(docx_file).value
         if args.debug:
-            with open(
-                os.path.join(target_dir, "debugdebug.pydocx"), "w", encoding="utf-8"
+            with codecs.open(
+                os.path.join(target_dir, "debugdebug.pydocx"), "w", "utf8"
             ) as dbg:
                 dbg.write(html)
         input_docx = (
@@ -994,8 +994,8 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
         bsoup = BeautifulSoup(input_docx, "html.parser")
 
         if args.debug:
-            with open(
-                os.path.join(target_dir, "debug.pydocx"), "w", encoding="utf-8"
+            with codecs.open(
+                os.path.join(target_dir, "debug.pydocx"), "w", "utf8"
             ) as dbg:
                 dbg.write(input_docx)
 
@@ -1065,7 +1065,7 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
             ensure_line_breaks(tag)
         for tag in bsoup.find_all("table"):
             try:
-                table = html2md(str(tag))
+                table = dashtable.html2md(str(tag))
                 tag.insert_before(table)
             except (TypeError, ValueError):
                 logger.error(f"couldn't parse html table: {str(tag)}")
@@ -1096,12 +1096,12 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
                     tag.unwrap()
 
         if args.debug:
-            with open(
-                os.path.join(target_dir, "debug_raw.html"), "w", encoding="utf-8"
+            with codecs.open(
+                os.path.join(target_dir, "debug_raw.html"), "w", "utf8"
             ) as dbg:
                 dbg.write(str(bsoup))
-            with open(
-                os.path.join(target_dir, "debug.html"), "w", encoding="utf-8"
+            with codecs.open(
+                os.path.join(target_dir, "debug.html"), "w", "utf8"
             ) as dbg:
                 dbg.write(bsoup.prettify())
 
@@ -1139,9 +1139,7 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
         txt = txt.replace(f"IMGPATH({i})", elem)
 
     if args.debug:
-        with open(
-            os.path.join(target_dir, "debug.debug"), "w", encoding="utf-8"
-        ) as dbg:
+        with codecs.open(os.path.join(target_dir, "debug.debug"), "w", "utf8") as dbg:
             dbg.write(txt)
 
     final_structure = chgk_parse(txt, defaultauthor=defaultauthor, args=args)
@@ -1175,7 +1173,7 @@ def chgk_parse_wrapper(path, args, logger=None):
         sys.exit()
     outfilename = os.path.join(target_dir, make_filename(abspath, "4s", args))
     logger.info("Output: {}".format(os.path.abspath(outfilename)))
-    with open(outfilename, "w", encoding="utf-8") as output_file:
+    with codecs.open(outfilename, "w", "utf8") as output_file:
         output_file.write(compose_4s(final_structure, args=args))
     return outfilename
 

chgksuite/parser_db.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import codecs
 import json
 import os
 import re
@@ -435,7 +436,7 @@ def chgk_parse_db(text, debug=False, logger=False):
     append_question(lexer)
 
     if debug:
-        with open("debug_final.json", "w", encoding="utf-8") as f:
+        with codecs.open("debug_final.json", "w", "utf8") as f:
             f.write(json.dumps(lexer.structure, ensure_ascii=False, indent=4))
 
     return lexer.structure

chgksuite/trello.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+import codecs
 import json
 import os
 import pdb
@@ -51,7 +52,7 @@ def upload_file(filepath, trello, list_name=None):
     assert lid is not None
     print(f"uploading to list '{list_['name']}'")
     content = ""
-    with open(filepath, "r", encoding="utf-8") as f:
+    with codecs.open(filepath, "r", "utf8") as f:
         content = f.read()
     cards = re.split(r"(\r?\n){2,}", content)
     cards = [x for x in cards if x != "" and x != "\n" and x != "\r\n"]
@@ -254,7 +255,7 @@ def gui_trello_download(args):
 
     board_id_path = os.path.join(args.folder, ".board_id")
     if os.path.isfile(board_id_path):
-        with open(board_id_path, "r", encoding="utf-8") as f:
+        with codecs.open(board_id_path, "r", "utf8") as f:
             board_id = f.read().rstrip()
     else:
         board_id = get_board_id(path=args.folder)
@@ -400,14 +401,14 @@ def gui_trello_download(args):
             result.extend(_lists[_list["name"]])
         filename = "singlefile.4s"
         print("outputting {}".format(filename))
-        with open(filename, "w", encoding="utf-8") as f:
+        with codecs.open(filename, "w", "utf8") as f:
             for item in result:
                 f.write("\n" + item + "\n")
     else:
         for _list in _lists:
             filename = "{}.4s".format(_list)
             print("outputting {}".format(filename))
-            with open(filename, "w", encoding="utf-8") as f:
+            with codecs.open(filename, "w", "utf8") as f:
                 for item in _lists[_list]:
                     f.write("\n" + item + "\n")
 
@@ -425,7 +426,7 @@ def get_board_id(path=None):
     if "trello.com" in board_id:
         board_id = re_bi.search(board_id).group(1)
     if path:
-        with open(os.path.join(path, ".board_id"), "w", encoding="utf-8") as f:
+        with codecs.open(os.path.join(path, ".board_id"), "w", "utf8") as f:
             f.write(board_id)
     return board_id
 
@@ -436,7 +437,7 @@ def get_token(tokenpath, args):
     else:
         webbrowser.open(TRELLO_URL)
     token = input("Please paste the obtained token: ").rstrip()
-    with open(tokenpath, "w", encoding="utf-8") as f:
+    with codecs.open(tokenpath, "w", "utf8") as f:
         f.write(token)
     return token
 
@@ -451,7 +452,7 @@ def gui_trello(args):
     if not os.path.isfile(tokenpath):
         token = get_token(tokenpath, args)
     else:
-        with open(tokenpath, "r", encoding="utf-8") as f:
+        with codecs.open(tokenpath, "r", "utf8") as f:
             token = f.read().rstrip()
 
     with open(os.path.join(resourcedir, "trello.json")) as f:

chgksuite/typotools.py

@@ -92,13 +92,13 @@ def uni_normalize(k):
 
 
 def cyr_lat_check_char(i, char, word):
-    if char.lower() in CYRILLIC_CHARS:
+    if char in CYRILLIC_CHARS:
         return
     if not (
-        (i == 0 or word[i - 1].lower() in CYRILLIC_CHARS or not word[i - 1].isalpha())
+        (i == 0 or word[i - 1] in CYRILLIC_CHARS or not word[i - 1].isalpha())
         and (
             i == len(word) - 1
-            or word[i + 1].lower() in CYRILLIC_CHARS
+            or word[i + 1] in CYRILLIC_CHARS
             or not word[i + 1].isalpha()
         )
     ):
@@ -121,7 +121,7 @@ def cyr_lat_check_word(word):
         if check_result:
             replacements[char] = check_result
         elif (
-            char.lower() in CYRILLIC_CHARS
+            char in CYRILLIC_CHARS
             and i < len(word) - 1
             and word[i + 1] in ACCENTS_TO_FIX
         ):

chgksuite/version.py

@@ -1 +1 @@
-__version__ = "0.27.0"
+__version__ = "0.27.0b3"

{chgksuite-0.27.0.dist-info → chgksuite-0.27.0b3.dist-info}/METADATA

@@ -1,21 +1,23 @@
 Metadata-Version: 2.4
 Name: chgksuite
-Version: 0.27.0
+Version: 0.27.0b3
 Summary: A package for chgk automation
-Project-URL: Homepage, https://gitlab.com/peczony/chgksuite
 Author-email: Alexander Pecheny <ap@pecheny.me>
 License-Expression: MIT
-License-File: LICENSE
-Classifier: Operating System :: OS Independent
+Project-URL: Homepage, https://gitlab.com/peczony/chgksuite
 Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: beautifulsoup4
 Requires-Dist: chardet
+Requires-Dist: dashtable
 Requires-Dist: dateparser
 Requires-Dist: mammoth
 Requires-Dist: openpyxl
 Requires-Dist: parse
-Requires-Dist: pillow
+Requires-Dist: Pillow
 Requires-Dist: ply
 Requires-Dist: pypandoc
 Requires-Dist: pypdf
@@ -27,7 +29,7 @@ Requires-Dist: requests
 Requires-Dist: toml
 Requires-Dist: urllib3>=2.6.2
 Requires-Dist: watchdog
-Description-Content-Type: text/markdown
+Dynamic: license-file
 
 **chgksuite** is an utility that helps chgk editors.
 

{chgksuite-0.27.0.dist-info → chgksuite-0.27.0b3.dist-info}/RECORD

@@ -1,25 +1,23 @@
 chgksuite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chgksuite/__main__.py,sha256=0-_jfloveTW3SZYW5XEagbyaHKGCiDhGNgcLxsT_dMs,140
-chgksuite/_html2md.py,sha256=_FP2tXangkFubnByXNoe4sDfR_njUy19MCD4OWX-BP0,2414
-chgksuite/cli.py,sha256=fHa7HNJeQeUNXpbqnMnSXHOMpbxpaph6d3KdVNx9uNg,41257
-chgksuite/common.py,sha256=TGXXWjdCS8Fy5Gkxuw7ZN3xh9pTS84ZtvRQj7IYU1E4,11341
-chgksuite/lastdir,sha256=BbZVRYZnXBQzJUrl7a2e4xuUcfmq6asNI705pTxBfD4,49
-chgksuite/parser.py,sha256=6T6o3F_oJVe9sl96gCaACCwtuF7lcn2V-24qEMN27zw,45847
-chgksuite/parser_db.py,sha256=Ngh2ZYhAyetb6Sa-5xC9aX8quX9Ar1WheSfhSy-JADw,11105
-chgksuite/trello.py,sha256=UYWemtf6z0jKW3tY-aof7_w2hWqcljYNd891vXFZ8mw,14731
-chgksuite/typotools.py,sha256=J2AEQbfcR0HHSu5WCALpj4Ya_ngOMXRh7esJgcybWQM,12797
-chgksuite/version.py,sha256=Hjsc9XQ3AkqXm-5cdlX-H8iKjURzi1FQeWNi2xx34Uo,23
+chgksuite/cli.py,sha256=95Xj1jrnybtso9qSCAwgv6utCrhJF43oFXlH5LWyHKA,40918
+chgksuite/common.py,sha256=M4mYjVAzF7uk9ElF0XmO3eggxSFf2bPlKinT2nEZPXA,11350
+chgksuite/parser.py,sha256=2UL-2dJtCFYEjakUfeh3n1E4epMKPo0pjdaC_cBZplM,45775
+chgksuite/parser_db.py,sha256=gh5AM80UR_hQ0r_-AwWLbqZCl2V0j3HAgj6BilImXyc,11116
+chgksuite/trello.py,sha256=I1JmIbZVJjJuuRO0g26fNt8deRo9hDlk1xBIf8w31Rs,14724
+chgksuite/typotools.py,sha256=0fQOjt5H3NRl0JeGTp2x-k-2ZN68E9Z9WX8D7lCwXmA,12765
+chgksuite/version.py,sha256=1PfujVHYVF7srJSn6DXPFkpAJHTDurCFxLyRIehyqJk,25
 chgksuite/vulture_whitelist.py,sha256=P__p_X0zt10ivddIf81uyxsobV14vFg8uS2lt4foYpc,3582
-chgksuite/composer/__init__.py,sha256=kTQsxgn_ED18DgZjdvh7QuwC36FVbaiv_eYTjj3zdIk,6596
-chgksuite/composer/chgksuite_parser.py,sha256=ItlTenviFDuqP-f1960nzD-gRPFDQy4RdOL39PswTvg,9044
+chgksuite/composer/__init__.py,sha256=MAOVZIYXmZmD6nNQSo9DueV6b5RgxF7_HGeLvsAhMJs,6490
+chgksuite/composer/chgksuite_parser.py,sha256=XxopZLVY4DQxgxw2a6NT70ga_2XZHzuvn58RnlriiqE,8847
 chgksuite/composer/composer_common.py,sha256=kc-_Tc9NjevfXGj4fXoa9fye9AO0EuMSnEPJnS0n-aQ,16281
-chgksuite/composer/db.py,sha256=DI-goR4V69S8bufNfW5smTFG9puiyjcxC1u1TFuhfYs,8162
-chgksuite/composer/docx.py,sha256=cxPgjykAlU3XxKCtM3K13Wm6IcKqAHo0ngLqa8-2opM,23716
-chgksuite/composer/latex.py,sha256=Ouq3OkUA0oS_zhCOiPZ2tY2sMe3OVg84Cead2GgJi2c,9231
-chgksuite/composer/lj.py,sha256=7zrLrvbgYEoiF-NC7zyDaJTvPMhwt8tQT_KWgsAeG4A,15202
-chgksuite/composer/markdown.py,sha256=hWajBAvop_BTyBI6rzeIwAaj7p_6p2kQre4WDMalD90,4343
-chgksuite/composer/openquiz.py,sha256=BF506tH6b1IoocC61l5xBU969l38S1IjqMi6mqhG_HI,6990
+chgksuite/composer/db.py,sha256=71cINE_V8s6YidvqpmBmmlWbcXraUEGZA1xpVFAUENw,8173
+chgksuite/composer/docx.py,sha256=W46glwffZFpIATrwe_100vl5ypobMwXADSfoaApyHl8,23716
+chgksuite/composer/latex.py,sha256=_IKylzdDcokgXYvvxsVSiq-Ba5fVirWcfCp6eOyx6zQ,9242
+chgksuite/composer/lj.py,sha256=nty3Zs3N1H0gNK378U04aAHo71_5cABhCM1Mm9jiUEA,15213
+chgksuite/composer/openquiz.py,sha256=D9q7lcEgUGwR1UF6Qp3I-wBJucy9vMnrxoSOst4V45Q,7001
 chgksuite/composer/pptx.py,sha256=9O0tfx2xpyx9Y4ceatVIXdiwvslnj8gliZIlxsDe5Ow,23971
+chgksuite/composer/reddit.py,sha256=-Eg4CqMHhyGGfCteVwdQdtE1pfUXQ42XcP5OYUrBXmo,3878
 chgksuite/composer/stats.py,sha256=GbraSrjaZ8Mc2URs5aGAsI4ekboAKzlJJOqsbe96ELA,3995
 chgksuite/composer/telegram.py,sha256=KM9Bnkf2bxdJNMrhjCCw2xx-sWcIQioBc1FdSY4OX-g,47431
 chgksuite/composer/telegram_bot.py,sha256=xT5D39m4zGmIbHV_ZfyQ9Rc8PAmG2V5FGUeDKpkgyTw,3767
@@ -27,8 +25,8 @@ chgksuite/handouter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 chgksuite/handouter/gen.py,sha256=CJfGl8R2vnElnsjBo0n4u-y8KD-l2qxrIuUHj5WZBuI,5241
 chgksuite/handouter/installer.py,sha256=u4jQKeCn0VjOnaDFezx35g8oRjji5edvYGj5xSHCEW4,7574
 chgksuite/handouter/pack.py,sha256=H-Ln1JqKK2u3jFI5wwsh7pQdJBpQJ-s8gV9iECQ3kgU,2504
-chgksuite/handouter/runner.py,sha256=AOJ90ncqMotib_FCPL7K50oQh6tH1EuhnKf3FGSUTxk,17331
-chgksuite/handouter/tex_internals.py,sha256=j9zvai6zmaEg8osXnJ4yaXAx-89ufcpypySjyoxGFM0,1544
+chgksuite/handouter/runner.py,sha256=QPqLKbfNDL0ucJ365lvKCwRcPKrhxRBJ-YFSbQLU9_8,8641
+chgksuite/handouter/tex_internals.py,sha256=pxvMXkqlMfzBbAlTkFCJBlcT7t1XS0Z9XOzVboc2f2Y,966
 chgksuite/handouter/utils.py,sha256=0RoECvHzfmwWnRL2jj4WKh22oTCPh2MXid_a9ShplDA,2243
 chgksuite/resources/cheader.tex,sha256=Jfe3LESk0VIV0HCObbajSQpEMljaIDAIEGSs6YY9rTk,3454
 chgksuite/resources/fix-unnumbered-sections.sty,sha256=FN6ZSWC6MvoRoThPm5AxCF98DdgcxbxyBYG6YImM05s,1409
@@ -56,8 +54,9 @@ chgksuite/resources/regexes_uz_cyr.json,sha256=D4AyaEPEY753I47Ky2Fwol_4kxQsl-Yu9
 chgksuite/resources/template.docx,sha256=Do29TAsg3YbH0rRSaXhVzKEoh4pwXkklW_idWA34HVE,11189
 chgksuite/resources/template.pptx,sha256=hEFWqE-yYpwZ8ejrMCJIPEyoMT3eDqaqtiEeQ7I4fyk,29777
 chgksuite/resources/trello.json,sha256=M5Q9JR-AAJF1u16YtNAxDX-7c7VoVTXuq4POTqYvq8o,555
-chgksuite-0.27.0.dist-info/METADATA,sha256=Ln_5OzfvOLqioOMK-mPmYiqZI1bPcpguRByxzfIvBFs,1152
-chgksuite-0.27.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-chgksuite-0.27.0.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
-chgksuite-0.27.0.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
-chgksuite-0.27.0.dist-info/RECORD,,
+chgksuite-0.27.0b3.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
+chgksuite-0.27.0b3.dist-info/METADATA,sha256=muUWnuAXvRsCjuwnkkKsES747wqhlLWTquzhmOm9ymk,1201
+chgksuite-0.27.0b3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+chgksuite-0.27.0b3.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
+chgksuite-0.27.0b3.dist-info/top_level.txt,sha256=cSWiRBOGZW9nIO6Rv1IrEfwPgV2ZWs87QV9wPXeBGqM,10
+chgksuite-0.27.0b3.dist-info/RECORD,,

{chgksuite-0.27.0.dist-info → chgksuite-0.27.0b3.dist-info}/WHEEL

@@ -1,4 +1,5 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.28.0
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
+

chgksuite-0.27.0b3.dist-info/top_level.txt

@@ -0,0 +1 @@
+chgksuite

chgksuite/_html2md.py

@@ -1,90 +0,0 @@
-"""Simple HTML table to Markdown converter.
-
-Replaces dashtable.html2md with a minimal implementation that avoids
-deprecated BeautifulSoup methods.
-"""
-
-from bs4 import BeautifulSoup
-
-
-def html2md(html_string: str) -> str:
-    """Convert an HTML table to a Markdown table string.
-
-    Parameters
-    ----------
-    html_string : str
-        HTML string containing a table
-
-    Returns
-    -------
-    str
-        The table formatted as Markdown
-    """
-    soup = BeautifulSoup(html_string, "html.parser")
-    table = soup.find("table")
-
-    if not table:
-        return ""
-
-    rows = table.find_all("tr")
-    if not rows:
-        return ""
-
-    # Extract all rows as lists of cell texts
-    data = []
-    for row in rows:
-        # Check for header cells first, then data cells
-        cells = row.find_all("th")
-        if not cells:
-            cells = row.find_all("td")
-
-        row_data = []
-        for cell in cells:
-            # Get text, normalize whitespace
-            text = " ".join(cell.get_text().split())
-            row_data.append(text)
-        if row_data:
-            data.append(row_data)
-
-    if not data:
-        return ""
-
-    # Normalize row lengths (pad shorter rows)
-    max_cols = max(len(row) for row in data)
-    for row in data:
-        while len(row) < max_cols:
-            row.append("")
-
-    # Calculate column widths (minimum 3 for markdown separator)
-    # Add 2 for space cushions on each side
-    widths = []
-    for col in range(max_cols):
-        width = max(len(row[col]) for row in data)
-        widths.append(max(width + 2, 3))
-
-    # Build markdown table
-    lines = []
-
-    # Header row (centered, with padding)
-    header = "|" + "|".join(_center(cell, widths[i]) for i, cell in enumerate(data[0])) + "|"
-    lines.append(header)
-
-    # Separator row (no spaces to avoid typotools converting --- to em-dash)
-    separator = "|" + "|".join("-" * w for w in widths) + "|"
-    lines.append(separator)
-
-    # Data rows (centered, with padding)
-    for row in data[1:]:
-        line = "|" + "|".join(_center(cell, widths[i]) for i, cell in enumerate(row)) + "|"
-        lines.append(line)
-
-    return "\n".join(lines)
-
-
-def _center(text: str, width: int) -> str:
-    """Center text within width, with space padding."""
-    text = text.strip()
-    padding = width - len(text)
-    left = padding // 2
-    right = padding - left
-    return " " * left + text + " " * right

chgksuite/lastdir

@@ -1 +0,0 @@
-/Users/pecheny/chgksuite1/tmpz_2mf3o8/tmptke0lqfv