Minor (whitespace, spelling, doc update).

This commit is contained in:
Werner Lemberg 2019-02-20 12:48:36 +01:00
parent 0ac6921109
commit de8de1ce0e
4 changed files with 29 additions and 23 deletions

View File

@ -298,21 +298,22 @@ PIP ?= pip
refdoc: refdoc:
@echo Running docwriter... @echo Running docwriter...
$(PYTHON) -m docwriter \ $(PYTHON) -m docwriter \
--prefix=ft2 \ --prefix=ft2 \
--title=FreeType-$(version) \ --title=FreeType-$(version) \
--output=$(DOC_DIR) \ --output=$(DOC_DIR) \
$(PUBLIC_DIR)/*.h \ $(PUBLIC_DIR)/*.h \
$(PUBLIC_DIR)/config/*.h \ $(PUBLIC_DIR)/config/*.h \
$(PUBLIC_DIR)/cache/*.h $(PUBLIC_DIR)/cache/*.h
@echo Building static site... @echo Building static site...
cd $(DOC_DIR) && mkdocs build cd $(DOC_DIR) && mkdocs build
@echo Done. @echo Done.
# Variables for running refdoc with Python's `virtualenv'. The env is # Variables for running `refdoc' with Python's `virtualenv'. The
# created in `DOC_DIR/env' and is gitignored. # environment is created in `DOC_DIR/env' and is gitignored.
# We still need to cd into `DOC_DIR' to build mkdocs because paths in #
# mkdocs.yml are relative to cwd. # We still need to cd into `DOC_DIR' to build `mkdocs' because paths in
# `mkdocs.yml' are relative to the current working directory.
# #
VENV_NAME := env VENV_NAME := env
VENV_DIR := $(DOC_DIR)$(SEP)$(VENV_NAME) VENV_DIR := $(DOC_DIR)$(SEP)$(VENV_NAME)
@ -325,13 +326,13 @@ refdoc-venv:
@echo Installing docwriter... @echo Installing docwriter...
$(ENV_PIP) install docwriter $(ENV_PIP) install docwriter
@echo Running docwriter... @echo Running docwriter...
$(ENV_PYTHON) -m docwriter \ $(ENV_PYTHON) -m docwriter \
--prefix=ft2 \ --prefix=ft2 \
--title=FreeType-$(version) \ --title=FreeType-$(version) \
--output=$(DOC_DIR) \ --output=$(DOC_DIR) \
$(PUBLIC_DIR)/*.h \ $(PUBLIC_DIR)/*.h \
$(PUBLIC_DIR)/config/*.h \ $(PUBLIC_DIR)/config/*.h \
$(PUBLIC_DIR)/cache/*.h $(PUBLIC_DIR)/cache/*.h
@echo Building static site... @echo Building static site...
cd $(DOC_DIR) && $(VENV_NAME)$(SEP)$(BIN)$(SEP)python -m mkdocs build cd $(DOC_DIR) && $(VENV_NAME)$(SEP)$(BIN)$(SEP)python -m mkdocs build
@echo Done. @echo Done.

View File

@ -37,7 +37,7 @@ AC_SUBST(EXEEXT)
PKG_PROG_PKG_CONFIG([0.24]) PKG_PROG_PKG_CONFIG([0.24])
LT_INIT(win32-dll) LT_INIT(win32-dll)
AC_CHECK_HEADER([windows.h],[LT_PROG_RC]) AC_CHECK_HEADER([windows.h], [LT_PROG_RC])
# checks for native programs to generate building tool # checks for native programs to generate building tool
@ -196,7 +196,7 @@ AC_SYS_LARGEFILE
AC_ARG_ENABLE([mmap], AC_ARG_ENABLE([mmap],
AS_HELP_STRING([--disable-mmap], AS_HELP_STRING([--disable-mmap],
[do not check mmap() and do not use]), [do not check mmap() and do not use]),
[enable_mmap="no"],[enable_mmap="yes"]) [enable_mmap="no"], [enable_mmap="yes"])
if test "x${enable_mmap}" != "xno"; then if test "x${enable_mmap}" != "xno"; then
AC_FUNC_MMAP AC_FUNC_MMAP
fi fi
@ -315,7 +315,7 @@ found_visibility_flag=no
AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
orig_CFLAGS="${CFLAGS}" orig_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} -fvisibility=hidden" CFLAGS="${CFLAGS} -fvisibility=hidden"
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[found_visibility_flag=yes [found_visibility_flag=yes
AC_MSG_RESULT(yes)], AC_MSG_RESULT(yes)],
[CFLAGS="${orig_CFLAGS}" [CFLAGS="${orig_CFLAGS}"
@ -325,7 +325,7 @@ if test "${found_visibility_flag}" = "no"; then
AC_MSG_CHECKING([for -xldscope=hidden compiler flag]) AC_MSG_CHECKING([for -xldscope=hidden compiler flag])
orig_CFLAGS="${CFLAGS}" orig_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} -xldscope=hidden" CFLAGS="${CFLAGS} -xldscope=hidden"
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[found_visibility_flag=yes [found_visibility_flag=yes
AC_MSG_RESULT(yes)], AC_MSG_RESULT(yes)],
[CFLAGS="${orig_CFLAGS}" [CFLAGS="${orig_CFLAGS}"

View File

@ -79,6 +79,11 @@ CHANGES BETWEEN 2.9.1 and 2.10
functions limited to Adobe MultiMaster fonts to directly set and functions limited to Adobe MultiMaster fonts to directly set and
get the weight vector. get the weight vector.
- Support for Position Independent Code as needed by systems that
prohibit automatic address fixups, such as BREW, has been
removed. [Compilation with modern compilers that use flags like
`-fPIC' or `-fPIE' is not affected.]
====================================================================== ======================================================================

View File

@ -860,7 +860,7 @@
case cff_op_flex1: case cff_op_flex1:
case cff_op_callsubr: case cff_op_callsubr:
case cff_op_callgsubr: case cff_op_callgsubr:
/* depracated opcodes */ /* deprecated opcodes */
case cff_op_dotsection: case cff_op_dotsection:
/* invalid Type 1 opcodes */ /* invalid Type 1 opcodes */
case cff_op_hsbw: case cff_op_hsbw: