diff options
Diffstat (limited to 'src/foomatic')
| -rw-r--r-- | src/foomatic/Makefile.am | 6 | ||||
| -rw-r--r-- | src/foomatic/Makefile.in | 10 | ||||
| -rw-r--r-- | src/foomatic/foomatic-generator.in | 25 | ||||
| -rw-r--r-- | src/foomatic/foomatic-templates-ijs/gutenprint.xml | 2 | ||||
| -rw-r--r-- | src/foomatic/printer_options.c | 3 |
5 files changed, 35 insertions, 11 deletions
diff --git a/src/foomatic/Makefile.am b/src/foomatic/Makefile.am index fc5880d..bc5666d 100644 --- a/src/foomatic/Makefile.am +++ b/src/foomatic/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.53 2010/08/07 02:30:38 rlk Exp $ +## $Id: Makefile.am,v 1.56 2011/12/24 02:10:46 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -91,12 +91,12 @@ install-kit: fi clean-local: - -$(RM) -r foomatic-db + -$(RM) -rf foomatic-db foomatic-data: foomatic-stamp foomatic-stamp: foomatic-generator $(noinst_PROGRAMS) mk_printerlist $(top_builddir)/src/xml/xml-stamp - -$(RM) -r foomatic-db + -$(RM) -rf foomatic-db $(FOOMATIC_GENERATOR) -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS) $(FOOMATIC_GENERATOR) -s -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS) touch foomatic-stamp diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in index a1f28f3..74f9922 100644 --- a/src/foomatic/Makefile.in +++ b/src/foomatic/Makefile.in @@ -130,6 +130,7 @@ DB2PS = @DB2PS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ +DLLTOOL = @DLLTOOL@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -206,6 +207,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -226,6 +228,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUG_IN_PATH = @PLUG_IN_PATH@ POSUB = @POSUB@ RANLIB = @RANLIB@ @@ -249,6 +253,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -295,7 +300,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -674,12 +678,12 @@ install-kit: fi clean-local: - -$(RM) -r foomatic-db + -$(RM) -rf foomatic-db foomatic-data: foomatic-stamp foomatic-stamp: foomatic-generator $(noinst_PROGRAMS) mk_printerlist $(top_builddir)/src/xml/xml-stamp - -$(RM) -r foomatic-db + -$(RM) -rf foomatic-db $(FOOMATIC_GENERATOR) -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS) $(FOOMATIC_GENERATOR) -s -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS) touch foomatic-stamp diff --git a/src/foomatic/foomatic-generator.in b/src/foomatic/foomatic-generator.in index 69a8e7e..626bc9c 100644 --- a/src/foomatic/foomatic-generator.in +++ b/src/foomatic/foomatic-generator.in @@ -89,8 +89,6 @@ my @parameter_level_names = ( my $option_remap = ""; my $opt_index = 0; -use Data::Dumper; - if (! $opt_x) { open PIPE, "./printer_options $simplified_subopt|" or die "Cannot run printer_options: $!\n"; print STDERR "Loading options from ./printer_options $simplified_subopt..."; @@ -1284,21 +1282,36 @@ sub qualityorder { "dpi_high2", "dpi_high3", "dpi_high4", + "dpi_high5", "dpi_highmono", "dpi_highmono2", + "dpi_highmono3", + "dpi_highmono4", + "dpi_highmono5", "dpi_mono", + "dpi_mono2", + "dpi_mono3", + "dpi_mono4", + "dpi_mono5", "dpi_draft", "dpi_draft2", "dpi_draft3", + "dpi_draft4", + "dpi_draft5", "dpi_std2", "dpi_std3", + "dpi_std4", + "dpi_std5", "dpi_draftmono", "dpi_draftmono2", - "dpi_glossphotohigh", + "dpi_draftmono3", + "dpi_draftmono4", + "dpi_draftmono5", "dpi_photohigh", "dpi_photohigh2", "dpi_photohigh3", "dpi_photohigh4", + "dpi_photohigh5", "dpi_tshirt", "dpi_photomed", "dpi_photomed2", @@ -1306,13 +1319,19 @@ sub qualityorder { "dpi_photo2", "dpi_photo3", "dpi_photo4", + "dpi_photo5", "dpi_photodraft", "dpi_photodraft2", "dpi_photodraft3", + "dpi_photodraft4", + "dpi_photodraft5", "dpi_photomonohigh", + "dpi_photomonohigh2", "dpi_photomonomed", "dpi_photomono", + "dpi_photomono2", "dpi_photomonodraft", + "dpi_photomonodraft2", "dpi_ohphigh", "dpi_ohp" ); diff --git a/src/foomatic/foomatic-templates-ijs/gutenprint.xml b/src/foomatic/foomatic-templates-ijs/gutenprint.xml index 399dd8d..040ccf6 100644 --- a/src/foomatic/foomatic-templates-ijs/gutenprint.xml +++ b/src/foomatic/foomatic-templates-ijs/gutenprint.xml @@ -3,7 +3,7 @@ <url>http://gimp-print.sourceforge.net/</url> <execution> <filter /> - <prototype>gs -q -dPARANOIDSAFER -dNOPAUSE -dBATCH -sDEVICE=ijs -sIjsServer=ijsgutenprint.@@STPREL@@ -dIjsUseOutputFD%A -sIjsParams="@@REMAP@@STP_VERSION=@@STPVER@@,%B"%Z -sOutputFile=- -</prototype> + <prototype>gs -q -dPARANOIDSAFER -dNOPAUSE -dBATCH -dNOINTERPOLATE -sDEVICE=ijs -sIjsServer=ijsgutenprint.@@STPREL@@ -dIjsUseOutputFD%A -sIjsParams="@@REMAP@@STP_VERSION=@@STPVER@@,%B"%Z -sOutputFile=- -</prototype> </execution> <comments> <en> diff --git a/src/foomatic/printer_options.c b/src/foomatic/printer_options.c index a5b4c45..331d32e 100644 --- a/src/foomatic/printer_options.c +++ b/src/foomatic/printer_options.c @@ -1,5 +1,5 @@ /* - * "$Id: printer_options.c,v 1.52 2007/05/06 19:38:10 rlk Exp $" + * "$Id: printer_options.c,v 1.53 2012/05/26 15:57:35 rlk Exp $" * * Dump the per-printer options for the OpenPrinting database * @@ -186,6 +186,7 @@ main(int argc, char **argv) printf("$$x_t{'%s'} = '%d';",param->name, x); printf("$$y_t{'%s'} = '%d';",param->name, y); } + stp_clear_string_parameter(pv, "Resolution"); } } printf("}\n"); |