From aaa4d7c8f133669eaf86762a154baadf9a6e48b4 Mon Sep 17 00:00:00 2001 From: wlemb Date: Wed, 25 Jul 2001 15:42:58 +0000 Subject: * aclocal.m4 (GROFF_PAGE): Add `AC_DEFINE(PAGEA4)'. * src/preproc/html/pre-html.cc: Use it for DEFAULT_VERTICAL_OFFSET. * Makefile.in: Comment updated. * configure: Regenerated. * src/preproc/html/pre-html.cc (TRANSPARENT): Use `white' as colour name instead of number. --- ChangeLog | 9 +++++++++ Makefile.in | 1 + aclocal.m4 | 3 +++ configure | 36 +++++++++++++++++++++--------------- src/preproc/html/pre-html.cc | 8 ++++++-- 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3781f82c..f012f88e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-07-25 Gaius Mulley + + * aclocal.m4 (GROFF_PAGE): Add `AC_DEFINE(PAGEA4)'. + * src/preproc/html/pre-html.cc: Use it for DEFAULT_VERTICAL_OFFSET. + * Makefile.in: Comment updated. + * configure: Regenerated. + 2001-07-25 Werner LEMBERG * src/preproc/pic/pic.cc: Removed. @@ -11,6 +18,8 @@ * src/devices/grohtml/grohtml.man: Add information about valid versions of pnmtopng. + * src/preproc/html/pre-html.cc (TRANSPARENT): Use `white' as colour + name instead of number. 2001-07-24 Werner LEMBERG diff --git a/Makefile.in b/Makefile.in index e36d0eaf..b4845d2f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -225,6 +225,7 @@ man7dir=$(manroot)/man$(man7ext) # -DHAVE_STRUCT_EXCEPTION if defines struct exception # -DRETSIGTYPE=int if signal handlers return int not void # -DIS_EBCDIC_HOST if the host's encoding is EBCDIC +# -DPAGEA4 if the the printer's page size is A4 DEFINES=@DEFS@ # Include fmod.o, strtol.o, getcwd.o, strerror.o, putenv.o in LIBOBJS if diff --git a/aclocal.m4 b/aclocal.m4 index bf2b2959..d72c696b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -260,6 +260,9 @@ changequote(,)dnl changequote([,])dnl fi test -n "$PAGE" || PAGE=letter +if test "x$PAGE" = "xA4"; then + AC_DEFINE(PAGEA4) +fi AC_MSG_RESULT($PAGE) AC_SUBST(PAGE)])dnl dnl diff --git a/configure b/configure index b436adf3..8d8f5499 100755 --- a/configure +++ b/configure @@ -4441,22 +4441,28 @@ if test -z "$PAGE"; then esac fi test -n "$PAGE" || PAGE=letter -echo "$as_me:4444: result: $PAGE" >&5 +if test "x$PAGE" = "xA4"; then + cat >>confdefs.h <<\EOF +#define PAGEA4 1 +EOF + +fi +echo "$as_me:4450: result: $PAGE" >&5 echo "${ECHO_T}$PAGE" >&6 -echo "$as_me:4447: checking for existing troff installation" >&5 +echo "$as_me:4453: checking for existing troff installation" >&5 echo $ECHO_N "checking for existing troff installation... $ECHO_C" >&6 if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then - echo "$as_me:4450: result: yes" >&5 + echo "$as_me:4456: result: yes" >&5 echo "${ECHO_T}yes" >&6 g=g else - echo "$as_me:4454: result: no" >&5 + echo "$as_me:4460: result: no" >&5 echo "${ECHO_T}no" >&6 g= fi -echo "$as_me:4459: checking for prefix of system macro packages" >&5 +echo "$as_me:4465: checking for prefix of system macro packages" >&5 echo $ECHO_N "checking for prefix of system macro packages... $ECHO_C" >&6 sys_tmac_prefix= sys_tmac_file_prefix= @@ -4473,11 +4479,11 @@ for d in /usr/share/lib/tmac /usr/lib/tmac; do done done done -echo "$as_me:4476: result: $sys_tmac_prefix" >&5 +echo "$as_me:4482: result: $sys_tmac_prefix" >&5 echo "${ECHO_T}$sys_tmac_prefix" >&6 tmac_wrap= -echo "$as_me:4480: checking which system macro packages should be made available" >&5 +echo "$as_me:4486: checking which system macro packages should be made available" >&5 echo $ECHO_N "checking which system macro packages should be made available... $ECHO_C" >&6 if test "x$sys_tmac_file_prefix" = "xtmac."; then for f in $sys_tmac_prefix*; do @@ -4513,7 +4519,7 @@ elif test -n "$sys_tmac_prefix"; then done rm -f conftest.sol fi -echo "$as_me:4516: result: $tmac_wrap" >&5 +echo "$as_me:4522: result: $tmac_wrap" >&5 echo "${ECHO_T}$tmac_wrap" >&6 $srcdir/mkinstalldirs src/xditview @@ -4628,7 +4634,7 @@ rm -f confdef2opt.sed : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:4631: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:4637: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -4796,7 +4802,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:4799: error: ambiguous option: $1 + { { echo "$as_me:4805: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -4819,12 +4825,12 @@ Try \`$0 --help' for more information." >&2;} 'src/xditview/Imakefile' ) CONFIG_FILES="$CONFIG_FILES src/xditview/Imakefile" ;; # This is an error. - -*) { { echo "$as_me:4822: error: unrecognized option: $1 + -*) { { echo "$as_me:4828: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} { (exit 1); exit 1; }; } ;; - *) { { echo "$as_me:4827: error: invalid argument: $1" >&5 + *) { { echo "$as_me:4833: error: invalid argument: $1" >&5 echo "$as_me: error: invalid argument: $1" >&2;} { (exit 1); exit 1; }; };; esac @@ -5065,7 +5071,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:5068: creating $ac_file" >&5 + { echo "$as_me:5074: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -5083,7 +5089,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:5086: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5092: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5096,7 +5102,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5099: error: cannot find input file: $f" >&5 + { { echo "$as_me:5105: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; diff --git a/src/preproc/html/pre-html.cc b/src/preproc/html/pre-html.cc index 399345be..199c3315 100644 --- a/src/preproc/html/pre-html.cc +++ b/src/preproc/html/pre-html.cc @@ -58,12 +58,16 @@ extern "C" const char *Version_string; #define POSTSCRIPTRES 72000 // maybe there is a better way to find this? --fixme-- #define DEFAULT_IMAGE_RES 80 // 80 pixels per inch resolution -#define DEFAULT_VERTICAL_OFFSET 45 // DEFAULT_VERTICAL_OFFSET/72 of an inch +#ifdef PAGEA4 +# define DEFAULT_VERTICAL_OFFSET 0 // DEFAULT_VERTICAL_OFFSET/72 of an inch +#else +# define DEFAULT_VERTICAL_OFFSET 50 // DEFAULT_VERTICAL_OFFSET/72 of an inch +#endif #define IMAGE_BOARDER_PIXELS 0 #define MAX_WIDTH 8 // inches #define INLINE_LEADER_CHAR '\\' -#define TRANSPARENT "-background \"#FFF\" -transparent \"#FFF\"" +#define TRANSPARENT "-background white -transparent white" #define PAGE_TEMPLATE_SHORT "pg" #define PAGE_TEMPLATE_LONG "-page-" -- cgit v1.2.1