From 5bfb0b721c6c492ad61abf99bd36913cc83ec0b8 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jun 2022 02:56:41 -0600 Subject: [PATCH] Rename s/shape-complex/shaper/g --- src/Makefile.sources | 64 +++++++++---------- src/gen-indic-table.py | 2 +- src/gen-use-table.py | 2 +- src/gen-vowel-constraints.py | 2 +- src/harfbuzz.cc | 24 +++---- src/hb-ot-shape-normalize.cc | 2 +- src/hb-ot-shape.cc | 2 +- ...ack.hh => hb-ot-shaper-arabic-fallback.hh} | 2 +- ...hh => hb-ot-shaper-arabic-joining-list.hh} | 0 ...-table.hh => hb-ot-shaper-arabic-table.hh} | 0 ...1256.hh => hb-ot-shaper-arabic-win1256.hh} | 2 +- ...mplex-arabic.cc => hb-ot-shaper-arabic.cc} | 6 +- ...mplex-arabic.hh => hb-ot-shaper-arabic.hh} | 2 +- ...lex-default.cc => hb-ot-shaper-default.cc} | 2 +- ...mplex-hangul.cc => hb-ot-shaper-hangul.cc} | 2 +- ...mplex-hebrew.cc => hb-ot-shaper-hebrew.cc} | 2 +- ...chine.hh => hb-ot-shaper-indic-machine.hh} | 54 ++++++++-------- ...chine.rl => hb-ot-shaper-indic-machine.rl} | 0 ...c-table.cc => hb-ot-shaper-indic-table.cc} | 2 +- ...complex-indic.cc => hb-ot-shaper-indic.cc} | 6 +- ...complex-indic.hh => hb-ot-shaper-indic.hh} | 2 +- ...chine.hh => hb-ot-shaper-khmer-machine.hh} | 40 ++++++------ ...chine.rl => hb-ot-shaper-khmer-machine.rl} | 0 ...complex-khmer.cc => hb-ot-shaper-khmer.cc} | 4 +- ...complex-khmer.hh => hb-ot-shaper-khmer.hh} | 2 +- ...ine.hh => hb-ot-shaper-myanmar-machine.hh} | 40 ++++++------ ...ine.rl => hb-ot-shaper-myanmar-machine.rl} | 0 ...lex-myanmar.cc => hb-ot-shaper-myanmar.cc} | 4 +- ...lex-myanmar.hh => hb-ot-shaper-myanmar.hh} | 2 +- ...x-syllabic.cc => hb-ot-shaper-syllabic.cc} | 2 +- ...x-syllabic.hh => hb-ot-shaper-syllabic.hh} | 2 +- ...e-complex-thai.cc => hb-ot-shaper-thai.cc} | 2 +- ...machine.hh => hb-ot-shaper-use-machine.hh} | 54 ++++++++-------- ...machine.rl => hb-ot-shaper-use-machine.rl} | 2 +- ...use-table.hh => hb-ot-shaper-use-table.hh} | 2 +- ...ape-complex-use.cc => hb-ot-shaper-use.cc} | 10 +-- ...s.cc => hb-ot-shaper-vowel-constraints.cc} | 2 +- ...s.hh => hb-ot-shaper-vowel-constraints.hh} | 2 +- ...hb-ot-shape-complex.hh => hb-ot-shaper.hh} | 0 src/meson.build | 64 +++++++++---------- src/update-unicode-tables.make | 20 +++--- 41 files changed, 217 insertions(+), 217 deletions(-) rename src/{hb-ot-shape-complex-arabic-fallback.hh => hb-ot-shaper-arabic-fallback.hh} (99%) rename src/{hb-ot-shape-complex-arabic-joining-list.hh => hb-ot-shaper-arabic-joining-list.hh} (100%) rename src/{hb-ot-shape-complex-arabic-table.hh => hb-ot-shaper-arabic-table.hh} (100%) rename src/{hb-ot-shape-complex-arabic-win1256.hh => hb-ot-shaper-arabic-win1256.hh} (99%) rename src/{hb-ot-shape-complex-arabic.cc => hb-ot-shaper-arabic.cc} (99%) rename src/{hb-ot-shape-complex-arabic.hh => hb-ot-shaper-arabic.hh} (97%) rename src/{hb-ot-shape-complex-default.cc => hb-ot-shaper-default.cc} (98%) rename src/{hb-ot-shape-complex-hangul.cc => hb-ot-shaper-hangul.cc} (99%) rename src/{hb-ot-shape-complex-hebrew.cc => hb-ot-shaper-hebrew.cc} (99%) rename src/{hb-ot-shape-complex-indic-machine.hh => hb-ot-shaper-indic-machine.hh} (93%) rename src/{hb-ot-shape-complex-indic-machine.rl => hb-ot-shaper-indic-machine.rl} (100%) rename src/{hb-ot-shape-complex-indic-table.cc => hb-ot-shaper-indic-table.cc} (99%) rename src/{hb-ot-shape-complex-indic.cc => hb-ot-shaper-indic.cc} (99%) rename src/{hb-ot-shape-complex-indic.hh => hb-ot-shaper-indic.hh} (99%) rename src/{hb-ot-shape-complex-khmer-machine.hh => hb-ot-shaper-khmer-machine.hh} (91%) rename src/{hb-ot-shape-complex-khmer-machine.rl => hb-ot-shaper-khmer-machine.rl} (100%) rename src/{hb-ot-shape-complex-khmer.cc => hb-ot-shaper-khmer.cc} (99%) rename src/{hb-ot-shape-complex-khmer.hh => hb-ot-shaper-khmer.hh} (98%) rename src/{hb-ot-shape-complex-myanmar-machine.hh => hb-ot-shaper-myanmar-machine.hh} (93%) rename src/{hb-ot-shape-complex-myanmar-machine.rl => hb-ot-shaper-myanmar-machine.rl} (100%) rename src/{hb-ot-shape-complex-myanmar.cc => hb-ot-shaper-myanmar.cc} (98%) rename src/{hb-ot-shape-complex-myanmar.hh => hb-ot-shaper-myanmar.hh} (99%) rename src/{hb-ot-shape-complex-syllabic.cc => hb-ot-shaper-syllabic.cc} (98%) rename src/{hb-ot-shape-complex-syllabic.hh => hb-ot-shaper-syllabic.hh} (97%) rename src/{hb-ot-shape-complex-thai.cc => hb-ot-shaper-thai.cc} (99%) rename src/{hb-ot-shape-complex-use-machine.hh => hb-ot-shaper-use-machine.hh} (95%) rename src/{hb-ot-shape-complex-use-machine.rl => hb-ot-shaper-use-machine.rl} (99%) rename src/{hb-ot-shape-complex-use-table.hh => hb-ot-shaper-use-table.hh} (99%) rename src/{hb-ot-shape-complex-use.cc => hb-ot-shaper-use.cc} (98%) rename src/{hb-ot-shape-complex-vowel-constraints.cc => hb-ot-shaper-vowel-constraints.cc} (99%) rename src/{hb-ot-shape-complex-vowel-constraints.hh => hb-ot-shaper-vowel-constraints.hh} (97%) rename src/{hb-ot-shape-complex.hh => hb-ot-shaper.hh} (100%) diff --git a/src/Makefile.sources b/src/Makefile.sources index c2e0fee33..e4c31a668 100644 --- a/src/Makefile.sources +++ b/src/Makefile.sources @@ -131,30 +131,30 @@ HB_BASE_sources = \ hb-ot-os2-unicode-ranges.hh \ hb-ot-post-macroman.hh \ hb-ot-post-table.hh \ - hb-ot-shape-complex-arabic-fallback.hh \ - hb-ot-shape-complex-arabic-joining-list.hh \ - hb-ot-shape-complex-arabic-table.hh \ - hb-ot-shape-complex-arabic-win1256.hh \ - hb-ot-shape-complex-arabic.cc \ - hb-ot-shape-complex-arabic.hh \ - hb-ot-shape-complex-default.cc \ - hb-ot-shape-complex-hangul.cc \ - hb-ot-shape-complex-hebrew.cc \ - hb-ot-shape-complex-indic-table.cc \ - hb-ot-shape-complex-indic.cc \ - hb-ot-shape-complex-indic.hh \ - hb-ot-shape-complex-khmer.cc \ - hb-ot-shape-complex-khmer.hh \ - hb-ot-shape-complex-myanmar.cc \ - hb-ot-shape-complex-myanmar.hh \ - hb-ot-shape-complex-syllabic.cc \ - hb-ot-shape-complex-syllabic.hh \ - hb-ot-shape-complex-thai.cc \ - hb-ot-shape-complex-use-table.hh \ - hb-ot-shape-complex-use.cc \ - hb-ot-shape-complex-vowel-constraints.cc \ - hb-ot-shape-complex-vowel-constraints.hh \ - hb-ot-shape-complex.hh \ + hb-ot-shaper-arabic-fallback.hh \ + hb-ot-shaper-arabic-joining-list.hh \ + hb-ot-shaper-arabic-table.hh \ + hb-ot-shaper-arabic-win1256.hh \ + hb-ot-shaper-arabic.cc \ + hb-ot-shaper-arabic.hh \ + hb-ot-shaper-default.cc \ + hb-ot-shaper-hangul.cc \ + hb-ot-shaper-hebrew.cc \ + hb-ot-shaper-indic-table.cc \ + hb-ot-shaper-indic.cc \ + hb-ot-shaper-indic.hh \ + hb-ot-shaper-khmer.cc \ + hb-ot-shaper-khmer.hh \ + hb-ot-shaper-myanmar.cc \ + hb-ot-shaper-myanmar.hh \ + hb-ot-shaper-syllabic.cc \ + hb-ot-shaper-syllabic.hh \ + hb-ot-shaper-thai.cc \ + hb-ot-shaper-use-table.hh \ + hb-ot-shaper-use.cc \ + hb-ot-shaper-vowel-constraints.cc \ + hb-ot-shaper-vowel-constraints.hh \ + hb-ot-shaper.hh \ hb-ot-shape-fallback.cc \ hb-ot-shape-fallback.hh \ hb-ot-shape-normalize.cc \ @@ -203,19 +203,19 @@ HB_BASE_RAGEL_GENERATED_sources = \ hb-buffer-deserialize-json.hh \ hb-buffer-deserialize-text.hh \ hb-number-parser.hh \ - hb-ot-shape-complex-indic-machine.hh \ - hb-ot-shape-complex-khmer-machine.hh \ - hb-ot-shape-complex-myanmar-machine.hh \ - hb-ot-shape-complex-use-machine.hh \ + hb-ot-shaper-indic-machine.hh \ + hb-ot-shaper-khmer-machine.hh \ + hb-ot-shaper-myanmar-machine.hh \ + hb-ot-shaper-use-machine.hh \ $(NULL) HB_BASE_RAGEL_sources = \ hb-buffer-deserialize-json.rl \ hb-buffer-deserialize-text.rl \ hb-number-parser.rl \ - hb-ot-shape-complex-indic-machine.rl \ - hb-ot-shape-complex-khmer-machine.rl \ - hb-ot-shape-complex-myanmar-machine.rl \ - hb-ot-shape-complex-use-machine.rl \ + hb-ot-shaper-indic-machine.rl \ + hb-ot-shaper-khmer-machine.rl \ + hb-ot-shaper-myanmar-machine.rl \ + hb-ot-shaper-use-machine.rl \ $(NULL) HB_BASE_headers = \ diff --git a/src/gen-indic-table.py b/src/gen-indic-table.py index 367e55e27..7e38ee1d1 100755 --- a/src/gen-indic-table.py +++ b/src/gen-indic-table.py @@ -106,7 +106,7 @@ print ('#include "hb.hh"') print () print ('#ifndef HB_NO_OT_SHAPE') print () -print ('#include "hb-ot-shape-complex-indic.hh"') +print ('#include "hb-ot-shaper-indic.hh"') print () # Shorten values diff --git a/src/gen-use-table.py b/src/gen-use-table.py index d49a2454f..d741cd05b 100755 --- a/src/gen-use-table.py +++ b/src/gen-use-table.py @@ -417,7 +417,7 @@ print ("#define HB_OT_SHAPER_USE_TABLE_HH") print () print ('#include "hb.hh"') print () -print ('#include "hb-ot-shape-complex-use-machine.hh"') +print ('#include "hb-ot-shaper-use-machine.hh"') print () total = 0 diff --git a/src/gen-vowel-constraints.py b/src/gen-vowel-constraints.py index 1b984c406..3c1f6211e 100755 --- a/src/gen-vowel-constraints.py +++ b/src/gen-vowel-constraints.py @@ -166,7 +166,7 @@ print ('#include "hb.hh"') print () print ('#ifndef HB_NO_OT_SHAPE') print () -print ('#include "hb-ot-shape-complex-vowel-constraints.hh"') +print ('#include "hb-ot-shaper-vowel-constraints.hh"') print () print ('static void') print ('_output_dotted_circle (hb_buffer_t *buffer)') diff --git a/src/harfbuzz.cc b/src/harfbuzz.cc index b6a5957c4..05a864ae1 100644 --- a/src/harfbuzz.cc +++ b/src/harfbuzz.cc @@ -22,18 +22,18 @@ #include "hb-ot-meta.cc" #include "hb-ot-metrics.cc" #include "hb-ot-name.cc" -#include "hb-ot-shape-complex-arabic.cc" -#include "hb-ot-shape-complex-default.cc" -#include "hb-ot-shape-complex-hangul.cc" -#include "hb-ot-shape-complex-hebrew.cc" -#include "hb-ot-shape-complex-indic-table.cc" -#include "hb-ot-shape-complex-indic.cc" -#include "hb-ot-shape-complex-khmer.cc" -#include "hb-ot-shape-complex-myanmar.cc" -#include "hb-ot-shape-complex-syllabic.cc" -#include "hb-ot-shape-complex-thai.cc" -#include "hb-ot-shape-complex-use.cc" -#include "hb-ot-shape-complex-vowel-constraints.cc" +#include "hb-ot-shaper-arabic.cc" +#include "hb-ot-shaper-default.cc" +#include "hb-ot-shaper-hangul.cc" +#include "hb-ot-shaper-hebrew.cc" +#include "hb-ot-shaper-indic-table.cc" +#include "hb-ot-shaper-indic.cc" +#include "hb-ot-shaper-khmer.cc" +#include "hb-ot-shaper-myanmar.cc" +#include "hb-ot-shaper-syllabic.cc" +#include "hb-ot-shaper-thai.cc" +#include "hb-ot-shaper-use.cc" +#include "hb-ot-shaper-vowel-constraints.cc" #include "hb-ot-shape-fallback.cc" #include "hb-ot-shape-normalize.cc" #include "hb-ot-shape.cc" diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc index 2dc83f9d1..0d8204d36 100644 --- a/src/hb-ot-shape-normalize.cc +++ b/src/hb-ot-shape-normalize.cc @@ -29,7 +29,7 @@ #ifndef HB_NO_OT_SHAPE #include "hb-ot-shape-normalize.hh" -#include "hb-ot-shape-complex.hh" +#include "hb-ot-shaper.hh" #include "hb-ot-shape.hh" diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc index f0e664b5d..5ac701616 100644 --- a/src/hb-ot-shape.cc +++ b/src/hb-ot-shape.cc @@ -37,7 +37,7 @@ #include "hb-shaper-impl.hh" #include "hb-ot-shape.hh" -#include "hb-ot-shape-complex.hh" +#include "hb-ot-shaper.hh" #include "hb-ot-shape-fallback.hh" #include "hb-ot-shape-normalize.hh" diff --git a/src/hb-ot-shape-complex-arabic-fallback.hh b/src/hb-ot-shaper-arabic-fallback.hh similarity index 99% rename from src/hb-ot-shape-complex-arabic-fallback.hh rename to src/hb-ot-shaper-arabic-fallback.hh index 2fbef47f6..875825c96 100644 --- a/src/hb-ot-shape-complex-arabic-fallback.hh +++ b/src/hb-ot-shaper-arabic-fallback.hh @@ -201,7 +201,7 @@ struct arabic_fallback_plan_t #endif #ifdef HB_WITH_WIN1256 -#include "hb-ot-shape-complex-arabic-win1256.hh" +#include "hb-ot-shaper-arabic-win1256.hh" #endif struct ManifestLookup diff --git a/src/hb-ot-shape-complex-arabic-joining-list.hh b/src/hb-ot-shaper-arabic-joining-list.hh similarity index 100% rename from src/hb-ot-shape-complex-arabic-joining-list.hh rename to src/hb-ot-shaper-arabic-joining-list.hh diff --git a/src/hb-ot-shape-complex-arabic-table.hh b/src/hb-ot-shaper-arabic-table.hh similarity index 100% rename from src/hb-ot-shape-complex-arabic-table.hh rename to src/hb-ot-shaper-arabic-table.hh diff --git a/src/hb-ot-shape-complex-arabic-win1256.hh b/src/hb-ot-shaper-arabic-win1256.hh similarity index 99% rename from src/hb-ot-shape-complex-arabic-win1256.hh rename to src/hb-ot-shaper-arabic-win1256.hh index 1a01da5c4..b8d481c81 100644 --- a/src/hb-ot-shape-complex-arabic-win1256.hh +++ b/src/hb-ot-shaper-arabic-win1256.hh @@ -342,7 +342,7 @@ OT_TABLE_END #include "hb.hh" /* Make check-includes.sh happy. */ #endif #ifdef OT_MEASURE -#include "hb-ot-shape-complex-arabic-win1256.hh" +#include "hb-ot-shaper-arabic-win1256.hh" #endif #define HB_OT_SHAPER_ARABIC_WIN1256_HH diff --git a/src/hb-ot-shape-complex-arabic.cc b/src/hb-ot-shaper-arabic.cc similarity index 99% rename from src/hb-ot-shape-complex-arabic.cc rename to src/hb-ot-shaper-arabic.cc index f30987c2e..b42d309a1 100644 --- a/src/hb-ot-shape-complex-arabic.cc +++ b/src/hb-ot-shaper-arabic.cc @@ -28,7 +28,7 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex-arabic.hh" +#include "hb-ot-shaper-arabic.hh" #include "hb-ot-shape.hh" @@ -81,7 +81,7 @@ enum hb_arabic_joining_type_t { JOINING_TYPE_X = 8 /* means: use general-category to choose between U or T. */ }; -#include "hb-ot-shape-complex-arabic-table.hh" +#include "hb-ot-shaper-arabic-table.hh" static unsigned int get_joining_type (hb_codepoint_t u, hb_unicode_general_category_t gen_cat) { @@ -240,7 +240,7 @@ collect_features_arabic (hb_ot_shape_planner_t *plan) map->enable_feature (HB_TAG('m','s','e','t')); } -#include "hb-ot-shape-complex-arabic-fallback.hh" +#include "hb-ot-shaper-arabic-fallback.hh" struct arabic_shape_plan_t { diff --git a/src/hb-ot-shape-complex-arabic.hh b/src/hb-ot-shaper-arabic.hh similarity index 97% rename from src/hb-ot-shape-complex-arabic.hh rename to src/hb-ot-shaper-arabic.hh index ed58bcf09..a025b1a39 100644 --- a/src/hb-ot-shape-complex-arabic.hh +++ b/src/hb-ot-shaper-arabic.hh @@ -31,7 +31,7 @@ #include "hb.hh" -#include "hb-ot-shape-complex.hh" +#include "hb-ot-shaper.hh" struct arabic_shape_plan_t; diff --git a/src/hb-ot-shape-complex-default.cc b/src/hb-ot-shaper-default.cc similarity index 98% rename from src/hb-ot-shape-complex-default.cc rename to src/hb-ot-shaper-default.cc index aa089ed33..25716aa81 100644 --- a/src/hb-ot-shape-complex-default.cc +++ b/src/hb-ot-shaper-default.cc @@ -28,7 +28,7 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex.hh" +#include "hb-ot-shaper.hh" const hb_ot_shaper_t _hb_ot_shaper_default = diff --git a/src/hb-ot-shape-complex-hangul.cc b/src/hb-ot-shaper-hangul.cc similarity index 99% rename from src/hb-ot-shape-complex-hangul.cc rename to src/hb-ot-shaper-hangul.cc index 0fc32b42e..aa507c75c 100644 --- a/src/hb-ot-shape-complex-hangul.cc +++ b/src/hb-ot-shaper-hangul.cc @@ -28,7 +28,7 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex.hh" +#include "hb-ot-shaper.hh" /* Hangul shaper */ diff --git a/src/hb-ot-shape-complex-hebrew.cc b/src/hb-ot-shaper-hebrew.cc similarity index 99% rename from src/hb-ot-shape-complex-hebrew.cc rename to src/hb-ot-shaper-hebrew.cc index 34f0f82c8..f3b6cde17 100644 --- a/src/hb-ot-shape-complex-hebrew.cc +++ b/src/hb-ot-shaper-hebrew.cc @@ -28,7 +28,7 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex.hh" +#include "hb-ot-shaper.hh" static bool diff --git a/src/hb-ot-shape-complex-indic-machine.hh b/src/hb-ot-shaper-indic-machine.hh similarity index 93% rename from src/hb-ot-shape-complex-indic-machine.hh rename to src/hb-ot-shaper-indic-machine.hh index 8ea5d5d5f..8012ffd06 100644 --- a/src/hb-ot-shape-complex-indic-machine.hh +++ b/src/hb-ot-shaper-indic-machine.hh @@ -1,5 +1,5 @@ -#line 1 "hb-ot-shape-complex-indic-machine.rl" +#line 1 "hb-ot-shaper-indic-machine.rl" /* * Copyright © 2011,2012 Google, Inc. * @@ -41,7 +41,7 @@ enum indic_syllable_type_t { }; -#line 45 "hb-ot-shape-complex-indic-machine.hh" +#line 45 "hb-ot-shaper-indic-machine.hh" #define indic_syllable_machine_ex_A 10u #define indic_syllable_machine_ex_C 1u #define indic_syllable_machine_ex_CM 17u @@ -61,7 +61,7 @@ enum indic_syllable_type_t { #define indic_syllable_machine_ex_ZWNJ 5u -#line 65 "hb-ot-shape-complex-indic-machine.hh" +#line 65 "hb-ot-shaper-indic-machine.hh" static const unsigned char _indic_syllable_machine_trans_keys[] = { 8u, 8u, 4u, 8u, 5u, 7u, 5u, 8u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 4u, 13u, 4u, 8u, 8u, 8u, 5u, 7u, 5u, 8u, 4u, 8u, 6u, 6u, 16u, 16u, @@ -413,11 +413,11 @@ static const int indic_syllable_machine_error = -1; static const int indic_syllable_machine_en_main = 39; -#line 46 "hb-ot-shape-complex-indic-machine.rl" +#line 46 "hb-ot-shaper-indic-machine.rl" -#line 102 "hb-ot-shape-complex-indic-machine.rl" +#line 102 "hb-ot-shaper-indic-machine.rl" #define found_syllable(syllable_type) \ @@ -436,7 +436,7 @@ find_syllables_indic (hb_buffer_t *buffer) int cs; hb_glyph_info_t *info = buffer->info; -#line 440 "hb-ot-shape-complex-indic-machine.hh" +#line 440 "hb-ot-shaper-indic-machine.hh" { cs = indic_syllable_machine_start; ts = 0; @@ -444,7 +444,7 @@ find_syllables_indic (hb_buffer_t *buffer) act = 0; } -#line 122 "hb-ot-shape-complex-indic-machine.rl" +#line 122 "hb-ot-shaper-indic-machine.rl" p = 0; @@ -452,7 +452,7 @@ find_syllables_indic (hb_buffer_t *buffer) unsigned int syllable_serial = 1; -#line 456 "hb-ot-shape-complex-indic-machine.hh" +#line 456 "hb-ot-shaper-indic-machine.hh" { int _slen; int _trans; @@ -466,7 +466,7 @@ _resume: #line 1 "NONE" {ts = p;} break; -#line 470 "hb-ot-shape-complex-indic-machine.hh" +#line 470 "hb-ot-shaper-indic-machine.hh" } _keys = _indic_syllable_machine_trans_keys + (cs<<1); @@ -489,51 +489,51 @@ _eof_trans: {te = p+1;} break; case 11: -#line 98 "hb-ot-shape-complex-indic-machine.rl" +#line 98 "hb-ot-shaper-indic-machine.rl" {te = p+1;{ found_syllable (indic_non_indic_cluster); }} break; case 13: -#line 93 "hb-ot-shape-complex-indic-machine.rl" +#line 93 "hb-ot-shaper-indic-machine.rl" {te = p;p--;{ found_syllable (indic_consonant_syllable); }} break; case 14: -#line 94 "hb-ot-shape-complex-indic-machine.rl" +#line 94 "hb-ot-shaper-indic-machine.rl" {te = p;p--;{ found_syllable (indic_vowel_syllable); }} break; case 17: -#line 95 "hb-ot-shape-complex-indic-machine.rl" +#line 95 "hb-ot-shaper-indic-machine.rl" {te = p;p--;{ found_syllable (indic_standalone_cluster); }} break; case 19: -#line 96 "hb-ot-shape-complex-indic-machine.rl" +#line 96 "hb-ot-shaper-indic-machine.rl" {te = p;p--;{ found_syllable (indic_symbol_cluster); }} break; case 15: -#line 97 "hb-ot-shape-complex-indic-machine.rl" +#line 97 "hb-ot-shaper-indic-machine.rl" {te = p;p--;{ found_syllable (indic_broken_cluster); }} break; case 16: -#line 98 "hb-ot-shape-complex-indic-machine.rl" +#line 98 "hb-ot-shaper-indic-machine.rl" {te = p;p--;{ found_syllable (indic_non_indic_cluster); }} break; case 1: -#line 93 "hb-ot-shape-complex-indic-machine.rl" +#line 93 "hb-ot-shaper-indic-machine.rl" {{p = ((te))-1;}{ found_syllable (indic_consonant_syllable); }} break; case 3: -#line 94 "hb-ot-shape-complex-indic-machine.rl" +#line 94 "hb-ot-shaper-indic-machine.rl" {{p = ((te))-1;}{ found_syllable (indic_vowel_syllable); }} break; case 7: -#line 95 "hb-ot-shape-complex-indic-machine.rl" +#line 95 "hb-ot-shaper-indic-machine.rl" {{p = ((te))-1;}{ found_syllable (indic_standalone_cluster); }} break; case 8: -#line 96 "hb-ot-shape-complex-indic-machine.rl" +#line 96 "hb-ot-shaper-indic-machine.rl" {{p = ((te))-1;}{ found_syllable (indic_symbol_cluster); }} break; case 4: -#line 97 "hb-ot-shape-complex-indic-machine.rl" +#line 97 "hb-ot-shaper-indic-machine.rl" {{p = ((te))-1;}{ found_syllable (indic_broken_cluster); }} break; case 6: @@ -554,22 +554,22 @@ _eof_trans: case 18: #line 1 "NONE" {te = p+1;} -#line 93 "hb-ot-shape-complex-indic-machine.rl" +#line 93 "hb-ot-shaper-indic-machine.rl" {act = 1;} break; case 5: #line 1 "NONE" {te = p+1;} -#line 97 "hb-ot-shape-complex-indic-machine.rl" +#line 97 "hb-ot-shaper-indic-machine.rl" {act = 5;} break; case 12: #line 1 "NONE" {te = p+1;} -#line 98 "hb-ot-shape-complex-indic-machine.rl" +#line 98 "hb-ot-shaper-indic-machine.rl" {act = 6;} break; -#line 573 "hb-ot-shape-complex-indic-machine.hh" +#line 573 "hb-ot-shaper-indic-machine.hh" } _again: @@ -578,7 +578,7 @@ _again: #line 1 "NONE" {ts = 0;} break; -#line 582 "hb-ot-shape-complex-indic-machine.hh" +#line 582 "hb-ot-shaper-indic-machine.hh" } if ( ++p != pe ) @@ -594,7 +594,7 @@ _again: } -#line 130 "hb-ot-shape-complex-indic-machine.rl" +#line 130 "hb-ot-shaper-indic-machine.rl" } diff --git a/src/hb-ot-shape-complex-indic-machine.rl b/src/hb-ot-shaper-indic-machine.rl similarity index 100% rename from src/hb-ot-shape-complex-indic-machine.rl rename to src/hb-ot-shaper-indic-machine.rl diff --git a/src/hb-ot-shape-complex-indic-table.cc b/src/hb-ot-shaper-indic-table.cc similarity index 99% rename from src/hb-ot-shape-complex-indic-table.cc rename to src/hb-ot-shaper-indic-table.cc index 326aa9f96..213523745 100644 --- a/src/hb-ot-shape-complex-indic-table.cc +++ b/src/hb-ot-shaper-indic-table.cc @@ -18,7 +18,7 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex-indic.hh" +#include "hb-ot-shaper-indic.hh" #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-macros" diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shaper-indic.cc similarity index 99% rename from src/hb-ot-shape-complex-indic.cc rename to src/hb-ot-shaper-indic.cc index eb9e0da58..2c8f7c5f1 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shaper-indic.cc @@ -28,9 +28,9 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex-indic.hh" -#include "hb-ot-shape-complex-indic-machine.hh" -#include "hb-ot-shape-complex-vowel-constraints.hh" +#include "hb-ot-shaper-indic.hh" +#include "hb-ot-shaper-indic-machine.hh" +#include "hb-ot-shaper-vowel-constraints.hh" #include "hb-ot-layout.hh" diff --git a/src/hb-ot-shape-complex-indic.hh b/src/hb-ot-shaper-indic.hh similarity index 99% rename from src/hb-ot-shape-complex-indic.hh rename to src/hb-ot-shaper-indic.hh index 719d92a39..f58cc6f56 100644 --- a/src/hb-ot-shape-complex-indic.hh +++ b/src/hb-ot-shaper-indic.hh @@ -29,7 +29,7 @@ #include "hb.hh" -#include "hb-ot-shape-complex-syllabic.hh" +#include "hb-ot-shaper-syllabic.hh" /* buffer var allocations */ diff --git a/src/hb-ot-shape-complex-khmer-machine.hh b/src/hb-ot-shaper-khmer-machine.hh similarity index 91% rename from src/hb-ot-shape-complex-khmer-machine.hh rename to src/hb-ot-shaper-khmer-machine.hh index e7788a5a4..fc110145d 100644 --- a/src/hb-ot-shape-complex-khmer-machine.hh +++ b/src/hb-ot-shaper-khmer-machine.hh @@ -1,5 +1,5 @@ -#line 1 "hb-ot-shape-complex-khmer-machine.rl" +#line 1 "hb-ot-shaper-khmer-machine.rl" /* * Copyright © 2011,2012 Google, Inc. * @@ -38,7 +38,7 @@ enum khmer_syllable_type_t { }; -#line 42 "hb-ot-shape-complex-khmer-machine.hh" +#line 42 "hb-ot-shaper-khmer-machine.hh" #define khmer_syllable_machine_ex_C 1u #define khmer_syllable_machine_ex_Coeng 14u #define khmer_syllable_machine_ex_DOTTEDCIRCLE 12u @@ -56,7 +56,7 @@ enum khmer_syllable_type_t { #define khmer_syllable_machine_ex_ZWNJ 5u -#line 60 "hb-ot-shape-complex-khmer-machine.hh" +#line 60 "hb-ot-shaper-khmer-machine.hh" static const unsigned char _khmer_syllable_machine_trans_keys[] = { 5u, 26u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, 5u, 21u, 5u, 26u, 5u, 21u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, @@ -239,11 +239,11 @@ static const int khmer_syllable_machine_error = -1; static const int khmer_syllable_machine_en_main = 20; -#line 43 "hb-ot-shape-complex-khmer-machine.rl" +#line 43 "hb-ot-shaper-khmer-machine.rl" -#line 86 "hb-ot-shape-complex-khmer-machine.rl" +#line 86 "hb-ot-shaper-khmer-machine.rl" #define found_syllable(syllable_type) \ @@ -262,7 +262,7 @@ find_syllables_khmer (hb_buffer_t *buffer) int cs; hb_glyph_info_t *info = buffer->info; -#line 266 "hb-ot-shape-complex-khmer-machine.hh" +#line 266 "hb-ot-shaper-khmer-machine.hh" { cs = khmer_syllable_machine_start; ts = 0; @@ -270,7 +270,7 @@ find_syllables_khmer (hb_buffer_t *buffer) act = 0; } -#line 106 "hb-ot-shape-complex-khmer-machine.rl" +#line 106 "hb-ot-shaper-khmer-machine.rl" p = 0; @@ -278,7 +278,7 @@ find_syllables_khmer (hb_buffer_t *buffer) unsigned int syllable_serial = 1; -#line 282 "hb-ot-shape-complex-khmer-machine.hh" +#line 282 "hb-ot-shaper-khmer-machine.hh" { int _slen; int _trans; @@ -292,7 +292,7 @@ _resume: #line 1 "NONE" {ts = p;} break; -#line 296 "hb-ot-shape-complex-khmer-machine.hh" +#line 296 "hb-ot-shaper-khmer-machine.hh" } _keys = _khmer_syllable_machine_trans_keys + (cs<<1); @@ -315,27 +315,27 @@ _eof_trans: {te = p+1;} break; case 8: -#line 82 "hb-ot-shape-complex-khmer-machine.rl" +#line 82 "hb-ot-shaper-khmer-machine.rl" {te = p+1;{ found_syllable (khmer_non_khmer_cluster); }} break; case 10: -#line 80 "hb-ot-shape-complex-khmer-machine.rl" +#line 80 "hb-ot-shaper-khmer-machine.rl" {te = p;p--;{ found_syllable (khmer_consonant_syllable); }} break; case 12: -#line 81 "hb-ot-shape-complex-khmer-machine.rl" +#line 81 "hb-ot-shaper-khmer-machine.rl" {te = p;p--;{ found_syllable (khmer_broken_cluster); }} break; case 11: -#line 82 "hb-ot-shape-complex-khmer-machine.rl" +#line 82 "hb-ot-shaper-khmer-machine.rl" {te = p;p--;{ found_syllable (khmer_non_khmer_cluster); }} break; case 1: -#line 80 "hb-ot-shape-complex-khmer-machine.rl" +#line 80 "hb-ot-shaper-khmer-machine.rl" {{p = ((te))-1;}{ found_syllable (khmer_consonant_syllable); }} break; case 5: -#line 81 "hb-ot-shape-complex-khmer-machine.rl" +#line 81 "hb-ot-shaper-khmer-machine.rl" {{p = ((te))-1;}{ found_syllable (khmer_broken_cluster); }} break; case 3: @@ -353,16 +353,16 @@ _eof_trans: case 4: #line 1 "NONE" {te = p+1;} -#line 81 "hb-ot-shape-complex-khmer-machine.rl" +#line 81 "hb-ot-shaper-khmer-machine.rl" {act = 2;} break; case 9: #line 1 "NONE" {te = p+1;} -#line 82 "hb-ot-shape-complex-khmer-machine.rl" +#line 82 "hb-ot-shaper-khmer-machine.rl" {act = 3;} break; -#line 366 "hb-ot-shape-complex-khmer-machine.hh" +#line 366 "hb-ot-shaper-khmer-machine.hh" } _again: @@ -371,7 +371,7 @@ _again: #line 1 "NONE" {ts = 0;} break; -#line 375 "hb-ot-shape-complex-khmer-machine.hh" +#line 375 "hb-ot-shaper-khmer-machine.hh" } if ( ++p != pe ) @@ -387,7 +387,7 @@ _again: } -#line 114 "hb-ot-shape-complex-khmer-machine.rl" +#line 114 "hb-ot-shaper-khmer-machine.rl" } diff --git a/src/hb-ot-shape-complex-khmer-machine.rl b/src/hb-ot-shaper-khmer-machine.rl similarity index 100% rename from src/hb-ot-shape-complex-khmer-machine.rl rename to src/hb-ot-shaper-khmer-machine.rl diff --git a/src/hb-ot-shape-complex-khmer.cc b/src/hb-ot-shaper-khmer.cc similarity index 99% rename from src/hb-ot-shape-complex-khmer.cc rename to src/hb-ot-shaper-khmer.cc index 0f58d3bc2..7aca1565b 100644 --- a/src/hb-ot-shape-complex-khmer.cc +++ b/src/hb-ot-shaper-khmer.cc @@ -28,8 +28,8 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex-khmer.hh" -#include "hb-ot-shape-complex-khmer-machine.hh" +#include "hb-ot-shaper-khmer.hh" +#include "hb-ot-shaper-khmer-machine.hh" #include "hb-ot-layout.hh" diff --git a/src/hb-ot-shape-complex-khmer.hh b/src/hb-ot-shaper-khmer.hh similarity index 98% rename from src/hb-ot-shape-complex-khmer.hh rename to src/hb-ot-shaper-khmer.hh index e3fff829e..e3d0d3215 100644 --- a/src/hb-ot-shape-complex-khmer.hh +++ b/src/hb-ot-shaper-khmer.hh @@ -29,7 +29,7 @@ #include "hb.hh" -#include "hb-ot-shape-complex-indic.hh" +#include "hb-ot-shaper-indic.hh" /* buffer var allocations */ diff --git a/src/hb-ot-shape-complex-myanmar-machine.hh b/src/hb-ot-shaper-myanmar-machine.hh similarity index 93% rename from src/hb-ot-shape-complex-myanmar-machine.hh rename to src/hb-ot-shaper-myanmar-machine.hh index 52a6e9415..41d4ecbac 100644 --- a/src/hb-ot-shape-complex-myanmar-machine.hh +++ b/src/hb-ot-shaper-myanmar-machine.hh @@ -1,5 +1,5 @@ -#line 1 "hb-ot-shape-complex-myanmar-machine.rl" +#line 1 "hb-ot-shaper-myanmar-machine.rl" /* * Copyright © 2011,2012 Google, Inc. * @@ -39,7 +39,7 @@ enum myanmar_syllable_type_t { }; -#line 43 "hb-ot-shape-complex-myanmar-machine.hh" +#line 43 "hb-ot-shaper-myanmar-machine.hh" #define myanmar_syllable_machine_ex_A 10u #define myanmar_syllable_machine_ex_As 18u #define myanmar_syllable_machine_ex_C 1u @@ -68,7 +68,7 @@ enum myanmar_syllable_type_t { #define myanmar_syllable_machine_ex_ZWNJ 5u -#line 72 "hb-ot-shape-complex-myanmar-machine.hh" +#line 72 "hb-ot-shaper-myanmar-machine.hh" static const unsigned char _myanmar_syllable_machine_trans_keys[] = { 1u, 33u, 3u, 33u, 5u, 29u, 5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 3u, 33u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 33u, 1u, 16u, 3u, 33u, 3u, 33u, @@ -355,11 +355,11 @@ static const int myanmar_syllable_machine_error = -1; static const int myanmar_syllable_machine_en_main = 0; -#line 44 "hb-ot-shape-complex-myanmar-machine.rl" +#line 44 "hb-ot-shaper-myanmar-machine.rl" -#line 102 "hb-ot-shape-complex-myanmar-machine.rl" +#line 102 "hb-ot-shaper-myanmar-machine.rl" #define found_syllable(syllable_type) \ @@ -378,7 +378,7 @@ find_syllables_myanmar (hb_buffer_t *buffer) int cs; hb_glyph_info_t *info = buffer->info; -#line 382 "hb-ot-shape-complex-myanmar-machine.hh" +#line 382 "hb-ot-shaper-myanmar-machine.hh" { cs = myanmar_syllable_machine_start; ts = 0; @@ -386,7 +386,7 @@ find_syllables_myanmar (hb_buffer_t *buffer) act = 0; } -#line 122 "hb-ot-shape-complex-myanmar-machine.rl" +#line 122 "hb-ot-shaper-myanmar-machine.rl" p = 0; @@ -394,7 +394,7 @@ find_syllables_myanmar (hb_buffer_t *buffer) unsigned int syllable_serial = 1; -#line 398 "hb-ot-shape-complex-myanmar-machine.hh" +#line 398 "hb-ot-shaper-myanmar-machine.hh" { int _slen; int _trans; @@ -408,7 +408,7 @@ _resume: #line 1 "NONE" {ts = p;} break; -#line 412 "hb-ot-shape-complex-myanmar-machine.hh" +#line 412 "hb-ot-shaper-myanmar-machine.hh" } _keys = _myanmar_syllable_machine_trans_keys + (cs<<1); @@ -427,38 +427,38 @@ _eof_trans: switch ( _myanmar_syllable_machine_trans_actions[_trans] ) { case 6: -#line 94 "hb-ot-shape-complex-myanmar-machine.rl" +#line 94 "hb-ot-shaper-myanmar-machine.rl" {te = p+1;{ found_syllable (myanmar_consonant_syllable); }} break; case 4: -#line 95 "hb-ot-shape-complex-myanmar-machine.rl" +#line 95 "hb-ot-shaper-myanmar-machine.rl" {te = p+1;{ found_syllable (myanmar_non_myanmar_cluster); }} break; case 10: -#line 96 "hb-ot-shape-complex-myanmar-machine.rl" +#line 96 "hb-ot-shaper-myanmar-machine.rl" {te = p+1;{ found_syllable (myanmar_punctuation_cluster); }} break; case 8: -#line 97 "hb-ot-shape-complex-myanmar-machine.rl" +#line 97 "hb-ot-shaper-myanmar-machine.rl" {te = p+1;{ found_syllable (myanmar_broken_cluster); }} break; case 3: -#line 98 "hb-ot-shape-complex-myanmar-machine.rl" +#line 98 "hb-ot-shaper-myanmar-machine.rl" {te = p+1;{ found_syllable (myanmar_non_myanmar_cluster); }} break; case 5: -#line 94 "hb-ot-shape-complex-myanmar-machine.rl" +#line 94 "hb-ot-shaper-myanmar-machine.rl" {te = p;p--;{ found_syllable (myanmar_consonant_syllable); }} break; case 7: -#line 97 "hb-ot-shape-complex-myanmar-machine.rl" +#line 97 "hb-ot-shaper-myanmar-machine.rl" {te = p;p--;{ found_syllable (myanmar_broken_cluster); }} break; case 9: -#line 98 "hb-ot-shape-complex-myanmar-machine.rl" +#line 98 "hb-ot-shaper-myanmar-machine.rl" {te = p;p--;{ found_syllable (myanmar_non_myanmar_cluster); }} break; -#line 462 "hb-ot-shape-complex-myanmar-machine.hh" +#line 462 "hb-ot-shaper-myanmar-machine.hh" } _again: @@ -467,7 +467,7 @@ _again: #line 1 "NONE" {ts = 0;} break; -#line 471 "hb-ot-shape-complex-myanmar-machine.hh" +#line 471 "hb-ot-shaper-myanmar-machine.hh" } if ( ++p != pe ) @@ -483,7 +483,7 @@ _again: } -#line 130 "hb-ot-shape-complex-myanmar-machine.rl" +#line 130 "hb-ot-shaper-myanmar-machine.rl" } diff --git a/src/hb-ot-shape-complex-myanmar-machine.rl b/src/hb-ot-shaper-myanmar-machine.rl similarity index 100% rename from src/hb-ot-shape-complex-myanmar-machine.rl rename to src/hb-ot-shaper-myanmar-machine.rl diff --git a/src/hb-ot-shape-complex-myanmar.cc b/src/hb-ot-shaper-myanmar.cc similarity index 98% rename from src/hb-ot-shape-complex-myanmar.cc rename to src/hb-ot-shaper-myanmar.cc index e0e46be3c..8cc373a73 100644 --- a/src/hb-ot-shape-complex-myanmar.cc +++ b/src/hb-ot-shaper-myanmar.cc @@ -28,8 +28,8 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex-myanmar.hh" -#include "hb-ot-shape-complex-myanmar-machine.hh" +#include "hb-ot-shaper-myanmar.hh" +#include "hb-ot-shaper-myanmar-machine.hh" /* diff --git a/src/hb-ot-shape-complex-myanmar.hh b/src/hb-ot-shaper-myanmar.hh similarity index 99% rename from src/hb-ot-shape-complex-myanmar.hh rename to src/hb-ot-shaper-myanmar.hh index b23b570d9..5b22eb528 100644 --- a/src/hb-ot-shape-complex-myanmar.hh +++ b/src/hb-ot-shaper-myanmar.hh @@ -29,7 +29,7 @@ #include "hb.hh" -#include "hb-ot-shape-complex-indic.hh" +#include "hb-ot-shaper-indic.hh" /* buffer var allocations */ diff --git a/src/hb-ot-shape-complex-syllabic.cc b/src/hb-ot-shaper-syllabic.cc similarity index 98% rename from src/hb-ot-shape-complex-syllabic.cc rename to src/hb-ot-shaper-syllabic.cc index 11bf119ab..686015d79 100644 --- a/src/hb-ot-shape-complex-syllabic.cc +++ b/src/hb-ot-shaper-syllabic.cc @@ -26,7 +26,7 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex-syllabic.hh" +#include "hb-ot-shaper-syllabic.hh" void diff --git a/src/hb-ot-shape-complex-syllabic.hh b/src/hb-ot-shaper-syllabic.hh similarity index 97% rename from src/hb-ot-shape-complex-syllabic.hh rename to src/hb-ot-shaper-syllabic.hh index e8759ed2b..a250967a7 100644 --- a/src/hb-ot-shape-complex-syllabic.hh +++ b/src/hb-ot-shaper-syllabic.hh @@ -27,7 +27,7 @@ #include "hb.hh" -#include "hb-ot-shape-complex.hh" +#include "hb-ot-shaper.hh" HB_INTERNAL void diff --git a/src/hb-ot-shape-complex-thai.cc b/src/hb-ot-shaper-thai.cc similarity index 99% rename from src/hb-ot-shape-complex-thai.cc rename to src/hb-ot-shaper-thai.cc index 6c745c735..e8410d2c3 100644 --- a/src/hb-ot-shape-complex-thai.cc +++ b/src/hb-ot-shaper-thai.cc @@ -28,7 +28,7 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex.hh" +#include "hb-ot-shaper.hh" /* Thai / Lao shaper */ diff --git a/src/hb-ot-shape-complex-use-machine.hh b/src/hb-ot-shaper-use-machine.hh similarity index 95% rename from src/hb-ot-shape-complex-use-machine.hh rename to src/hb-ot-shaper-use-machine.hh index 2c4090fc2..f71a448ec 100644 --- a/src/hb-ot-shape-complex-use-machine.hh +++ b/src/hb-ot-shaper-use-machine.hh @@ -1,5 +1,5 @@ -#line 1 "hb-ot-shape-complex-use-machine.rl" +#line 1 "hb-ot-shaper-use-machine.rl" /* * Copyright © 2015 Mozilla Foundation. * Copyright © 2015 Google, Inc. @@ -33,7 +33,7 @@ #include "hb.hh" -#include "hb-ot-shape-complex-syllabic.hh" +#include "hb-ot-shaper-syllabic.hh" /* buffer var allocations */ #define use_category() ot_shaper_var_u8_category() @@ -53,7 +53,7 @@ enum use_syllable_type_t { }; -#line 57 "hb-ot-shape-complex-use-machine.hh" +#line 57 "hb-ot-shaper-use-machine.hh" #define use_syllable_machine_ex_B 1u #define use_syllable_machine_ex_CGJ 6u #define use_syllable_machine_ex_CMAbv 31u @@ -96,7 +96,7 @@ enum use_syllable_type_t { #define use_syllable_machine_ex_ZWNJ 14u -#line 100 "hb-ot-shape-complex-use-machine.hh" +#line 100 "hb-ot-shaper-use-machine.hh" static const unsigned char _use_syllable_machine_trans_keys[] = { 0u, 51u, 11u, 48u, 11u, 48u, 1u, 48u, 23u, 48u, 24u, 47u, 25u, 47u, 26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u, 24u, 48u, 24u, 48u, 1u, 1u, 24u, 48u, 22u, 48u, @@ -595,11 +595,11 @@ static const int use_syllable_machine_error = -1; static const int use_syllable_machine_en_main = 0; -#line 58 "hb-ot-shape-complex-use-machine.rl" +#line 58 "hb-ot-shaper-use-machine.rl" -#line 181 "hb-ot-shape-complex-use-machine.rl" +#line 181 "hb-ot-shaper-use-machine.rl" #define found_syllable(syllable_type) \ @@ -698,7 +698,7 @@ find_syllables_use (hb_buffer_t *buffer) unsigned int act HB_UNUSED; int cs; -#line 702 "hb-ot-shape-complex-use-machine.hh" +#line 702 "hb-ot-shaper-use-machine.hh" { cs = use_syllable_machine_start; ts = 0; @@ -706,12 +706,12 @@ find_syllables_use (hb_buffer_t *buffer) act = 0; } -#line 281 "hb-ot-shape-complex-use-machine.rl" +#line 281 "hb-ot-shaper-use-machine.rl" unsigned int syllable_serial = 1; -#line 715 "hb-ot-shape-complex-use-machine.hh" +#line 715 "hb-ot-shaper-use-machine.hh" { int _slen; int _trans; @@ -725,7 +725,7 @@ _resume: #line 1 "NONE" {ts = p;} break; -#line 729 "hb-ot-shape-complex-use-machine.hh" +#line 729 "hb-ot-shaper-use-machine.hh" } _keys = _use_syllable_machine_trans_keys + (cs<<1); @@ -744,51 +744,51 @@ _eof_trans: switch ( _use_syllable_machine_trans_actions[_trans] ) { case 9: -#line 171 "hb-ot-shape-complex-use-machine.rl" +#line 171 "hb-ot-shaper-use-machine.rl" {te = p+1;{ found_syllable (use_standard_cluster); }} break; case 6: -#line 174 "hb-ot-shape-complex-use-machine.rl" +#line 174 "hb-ot-shaper-use-machine.rl" {te = p+1;{ found_syllable (use_symbol_cluster); }} break; case 4: -#line 176 "hb-ot-shape-complex-use-machine.rl" +#line 176 "hb-ot-shaper-use-machine.rl" {te = p+1;{ found_syllable (use_broken_cluster); }} break; case 3: -#line 177 "hb-ot-shape-complex-use-machine.rl" +#line 177 "hb-ot-shaper-use-machine.rl" {te = p+1;{ found_syllable (use_non_cluster); }} break; case 11: -#line 170 "hb-ot-shape-complex-use-machine.rl" +#line 170 "hb-ot-shaper-use-machine.rl" {te = p;p--;{ found_syllable (use_sakot_terminated_cluster); }} break; case 7: -#line 171 "hb-ot-shape-complex-use-machine.rl" +#line 171 "hb-ot-shaper-use-machine.rl" {te = p;p--;{ found_syllable (use_standard_cluster); }} break; case 14: -#line 172 "hb-ot-shape-complex-use-machine.rl" +#line 172 "hb-ot-shaper-use-machine.rl" {te = p;p--;{ found_syllable (use_number_joiner_terminated_cluster); }} break; case 13: -#line 173 "hb-ot-shape-complex-use-machine.rl" +#line 173 "hb-ot-shaper-use-machine.rl" {te = p;p--;{ found_syllable (use_numeral_cluster); }} break; case 5: -#line 174 "hb-ot-shape-complex-use-machine.rl" +#line 174 "hb-ot-shaper-use-machine.rl" {te = p;p--;{ found_syllable (use_symbol_cluster); }} break; case 17: -#line 175 "hb-ot-shape-complex-use-machine.rl" +#line 175 "hb-ot-shaper-use-machine.rl" {te = p;p--;{ found_syllable (use_hieroglyph_cluster); }} break; case 15: -#line 176 "hb-ot-shape-complex-use-machine.rl" +#line 176 "hb-ot-shaper-use-machine.rl" {te = p;p--;{ found_syllable (use_broken_cluster); }} break; case 16: -#line 177 "hb-ot-shape-complex-use-machine.rl" +#line 177 "hb-ot-shaper-use-machine.rl" {te = p;p--;{ found_syllable (use_non_cluster); }} break; case 12: @@ -806,16 +806,16 @@ _eof_trans: case 8: #line 1 "NONE" {te = p+1;} -#line 169 "hb-ot-shape-complex-use-machine.rl" +#line 169 "hb-ot-shaper-use-machine.rl" {act = 1;} break; case 10: #line 1 "NONE" {te = p+1;} -#line 170 "hb-ot-shape-complex-use-machine.rl" +#line 170 "hb-ot-shaper-use-machine.rl" {act = 2;} break; -#line 819 "hb-ot-shape-complex-use-machine.hh" +#line 819 "hb-ot-shaper-use-machine.hh" } _again: @@ -824,7 +824,7 @@ _again: #line 1 "NONE" {ts = 0;} break; -#line 828 "hb-ot-shape-complex-use-machine.hh" +#line 828 "hb-ot-shaper-use-machine.hh" } if ( ++p != pe ) @@ -840,7 +840,7 @@ _again: } -#line 286 "hb-ot-shape-complex-use-machine.rl" +#line 286 "hb-ot-shaper-use-machine.rl" } diff --git a/src/hb-ot-shape-complex-use-machine.rl b/src/hb-ot-shaper-use-machine.rl similarity index 99% rename from src/hb-ot-shape-complex-use-machine.rl rename to src/hb-ot-shaper-use-machine.rl index c06fe3a29..929cc0794 100644 --- a/src/hb-ot-shape-complex-use-machine.rl +++ b/src/hb-ot-shaper-use-machine.rl @@ -31,7 +31,7 @@ #include "hb.hh" -#include "hb-ot-shape-complex-syllabic.hh" +#include "hb-ot-shaper-syllabic.hh" /* buffer var allocations */ #define use_category() ot_shaper_var_u8_category() diff --git a/src/hb-ot-shape-complex-use-table.hh b/src/hb-ot-shaper-use-table.hh similarity index 99% rename from src/hb-ot-shape-complex-use-table.hh rename to src/hb-ot-shaper-use-table.hh index 0877e6abb..91f662d0d 100644 --- a/src/hb-ot-shape-complex-use-table.hh +++ b/src/hb-ot-shaper-use-table.hh @@ -42,7 +42,7 @@ #include "hb.hh" -#include "hb-ot-shape-complex-use-machine.hh" +#include "hb-ot-shaper-use-machine.hh" #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-macros" diff --git a/src/hb-ot-shape-complex-use.cc b/src/hb-ot-shaper-use.cc similarity index 98% rename from src/hb-ot-shape-complex-use.cc rename to src/hb-ot-shaper-use.cc index 5f800d93a..98f0f99e3 100644 --- a/src/hb-ot-shape-complex-use.cc +++ b/src/hb-ot-shaper-use.cc @@ -30,11 +30,11 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex-use-machine.hh" -#include "hb-ot-shape-complex-use-table.hh" -#include "hb-ot-shape-complex-arabic.hh" -#include "hb-ot-shape-complex-arabic-joining-list.hh" -#include "hb-ot-shape-complex-vowel-constraints.hh" +#include "hb-ot-shaper-use-machine.hh" +#include "hb-ot-shaper-use-table.hh" +#include "hb-ot-shaper-arabic.hh" +#include "hb-ot-shaper-arabic-joining-list.hh" +#include "hb-ot-shaper-vowel-constraints.hh" /* diff --git a/src/hb-ot-shape-complex-vowel-constraints.cc b/src/hb-ot-shaper-vowel-constraints.cc similarity index 99% rename from src/hb-ot-shape-complex-vowel-constraints.cc rename to src/hb-ot-shaper-vowel-constraints.cc index 4294230d6..be4ac813b 100644 --- a/src/hb-ot-shape-complex-vowel-constraints.cc +++ b/src/hb-ot-shaper-vowel-constraints.cc @@ -18,7 +18,7 @@ #ifndef HB_NO_OT_SHAPE -#include "hb-ot-shape-complex-vowel-constraints.hh" +#include "hb-ot-shaper-vowel-constraints.hh" static void _output_dotted_circle (hb_buffer_t *buffer) diff --git a/src/hb-ot-shape-complex-vowel-constraints.hh b/src/hb-ot-shaper-vowel-constraints.hh similarity index 97% rename from src/hb-ot-shape-complex-vowel-constraints.hh rename to src/hb-ot-shaper-vowel-constraints.hh index b168aeb40..5a7ee1b0f 100644 --- a/src/hb-ot-shape-complex-vowel-constraints.hh +++ b/src/hb-ot-shaper-vowel-constraints.hh @@ -29,7 +29,7 @@ #include "hb.hh" -#include "hb-ot-shape-complex.hh" +#include "hb-ot-shaper.hh" HB_INTERNAL void _hb_preprocess_text_vowel_constraints (const hb_ot_shape_plan_t *plan, diff --git a/src/hb-ot-shape-complex.hh b/src/hb-ot-shaper.hh similarity index 100% rename from src/hb-ot-shape-complex.hh rename to src/hb-ot-shaper.hh diff --git a/src/meson.build b/src/meson.build index fda1ab648..41102bcaa 100644 --- a/src/meson.build +++ b/src/meson.build @@ -135,30 +135,30 @@ hb_base_sources = files( 'hb-ot-os2-unicode-ranges.hh', 'hb-ot-post-macroman.hh', 'hb-ot-post-table.hh', - 'hb-ot-shape-complex-arabic-fallback.hh', - 'hb-ot-shape-complex-arabic-joining-list.hh', - 'hb-ot-shape-complex-arabic-table.hh', - 'hb-ot-shape-complex-arabic-win1256.hh', - 'hb-ot-shape-complex-arabic.cc', - 'hb-ot-shape-complex-arabic.hh', - 'hb-ot-shape-complex-default.cc', - 'hb-ot-shape-complex-hangul.cc', - 'hb-ot-shape-complex-hebrew.cc', - 'hb-ot-shape-complex-indic-table.cc', - 'hb-ot-shape-complex-indic.cc', - 'hb-ot-shape-complex-indic.hh', - 'hb-ot-shape-complex-khmer.cc', - 'hb-ot-shape-complex-khmer.hh', - 'hb-ot-shape-complex-myanmar.cc', - 'hb-ot-shape-complex-myanmar.hh', - 'hb-ot-shape-complex-syllabic.cc', - 'hb-ot-shape-complex-syllabic.hh', - 'hb-ot-shape-complex-thai.cc', - 'hb-ot-shape-complex-use-table.hh', - 'hb-ot-shape-complex-use.cc', - 'hb-ot-shape-complex-vowel-constraints.cc', - 'hb-ot-shape-complex-vowel-constraints.hh', - 'hb-ot-shape-complex.hh', + 'hb-ot-shaper-arabic-fallback.hh', + 'hb-ot-shaper-arabic-joining-list.hh', + 'hb-ot-shaper-arabic-table.hh', + 'hb-ot-shaper-arabic-win1256.hh', + 'hb-ot-shaper-arabic.cc', + 'hb-ot-shaper-arabic.hh', + 'hb-ot-shaper-default.cc', + 'hb-ot-shaper-hangul.cc', + 'hb-ot-shaper-hebrew.cc', + 'hb-ot-shaper-indic-table.cc', + 'hb-ot-shaper-indic.cc', + 'hb-ot-shaper-indic.hh', + 'hb-ot-shaper-khmer.cc', + 'hb-ot-shaper-khmer.hh', + 'hb-ot-shaper-myanmar.cc', + 'hb-ot-shaper-myanmar.hh', + 'hb-ot-shaper-syllabic.cc', + 'hb-ot-shaper-syllabic.hh', + 'hb-ot-shaper-thai.cc', + 'hb-ot-shaper-use-table.hh', + 'hb-ot-shaper-use.cc', + 'hb-ot-shaper-vowel-constraints.cc', + 'hb-ot-shaper-vowel-constraints.hh', + 'hb-ot-shaper.hh', 'hb-ot-shape-fallback.cc', 'hb-ot-shape-fallback.hh', 'hb-ot-shape-normalize.cc', @@ -206,19 +206,19 @@ hb_base_ragel_generated_sources = files( 'hb-buffer-deserialize-json.hh', 'hb-buffer-deserialize-text.hh', 'hb-number-parser.hh', - 'hb-ot-shape-complex-indic-machine.hh', - 'hb-ot-shape-complex-khmer-machine.hh', - 'hb-ot-shape-complex-myanmar-machine.hh', - 'hb-ot-shape-complex-use-machine.hh', + 'hb-ot-shaper-indic-machine.hh', + 'hb-ot-shaper-khmer-machine.hh', + 'hb-ot-shaper-myanmar-machine.hh', + 'hb-ot-shaper-use-machine.hh', ) hb_base_ragel_sources = [ 'hb-buffer-deserialize-json.rl', 'hb-buffer-deserialize-text.rl', 'hb-number-parser.rl', - 'hb-ot-shape-complex-indic-machine.rl', - 'hb-ot-shape-complex-khmer-machine.rl', - 'hb-ot-shape-complex-myanmar-machine.rl', - 'hb-ot-shape-complex-use-machine.rl', + 'hb-ot-shaper-indic-machine.rl', + 'hb-ot-shaper-khmer-machine.rl', + 'hb-ot-shaper-myanmar-machine.rl', + 'hb-ot-shaper-use-machine.rl', ] hb_base_headers = files( diff --git a/src/update-unicode-tables.make b/src/update-unicode-tables.make index 8c2eaa418..9002dc981 100755 --- a/src/update-unicode-tables.make +++ b/src/update-unicode-tables.make @@ -1,29 +1,29 @@ #!/usr/bin/env -S make -f all: packtab \ - hb-ot-shape-complex-arabic-joining-list.hh \ - hb-ot-shape-complex-arabic-table.hh hb-unicode-emoji-table.hh \ - hb-ot-shape-complex-indic-table.cc hb-ot-tag-table.hh \ - hb-ucd-table.hh hb-ot-shape-complex-use-table.hh \ - hb-ot-shape-complex-vowel-constraints.cc + hb-ot-shaper-arabic-joining-list.hh \ + hb-ot-shaper-arabic-table.hh hb-unicode-emoji-table.hh \ + hb-ot-shaper-indic-table.cc hb-ot-tag-table.hh \ + hb-ucd-table.hh hb-ot-shaper-use-table.hh \ + hb-ot-shaper-vowel-constraints.cc .PHONY: all clean packtab -hb-ot-shape-complex-arabic-joining-list.hh: gen-arabic-joining-list.py ArabicShaping.txt Scripts.txt +hb-ot-shaper-arabic-joining-list.hh: gen-arabic-joining-list.py ArabicShaping.txt Scripts.txt ./$^ > $@ || ($(RM) $@; false) -hb-ot-shape-complex-arabic-table.hh: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt +hb-ot-shaper-arabic-table.hh: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt ./$^ > $@ || ($(RM) $@; false) hb-unicode-emoji-table.hh: gen-emoji-table.py emoji-data.txt emoji-test.txt ./$^ > $@ || ($(RM) $@; false) -hb-ot-shape-complex-indic-table.cc: gen-indic-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt Blocks.txt +hb-ot-shaper-indic-table.cc: gen-indic-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt Blocks.txt ./$^ > $@ || ($(RM) $@; false) hb-ot-tag-table.hh: gen-tag-table.py languagetags language-subtag-registry ./$^ > $@ || ($(RM) $@; false) hb-ucd-table.hh: gen-ucd-table.py ucd.nounihan.grouped.zip hb-common.h ./$^ > $@ || ($(RM) $@; false) -hb-ot-shape-complex-use-table.hh: gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt ArabicShaping.txt DerivedCoreProperties.txt UnicodeData.txt Blocks.txt Scripts.txt ms-use/IndicSyllabicCategory-Additional.txt ms-use/IndicPositionalCategory-Additional.txt +hb-ot-shaper-use-table.hh: gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt ArabicShaping.txt DerivedCoreProperties.txt UnicodeData.txt Blocks.txt Scripts.txt ms-use/IndicSyllabicCategory-Additional.txt ms-use/IndicPositionalCategory-Additional.txt ./$^ > $@ || ($(RM) $@; false) -hb-ot-shape-complex-vowel-constraints.cc: gen-vowel-constraints.py ms-use/IndicShapingInvalidCluster.txt Scripts.txt +hb-ot-shaper-vowel-constraints.cc: gen-vowel-constraints.py ms-use/IndicShapingInvalidCluster.txt Scripts.txt ./$^ > $@ || ($(RM) $@; false) packtab: