[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] ewaldhew-wip 38c6d74 07/47: [psaux] Rename files
|
From: |
Hew Yih Shiuan Ewald |
|
Subject: |
[freetype2] ewaldhew-wip 38c6d74 07/47: [psaux] Rename files |
|
Date: |
Thu, 6 Jul 2017 04:49:32 -0400 (EDT) |
branch: ewaldhew-wip
commit 38c6d74195e2504c37c5b5b61803c284010be91a
Author: Ewald Hew <address@hidden>
Commit: Ewald Hew <address@hidden>
[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.
---
src/psaux/Jamfile | 18 +++++++++---------
src/psaux/{cf2arrst.c => psarrst.c} | 8 ++++----
src/psaux/{cf2arrst.h => psarrst.h} | 2 +-
src/psaux/psaux.c | 18 +++++++++---------
src/psaux/psauxmod.c | 2 +-
src/psaux/{cf2blues.c => psblues.c} | 8 ++++----
src/psaux/{cf2blues.h => psblues.h} | 2 +-
src/psaux/{cf2error.c => pserror.c} | 4 ++--
src/psaux/{cf2error.h => pserror.h} | 2 +-
src/psaux/{cf2fixed.h => psfixed.h} | 0
src/psaux/{cf2font.c => psfont.c} | 10 +++++-----
src/psaux/{cf2font.h => psfont.h} | 4 ++--
src/psaux/{cf2ft.c => psft.c} | 6 +++---
src/psaux/{cf2ft.h => psft.h} | 4 ++--
src/psaux/{cf2glue.h => psglue.h} | 8 ++++----
src/psaux/{cf2hints.c => pshints.c} | 10 +++++-----
src/psaux/{cf2hints.h => pshints.h} | 0
src/psaux/{cf2intrp.c => psintrp.c} | 14 +++++++-------
src/psaux/{cf2intrp.h => psintrp.h} | 4 ++--
src/psaux/{cf2read.c => psread.c} | 6 +++---
src/psaux/{cf2read.h => psread.h} | 0
src/psaux/{cf2stack.c => psstack.c} | 10 +++++-----
src/psaux/{cf2stack.h => psstack.h} | 0
src/psaux/{cf2types.h => pstypes.h} | 0
src/psaux/rules.mk | 24 ++++++++++++------------
25 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/src/psaux/Jamfile b/src/psaux/Jamfile
index 8ca5189..392acab 100644
--- a/src/psaux/Jamfile
+++ b/src/psaux/Jamfile
@@ -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
diff --git a/src/psaux/cf2arrst.c b/src/psaux/psarrst.c
similarity index 98%
rename from src/psaux/cf2arrst.c
rename to src/psaux/psarrst.c
index 6796450..9bd0997 100644
--- a/src/psaux/cf2arrst.c
+++ b/src/psaux/psarrst.c
@@ -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"
/*
diff --git a/src/psaux/cf2arrst.h b/src/psaux/psarrst.h
similarity index 99%
rename from src/psaux/cf2arrst.h
rename to src/psaux/psarrst.h
index 3c21a3b..095938d 100644
--- a/src/psaux/cf2arrst.h
+++ b/src/psaux/psarrst.h
@@ -40,7 +40,7 @@
#define CF2ARRST_H_
-#include "cf2error.h"
+#include "pserror.h"
FT_BEGIN_HEADER
diff --git a/src/psaux/psaux.c b/src/psaux/psaux.c
index f99884a..e30c9b0 100644
--- a/src/psaux/psaux.c
+++ b/src/psaux/psaux.c
@@ -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 */
diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c
index a880881..eb94d54 100644
--- a/src/psaux/psauxmod.c
+++ b/src/psaux/psauxmod.c
@@ -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
diff --git a/src/psaux/cf2blues.c b/src/psaux/psblues.c
similarity index 99%
rename from src/psaux/cf2blues.c
rename to src/psaux/psblues.c
index f9f5bbb..b107521 100644
--- a/src/psaux/cf2blues.c
+++ b/src/psaux/psblues.c
@@ -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"
/*************************************************************************/
diff --git a/src/psaux/cf2blues.h b/src/psaux/psblues.h
similarity index 99%
rename from src/psaux/cf2blues.h
rename to src/psaux/psblues.h
index a6bcd9d..48e8be8 100644
--- a/src/psaux/cf2blues.h
+++ b/src/psaux/psblues.h
@@ -69,7 +69,7 @@
#define CF2BLUES_H_
-#include "cf2glue.h"
+#include "psglue.h"
FT_BEGIN_HEADER
diff --git a/src/psaux/cf2error.c b/src/psaux/pserror.c
similarity index 98%
rename from src/psaux/cf2error.c
rename to src/psaux/pserror.c
index e3dd69f..7b1d4b5 100644
--- a/src/psaux/cf2error.c
+++ b/src/psaux/pserror.c
@@ -36,8 +36,8 @@
/***************************************************************************/
-#include "cf2ft.h"
-#include "cf2error.h"
+#include "psft.h"
+#include "pserror.h"
FT_LOCAL_DEF( void )
diff --git a/src/psaux/cf2error.h b/src/psaux/pserror.h
similarity index 99%
rename from src/psaux/cf2error.h
rename to src/psaux/pserror.h
index d2c770d..e2a44b9 100644
--- a/src/psaux/cf2error.h
+++ b/src/psaux/pserror.h
@@ -50,7 +50,7 @@
#include FT_ERRORS_H
-#include "cf2ft.h"
+#include "psft.h"
FT_BEGIN_HEADER
diff --git a/src/psaux/cf2fixed.h b/src/psaux/psfixed.h
similarity index 100%
rename from src/psaux/cf2fixed.h
rename to src/psaux/psfixed.h
diff --git a/src/psaux/cf2font.c b/src/psaux/psfont.c
similarity index 99%
rename from src/psaux/cf2font.c
rename to src/psaux/psfont.c
index 8d0dfc6..13cff73 100644
--- a/src/psaux/cf2font.c
+++ b/src/psaux/psfont.c
@@ -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. */
diff --git a/src/psaux/cf2font.h b/src/psaux/psfont.h
similarity index 99%
rename from src/psaux/cf2font.h
rename to src/psaux/psfont.h
index 94a31ca..f7ce149 100644
--- a/src/psaux/cf2font.h
+++ b/src/psaux/psfont.h
@@ -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
diff --git a/src/psaux/cf2ft.c b/src/psaux/psft.c
similarity index 99%
rename from src/psaux/cf2ft.c
rename to src/psaux/psft.c
index 6bffce9..2107100 100644
--- a/src/psaux/cf2ft.c
+++ b/src/psaux/psft.c
@@ -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
diff --git a/src/psaux/cf2ft.h b/src/psaux/psft.h
similarity index 99%
rename from src/psaux/cf2ft.h
rename to src/psaux/psft.h
index 772fb07..bbb2cf7 100644
--- a/src/psaux/cf2ft.h
+++ b/src/psaux/psft.h
@@ -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 */
diff --git a/src/psaux/cf2glue.h b/src/psaux/psglue.h
similarity index 98%
rename from src/psaux/cf2glue.h
rename to src/psaux/psglue.h
index 56a7c24..fba6737 100644
--- a/src/psaux/cf2glue.h
+++ b/src/psaux/psglue.h
@@ -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
diff --git a/src/psaux/cf2hints.c b/src/psaux/pshints.c
similarity index 99%
rename from src/psaux/cf2hints.c
rename to src/psaux/pshints.c
index e0f2cc9..c8177b7 100644
--- a/src/psaux/cf2hints.c
+++ b/src/psaux/pshints.c
@@ -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"
/*************************************************************************/
diff --git a/src/psaux/cf2hints.h b/src/psaux/pshints.h
similarity index 100%
rename from src/psaux/cf2hints.h
rename to src/psaux/pshints.h
diff --git a/src/psaux/cf2intrp.c b/src/psaux/psintrp.c
similarity index 99%
rename from src/psaux/cf2intrp.c
rename to src/psaux/psintrp.c
index 605b468..1629d7b 100644
--- a/src/psaux/cf2intrp.c
+++ b/src/psaux/psintrp.c
@@ -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 */
diff --git a/src/psaux/cf2intrp.h b/src/psaux/psintrp.h
similarity index 98%
rename from src/psaux/cf2intrp.h
rename to src/psaux/psintrp.h
index ec030e8..01809a9 100644
--- a/src/psaux/cf2intrp.h
+++ b/src/psaux/psintrp.h
@@ -40,8 +40,8 @@
#define CF2INTRP_H_
-#include "cf2ft.h"
-#include "cf2hints.h"
+#include "psft.h"
+#include "pshints.h"
FT_BEGIN_HEADER
diff --git a/src/psaux/cf2read.c b/src/psaux/psread.c
similarity index 98%
rename from src/psaux/cf2read.c
rename to src/psaux/psread.c
index 2b429e3..237ab7b 100644
--- a/src/psaux/cf2read.c
+++ b/src/psaux/psread.c
@@ -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 */
diff --git a/src/psaux/cf2read.h b/src/psaux/psread.h
similarity index 100%
rename from src/psaux/cf2read.h
rename to src/psaux/psread.h
diff --git a/src/psaux/cf2stack.c b/src/psaux/psstack.c
similarity index 98%
rename from src/psaux/cf2stack.c
rename to src/psaux/psstack.c
index 12a026d..e97ec00 100644
--- a/src/psaux/cf2stack.c
+++ b/src/psaux/psstack.c
@@ -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. */
diff --git a/src/psaux/cf2stack.h b/src/psaux/psstack.h
similarity index 100%
rename from src/psaux/cf2stack.h
rename to src/psaux/psstack.h
diff --git a/src/psaux/cf2types.h b/src/psaux/pstypes.h
similarity index 100%
rename from src/psaux/cf2types.h
rename to src/psaux/pstypes.h
diff --git a/src/psaux/rules.mk b/src/psaux/rules.mk
index 50dd688..b6767ef 100644
--- a/src/psaux/rules.mk
+++ b/src/psaux/rules.mk
@@ -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)/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)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] ewaldhew-wip 38c6d74 07/47: [psaux] Rename files,
Hew Yih Shiuan Ewald <=