flexablelib-speedups 3.3.0__tar.gz → 3.4.0__tar.gz

{flexablelib_speedups-3.3.0 → flexablelib_speedups-3.4.0}/MANIFEST.in

@@ -2,3 +2,4 @@ include README.md
 include LICENSE
 include flexablelib_speedups/_frames.c
 include flexablelib_speedups/_width_tables.h
+include flexablelib_speedups/_ascii_table.h

{flexablelib_speedups-3.3.0/flexablelib_speedups.egg-info → flexablelib_speedups-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexablelib-speedups
-Version: 3.3.0
+Version: 3.4.0
 Summary: Optional C acceleration of terminal frame drawing for flexablelib (cut, pad, borders, frame diffs).
 Home-page: https://github.com/Opus-Perpetuus/flexablelib
 Author: Benjamin Ramirez

{flexablelib_speedups-3.3.0 → flexablelib_speedups-3.4.0}/flexablelib_speedups/__init__.py

@@ -6,7 +6,7 @@ directly: :mod:`flexablelib._frames` picks it up when it is installed and
 falls back to identical pure-Python code when it is not.
 """
 
-__version__ = '3.3.0'
+__version__ = '3.4.0'
 
 from . import _frames  # noqa: F401,E402
 

flexablelib_speedups-3.4.0/flexablelib_speedups/_ascii_table.h

@@ -0,0 +1,342 @@
+/* Generated by tools/gen_ascii_table.py from
+ * flexablelib._frames.ASCII_FOLD. Do not edit. */
+
+struct ascii_fold_entry { Py_UCS4 cp; char ch; };
+
+static const struct ascii_fold_entry ascii_fold_table[] = {
+    {0x00A0, ' '},
+    {0x00A6, '|'},
+    {0x00AB, '<'},
+    {0x00AC, '-'},
+    {0x00B0, 'o'},
+    {0x00B1, '+'},
+    {0x00B7, '.'},
+    {0x00BB, '>'},
+    {0x00D7, 'x'},
+    {0x00F7, '/'},
+    {0x2010, '-'},
+    {0x2011, '-'},
+    {0x2012, '-'},
+    {0x2013, '-'},
+    {0x2014, '-'},
+    {0x2015, '-'},
+    {0x2018, '\''},
+    {0x2019, '\''},
+    {0x201A, '\''},
+    {0x201C, '"'},
+    {0x201D, '"'},
+    {0x201E, '"'},
+    {0x2022, '.'},
+    {0x2023, '>'},
+    {0x2026, '.'},
+    {0x2032, '\''},
+    {0x2033, '"'},
+    {0x2039, '<'},
+    {0x203A, '>'},
+    {0x2043, '-'},
+    {0x20AC, 'E'},
+    {0x2139, 'i'},
+    {0x2190, '<'},
+    {0x2191, '^'},
+    {0x2192, '>'},
+    {0x2193, 'v'},
+    {0x2194, '-'},
+    {0x2195, '|'},
+    {0x219E, '<'},
+    {0x21A0, '>'},
+    {0x21A4, '<'},
+    {0x21A6, '>'},
+    {0x21A9, '<'},
+    {0x21B5, '<'},
+    {0x21D0, '<'},
+    {0x21D1, '^'},
+    {0x21D2, '>'},
+    {0x21D3, 'v'},
+    {0x21D4, '-'},
+    {0x21D5, '|'},
+    {0x2205, '0'},
+    {0x2212, '-'},
+    {0x2219, '.'},
+    {0x221A, '+'},
+    {0x221E, '8'},
+    {0x223C, '~'},
+    {0x2248, '~'},
+    {0x2260, '#'},
+    {0x2264, '<'},
+    {0x2265, '>'},
+    {0x22EF, '.'},
+    {0x23CE, '<'},
+    {0x2423, '_'},
+    {0x2500, '-'},
+    {0x2501, '-'},
+    {0x2502, '|'},
+    {0x2503, '|'},
+    {0x2504, '-'},
+    {0x2505, '-'},
+    {0x2506, '|'},
+    {0x2507, '|'},
+    {0x2508, '-'},
+    {0x2509, '-'},
+    {0x250A, '|'},
+    {0x250B, '|'},
+    {0x250C, '+'},
+    {0x250D, '+'},
+    {0x250E, '+'},
+    {0x250F, '+'},
+    {0x2510, '+'},
+    {0x2511, '+'},
+    {0x2512, '+'},
+    {0x2513, '+'},
+    {0x2514, '+'},
+    {0x2515, '+'},
+    {0x2516, '+'},
+    {0x2517, '+'},
+    {0x2518, '+'},
+    {0x2519, '+'},
+    {0x251A, '+'},
+    {0x251B, '+'},
+    {0x251C, '+'},
+    {0x251D, '+'},
+    {0x251E, '+'},
+    {0x251F, '+'},
+    {0x2520, '+'},
+    {0x2521, '+'},
+    {0x2522, '+'},
+    {0x2523, '+'},
+    {0x2524, '+'},
+    {0x2525, '+'},
+    {0x2526, '+'},
+    {0x2527, '+'},
+    {0x2528, '+'},
+    {0x2529, '+'},
+    {0x252A, '+'},
+    {0x252B, '+'},
+    {0x252C, '+'},
+    {0x252D, '+'},
+    {0x252E, '+'},
+    {0x252F, '+'},
+    {0x2530, '+'},
+    {0x2531, '+'},
+    {0x2532, '+'},
+    {0x2533, '+'},
+    {0x2534, '+'},
+    {0x2535, '+'},
+    {0x2536, '+'},
+    {0x2537, '+'},
+    {0x2538, '+'},
+    {0x2539, '+'},
+    {0x253A, '+'},
+    {0x253B, '+'},
+    {0x253C, '+'},
+    {0x253D, '+'},
+    {0x253E, '+'},
+    {0x253F, '+'},
+    {0x2540, '+'},
+    {0x2541, '+'},
+    {0x2542, '+'},
+    {0x2543, '+'},
+    {0x2544, '+'},
+    {0x2545, '+'},
+    {0x2546, '+'},
+    {0x2547, '+'},
+    {0x2548, '+'},
+    {0x2549, '+'},
+    {0x254A, '+'},
+    {0x254B, '+'},
+    {0x254C, '-'},
+    {0x254D, '-'},
+    {0x254E, '|'},
+    {0x254F, '|'},
+    {0x2550, '='},
+    {0x2551, '|'},
+    {0x2552, '+'},
+    {0x2553, '+'},
+    {0x2554, '+'},
+    {0x2555, '+'},
+    {0x2556, '+'},
+    {0x2557, '+'},
+    {0x2558, '+'},
+    {0x2559, '+'},
+    {0x255A, '+'},
+    {0x255B, '+'},
+    {0x255C, '+'},
+    {0x255D, '+'},
+    {0x255E, '+'},
+    {0x255F, '+'},
+    {0x2560, '+'},
+    {0x2561, '+'},
+    {0x2562, '+'},
+    {0x2563, '+'},
+    {0x2564, '+'},
+    {0x2565, '+'},
+    {0x2566, '+'},
+    {0x2567, '+'},
+    {0x2568, '+'},
+    {0x2569, '+'},
+    {0x256A, '+'},
+    {0x256B, '+'},
+    {0x256C, '+'},
+    {0x256D, '+'},
+    {0x256E, '+'},
+    {0x256F, '+'},
+    {0x2570, '+'},
+    {0x2571, '/'},
+    {0x2572, '\\'},
+    {0x2573, 'X'},
+    {0x2574, '-'},
+    {0x2575, '|'},
+    {0x2576, '-'},
+    {0x2577, '|'},
+    {0x2578, '-'},
+    {0x2579, '|'},
+    {0x257A, '-'},
+    {0x257B, '|'},
+    {0x257C, '-'},
+    {0x257D, '|'},
+    {0x257E, '-'},
+    {0x257F, '|'},
+    {0x2580, '-'},
+    {0x2581, '_'},
+    {0x2582, '_'},
+    {0x2583, '.'},
+    {0x2584, '-'},
+    {0x2585, '='},
+    {0x2586, '='},
+    {0x2587, '#'},
+    {0x2588, '#'},
+    {0x2589, '#'},
+    {0x258A, '#'},
+    {0x258B, '='},
+    {0x258C, '='},
+    {0x258D, '-'},
+    {0x258E, '-'},
+    {0x258F, '|'},
+    {0x2590, '='},
+    {0x2591, '.'},
+    {0x2592, ':'},
+    {0x2593, '#'},
+    {0x2594, '-'},
+    {0x2595, '|'},
+    {0x2596, '#'},
+    {0x2597, '#'},
+    {0x2598, '#'},
+    {0x2599, '#'},
+    {0x259A, '#'},
+    {0x259B, '#'},
+    {0x259C, '#'},
+    {0x259D, '#'},
+    {0x259E, '#'},
+    {0x259F, '#'},
+    {0x25A0, '#'},
+    {0x25A1, 'o'},
+    {0x25A2, '*'},
+    {0x25A3, '*'},
+    {0x25A4, '*'},
+    {0x25A5, '*'},
+    {0x25A6, '*'},
+    {0x25A7, '*'},
+    {0x25A8, '*'},
+    {0x25A9, '*'},
+    {0x25AA, '#'},
+    {0x25AB, 'o'},
+    {0x25AC, '#'},
+    {0x25AD, 'o'},
+    {0x25AE, '#'},
+    {0x25AF, 'o'},
+    {0x25B0, '*'},
+    {0x25B1, '*'},
+    {0x25B2, '^'},
+    {0x25B3, '^'},
+    {0x25B4, '^'},
+    {0x25B5, '^'},
+    {0x25B6, '>'},
+    {0x25B7, '>'},
+    {0x25B8, '>'},
+    {0x25B9, '>'},
+    {0x25BA, '>'},
+    {0x25BB, '>'},
+    {0x25BC, 'v'},
+    {0x25BD, 'v'},
+    {0x25BE, 'v'},
+    {0x25BF, 'v'},
+    {0x25C0, '<'},
+    {0x25C1, '<'},
+    {0x25C2, '<'},
+    {0x25C3, '<'},
+    {0x25C4, '<'},
+    {0x25C5, '<'},
+    {0x25C6, '*'},
+    {0x25C7, '*'},
+    {0x25C8, '*'},
+    {0x25C9, '*'},
+    {0x25CA, '*'},
+    {0x25CB, 'o'},
+    {0x25CC, 'o'},
+    {0x25CD, '*'},
+    {0x25CE, '*'},
+    {0x25CF, '*'},
+    {0x25D0, 'o'},
+    {0x25D1, 'o'},
+    {0x25D2, 'o'},
+    {0x25D3, 'o'},
+    {0x25D4, '*'},
+    {0x25D5, '*'},
+    {0x25D6, '*'},
+    {0x25D7, '*'},
+    {0x25D8, '*'},
+    {0x25D9, '*'},
+    {0x25DA, '*'},
+    {0x25DB, '*'},
+    {0x25DC, '*'},
+    {0x25DD, '*'},
+    {0x25DE, '*'},
+    {0x25DF, '*'},
+    {0x25E0, '*'},
+    {0x25E1, '*'},
+    {0x25E2, '*'},
+    {0x25E3, '*'},
+    {0x25E4, '*'},
+    {0x25E5, '*'},
+    {0x25E6, 'o'},
+    {0x25E7, '*'},
+    {0x25E8, '*'},
+    {0x25E9, '*'},
+    {0x25EA, '*'},
+    {0x25EB, '*'},
+    {0x25EC, '*'},
+    {0x25ED, '*'},
+    {0x25EE, '*'},
+    {0x25EF, 'o'},
+    {0x25F0, '*'},
+    {0x25F1, '*'},
+    {0x25F2, '*'},
+    {0x25F3, '*'},
+    {0x25F4, '*'},
+    {0x25F5, '*'},
+    {0x25F6, '*'},
+    {0x25F7, '*'},
+    {0x25F8, '*'},
+    {0x25F9, '*'},
+    {0x25FA, '*'},
+    {0x25FB, '*'},
+    {0x25FC, '*'},
+    {0x25FF, '*'},
+    {0x2605, '*'},
+    {0x2606, '*'},
+    {0x2610, '.'},
+    {0x2611, 'x'},
+    {0x2612, 'x'},
+    {0x26A0, '!'},
+    {0x2713, '+'},
+    {0x2714, '+'},
+    {0x2716, 'x'},
+    {0x2717, 'x'},
+    {0x2718, 'x'},
+    {0x2726, '*'},
+    {0x2727, '*'},
+    {0x27F5, '<'},
+    {0x27F6, '>'},
+    {0x2B51, '*'},
+};
+
+#define ASCII_FOLD_COUNT 333

{flexablelib_speedups-3.3.0 → flexablelib_speedups-3.4.0}/flexablelib_speedups/_frames.c

@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include "_width_tables.h"
+#include "_ascii_table.h"
 
 #define ESC 0x1B
 #define BEL 0x07
@@ -682,6 +683,226 @@ fail:
     return NULL;
 }
 
+/* ------------------------------------------------------------------------
+ * ascii_fold(text) -> str
+ *
+ * Every symbol of flexablelib._frames.ASCII_FOLD replaced by its one-column
+ * ASCII stand-in; braille cells become ' ', '.', ':' or '#' by dot count.
+ */
+static int
+fold_cp(Py_UCS4 cp)
+{
+    size_t low = 0, high = ASCII_FOLD_COUNT;
+    if (cp < 0x80) return 0;
+    if (cp >= 0x2800 && cp <= 0x28FF) {
+        unsigned bits = (unsigned)(cp - 0x2800);
+        int dots = 0;
+        while (bits) { dots += (int)(bits & 1u); bits >>= 1; }
+        return dots == 0 ? ' ' : dots <= 2 ? '.' : dots <= 5 ? ':' : '#';
+    }
+    while (low < high) {
+        size_t mid = low + (high - low) / 2;
+        if (cp < ascii_fold_table[mid].cp) high = mid;
+        else if (cp > ascii_fold_table[mid].cp) low = mid + 1;
+        else return (unsigned char)ascii_fold_table[mid].ch;
+    }
+    return 0;
+}
+
+static PyObject *
+py_ascii_fold(PyObject *m, PyObject *text)
+{
+    int kind, okind;
+    const void *data;
+    void *odata;
+    Py_ssize_t length, i;
+    Py_UCS4 maxchar = 0;
+    int changed = 0;
+    PyObject *out;
+    (void)m;
+    if (unpack(text, &kind, &data, &length) < 0) return NULL;
+    if (PyUnicode_IS_ASCII(text)) return Py_NewRef(text);
+    for (i = 0; i < length; i++) {
+        Py_UCS4 cp = PyUnicode_READ(kind, data, i);
+        int c = fold_cp(cp);
+        if (c) { changed = 1; cp = (Py_UCS4)c; }
+        if (cp > maxchar) maxchar = cp;
+    }
+    if (!changed) return Py_NewRef(text);
+    out = PyUnicode_New(length, maxchar);
+    if (!out) return NULL;
+    okind = PyUnicode_KIND(out);
+    odata = PyUnicode_DATA(out);
+    for (i = 0; i < length; i++) {
+        Py_UCS4 cp = PyUnicode_READ(kind, data, i);
+        int c = fold_cp(cp);
+        PyUnicode_WRITE(okind, odata, i, c ? (Py_UCS4)c : cp);
+    }
+    return out;
+}
+
+/* ------------------------------------------------------------------------
+ * extract_marks(lines) -> (clean_lines, regions)
+ *
+ * Removes the zero-width hit-region marks (ESC ] 8970 ; id BEL opens,
+ * ESC ] 8970 ; BEL closes) and reports (id, row, x0, x1, depth) per span.
+ */
+static Py_ssize_t
+measure_range(int kind, const void *data, Py_ssize_t start, Py_ssize_t end)
+{
+    Py_ssize_t total = 0, pos = start;
+    int prev = 0;
+    while (pos < end) {
+        Py_UCS4 cp = PyUnicode_READ(kind, data, pos);
+        int w;
+        if (cp == ESC) {
+            Py_ssize_t skip = seq_len(kind, data, end, pos);
+            if (skip > 0) { pos += skip; continue; }
+        }
+        if (cp == VS16) {
+            if (prev == 1) { total += 1; prev = 2; }
+            pos++;
+            continue;
+        }
+        w = cp_width(cp);
+        total += w;
+        prev = w;
+        pos++;
+    }
+    return total;
+}
+
+static int
+is_mark(int kind, const void *data, Py_ssize_t length, Py_ssize_t pos)
+{
+    static const char tag[] = "\x1b]8970;";
+    Py_ssize_t k;
+    if (pos + 7 > length) return 0;
+    for (k = 0; k < 7; k++)
+        if (PyUnicode_READ(kind, data, pos + k) != (Py_UCS4)(unsigned char)tag[k])
+            return 0;
+    return 1;
+}
+
+#define MARK_DEPTH 64
+
+static int
+add_region(PyObject *regions, long ident, Py_ssize_t row, Py_ssize_t x0,
+           Py_ssize_t x1, Py_ssize_t depth)
+{
+    PyObject *t = Py_BuildValue("(lnnnn)", ident, row, x0, x1, depth);
+    int rc;
+    if (!t) return -1;
+    rc = PyList_Append(regions, t);
+    Py_DECREF(t);
+    return rc;
+}
+
+static PyObject *
+py_extract_marks(PyObject *m, PyObject *arg)
+{
+    PyObject *seq, *out = NULL, *regions = NULL, *result = NULL;
+    Py_ssize_t n, row;
+    long ids[MARK_DEPTH];
+    Py_ssize_t starts[MARK_DEPTH];
+    (void)m;
+    seq = PySequence_Fast(arg, "lines must be a sequence of str");
+    if (!seq) return NULL;
+    n = PySequence_Fast_GET_SIZE(seq);
+    out = PyList_New(n);
+    regions = PyList_New(0);
+    if (!out || !regions) goto done;
+    for (row = 0; row < n; row++) {
+        PyObject *line = PySequence_Fast_GET_ITEM(seq, row);
+        PyObject *parts = NULL, *joined, *empty;
+        int kind;
+        const void *data;
+        Py_ssize_t length, pos = 0, k, col = 0, depth = 0, overflow = 0;
+        int found = 0;
+        if (unpack(line, &kind, &data, &length) < 0) goto done;
+        for (k = 0; k < length; k++) {
+            if (PyUnicode_READ(kind, data, k) == ESC &&
+                is_mark(kind, data, length, k)) { found = 1; break; }
+        }
+        if (!found) {
+            PyList_SET_ITEM(out, row, Py_NewRef(line));
+            continue;
+        }
+        parts = PyList_New(0);
+        if (!parts) goto done;
+        for (;;) {
+            Py_ssize_t mk = -1, end = -1, q;
+            PyObject *seg;
+            for (k = pos; k < length; k++) {
+                if (PyUnicode_READ(kind, data, k) == ESC &&
+                    is_mark(kind, data, length, k)) { mk = k; break; }
+            }
+            q = mk < 0 ? length : mk;
+            seg = PyUnicode_Substring(line, pos, q);
+            if (!seg || PyList_Append(parts, seg) < 0) {
+                Py_XDECREF(seg); Py_DECREF(parts); goto done;
+            }
+            Py_DECREF(seg);
+            col += measure_range(kind, data, pos, q);
+            if (mk < 0) break;
+            for (k = mk; k < length; k++) {
+                if (PyUnicode_READ(kind, data, k) == BEL) { end = k; break; }
+            }
+            if (end < 0) break;
+            {
+                Py_ssize_t a = mk + 7, len = end - a;
+                int digits = len > 0 && len <= 9;
+                long ident = 0;
+                for (k = a; digits && k < end; k++) {
+                    Py_UCS4 c = PyUnicode_READ(kind, data, k);
+                    if (c < '0' || c > '9') digits = 0;
+                    else ident = ident * 10 + (long)(c - '0');
+                }
+                if (digits) {
+                    if (depth < MARK_DEPTH) {
+                        ids[depth] = ident;
+                        starts[depth] = col;
+                        depth++;
+                    } else {
+                        overflow++;
+                    }
+                } else if (len == 0) {
+                    if (overflow) {
+                        overflow--;
+                    } else if (depth > 0) {
+                        depth--;
+                        if (add_region(regions, ids[depth], row, starts[depth],
+                                       col, depth) < 0) {
+                            Py_DECREF(parts); goto done;
+                        }
+                    }
+                }
+            }
+            pos = end + 1;
+        }
+        while (depth > 0) {
+            depth--;
+            if (add_region(regions, ids[depth], row, starts[depth], col,
+                           depth) < 0) {
+                Py_DECREF(parts); goto done;
+            }
+        }
+        empty = PyUnicode_New(0, 0);
+        if (!empty) { Py_DECREF(parts); goto done; }
+        joined = PyUnicode_Join(empty, parts);
+        Py_DECREF(empty);
+        Py_DECREF(parts);
+        if (!joined) goto done;
+        PyList_SET_ITEM(out, row, joined);
+    }
+    result = PyTuple_Pack(2, out, regions);
+done:
+    Py_XDECREF(out);
+    Py_XDECREF(regions);
+    Py_DECREF(seq);
+    return result;
+}
+
 static PyMethodDef methods[] = {
     {"visible_width", py_visible_width, METH_O, "Visible terminal columns of a string."},
     {"strip_ansi", py_strip_ansi, METH_O, "The string without ANSI escapes."},
@@ -695,6 +916,9 @@ static PyMethodDef methods[] = {
      "border_grid(width, height, horiz, vert, glyphs) -> list of str"},
     {"changed_lines", py_changed_lines, METH_VARARGS, "changed_lines(old, new)"},
     {"render_diff", py_render_diff, METH_VARARGS, "render_diff(old, new) -> str"},
+    {"ascii_fold", py_ascii_fold, METH_O, "ascii_fold(text) -> str"},
+    {"extract_marks", py_extract_marks, METH_O,
+     "extract_marks(lines) -> (clean_lines, regions)"},
     {NULL, NULL, 0, NULL}
 };
 

{flexablelib_speedups-3.3.0 → flexablelib_speedups-3.4.0/flexablelib_speedups.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexablelib-speedups
-Version: 3.3.0
+Version: 3.4.0
 Summary: Optional C acceleration of terminal frame drawing for flexablelib (cut, pad, borders, frame diffs).
 Home-page: https://github.com/Opus-Perpetuus/flexablelib
 Author: Benjamin Ramirez

{flexablelib_speedups-3.3.0 → flexablelib_speedups-3.4.0}/flexablelib_speedups.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ MANIFEST.in
 README.md
 setup.py
 flexablelib_speedups/__init__.py
+flexablelib_speedups/_ascii_table.h
 flexablelib_speedups/_frames.c
 flexablelib_speedups/_width_tables.h
 flexablelib_speedups.egg-info/PKG-INFO

{flexablelib_speedups-3.3.0 → flexablelib_speedups-3.4.0}/setup.py

@@ -30,7 +30,8 @@ setup(
     packages=['flexablelib_speedups'],
     ext_modules=[Extension('flexablelib_speedups._frames',
                            sources=['flexablelib_speedups/_frames.c'],
-                           depends=['flexablelib_speedups/_width_tables.h'],
+                           depends=['flexablelib_speedups/_width_tables.h',
+                                    'flexablelib_speedups/_ascii_table.h'],
                            # No compiler: the install still succeeds and
                            # flexablelib keeps its pure-Python frame code.
                            optional=True)],