From a4e9f56c08706897b6b24266f1229d531aba5649 Mon Sep 17 00:00:00 2001 From: Vincent Wei Date: Sun, 10 Mar 2019 14:44:33 +0800 Subject: [PATCH] cleanup --- src/font/utils/Makefile | 2 +- src/font/utils/gen-bidi-type-tab.c | 4 ++-- src/font/utils/gen-joining-type-tab.c | 4 ++-- src/font/utils/mgbidi-unicode-version.h | 10 ---------- 4 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 src/font/utils/mgbidi-unicode-version.h diff --git a/src/font/utils/Makefile b/src/font/utils/Makefile index ed443d19..14a0d539 100644 --- a/src/font/utils/Makefile +++ b/src/font/utils/Makefile @@ -36,7 +36,7 @@ mgbidi-unicode-version.h:ucd/ReadMe.txt gen-unicode-version ./gen-unicode-version ucd/ReadMe.txt > mgbidi-unicode-version.h clean: - rm -f *.o mgbidi-*.h \ + rm -f *.o mgbidi-*.h mgbidi-*.inc \ mkmap-ucs-gb2312 mkmap-gb18030-ucs.c mkmap-ucs-gb18030 \ gen-unicode-version \ gen-bidi-type-tab \ diff --git a/src/font/utils/gen-bidi-type-tab.c b/src/font/utils/gen-bidi-type-tab.c index 51744ac2..4345256e 100644 --- a/src/font/utils/gen-bidi-type-tab.c +++ b/src/font/utils/gen-bidi-type-tab.c @@ -81,7 +81,7 @@ enum Char32TypeLinearEnumOffsetOne { # define _MGBIDI_ADD_TYPE(TYPE,SYMBOL) TYPE, # define _MGBIDI_ADD_ALIAS(TYPE1,TYPE2) TYPE1 = TYPE2, -# include "../mgbidi-bidi-types-list.h" +# include "../mgbidi-bidi-types-list.inc" # undef _MGBIDI_ADD_ALIAS # undef _MGBIDI_ADD_TYPE NUM_TYPES @@ -96,7 +96,7 @@ type_names[] = { # define _MGBIDI_ADD_TYPE(TYPE,SYMBOL) {STRINGIZE(TYPE), TYPE}, # define _MGBIDI_ADD_ALIAS(TYPE1,TYPE2) _MGBIDI_ADD_TYPE(TYPE1, SYMBOL) -# include "../mgbidi-bidi-types-list.h" +# include "../mgbidi-bidi-types-list.inc" # undef _MGBIDI_ADD_ALIAS # undef _MGBIDI_ADD_TYPE }; diff --git a/src/font/utils/gen-joining-type-tab.c b/src/font/utils/gen-joining-type-tab.c index aa6d1cd3..d965ea5b 100644 --- a/src/font/utils/gen-joining-type-tab.c +++ b/src/font/utils/gen-joining-type-tab.c @@ -93,7 +93,7 @@ die3l ( enum FriBidiJoiningLinearEnumOffsetOne { # define _MGBIDI_ADD_TYPE(TYPE,SYMBOL) TYPE, -# include "../mgbidi-joining-types-list.h" +# include "../mgbidi-joining-types-list.inc" # undef _MGBIDI_ADD_TYPE NUM_TYPES }; @@ -106,7 +106,7 @@ struct type_names[] = { # define _MGBIDI_ADD_TYPE(TYPE,SYMBOL) {STRINGIZE(TYPE), TYPE}, -# include "../mgbidi-joining-types-list.h" +# include "../mgbidi-joining-types-list.inc" # undef _MGBIDI_ADD_TYPE }; diff --git a/src/font/utils/mgbidi-unicode-version.h b/src/font/utils/mgbidi-unicode-version.h deleted file mode 100644 index cc623507..00000000 --- a/src/font/utils/mgbidi-unicode-version.h +++ /dev/null @@ -1,10 +0,0 @@ -/* mgbidi-unicode-version.h - * generated by gen-unicode-version - * from the file ReadMe.txt */ - -#define MGBIDI_UNICODE_VERSION "12.0.0" -#define MGBIDI_UNICODE_MAJOR_VERSION 12 -#define MGBIDI_UNICODE_MINOR_VERSION 0 -#define MGBIDI_UNICODE_MICRO_VERSION 0 - -/* End of generated mgbidi-unicode-version.h */