Branding fixes

System Internals / FreeType - Alexei Podtelezhnikov [gmail.com] - 7 September 2017 22:36 EDT



###

diff --git a/ChangeLog.24 b/ChangeLog.24
index 796763c..e33b8f5 100644
--- a/ChangeLog.24
+++ b/ChangeLog.24
@@ -1860,10 +1860,10 @@
Fix `checking if gcc static flag -static works' test.

On my linux build tree, I receive yes answer in every package I
- build except freetype for this test checking if gcc static flag
+ build except FreeType for this test checking if gcc static flag
`-static' works

- On freetype, no is received, unless bzip2 and zlib are disabled using
+ In FreeType, no is received, unless bzip2 and zlib are disabled using

./configure --without-bzip2 --without-zlib

diff --git a/ChangeLog.25 b/ChangeLog.25
index d7fed71..f3e5cc1 100644
--- a/ChangeLog.25
+++ b/ChangeLog.25
@@ -2116,7 +2116,7 @@
builds/unix/unix-def.in (freetype-config, freetype2.pc): Handle
HarfBuzz.

- * docs/INSTALL.UNIX: Document interdependency of Freetype with
+ * docs/INSTALL.UNIX: Document interdependency of FreeType with
HarfBuzz.

2014-02-28 Alexei Podtelezhnikov
diff --git a/builds/mac/ftmac.c b/builds/mac/ftmac.c
index 60cf73e..f5747a4 100644
--- a/builds/mac/ftmac.c
+++ b/builds/mac/ftmac.c
@@ -1423,7 +1423,7 @@ typedef short ResourceIndex;
/* accepts an FSRef instead of a path. */
/* */
/* This function is deprecated because Carbon data types (FSRef) */
- /* are not cross-platform, and thus not suitable for the freetype API. */
+ /* are not cross-platform, and thus not suitable for the FreeType API. */
FT_EXPORT_DEF( FT_Error )
FT_New_Face_From_FSRef( FT_Library library,
const FSRef* ref,
@@ -1481,7 +1481,7 @@ typedef short ResourceIndex;
/* accepts an FSSpec instead of a path. */
/* */
/* This function is deprecated because Carbon data types (FSSpec) */
- /* are not cross-platform, and thus not suitable for the freetype API. */
+ /* are not cross-platform, and thus not suitable for the FreeType API. */
FT_EXPORT_DEF( FT_Error )
FT_New_Face_From_FSSpec( FT_Library library,
const FSSpec* spec,
diff --git a/builds/windows/detect.mk b/builds/windows/detect.mk
index 350d156..2032934 100644
--- a/builds/windows/detect.mk
+++ b/builds/windows/detect.mk
@@ -77,7 +77,7 @@ ifeq ($(PLATFORM),windows)
# So we need to hack.
#
# Kudos to Eli Zaretskii (DJGPP guru) that helped debug it.
- # Details are available in threads of the freetype mailing list
+ # Details are available in threads of the FreeType mailing list
# (2004-11-11), and then in the devel mailing list (2004-11-20 to -23).
#
ifeq ($(OS),Windows_NT)
diff --git a/docs/CHANGES b/docs/CHANGES
index 2bac995..9a62c9e 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -824,7 +824,7 @@ CHANGES BETWEEN 2.5.2 and 2.5.3
and install FreeType again.

With FreeType's `configure' script the procedure boils down to
- configure, build, and install Freetype, then configure, compile,
+ configure, build, and install FreeType, then configure, compile,
and install HarfBuzz, then configure, compile, and install
FreeType again (after executing `make distclean').

diff --git a/docs/INSTALL.VMS b/docs/INSTALL.VMS
index 7a5174d..6ba48d3 100644
--- a/docs/INSTALL.VMS
+++ b/docs/INSTALL.VMS
@@ -1,7 +1,7 @@
-How to build the freetype2 library on VMS
+How to build the FreeType 2 library on VMS
-----------------------------------------

-It is actually very straightforward to install the Freetype2 library.
+It is actually very straightforward to install the FreeType 2 library.
Just execute vms_make.com from the toplevel directory to build the
library. This procedure currently accepts the following options:

@@ -15,10 +15,10 @@ ccopt=
Options to pass to the C compiler e.g. ccopt=/float=ieee

In case you did download the demos, place them in a separate directory
-sharing the same toplevel as the directory of Freetype2 and follow the
-same instructions as above for the demos from there. The build
-process relies on this to figure the location of the Freetype2 include
-files.
+sharing the same top level as the directory of FreeType 2 and follow
+the same instructions as above for the demos from there. The build
+process relies on this to figure out the location of the FreeType 2
+include files.


To rebuild the sources it is necessary to have MMS/MMK installed on
diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT
index e116d34..a4e1980 100644
--- a/docs/VERSIONS.TXT
+++ b/docs/VERSIONS.TXT
@@ -99,7 +99,7 @@ other release numbers.
#include
#include FT_FREETYPE_H
#if (FREETYPE_MAJOR*1000 + FREETYPE_MINOR)*1000 + FREETYPE_PATCH < 2000009
-#error Freetype version too low.
+#error FreeType version too low.
#endif
],
[AC_MSG_RESULT(yes)
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index 4b92066..4e76585 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -1005,7 +1005,7 @@
/* accepts an FSRef instead of a path. */
/* */
/* This function is deprecated because Carbon data types (FSRef) */
- /* are not cross-platform, and thus not suitable for the freetype API. */
+ /* are not cross-platform, and thus not suitable for the FreeType API. */
FT_EXPORT_DEF( FT_Error )
FT_New_Face_From_FSRef( FT_Library library,
const FSRef* ref,
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 1d8bc2d..6db8136 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -4557,7 +4557,7 @@
if ( !clazz )
return FT_THROW( Invalid_Argument );

- /* check freetype version */
+ /* check FreeType version */
if ( clazz->module_requires > FREETYPE_VER_FIXED )
return FT_THROW( Invalid_Version );

diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c
index 66dae60..5cf386f 100644
--- a/src/base/ftsynth.c
+++ b/src/base/ftsynth.c
@@ -123,7 +123,7 @@

/*
* XXX: overflow check for 16-bit system, for compatibility
- * with FT_GlyphSlot_Embolden() since freetype-2.1.10.
+ * with FT_GlyphSlot_Embolden() since FreeType 2.1.10.
* unfortunately, this function return no informations
* about the cause of error.
*/
diff --git a/src/gxvalid/README b/src/gxvalid/README
index 7201459..200f66c 100644
--- a/src/gxvalid/README
+++ b/src/gxvalid/README
@@ -9,7 +9,7 @@ gxvalid: TrueType GX validator
additional tables in TrueType font which are used by `QuickDraw GX
Text', Apple Advanced Typography (AAT). In addition, gxvalid can
validates `kern' tables which have been extended for AAT. Like the
- otvalid module, gxvalid uses Freetype 2's validator framework
+ otvalid module, gxvalid uses FreeType 2's validator framework
(ftvalid).

You can link gxvalid with your program; before running your own layout
diff --git a/src/pcf/README b/src/pcf/README
index 10eff15..09ea970 100644
--- a/src/pcf/README
+++ b/src/pcf/README
@@ -41,8 +41,8 @@ value given as argument into the corresponding glyph number.
Known problems
**************

-- dealing explicitly with encodings breaks the uniformity of freetype2
- api.
+- dealing explicitly with encodings breaks the uniformity of FreeType 2
+ API.

- except for encodings properties, client applications have no
visibility of the PCF_Face object. This means that applications
diff --git a/vms_make.com b/vms_make.com
index ea56318..db0dca6 100644
--- a/vms_make.com
+++ b/vms_make.com
@@ -1,4 +1,4 @@
-$! make Freetype2 under OpenVMS
+$! make FreeType 2 under OpenVMS
$!
$! Copyright 2003-2017 by
$! David Turner, Robert Wilhelm, and Werner Lemberg.
@@ -10,7 +10,7 @@ $! indicate that you have read the license and understand and accept it
$! fully.
$!
$!
-$! External libraries (like Freetype, XPM, etc.) are supported via the
+$! External libraries (like FreeType, XPM, etc.) are supported via the
$! config file VMSLIB.DAT. Please check the sample file, which is part of this
$! distribution, for the information you need to provide
$!
@@ -26,12 +26,12 @@ $! In case of problems with the install you might contact me at
$! zinser@zinser.no-ip.info (preferred) or
$! zinser@sysdev.deutsche-boerse.com (work)
$!
-$! Make procedure history for Freetype2
+$! Make procedure history for FreeType 2
$!
$!------------------------------------------------------------------------------
$! Version history
$! 0.01 20040401 First version to receive a number
-$! 0.02 20041030 Add error handling, Freetype 2.1.9
+$! 0.02 20041030 Add error handling, FreeType 2.1.9
$!
$ on error then goto err_exit
$ true = 1
@@ -128,7 +128,7 @@ $ERR_LIB:
$ write sys$output "Error reading config file vmslib.dat"
$ goto err_exit
$FT2_ERR:
-$ write sys$output "Could not locate Freetype 2 include files"
+$ write sys$output "Could not locate FreeType 2 include files"
$ goto err_exit
$ERR_EXIT:
$ set message/facil/ident/sever/text
@@ -1070,7 +1070,7 @@ $ then
$ type/out=vmslib.dat sys$input
!
! This is a simple driver file with information used by vms_make.com to
-! check if external libraries (like t1lib and freetype) are available on
+! check if external libraries (like t1lib and FreeType) are available on
! the system.
!
! Layout of the file:
@@ -1148,7 +1148,7 @@ $ if f$locate("EXE",libtype) .lt. f$length(libtype) then lqual = "/share"
$ write optf libloc , lqual
$ if (f$trnlnm("topt") .nes. "") then write topt libloc , lqual
$!
-$! Nasty hack to get the freetype includes to work
+$! Nasty hack to get the FreeType includes to work
$!
$ ft2def = false
$ if ((libname .eqs. "FREETYPE") .and. -

22a7f5b Branding fixes.
ChangeLog.24 | 4 ++--
ChangeLog.25 | 2 +-
builds/mac/ftmac.c | 4 ++--
builds/windows/detect.mk | 2 +-
docs/CHANGES | 2 +-
docs/INSTALL.VMS | 12 ++++++------
docs/VERSIONS.TXT | 2 +-
src/base/ftmac.c | 2 +-
src/base/ftobjs.c | 2 +-
src/base/ftsynth.c | 2 +-
src/gxvalid/README | 2 +-
src/pcf/README | 4 ++--
vms_make.com | 14 +++++++-------
13 files changed, 27 insertions(+), 27 deletions(-)

Upstream: git.savannah.gnu.org


  • Share