from:"anatoly techtonik"

[PHP-DOC] cvs: phpdoc / Makefile.in

2005-04-02 Thread anatoly techtonik

techtonik   Sat Apr  2 16:30:57 2005 EDT

  Modified files:  
/phpdoc Makefile.in 
  Log:
  + genfunclist.php generator instead of genfunclist.sh and funcparse.awk
  
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.163&r2=1.164&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.163 phpdoc/Makefile.in:1.164
--- phpdoc/Makefile.in:1.163Sun Mar 20 09:49:17 2005
+++ phpdoc/Makefile.in  Sat Apr  2 16:30:54 2005
@@ -16,7 +16,7 @@
 #
 
 #
-# $Id: Makefile.in,v 1.163 2005/03/20 14:49:17 nlopess Exp $
+# $Id: Makefile.in,v 1.164 2005/04/02 21:30:54 techtonik Exp $
 #
 
 all: html
@@ -110,7 +110,7 @@
 FORCE:
 
 funclist.txt: FORCE
-   $(scriptdir)/genfunclist.sh $(PHP_SOURCE) > funclist.txt
+   $(PHP) -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) > funclist.txt
 
 funcsummary.txt: FORCE
$(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) > funcsummary.txt
@@ -126,8 +126,8 @@
touch funcindex.xml ;\
else \
$(XSLTPROC) -o quickref-temp.txt $(QUICKREF_XSL_SHEET) manual.xml ;\
-   echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > 
funcindex.xml" ;\
-   $(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > 
funcindex.xml ;\
+   echo "$(PHP) -q $(scriptdir)/genfuncindex.php quickref-temp.txt > 
funcindex.xml" ;\
+   $(PHP) -q $(scriptdir)/genfuncindex.php quickref-temp.txt > 
funcindex.xml ;\
rm -f quickref-temp.txt ;\
fi

[PHP-DOC] cvs: phpdoc / configure.in

2005-04-02 Thread anatoly techtonik

techtonik   Sat Apr  2 16:25:42 2005 EDT

  Modified files:  
/phpdoc configure.in 
  Log:
  * convert slashes from windows envariables
  
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.224&r2=1.225&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.224 phpdoc/configure.in:1.225
--- phpdoc/configure.in:1.224   Sat Apr  2 04:50:20 2005
+++ phpdoc/configure.in Sat Apr  2 16:25:41 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.224 2005/04/02 09:50:20 techtonik Exp $
+dnl $Id: configure.in,v 1.225 2005/04/02 21:25:41 techtonik Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -43,7 +43,7 @@
 else
   if test -e "$PHP_PEAR_BIN_DIR/cli/php" ; then
 AC_MSG_CHECKING([for php])
-PHP="$PHP_PEAR_BIN_DIR/cli/php"
+PHP=`echo $PHP_PEAR_BIN_DIR/cli/php | tr '' '/'`
 AC_MSG_RESULT($PHP)
   else 
 AC_PATH_PROGS(PHP,"php php4",no)
@@ -58,7 +58,7 @@
   else
 if test -e "$PHP_PEAR_BIN_DIR/cli/php" ; then
   AC_MSG_CHECKING([for php])
-  PHP="$PHP_PEAR_BIN_DIR/cli/php"
+  PHP=`echo $PHP_PEAR_BIN_DIR/cli/php | tr '' '/'`
   AC_MSG_RESULT($PHP)
 else 
   AC_PATH_PROGS(PHP,"php php4",no)

[PHP-DOC] cvs: phpdoc / configure.in

2005-04-02 Thread anatoly techtonik

techtonik   Sat Apr  2 04:50:23 2005 EDT

  Modified files:  
/phpdoc configure.in 
  Log:
  + php source autodetection from cvs checkout
  
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.223&r2=1.224&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.223 phpdoc/configure.in:1.224
--- phpdoc/configure.in:1.223   Sun Mar 20 09:49:17 2005
+++ phpdoc/configure.in Sat Apr  2 04:50:20 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.223 2005/03/20 14:49:17 nlopess Exp $
+dnl $Id: configure.in,v 1.224 2005/04/02 09:50:20 techtonik Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -384,10 +384,24 @@
   if test -d "$withval" ; then
 PHP_SOURCE=$withval
   else
-PHP_SOURCE=$srcdir/../php4
+for PHP_SOURCE in \
+   $srcdir/../php4 \
+   $srcdir/../php-src
+do
+   if test -d $PHP_SOURCE; then
+break
+   fi
+done
   fi
 ],[
-  PHP_SOURCE=$srcdir/../php4
+  for PHP_SOURCE in \
+  $srcdir/../php4 \
+  $srcdir/../php-src
+  do
+  if test -d $PHP_SOURCE; then
+  break
+  fi
+  done
 ])
 if test ! -d $PHP_SOURCE; then
 PHP_SOURCE=no

[PHP-DOC] cvs: phpdoc /scripts dbtags.php

2005-04-01 Thread anatoly techtonik

techtonik   Fri Apr  1 19:08:46 2005 EDT

  Modified files:  
/phpdoc/scripts dbtags.php 
  Log:
  fix php notices and bump year
  
http://cvs.php.net/diff.php/phpdoc/scripts/dbtags.php?r1=1.4&r2=1.5&ty=u
Index: phpdoc/scripts/dbtags.php
diff -u phpdoc/scripts/dbtags.php:1.4 phpdoc/scripts/dbtags.php:1.5
--- phpdoc/scripts/dbtags.php:1.4   Sun Oct 31 16:20:16 2004
+++ phpdoc/scripts/dbtags.php   Fri Apr  1 19:08:43 2005
@@ -4,7 +4,7 @@
   +--+
   | PHP Version 4|
   +--+
-  | Copyright (c) 1997-2004 The PHP Group|
+  | Copyright (c) 1997-2005 The PHP Group|
   +--+
   | This source file is subject to version 3.0 of the PHP license,   |
   | that is bundled with this package in the file LICENSE, and is|
@@ -17,10 +17,10 @@
   | Authors:Gabor Hojtsy <[EMAIL PROTECTED]>  |
   +--+
  
-  $Id: dbtags.php,v 1.4 2004/10/31 21:20:16 techtonik Exp $
+  $Id: dbtags.php,v 1.5 2005/04/02 00:08:43 techtonik Exp $
 */
 
-if ($argc > 2 || in_array($argv[1], array('--help', '-help', '-h', '-?'))) {
+if ($argc > 2 || (isset($argv[1]) && in_array($argv[1], array('--help', 
'-help', '-h', '-?' {
 ?>
 
 Process XML files for used DocBook tags
@@ -127,7 +127,11 @@
 
 // New occurences found, so increase the number
 foreach ($tags_found[1] as $tag_name) {
-$used_tags[$tag_name]++;
+if (isset($used_tags[$tag_name])) {
+$used_tags[$tag_name]++;
+} else {
+$used_tags[$tag_name] = 1;
+}
 }
 
 } // check_file() function end

[PHP-DOC] cvs: phpdoc /howto howto.xml

2005-04-01 Thread anatoly techtonik

techtonik   Fri Apr  1 18:41:35 2005 EDT

  Modified files:  
/phpdoc/howto   howto.xml 
  Log:
  year bumping
  
http://cvs.php.net/diff.php/phpdoc/howto/howto.xml?r1=1.46&r2=1.47&ty=u
Index: phpdoc/howto/howto.xml
diff -u phpdoc/howto/howto.xml:1.46 phpdoc/howto/howto.xml:1.47
--- phpdoc/howto/howto.xml:1.46 Thu Jan 27 17:09:01 2005
+++ phpdoc/howto/howto.xml  Fri Apr  1 18:41:34 2005
@@ -118,7 +118,7 @@
   
Copyright

-This manual is © Copyright 2001-2004 by the PHP Documentation
+This manual is © Copyright 2001-2005 by the PHP Documentation
 Group. See the copyright terms of the PHP Documentation for
 information about what conditions are applied to this document.

[PHP-DOC] cvs: phpdoc /en/reference/strings/functions str-replace.xml

2005-03-11 Thread anatoly techtonik

techtonik   Fri Mar 11 08:56:47 2005 EDT

  Modified files:  
/phpdoc/en/reference/strings/functions  str-replace.xml 
  Log:
  * Add notice about "what if replacement is array while search is not?"
  
http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/str-replace.xml?r1=1.17&r2=1.18&ty=u
Index: phpdoc/en/reference/strings/functions/str-replace.xml
diff -u phpdoc/en/reference/strings/functions/str-replace.xml:1.17 
phpdoc/en/reference/strings/functions/str-replace.xml:1.18
--- phpdoc/en/reference/strings/functions/str-replace.xml:1.17  Wed Nov 10 
03:30:46 2004
+++ phpdoc/en/reference/strings/functions/str-replace.xml   Fri Mar 11 
08:56:44 2005
@@ -1,5 +1,5 @@
 
-
+
 
   

@@ -56,9 +56,10 @@
  replace has fewer values than
  search, then an empty string is used for
  the rest of replacement values. If search
- is an array and replace is a string; then
+ is an array and replace is a string, then
  this replacement string is used for every value of
- search.
+ search. The converse would not make sense,
+ though.

[PHP-DOC] cvs: phpdoc / configure.in

2005-03-10 Thread anatoly techtonik

techtonik   Thu Mar 10 09:59:44 2005 EDT

  Modified files:  
/phpdoc configure.in 
  Log:
  * optimize tools autodetection code
  
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.220&r2=1.221&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.220 phpdoc/configure.in:1.221
--- phpdoc/configure.in:1.220   Sun Mar  6 12:00:40 2005
+++ phpdoc/configure.in Thu Mar 10 09:59:43 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.220 2005/03/06 17:00:40 tony2001 Exp $
+dnl $Id: configure.in,v 1.221 2005/03/10 14:59:43 techtonik Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -46,11 +46,7 @@
 PHP="$PHP_PEAR_BIN_DIR/cli/php"
 AC_MSG_RESULT($PHP)
   else 
-AC_PATH_PROG(PHP,"php",no)
-if test $PHP = "no"; then
-  AC_PATH_PROG(PHP4,"php4",no)
-  PHP=$PHP4
-fi
+AC_PATH_PROGS(PHP,"php php4",no)
   fi
 fi
   fi
@@ -65,11 +61,7 @@
   PHP="$PHP_PEAR_BIN_DIR/cli/php"
   AC_MSG_RESULT($PHP)
 else 
-  AC_PATH_PROG(PHP,"php",no)
-  if test $PHP = "no"; then
-AC_PATH_PROG(PHP4,"php4",no)
-PHP=$PHP4
-  fi
+  AC_PATH_PROGS(PHP,"php php4",no)
 fi
   fi
 ]
@@ -135,12 +127,7 @@
 JADE=../phpdoc-tools/openjade/openjade.exe
 AC_MSG_RESULT($JADE)
   else
-AC_PATH_PROG(OPENJADE,"openjade",no)
-if test $OPENJADE = "no"; then
-  AC_PATH_PROG(JADE,"jade",no)
-else
-  JADE=$OPENJADE
-fi
+AC_PATH_PROGS(JADE,"openjade jade",no)
   fi
 fi
   fi
@@ -155,12 +142,7 @@
   JADE=../phpdoc-tools/openjade/openjade.exe
   AC_MSG_RESULT($JADE)
 else
-  AC_PATH_PROG(OPENJADE,"openjade",no)
-  if test $OPENJADE = "no"; then
-AC_PATH_PROG(JADE,"jade",no)
-  else
-JADE=$OPENJADE
-  fi
+  AC_PATH_PROGS(JADE,"openjade jade",no)
 fi
   fi
 ]
@@ -197,12 +179,7 @@
 NSGMLS=../phpdoc-tools/openjade/onsgmls.exe
 AC_MSG_RESULT($NSGMLS)
   else
-AC_PATH_PROG(ONSGMLS,"onsgmls",no)
-if test $ONSGMLS = "no"; then
-  AC_PATH_PROG(NSGMLS,"nsgmls",no)
-else
-  NSGMLS=$ONSGMLS
-fi
+AC_PATH_PROGS(NSGMLS,"onsgmls nsgmls",no)
   fi
 fi
   fi
@@ -217,12 +194,7 @@
   NSGMLS=../phpdoc-tools/openjade/onsgmls.exe
   AC_MSG_RESULT($NSGMLS)
 else
-  AC_PATH_PROG(ONSGMLS,"onsgmls",no)
-  if test $ONSGMLS = "no"; then
-AC_PATH_PROG(NSGMLS,"nsgmls",no)
-  else
-NSGMLS=$ONSGMLS
-  fi
+  AC_PATH_PROGS(NSGMLS,"onsgmls nsgmls",no)
 fi
   fi
 ]

[PHP-DOC] cvs: phpdoc / LICENSE Makefile.in

2005-03-06 Thread anatoly techtonik

techtonik   Sun Mar  6 14:11:36 2005 EDT

  Modified files:  
/phpdoc LICENSE Makefile.in 
  Log:
  bump year
  
http://cvs.php.net/diff.php/phpdoc/LICENSE?r1=1.6&r2=1.7&ty=u
Index: phpdoc/LICENSE
diff -u phpdoc/LICENSE:1.6 phpdoc/LICENSE:1.7
--- phpdoc/LICENSE:1.6  Thu Sep  2 18:33:16 2004
+++ phpdoc/LICENSE  Sun Mar  6 14:11:34 2005
@@ -1,6 +1,6 @@
 Documentation content licensing:
 
-Copyright (c) 1997 - 2004 by the PHP Documentation Group. This
+Copyright (c) 1997 - 2005 by the PHP Documentation Group. This
 material may be distributed only subject to the terms and
 conditions set forth in the Open Publication License, v1.0 or
 later. A copy of the Open Publication License is distributed
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.160&r2=1.161&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.160 phpdoc/Makefile.in:1.161
--- phpdoc/Makefile.in:1.160Thu Mar  3 15:42:31 2005
+++ phpdoc/Makefile.in  Sun Mar  6 14:11:34 2005
@@ -1,7 +1,7 @@
 # +--+
 # | PHP Version 4|
 # +--+
-# | Copyright (c) 1997-2004 The PHP Group|
+# | Copyright (c) 1997-2005 The PHP Group|
 # +--+
 # | This source file is subject to version 3.0 of the PHP license,   |
 # | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
 #
 
 #
-# $Id: Makefile.in,v 1.160 2005/03/03 20:42:31 techtonik Exp $
+# $Id: Makefile.in,v 1.161 2005/03/06 19:11:34 techtonik Exp $
 #
 
 all: html

[PHP-DOC] Bug system questions

2005-03-04 Thread anatoly techtonik

Hello, phpdoc@lists.php.net

1. Is it possible to cleanup bug system from spam comments?
   http://bugs.php.net/bug.php?id=30305
2. How to deal with duplicate bugreports?
   http://bugs.php.net/bug.php?id=30305
   http://bugs.php.net/bug.php?id=11074

t
-- 
--[ http://wiki.phpdoc.info/DocLinks ]--

[PHP-DOC] cvs: phpdoc /en/reference/array/functions array-splice.xml

2005-03-04 Thread anatoly techtonik

techtonik   Fri Mar  4 06:19:05 2005 EDT

  Modified files:  
/phpdoc/en/reference/array/functionsarray-splice.xml 
  Log:
  note that it doesn't preserve keys from replacement array
  
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/array-splice.xml?r1=1.13&r2=1.14&ty=u
Index: phpdoc/en/reference/array/functions/array-splice.xml
diff -u phpdoc/en/reference/array/functions/array-splice.xml:1.13 
phpdoc/en/reference/array/functions/array-splice.xml:1.14
--- phpdoc/en/reference/array/functions/array-splice.xml:1.13   Wed Nov 10 
03:30:19 2004
+++ phpdoc/en/reference/array/functions/array-splice.xmlFri Mar  4 
06:19:04 2005
@@ -1,5 +1,5 @@
 
-
+
 
   

@@ -55,8 +55,10 @@
  length are such that nothing is removed,
  then the elements from the replacement
  array are inserted in the place specified by the
- offset. Tip: if the replacement is just
- one element it is not necessary to put array()
+ offset. Note that keys in replacement
+ array are not preserved. 
+ If replacement is just one element it is
+ not necessary to put array()
  around it, unless the element is an array itself.

Re: [PHP-DOC] cvs: phpdoc / Makefile.in configure.in

2005-03-03 Thread anatoly techtonik

||*()*|| Hi, phpdoc.

Can anybody familiar with *nix maketools tell me - when make rebuilds
some target - does it rebuild target's dependencies?

at> techtonik   Thu Mar  3 15:42:32 2005 EDT

at>   Modified files:  
at> /phpdoc configure.in Makefile.in 
at>   Log:
at>   fix bug #31932 : images are missing in the manual
  
at> http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.218&r2=1.219&ty=u
at> Index: phpdoc/configure.in
at> diff -u phpdoc/configure.in:1.218 phpdoc/configure.in:1.219
at> --- phpdoc/configure.in:1.218   Tue Mar  1 12:28:40 2005
at> +++ phpdoc/configure.in Thu Mar  3 15:42:30 2005
at> @@ -1,4 +1,4 @@
at> -dnl $Id: configure.in,v 1.218 2005/03/01 17:28:40 techtonik Exp $
at> +dnl $Id: configure.in,v 1.219 2005/03/03 20:42:30 techtonik Exp $
 
at>  dnl autoconf initialisation
at>  AC_INIT()
at> @@ -524,15 +524,15 @@
at>  ])
 
at>  if test -d "$ZENDAPI"; then
at> -  ZEND_FIGURES="cp -r $ZENDAPI/figures ."
at> -  ZEND_FIGURES_HTML="$ZEND_FIGURES/html"
at> -  ZEND_FIGURES_PHP="$ZEND_FIGURES/php"
at>FIGURES="figures"
at> +  ZEND_FIGURES="cp $ZENDAPI/figures/*.png ."
at> +  ZEND_FIGURES_HTML="$ZEND_FIGURES/html/$FIGURES"
at> +  ZEND_FIGURES_PHP="$ZEND_FIGURES/php/$FIGURES"
at>  else
at> +  FIGURES=""
at>ZEND_FIGURES=""
at>ZEND_FIGURES_HTML=""
at>ZEND_FIGURES_PHP=""
at> -  FIGURES=""
at>  fi
 
at>  AC_MSG_RESULT($ZENDAPI)
at> http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.159&r2=1.160&ty=u
at> Index: phpdoc/Makefile.in
at> diff -u phpdoc/Makefile.in:1.159 phpdoc/Makefile.in:1.160
at> --- phpdoc/Makefile.in:1.159Fri Feb 11 10:57:49 2005
at> +++ phpdoc/Makefile.in  Thu Mar  3 15:42:31 2005
at> @@ -16,7 +16,7 @@
at>  #
 
at>  #
at> -# $Id: Makefile.in,v 1.159 2005/02/11 15:57:49 derick Exp $
at> +# $Id: Makefile.in,v 1.160 2005/03/03 20:42:31 techtonik Exp $
at>  #
 
at>  all: html
at> @@ -84,11 +84,11 @@
at> @ZEND_FIGURES@
 
at>  zendapihtml: 
at> -   rm -rf html && mkdir html
at> +   rm -rf html && mkdir html && mkdir html/@FIGURES@
at> @ZEND_FIGURES_HTML@
 
at>  zendapiphp: 
at> -   rm -rf php && mkdir php
at> +   rm -rf php && mkdir php && mkdir php/@FIGURES@
at> @ZEND_FIGURES_PHP@
 
at>  html: html/index.html
at> @@ -167,8 +167,6 @@
at>  @[EMAIL PROTECTED]: @[EMAIL PROTECTED] $(BIGHTML_DEPS)
 
at>  html/index.html: manual.xml $(HTML_DEPS)
at> -   rm -rf html && mkdir html
at> -   @ZEND_FIGURES_HTML@
at> $(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
at> $(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml 
$(XMLDCL) manual.xml
at> $(PHP) -q $(scriptdir)/html_syntax.php html html/
at> @@ -177,8 +175,6 @@
 
at>  # still needs more tweaks!!
at>  html_xsl: manual.xml zendapihtml
at> -   rm -rf html && mkdir html
at> -   @ZEND_FIGURES_HTML@
at> ${XSLTPROC} xsl/html.xsl manual.xml
 
at>  bightml_xsl: manual.xml zendapi
at> @@ -192,17 +188,16 @@
at> ${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
 
at>  chm_xsl: manual.xml
at> -   rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html
at> +   rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir 
./htmlhelp/html/@FIGURES@
at> +   @ZEND_FIGURES@/htmlhelp/html/@FIGURES@
at> ${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
  
at>  phpweb_xsl: manual.xml zendapiphp
at> -   rm -rf php && mkdir php
at> ${XSLTPROC} $(srcdir)/xsl/phpweb.xsl manual.xml
at> $(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
 
at>  php/index.php: manual.xml $(PHPWEB_DEPS)
at> $(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
at> -   rm -rf php && mkdir php
at> $(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
at> -$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t 
sgml $(XMLDCL) manual.xml
at> $(PHP) -q $(scriptdir)/html_syntax.php php php/

t
--

[PHP-DOC] cvs: phpdoc / Makefile.in configure.in

2005-03-03 Thread anatoly techtonik

techtonik   Thu Mar  3 15:42:32 2005 EDT

  Modified files:  
/phpdoc configure.in Makefile.in 
  Log:
  fix bug #31932 : images are missing in the manual
  
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.218&r2=1.219&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.218 phpdoc/configure.in:1.219
--- phpdoc/configure.in:1.218   Tue Mar  1 12:28:40 2005
+++ phpdoc/configure.in Thu Mar  3 15:42:30 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.218 2005/03/01 17:28:40 techtonik Exp $
+dnl $Id: configure.in,v 1.219 2005/03/03 20:42:30 techtonik Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -524,15 +524,15 @@
 ])
 
 if test -d "$ZENDAPI"; then
-  ZEND_FIGURES="cp -r $ZENDAPI/figures ."
-  ZEND_FIGURES_HTML="$ZEND_FIGURES/html"
-  ZEND_FIGURES_PHP="$ZEND_FIGURES/php"
   FIGURES="figures"
+  ZEND_FIGURES="cp $ZENDAPI/figures/*.png ."
+  ZEND_FIGURES_HTML="$ZEND_FIGURES/html/$FIGURES"
+  ZEND_FIGURES_PHP="$ZEND_FIGURES/php/$FIGURES"
 else
+  FIGURES=""
   ZEND_FIGURES=""
   ZEND_FIGURES_HTML=""
   ZEND_FIGURES_PHP=""
-  FIGURES=""
 fi
 
 AC_MSG_RESULT($ZENDAPI)
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.159&r2=1.160&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.159 phpdoc/Makefile.in:1.160
--- phpdoc/Makefile.in:1.159Fri Feb 11 10:57:49 2005
+++ phpdoc/Makefile.in  Thu Mar  3 15:42:31 2005
@@ -16,7 +16,7 @@
 #
 
 #
-# $Id: Makefile.in,v 1.159 2005/02/11 15:57:49 derick Exp $
+# $Id: Makefile.in,v 1.160 2005/03/03 20:42:31 techtonik Exp $
 #
 
 all: html
@@ -84,11 +84,11 @@
@ZEND_FIGURES@
 
 zendapihtml: 
-   rm -rf html && mkdir html
+   rm -rf html && mkdir html && mkdir html/@FIGURES@
@ZEND_FIGURES_HTML@
 
 zendapiphp: 
-   rm -rf php && mkdir php
+   rm -rf php && mkdir php && mkdir php/@FIGURES@
@ZEND_FIGURES_PHP@
 
 html: html/index.html
@@ -167,8 +167,6 @@
 @[EMAIL PROTECTED]: @[EMAIL PROTECTED] $(BIGHTML_DEPS)
 
 html/index.html: manual.xml $(HTML_DEPS)
-   rm -rf html && mkdir html
-   @ZEND_FIGURES_HTML@
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
$(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml 
$(XMLDCL) manual.xml
$(PHP) -q $(scriptdir)/html_syntax.php html html/
@@ -177,8 +175,6 @@
 
 # still needs more tweaks!!
 html_xsl: manual.xml zendapihtml
-   rm -rf html && mkdir html
-   @ZEND_FIGURES_HTML@
${XSLTPROC} xsl/html.xsl manual.xml
 
 bightml_xsl: manual.xml zendapi
@@ -192,17 +188,16 @@
${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
 
 chm_xsl: manual.xml
-   rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html
+   rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir 
./htmlhelp/html/@FIGURES@
+   @ZEND_FIGURES@/htmlhelp/html/@FIGURES@
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
  
 phpweb_xsl: manual.xml zendapiphp
-   rm -rf php && mkdir php
${XSLTPROC} $(srcdir)/xsl/phpweb.xsl manual.xml
$(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
 
 php/index.php: manual.xml $(PHPWEB_DEPS)
$(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
-   rm -rf php && mkdir php
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
-$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml 
$(XMLDCL) manual.xml
$(PHP) -q $(scriptdir)/html_syntax.php php php/

Re[2]: [PHP-DOC] cvs: phpdoc /howto tools.xml

2005-03-02 Thread anatoly techtonik

||*()*|| Hi, Gabor.

>>  
>>   You need the same tools as on Linux. The very basic
>>   thing is a CVS client. You can find one simple command
>> - line client here at the CVSHome.org
>> - Win32 download pool. We do not recommend GUI tools such
>> - as WinCVS, because they can easily screw up the module
>> - with files not intended to be there (eg. files with
>> - uppercased names). The best is to use one command line
>> - client, as this way you are in control.
>> + line client here at the CVSHome.org.
>> + Although you can use GUI tools such as WinCVS or TortoiseCVS,
>> + we provided instructions only for command line client in order
>> + to keep this HOWTO short and simple.

GH> This screw up thing is (was?) actually true, but I don't mind making the 
GH> discription simpler...

Well, I created file LETTERS.BIG to test if WinCVS can skip this fact
completely, but it didn't. File was shown in WinCVS panel in all
uppers. I can't think out case when such files can screw up CVS.
Maybe this info is outdated - do you have any examples how to test
that?

>> +  to Windows, which are not needed for phpdoc. To install
>> +  minimal set of required packages select
>> +  autoconf and make
>> +  along with components, which are selected in setup by 
>> +  default. You may also want to add cvs
>> +  to the installation list if you don't have CVS client yet.
>> +  Do not care about dependencies - they will be selected
>> +  automatically.

GH> Wow, the new versions check for dependencies automatically? That is great.

Me too thinks so. =)
I have a feeling that some sentences can be rephrased, but I can't
see the way. I'm not surprised, though. =)


t
--

[PHP-DOC] cvs: phpdoc / configure.in

2005-03-01 Thread anatoly techtonik

techtonik   Tue Mar  1 12:28:40 2005 EDT

  Modified files:  
/phpdoc configure.in 
  Log:
  * proper openjade detection on win32
  
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.217&r2=1.218&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.217 phpdoc/configure.in:1.218
--- phpdoc/configure.in:1.217   Tue Mar  1 06:38:30 2005
+++ phpdoc/configure.in Tue Mar  1 12:28:40 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.217 2005/03/01 11:38:30 techtonik Exp $
+dnl $Id: configure.in,v 1.218 2005/03/01 17:28:40 techtonik Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -130,16 +130,17 @@
   JADE=../phpdoc-tools/jade/jade.exe
   AC_MSG_RESULT($JADE)
 else
-  AC_CHECK_PROG(OPENJADE,"openjade.exe","openjade.exe",no)
-  if test $OPENJADE = "no"; then
+  if test -e ../phpdoc-tools/openjade/openjade.exe ; then
+AC_MSG_CHECKING([for jade])
+JADE=../phpdoc-tools/openjade/openjade.exe
+AC_MSG_RESULT($JADE)
+  else
 AC_PATH_PROG(OPENJADE,"openjade",no)
 if test $OPENJADE = "no"; then
   AC_PATH_PROG(JADE,"jade",no)
 else
   JADE=$OPENJADE
 fi
-  else
-JADE=$OPENJADE
   fi
 fi
   fi
@@ -149,16 +150,17 @@
 JADE=../phpdoc-tools/jade/jade.exe
 AC_MSG_RESULT($JADE)
   else
-AC_CHECK_PROG(OPENJADE,"openjade.exe","openjade.exe",no)
-if test $OPENJADE = "no"; then
+if test -e ../phpdoc-tools/openjade/openjade.exe ; then
+  AC_MSG_CHECKING([for jade])
+  JADE=../phpdoc-tools/openjade/openjade.exe
+  AC_MSG_RESULT($JADE)
+else
   AC_PATH_PROG(OPENJADE,"openjade",no)
   if test $OPENJADE = "no"; then
 AC_PATH_PROG(JADE,"jade",no)
   else
 JADE=$OPENJADE
   fi
-else
-  JADE=$OPENJADE
 fi
   fi
 ]
@@ -190,16 +192,17 @@
   NSGMLS=../phpdoc-tools/jade/nsgmls.exe
   AC_MSG_RESULT($NSGMLS)
 else
-  AC_CHECK_PROG(ONSGMLS,"onsgmls.exe","onsgmls.exe",no)
-  if test $ONSGMLS = "no"; then
+  if test -e ../phpdoc-tools/openjade/onsgmls.exe ; then
+AC_MSG_CHECKING([for nsgmls])
+NSGMLS=../phpdoc-tools/openjade/onsgmls.exe
+AC_MSG_RESULT($NSGMLS)
+  else
 AC_PATH_PROG(ONSGMLS,"onsgmls",no)
 if test $ONSGMLS = "no"; then
   AC_PATH_PROG(NSGMLS,"nsgmls",no)
 else
   NSGMLS=$ONSGMLS
 fi
-  else
-NSGMLS=$ONSGMLS
   fi
 fi
   fi
@@ -209,16 +212,17 @@
 NSGMLS=../phpdoc-tools/jade/nsgmls.exe
 AC_MSG_RESULT($NSGMLS)
   else
-AC_CHECK_PROG(ONSGMLS,"onsgmls.exe","onsgmls.exe",no)
-if test $ONSGMLS = "no"; then
+if test -e ../phpdoc-tools/openjade/onsgmls.exe ; then
+  AC_MSG_CHECKING([for nsgmls])
+  NSGMLS=../phpdoc-tools/openjade/onsgmls.exe
+  AC_MSG_RESULT($NSGMLS)
+else
   AC_PATH_PROG(ONSGMLS,"onsgmls",no)
   if test $ONSGMLS = "no"; then
 AC_PATH_PROG(NSGMLS,"nsgmls",no)
   else
 NSGMLS=$ONSGMLS
   fi
-else
-  NSGMLS=$ONSGMLS
 fi
   fi
 ]

[PHP-DOC] cvs: phpdoc /howto tools.xml

2005-03-01 Thread anatoly techtonik

techtonik   Tue Mar  1 12:26:57 2005 EDT

  Modified files:  
/phpdoc/howto   tools.xml 
  Log:
  * try to explain why it is better to use cmdline cvs client in more realistic 
way =)
  + instructions for minimum working installation of cygwin packages
  + openjade instructions
  
  
http://cvs.php.net/diff.php/phpdoc/howto/tools.xml?r1=1.21&r2=1.22&ty=u
Index: phpdoc/howto/tools.xml
diff -u phpdoc/howto/tools.xml:1.21 phpdoc/howto/tools.xml:1.22
--- phpdoc/howto/tools.xml:1.21 Tue Jul 27 20:16:31 2004
+++ phpdoc/howto/tools.xml  Tue Mar  1 12:26:56 2005
@@ -220,12 +220,10 @@
 
  You need the same tools as on Linux. The very basic
  thing is a CVS client. You can find one simple command
- line client here at the CVSHome.org
- Win32 download pool. We do not recommend GUI tools such
- as WinCVS, because they can easily screw up the module
- with files not intended to be there (eg. files with
- uppercased names). The best is to use one command line
- client, as this way you are in control.
+ line client here at the CVSHome.org.
+ Although you can use GUI tools such as WinCVS or TortoiseCVS,
+ we provided instructions only for command line client in order
+ to keep this HOWTO short and simple.
 
 
 
@@ -242,7 +240,7 @@
  If you want to produce something viewable, or just would
  like to test the modified file before committing (recommended!),
  you need some more tools. To get it running on Windows,
- you'll need these tools:
+ you'll need these:
 
  
   
@@ -269,21 +267,23 @@
  You need to download and install the Cygwin tools. 
  Just select the "Install now!" link and run the supplied
  setup.exe. It will guide you through
- the process of installation. These tools are port of standard
+ the process of installation. These tools are ports of standard
  Unix tools like sed, awk, autoconf, make, perl, ...
- for Windows.
+ for Windows. 
 
 
 
  
   Be aware, that cygwin is grown to be a very huge project and
   it includes many programs (such as postgres and apache) ported
-  to Windows, which are not needed for phpdoc. We are unable to
-  give you a list of needed components from cygwin (which you should
-  download and install), because the basic tools are interconnected,
-  and depend on each other. If you manage to find the smallest
-  needed installation, do not hesitate to contact us, and send the
-  solution to us.
+  to Windows, which are not needed for phpdoc. To install
+  minimal set of required packages select
+  autoconf and make
+  along with components, which are selected in setup by 
+  default. You may also want to add cvs
+  to the installation list if you don't have CVS client yet.
+  Do not care about dependencies - they will be selected
+  automatically.
  
 
 
@@ -329,7 +329,9 @@
  ls, you should see
  phpdoc listed). Type mkdir
  phpdoc-tools, and then unzip Jade to
- phpdoc-tools/jade.
+ phpdoc-tools/jade. If you chose openjade,
+ place files from bin/ directory of
+ openjade archive to phpdoc-tools/openjade.

[PHP-DOC] cvs: phpdoc /howto howto.ent

2005-03-01 Thread anatoly techtonik

techtonik   Tue Mar  1 12:18:52 2005 EDT

  Modified files:  
/phpdoc/howto   howto.ent 
  Log:
  * fixed link for win32 cvs client
  
http://cvs.php.net/diff.php/phpdoc/howto/howto.ent?r1=1.24&r2=1.25&ty=u
Index: phpdoc/howto/howto.ent
diff -u phpdoc/howto/howto.ent:1.24 phpdoc/howto/howto.ent:1.25
--- phpdoc/howto/howto.ent:1.24 Fri Apr 16 16:20:20 2004
+++ phpdoc/howto/howto.ent  Tue Mar  1 12:18:50 2005
@@ -56,7 +56,7 @@
 
 
 http://www.cvshome.org/";>
-http://ftp.cvshome.org/win32/";>
+http://ccvs.cvshome.org/servlets/ProjectDocumentList?folderID=83";>
 http://cvsbook.red-bean.com/";>
 http://www.arc.unm.edu/~rsahu/cvs.html";>
 http://cellworks.washington.edu/pub/docs/cvs/tutorial/cvs_tutorial_1.html";>

[PHP-DOC] cvs: phpdoc / configure.in

2005-03-01 Thread anatoly techtonik

techtonik   Tue Mar  1 06:38:30 2005 EDT

  Modified files:  
/phpdoc configure.in 
  Log:
  + attempt to detect php binary path from pear environment
  
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.216&r2=1.217&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.216 phpdoc/configure.in:1.217
--- phpdoc/configure.in:1.216   Thu Feb 24 18:08:33 2005
+++ phpdoc/configure.in Tue Mar  1 06:38:30 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.216 2005/02/24 23:08:33 derick Exp $
+dnl $Id: configure.in,v 1.217 2005/03/01 11:38:30 techtonik Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -41,10 +41,16 @@
   PHP=../phpdoc-tools/php.bat
   AC_MSG_RESULT($PHP)
 else
-  AC_PATH_PROG(PHP,"php",no)
-  if test $PHP = "no"; then
-AC_PATH_PROG(PHP4,"php4",no)
-PHP=$PHP4
+  if test -e "$PHP_PEAR_BIN_DIR/cli/php" ; then
+AC_MSG_CHECKING([for php])
+PHP="$PHP_PEAR_BIN_DIR/cli/php"
+AC_MSG_RESULT($PHP)
+  else 
+AC_PATH_PROG(PHP,"php",no)
+if test $PHP = "no"; then
+  AC_PATH_PROG(PHP4,"php4",no)
+  PHP=$PHP4
+fi
   fi
 fi
   fi
@@ -54,10 +60,16 @@
 PHP=../phpdoc-tools/php.bat
 AC_MSG_RESULT($PHP)
   else
-AC_PATH_PROG(PHP,"php",no)
-if test $PHP = "no"; then
-  AC_PATH_PROG(PHP4,"php4",no)
-  PHP=$PHP4
+if test -e "$PHP_PEAR_BIN_DIR/cli/php" ; then
+  AC_MSG_CHECKING([for php])
+  PHP="$PHP_PEAR_BIN_DIR/cli/php"
+  AC_MSG_RESULT($PHP)
+else 
+  AC_PATH_PROG(PHP,"php",no)
+  if test $PHP = "no"; then
+AC_PATH_PROG(PHP4,"php4",no)
+PHP=$PHP4
+  fi
 fi
   fi
 ]

Re[2]: [PHP-DOC] cvs: phpdoc /en/reference/filesystem/functions is-uploaded-file.xml

2005-02-15 Thread anatoly techtonik

||*()*|| Hi, Jakub.

>> is_uploaded_file is a register_globals artifact, and shouldn't need to
>> be used with the $_FILES array.

JV> Sounds like it will be best to remove this example and write that
JV> is_uploaded_file() is unnecessary if $_FILES array is used instead.

Hmm.. Is it possible to forge $_FILES contents by supplying some wrong
POST data? Almost the same question is here.. =)
http://www.faqts.com/knowledge_base/view.phtml/aid/29201/fid/62
To tell the truth I'd like to see some kind of algorithm or research on
the way PHP validates uploads and fills $_FILES array. With my skills I
can only see, that this happens in rfc1867.c

So is_uploaded_file function is useful only when
$_FILES['userfile']['tmp_name'] path is passed from some other function.
I can rewrite an example. BTW, it was written because the old one is
for PHP < 4.0.3 and there are no other examples on the page.


t
--

[PHP-DOC] cvs: phpdoc /en/reference/filesystem/functions is-uploaded-file.xml

2005-02-14 Thread anatoly techtonik

techtonik   Mon Feb 14 11:20:01 2005 EDT

  Modified files:  
/phpdoc/en/reference/filesystem/functions   is-uploaded-file.xml 
  Log:
  integrated note 39637, added example
  please check wording
  
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/is-uploaded-file.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/filesystem/functions/is-uploaded-file.xml
diff -u phpdoc/en/reference/filesystem/functions/is-uploaded-file.xml:1.5 
phpdoc/en/reference/filesystem/functions/is-uploaded-file.xml:1.6
--- phpdoc/en/reference/filesystem/functions/is-uploaded-file.xml:1.5   Tue May 
18 10:23:19 2004
+++ phpdoc/en/reference/filesystem/functions/is-uploaded-file.xml   Mon Feb 
14 11:20:00 2005
@@ -1,5 +1,5 @@
 
-
+
 
   

@@ -26,6 +26,29 @@
  system.
 
 
+ For proper working, the function is_uploaded_file 
needs
+ an argument like $_FILES['userfile']['tmp_name'], - the name of the 
uploaded
+ file on the clients machine $_FILES['userfile']['name'] does not work.
+
+
+ is_uploaded_file example
+ 
+
+ 
+
+
  is_uploaded_file is available only in
  versions of PHP 3 after PHP 3.0.16, and in versions of PHP 4
  after 4.0.2. If you are stuck using an earlier version, you can
@@ -39,7 +62,7 @@
  
 
  
-  is_uploaded_file example
+  is_uploaded_file example for PHP 4 < 
4.0.3

[PHP-DOC] cvs: phpdoc /RFC installpart

2004-11-22 Thread anatoly techtonik

techtonik   Mon Nov 22 17:02:26 2004 EDT

  Removed files:   
/phpdoc/RFC installpart 
  Log:
  done =)

[PHP-DOC] cvs: phpdoc /en/reference/oci8/functions oci-collection-free.xml oci-free-collection.xml

2004-11-21 Thread anatoly techtonik

techtonik   Sun Nov 21 17:44:16 2004 EDT

  Added files: 
/phpdoc/en/reference/oci8/functions oci-collection-free.xml 

  Removed files:   
/phpdoc/en/reference/oci8/functions oci-free-collection.xml 
  Log:
  renamed oci-free-collection.xml to oci-collection-free.xml
  

http://cvs.php.net/co.php/phpdoc/en/reference/oci8/functions/oci-collection-free.xml?r=1.1&p=1
Index: phpdoc/en/reference/oci8/functions/oci-collection-free.xml
+++ phpdoc/en/reference/oci8/functions/oci-collection-free.xml


  
   
OCI-Collection->free
Frees resources associated with collection object
   
   
Description
 
  boolOCI-Collection->free
  
 

 Frees resources associated with collection object. 


 &return.success;

[PHP-DOC] cvs: phpdoc /en/reference/oci8/functions oci-collection-append.xml oci-collection-assign.xml oci-collection-element-assign.xml oci-collection-element-get.xml oci-collection-max.xml oci-collection-size.xml oci-collection-trim.xml oci-free-collection.xml

2004-11-21 Thread anatoly techtonik

techtonik   Sun Nov 21 17:37:24 2004 EDT

  Modified files:  
/phpdoc/en/reference/oci8/functions oci-collection-append.xml 
oci-collection-assign.xml 
oci-collection-element-assign.xml 
oci-collection-element-get.xml 
oci-collection-max.xml 
oci-collection-size.xml 
oci-collection-trim.xml 
oci-free-collection.xml 
  Log:
  follow phpdoc conventions for method IDs
  http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/oci-collection-append.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/oci8/functions/oci-collection-append.xml
diff -u phpdoc/en/reference/oci8/functions/oci-collection-append.xml:1.1 
phpdoc/en/reference/oci8/functions/oci-collection-append.xml:1.2
--- phpdoc/en/reference/oci8/functions/oci-collection-append.xml:1.1Mon Mar 
 8 09:12:17 2004
+++ phpdoc/en/reference/oci8/functions/oci-collection-append.xmlSun Nov 
21 17:37:23 2004
@@ -1,14 +1,14 @@
 
-
-  
+
+  

-collection->append
+OCI-Collection->append
 Appends an object to the collection


 Description
  
-  boolcollection->append
+  boolOCI-Collection->append
   mixedvalue
  
 
http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/oci-collection-assign.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/oci8/functions/oci-collection-assign.xml
diff -u phpdoc/en/reference/oci8/functions/oci-collection-assign.xml:1.4 
phpdoc/en/reference/oci8/functions/oci-collection-assign.xml:1.5
--- phpdoc/en/reference/oci8/functions/oci-collection-assign.xml:1.4Fri Nov 
12 06:02:29 2004
+++ phpdoc/en/reference/oci8/functions/oci-collection-assign.xmlSun Nov 
21 17:37:23 2004
@@ -1,14 +1,14 @@
 
-
-  
+
+  

-collection->assign
+OCI-Collection->assign
 Assigns a value to the collection from another existing 
collection


 Description
  
-  boolcollection->assign
+  boolOCI-Collection->assign
   
OCI-Collectionfrom
  
 
http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/oci-collection-element-assign.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/reference/oci8/functions/oci-collection-element-assign.xml
diff -u 
phpdoc/en/reference/oci8/functions/oci-collection-element-assign.xml:1.2 
phpdoc/en/reference/oci8/functions/oci-collection-element-assign.xml:1.3
--- phpdoc/en/reference/oci8/functions/oci-collection-element-assign.xml:1.2
Tue Mar  9 04:28:18 2004
+++ phpdoc/en/reference/oci8/functions/oci-collection-element-assign.xml
Sun Nov 21 17:37:23 2004
@@ -1,14 +1,14 @@
 
-
-  
+
+  

-collection->assignElem
+OCI-Collection->assignElem
 Assigns a value to the element of the collection


 Description
  
-  boolcollection->assignElem
+  boolOCI-Collection->assignElem
   intindex
   mixedvalue
  
http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/oci-collection-element-get.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/oci8/functions/oci-collection-element-get.xml
diff -u phpdoc/en/reference/oci8/functions/oci-collection-element-get.xml:1.1 
phpdoc/en/reference/oci8/functions/oci-collection-element-get.xml:1.2
--- phpdoc/en/reference/oci8/functions/oci-collection-element-get.xml:1.1   
Mon Mar  8 09:12:17 2004
+++ phpdoc/en/reference/oci8/functions/oci-collection-element-get.xml   Sun Nov 
21 17:37:23 2004
@@ -1,28 +1,28 @@
 
-
-  
+
+  

-collection->getElem
+OCI-Collection->getElem
 Returns value of the element


 Description
  
-  mixedcollection->getElem
+  mixedOCI-Collection->getElem
   intindex
  
  
-  Method collection->getElem returns value of the
+  Method OCI-Collection->getElem returns value of the
   element with index index (1-based).
  
  
-  collection->getElem will return &false; if
+  OCI-Collection->getElem will return &false; if
   such element doesn't exist; &null; if element is &null;; string if
   element is column of a string datatype or number if element is numeric
   field.
  
  
-  collection->getElem will return &false; in case of
+  OCI-Collection->getElem will return &false; in case 
of
   error.
  

http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/oci-collection-max.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/oci8/functions/oci-collection-max.xml
diff -u phpdoc/en/reference/oci8/functions/oci-collection-max.xml:1.1 
phpdoc/en/reference/oci8/functions/oci-collection-max.xml:1.2
--- phpdoc/en/reference/oci8/functions/oci-collection-max.xml:1.1   Mon Mar 
 8 09:12:17 2004
+++ phpdoc/en/reference/oci8/functions/oci-collection-max.xml   Sun Nov 21 
17:37:2

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-21 Thread anatoly techtonik

techtonik   Sun Nov 21 16:13:49 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  fix last customization to work properly
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.25&r2=1.26&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.25 phpdoc/xsl/common.xsl:1.26
--- phpdoc/xsl/common.xsl:1.25  Fri Nov 19 06:06:06 2004
+++ phpdoc/xsl/common.xsl   Sun Nov 21 16:13:48 2004
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.25 2004/11/19 11:06:06 techtonik Exp $
+  $Id: common.xsl,v 1.26 2004/11/21 21:13:48 techtonik Exp $
 
   What is done in this stylesheet as common to all HTML output formats:
 
@@ -396,19 +396,18 @@
 
   
 
-
-  
-
   
 
 
-
-  
-
-
-   
-
+
+  
+
+  
+  
+ 
+  
+

[PHP-DOC] cvs: phpdoc /scripts genfuncindex.php

2004-11-20 Thread anatoly techtonik

techtonik   Sat Nov 20 18:35:40 2004 EDT

  Modified files:  
/phpdoc/scripts genfuncindex.php 
  Log:
  do something with function names actually (that means lowercase them) =)
  
http://cvs.php.net/diff.php/phpdoc/scripts/genfuncindex.php?r1=1.12&r2=1.13&ty=u
Index: phpdoc/scripts/genfuncindex.php
diff -u phpdoc/scripts/genfuncindex.php:1.12 
phpdoc/scripts/genfuncindex.php:1.13
--- phpdoc/scripts/genfuncindex.php:1.12Fri Nov 19 06:07:43 2004
+++ phpdoc/scripts/genfuncindex.php Sat Nov 20 18:35:39 2004
@@ -16,7 +16,7 @@
   | Authors:Hartmut Holzgraefe <[EMAIL PROTECTED]>|
   +--+
  
-  $Id: genfuncindex.php,v 1.12 2004/11/19 11:07:43 techtonik Exp $
+  $Id: genfuncindex.php,v 1.13 2004/11/20 23:35:39 techtonik Exp $
 */
 echo "<" . "?xml version='1.0' encoding='iso-8859-1'?" . ">\n";
 ?>
@@ -32,8 +32,8 @@
 foreach ( $functions as $funcentry ) {
 list($function,$description) = explode(" - ",$funcentry);
 
-if (!ereg("::|->",$function)) {
-strtolower(trim($function));
+if (!ereg("::|->", $function)) {
+$function = strtolower(trim($function));
 }
 if (!ereg("^[[:alnum:]]",$function)) continue;

[PHP-DOC] cvs: phpdoc /scripts genfuncindex.php

2004-11-19 Thread anatoly techtonik

techtonik   Fri Nov 19 06:07:43 2004 EDT

  Modified files:  
/phpdoc/scripts genfuncindex.php 
  Log:
  respect case-sensivity of OO stuff
  
http://cvs.php.net/diff.php/phpdoc/scripts/genfuncindex.php?r1=1.11&r2=1.12&ty=u
Index: phpdoc/scripts/genfuncindex.php
diff -u phpdoc/scripts/genfuncindex.php:1.11 
phpdoc/scripts/genfuncindex.php:1.12
--- phpdoc/scripts/genfuncindex.php:1.11Wed Dec 31 19:47:42 2003
+++ phpdoc/scripts/genfuncindex.php Fri Nov 19 06:07:43 2004
@@ -16,7 +16,7 @@
   | Authors:Hartmut Holzgraefe <[EMAIL PROTECTED]>|
   +--+
  
-  $Id: genfuncindex.php,v 1.11 2004/01/01 00:47:42 goba Exp $
+  $Id: genfuncindex.php,v 1.12 2004/11/19 11:07:43 techtonik Exp $
 */
 echo "<" . "?xml version='1.0' encoding='iso-8859-1'?" . ">\n";
 ?>
@@ -26,22 +26,26 @@
  
   &FunctionIndex;
 \n";
-   }
-   $letter=$function{0};
-   echo "  \n";
-   echo "   ".strtoupper($letter)."\n";
-   }
-   echo "   
$function\n";
+list($function,$description) = explode(" - ",$funcentry);
+
+if (!ereg("::|->",$function)) {
+strtolower(trim($function));
+}
+if (!ereg("^[[:alnum:]]",$function)) continue;
+
+if (strtolower($function{0}) != $letter) {
+if ($letter != ' ') {
+echo "  \n";
+}
+$letter = strtolower($function{0});
+   echo "  \n";
+   echo "   ".strtoupper($letter)."\n";
+}
+echo "   
$function\n";
 }
 ?>

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-19 Thread anatoly techtonik

techtonik   Fri Nov 19 06:06:06 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  ::__ and ->__ should be compressed to one minus sign
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.24&r2=1.25&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.24 phpdoc/xsl/common.xsl:1.25
--- phpdoc/xsl/common.xsl:1.24  Sun Nov 14 11:18:42 2004
+++ phpdoc/xsl/common.xsl   Fri Nov 19 06:06:06 2004
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.24 2004/11/14 16:18:42 techtonik Exp $
+  $Id: common.xsl,v 1.25 2004/11/19 11:06:06 techtonik Exp $
 
   What is done in this stylesheet as common to all HTML output formats:
 
@@ -379,21 +379,36 @@
   
   
 
-  
+  
   
-
-  
- 
-  
-  
- 
-  
-  
- 
-  
-
+
+  
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+
+
+
+  
+
+
+   
+

[PHP-DOC] cvs: phpdoc /howto working.xml

2004-11-19 Thread anatoly techtonik

techtonik   Fri Nov 19 06:04:11 2004 EDT

  Modified files:  
/phpdoc/howto   working.xml 
  Log:
  ::__ and ->__ should be compressed to one minus sign
  
http://cvs.php.net/diff.php/phpdoc/howto/working.xml?r1=1.49&r2=1.50&ty=u
Index: phpdoc/howto/working.xml
diff -u phpdoc/howto/working.xml:1.49 phpdoc/howto/working.xml:1.50
--- phpdoc/howto/working.xml:1.49   Thu Nov 18 12:58:15 2004
+++ phpdoc/howto/working.xmlFri Nov 19 06:04:11 2004
@@ -132,10 +132,13 @@
  Unlike function reference IDs method reference IDs are
  case-sensitive. Special operators ::, 
  -> and underscores are replaced by the same
- minus signs (-). For example 
function.ArrayObject---constructor
- is an ID for ArrayObject::__constructor and 
- function.DOMCharacterData-deleteData is for
- DOMCharacterData->deleteData method accordingly.
+ minus signs (-). For example 
function.DOMCharacterData-deleteData
+ is an ID for DOMCharacterData->deleteData and
+ function.ArrayObject-constructor
+ is for ArrayObject::__constructor
+ method accordingly. Note an exception when operators ::
+ and -> followed by two underscores are replaced with
+ one minus sign (-).
 
 
  Function reference section IDs
@@ -491,7 +494,7 @@
 A function skeleton (func-name.xml)
 
 
-
+
 
  
   func_name
@@ -650,7 +653,7 @@
 A reference.xml skeleton
 
 
-
+
 
  Extname &Functions;
  Extname
@@ -717,7 +720,7 @@
 A configure.xml skeleton
 
 
-
+
 
  &reftitle.install;
  
@@ -758,7 +761,7 @@
 A constants.xml skeleton
 
 
-
+
 
  &reftitle.constants;
  &extension.constants;
@@ -808,7 +811,7 @@
 A ini.xml skeleton
 
 
-
+
 
  &reftitle.runtime;
  &extension.runtime;

[PHP-DOC] cvs: phpdoc /howto working.xml

2004-11-18 Thread anatoly techtonik

techtonik   Thu Nov 18 12:58:16 2004 EDT

  Modified files:  
/phpdoc/howto   working.xml 
  Log:
  method IDs are mixed case
  
http://cvs.php.net/diff.php/phpdoc/howto/working.xml?r1=1.48&r2=1.49&ty=u
Index: phpdoc/howto/working.xml
diff -u phpdoc/howto/working.xml:1.48 phpdoc/howto/working.xml:1.49
--- phpdoc/howto/working.xml:1.48   Fri Nov 12 08:05:52 2004
+++ phpdoc/howto/working.xmlThu Nov 18 12:58:15 2004
@@ -129,6 +129,15 @@
  in IDs, they should be replaced by minus signs (-).
 
 
+ Unlike function reference IDs method reference IDs are
+ case-sensitive. Special operators ::, 
+ -> and underscores are replaced by the same
+ minus signs (-). For example 
function.ArrayObject---constructor
+ is an ID for ArrayObject::__constructor and 
+ function.DOMCharacterData-deleteData is for
+ DOMCharacterData->deleteData method accordingly.
+
+
  Function reference section IDs
  () look
  like this: 'ref.category', for example: 'ref.ftp'.
@@ -482,7 +491,7 @@
 A function skeleton (func-name.xml)
 
 
-
+
 
  
   func_name
@@ -641,7 +650,7 @@
 A reference.xml skeleton
 
 
-
+
 
  Extname &Functions;
  Extname
@@ -708,7 +717,7 @@
 A configure.xml skeleton
 
 
-
+
 
  &reftitle.install;
  
@@ -749,7 +758,7 @@
 A constants.xml skeleton
 
 
-
+
 
  &reftitle.constants;
  &extension.constants;
@@ -799,7 +808,7 @@
 A ini.xml skeleton
 
 
-
+
 
  &reftitle.runtime;
  &extension.runtime;

[PHP-DOC] cvs: phpdoc / Makefile.in

2004-11-15 Thread anatoly techtonik

techtonik   Mon Nov 15 14:17:58 2004 EDT

  Modified files:  
/phpdoc Makefile.in 
  Log:
  * generate funcindex.xml through XSL template
  * use -o option to xsltproc to get unix linefeeds in output file
  * remove redundant quickref.dsl from building process
  
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.156&r2=1.157&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.156 phpdoc/Makefile.in:1.157
--- phpdoc/Makefile.in:1.156Sun Nov 14 17:33:26 2004
+++ phpdoc/Makefile.in  Mon Nov 15 14:17:56 2004
@@ -16,7 +16,7 @@
 #
 
 #
-# $Id: Makefile.in,v 1.156 2004/11/14 22:33:26 techtonik Exp $
+# $Id: Makefile.in,v 1.157 2004/11/15 19:17:56 techtonik Exp $
 #
 
 all: html
@@ -44,7 +44,6 @@
 HOWTO_STYLESHEET=dsssl/howto.dsl
 HOWTOPHP_STYLESHEET=dsssl/howto-php.dsl
 PRINT_STYLESHEET=dsssl/print.dsl
-QUICKREF_STYLESHEET=dsssl/quickref.dsl
 KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl
 XMLDCL=$(srcdir)/dtds/dbxml-4.1.2/phpdocxml.dcl
 
@@ -124,7 +123,7 @@
echo " reusing old file" ;\
touch funcindex.xml ;\
else \
-   $(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml 
$(XMLDCL) manual.xml | sed -e 's/   */ /g' | sort -f > quickref-temp.txt ;\
+   $(XSLTPROC) -o quickref-temp.txt $(QUICKREF_XSL_SHEET) manual.xml ;\
echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > 
funcindex.xml" ;\
$(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > 
funcindex.xml ;\
rm -f quickref-temp.txt ;\
@@ -148,7 +147,7 @@
 quickref: quickref.txt
 quickref.txt: FORCE
@if test ! -e funcindex.xml; then touch funcindex.xml; fi 
-   $(XSLTPROC) $(QUICKREF_XSL_SHEET) manual.xml > quickref.txt
+   $(XSLTPROC) -o quickref.txt $(QUICKREF_XSL_SHEET) manual.xml
 
 kdevelop_toc: php.toc
 php.toc: manual.xml $(KDEVELOP_TOC_DEPS)

[PHP-DOC] cvs: phpdoc / Makefile.in

2004-11-14 Thread anatoly techtonik

techtonik   Sun Nov 14 17:33:26 2004 EDT

  Modified files:  
/phpdoc Makefile.in 
  Log:
  use XSL to generate quick reference (quickref.xsl)
  
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.155&r2=1.156&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.155 phpdoc/Makefile.in:1.156
--- phpdoc/Makefile.in:1.155Mon Nov  1 16:12:09 2004
+++ phpdoc/Makefile.in  Sun Nov 14 17:33:26 2004
@@ -16,7 +16,7 @@
 #
 
 #
-# $Id: Makefile.in,v 1.155 2004/11/01 21:12:09 derick Exp $
+# $Id: Makefile.in,v 1.156 2004/11/14 22:33:26 techtonik Exp $
 #
 
 all: html
@@ -50,6 +50,7 @@
 
 CHM_XSL_SHEET=xsl/htmlhelp.xsl
 HOWTO_XSL_SHEET=xsl/howto.xsl
+QUICKREF_XSL_SHEET=xsl/quickref.xsl
 
 BIGHTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in 
dsssl/common.dsl.in zendapi
 HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in 
dsssl/common.dsl.in zendapihtml
@@ -147,7 +148,7 @@
 quickref: quickref.txt
 quickref.txt: FORCE
@if test ! -e funcindex.xml; then touch funcindex.xml; fi 
-   $(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml 
$(XMLDCL) manual.xml | sed -e 's/   */ /g' | sed -e 's/>/>/' | sed -e 
's/ quickref.txt
 
 kdevelop_toc: php.toc
 php.toc: manual.xml $(KDEVELOP_TOC_DEPS)

[PHP-DOC] cvs: phpdoc /xsl quickref.xsl

2004-11-14 Thread anatoly techtonik

techtonik   Sun Nov 14 17:30:58 2004 EDT

  Modified files:  
/phpdoc/xsl quickref.xsl 
  Log:
  write quick reference for every refname if there are more than one
  (e.g. mysqli)
  
http://cvs.php.net/diff.php/phpdoc/xsl/quickref.xsl?r1=1.4&r2=1.5&ty=u
Index: phpdoc/xsl/quickref.xsl
diff -u phpdoc/xsl/quickref.xsl:1.4 phpdoc/xsl/quickref.xsl:1.5
--- phpdoc/xsl/quickref.xsl:1.4 Sun Nov 14 15:37:29 2004
+++ phpdoc/xsl/quickref.xsl Sun Nov 14 17:30:57 2004
@@ -3,7 +3,7 @@
 
   quickref.xsl: Stylesheet for generating quick-reference
 
-  $Id: quickref.xsl,v 1.4 2004/11/14 20:37:29 techtonik Exp $
+  $Id: quickref.xsl,v 1.5 2004/11/14 22:30:57 techtonik Exp $
 
 -->
 
   
-  
-
+  
+
  - 
-
+
 

-  
+  
 
 
 
\ No newline at end of file

[PHP-DOC] cvs: phpdoc /xsl quickref.xsl

2004-11-14 Thread anatoly techtonik

techtonik   Sun Nov 14 15:37:31 2004 EDT

  Modified files:  
/phpdoc/xsl quickref.xsl 
  Log:
  function names in reference can't contain spaces
  fix since refnamediv is used more widely
  
http://cvs.php.net/diff.php/phpdoc/xsl/quickref.xsl?r1=1.3&r2=1.4&ty=u
Index: phpdoc/xsl/quickref.xsl
diff -u phpdoc/xsl/quickref.xsl:1.3 phpdoc/xsl/quickref.xsl:1.4
--- phpdoc/xsl/quickref.xsl:1.3 Sun Nov 14 12:36:11 2004
+++ phpdoc/xsl/quickref.xsl Sun Nov 14 15:37:29 2004
@@ -3,7 +3,7 @@
 
   quickref.xsl: Stylesheet for generating quick-reference
 
-  $Id: quickref.xsl,v 1.3 2004/11/14 17:36:11 techtonik Exp $
+  $Id: quickref.xsl,v 1.4 2004/11/14 20:37:29 techtonik Exp $
 
 -->
 
 
 
-  
-   - 
-  
-  
-
+  
+  
+
+ - 
+
+

+  
 
 
 
\ No newline at end of file

[PHP-DOC] cvs: phpdoc /xsl quickref.xsl

2004-11-14 Thread anatoly techtonik

techtonik   Sun Nov 14 12:36:11 2004 EDT

  Modified files:  
/phpdoc/xsl quickref.xsl 
  Log:
  production release
  [add] parameter to sort quickreference alphabetically regardless of case 
  
http://cvs.php.net/diff.php/phpdoc/xsl/quickref.xsl?r1=1.2&r2=1.3&ty=u
Index: phpdoc/xsl/quickref.xsl
diff -u phpdoc/xsl/quickref.xsl:1.2 phpdoc/xsl/quickref.xsl:1.3
--- phpdoc/xsl/quickref.xsl:1.2 Sun Nov 14 12:34:27 2004
+++ phpdoc/xsl/quickref.xsl Sun Nov 14 12:36:11 2004
@@ -3,20 +3,37 @@
 
   quickref.xsl: Stylesheet for generating quick-reference
 
-  $Id: quickref.xsl,v 1.2 2004/11/14 17:34:27 techtonik Exp $
+  $Id: quickref.xsl,v 1.3 2004/11/14 17:36:11 techtonik Exp $
 
 -->
+
+
+
+]>
 http://www.w3.org/1999/XSL/Transform";
 version="1.0">
 
 
 
+
+
 
 
 
-  
- 
-  
+  
+  
+
+
+
+  
+  
+
+
+
+  
+

[PHP-DOC] cvs: phpdoc /xsl quickref.xsl

2004-11-14 Thread anatoly techtonik

techtonik   Sun Nov 14 12:34:28 2004 EDT

  Modified files:  
/phpdoc/xsl quickref.xsl 
  Log:
  eternal mess. linefeeds
  
http://cvs.php.net/diff.php/phpdoc/xsl/quickref.xsl?r1=1.1&r2=1.2&ty=u
Index: phpdoc/xsl/quickref.xsl
diff -u phpdoc/xsl/quickref.xsl:1.1 phpdoc/xsl/quickref.xsl:1.2
--- phpdoc/xsl/quickref.xsl:1.1 Sat Nov 13 12:49:41 2004
+++ phpdoc/xsl/quickref.xsl Sun Nov 14 12:34:27 2004
@@ -1,30 +1,30 @@
-
-
-http://www.w3.org/1999/XSL/Transform";
-version="1.0">
-
-
-
-
-
-
-  
- 
-  
-
-
-
-  
-   - 
-  
-  
-
-
-
+
+
+http://www.w3.org/1999/XSL/Transform";
+version="1.0">
+
+
+
+
+
+
+  
+ 
+  
+
+
+
+  
+   - 
+  
+  
+
+
+
 
\ No newline at end of file

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-14 Thread anatoly techtonik

techtonik   Sun Nov 14 11:18:43 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  bring external links markup from previous version of templates
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.23&r2=1.24&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.23 phpdoc/xsl/common.xsl:1.24
--- phpdoc/xsl/common.xsl:1.23  Sun Nov 14 08:28:52 2004
+++ phpdoc/xsl/common.xsl   Sun Nov 14 11:18:42 2004
@@ -3,11 +3,10 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.23 2004/11/14 13:28:52 techtonik Exp $
+  $Id: common.xsl,v 1.24 2004/11/14 16:18:42 techtonik Exp $
 
--->
-
 http://www.w3.org/1999/XSL/Transform";
 version="1.0">
@@ -426,4 +426,33 @@
 
 
 
+
+
+
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+  » 
+ 
+  
+
+  
+
+
+  
+
+  
+
+
+

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-14 Thread anatoly techtonik

techtonik   Sun Nov 14 09:28:25 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  add some comments (save state)
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.17&r2=1.18&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.17 phpdoc/xsl/htmlhelp.xsl:1.18
--- phpdoc/xsl/htmlhelp.xsl:1.17Wed Nov 10 15:40:03 2004
+++ phpdoc/xsl/htmlhelp.xsl Sun Nov 14 09:28:25 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.17 2004/11/10 20:40:03 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.18 2004/11/14 14:28:25 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -12,6 +12,30 @@
 xmlns:set="http://exslt.org/sets";
version="1.0"
 exclude-result-prefixes="doc exsl set">
+
 
 
 
@@ -496,8 +520,7 @@
   
 
 
-
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-14 Thread anatoly techtonik

techtonik   Sun Nov 14 08:28:52 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  add some comments (save state)
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.22&r2=1.23&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.22 phpdoc/xsl/common.xsl:1.23
--- phpdoc/xsl/common.xsl:1.22  Sun Nov 14 08:15:42 2004
+++ phpdoc/xsl/common.xsl   Sun Nov 14 08:28:52 2004
@@ -3,12 +3,21 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.22 2004/11/14 13:15:42 techtonik Exp $
+  $Id: common.xsl,v 1.23 2004/11/14 13:28:52 techtonik Exp $
 
 -->
 
 http://www.w3.org/1999/XSL/Transform";
 version="1.0">

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-14 Thread anatoly techtonik

techtonik   Sun Nov 14 08:15:43 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  TOC labels (like section numbers) are not included in TOC href
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.21&r2=1.22&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.21 phpdoc/xsl/common.xsl:1.22
--- phpdoc/xsl/common.xsl:1.21  Wed Nov 10 15:34:59 2004
+++ phpdoc/xsl/common.xsl   Sun Nov 14 08:15:42 2004
@@ -3,9 +3,13 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.21 2004/11/10 20:34:59 techtonik Exp $
+  $Id: common.xsl,v 1.22 2004/11/14 13:15:42 techtonik Exp $
 
 -->
+
 http://www.w3.org/1999/XSL/Transform";
 version="1.0">
 
@@ -291,6 +295,37 @@
 
 
 
+
+
+  
+  
+  
+
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+  
+  
+
+
+

[PHP-DOC] cvs: phpdoc /xsl howto.xsl

2004-11-14 Thread anatoly techtonik

techtonik   Sun Nov 14 08:15:23 2004 EDT

  Modified files:  
/phpdoc/xsl howto.xsl 
  Log:
  TOC labels (like section numbers) are not included in TOC href (moved to 
common.xsl)
  
http://cvs.php.net/diff.php/phpdoc/xsl/howto.xsl?r1=1.5&r2=1.6&ty=u
Index: phpdoc/xsl/howto.xsl
diff -u phpdoc/xsl/howto.xsl:1.5 phpdoc/xsl/howto.xsl:1.6
--- phpdoc/xsl/howto.xsl:1.5Tue Nov  2 14:04:44 2004
+++ phpdoc/xsl/howto.xslSun Nov 14 08:15:22 2004
@@ -3,7 +3,7 @@
 
   HOWTO specific stylesheet based on Docbook XSL 1.66.1
 
-  $Id: howto.xsl,v 1.5 2004/11/02 19:04:44 techtonik Exp $
+  $Id: howto.xsl,v 1.6 2004/11/14 13:15:22 techtonik Exp $
 
 -->
 
-  
-
-
-
-
-
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-  
-
-  
-  
-  
-
-
-  
-
-

[PHP-DOC] cvs: phpdoc /xsl README.txt quickref.xsl

2004-11-13 Thread anatoly techtonik

techtonik   Sat Nov 13 12:49:43 2004 EDT

  Added files: 
/phpdoc/xsl quickref.xsl 

  Modified files:  
/phpdoc/xsl README.txt 
  Log:
  [add] quickref.xsl template for generating quick-reference
  
http://cvs.php.net/diff.php/phpdoc/xsl/README.txt?r1=1.1&r2=1.2&ty=u
Index: phpdoc/xsl/README.txt
diff -u phpdoc/xsl/README.txt:1.1 phpdoc/xsl/README.txt:1.2
--- phpdoc/xsl/README.txt:1.1   Wed Nov 10 17:37:12 2004
+++ phpdoc/xsl/README.txt   Sat Nov 13 12:49:41 2004
@@ -14,6 +14,8 @@
  the code to be found under the functable repository in
  CVS or ask Hartmut =)  mailto:[EMAIL PROTECTED]
 
+QUICKREF.XSL   - for building functions quick reference 
+
 All others are deprecated.
 
  
@@ -53,4 +55,4 @@
 Contact him or the phpdoc list ([EMAIL PROTECTED]) if you have any questions
 or suggestions...
 
-Last modified $Date: 2004/11/10 22:37:12 $
\ No newline at end of file
+Last modified $Date: 2004/11/13 17:49:41 $
\ No newline at end of file

http://cvs.php.net/co.php/phpdoc/xsl/quickref.xsl?r=1.1&p=1
Index: phpdoc/xsl/quickref.xsl
+++ phpdoc/xsl/quickref.xsl


http://www.w3.org/1999/XSL/Transform";
version="1.0">






  
 
  



  
   -

[PHP-DOC] cvs: phpdoc /xsl README.txt

2004-11-10 Thread anatoly techtonik

techtonik   Wed Nov 10 17:37:15 2004 EDT

  Added files: 
/phpdoc/xsl README.txt 
  Log:
  add status for templates with some additional comments
  fell free to fix errors
  

http://cvs.php.net/co.php/phpdoc/xsl/README.txt?r=1.1&p=1
Index: phpdoc/xsl/README.txt
+++ phpdoc/xsl/README.txt
Status of XSL Templates in this directory
~
The only used and supported files here as of DBK XSL 1.66.1 are:
HOWTO.XSL  - for generating HOW-TO with XSL
HTMLHELP.XSL   - for xCHM building process
HTMLHELP-CONFIG.XSL.IN - configuration parameters for the above

COMMON.XSL - template with common options for HTMLHELP.XSL and
 HOWTO.XSL (so far). Contains XSL code to tune
 rendering of examples (programlisting) sections and 
 general function reference customizations

VERSION.XML- function to PHP version relation. Auto-generated from
 the code to be found under the functable repository in
 CVS or ask Hartmut =)  mailto:[EMAIL PROTECTED]

All others are deprecated.

 
HTML HELP (xCHM) NOTES
~~
HTML HELP (xCHM) generated from these templates is made of three customization
layers. Some parameters in XSL templates are not customizable and sometimes you
will need to copy whole big template to make a minor customization. Next time
DocBook templates upgrade you must merge these modifications. This becomes even
worse if there will be major structural changes in XSL DocBook (not likely, but
still possible) - that way you will have to start customizations almost from
scratch. Sometimes it is much more easier to patch output code with PHP scripts.

So, the first layer is "minor" customizations of DocBook XSL templates, 
where..html and HTMLHELP project files are created without major templates 
redefining.
It is not that only XSL parameters are set and there are no templates redefined
at all. It is programmer's point of view on if templates should be redefined in
XSL or tuned via PHP scripts. The general rule probably is simplicity in
synchronizing customization layers with DocBook ones.

Second layer consists of PHP scripts in htmlhelp/ directory and mostly used for
quick patches/fixes, search_and_replace operations, that otherwise will require
big XSL overhaul. This layer also performs a very important role - it modifies
DOM structure of raw html files produced by DocBook XSL to add dynamic 
features, 
what are candy of xCHM. User notes, for example. 

Third layer is JavaScript code. It brings life to static xCHM pages, when user
decides to read them, manages skinning issues and all that stuff that is called
DHTML.


See htmlhelp/DESCRIPTION.txt with overview of requirements for output and input
html files from each layer.

===
This document is written by techtonik ([EMAIL PROTECTED])
Contact him or the phpdoc list ([EMAIL PROTECTED]) if you have any questions
or suggestions...

Last modified $Date: 2004/11/10 22:37:12 $

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-10 Thread anatoly techtonik

techtonik   Wed Nov 10 15:40:03 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  fix function index from being hidden in native htmlhelp docbook templates
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.16&r2=1.17&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.16 phpdoc/xsl/htmlhelp.xsl:1.17
--- phpdoc/xsl/htmlhelp.xsl:1.16Wed Nov 10 15:38:09 2004
+++ phpdoc/xsl/htmlhelp.xsl Wed Nov 10 15:40:03 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.16 2004/11/10 20:38:09 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.17 2004/11/10 20:40:03 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -490,6 +490,35 @@
   
 
 
+
+
+  
+
+
+
+
+
+  
+  
+
+  
+  
+
+
+
+  
+  
+
+
+

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-10 Thread anatoly techtonik

techtonik   Wed Nov 10 15:38:09 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  fix overescaping in HHC caused by chunking HH files in html mode
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.15&r2=1.16&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.15 phpdoc/xsl/htmlhelp.xsl:1.16
--- phpdoc/xsl/htmlhelp.xsl:1.15Tue Nov  9 08:02:05 2004
+++ phpdoc/xsl/htmlhelp.xsl Wed Nov 10 15:38:09 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.15 2004/11/09 13:02:05 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.16 2004/11/10 20:38:09 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -308,6 +308,43 @@
   
 
 
+
+
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+  
+
+
+  
+  
+  
+
+  
+
+  
+
+  
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-10 Thread anatoly techtonik

techtonik   Wed Nov 10 15:35:04 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  generate proper xreferences to methods from  block
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.20&r2=1.21&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.20 phpdoc/xsl/common.xsl:1.21
--- phpdoc/xsl/common.xsl:1.20  Tue Nov  9 07:59:37 2004
+++ phpdoc/xsl/common.xsl   Wed Nov 10 15:34:59 2004
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.20 2004/11/09 12:59:37 techtonik Exp $
+  $Id: common.xsl,v 1.21 2004/11/10 20:34:59 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -335,14 +335,31 @@
   
   
 
+  
+  
+
+  
+ 
+  
+  
+ 
+  
+  
+ 
+  
+
+  
+  
   
 
-   
+   
 
   
 
   
-
+

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-09 Thread anatoly techtonik

techtonik   Tue Nov  9 08:02:05 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  [ADD] * handler for parameter role="reference" in function prototype
  [ADD] * pagebreak if function has several prototypes
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.14&r2=1.15&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.14 phpdoc/xsl/htmlhelp.xsl:1.15
--- phpdoc/xsl/htmlhelp.xsl:1.14Thu Nov  4 02:41:11 2004
+++ phpdoc/xsl/htmlhelp.xsl Tue Nov  9 08:02:05 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.14 2004/11/04 07:41:11 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.15 2004/11/09 13:02:05 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -550,23 +550,24 @@
  
 
  This overrides common.xsl templates
- TODO: 
 -->
 
 
-  
-   
-  
-  
-   
-  
-   ( 
-  
-  
-]
-  
-   )
+  
+
+ 
+
+
+ 
+
+ ( 
+
+
+  ]
+
+ )
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-09 Thread anatoly techtonik

techtonik   Tue Nov  9 07:59:38 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  [ADD] * handler for parameter role="reference" in function prototype
  [ADD] * pagebreak if function has several prototypes
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.19&r2=1.20&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.19 phpdoc/xsl/common.xsl:1.20
--- phpdoc/xsl/common.xsl:1.19  Wed Nov  3 02:18:48 2004
+++ phpdoc/xsl/common.xsl   Tue Nov  9 07:59:37 2004
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.19 2004/11/03 07:18:48 techtonik Exp $
+  $Id: common.xsl,v 1.20 2004/11/09 12:59:37 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -80,14 +80,15 @@
  
 
  Note, that this is DSSSL like version. htmlhelp.xsl uses another, span 
style
- TODO: 
 -->
 
 
 
-  
+  
+
+  
 
 
 
@@ -111,6 +112,9 @@
 
 
 
+  
+&
+

[PHP-DOC] cvs: phpdoc /htmlhelp README.txt

2004-11-05 Thread anatoly techtonik

techtonik   Fri Nov  5 15:14:25 2004 EDT

  Modified files:  
/phpdoc/htmlhelpREADME.txt 
  Log:
  DocBook XSL stylesheets updated to version 1.66.1
  XSL customizing layer rewritten
  xCHM building process is alive again
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/README.txt?r1=1.8&r2=1.9&ty=u
Index: phpdoc/htmlhelp/README.txt
diff -u phpdoc/htmlhelp/README.txt:1.8 phpdoc/htmlhelp/README.txt:1.9
--- phpdoc/htmlhelp/README.txt:1.8  Mon Sep  6 16:34:43 2004
+++ phpdoc/htmlhelp/README.txt  Fri Nov  5 15:14:20 2004
@@ -16,24 +16,8 @@
 
 How to build a CHM manual with this system?
 
- 0. Ensure that you have the latest phpdoc checkout,
-but that your XSL folder is dated 2002.12.31 23:00:00,
-since if you use XSL sheets from after this timestamp,
-the customizations will not work. Use the cvs date tag
-to get this version:
-
-From the phpdoc root directory:
-cvs update -dP -D"December 31, 2002 11:00pm" xsl
-
-# ensure the version information is up-to-date and that
-# html doctypes are included
-cvs up -A xsl/version.xml xsl/docbook/html/chunker.xsl
-
-{Volunteer to fix the customizations if you are willing
- to, but otherwise you cannot do much more but use the old
- sheets}
-
-Ensure however that the xsl/version.xml file is up to date,
+ 0. Ensure that you have the latest phpdoc checkout and the
+version information in xsl/version.xml is up-to-date,
 so you will build the latest function version information
 into the CHM.
 
@@ -45,24 +29,8 @@
 "--with-xsltproc=path" option to explicitly
 provide the XSLTProc path.
 
- 3. Replace @DOCBOOKXSL_HTML@ with ./docbook/html/chunk.xsl in
-xsl/htmlhelp-db.xsl (do this after any configure runs). This
-is needed, since the new XSL sheets require no configuration,
-and since you are using old sheets, you need to do configuration
-yourself.
-
- 4. Add
-
-
-  
-
-
-http://www.w3.org/TR/html4/loose.dtd'"/>
-
-
-to xsl/html-common.xsl.
 
- 5. Run "make chm_xsl"
+ 3. Run "make chm_xsl"
 
 If xsltproc encounters errors in the XML files,
 correct the errors, commit them to phpdoc, and
@@ -72,22 +40,22 @@
 After this step the HTML files to start are in
 phpdoc/htmlhelp/html
 
- 6. Get the actual mirrors.inc file from
+ 4. Get the actual mirrors.inc file from
 http://ANY_MIRROR.php.net/include/mirrors.inc
 and save into the directory where the
 make_chm.bat resides (overwrite old one if
 one exists).
 
- 7. Get all the user notes from
+ 5. Get all the user notes from
 http://ANY_MIRROR.php.net/backend/notes/all.bz2,
 extract its contents (using bunzip2 all.bz2, for example),
 and place the resulting "all" file to the same folder where
 the make_chm.bat resides.
 
- 8. Copy local_vars.php.src to local_vars.php and
+ 6. Copy local_vars.php.src to local_vars.php and
 adjust settings as needed.
 
- 9. Now run make_chm.bat
+ 7. Now run make_chm.bat
 
 Well, this is quite manual right now, and there are
 some problems need fixing (see the TODO.txt file too).

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-03 Thread anatoly techtonik

techtonik   Thu Nov  4 02:41:11 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  fix invalid select attribute
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.13&r2=1.14&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.13 phpdoc/xsl/htmlhelp.xsl:1.14
--- phpdoc/xsl/htmlhelp.xsl:1.13Wed Nov  3 23:27:20 2004
+++ phpdoc/xsl/htmlhelp.xsl Thu Nov  4 02:41:11 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.13 2004/11/04 04:27:20 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.14 2004/11/04 07:41:11 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -493,8 +493,8 @@
 
 
 
-
-
+
+

[PHP-DOC] cvs: phpdoc /en/reference/rar reference.xml

2004-11-03 Thread anatoly techtonik

techtonik   Thu Nov  4 01:16:23 2004 EDT

  Modified files:  
/phpdoc/en/reference/rarreference.xml 
  Log:
  make id lowercase
  
http://cvs.php.net/diff.php/phpdoc/en/reference/rar/reference.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/rar/reference.xml
diff -u phpdoc/en/reference/rar/reference.xml:1.1 
phpdoc/en/reference/rar/reference.xml:1.2
--- phpdoc/en/reference/rar/reference.xml:1.1   Wed Sep 22 11:51:29 2004
+++ phpdoc/en/reference/rar/reference.xml   Thu Nov  4 01:16:21 2004
@@ -1,6 +1,6 @@
 
-
- 
+
+ 
   Rar Functions
   Rar

[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php

2004-11-03 Thread anatoly techtonik

techtonik   Wed Nov  3 23:36:37 2004 EDT

  Modified files:  
/phpdoc/htmlhelpfilter_files.php 
  Log:
  additional table styling fixes
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.9&r2=1.10&ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.9 phpdoc/htmlhelp/filter_files.php:1.10
--- phpdoc/htmlhelp/filter_files.php:1.9Wed Nov  3 15:46:01 2004
+++ phpdoc/htmlhelp/filter_files.phpWed Nov  3 23:36:37 2004
@@ -216,6 +216,11 @@
 );
 
 //--
+// Add .datatable class for tables to ease styling
+$content = preg_replace('! tags after all  or  or  close tags to
 // enable CSS support for those paragraphs (these break a )
 // BUT do not put a P after our special notes container

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-03 Thread anatoly techtonik

techtonik   Wed Nov  3 23:27:21 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  additional table styling fixes
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.12&r2=1.13&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.12 phpdoc/xsl/htmlhelp.xsl:1.13
--- phpdoc/xsl/htmlhelp.xsl:1.12Wed Nov  3 15:57:33 2004
+++ phpdoc/xsl/htmlhelp.xsl Wed Nov  3 23:27:20 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.12 2004/11/03 20:57:33 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.13 2004/11/04 04:27:20 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -493,6 +493,9 @@
 
 
 
+
+
+

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-03 Thread anatoly techtonik

techtonik   Wed Nov  3 15:53:44 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  _blank target for external links
  shade verbatims with CSS hence get rid of table wrapper
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.10&r2=1.11&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.10 phpdoc/xsl/htmlhelp.xsl:1.11
--- phpdoc/xsl/htmlhelp.xsl:1.10Wed Nov  3 02:20:24 2004
+++ phpdoc/xsl/htmlhelp.xsl Wed Nov  3 15:53:40 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.10 2004/11/03 07:20:24 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.11 2004/11/03 20:53:40 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -22,6 +22,9 @@
 
 
 
+
+
+
 http://www.w3.org/TR/html4/loose.dtd'"/>
 
 
@@ -51,6 +54,9 @@
 set   toc
 
 
+
+
+

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-03 Thread anatoly techtonik

techtonik   Wed Nov  3 15:57:34 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  use simple bold text for admonitions (note|important|warning|caution|tip)
  default tables cellpadding=2, cellspacing=1 and border=0
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.11&r2=1.12&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.11 phpdoc/xsl/htmlhelp.xsl:1.12
--- phpdoc/xsl/htmlhelp.xsl:1.11Wed Nov  3 15:53:40 2004
+++ phpdoc/xsl/htmlhelp.xsl Wed Nov  3 15:57:33 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.11 2004/11/03 20:53:40 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.12 2004/11/03 20:57:33 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -469,6 +469,31 @@
   
 
 
+
+
+  
+
+  
+
+  
+
+
+
+  
+  
+  : 
+
+
+
+  
+
+
+
+
+
+
+
+

[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php

2004-11-03 Thread anatoly techtonik

techtonik   Wed Nov  3 15:46:07 2004 EDT

  Modified files:  
/phpdoc/htmlhelpfilter_files.php 
  Log:
  insert pageText div after last closed div
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.8&r2=1.9&ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.8 phpdoc/htmlhelp/filter_files.php:1.9
--- phpdoc/htmlhelp/filter_files.php:1.8Tue Nov  2 14:18:33 2004
+++ phpdoc/htmlhelp/filter_files.phpWed Nov  3 15:46:01 2004
@@ -181,14 +181,14 @@
 // Normal page
 else {
 
-$headend_regex = '!!';
+$headend_regex = '!(()+)!';
 if (!preg_match($headend_regex, $content)) {
 echo "Impossible to close pageHeaders div. No match in $filename\n";
 
 } else {
 $content = preg_replace(
 $headend_regex,
-'',
+'\1',
 $content
 );
 }

[PHP-DOC] cvs: phpdoc /en/install pecl.xml

2004-11-03 Thread anatoly techtonik

techtonik   Wed Nov  3 04:30:10 2004 EDT

  Modified files:  
/phpdoc/en/install  pecl.xml 
  Log:
  remove simplesect in favor of sect1
  
http://cvs.php.net/diff.php/phpdoc/en/install/pecl.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/install/pecl.xml
diff -u phpdoc/en/install/pecl.xml:1.3 phpdoc/en/install/pecl.xml:1.4
--- phpdoc/en/install/pecl.xml:1.3  Tue Sep  7 08:03:22 2004
+++ phpdoc/en/install/pecl.xml  Wed Nov  3 04:30:06 2004
@@ -1,10 +1,10 @@
 
-
+
 
 
  Installation of PECL extensions
 
- 
+ 
   Introduction to PECL Installations
   
PHP extensions may be installed in a variety of ways. 
@@ -32,9 +32,9 @@
Anonymous CVS Instructions for 
details on the required tools, and required versions.
   
- 
+ 
 
- 
+ 
   Downloading PECL extensions
   
There are several options for downloading PECL extensions, such as:
@@ -91,9 +91,9 @@
 

   
- 
+ 
 
- 
+ 
   PECL for Windows users
   
Like with any other PHP extension DLL, to install move 
@@ -109,9 +109,9 @@
   
After doing this, restart the web server.
   
- 
+ 
  
- 
+ 
   Compiling shared PECL extensions with PEAR
   
PEAR makes it easy to create shared PHP extensions. Using the 
@@ -144,9 +144,9 @@
extensions directory. Adjust  
&php.ini; accordingly.
   
- 
+ 
 
- 
+ 
   Compiling shared PECL extensions with phpize
   
If using pear is not an option, like for building shared PECL extensions
@@ -176,9 +176,9 @@
extensions directory, and adjust
&php.ini; accordingly.
   
- 
+ 
 
- 
+ 
   Compiling PECL extensions statically into PHP
   
To statically include the extension within the PHP build, put the 
@@ -228,7 +228,7 @@
 $ ./configure --help | grep extname

   
- 
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-03 Thread anatoly techtonik

techtonik   Wed Nov  3 02:18:50 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  proper  rendering in ToC
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.18&r2=1.19&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.18 phpdoc/xsl/common.xsl:1.19
--- phpdoc/xsl/common.xsl:1.18  Tue Nov  2 14:03:53 2004
+++ phpdoc/xsl/common.xsl   Wed Nov  3 02:18:48 2004
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.18 2004/11/02 19:03:53 techtonik Exp $
+  $Id: common.xsl,v 1.19 2004/11/03 07:18:48 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -355,5 +355,10 @@
   
 
 
+
+
+  
+
+

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-02 Thread anatoly techtonik

techtonik   Wed Nov  3 02:20:25 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  replace one PHP Manual with Table of Contents
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.9&r2=1.10&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.9 phpdoc/xsl/htmlhelp.xsl:1.10
--- phpdoc/xsl/htmlhelp.xsl:1.9 Tue Nov  2 14:12:48 2004
+++ phpdoc/xsl/htmlhelp.xsl Wed Nov  3 02:20:24 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.9 2004/11/02 19:12:48 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.10 2004/11/03 07:20:24 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -110,6 +110,11 @@
   
 
   
+  
+
+  
+
+  
   
   
   
@@ -119,7 +124,7 @@
   
   
   
-
+
 
   
   
 
   
+  
+
+  
+
+  
+
   
   
   
@@ -262,7 +273,7 @@
   
   
   
-
+

[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php

2004-11-02 Thread anatoly techtonik

techtonik   Tue Nov  2 14:18:33 2004 EDT

  Modified files:  
/phpdoc/htmlhelpfilter_files.php 
  Log:
  handle optional lang attribute in divs
  more error reporting
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.7&r2=1.8&ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.7 phpdoc/htmlhelp/filter_files.php:1.8
--- phpdoc/htmlhelp/filter_files.php:1.7Sat Oct 30 08:55:21 2004
+++ phpdoc/htmlhelp/filter_files.phpTue Nov  2 14:18:33 2004
@@ -106,7 +106,7 @@
 
 // Replace title with simple  content [shorter, without tags]
 $content = preg_replace(
-'!]*>.+!Us',
+'!]*>.+!Us',
 "$page_title",
 $content,
 1
@@ -116,8 +116,12 @@
 // Add divisions for skin support
 
 // Make the document invisible by default, adding a new first div
+// with id="pageContent" and opening div with id="pageHeaders"
 $bodystart_regex = '!()!Us';
-if (preg_match($bodystart_regex, $content)) {
+if (!preg_match($bodystart_regex, $content)) {
+echo "Can't add first div. No match in $filename\n";
+
+} else {
 $content = preg_replace(
 $bodystart_regex,
 '\1',
@@ -131,18 +135,17 @@
 '',
 $content
 );
-} else {
-echo "Can't add first div. No match.\n";
 }
 
-// For headers we have several possibilities
+// For headers we have several possibilities to close div id="pageHeaders"
+// and open div with id="pageText"
 if (strpos($content, '') !== FALSE) {
 
 // A function page
 if (!strpos($content, "refsynopsisdiv")) {
 $content = str_replace(
-'',
-'',
+'',
-'',
+'()?!',
-'\\1',
-$content
-);
-
-}
-
 // The index page
-else {
+elseif ($filename == $INDEX_FILE)  {
 
 // Delete titlepage div and
 // add pageHeader end and pageText start
@@ -186,6 +178,23 @@
 );
 }
 
+// Normal page
+else {
+
+$headend_regex = '!!';
+if (!preg_match($headend_regex, $content)) {
+echo "Impossible to close pageHeaders div. No match in $filename\n";
+
+} else {
+$content = preg_replace(
+$headend_regex,
+'',
+$content
+);
+}
+
+}
+
 // End that pageText div before the user notes
 $content = str_replace(
 '',

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-02 Thread anatoly techtonik

techtonik   Tue Nov  2 14:12:50 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  make it more clear that every page consists of titlepage (or page header)
  and content.. in htmlhelp format reference info goes into page header
  
  omit word "description" in new xml format references
  render seealso sections in such files
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.8&r2=1.9&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.8 phpdoc/xsl/htmlhelp.xsl:1.9
--- phpdoc/xsl/htmlhelp.xsl:1.8 Tue Nov  2 08:20:16 2004
+++ phpdoc/xsl/htmlhelp.xsl Tue Nov  2 14:12:48 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.8 2004/11/02 13:20:16 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.9 2004/11/02 19:12:48 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -455,16 +455,18 @@
 
 
 
-
+
 
   
@@ -498,11 +500,12 @@
   intpreg_match_all
   stringpattern
   stringsubject
-  arraymatches
+  arraymatches
   intflags
  
 
  This overrides common.xsl templates
+ TODO: 
 -->
 
@@ -539,9 +542,23 @@
   
 
 
+
+
+
 
-
-
+
+
+
+
+
+
+
+   
+
 
+
+

[PHP-DOC] cvs: phpdoc /xsl howto.xsl

2004-11-02 Thread anatoly techtonik

techtonik   Tue Nov  2 14:04:45 2004 EDT

  Modified files:  
/phpdoc/xsl howto.xsl 
  Log:
  small cleanup
  
http://cvs.php.net/diff.php/phpdoc/xsl/howto.xsl?r1=1.4&r2=1.5&ty=u
Index: phpdoc/xsl/howto.xsl
diff -u phpdoc/xsl/howto.xsl:1.4 phpdoc/xsl/howto.xsl:1.5
--- phpdoc/xsl/howto.xsl:1.4Tue Nov  2 09:36:33 2004
+++ phpdoc/xsl/howto.xslTue Nov  2 14:04:44 2004
@@ -3,7 +3,7 @@
 
   HOWTO specific stylesheet based on Docbook XSL 1.66.1
 
-  $Id: howto.xsl,v 1.4 2004/11/02 14:36:33 techtonik Exp $
+  $Id: howto.xsl,v 1.5 2004/11/02 19:04:44 techtonik Exp $
 
 -->
 
 
 http://www.w3.org/1999/XSL/Transform"; version="1.0">
@@ -51,8 +51,6 @@
   
   
   
-  
-  
  
   
   
@@ -211,7 +209,6 @@
 
 /* Make literals look like in DSSSL - vars */
 .literal {font:oblique 1em serif;}
-.parameter {font:italic;}
 
 .filename {font:monospace}

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-02 Thread anatoly techtonik

techtonik   Tue Nov  2 14:03:55 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  enclose  in links, add parenthesis, make 'em bold. Do not link if
  current page is description of current function or target is not available
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.17&r2=1.18&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.17 phpdoc/xsl/common.xsl:1.18
--- phpdoc/xsl/common.xsl:1.17  Tue Nov  2 08:19:10 2004
+++ phpdoc/xsl/common.xsl   Tue Nov  2 14:03:53 2004
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.17 2004/11/02 13:19:10 techtonik Exp $
+  $Id: common.xsl,v 1.18 2004/11/02 19:03:53 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -75,11 +75,12 @@
   intpreg_match_all
   stringpattern
   stringsubject
-  arraymatches
+  arraymatches
   intflags
  
 
  Note, that this is DSSSL like version. htmlhelp.xsl uses another, span style
+ TODO: 
 -->
 
 
+
+  
+  
+ 
+  ()
+  
+  
+
+  
+
+   
+
+  
+
+  
+
+   
+
+
+  
+
+  
+
+
+  
+
+
+
+
+  
+
+

[PHP-DOC] cvs: phpdoc /xsl howto.xsl

2004-11-02 Thread anatoly techtonik

techtonik   Tue Nov  2 09:36:34 2004 EDT

  Modified files:  
/phpdoc/xsl howto.xsl 
  Log:
  link with common.xsl
  
http://cvs.php.net/diff.php/phpdoc/xsl/howto.xsl?r1=1.3&r2=1.4&ty=u
Index: phpdoc/xsl/howto.xsl
diff -u phpdoc/xsl/howto.xsl:1.3 phpdoc/xsl/howto.xsl:1.4
--- phpdoc/xsl/howto.xsl:1.3Fri Oct 29 09:00:22 2004
+++ phpdoc/xsl/howto.xslTue Nov  2 09:36:33 2004
@@ -3,7 +3,7 @@
 
   HOWTO specific stylesheet based on Docbook XSL 1.66.1
 
-  $Id: howto.xsl,v 1.3 2004/10/29 13:00:22 techtonik Exp $
+  $Id: howto.xsl,v 1.4 2004/11/02 14:36:33 techtonik Exp $
 
 -->
 
-
-  
-
-
-  
-
-
-
-
-
-  
-  
-
-  
-
-  
-
-
-
-
-  
-
-
-  
-
-
-  
-
-   
-
-
-   
-
-  
-  
-
-   
-
-
-   
-
-
-  
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-
-  
-
-  
-  
-
-
-
-  
-
-  
-
-  
-
-  
-
-  
-  
-
-  
-
-  
-  
-  
-
-
- 
-
-
-
-
-  
-
-
-
-
-  
-
-  
-  
-  
-
-  
-  
-
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-  
-
-  
-
-  
-
-  
-
-

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-02 Thread anatoly techtonik

techtonik   Tue Nov  2 08:20:16 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  add special reference page formatting for HH
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.7&r2=1.8&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.7 phpdoc/xsl/htmlhelp.xsl:1.8
--- phpdoc/xsl/htmlhelp.xsl:1.7 Mon Nov  1 11:29:45 2004
+++ phpdoc/xsl/htmlhelp.xsl Tue Nov  2 08:20:16 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.7 2004/11/01 16:29:45 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.8 2004/11/02 13:20:16 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -53,6 +53,7 @@
 
 
 
+
 
 
 
@@ -201,6 +202,8 @@
   
 
 
+
+
 
 
 
+-->
 
 
 
+
 
 
 
@@ -434,7 +437,11 @@
 
 
 
+
+
+
 
+
 
   
   
@@ -445,4 +452,96 @@
   
 
 
+
+
+
+
+
+  
+
+  
+
+
+
+
+  
+
+
+  
+  ()
+  
+  
+
+  
+
+
+
+
+
+  
+   
+  
+  
+   
+  
+   ( 
+  
+  
+]
+  
+   )
+
+
+
+
+  
+ [
+  
+  
+, 
+  
+  
+   
+  
+   
+  
+   
+  
+
+
+
+
+
+
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-02 Thread anatoly techtonik

techtonik   Tue Nov  2 08:19:12 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  replace copy-of with value-of in methodname template
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.16&r2=1.17&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.16 phpdoc/xsl/common.xsl:1.17
--- phpdoc/xsl/common.xsl:1.16  Mon Nov  1 16:27:53 2004
+++ phpdoc/xsl/common.xsl   Tue Nov  2 08:19:10 2004
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.16 2004/11/01 21:27:53 techtonik Exp $
+  $Id: common.xsl,v 1.17 2004/11/02 13:19:10 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -33,7 +33,7 @@
 
 
 
+ function title like in DSSSL -->
 
   
 
@@ -100,7 +100,7 @@
 
 
   
-
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-01 Thread anatoly techtonik

techtonik   Mon Nov  1 16:27:54 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  fix some errors
  make default output closer to DSSSL
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.15&r2=1.16&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.15 phpdoc/xsl/common.xsl:1.16
--- phpdoc/xsl/common.xsl:1.15  Mon Nov  1 14:44:31 2004
+++ phpdoc/xsl/common.xsl   Mon Nov  1 16:27:53 2004
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.15 2004/11/01 19:44:31 techtonik Exp $
+  $Id: common.xsl,v 1.16 2004/11/01 21:27:53 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -65,6 +65,23 @@
   
 
 
+
+
 
@@ -83,7 +100,7 @@
 
 
   
-
+
   
 
 
@@ -98,7 +115,7 @@
 
 
   
- (
+ ( 
 
   [
 
@@ -107,7 +124,7 @@
   
 
   
-
+
[, 
 
 
@@ -117,14 +134,14 @@
 
 
   
-   
+   
]

   
-  
+  
 ]
   
-  )
+   )
 
   
 
@@ -292,4 +309,16 @@
 
 
 
+
+
+
+
+
+  
+
+  
+
+
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-01 Thread anatoly techtonik

techtonik   Mon Nov  1 14:44:34 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  attempt to make this XSL more structurized while integrating html-common.xml
  add version information below function name
  make functionnames bold like in DSSSL
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.14&r2=1.15&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.14 phpdoc/xsl/common.xsl:1.15
--- phpdoc/xsl/common.xsl:1.14  Mon Nov  1 14:30:47 2004
+++ phpdoc/xsl/common.xsl   Mon Nov  1 14:44:31 2004
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.14 2004/11/01 19:30:47 techtonik Exp $
+  $Id: common.xsl,v 1.15 2004/11/01 19:44:31 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -16,6 +16,8 @@
 
 
 
+
+
 
 
 
@@ -27,13 +29,45 @@
 
 
 
-
 
 
 
+
+
+  
+
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+()
+
+  
+
+  
+
 
 
+ of square brackets for optional parameters. Make methodnames bold
+ like in DSSSL -->
 
   
 
@@ -44,7 +78,13 @@
 
 
 
-   (void)
+   ( void )
+
+
+
+  
+
+  
 
 
 
@@ -91,6 +131,8 @@
 
 
 
+
+
 
 
@@ -227,6 +269,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -245,4 +291,5 @@
   
 
 
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-01 Thread anatoly techtonik

techtonik   Mon Nov  1 14:30:48 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  more advanced newline strip template for programlistings
  preserves first line indentation
  http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.13&r2=1.14&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.13 phpdoc/xsl/common.xsl:1.14
--- phpdoc/xsl/common.xsl:1.13  Mon Nov  1 07:16:55 2004
+++ phpdoc/xsl/common.xsl   Mon Nov  1 14:30:47 2004
@@ -1,9 +1,9 @@
 
 
 http://www.w3.org/1999/XSL/Transform";
@@ -15,6 +15,7 @@
 
 
 
+
 
 
 
@@ -31,8 +32,8 @@
 
 
 
-
+
 
   
 
@@ -89,89 +90,140 @@
 
 
 
-
-
- 
- 
-
- 
 
- 
-  
-   
-
- 
-
-   
-   
-
-   
-  
- 
+
+
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
 
- 
   
-   
-
- 
-
-   
-   
-
-   
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
   
- 
-
- 
-
 
 
-
-
- 
+
+
+
+ 
+ 
 
  
-  
-   
-
+  
+   
+  
+  
+   
+
+   
+  
+  
+   
+

   
   
-   
+   
   
  
 
 
-
-
- 
-
- 
-  
- 
+
+  
+  
+   
 
- 
-  
-   
-
-   
-  
-  
-   
-  
- 
+  
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+
+  
+
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+
+  
+
+  
+
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-01 Thread anatoly techtonik

techtonik   Mon Nov  1 11:33:48 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  more advanced newline strip template for programlistings
  what preserves first line indentation
  http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.13&r2=1.14&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.13 phpdoc/xsl/common.xsl:1.14
--- phpdoc/xsl/common.xsl:1.13  Mon Nov  1 07:16:55 2004
+++ phpdoc/xsl/common.xsl   Mon Nov  1 11:33:47 2004
@@ -1,196 +1,248 @@
-
-
-http://www.w3.org/1999/XSL/Transform";
-version="1.0">
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+http://www.w3.org/1999/XSL/Transform";
+version="1.0">
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-  
-
-
-
-  
-   
-
-
-
+
+  
+
+
+
+  
+   
+
+
+
(void)
-
-
-
-  
-   
-
-
-
-  
-
-
-
-  
- (
-
-  [
-
-  
-  
-  
-
-  
-
-   [, 
-
-
-  , 
-
-  
-
-
+
+
+
+  
+   
+
+
+
+  
+
+
+
+  
+ (
+
+  [
+
+  
+  
+  
+
+  
+
+   [, 
+
+
+  , 
+
+  
+
+
   

]

-  
-  
-]
-  
-  )
-
-  
-
-
-
-
-
- 
- 
-
- 
-
- 
-  
-   
-
- 
-
-   
-   
-
-   
-  
- 
-
- 
-  
-   
-
- 
-
-   
-   
-
-   
-  
- 
-
- 
-
-
-
-
-
- 
-
- 
-  
-   
-
-   
-  
-  
-   
-  
- 
-
-
-
-
- 
-
- 
-  
- 
-
- 
-  
-   
-
-   
-  
-  
-   
-  
- 
-
-
-
-
-
-
-  
-
-  
-
-
-  , 
-
-
-  
-
-
-
-  
-
-
-
+  
+  
+]
+  
+  )
+
+  
+
+
+
+
+
+
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+
+
+
+
+ 
+ 
+
+ 
+  
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+  
+ 
+
+
+
+  
+  
+   
+
+  
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+
+  
+
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+
+
+
+
+
+  
+
+  
+
+
+  , 
+
+
+  
+
+
+
+  
+
+
+

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-01 Thread anatoly techtonik

techtonik   Mon Nov  1 11:29:47 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  remove handy button to PHP.NET as it confuses hhc.exe
  perhaps for later
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.6&r2=1.7&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.6 phpdoc/xsl/htmlhelp.xsl:1.7
--- phpdoc/xsl/htmlhelp.xsl:1.6 Mon Nov  1 07:17:49 2004
+++ phpdoc/xsl/htmlhelp.xsl Mon Nov  1 11:29:45 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.6 2004/11/01 12:17:49 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.7 2004/11/01 16:29:45 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -87,9 +87,10 @@
 
 
 
-
+

[PHP-DOC] cvs: phpdoc /htmlhelp make_chm.php

2004-11-01 Thread anatoly techtonik

techtonik   Mon Nov  1 07:59:23 2004 EDT

  Modified files:  
/phpdoc/htmlhelpmake_chm.php 
  Log:
  do not wait for overwrite confirmation
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/make_chm.php?r1=1.4&r2=1.5&ty=u
Index: phpdoc/htmlhelp/make_chm.php
diff -u phpdoc/htmlhelp/make_chm.php:1.4 phpdoc/htmlhelp/make_chm.php:1.5
--- phpdoc/htmlhelp/make_chm.php:1.4Fri Dec 27 05:06:17 2002
+++ phpdoc/htmlhelp/make_chm.phpMon Nov  1 07:59:23 2004
@@ -161,7 +161,7 @@
 // $RELEASE_DIR = str_replace("/", "\\", $RELEASE_DIR):
 exec("copy suppfiles\\prefs $RELEASE_DIR /Y");
 exec("copy suppfiles\\quickref $RELEASE_DIR /Y");
-exec("xcopy suppfiles\\skins $RELEASE_DIR\\skins /S /I /Q /EXCLUDE:exclude.txt");
+exec("xcopy suppfiles\\skins $RELEASE_DIR\\skins /S /I /Q /Y /EXCLUDE:exclude.txt");
 
 // Delete unused files
 if ($END_CLEANUP) {

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-11-01 Thread anatoly techtonik

techtonik   Mon Nov  1 07:17:49 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  link with common.xsl
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.5&r2=1.6&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.5 phpdoc/xsl/htmlhelp.xsl:1.6
--- phpdoc/xsl/htmlhelp.xsl:1.5 Sun Oct 31 05:07:09 2004
+++ phpdoc/xsl/htmlhelp.xsl Mon Nov  1 07:17:49 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.5 2004/10/31 10:07:09 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.6 2004/11/01 12:17:49 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -17,6 +17,7 @@
 
 
 
+
 
 
 
@@ -28,6 +29,7 @@
 
 
 
+
 
 
 
@@ -442,7 +444,4 @@
   
 
 
-
-
-

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-01 Thread anatoly techtonik

techtonik   Mon Nov  1 07:16:59 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  place in logical order
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.12&r2=1.13&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.12 phpdoc/xsl/common.xsl:1.13
--- phpdoc/xsl/common.xsl:1.12  Mon Nov  1 03:36:04 2004
+++ phpdoc/xsl/common.xsl   Mon Nov  1 07:16:55 2004
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all formats
 
-  $Id: common.xsl,v 1.12 2004/11/01 08:36:04 techtonik Exp $
+  $Id: common.xsl,v 1.13 2004/11/01 12:16:55 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -89,23 +89,6 @@
 
 
 
-
-
-  
-
-  
-
-
-  , 
-
-
-  
-
-
-
-  
-
-
 
+
+  
+
+  
+
+
+  , 
+
+
+  
+
+
+
+  
+
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-11-01 Thread anatoly techtonik

techtonik   Mon Nov  1 03:36:06 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  remove  support 
  remove l10n.gentext.language template since DocBook's does the same
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.11&r2=1.12&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.11 phpdoc/xsl/common.xsl:1.12
--- phpdoc/xsl/common.xsl:1.11  Sun Oct 31 18:53:48 2004
+++ phpdoc/xsl/common.xsl   Mon Nov  1 03:36:04 2004
@@ -3,16 +3,13 @@
 
   common.xsl: Common customizations for all formats
 
-  $Id: common.xsl,v 1.11 2004/10/31 23:53:48 techtonik Exp $
+  $Id: common.xsl,v 1.12 2004/11/01 08:36:04 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
 version="1.0">
 
 
-
-
-
  
 
@@ -61,7 +58,7 @@
 
   
  (
-
+
   [
 
   
@@ -69,7 +66,7 @@
   
 
   
-
+
[, 
 
 
@@ -79,11 +76,11 @@
 
 
   
-   
+   
]

   
-  
+  
 ]
   
   )

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2004-10-31 Thread anatoly techtonik

techtonik   Sun Oct 31 18:53:53 2004 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  do not repeat default DocBook XSL settings (year and label)
  turn off separators on reference and refentry pages
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.10&r2=1.11&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.10 phpdoc/xsl/common.xsl:1.11
--- phpdoc/xsl/common.xsl:1.10  Sun Feb 22 06:02:02 2004
+++ phpdoc/xsl/common.xsl   Sun Oct 31 18:53:48 2004
@@ -3,6 +3,8 @@
 
   common.xsl: Common customizations for all formats
 
+  $Id: common.xsl,v 1.11 2004/10/31 23:53:48 techtonik Exp $
+
 -->
 http://www.w3.org/1999/XSL/Transform";
 version="1.0">
@@ -11,27 +13,29 @@
 
 
 
-
-
-
-
-
-
-
+ 
 
 
-
+
+
+
 
-
+
+
+
+
+
+
+
+
 
 
 
 
-
-
 
-
+

[PHP-DOC] cvs: phpdoc /scripts dbtags.php

2004-10-31 Thread anatoly techtonik

techtonik   Sun Oct 31 16:20:20 2004 EDT

  Modified files:  
/phpdoc/scripts dbtags.php 
  Log:
  some grammar fixes 
  
http://cvs.php.net/diff.php/phpdoc/scripts/dbtags.php?r1=1.3&r2=1.4&ty=u
Index: phpdoc/scripts/dbtags.php
diff -u phpdoc/scripts/dbtags.php:1.3 phpdoc/scripts/dbtags.php:1.4
--- phpdoc/scripts/dbtags.php:1.3   Wed Aug 25 04:36:32 2004
+++ phpdoc/scripts/dbtags.php   Sun Oct 31 16:20:16 2004
@@ -17,7 +17,7 @@
   | Authors:Gabor Hojtsy <[EMAIL PROTECTED]>  |
   +--+
  
-  $Id: dbtags.php,v 1.3 2004/08/25 08:36:32 didou Exp $
+  $Id: dbtags.php,v 1.4 2004/10/31 21:20:16 techtonik Exp $
 */
 
 if ($argc > 2 || in_array($argv[1], array('--help', '-help', '-h', '-?'))) {
@@ -70,10 +70,10 @@
 /* Here starts the functions part*/
 /*/
 
-// Checks a diretory of phpdoc XML files
+// Checks a directory of phpdoc XML files
 function check_dir($dir, &$used_tags)
 {
-// Collect files and diretcories in these arrays
+// Collect files and directories in these arrays
 $directories = array();
 $files = array();
 
@@ -125,7 +125,7 @@
 // No entities found
 if (count($tags_found[1]) == 0) { return; }
 
-// New occurances found, so increase the number
+// New occurences found, so increase the number
 foreach ($tags_found[1] as $tag_name) {
 $used_tags[$tag_name]++;
 }
@@ -136,7 +136,7 @@
 /* Here starts the program   */
 /*/
 
-// Chechking all languages
+// Checking all languages
 foreach ($langcodes as $langcode) {
 
 // Check for directory validity
@@ -158,7 +158,7 @@
 echo "Generating tag_usage.txt ...\n";
 
 $fp = fopen("tag_usage.txt", "w");
-fwrite($fp, "TAG USAGE STATISCTICS
+fwrite($fp, "TAG USAGE STATISTICS
 
 =
 In this file you can find tag usage stats compiled

[PHP-DOC] cvs: phpdoc /chm make_chm.README

2004-10-31 Thread anatoly techtonik

techtonik   Sun Oct 31 07:05:49 2004 EDT

  Modified files:  
/phpdoc/chm make_chm.README 
  Log:
  bring this closer to reality
  
http://cvs.php.net/diff.php/phpdoc/chm/make_chm.README?r1=1.4&r2=1.5&ty=u
Index: phpdoc/chm/make_chm.README
diff -u phpdoc/chm/make_chm.README:1.4 phpdoc/chm/make_chm.README:1.5
--- phpdoc/chm/make_chm.README:1.4  Mon Sep  6 16:34:00 2004
+++ phpdoc/chm/make_chm.README  Sun Oct 31 07:05:46 2004
@@ -34,9 +34,8 @@
   a) Download the actual html manual from
  http://www.php.net/download-docs.php
  and untar the distribution into a directory
-  a) Build the html manual yourself using Jade and the other
- tools needed (look into the README and/or README.win32
- file to see how to build it yourself)
+  b) Build the html manual yourself using Jade and the other
+ tools needed (look into the HOWTO to see how to build it yourself)
  
 The .chm manual generator files (from cvs.php.net):
 
@@ -114,4 +113,4 @@
 Thomas Schoefbeck ([EMAIL PROTECTED]). Contact them or the phpdoc list 
 ([EMAIL PROTECTED]) if you have any questions or suggestions...
 
-Last modified $Date: 2004/09/06 20:34:00 $
\ No newline at end of file
+Last modified $Date: 2004/10/31 12:05:46 $
\ No newline at end of file

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-10-31 Thread anatoly techtonik

techtonik   Sun Oct 31 05:07:10 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  escape double quotes in titles to correctly generate .hhk entry
  temporary fix to hide errorneous output while processing titleabbrev in reference
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.4&r2=1.5&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.4 phpdoc/xsl/htmlhelp.xsl:1.5
--- phpdoc/xsl/htmlhelp.xsl:1.4 Sat Oct 30 09:50:50 2004
+++ phpdoc/xsl/htmlhelp.xsl Sun Oct 31 05:07:09 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.4 2004/10/30 13:50:50 nlopess Exp $
+  $Id: htmlhelp.xsl,v 1.5 2004/10/31 10:07:09 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -171,8 +171,8 @@
 
 
 
-
-]]>
+]]>
+
 
   
 
@@ -190,6 +190,19 @@
   
 
 
+
+
+  
+  
+  
+
+
+
+
+

[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php

2004-10-30 Thread anatoly techtonik

techtonik   Sat Oct 30 08:55:22 2004 EDT

  Modified files:  
/phpdoc/htmlhelpfilter_files.php 
  Log:
  fix inserting first div to make document invisible by default
  add error reporting for this operation
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.6&r2=1.7&ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.6 phpdoc/htmlhelp/filter_files.php:1.7
--- phpdoc/htmlhelp/filter_files.php:1.6Fri Oct 29 05:58:18 2004
+++ phpdoc/htmlhelp/filter_files.phpSat Oct 30 08:55:21 2004
@@ -116,19 +116,24 @@
 // Add divisions for skin support
 
 // Make the document invisible by default, adding a new first div
-$content = preg_replace(
-'!()!Us',
-'\1',
-$content,
-1
-);
+$bodystart_regex = '!()!Us';
+if (preg_match($bodystart_regex, $content)) {
+$content = preg_replace(
+$bodystart_regex,
+'\1',
+$content,
+1
+);
 
-// Put there the end of this pageContent
-$content = str_replace(
-'',
-'',
-$content
-);
+// Put there the end of this pageContent
+$content = str_replace(
+'',
+'',
+$content
+);
+} else {
+echo "Can't add first div. No match.\n";
+}
 
 // For headers we have several possibilities
 if (strpos($content, '') !== FALSE) {
@@ -200,7 +205,7 @@
 "formatPre",
 $content
 );
-
+
 //--
 // Put  tags after all  or  or  close tags to
 // enable CSS support for those paragraphs (these break a )

[PHP-DOC] cvs: phpdoc /xsl howto.xsl

2004-10-29 Thread anatoly techtonik

techtonik   Fri Oct 29 09:00:23 2004 EDT

  Modified files:  
/phpdoc/xsl howto.xsl 
  Log:
  correct output when whole programlisting is located on one line
  
http://cvs.php.net/diff.php/phpdoc/xsl/howto.xsl?r1=1.2&r2=1.3&ty=u
Index: phpdoc/xsl/howto.xsl
diff -u phpdoc/xsl/howto.xsl:1.2 phpdoc/xsl/howto.xsl:1.3
--- phpdoc/xsl/howto.xsl:1.2Fri Oct  1 12:41:50 2004
+++ phpdoc/xsl/howto.xslFri Oct 29 09:00:22 2004
@@ -3,7 +3,7 @@
 
   HOWTO specific stylesheet based on Docbook XSL 1.66.1
 
-  $Id: howto.xsl,v 1.2 2004/10/01 16:41:50 techtonik Exp $
+  $Id: howto.xsl,v 1.3 2004/10/29 13:00:22 techtonik Exp $
 
 -->

[PHP-DOC] cvs: phpdoc /en/language types.xml

2004-10-29 Thread anatoly techtonik

techtonik   Fri Oct 29 06:02:33 2004 EDT

  Modified files:  
/phpdoc/en/language types.xml 
  Log:
  example in float type section is not a php code
  
http://cvs.php.net/diff.php/phpdoc/en/language/types.xml?r1=1.143&r2=1.144&ty=u
Index: phpdoc/en/language/types.xml
diff -u phpdoc/en/language/types.xml:1.143 phpdoc/en/language/types.xml:1.144
--- phpdoc/en/language/types.xml:1.143  Sat Oct  9 01:35:29 2004
+++ phpdoc/en/language/types.xmlFri Oct 29 06:02:33 2004
@@ -1,5 +1,5 @@
 
-
+
  
   Types
 
@@ -559,7 +559,7 @@
 
 Formally:
 
- 
+ 
 LNUM  [0-9]+
 DNUM  ([0-9]*[\.]{LNUM}) | ({LNUM}[\.][0-9]*)
 EXPONENT_DNUM ( ({LNUM} | {DNUM}) [eE][+-]? {LNUM})

[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php

2004-10-29 Thread anatoly techtonik

techtonik   Fri Oct 29 05:58:19 2004 EDT

  Modified files:  
/phpdoc/htmlhelpfilter_files.php 
  Log:
  fixed some errors in .HHP refinement block
  added _index.html to [FILES] section
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.5&r2=1.6&ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.5 phpdoc/htmlhelp/filter_files.php:1.6
--- phpdoc/htmlhelp/filter_files.php:1.5Mon Oct 18 16:30:48 2004
+++ phpdoc/htmlhelp/filter_files.phpFri Oct 29 05:58:18 2004
@@ -52,14 +52,14 @@

 // Rewrite HHP file to make UK English default language like in template
 // prior to DocBook XSL 1.66.1. Add supplementary files to [FILES] section
-// and also insert [MERGE] section
+// and also insert [MERGE FILES] section
 $hhp_file = "$HTML_TARGET/php_manual_$LANGUAGE.hhp";
 
 if (file_exists($hhp_file)) {
 $php_hhp = join("", file($hhp_file));
 
 // Get rid of hh autoindex "feature" and set UK English language
-$php_hhp = preg_replace("|Auto Index=Yes(\W+)\w|i","\w",$php_hhp);
+$php_hhp = preg_replace("|Auto Index=Yes\W+|i","",$php_hhp);
 $php_hhp = str_replace("Language=0x0409 English (UNITED 
STATES)","Language=0x0809 English (UNITED KINGDOM)",$php_hhp);
 
 // Capturing line delimiter
@@ -73,11 +73,12 @@
 if ($entry != "." && $entry != ".." && !is_dir($entry))
 $supp_files .= $delim.$entry;
 }
+$supp_files .= $delim."_index.html";
 
 // Insert [MERGE] section and supplemental files 
 $php_hhp = preg_replace(
"|\[FILES\]((\W+)\w)|i",
-   "[MERGE]$2php_manual_notes.chm$2$2[FILES]$supp_files$1",
+   "[MERGE FILES]$2php_manual_notes.chm$2$2[FILES]$supp_files$1",
$php_hhp);
 $fp = fopen($hhp_file, "w");
 fwrite($fp, $php_hhp);
@@ -105,7 +106,7 @@
 
 // Replace title with simple  content [shorter, without tags]
 $content = preg_replace(
-'!]*>.+!Us',
+'!]*>.+!Us',
 "$page_title",
 $content,
 1

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-10-19 Thread anatoly techtonik

techtonik   Tue Oct 19 11:11:10 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  oops, debug params
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.2&r2=1.3&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.2 phpdoc/xsl/htmlhelp.xsl:1.3
--- phpdoc/xsl/htmlhelp.xsl:1.2 Mon Oct 18 16:28:10 2004
+++ phpdoc/xsl/htmlhelp.xsl Tue Oct 19 11:11:09 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl,v 1.2 2004/10/18 20:28:10 techtonik Exp $
+  $Id: htmlhelp.xsl,v 1.3 2004/10/19 15:11:09 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -34,7 +34,7 @@
 book  toc,title
 chapter   toc,title
 part  toc,title
-preface   toc
+preface   toc,title
 qandadiv  toc
 qandaset  toc
 reference toc,title
@@ -271,7 +271,6 @@
 
 
 
-

[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php

2004-10-18 Thread anatoly techtonik

techtonik   Mon Oct 18 16:30:48 2004 EDT

  Modified files:  
/phpdoc/htmlhelpfilter_files.php 
  Log:
  some HHP customizations to support new xCHM PHPDOC template
  
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.4&r2=1.5&ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.4 phpdoc/htmlhelp/filter_files.php:1.5
--- phpdoc/htmlhelp/filter_files.php:1.4Tue Sep  7 07:06:08 2004
+++ phpdoc/htmlhelp/filter_files.phpMon Oct 18 16:30:48 2004
@@ -49,7 +49,41 @@
 $fp = fopen("$HTML_TARGET/_script.js", "w");
 fwrite($fp, $script_js);
 fclose($fp);
-
+   
+// Rewrite HHP file to make UK English default language like in template
+// prior to DocBook XSL 1.66.1. Add supplementary files to [FILES] section
+// and also insert [MERGE] section
+$hhp_file = "$HTML_TARGET/php_manual_$LANGUAGE.hhp";
+
+if (file_exists($hhp_file)) {
+$php_hhp = join("", file($hhp_file));
+
+// Get rid of hh autoindex "feature" and set UK English language
+$php_hhp = preg_replace("|Auto Index=Yes(\W+)\w|i","\w",$php_hhp);
+$php_hhp = str_replace("Language=0x0409 English (UNITED 
STATES)","Language=0x0809 English (UNITED KINGDOM)",$php_hhp);
+
+// Capturing line delimiter
+preg_match("|\[FILES\](\W+)\w|i",$php_hhp,$matches);
+$delim = $matches[1];
+
+// Building list of supplemental files. glob doesn't work in 4.3.7/8 :(
+$d = dir("suppfiles/html");
+$supp_files = "";
+while (false !== ($entry = $d->read())) {
+if ($entry != "." && $entry != ".." && !is_dir($entry))
+$supp_files .= $delim.$entry;
+}
+
+// Insert [MERGE] section and supplemental files 
+$php_hhp = preg_replace(
+   "|\[FILES\]((\W+)\w)|i",
+   "[MERGE]$2php_manual_notes.chm$2$2[FILES]$supp_files$1",
+   $php_hhp);
+$fp = fopen($hhp_file, "w");
+fwrite($fp, $php_hhp);
+fclose($fp);
+}
+
 return $counter;
 } // filterFiles() function end

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2004-10-18 Thread anatoly techtonik

techtonik   Mon Oct 18 16:28:10 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  New xCHM PHPDOC template based on version 1.66.1 of DocBook XSL.
  May need some customizations from older templates to be revised and added.
  
  http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.1&r2=1.2&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.1 phpdoc/xsl/htmlhelp.xsl:1.2
--- phpdoc/xsl/htmlhelp.xsl:1.1 Mon Oct 18 16:20:32 2004
+++ phpdoc/xsl/htmlhelp.xsl Mon Oct 18 16:28:10 2004
@@ -1,59 +1,310 @@
-
+
 
 http://www.w3.org/1999/XSL/Transform";
-xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table";
-xmlns:xtbl="com.nwalsh.xalan.Table"
-exclude-result-prefixes="stbl xtbl"
-version="1.0">
+xmlns:doc="http://nwalsh.com/xsl/documentation/1.0";
+xmlns:exsl="http://exslt.org/common";
+xmlns:set="http://exslt.org/sets";
+   version="1.0"
+exclude-result-prefixes="doc exsl set">
 
-
-
+
 
+
+
+
+
 
 
+
 
+
+
 
-
 
-
+
+
+appendix  toc,title
+article   toc
+book  toc,title
+chapter   toc,title
+part  toc,title
+preface   toc
+qandadiv  toc
+qandaset  toc
+reference toc,title
+sect1 toc
+sect2 toc
+sect3 toc
+sect4 toc
+sect5 toc
+section   toc
+set   toc
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://www.php.net'"/>
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+  
+
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+
+
+  
+  
+
+
+
+  
+  
+
+  
+
+
+  
+
+
+  
+
+  
+
+  
+  
+  
+
+
+  
+  
 
-
+  
+
 
-
-
-  
+
+  
+
+  
+
+  
+  
+
+
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+
+
+
+  
+  
+  
+  
+  
 
+  
+
+  
+
+
+  
+
+  
+
+  
 
 
-
-
-  displayPage();
-  if(prefs_context_override){return 
false;}
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+  
+
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+
+
+  
+  
+  
+
+  
+
+
+
+
+
+
+  
+
+  
+
+  
+  
+
+
+
+  
+
+
+  
 
 
-
+
+
+
+
+
+
+
+
+
 
   
+
 
+
   
 
 
- 
-
+
+  
+  
+
+
+
+
+  displayPage();
+  if(prefs_context_override){return 
false;}
+
+
+ 
+
+
 
 
 
@@ -70,7 +321,7 @@
   
   
  
-  
+  
 
   
   
@@ -80,19 +331,19 @@
   
 
 << 
-
+
   
   
 
   
-  
+  
 
 
   
 
 
   
-  
+  
 
   
   
@@ -101,7 +352,7 @@
 
   
 
-
+
  >>
   
   
@@ -121,7 +372,7 @@
   
 
 
-
+
 
   
   
@@ -138,7 +389,7 @@
   
 
   
-
+
   
   
 
@@ -165,280 +416,15 @@
   
 
 
-
-
-  
-
-  
-
-  
-
-
-
-  
-
-  
-
-» 
-
-  
-
-  
-  
-
-  
-
-  
-
-
-
-
-
-
-  
-
-
-  
-  ()
-  
-  
-
-  
-
-
-
-
-
-
-
-
-
-  
-
-
-
-
-  
-
-
-
-
-  
-
-  
-
-  
-
-
-
-  
-  
-  : 
-
-
-
-  
-
-
-
-
-  
-  
-  
-
-  
-
-  
-
-  
-  1
-
-  
-
-  
-
-
-
-
-  
-
-  
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-  
-  
-
-  
-
-  
-  
-  
-
-
-
-  100%
-
-
-
-  
-0
-  
-  
-0
-
-  
-
-  
-
-  
-
-  
-  
-
-  
-
-  
-  
-
-  
-
-  
-
-  
-  
-0
-  
-
-
-
-  
-
-  
-
-  
-
-
-
-  
-
-
-  
-
-
-
-  
-
-  
-
-
-  100%
-
-
-  
-
-  
-
-
-
-  
-
-  
-
-  
-  
-
-  
-
-  
-  
-
-  
-  
-
-  No convertLength function available.
-
-  
-
-  
-  
-
-  
-
-  
-
-
-
-  
-
-  
-
-  
-

[PHP-DOC] cvs: phpdoc /xsl .cvsignore htmlhelp.xsl htmlhelp.xsl.in

2004-10-18 Thread anatoly techtonik

techtonik   Mon Oct 18 16:20:33 2004 EDT

  Added files: 
/phpdoc/xsl htmlhelp.xsl 

  Removed files:   
/phpdoc/xsl htmlhelp.xsl.in 

  Modified files:  
/phpdoc/xsl .cvsignore 
  Log:
  moved htmlhelp.xsl.in to htmlhelp.xsl as we now have configure/able parameters 
stored in html-config.xsl.in
  http://cvs.php.net/diff.php/phpdoc/xsl/.cvsignore?r1=1.7&r2=1.8&ty=u
Index: phpdoc/xsl/.cvsignore
diff -u phpdoc/xsl/.cvsignore:1.7 phpdoc/xsl/.cvsignore:1.8
--- phpdoc/xsl/.cvsignore:1.7   Mon Oct 18 16:11:13 2004
+++ phpdoc/xsl/.cvsignore   Mon Oct 18 16:20:32 2004
@@ -1,3 +1,2 @@
 htmlhelp-config.xsl
-htmlhelp.xsl
 param_html.xsl

http://cvs.php.net/co.php/phpdoc/xsl/htmlhelp.xsl?r=1.1&p=1
Index: phpdoc/xsl/htmlhelp.xsl
+++ phpdoc/xsl/htmlhelp.xsl


http://www.w3.org/1999/XSL/Transform";
xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table";
xmlns:xtbl="com.nwalsh.xalan.Table"
exclude-result-prefixes="stbl xtbl"
version="1.0">
















  

  

  
  





  displayPage();
  if(prefs_context_override){return 
false;}




  

  


 




  
  
  
  
  
  
   function displayNotes() { _displayNotes(); }
   loadNotes();
  
  
  
  
 
  

  
  

  

  

<< 

  
  

  
  


  


  
  

  
  

  

  


 >>
  
  

  

 
  

  This page 
online
     
  Report a 
bug

  

  
  




  
  

  
  

  

  
  
  
  

  

  
  

  

  

  
  

  


  

  

  


  
   : 

  




  

  

  



  

  

» 

  

  
  

  

  






  


  
  ()
  
  

  









  




  




  

  

  



  
  
  : 



  




  
  
  

  

  

  
  1

  

  




  

  
  

  


  


  

  

  
  
  

  

  
  
  



  100%



  
0
  
  
0

  

  

  

  
  

  

  
  

  

  

  
  
0
  



  

  

  



  


  



  

  


  100%


  

  



  

  

  
  

  

  
  

  
  

  No convertLength function available.

  

  
  

  

  



  

  

  
  

  
  

  No adjustColumnWidths function available.

[PHP-DOC] cvs: phpdoc /xsl htmlhelp-config.xsl.in

2004-10-18 Thread anatoly techtonik

techtonik   Mon Oct 18 16:15:17 2004 EDT

  Modified files:  
/phpdoc/xsl htmlhelp-config.xsl.in 
  Log:
  newlines =" htmlhelp-config.xsl.in
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp-config.xsl.in?r1=1.1&r2=1.2&ty=u
Index: phpdoc/xsl/htmlhelp-config.xsl.in
diff -u phpdoc/xsl/htmlhelp-config.xsl.in:1.1 phpdoc/xsl/htmlhelp-config.xsl.in:1.2
--- phpdoc/xsl/htmlhelp-config.xsl.in:1.1   Mon Oct 18 16:11:13 2004
+++ phpdoc/xsl/htmlhelp-config.xsl.in   Mon Oct 18 16:15:17 2004
@@ -1,20 +1,20 @@
-
-
-
-http://www.w3.org/1999/XSL/Transform";
-version="1.0">
-
-
-
-
-
-
-
-
-
+
+
+
+http://www.w3.org/1999/XSL/Transform";
+version="1.0">
+
+
+
+
+
+
+
+
+

[PHP-DOC] cvs: phpdoc /xsl .cvsignore htmlhelp-config.xsl.in htmlhelp.xsl.in

2004-10-18 Thread anatoly techtonik

techtonik   Mon Oct 18 16:11:14 2004 EDT

  Added files: 
/phpdoc/xsl htmlhelp-config.xsl.in 

  Modified files:  
/phpdoc/xsl .cvsignore htmlhelp.xsl.in 
  Log:
  move configure/able htmlhelp params into separate file
  
http://cvs.php.net/diff.php/phpdoc/xsl/.cvsignore?r1=1.6&r2=1.7&ty=u
Index: phpdoc/xsl/.cvsignore
diff -u phpdoc/xsl/.cvsignore:1.6 phpdoc/xsl/.cvsignore:1.7
--- phpdoc/xsl/.cvsignore:1.6   Mon Sep 20 08:14:14 2004
+++ phpdoc/xsl/.cvsignore   Mon Oct 18 16:11:13 2004
@@ -1,2 +1,3 @@
+htmlhelp-config.xsl
 htmlhelp.xsl
 param_html.xsl
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl.in?r1=1.35&r2=1.36&ty=u
Index: phpdoc/xsl/htmlhelp.xsl.in
diff -u phpdoc/xsl/htmlhelp.xsl.in:1.35 phpdoc/xsl/htmlhelp.xsl.in:1.36
--- phpdoc/xsl/htmlhelp.xsl.in:1.35 Sun Aug 11 14:02:57 2002
+++ phpdoc/xsl/htmlhelp.xsl.in  Mon Oct 18 16:11:13 2004
@@ -3,7 +3,7 @@
 
   HTML Help specific stylesheet
 
-  $Id: htmlhelp.xsl.in,v 1.35 2002/08/11 18:02:57 goba Exp $
+  $Id: htmlhelp.xsl.in,v 1.36 2004/10/18 20:11:13 techtonik Exp $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -15,14 +15,10 @@
 
 
 
+
+
 
 
-
-
-
-
-
-
 
 
 

http://cvs.php.net/co.php/phpdoc/xsl/htmlhelp-config.xsl.in?r=1.1&p=1
Index: phpdoc/xsl/htmlhelp-config.xsl.in
+++ phpdoc/xsl/htmlhelp-config.xsl.in



http://www.w3.org/1999/XSL/Transform";
version="1.0">

[PHP-DOC] cvs: phpdoc / Makefile.in

2004-10-05 Thread anatoly techtonik

techtonik   Tue Oct  5 07:16:55 2004 EDT

  Modified files:  
/phpdoc Makefile.in 
  Log:
  [ADD] commands to build howto with XSL
  
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.153&r2=1.154&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.153 phpdoc/Makefile.in:1.154
--- phpdoc/Makefile.in:1.153Wed Sep  8 17:38:52 2004
+++ phpdoc/Makefile.in  Tue Oct  5 07:16:52 2004
@@ -16,7 +16,7 @@
 #
 
 #
-# $Id: Makefile.in,v 1.153 2004/09/08 21:38:52 betz Exp $
+# $Id: Makefile.in,v 1.154 2004/10/05 11:16:52 techtonik Exp $
 #
 
 all: html
@@ -49,6 +49,7 @@
 XMLDCL=$(srcdir)/dtds/dbxml-4.1.2/phpdocxml.dcl
 
 CHM_XSL_SHEET=xsl/htmlhelp.xsl
+HOWTO_XSL_SHEET=xsl/howto.xsl
 
 BIGHTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in 
dsssl/common.dsl.in zendapi
 HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in 
dsssl/common.dsl.in zendapihtml
@@ -184,6 +185,10 @@
 fo: manual.xml zendapi
${XSLTPROC} -o manual.fo xsl/fo.xsl manual.xml
 
+howto_xsl:
+   rm -rf ./howto/html && mkdir ./howto/html
+   ${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
+
 chm_xsl: manual.xml
rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
@@ -302,6 +307,9 @@
@if test ! -e entities/missing-entities.ent; then touch 
entities/missing-entities.ent; fi 
@if test ! -e @LANGDIR@/missing-ids.xml; then touch @LANGDIR@/missing-ids.xml; 
fi
$(XMLLINT) --noent --noout --valid manual.xml 
+
+test_howto:
+   $(XMLLINT) --noent --noout --valid ./howto/howto.xml
 
 # }}}

[PHP-DOC] cvs: phpdoc /xsl howto.xsl

2004-10-01 Thread anatoly techtonik

techtonik   Fri Oct  1 12:41:50 2004 EDT

  Modified files:  
/phpdoc/xsl howto.xsl 
  Log:
  correct docbook-xsl templates location
  
http://cvs.php.net/diff.php/phpdoc/xsl/howto.xsl?r1=1.1&r2=1.2&ty=u
Index: phpdoc/xsl/howto.xsl
diff -u phpdoc/xsl/howto.xsl:1.1 phpdoc/xsl/howto.xsl:1.2
--- phpdoc/xsl/howto.xsl:1.1Fri Oct  1 10:23:21 2004
+++ phpdoc/xsl/howto.xslFri Oct  1 12:41:50 2004
@@ -3,7 +3,7 @@
 
   HOWTO specific stylesheet based on Docbook XSL 1.66.1
 
-  $Id: howto.xsl,v 1.1 2004/10/01 14:23:21 techtonik Exp $
+  $Id: howto.xsl,v 1.2 2004/10/01 16:41:50 techtonik Exp $
 
 -->

[PHP-DOC] cvs: phpdoc /xsl howto.xsl

2004-10-01 Thread anatoly techtonik

techtonik   Fri Oct  1 10:23:21 2004 EDT

  Added files: 
/phpdoc/xsl howto.xsl 
  Log:
  XSL template to build HOWTO. Started from scratch from DocBook XSL 1.66.1
  
http://cvs.php.net/co.php/phpdoc/xsl/howto.xsl?r=1.1&p=1
Index: phpdoc/xsl/howto.xsl
+++ phpdoc/xsl/howto.xsl




http://www.w3.org/1999/XSL/Transform"; version="1.0">

  






 
  

  
  
  
  
  
 
  
  

  
  






  
  
  
book  toc,title
part  toc,title
chapter   toc,title
preface   toc

[PHP-DOC] cvs: phpdoc /xsl .cvsignore

2004-09-20 Thread anatoly techtonik

techtonik   Mon Sep 20 08:14:18 2004 EDT

  Modified files:  
/phpdoc/xsl .cvsignore 
  Log:
  htmlhelp-db.xsl is not autogenerated
  
http://cvs.php.net/diff.php/phpdoc/xsl/.cvsignore?r1=1.5&r2=1.6&ty=u
Index: phpdoc/xsl/.cvsignore
diff -u phpdoc/xsl/.cvsignore:1.5 phpdoc/xsl/.cvsignore:1.6
--- phpdoc/xsl/.cvsignore:1.5   Sat Apr 19 13:00:02 2003
+++ phpdoc/xsl/.cvsignore   Mon Sep 20 08:14:14 2004
@@ -1,3 +1,2 @@
 htmlhelp.xsl
-htmlhelp-db.xsl
 param_html.xsl

[PHP-DOC] cvs: phpdoc / configure.in

2004-09-19 Thread anatoly techtonik

techtonik   Sun Sep 19 08:59:30 2004 EDT

  Modified files:  
/phpdoc configure.in 
  Log:
  [FIX] * Check for openjade on windows installed in path manually or from cygwin 
package.
  
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.204&r2=1.205&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.204 phpdoc/configure.in:1.205
--- phpdoc/configure.in:1.204   Wed Sep  8 14:05:53 2004
+++ phpdoc/configure.in Sun Sep 19 08:59:30 2004
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.204 2004/09/08 18:05:53 dave Exp $
+dnl $Id: configure.in,v 1.205 2004/09/19 12:59:30 techtonik Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -118,9 +118,14 @@
   JADE=../phpdoc-tools/jade/jade.exe
   AC_MSG_RESULT($JADE)
 else
-  AC_PATH_PROG(OPENJADE,"openjade",no)
+  AC_CHECK_PROG(OPENJADE,"openjade.exe","openjade.exe",no)
   if test $OPENJADE = "no"; then
-AC_PATH_PROG(JADE,"jade",no)
+AC_PATH_PROG(OPENJADE,"openjade",no)
+if test $OPENJADE = "no"; then
+  AC_PATH_PROG(JADE,"jade",no)
+else
+  JADE=$OPENJADE
+fi
   else
 JADE=$OPENJADE
   fi
@@ -132,13 +137,18 @@
 JADE=../phpdoc-tools/jade/jade.exe
 AC_MSG_RESULT($JADE)
   else
-AC_PATH_PROG(OPENJADE,"openjade",no)
+AC_CHECK_PROG(OPENJADE,"openjade.exe","openjade.exe",no)
 if test $OPENJADE = "no"; then
-  AC_PATH_PROG(JADE,"jade",no)
+  AC_PATH_PROG(OPENJADE,"openjade",no)
+  if test $OPENJADE = "no"; then
+AC_PATH_PROG(JADE,"jade",no)
+  else
+JADE=$OPENJADE
+  fi
 else
   JADE=$OPENJADE
 fi
-   fi
+  fi
 ]
 )
 if test $JADE = "no"; then
@@ -168,9 +178,14 @@
   NSGMLS=../phpdoc-tools/jade/nsgmls.exe
   AC_MSG_RESULT($NSGMLS)
 else
-  AC_PATH_PROG(ONSGMLS,"onsgmls",no)
+  AC_CHECK_PROG(ONSGMLS,"onsgmls.exe","onsgmls.exe",no)
   if test $ONSGMLS = "no"; then
-AC_PATH_PROG(NSGMLS,"nsgmls",no)
+AC_PATH_PROG(ONSGMLS,"onsgmls",no)
+if test $ONSGMLS = "no"; then
+  AC_PATH_PROG(NSGMLS,"nsgmls",no)
+else
+  NSGMLS=$ONSGMLS
+fi
   else
 NSGMLS=$ONSGMLS
   fi
@@ -182,9 +197,14 @@
 NSGMLS=../phpdoc-tools/jade/nsgmls.exe
 AC_MSG_RESULT($NSGMLS)
   else
-AC_PATH_PROG(ONSGMLS,"onsgmls",no)
+AC_CHECK_PROG(ONSGMLS,"onsgmls.exe","onsgmls.exe",no)
 if test $ONSGMLS = "no"; then
-  AC_PATH_PROG(NSGMLS,"nsgmls",no)
+  AC_PATH_PROG(ONSGMLS,"onsgmls",no)
+  if test $ONSGMLS = "no"; then
+AC_PATH_PROG(NSGMLS,"nsgmls",no)
+  else
+NSGMLS=$ONSGMLS
+  fi
 else
   NSGMLS=$ONSGMLS
 fi

[PHP-DOC] cvs: phpdoc /scripts genfunclist.php

2004-09-13 Thread anatoly techtonik

techtonik   Mon Sep 13 09:36:01 2004 EDT

  Added files: 
/phpdoc/scripts genfunclist.php 
  Log:
  Initial checkin.
  Builds function list from PHP sources. Replacement for both funcparse.awk
  and genfunclist.sh in phpdoc/scripts
  
  
http://cvs.php.net/co.php/phpdoc/scripts/genfunclist.php?r=1.1&p=1
Index: phpdoc/scripts/genfunclist.php
+++ phpdoc/scripts/genfunclist.php
http://www.php.net/license/3_0.txt.  |
  | If you did not receive a copy of the PHP license and are unable to   |
  | obtain it through the world-wide-web, please send a note to  |
  | [EMAIL PROTECTED] so we can mail you a copy immediately.   |
  +--+
  | Authors:Ariel Shkedi <[EMAIL PROTECTED]> or <[EMAIL PROTECTED]> |
  | Rasmus Lerdorf <[EMAIL PROTECTED]>|
  |  |
  | anatoly techtonik <[EMAIL PROTECTED]>  |
  +--+

  $Id: genfunclist.php,v 1.1 2004/09/13 13:36:00 techtonik Exp $
*/

/**
 * Builds function list from PHP sources
 *
 * Finds all source files, which contain Zend Function Block and extracts
 * information from them to build a list. Replacement for both funcparse.awk
 * and genfunclist.sh
 *
 * Requires PEAR File_Find class.
 *
 * Known limitations:
 * - can't handle multiline comments and precompiler directives
 */

/**
 * include function block headers in output
 */
$show_block_names = true;
/**
 * sort function names (disable this to output directive and comments stuff)
 */
$sort_names = true;
/**
 * if sorting disabled, output directives
 */
$show_directives = true;
/**
 * if sorting disabled, output comments and other stuff
 */
$show_stuff = true;

if ($argc != 2 ||
in_array($argv[1], array('--help', '-help', '-h', '-?')) ||
!is_dir($argv[1])) {

echo "Builds function list from PHP sources\n\n";
echo "Usage:\n";
echo "  $argv[0] \n\n";
echo "  --help, -help, -h, -?\n";
echo "  to get this help.";

} else {

// check for PHP3 sources
$PHP3_lex = is_file($argv[1]."/language-scanner.lex")  // only in PHP3 sources
? $argv[1]."/language-scanner.lex"
: NULL;

require_once "File/Find.php";
//$parsefiles = File_Find::search('/\.(c|cpp|h|ec)$/i', $argv[1], 'perl');
$ff = &new File_Find();
$parsefiles = $ff->search('/\.(c|cpp|h|ec)$/i', $argv[1], 'perl');

// make unified directory separator - /
if (DIRECTORY_SEPARATOR == '\\') {
$parsefiles = array_map( create_function('$a', 'return str_replace("", 
"/", $a);'), $parsefiles );
}

//$FB_exclude = "_class_functions";
$ZendFB_regex  = "`^[ \t]*(?:static)?[ 
\t]*(?:zend_)?function_entry\s*(?!php_hw_api_)\w+(? $file) {
$file_contents = file_get_contents($file);
if (strpos($file_contents, 'function_entry') === FALSE) {
unset($parsefiles[$key]);
} else {
$m = preg_match_all($ZendFB_regex, $file_contents, $matches);
if ($m) {
foreach ($matches[0] as $mk => $mv) {
$block_titles[$key][$mk] = strtok($mv, "\n");
}
$blocks[$key] = $matches[1];
} else {
unset($parsefiles[$key]);
}
}
}

array_multisort($parsefiles, $blocks, $block_titles);
//print_r($parsefiles);
//print_r($block_titles);

$macronames = 
"ZEND_FE|ZEND_FALIAS|PHP_FE|PHP_FALIAS|ZEND_NAMED_FE|PHP_NAMED_FE|PHP_STATIC_FE";
if ($PHP3_lex) $macronames .= "|UODBC_FE(?:_ALIAS)?";
$FB_instance_regex = "`^[ \t]*(?:($macronames)\s*\(|\{)\s*\"?(\w+)`im";

foreach ($parsefiles as $key => $file) {
// output source file name
echo str_replace($argv[1], "# php-src", $file)."\n";
foreach ($blocks[$key] as $bk => $bv) {
// output function block title
if ($show_block_names) {
echo "# ".$block_titles[$key][$bk]."\n";
}
$resultecho = array();
$tok = strtok($bv, "\n");
while ($tok) {
if (preg_match($FB_instance_regex, $tok, $matches)) {
if ($PHP3_lex && ereg("^UODBC_FE",$matches[1]))
$matches[2] = "odbc_".$matches[2];
// output function name
if (!$sort_names):

< 1 2

101 - 193 of 193 matches

Mail list logo