diff options
| -rw-r--r-- | src/autofit/afglobal.c | 8 | ||||
| -rw-r--r-- | src/autofit/aftypes.h | 5 | ||||
| -rw-r--r-- | src/autofit/afws-decl.h (renamed from src/autofit/afwrtsys.h) | 22 | ||||
| -rw-r--r-- | src/autofit/afws-iter.h | 31 | ||||
| -rw-r--r-- | src/autofit/rules.mk | 15 |
5 files changed, 47 insertions, 34 deletions
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c index aedb74ddd..577b94e47 100644 --- a/src/autofit/afglobal.c +++ b/src/autofit/afglobal.c @@ -19,6 +19,7 @@ #include "afglobal.h" #include "afranges.h" #include "afshaper.h" +#include "afws-decl.h" #include <freetype/internal/ftdebug.h> @@ -32,11 +33,6 @@ #define FT_COMPONENT afglobal - /* get writing system specific header files */ -#undef WRITING_SYSTEM -#define WRITING_SYSTEM( ws, WS ) /* empty */ -#include "afwrtsys.h" - #include "aferrors.h" @@ -74,7 +70,7 @@ af_writing_system_classes[] = { -#include "afwrtsys.h" +#include "afws-iter.h" NULL /* do not remove */ }; diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h index e76b103ed..1d792b947 100644 --- a/src/autofit/aftypes.h +++ b/src/autofit/aftypes.h @@ -198,7 +198,6 @@ extern void* _af_debug_hints; * outline according to the results of the glyph analyzer. */ -#define AFWRTSYS_H_ /* don't load header files */ #undef WRITING_SYSTEM #define WRITING_SYSTEM( ws, WS ) \ AF_WRITING_SYSTEM_ ## WS, @@ -207,14 +206,12 @@ extern void* _af_debug_hints; typedef enum AF_WritingSystem_ { -#include "afwrtsys.h" +#include "afws-iter.h" AF_WRITING_SYSTEM_MAX /* do not remove */ } AF_WritingSystem; -#undef AFWRTSYS_H_ - typedef struct AF_WritingSystemClassRec_ { diff --git a/src/autofit/afwrtsys.h b/src/autofit/afws-decl.h index 39aa12112..c10dd57e7 100644 --- a/src/autofit/afwrtsys.h +++ b/src/autofit/afws-decl.h @@ -1,8 +1,8 @@ /**************************************************************************** * - * afwrtsys.h + * afws-decl.h * - * Auto-fitter writing systems (specification only). + * Auto-fitter writing system declarations (specification only). * * Copyright (C) 2013-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. @@ -16,8 +16,8 @@ */ -#ifndef AFWRTSYS_H_ -#define AFWRTSYS_H_ +#ifndef AFWS_DECL_H_ +#define AFWS_DECL_H_ /* Since preprocessor directives can't create other preprocessor */ /* directives, we have to include the header files manually. */ @@ -27,19 +27,7 @@ #include "afcjk.h" #include "afindic.h" -#endif /* AFWRTSYS_H_ */ +#endif /* AFWS_DECL_H_ */ - /* The following part can be included multiple times. */ - /* Define `WRITING_SYSTEM' as needed. */ - - - /* Add new writing systems here. The arguments are the writing system */ - /* name in lowercase and uppercase, respectively. */ - - WRITING_SYSTEM( dummy, DUMMY ) - WRITING_SYSTEM( latin, LATIN ) - WRITING_SYSTEM( cjk, CJK ) - WRITING_SYSTEM( indic, INDIC ) - /* END */ diff --git a/src/autofit/afws-iter.h b/src/autofit/afws-iter.h new file mode 100644 index 000000000..55714203e --- /dev/null +++ b/src/autofit/afws-iter.h @@ -0,0 +1,31 @@ +/**************************************************************************** + * + * afws-iter.h + * + * Auto-fitter writing systems iterator (specification only). + * + * Copyright (C) 2013-2021 by + * David Turner, Robert Wilhelm, and Werner Lemberg. + * + * This file is part of the FreeType project, and may only be used, + * modified, and distributed under the terms of the FreeType project + * license, LICENSE.TXT. By continuing to use, modify, or distribute + * this file you indicate that you have read the license and + * understand and accept it fully. + * + */ + + /* This header may be included multiple times. */ + /* Define `WRITING_SYSTEM' as needed. */ + + + /* Add new writing systems here. The arguments are the writing system */ + /* name in lowercase and uppercase, respectively. */ + + WRITING_SYSTEM( dummy, DUMMY ) + WRITING_SYSTEM( latin, LATIN ) + WRITING_SYSTEM( cjk, CJK ) + WRITING_SYSTEM( indic, INDIC ) + + +/* END */ diff --git a/src/autofit/rules.mk b/src/autofit/rules.mk index 19b3bcadb..499c0e083 100644 --- a/src/autofit/rules.mk +++ b/src/autofit/rules.mk @@ -42,13 +42,14 @@ AUTOF_DRV_SRC := $(AUTOF_DIR)/afblue.c \ # AUTOF driver headers # -AUTOF_DRV_H := $(AUTOF_DRV_SRC:%c=%h) \ - $(AUTOF_DIR)/afcover.h \ - $(AUTOF_DIR)/aferrors.h \ - $(AUTOF_DIR)/afscript.h \ - $(AUTOF_DIR)/afstyles.h \ - $(AUTOF_DIR)/aftypes.h \ - $(AUTOF_DIR)/afwrtsys.h +AUTOF_DRV_H := $(AUTOF_DRV_SRC:%c=%h) \ + $(AUTOF_DIR)/afcover.h \ + $(AUTOF_DIR)/aferrors.h \ + $(AUTOF_DIR)/afscript.h \ + $(AUTOF_DIR)/afstyles.h \ + $(AUTOF_DIR)/aftypes.h \ + $(AUTOF_DIR)/afws-decl.h \ + $(AUTOF_DIR)/afws-iter.h # AUTOF driver object(s) |