From e8d3097d42969fa1e32eff2ece252ff584d3d56a Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 20 Aug 2010 09:27:12 -0400 Subject: config: upgrade to util-macros 1.8 for additional man page support Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS The value of MAN_SUBST is the same for all X.Org packages. Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS Signed-off-by: Gaetan Nadon --- Makefile.am | 26 +++---------------- bdftruncate.man | 32 ----------------------- configure.ac | 13 +++++++--- man/Makefile.am | 35 +++++++++++++++++++++++++ man/bdftruncate.man | 32 +++++++++++++++++++++++ man/ucs2any.man | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ ucs2any.man | 74 ----------------------------------------------------- 7 files changed, 153 insertions(+), 133 deletions(-) delete mode 100644 bdftruncate.man create mode 100644 man/Makefile.am create mode 100644 man/bdftruncate.man create mode 100644 man/ucs2any.man delete mode 100644 ucs2any.man diff --git a/Makefile.am b/Makefile.am index 5fa1514..48561ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = bdftruncate ucs2any AM_CFLAGS = $(CWARNFLAGS) @@ -52,33 +53,12 @@ mapfiles_DATA = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fontutil.pc -appmandir = $(APP_MAN_DIR) -appman_PRE = bdftruncate.man ucs2any.man -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) +CLEANFILES = bdftruncate -CLEANFILES = bdftruncate $(appman_DATA) - -EXTRA_DIST = $(mapfiles_DATA) $(appman_PRE) +EXTRA_DIST = $(mapfiles_DATA) MAINTAINERCLEANFILES = ChangeLog INSTALL -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -SED = sed - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__mapfilesdir__|$(mapfilesdir)|g' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - - .PHONY: ChangeLog INSTALL INSTALL: diff --git a/bdftruncate.man b/bdftruncate.man deleted file mode 100644 index 55cc0b7..0000000 --- a/bdftruncate.man +++ /dev/null @@ -1,32 +0,0 @@ -.TH bdftruncate __appmansuffix__ __vendorversion__ -.SH NAME -bdftruncate \- generate truncated BDF font from ISO 10646-1-encoded BDF font -.SH SYNOPSIS -.B bdftruncate -.I threshold -.B < -.I source.bdf -.B > -.I destination.bdf -.SH DESCRIPTION -.B bdftruncate -allows one to generate from an ISO10646-1 encoded BDF font other ISO10646-1 -BDF fonts in which all characters above a threshold code value are stored -unencoded. This is often desirable because the Xlib API and X11 protocol -data structures used for representing font metric information are extremely -inefficient when handling sparsely populated fonts. -.SH EXAMPLE -The command -.RS -bdftruncate 0x3200 < 6x13.bdf > 6x13t.bdf -.RE -will generate the file 6x13t.bdf in which all glyphs with codes ->= 0x3200 will only be stored unencoded (i.e., they are encoded at -codepoint -1). -.SH "SEE ALSO" -.BR ucs2any (1) -.SH AUTHOR -.B bdftruncate -was written by Markus Kuhn. -.PP -Branden Robinson wrote this manual page, originally for the Debian Project. diff --git a/configure.ac b/configure.ac index f3b63c3..bc08ec2 100644 --- a/configure.ac +++ b/configure.ac @@ -26,10 +26,10 @@ AC_INIT(font-util, [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product= AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) AM_CONFIG_HEADER(config.h) XORG_DEFAULT_OPTIONS @@ -52,4 +52,9 @@ AC_ARG_WITH(mapdir, [AC_HELP_STRING([--with-mapdir=DIR], MAPDIR="$mapdir" AC_SUBST(MAPDIR) -AC_OUTPUT([Makefile fontutil.m4 fontutil.pc]) +AC_CONFIG_FILES([Makefile + man/Makefile + fontutil.m4 + fontutil.pc]) + +AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..bf8199f --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,35 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# 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: +# +# The above copyright notice and this permission notice (including the next +# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. +# + +appmandir = $(APP_MAN_DIR) +appman_PRE = bdftruncate.man ucs2any.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man +MAN_SUBSTS += -e 's|__mapfilesdir__|$(MAPDIR)|g' + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/man/bdftruncate.man b/man/bdftruncate.man new file mode 100644 index 0000000..55cc0b7 --- /dev/null +++ b/man/bdftruncate.man @@ -0,0 +1,32 @@ +.TH bdftruncate __appmansuffix__ __vendorversion__ +.SH NAME +bdftruncate \- generate truncated BDF font from ISO 10646-1-encoded BDF font +.SH SYNOPSIS +.B bdftruncate +.I threshold +.B < +.I source.bdf +.B > +.I destination.bdf +.SH DESCRIPTION +.B bdftruncate +allows one to generate from an ISO10646-1 encoded BDF font other ISO10646-1 +BDF fonts in which all characters above a threshold code value are stored +unencoded. This is often desirable because the Xlib API and X11 protocol +data structures used for representing font metric information are extremely +inefficient when handling sparsely populated fonts. +.SH EXAMPLE +The command +.RS +bdftruncate 0x3200 < 6x13.bdf > 6x13t.bdf +.RE +will generate the file 6x13t.bdf in which all glyphs with codes +>= 0x3200 will only be stored unencoded (i.e., they are encoded at +codepoint -1). +.SH "SEE ALSO" +.BR ucs2any (1) +.SH AUTHOR +.B bdftruncate +was written by Markus Kuhn. +.PP +Branden Robinson wrote this manual page, originally for the Debian Project. diff --git a/man/ucs2any.man b/man/ucs2any.man new file mode 100644 index 0000000..0a619f4 --- /dev/null +++ b/man/ucs2any.man @@ -0,0 +1,74 @@ +.TH ucs2any __appmansuffix__ __vendorversion__ +.SH NAME +ucs2any \- generate BDF fonts containing subsets of ISO 10646-1 codepoints +.SH SYNOPSIS +.B ucs2any +[ +.B +d +| +.B -d +] +.I source-name +{ +.I mapping-file +.I registry-encoding +} +\&.\|.\|. +.SH DESCRIPTION +.B ucs2any +allows one to generate from an ISO 10646-1 encoded BDF font other BDF fonts +in any possible encoding. This way, one can derive from a single +ISO 10646-1 master font a whole set of 8-bit fonts in all ISO 8859 and +various other encodings. +.SH OPTIONS +.TP +.B +d +puts DEC VT100 graphics characters in the C0 range (default for upright, +character-cell fonts). +.TP +.B \-d +omits DEC VT100 graphics characters from the C0 range (default for all +font types except upright, character-cell fonts). +.SH OPERANDS +.TP +.I source-name +is the name of an ISO 10646-1 encoded BDF file. +.TP +.I mapping-file +is the name of a character set table like those at +.BR . +These files can also typically be found installed in the +.I __mapfilesdir__ +directory. +.TP +.I registry-encoding +are the CHARSET_REGISTRY and CHARSET_ENCODING field values for the font +name (XLFD) of the target font, separated by a hyphen. +.PP +Any number of +.I mapping-file +and +.I registry-encoding +operand pairs may be specified. +.SH EXAMPLE +The command +.RS +ucs2any 6x13.bdf 8859-1.TXT iso8859-1 8859-2.TXT iso8859-2 +.RE +will generate the files +.I 6x13-iso8859-1.bdf +and +.IR 6x13-iso8859-2.bdf . +.SH FUTURE DIRECTIONS +Hopefully a future release will have a facility similar to +.B ucs2any +built into the server, and reencode ISO 10646-1 on the fly, because +storing the same fonts in many different encodings is clearly a waste of +storage capacity. +.SH "SEE ALSO" +.BR bdftruncate (1) +.SH AUTHOR +.B ucs2any +was written by Markus Kuhn. +.PP +Branden Robinson wrote this manual page, originally for the Debian Project. diff --git a/ucs2any.man b/ucs2any.man deleted file mode 100644 index 0a619f4..0000000 --- a/ucs2any.man +++ /dev/null @@ -1,74 +0,0 @@ -.TH ucs2any __appmansuffix__ __vendorversion__ -.SH NAME -ucs2any \- generate BDF fonts containing subsets of ISO 10646-1 codepoints -.SH SYNOPSIS -.B ucs2any -[ -.B +d -| -.B -d -] -.I source-name -{ -.I mapping-file -.I registry-encoding -} -\&.\|.\|. -.SH DESCRIPTION -.B ucs2any -allows one to generate from an ISO 10646-1 encoded BDF font other BDF fonts -in any possible encoding. This way, one can derive from a single -ISO 10646-1 master font a whole set of 8-bit fonts in all ISO 8859 and -various other encodings. -.SH OPTIONS -.TP -.B +d -puts DEC VT100 graphics characters in the C0 range (default for upright, -character-cell fonts). -.TP -.B \-d -omits DEC VT100 graphics characters from the C0 range (default for all -font types except upright, character-cell fonts). -.SH OPERANDS -.TP -.I source-name -is the name of an ISO 10646-1 encoded BDF file. -.TP -.I mapping-file -is the name of a character set table like those at -.BR . -These files can also typically be found installed in the -.I __mapfilesdir__ -directory. -.TP -.I registry-encoding -are the CHARSET_REGISTRY and CHARSET_ENCODING field values for the font -name (XLFD) of the target font, separated by a hyphen. -.PP -Any number of -.I mapping-file -and -.I registry-encoding -operand pairs may be specified. -.SH EXAMPLE -The command -.RS -ucs2any 6x13.bdf 8859-1.TXT iso8859-1 8859-2.TXT iso8859-2 -.RE -will generate the files -.I 6x13-iso8859-1.bdf -and -.IR 6x13-iso8859-2.bdf . -.SH FUTURE DIRECTIONS -Hopefully a future release will have a facility similar to -.B ucs2any -built into the server, and reencode ISO 10646-1 on the fly, because -storing the same fonts in many different encodings is clearly a waste of -storage capacity. -.SH "SEE ALSO" -.BR bdftruncate (1) -.SH AUTHOR -.B ucs2any -was written by Markus Kuhn. -.PP -Branden Robinson wrote this manual page, originally for the Debian Project. -- cgit v1.2.1