From 5989a10e4ce73f1a0d19e98e568a31b396c13405 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 29 Sep 2002 14:20:04 +0000 Subject: Update to 1.8.22, as requested by Christian Biere in PR 18460. Changes: NEW FEATURES - Now support many Windows code pages in addition to ISO charsets. - HTMLDOC now supports heading levels 1 to 15. - HTMLDOC now allows the author to omit headings from the TOC using the _HD_OMIT_TOC attribute. - HTMLDOC now supports remote book files when running from the command-line. - HTMLDOC now supports hexadecimal character constants (ÿ) - New --nup and NUMBER-UP options for PostScript and PDF output. - HTMLDOC now logs HTML errors. - HTMLDOC now supports the A3, B, Legal, and Tabloid size names. - HTMLDOC now supports embedding of the base Type1 fonts in PostScript and PDF output. CHANGES - HTMLDOC now calculates the resolution of the body image using the printable width instead of the page width. - HTMLDOC should now compile out-of-the-box using the Cygwin tools. - HTMLDOC no longer inserts whitespace between text inside DIV elements. - HTMLDOC now supports quoted usernames and passwords in URLs. - HTMLDOC now defaults unknown colors to white for background colors and black for foreground colors. This should make documents that use non-standard color names still appear readable. - The HTML parser now allows BODY to auto-close HEAD and visa-versa. BUG FIXES - HTMLDOC could crash when checking if a URL is already cached. - HTMLDOC didn't adjust the top margin when changing the page header if the comment didn't appear at the top of a page. - HTMLDOC didn't initialize the right number of TOC headings. - When using a logo image in the header, the header was placed too low on the page. - "make install" didn't work in the fonts directory. - "€" didn't work, while "€" did: the character name table was not sorted properly... - Links didn't always point to the right page in PDF output. - XRX comment output could crash HTMLDOC. - Fixed-width columns in tables could be resized by HTMLDOC. - When writing PostScript commands, some printers reset their duplexing state when a new setpagedevice command is received; we now cache the current duplex state and change it only as needed. - The MEDIA SIZE comment didn't adjust the printable size for the current landscape setting. - HTMLDOC placed the header one line too high. - When continuing a chapter onto the next page, H3 and higher headings would be indented the wrong amount. - HTMLDOC wouldn't compile using GCC under HP-UX due to a badly "fixed" system header file (vmtypes.h). - Generating a book without a table-of-contents would produce a bad PDF file. - The Xerox XRX comments used the wrong units for the media size, points instead of millimeters. - IMG elements with links that use the ALIGN attribute didn't get the links. - Header and footer comments would interfere with the top and bottom margin settings. - Fixed a bug in the htmlReadFile() function which caused user-provided title pages not to be displayed in PS or PDF output. - The table-of-contents would inherit the last media settings in the document, but use the initial settings when formatting. --- www/htmldoc/Makefile.common | 6 ++--- www/htmldoc/PLIST | 53 +++++++++++++++++++++++++++++++------------- www/htmldoc/distinfo | 7 +++--- www/htmldoc/patches/patch-aa | 40 +++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 21 deletions(-) create mode 100644 www/htmldoc/patches/patch-aa (limited to 'www') diff --git a/www/htmldoc/Makefile.common b/www/htmldoc/Makefile.common index fa8d0c6ff00..2400dc924f3 100644 --- a/www/htmldoc/Makefile.common +++ b/www/htmldoc/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.2 2002/09/23 23:34:59 jlam Exp $ +# $NetBSD: Makefile.common,v 1.3 2002/09/29 14:20:04 wiz Exp $ # -HTMLDOC_VERSION= 1.8.19 +HTMLDOC_VERSION= 1.8.22 DISTNAME= htmldoc-${HTMLDOC_VERSION}-source WRKSRC= ${WRKDIR}/htmldoc-${HTMLDOC_VERSION} CATEGORIES= www -MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/1.8.19/ +MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/${HTMLDOC_VERSION}/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= packages@netbsd.org diff --git a/www/htmldoc/PLIST b/www/htmldoc/PLIST index 8003adfe3a2..0c3f2e19024 100644 --- a/www/htmldoc/PLIST +++ b/www/htmldoc/PLIST @@ -1,21 +1,18 @@ -@comment $NetBSD: PLIST,v 1.2 2002/05/06 21:42:37 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/09/29 14:20:04 wiz Exp $ bin/htmldoc man/man1/htmldoc.1 share/doc/htmldoc/help.html share/doc/htmldoc/htmldoc.pdf -share/htmldoc/afm/Courier -share/htmldoc/afm/Courier-Bold -share/htmldoc/afm/Courier-BoldOblique -share/htmldoc/afm/Courier-Oblique -share/htmldoc/afm/Helvetica -share/htmldoc/afm/Helvetica-Bold -share/htmldoc/afm/Helvetica-BoldOblique -share/htmldoc/afm/Helvetica-Oblique -share/htmldoc/afm/Symbol -share/htmldoc/afm/Times-Bold -share/htmldoc/afm/Times-BoldItalic -share/htmldoc/afm/Times-Italic -share/htmldoc/afm/Times-Roman +share/htmldoc/data/cp-1250 +share/htmldoc/data/cp-1251 +share/htmldoc/data/cp-1252 +share/htmldoc/data/cp-1253 +share/htmldoc/data/cp-1254 +share/htmldoc/data/cp-1255 +share/htmldoc/data/cp-1256 +share/htmldoc/data/cp-1257 +share/htmldoc/data/cp-1258 +share/htmldoc/data/cp-874 share/htmldoc/data/iso-8859-1 share/htmldoc/data/iso-8859-14 share/htmldoc/data/iso-8859-15 @@ -30,7 +27,33 @@ share/htmldoc/data/iso-8859-9 share/htmldoc/data/koi8-r share/htmldoc/data/prolog.ps share/htmldoc/data/psglyphs +share/htmldoc/fonts/Courier-Bold.afm +share/htmldoc/fonts/Courier-Bold.pfa +share/htmldoc/fonts/Courier-BoldOblique.afm +share/htmldoc/fonts/Courier-BoldOblique.pfa +share/htmldoc/fonts/Courier-Oblique.afm +share/htmldoc/fonts/Courier-Oblique.pfa +share/htmldoc/fonts/Courier.afm +share/htmldoc/fonts/Courier.pfa +share/htmldoc/fonts/Helvetica-Bold.afm +share/htmldoc/fonts/Helvetica-Bold.pfa +share/htmldoc/fonts/Helvetica-BoldOblique.afm +share/htmldoc/fonts/Helvetica-BoldOblique.pfa +share/htmldoc/fonts/Helvetica-Oblique.afm +share/htmldoc/fonts/Helvetica-Oblique.pfa +share/htmldoc/fonts/Helvetica.afm +share/htmldoc/fonts/Helvetica.pfa +share/htmldoc/fonts/Symbol.afm +share/htmldoc/fonts/Symbol.pfa +share/htmldoc/fonts/Times-Bold.afm +share/htmldoc/fonts/Times-Bold.pfa +share/htmldoc/fonts/Times-BoldItalic.afm +share/htmldoc/fonts/Times-BoldItalic.pfa +share/htmldoc/fonts/Times-Italic.afm +share/htmldoc/fonts/Times-Italic.pfa +share/htmldoc/fonts/Times-Roman.afm +share/htmldoc/fonts/Times-Roman.pfa +@dirrm share/htmldoc/fonts @dirrm share/htmldoc/data -@dirrm share/htmldoc/afm @dirrm share/htmldoc @dirrm share/doc/htmldoc diff --git a/www/htmldoc/distinfo b/www/htmldoc/distinfo index 0c721d450cc..2c6695d682b 100644 --- a/www/htmldoc/distinfo +++ b/www/htmldoc/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.4 2002/05/06 21:42:37 seb Exp $ +$NetBSD: distinfo,v 1.5 2002/09/29 14:20:04 wiz Exp $ -SHA1 (htmldoc-1.8.19-source.tar.bz2) = 98e3710f9d46346ae4043db37fa81d670df67eab -Size (htmldoc-1.8.19-source.tar.bz2) = 1740140 bytes +SHA1 (htmldoc-1.8.22-source.tar.bz2) = 73493e3d921ab8419593b7a85d342d7f08e5ae38 +Size (htmldoc-1.8.22-source.tar.bz2) = 2335516 bytes +SHA1 (patch-aa) = 8b42b0e3bfa16dc816284895d8d24a5401732202 diff --git a/www/htmldoc/patches/patch-aa b/www/htmldoc/patches/patch-aa new file mode 100644 index 00000000000..9304078fc9e --- /dev/null +++ b/www/htmldoc/patches/patch-aa @@ -0,0 +1,40 @@ +$NetBSD: patch-aa,v 1.5 2002/09/29 14:20:04 wiz Exp $ + +--- htmldoc/html.cxx.orig Thu Jun 13 20:44:09 2002 ++++ htmldoc/html.cxx +@@ -154,6 +154,8 @@ html_export(tree_t *document, /* I - Doc + { + write_header(&out, (uchar *)"index.html", title, author, copyright, + docnumber, NULL); ++ if (out == NULL) ++ return -1; + write_title(out, title, author, copyright, docnumber); + + write_footer(&out, NULL); +@@ -164,6 +166,9 @@ html_export(tree_t *document, /* I - Doc + write_header(&out, (uchar *)"index.html", title, author, copyright, + docnumber, NULL); + ++ if (out == NULL) ++ return -1; ++ + write_all(out, toc, 0); + write_footer(&out, NULL); + +@@ -175,11 +180,16 @@ html_export(tree_t *document, /* I - Doc + { + write_header(&out, htmlGetVariable(document, (uchar *)"FILENAME"), + title, author, copyright, docnumber, document); ++ if (out == NULL) ++ return -1; + write_all(out, document->child, 0); + write_footer(&out, document); + + document = document->next; + } ++ ++ if (out == NULL) ++ return -1; + + if (!OutputFiles && out != stdout) + { -- cgit v1.2.3