From 564ee8762111db2a7c6612296145f10d00ad9976 Mon Sep 17 00:00:00 2001 From: David Corbett Date: Fri, 6 Sep 2024 22:35:05 -0400 Subject: [PATCH] Rearrange non-Duployan private use characters --- sources/charsets.py | 16 ++++++++-------- sources/schema.py | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sources/charsets.py b/sources/charsets.py index 351ddd3..2f82909 100644 --- a/sources/charsets.py +++ b/sources/charsets.py @@ -533,15 +533,15 @@ def initialize_schemas(charset: Charset, light_line: float, stroke_gap: float) - Schema(0x2E40, double_hyphen, 1, Type.NON_JOINING, y_min=270), Schema(0xE000, bound, 1, Type.NON_JOINING, side_bearing=0), Schema(0xE001, cross_pommy, 1, Type.NON_JOINING, y_min=CROSS_DEPTH, y_max=CROSS_HEIGHT), - Schema(0xE002, converging_lines, 1, Type.NON_JOINING), Schema(0xE003, sacred_heart, 1, Type.NON_JOINING, y_min=CROSS_DEPTH, y_max=CROSS_HEIGHT), - Schema(0xE004, left_parenthesis_with_stroke, 1, Type.NON_JOINING, y_min=BRACKET_DEPTH, y_max=BRACKET_HEIGHT), - Schema(0xE005, right_parenthesis_with_stroke, 1, Type.NON_JOINING, y_min=BRACKET_DEPTH, y_max=BRACKET_HEIGHT), - Schema(0xE006, left_parenthesis_with_double_stroke, 1, Type.NON_JOINING, y_min=BRACKET_DEPTH, y_max=BRACKET_HEIGHT), - Schema(0xE007, right_parenthesis_with_double_stroke, 1, Type.NON_JOINING, y_min=BRACKET_DEPTH, y_max=BRACKET_HEIGHT), - Schema(0xE008, stenographic_semicolon, 1, Type.NON_JOINING), - Schema(0xE009, stenographic_question, 1, Type.NON_JOINING, y_max=CAP_HEIGHT), - Schema(0xE00A, ring_and_dot, 1, anchor=anchors.ABOVE), + Schema(0xE010, converging_lines, 1, Type.NON_JOINING), + Schema(0xE011, left_parenthesis_with_stroke, 1, Type.NON_JOINING, y_min=BRACKET_DEPTH, y_max=BRACKET_HEIGHT), + Schema(0xE012, right_parenthesis_with_stroke, 1, Type.NON_JOINING, y_min=BRACKET_DEPTH, y_max=BRACKET_HEIGHT), + Schema(0xE013, left_parenthesis_with_double_stroke, 1, Type.NON_JOINING, y_min=BRACKET_DEPTH, y_max=BRACKET_HEIGHT), + Schema(0xE014, right_parenthesis_with_double_stroke, 1, Type.NON_JOINING, y_min=BRACKET_DEPTH, y_max=BRACKET_HEIGHT), + Schema(0xE015, stenographic_semicolon, 1, Type.NON_JOINING), + Schema(0xE016, stenographic_question, 1, Type.NON_JOINING, y_max=CAP_HEIGHT), + Schema(0xE02A, ring_and_dot, 1, anchor=anchors.ABOVE), Schema(0xEC02, p_reverse, 1, Type.ORIENTING, maximum_tree_width=MAX_TREE_WIDTH), Schema(0xEC03, t_reverse, 1, Type.ORIENTING, maximum_tree_width=MAX_TREE_WIDTH), Schema(0xEC04, f_reverse, 1, Type.ORIENTING, maximum_tree_width=MAX_TREE_WIDTH), diff --git a/sources/schema.py b/sources/schema.py index 20371b8..77e54d2 100644 --- a/sources/schema.py +++ b/sources/schema.py @@ -263,16 +263,16 @@ class Schema: # Custom PUA names (r'^uniE000$', 'BOUND'), (r'^uniE001$', 'LATIN CROSS POMMEE'), - (r'^uniE002$', 'TWO LINES JOINED CONVERGING LEFT'), (r'^uniE003$', 'HEART WITH CROSS'), - (r'^uniE004$', 'LEFT PARENTHESIS WITH STROKE'), - (r'^uniE005$', 'RIGHT PARENTHESIS WITH STROKE'), - (r'^uniE006$', 'LEFT PARENTHESIS WITH DOUBLE STROKE'), - (r'^uniE007$', 'RIGHT PARENTHESIS WITH DOUBLE STROKE'), - (r'^uniE008$', 'STENOGRAPHIC SEMICOLON'), - (r'^uniE009$', 'STENOGRAPHIC QUESTION MARK'), - (r'^uniE00A$', 'COMBINING RING-AND-DOT ABOVE'), + (r'^uniE010$', 'TWO LINES JOINED CONVERGING LEFT'), + (r'^uniE011$', 'LEFT PARENTHESIS WITH STROKE'), + (r'^uniE012$', 'RIGHT PARENTHESIS WITH STROKE'), + (r'^uniE013$', 'LEFT PARENTHESIS WITH DOUBLE STROKE'), + (r'^uniE014$', 'RIGHT PARENTHESIS WITH DOUBLE STROKE'), + (r'^uniE015$', 'STENOGRAPHIC SEMICOLON'), + (r'^uniE016$', 'STENOGRAPHIC QUESTION MARK'), (r'^uniE021$', 'COMBINING DIGIT ONE ABOVE'), + (r'^uniE02A$', 'COMBINING RING-AND-DOT ABOVE'), (r'^uniE031$', 'COMBINING DIGIT ONE BELOW'), (r'^uniE033$', 'COMBINING DIGIT THREE BELOW'), (r'^uniE035$', 'COMBINING DIGIT FIVE BELOW'),