diff options
author | Karl Berry <karl@freefriends.org> | 2008-04-28 17:43:51 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-04-28 17:43:51 +0000 |
commit | 788b6dfdc51830f7148c039b45033b28cc210481 (patch) | |
tree | 1bb47bfc3a47a298cd347103a944cf8ebb2ca5d9 /Build/source/texk/lcdf-typetools/mmafm | |
parent | cfcfd819c353a546190e28baa022976c3aafa338 (diff) |
lcdf-typetools 2.67
git-svn-id: svn://tug.org/texlive/trunk@7711 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools/mmafm')
-rw-r--r-- | Build/source/texk/lcdf-typetools/mmafm/Makefile.in | 100 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/mmafm/main.cc | 40 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/mmafm/mmafm.1 | 2 |
3 files changed, 78 insertions, 64 deletions
diff --git a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in index 7fc3afae05c..8664b398f9d 100644 --- a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in +++ b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -50,7 +46,7 @@ PROGRAMS = $(bin_PROGRAMS) am_mmafm_OBJECTS = main.$(OBJEXT) mmafm_OBJECTS = $(am_mmafm_OBJECTS) mmafm_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -67,8 +63,6 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -92,6 +86,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FIXLIBC_O = @FIXLIBC_O@ +GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -104,9 +100,8 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -122,14 +117,12 @@ SHELL = @SHELL@ STRIP = @STRIP@ TEMPLATE_OBJS = @TEMPLATE_OBJS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -137,24 +130,35 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ +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@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign man_MANS = mmafm.1 mmafm_SOURCES = main.cc @@ -197,7 +201,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -220,7 +224,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) mmafm$(EXEEXT): $(mmafm_OBJECTS) $(mmafm_DEPENDENCIES) @rm -f mmafm$(EXEEXT) - $(CXXLINK) $(mmafm_LDFLAGS) $(mmafm_OBJECTS) $(mmafm_LDADD) $(LIBS) + $(CXXLINK) $(mmafm_OBJECTS) $(mmafm_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -231,22 +235,21 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -339,22 +342,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -370,7 +372,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -419,12 +421,20 @@ info-am: install-data-am: install-man +install-dvi: install-dvi-am + install-exec-am: install-binPROGRAMS +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -444,21 +454,25 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man +uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am uninstall-man uninstall-man1 + uninstall-man uninstall-man1 # 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. diff --git a/Build/source/texk/lcdf-typetools/mmafm/main.cc b/Build/source/texk/lcdf-typetools/mmafm/main.cc index 8c04fecf160..b58480e72c7 100644 --- a/Build/source/texk/lcdf-typetools/mmafm/main.cc +++ b/Build/source/texk/lcdf-typetools/mmafm/main.cc @@ -44,22 +44,22 @@ #define PRECISION_OPT 311 #define KERN_PREC_OPT 312 -Clp_Option options[] = { - { "1", '1', N1_OPT, Clp_ArgDouble, 0 }, - { "2", '2', N2_OPT, Clp_ArgDouble, 0 }, - { "3", '3', N3_OPT, Clp_ArgDouble, 0 }, - { "4", '4', N4_OPT, Clp_ArgDouble, 0 }, - { "weight", 'w', WEIGHT_OPT, Clp_ArgDouble, 0 }, - { "width", 'W', WIDTH_OPT, Clp_ArgDouble, 0 }, - { "optical-size", 'O', OPSIZE_OPT, Clp_ArgDouble, 0 }, - { "style", 0, STYLE_OPT, Clp_ArgDouble, 0 }, - { "wt", 0, WEIGHT_OPT, Clp_ArgDouble, 0 }, - { "wd", 0, WIDTH_OPT, Clp_ArgDouble, 0 }, - { "min-kern", 'k', KERN_PREC_OPT, Clp_ArgDouble, 0 }, - { "minimum-kern", 'k', KERN_PREC_OPT, Clp_ArgDouble, 0 }, - { "kern-precision", 'k', KERN_PREC_OPT, Clp_ArgDouble, 0 }, - { "output", 'o', OUTPUT_OPT, Clp_ArgString, 0 }, - { "precision", 'p', PRECISION_OPT, Clp_ArgInt, 0 }, +const Clp_Option options[] = { + { "1", '1', N1_OPT, Clp_ValDouble, 0 }, + { "2", '2', N2_OPT, Clp_ValDouble, 0 }, + { "3", '3', N3_OPT, Clp_ValDouble, 0 }, + { "4", '4', N4_OPT, Clp_ValDouble, 0 }, + { "weight", 'w', WEIGHT_OPT, Clp_ValDouble, 0 }, + { "width", 'W', WIDTH_OPT, Clp_ValDouble, 0 }, + { "optical-size", 'O', OPSIZE_OPT, Clp_ValDouble, 0 }, + { "style", 0, STYLE_OPT, Clp_ValDouble, 0 }, + { "wt", 0, WEIGHT_OPT, Clp_ValDouble, 0 }, + { "wd", 0, WIDTH_OPT, Clp_ValDouble, 0 }, + { "min-kern", 'k', KERN_PREC_OPT, Clp_ValDouble, 0 }, + { "minimum-kern", 'k', KERN_PREC_OPT, Clp_ValDouble, 0 }, + { "kern-precision", 'k', KERN_PREC_OPT, Clp_ValDouble, 0 }, + { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 }, + { "precision", 'p', PRECISION_OPT, Clp_ValInt, 0 }, { "version", 'v', VERSION_OPT, 0, 0 }, { "help", 'h', HELP_OPT, 0, 0 }, }; @@ -305,12 +305,12 @@ main(int argc, char *argv[]) case OUTPUT_OPT: if (output_file) errh->fatal("output file already specified"); - if (strcmp(clp->arg, "-") == 0) + if (strcmp(clp->vstr, "-") == 0) output_file = stdout; else { - output_file = fopen(clp->arg, "wb"); + output_file = fopen(clp->vstr, "wb"); if (!output_file) - errh->fatal("%s: %s", clp->arg, strerror(errno)); + errh->fatal("%s: %s", clp->vstr, strerror(errno)); } break; @@ -329,7 +329,7 @@ particular purpose.\n"); break; case Clp_NotOption: - read_file(clp->arg, finder); + read_file(clp->vstr, finder); break; case Clp_Done: diff --git a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 index 780e1b6d2a4..c56e333a0d5 100644 --- a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 +++ b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 @@ -1,5 +1,5 @@ .\" -*-nroff-*- -.ds V 2.66 +.ds V 2.67 .de M .BR "\\$1" "(\\$2)\\$3" .. |