[psaux] Rename files

Replace the `cf2' file name prefix with `ps' as the Adobe engine will be
used for both PostScript Types 1 and 2 (CFF) instead of just CFF.

s/cf2/ps/ for all following.
* src/psaux/cf2*: Renamed files.
* src/psaux/*: Update includes.
* src/psaux/Jamfile, src/psaux/rules.mk: Updated file references.
This commit is contained in:
Ewald Hew 2017-06-09 14:40:17 +08:00
parent f876e313a3
commit 214dd85d0a
25 changed files with 83 additions and 83 deletions

View File

@ -22,15 +22,15 @@ SubDir FT2_TOP $(FT2_SRC_DIR) psaux ;
psobjs
t1cmap
t1decode
cf2arrst
cf2blues
cf2error
cf2font
cf2ft
cf2hints
cf2intrp
cf2read
cf2stack
psarrst
psblues
pserror
psfont
psft
pshints
psintrp
psread
psstack
;
}
else

View File

@ -36,13 +36,13 @@
/***************************************************************************/
#include "cf2ft.h"
#include "psft.h"
#include FT_INTERNAL_DEBUG_H
#include "cf2glue.h"
#include "cf2arrst.h"
#include "psglue.h"
#include "psarrst.h"
#include "cf2error.h"
#include "pserror.h"
/*

View File

@ -40,7 +40,7 @@
#define CF2ARRST_H_
#include "cf2error.h"
#include "pserror.h"
FT_BEGIN_HEADER

View File

@ -27,15 +27,15 @@
#include "t1decode.c"
#include "cffdecode.c"
#include "cf2arrst.c"
#include "cf2blues.c"
#include "cf2error.c"
#include "cf2font.c"
#include "cf2ft.c"
#include "cf2hints.c"
#include "cf2intrp.c"
#include "cf2read.c"
#include "cf2stack.c"
#include "psarrst.c"
#include "psblues.c"
#include "pserror.c"
#include "psfont.c"
#include "psft.c"
#include "pshints.c"
#include "psintrp.c"
#include "psread.c"
#include "psstack.c"
/* END */

View File

@ -21,7 +21,7 @@
#include "psobjs.h"
#include "t1decode.h"
#include "t1cmap.h"
#include "cf2ft.h"
#include "psft.h"
#include "cffdecode.h"
#ifndef T1_CONFIG_OPTION_NO_AFM

View File

@ -36,12 +36,12 @@
/***************************************************************************/
#include "cf2ft.h"
#include "psft.h"
#include FT_INTERNAL_DEBUG_H
#include "cf2blues.h"
#include "cf2hints.h"
#include "cf2font.h"
#include "psblues.h"
#include "pshints.h"
#include "psfont.h"
/*************************************************************************/

View File

@ -69,7 +69,7 @@
#define CF2BLUES_H_
#include "cf2glue.h"
#include "psglue.h"
FT_BEGIN_HEADER

View File

@ -36,8 +36,8 @@
/***************************************************************************/
#include "cf2ft.h"
#include "cf2error.h"
#include "psft.h"
#include "pserror.h"
FT_LOCAL_DEF( void )

View File

@ -50,7 +50,7 @@
#include FT_ERRORS_H
#include "cf2ft.h"
#include "psft.h"
FT_BEGIN_HEADER

View File

@ -39,12 +39,12 @@
#include <ft2build.h>
#include FT_INTERNAL_CALC_H
#include "cf2ft.h"
#include "psft.h"
#include "cf2glue.h"
#include "cf2font.h"
#include "cf2error.h"
#include "cf2intrp.h"
#include "psglue.h"
#include "psfont.h"
#include "pserror.h"
#include "psintrp.h"
/* Compute a stem darkening amount in character space. */

View File

@ -42,8 +42,8 @@
#include FT_SERVICE_CFF_TABLE_LOAD_H
#include "cf2ft.h"
#include "cf2blues.h"
#include "psft.h"
#include "psblues.h"
FT_BEGIN_HEADER

View File

@ -36,11 +36,11 @@
/***************************************************************************/
#include "cf2ft.h"
#include "psft.h"
#include FT_INTERNAL_DEBUG_H
#include "cf2font.h"
#include "cf2error.h"
#include "psfont.h"
#include "pserror.h"
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
#include FT_MULTIPLE_MASTERS_H

View File

@ -40,7 +40,7 @@
#define CF2FT_H_
#include "cf2types.h"
#include "pstypes.h"
/* TODO: disable asserts for now */
@ -49,7 +49,7 @@
#include FT_SYSTEM_H
#include "cf2glue.h"
#include "psglue.h"
#include FT_INTERNAL_POSTSCRIPT_AUX_H /* for CFF_Decoder */

View File

@ -41,10 +41,10 @@
/* common includes for other modules */
#include "cf2error.h"
#include "cf2fixed.h"
#include "cf2arrst.h"
#include "cf2read.h"
#include "pserror.h"
#include "psfixed.h"
#include "psarrst.h"
#include "psread.h"
FT_BEGIN_HEADER

View File

@ -36,13 +36,13 @@
/***************************************************************************/
#include "cf2ft.h"
#include "psft.h"
#include FT_INTERNAL_DEBUG_H
#include "cf2glue.h"
#include "cf2font.h"
#include "cf2hints.h"
#include "cf2intrp.h"
#include "psglue.h"
#include "psfont.h"
#include "pshints.h"
#include "psintrp.h"
/*************************************************************************/

View File

@ -36,17 +36,17 @@
/***************************************************************************/
#include "cf2ft.h"
#include "psft.h"
#include FT_INTERNAL_DEBUG_H
#include FT_SERVICE_CFF_TABLE_LOAD_H
#include "cf2glue.h"
#include "cf2font.h"
#include "cf2stack.h"
#include "cf2hints.h"
#include "cf2intrp.h"
#include "psglue.h"
#include "psfont.h"
#include "psstack.h"
#include "pshints.h"
#include "psintrp.h"
#include "cf2error.h"
#include "pserror.h"
#include "psobjs.h" /* for cff_random */

View File

@ -40,8 +40,8 @@
#define CF2INTRP_H_
#include "cf2ft.h"
#include "cf2hints.h"
#include "psft.h"
#include "pshints.h"
FT_BEGIN_HEADER

View File

@ -36,12 +36,12 @@
/***************************************************************************/
#include "cf2ft.h"
#include "psft.h"
#include FT_INTERNAL_DEBUG_H
#include "cf2glue.h"
#include "psglue.h"
#include "cf2error.h"
#include "pserror.h"
/* Define CF2_IO_FAIL as 1 to enable random errors and random */

View File

@ -36,14 +36,14 @@
/***************************************************************************/
#include "cf2ft.h"
#include "psft.h"
#include FT_INTERNAL_DEBUG_H
#include "cf2glue.h"
#include "cf2font.h"
#include "cf2stack.h"
#include "psglue.h"
#include "psfont.h"
#include "psstack.h"
#include "cf2error.h"
#include "pserror.h"
/* Allocate and initialize an instance of CF2_Stack. */

View File

@ -34,24 +34,24 @@ PSAUX_DRV_SRC := $(PSAUX_DIR)/psobjs.c \
$(PSAUX_DIR)/afmparse.c \
$(PSAUX_DIR)/psconv.c \
$(PSAUX_DIR)/psauxmod.c \
$(PSAUX_DIR)/cf2arrst.c \
$(PSAUX_DIR)/cf2blues.c \
$(PSAUX_DIR)/cf2error.c \
$(PSAUX_DIR)/cf2font.c \
$(PSAUX_DIR)/cf2ft.c \
$(PSAUX_DIR)/cf2hints.c \
$(PSAUX_DIR)/cf2intrp.c \
$(PSAUX_DIR)/cf2read.c \
$(PSAUX_DIR)/cf2stack.c \
$(PSAUX_DIR)/cffdecode.c
$(PSAUX_DIR)/psarrst.c \
$(PSAUX_DIR)/psblues.c \
$(PSAUX_DIR)/pserror.c \
$(PSAUX_DIR)/psfont.c \
$(PSAUX_DIR)/psft.c \
$(PSAUX_DIR)/pshints.c \
$(PSAUX_DIR)/psintrp.c \
$(PSAUX_DIR)/psread.c \
$(PSAUX_DIR)/psstack.c \
$(PSAUX_DIR)/cffdecode.c
# PSAUX driver headers
#
PSAUX_DRV_H := $(PSAUX_DRV_SRC:%c=%h) \
$(PSAUX_DIR)/psauxerr.h \
$(PSAUX_DIR)/cf2fixed.h \
$(PSAUX_DIR)/cf2glue.h \
$(PSAUX_DIR)/cf2types.h
$(PSAUX_DIR)/psfixed.h \
$(PSAUX_DIR)/psglue.h \
$(PSAUX_DIR)/pstypes.h
# PSAUX driver object(s)