cvs: /php4 NEWS php_version.h /php4/ext/pdf pdf.c php_pdf.h /php4/tests testdom

steinm Mon Feb 21 08:23:08 2000 EDT Modified files: /php4 NEWS php_version.h /php4/ext/pdf pdf.c php_pdf.h /php4/tests testdom Log: - pdf_set_text_matrix() disappeared in pdflib 2.30. Put in another ifdef - small fix in testdom to suppress error msg. Index: php4/NEWS diff -u php4/NEWS:1.139 php4/NEWS:1.140 --- php4/NEWS:1.139 Mon Feb 21 03:02:02 2000 +++ php4/NEWS Mon Feb 21 08:23:07 2000 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???, Version 4.0 Beta 5 +- Support for pdflib 2.30 (Uwe) 20 February 2000, Version 4.0 Beta 4 - Introduced $HTTP_POST_FILES[], that contains information about files uploaded Index: php4/php_version.h diff -u php4/php_version.h:1.20 php4/php_version.h:1.21 --- php4/php_version.h:1.20 Sun Feb 20 13:30:33 2000 +++ php4/php_version.h Mon Feb 21 08:23:07 2000 @@ -1,3 +1,3 @@ /* automatically generated by configure */ /* edit configure.in.in to change version number */ -#define PHP_VERSION "4.0b4" +#define PHP_VERSION "4.0b4-dev" Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.23 php4/ext/pdf/pdf.c:1.24 --- php4/ext/pdf/pdf.c:1.23 Tue Feb 15 00:10:32 2000 +++ php4/ext/pdf/pdf.c Mon Feb 21 08:23:07 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.23 2000/02/15 08:10:32 steinm Exp $ */ +/* $Id: pdf.c,v 1.24 2000/02/21 16:23:07 steinm Exp $ */ /* pdflib 2.01 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -98,7 +98,9 @@ PHP_FE(pdf_set_text_rendering, NULL) PHP_FE(pdf_set_horiz_scaling, NULL) PHP_FE(pdf_set_text_rise, NULL) +#if PDFLIB_MAJORVERSION < 3 & PDFLIB_MINORVERSION < 30 PHP_FE(pdf_set_text_matrix, NULL) +#endif PHP_FE(pdf_set_text_pos, NULL) PHP_FE(pdf_set_char_spacing, NULL) PHP_FE(pdf_set_word_spacing, NULL) @@ -875,6 +877,7 @@ } /* }}} */ +#if PDFLIB_MAJORVERSION < 3 & PDFLIB_MINORVERSION < 30 /* {{{ proto void pdf_set_text_matrix(int pdfdoc, arry matrix) Sets the text matrix */ PHP_FUNCTION(pdf_set_text_matrix) { @@ -926,6 +929,7 @@ RETURN_TRUE; } /* }}} */ +#endif /* {{{ proto void pdf_set_text_pos(int pdfdoc, double x, double y) Set the position of text for the next pdf_show call */ Index: php4/ext/pdf/php_pdf.h diff -u php4/ext/pdf/php_pdf.h:1.4 php4/ext/pdf/php_pdf.h:1.5 --- php4/ext/pdf/php_pdf.h:1.4 Tue Feb 15 00:10:32 2000 +++ php4/ext/pdf/php_pdf.h Mon Feb 21 08:23:07 2000 @@ -26,7 +26,7 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php_pdf.h,v 1.4 2000/02/15 08:10:32 steinm Exp $ */ +/* $Id: php_pdf.h,v 1.5 2000/02/21 16:23:07 steinm Exp $ */ #ifndef _PHP_PDF_H #define _PHP_PDF_H @@ -66,7 +66,9 @@ PHP_FUNCTION(pdf_set_text_rendering); PHP_FUNCTION(pdf_set_horiz_scaling); PHP_FUNCTION(pdf_set_text_rise); +#if PDFLIB_MAJORVERSION < 3 & PDFLIB_MINORVERSION < 30 PHP_FUNCTION(pdf_set_text_matrix); +#endif PHP_FUNCTION(pdf_set_text_pos); PHP_FUNCTION(pdf_set_char_spacing); PHP_FUNCTION(pdf_set_word_spacing); Index: php4/tests/testdom diff -u php4/tests/testdom:1.9 php4/tests/testdom:1.10 --- php4/tests/testdom:1.9 Thu Feb 17 12:30:00 2000 +++ php4/tests/testdom Mon Feb 21 08:23:08 2000 @@ -38,7 +38,7 @@ <!DOCTYPE chapter SYSTEM '/share/sgml/Norman_Walsh/db3xml10/db3xml10.dtd'> <chapter language='en'><title language='en'>Title</title> <para language='ge'> -<informaltable language='&sp;'> +<informaltable language='sp'> <tgroup cols='3'> <tbody> <row><entry>a1</entry><entry morerows='1'>b1</entry><entry>c1</entry></row>