[PHP-DOC] cvs: phd(GWYNNE_PLAYS_HERE) /formats phpnetchunkedreader.php xhtml.php /include PhDReader.class.php
gwynne Sun Jul 29 09:46:39 2007 UTC
Added files: (Branch: GWYNNE_PLAYS_HERE)
/phd/formatsphpnetchunkedreader.php
Modified files:
/phd/formatsxhtml.php
/phd/includePhDReader.class.php
Log:
Commit bjori's latest onto a separate branch. The branch was created so that
I could mess around with some of my ideas without interfering with the
mainstream development until we'd had a chance to discuss and approve them
concurrently.
http://cvs.php.net/viewvc.cgi/phd/formats/xhtml.php?r1=1.7r2=1.7.2.1diff_format=u
Index: phd/formats/xhtml.php
diff -u phd/formats/xhtml.php:1.7 phd/formats/xhtml.php:1.7.2.1
--- phd/formats/xhtml.php:1.7 Sat Jul 28 23:58:06 2007
+++ phd/formats/xhtml.php Sun Jul 29 09:46:39 2007
@@ -1,6 +1,6 @@
?php
-/* $Id: xhtml.php,v 1.7 2007/07/28 23:58:06 gwynne Exp $
+/* $Id: xhtml.php,v 1.7.2.1 2007/07/29 09:46:39 gwynne Exp $
+-+
| Copyright(c) 2007 |
| Authors:|
@@ -49,16 +49,25 @@
'orderedlist' = 'ol',
'para' = 'p',
'parameter' = 'span',
+'partintro' = 'div',
'productname' = 'span',
'propname' = 'span',
'property' = 'span',
'proptype' = 'span',
+'section' = 'div',
'simplelist'= 'ul',
'simpara' = 'p',
- 'title' = 'h1',
+ 'title' = array(
+ /* DEFAULT */ 'h1',
+ 'refsect1' = 'h3',
+ 'example' = 'h4',
+ ),
'year' = 'span',
);
-
+protected $CURRENT_FUNCTION_ID = ;
+ protected $CURRENT_REFERENCE_ID = ;
+ protected $functionList = array();
+
public function __construct( $file, $encoding = 'utf-8', $options = NULL )
{
parent::__construct( $file, $encoding, $options );
}
@@ -75,16 +84,29 @@
public function format_refentry( $open ) {
if ( $open ) {
- return 'div';
+ $this-CURRENT_FUNCTION_ID = $id = $this-getID();
+
+ return sprintf( 'div id=%s class=refentry', $id );
}
+ $this-CURRENT_FUNCTION_ID = ;
+ return /div;
+ }
+ public function format_reference( $open ) {
+ if ( $open ) {
+ $this-CURRENT_REFERENCE_ID = $id = $this-getID();
+
+ return sprintf( 'div id=%s class=reference', $id
);
- echo /div;
- if ( $this-hasAttributes $this-moveToAttributeNs( id,
http://www.w3.org/XML/1998/namespace; ) ) {
- $id = $this-value;
}
- $content = ob_get_contents();
- ob_clean();
- file_put_contents( cache/$id.html, $content );
+ $content = /div;
+ $content .= 'ul class=funclist';
+ foreach( $this-functionList as $func = $desc ) {
+ $content .= sprintf( 'lia href=function.%1$s.html
class=refentry%1$s/a/li', $func );
+ }
+ $content .= /ul\n;
+ $this-CURRENT_REFERENCE_ID = ;
+ $this-functionList = array();
+ return $content;
}
@@ -141,8 +163,26 @@
return $content;
}
+ public function format_refnamediv( $open ) {
+ $root = $this-name;
+
+ while ( $this-readNode( $root ) ) {
+ $name = $this-name;
+ switch( $name ) {
+ case refname:
+ $refname = $this-readContent( $name );
+ break;
+ case refpurpose:
+ $refpurpose = $this-readContent( $name );
+ break;
+ }
+ }
+
+ $this-functionList[ $refname ] = $refpurpose;
+ return sprintf( 'div class=refnamedivspan
class=refname%s/spanspan class=refpurpose%s/span/div', $refname,
$refpurpose );
+ }
- protected function transformFromMap( $open, $name ) {
+ protected function transormFromMap($open, $tag, $name) {
$tag = $this-map[ $name ];
if($open) {
http://cvs.php.net/viewvc.cgi/phd/include/PhDReader.class.php?r1=1.6r2=1.6.2.1diff_format=u
Index: phd/include/PhDReader.class.php
[PHP-DOC] cvs: phpdoc /phpbook/phpbook-xsl html.xsl
bjori Sun Jul 29 10:10:37 2007 UTC Modified files: /phpdoc/phpbook/phpbook-xsl html.xsl Log: Ignore 'id recommended' warnings http://cvs.php.net/viewvc.cgi/phpdoc/phpbook/phpbook-xsl/html.xsl?r1=1.2r2=1.3diff_format=u Index: phpdoc/phpbook/phpbook-xsl/html.xsl diff -u phpdoc/phpbook/phpbook-xsl/html.xsl:1.2 phpdoc/phpbook/phpbook-xsl/html.xsl:1.3 --- phpdoc/phpbook/phpbook-xsl/html.xsl:1.2 Wed Jan 31 19:53:11 2007 +++ phpdoc/phpbook/phpbook-xsl/html.xsl Sun Jul 29 10:10:37 2007 @@ -3,7 +3,7 @@ html.xsl: Chunked HTML specific stylesheet - $Id: html.xsl,v 1.2 2007/01/31 19:53:11 bjori Exp $ + $Id: html.xsl,v 1.3 2007/07/29 10:10:37 bjori Exp $ -- xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; @@ -17,6 +17,9 @@ using the IDs in documents -- xsl:param name=base.dir select='html/'/ +!-- Ignore the annoying ID recommended on... warnings -- +xsl:param name=id.warnings select=0/ + !-- NAVIGATION-HEADERS: let them look similar to dsssl (not in 1st page, 1st line always PHP manual, titles labelled just with e.g. 'A.' instead of 'appendix A.') --
[PHP-DOC] Notes Status, 18240 total
Following are the top 20 pages of the manual, sorted by the number of user notes contributed. These sections could use a polish, those notes represent 8.3% of the 18240 total user notes. Notes | Page ---+- 99 | http://php.net/manual/en/ref.session.php 88 | http://php.net/manual/en/features.file-upload.php 84 | http://php.net/manual/en/ref.array.php 83 | http://php.net/manual/en/function.date.php 82 | http://php.net/manual/en/ref.image.php 79 | http://php.net/manual/en/function.rand.php 79 | http://php.net/manual/en/reserved.variables.php 79 | http://php.net/manual/en/function.fgetcsv.php 79 | http://php.net/manual/en/function.array-search.php 78 | http://php.net/manual/en/function.fsockopen.php 74 | http://php.net/manual/en/function.mssql-connect.php 73 | http://php.net/manual/en/ref.curl.php 70 | http://php.net/manual/en/function.in-array.php 68 | http://php.net/manual/en/function.strpos.php 68 | http://php.net/manual/en/ref.com.php 67 | http://php.net/manual/en/function.exec.php 66 | http://php.net/manual/en/control-structures.foreach.php 65 | http://php.net/manual/en/function.header.php 64 | http://php.net/manual/en/function.array-unique.php 64 | http://php.net/manual/en/ref.datetime.php
Re: [PHP-DOC] build failure en (2007-07-29)
On Sun, 29 Jul 2007, Hannes Magnusson wrote: Already turned off these warnings in the XSL this morning :) Yeah, I just noticed that :-) I put the crons back for the CHMs, let's see how it goes with all the languages... regards, Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org
[PHP-DOC] cvs: phd(GWYNNE_PLAYS_HERE) / build.php /formats xhtml.php /include PhDReader.class.php
gwynne Sun Jul 29 14:31:54 2007 UTC
Modified files: (Branch: GWYNNE_PLAYS_HERE)
/phdbuild.php
/phd/formatsxhtml.php
/phd/includePhDReader.class.php
Log:
Committed to my branch ONLY. This is my vision of some of what should be
going on in an output format, though a lot of this should be in a theme really.
Discussion versus Hannes' method is requested :).
http://cvs.php.net/viewvc.cgi/phd/build.php?r1=1.4r2=1.4.2.1diff_format=u
Index: phd/build.php
diff -u phd/build.php:1.4 phd/build.php:1.4.2.1
--- phd/build.php:1.4 Fri Jul 27 23:09:27 2007
+++ phd/build.php Sun Jul 29 14:31:54 2007
@@ -1,15 +1,36 @@
?php
+error_reporting( E_ALL | E_STRICT );
+
require_once 'config.php';
require_once 'formats/xhtml.php';
-$phd = new PhDXHTMLReader( ${OPTIONS[ 'xml_root' ]}/.manual.xml );
-$phd-seek( function.dotnet-load );
-echo date( DATE_RSS ). done seeking\n;
-
-ob_start();
-while( $phd-nextNode() ) {
- print $phd-transform();
+file_put_contents( dirname( __FILE__ ) . /temp.xml, ~XML
+?xml version=1.0 encoding=utf-8?
+
+book
+ part id=part1
+ chapter id=chap1
+ Using the application applicationautoconf/application, we can do some
+ fun stuff, since commandphp/command does other fun things, and dolor
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+ tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+ quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+ consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+ cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
+ non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+ /chapter
+ /part
+/book
+XML
+);
+
+$phd = new PhDReader_XHTML( dirname( __FILE__ ) . /temp.xml, NULL, 2 );
+
+while ( $phd-transformChunk( $chunk ) ) {
+print {$chunk}\n;
}
+print {$chunk}\n;
+
$phd-close();
?
http://cvs.php.net/viewvc.cgi/phd/formats/xhtml.php?r1=1.7.2.1r2=1.7.2.2diff_format=u
Index: phd/formats/xhtml.php
diff -u phd/formats/xhtml.php:1.7.2.1 phd/formats/xhtml.php:1.7.2.2
--- phd/formats/xhtml.php:1.7.2.1 Sun Jul 29 09:46:39 2007
+++ phd/formats/xhtml.php Sun Jul 29 14:31:54 2007
@@ -1,6 +1,6 @@
?php
-/* $Id: xhtml.php,v 1.7.2.1 2007/07/29 09:46:39 gwynne Exp $
+/* $Id: xhtml.php,v 1.7.2.2 2007/07/29 14:31:54 gwynne Exp $
+-+
| Copyright(c) 2007 |
| Authors:|
@@ -20,53 +20,7 @@
/* Grab the PhDReader parent class. */
require_once 'include/PhDReader.class.php';
-class PhDXHTMLReader extends PhDReader {
-
- protected $map = array(
- 'application' = 'span',
- 'classname' = 'span',
- 'code' = 'code',
- 'collab'= 'span',
- 'collabname'= 'span',
- 'command' = 'span',
- 'computeroutput'= 'span',
- 'constant' = 'span',
- 'emphasis' = 'em',
- 'enumname' = 'span',
- 'envar' = 'span',
- 'filename' = 'span',
- 'glossterm' = 'span',
- 'holder'= 'span',
- 'informaltable' = 'table',
- 'itemizedlist' = 'ul',
- 'listitem' = 'li',
- 'literal' = 'span',
- 'mediaobject' = 'div',
- 'methodparam' = 'span',
- 'member'= 'li',
- 'note' = 'div',
- 'option'= 'span',
- 'orderedlist' = 'ol',
- 'para' = 'p',
- 'parameter' = 'span',
-'partintro' = 'div',
- 'productname' = 'span',
- 'propname' = 'span',
- 'property' = 'span',
- 'proptype' = 'span',
-'section' = 'div',
- 'simplelist'= 'ul',
- 'simpara' = 'p',
- 'title' = array(
- /* DEFAULT */ 'h1',
- 'refsect1' = 'h3',
- 'example' = 'h4',
- ),
- 'year' = 'span',
- );
-protected $CURRENT_FUNCTION_ID = ;
- protected $CURRENT_REFERENCE_ID = ;
- protected $functionList = array();
+class PhDReader_XHTML extends
Re: [PHP-DOC] build failure en (2007-07-29)
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Derick Rethans wrote: those all seem to be warnings, is there some option to make it less noisy? One wonders, however, whether or not it would be a good idea to add IDs to all of these elements. - -- Edward Z. YangGnuPG: 0x869C48DA HTML Purifier htmlpurifier.org Anti-XSS HTML Filter [[ 3FA8 E9A9 7385 B691 A6FC B3CB A933 BE7D 869C 48DA ]] -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGrOmBqTO+fYacSNoRAuo5AKCJMue4dzvwapVaRijMo9wO7rlqKwCffPrP mJXrpAa+WNOAvYEQvQoytPU= =y7w6 -END PGP SIGNATURE-
[PHP-DOC] #42124 [Opn]: error on tmpname()
ID: 42124 User updated by: ch at lathspell dot de Reported By: ch at lathspell dot de Status: Open Bug Type:Translation problem PHP Version: Irrelevant New Comment: I'd suggest: REPLACE: Gibt den neuen temporären Dateinamen bei Erfolg, oder eine FALSE Zeichenkette wenn ein Fehler auftritt zurück. BY: Gibt den neuen temporären Dateinamen bei Erfolg oder FALSE wenn ein Fehler auftritt zurück. Previous Comments: [2007-07-27 11:55:20] [EMAIL PROTECTED] Considering most of us do not know any german, what would you propose changing it to? (in german) [2007-07-27 11:49:50] ch at lathspell dot de Description: tempnam() documentation in German: Gibt den neuen temporären Dateinamen bei Erfolg, oder eine FALSE Zeichenkette wenn ein Fehler auftritt zurück. I guess it returns simply FALSE and not the string FALSE if an error occurs. English original does it right. bye, -christian- Reproduce code: --- - Expected result: - Actual result: -- - -- Edit this bug report at http://bugs.php.net/?id=42124edit=1
