- default to lpi=6 and cpi=10 if paps is bringing up as cups filter.
(#223862)
This commit is contained in:
Akira TAGOH
parent
c0d5660983
commit
3fd0d25b97
@ -1,6 +1,6 @@
|
||||
diff -pruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in
|
||||
diff -pruN -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x 'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*' paps-0.6.6.orig/configure.in paps-0.6.6/configure.in
|
||||
--- paps-0.6.6.orig/configure.in 2006-04-28 04:41:36.000000000 +0900
|
||||
+++ paps-0.6.6/configure.in 2007-01-23 19:36:35.000000000 +0900
|
||||
+++ paps-0.6.6/configure.in 2007-02-15 23:34:24.000000000 +0900
|
||||
@@ -7,4 +7,17 @@ AC_LANG_C
|
||||
AC_PROG_CC
|
||||
AM_PROG_LIBTOOL
|
||||
@ -19,9 +19,9 @@ diff -pruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in
|
||||
+AC_SUBST(CUPS_LIBS)
|
||||
+
|
||||
AC_OUTPUT(Makefile src/Makefile doc/Makefile)
|
||||
diff -pruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
|
||||
--- paps-0.6.6.orig/src/Makefile.am 2007-01-23 19:07:52.000000000 +0900
|
||||
+++ paps-0.6.6/src/Makefile.am 2007-01-23 19:36:35.000000000 +0900
|
||||
diff -pruN -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x 'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*' paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
|
||||
--- paps-0.6.6.orig/src/Makefile.am 2007-02-15 22:59:47.000000000 +0900
|
||||
+++ paps-0.6.6/src/Makefile.am 2007-02-15 23:34:24.000000000 +0900
|
||||
@@ -5,10 +5,10 @@ libpaps_a_inc_HEADERS = libpaps.h
|
||||
libpaps_a_incdir = $(includedir)
|
||||
|
||||
@ -35,9 +35,9 @@ diff -pruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
|
||||
paps_DEPENDENCIES = $(noinst_LIBRARIES)
|
||||
|
||||
EXTRA_DIST = test_libpaps.c paps.1
|
||||
diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
--- paps-0.6.6.orig/src/paps.c 2007-01-23 19:07:52.000000000 +0900
|
||||
+++ paps-0.6.6/src/paps.c 2007-01-23 19:35:33.000000000 +0900
|
||||
diff -pruN -x Makefile -x Makefile.in -x '*.m4' -x autom4te.cache -x 'config.*' -x configure -x doc -x libtool -x .deps -x .libs -x '*.ps' -x foo -x paps -x 'lib*' -x texttopaps -x '*o' -x '*.cups' -x 'test*' -x 'stamp*' paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
--- paps-0.6.6.orig/src/paps.c 2007-02-15 22:59:48.000000000 +0900
|
||||
+++ paps-0.6.6/src/paps.c 2007-03-07 20:58:31.000000000 +0900
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <time.h>
|
||||
#include <locale.h>
|
||||
@ -78,7 +78,7 @@ diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
|
||||
/* Set locale from environment. */
|
||||
setlocale(LC_ALL, "");
|
||||
@@ -333,6 +338,118 @@ int main(int argc, char *argv[])
|
||||
@@ -333,6 +338,128 @@ int main(int argc, char *argv[])
|
||||
|
||||
g_option_context_add_main_entries(ctxt, entries, NULL);
|
||||
|
||||
@ -96,6 +96,16 @@ diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
+ g_set_prgname(prgname);
|
||||
+ /* argument format should be job-id user title copies options [file] */
|
||||
+ cups_mode = TRUE;
|
||||
+ /* set default values */
|
||||
+ lpi = 6.0L;
|
||||
+ cpi = 10.0L;
|
||||
+ left_margin = 18;
|
||||
+ right_margin = 18;
|
||||
+ top_margin = 36;
|
||||
+ bottom_margin = 36;
|
||||
+ page_width = 612;
|
||||
+ page_height = 792;
|
||||
+
|
||||
+ if (argc < 6 || argc > 7) {
|
||||
+ fprintf(stderr, "ERROR: %s job-id user title copies options [file]\n", prgname);
|
||||
+ exit(1);
|
||||
@ -197,7 +207,7 @@ diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
/* Parse command line */
|
||||
if (!g_option_context_parse(ctxt, &argc, &argv, &error))
|
||||
{
|
||||
@@ -359,6 +476,8 @@ int main(int argc, char *argv[])
|
||||
@@ -359,6 +486,8 @@ int main(int argc, char *argv[])
|
||||
IN = stdin;
|
||||
}
|
||||
title = filename_in;
|
||||
@ -206,7 +216,7 @@ diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
|
||||
paps = paps_new();
|
||||
pango_context = paps_get_pango_context (paps);
|
||||
@@ -377,8 +496,10 @@ int main(int argc, char *argv[])
|
||||
@@ -377,8 +506,10 @@ int main(int argc, char *argv[])
|
||||
pango_context_set_font_description (pango_context, font_description);
|
||||
|
||||
/* Page layout */
|
||||
@ -219,7 +229,7 @@ diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
|
||||
if (num_columns == 1)
|
||||
total_gutter_width = 0;
|
||||
@@ -439,6 +560,8 @@ int main(int argc, char *argv[])
|
||||
@@ -439,6 +570,8 @@ int main(int argc, char *argv[])
|
||||
page_layout.pango_dir = pango_dir;
|
||||
page_layout.filename = filename_in;
|
||||
page_layout.header_font_desc = header_font_desc;
|
||||
@ -228,7 +238,7 @@ diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
|
||||
/* calculate x-coordinate scale */
|
||||
if (cpi > 0.0L)
|
||||
@@ -584,6 +707,12 @@ split_text_into_paragraphs (PangoContext
|
||||
@@ -584,6 +717,12 @@ split_text_into_paragraphs (PangoContext
|
||||
if (wc == (gunichar)-1)
|
||||
{
|
||||
fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ());
|
||||
@ -241,7 +251,7 @@ diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
wc = 0;
|
||||
}
|
||||
if (!*p || !wc || wc == '\n' || wc == '\f')
|
||||
@@ -810,6 +939,7 @@ void print_postscript_header(FILE *OUT,
|
||||
@@ -810,6 +949,7 @@ void print_postscript_header(FILE *OUT,
|
||||
int orientation = page_layout->page_width > page_layout->page_height;
|
||||
int bb_page_width = page_layout->page_width;
|
||||
int bb_page_height = page_layout->page_height;
|
||||
@ -249,7 +259,7 @@ diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
|
||||
/* Keep bounding box non-rotated to make ggv happy */
|
||||
if (orientation)
|
||||
@@ -819,12 +949,20 @@ void print_postscript_header(FILE *OUT,
|
||||
@@ -819,12 +959,20 @@ void print_postscript_header(FILE *OUT,
|
||||
bb_page_height = tmp;
|
||||
}
|
||||
|
||||
@ -271,7 +281,7 @@ diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||||
"%%%%BeginProlog\n"
|
||||
"%%%%Orientation: %s\n"
|
||||
"/papsdict 1 dict def\n"
|
||||
@@ -874,8 +1012,10 @@ void print_postscript_header(FILE *OUT,
|
||||
@@ -874,8 +1022,10 @@ void print_postscript_header(FILE *OUT,
|
||||
title,
|
||||
bb_page_width,
|
||||
bb_page_height,
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: paps
|
||||
Version: 0.6.6
|
||||
Release: 17%{?dist}
|
||||
Release: 18%{?dist}
|
||||
|
||||
License: LGPL
|
||||
URL: http://paps.sourceforge.net/
|
||||
@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 7 2007 Akira TAGOH <tagoh@redhat.com> - 0.6.6-18
|
||||
- default to lpi=6 and cpi=10 if paps is bringing up as cups filter. (#223862)
|
||||
|
||||
* Tue Jan 23 2007 Akira TAGOH <tagoh@redhat.com>
|
||||
- Better the encoding guess by looking at current locale. (#212154)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user