Update fonts/encodings to 1.0.3

This commit is contained in:
matthieu 2010-07-24 20:54:34 +00:00
parent 46bd21e1f7
commit 407bd7f69e
12 changed files with 9979 additions and 1264 deletions

View File

@ -1,28 +1,12 @@
XFree86 code without an explicit copyright is covered by the following
copyright/license:
The XFree86/Xorg encoding files are in the public domain.
Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
Most of these encoding files were generated by me in the winter of 1998/1998
from publicly available sources (notably from data files provided by the
Unicode Consortium) using a throw-away program written in Common Lisp. Over
the years, a number of people have kindly added new encoding files to the
collection.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
If you want to add a copyright statement to an encoding file, you need
your brain examined.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of the XFree86 Project
shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
from the XFree86 Project.
Juliusz Chroboczek

View File

@ -1,3 +1,57 @@
commit 37d2a7c362a330d6aaa4d348a5db81da844ef7a8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat Oct 10 17:56:53 2009 -0700
encodings 1.0.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit ba904c20fa5e80449d515c8c8f04953db5a64a06
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 7 16:46:52 2009 -0700
Migrate to xorg macros 1.3 & font-util 1.1 macros
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 8053655dd5714014ecca5182471c96f5223feb29
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 6 19:15:31 2009 -0700
Add pointers to mailing lists, bugzilla, & git to README
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 6a86a2a95a40350ce19a6f5e802452cc28f1b968
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 19:11:08 2009 -0200
Janitor: Correct make distcheck and configure.ac simplification
commit 862d94a9b9931361c546d951b7026258d944fdad
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 19:10:58 2009 -0200
Janitor: Correct make distcheck and configure.ac simplification
commit d1546d162b4fe12c5d01479ded02b00bff5a9c64
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 15:51:13 2007 -0500
Add missing PHONY line for automatic ChangeLog generation
commit 0feb027d6c94a7896c5d2fb861de8c69340998db
Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
Date: Mon Jul 23 22:55:01 2007 +0200
Replace generic copyright statement.
commit 6e799b71a736588a5aeb274851bc8a81323d661e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 16:01:11 2006 +0200
bump to 1.0.2
commit 1963f4ab3ce7625ff687cbd4a94605aef86c7c03
Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
Date: Mon Nov 6 19:55:15 2006 +0100

View File

@ -47,23 +47,25 @@ if GZIP_SMALL
DATA_FILES = $(COMPRESSED)
CLEANFILES += $(COMPRESSED)
else
DATA_FILES = $(ENCODING_FILES) encodings.dir
DATA_FILES = $(ENCODING_FILES)
endif
SUFFIXES = .enc .enc.gz
.enc.enc.gz:
@GZIP@ -c < $< > $@
$(AM_V_GEN)$(GZIP) -c < $< > $@
encodings.dir: $(DATA_FILES)
@MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . -e large .
$(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . -e large .
encodings_DATA = $(DATA_FILES) encodings.dir
MAINTAINERCLEANFILES=ChangeLog
.PHONY: ChangeLog
ChangeLog:
git-log > ChangeLog
$(CHANGELOG_CMD)
dist-hook: ChangeLog

View File

@ -34,11 +34,13 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@GZIP_SMALL_TRUE@am__append_1 = $(COMPRESSED)
subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/configure COPYING \
ChangeLog install-sh missing
ChangeLog config.guess config.sub install-sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -79,31 +81,62 @@ GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENCODINGSDIR = @ENCODINGSDIR@
EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
FONTROOTDIR = @FONTROOTDIR@
GREP = @GREP@
GZIP = @GZIP@
GZIP_LARGE_FALSE = @GZIP_LARGE_FALSE@
GZIP_LARGE_TRUE = @GZIP_LARGE_TRUE@
GZIP_SMALL_FALSE = @GZIP_SMALL_FALSE@
GZIP_SMALL_TRUE = @GZIP_SMALL_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
MKFONTSCALE = @MKFONTSCALE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -111,30 +144,52 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@ -179,7 +234,7 @@ ENCODING_FILES = \
EXTRA_DIST = $(ENCODING_FILES) ChangeLog
COMPRESSED = $(ENCODING_FILES:%=%.gz)
CLEANFILES = encodings.dir $(am__append_1)
@GZIP_SMALL_FALSE@DATA_FILES = $(ENCODING_FILES) encodings.dir
@GZIP_SMALL_FALSE@DATA_FILES = $(ENCODING_FILES)
@GZIP_SMALL_TRUE@DATA_FILES = $(COMPRESSED)
SUFFIXES = .enc .enc.gz
encodings_DATA = $(DATA_FILES) encodings.dir
@ -619,13 +674,15 @@ uninstall-info: uninstall-info-recursive
.enc.enc.gz:
@GZIP@ -c < $< > $@
$(AM_V_GEN)$(GZIP) -c < $< > $@
encodings.dir: $(DATA_FILES)
@MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . -e large .
$(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . -e large .
.PHONY: ChangeLog
ChangeLog:
git-log > ChangeLog
$(CHANGELOG_CMD)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.

24
font/encodings/README Normal file
View File

@ -0,0 +1,24 @@
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
Please submit bug reports to the Xorg bugzilla:
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/font/encodings
http://cgit.freedesktop.org/xorg/font/encodings
For patch submission instructions, see:
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage

File diff suppressed because it is too large Load Diff

1463
font/encodings/config.guess vendored Normal file

File diff suppressed because it is too large Load Diff

1579
font/encodings/config.sub vendored Normal file

File diff suppressed because it is too large Load Diff

6043
font/encodings/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -1,29 +1,40 @@
AC_PREREQ([2.57])
AC_INIT([encodings], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_INIT([encodings], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
AC_PROG_INSTALL
# Require X.Org's font util macros 1.1 or later
m4_ifndef([XORG_FONT_MACROS_VERSION],
[m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])
XORG_FONT_MACROS_VERSION(1.1)
# mkfontscale
AC_PATH_PROG(MKFONTSCALE, mkfontscale)
if [[ -z $MKFONTSCALE ]]; then
AC_MSG_ERROR([mkfontscale is needed to build fontenc. Please install the app/mkfontscale package from X.Org.])
fi
XORG_FONT_REQUIRED_PROG(MKFONTSCALE, mkfontscale)
# Choose whether or not to compress encodings - default is to compress all
AC_MSG_CHECKING([if small encodings should be compressed])
AC_ARG_ENABLE(gzip-small-encodings,
AS_HELP_STRING([--disable-gzip-small-encodings],
AC_HELP_STRING([--disable-gzip-small-encodings],
[Disable compression of small encoding files]),
[GZIP_SMALL="$enableval"], [GZIP_SMALL="yes"])
AM_CONDITIONAL(GZIP_SMALL, [test x$GZIP_SMALL = xyes])
AC_MSG_RESULT([${GZIP_SMALL}])
AC_MSG_CHECKING([if large encodings should be compressed])
AC_ARG_ENABLE(gzip-large-encodings,
AS_HELP_STRING([--disable-gzip-large-encodings],
AC_HELP_STRING([--disable-gzip-large-encodings],
[Disable compression of large encoding files]),
[GZIP_LARGE="$enableval"], [GZIP_LARGE="yes"])
AM_CONDITIONAL(GZIP_LARGE, [test x$GZIP_LARGE = xyes])
AC_MSG_RESULT([${GZIP_LARGE}])
# gzip
@ -34,13 +45,6 @@ if test x$GZIP_SMALL = xyes -o x$GZIP_LARGE = xyes ; then
fi
fi
DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
AC_ARG_WITH(encodingsdir,
AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to install font encodings]),
[ENCODINGSDIR="$withval"],
[ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"])
AC_SUBST(ENCODINGSDIR)
XORG_RELEASE_VERSION
XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings])
AC_OUTPUT([Makefile large/Makefile])

View File

@ -34,9 +34,9 @@ endif
SUFFIXES = .enc .enc.gz
.enc.enc.gz:
@GZIP@ -c < $< > $@
$(AM_V_GEN)$(GZIP) -c < $< > $@
encodings.dir: $(DATA_FILES)
@MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . .
$(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . .
encodings_DATA = $(DATA_FILES) encodings.dir

View File

@ -34,6 +34,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@GZIP_LARGE_TRUE@am__append_1 = $(COMPRESSED)
subdir = large
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@ -56,31 +58,62 @@ encodingsDATA_INSTALL = $(INSTALL_DATA)
DATA = $(encodings_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENCODINGSDIR = @ENCODINGSDIR@
EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
FONTROOTDIR = @FONTROOTDIR@
GREP = @GREP@
GZIP = @GZIP@
GZIP_LARGE_FALSE = @GZIP_LARGE_FALSE@
GZIP_LARGE_TRUE = @GZIP_LARGE_TRUE@
GZIP_SMALL_FALSE = @GZIP_SMALL_FALSE@
GZIP_SMALL_TRUE = @GZIP_SMALL_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
MKFONTSCALE = @MKFONTSCALE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -88,30 +121,52 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@ -317,10 +372,10 @@ uninstall-am: uninstall-encodingsDATA uninstall-info-am
.enc.enc.gz:
@GZIP@ -c < $< > $@
$(AM_V_GEN)$(GZIP) -c < $< > $@
encodings.dir: $(DATA_FILES)
@MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . .
$(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . .
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: