[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Sun Jul 31 07:43:47 2005 EDT
Modified files:
/phpdoc/xsl htmlhelp.xsl
Log:
+ allow printing xCHM chapters - bug #29749
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.24&r2=1.25&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.24 phpdoc/xsl/htmlhelp.xsl:1.25
--- phpdoc/xsl/htmlhelp.xsl:1.24Sat Jul 30 15:42:41 2005
+++ phpdoc/xsl/htmlhelp.xsl Sun Jul 31 07:43:45 2005
@@ -3,7 +3,7 @@
HTML Help specific stylesheet
- $Id: htmlhelp.xsl,v 1.24 2005/07/30 19:42:41 techtonik Exp $
+ $Id: htmlhelp.xsl,v 1.25 2005/07/31 11:43:45 techtonik Exp $
-->
http://www.w3.org/1999/XSL/Transform";
@@ -404,7 +404,7 @@
-
+
@@ -442,12 +442,26 @@
+
- if (typeof displayPage == 'function') {
displayPage(); } else {document.all['pageContent'].style.display =
'block';}
+
+ if (typeof displayPage == 'function') {
+displayPage();
+ } else if (typeof document.all['pageContent'].style != 'undefined') {
+ document.all['pageContent'].style.display = 'block';
+ }
+
if(prefs_context_override){return
false;}
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Sat Jul 30 15:42:43 2005 EDT
Modified files:
/phpdoc/xsl htmlhelp.xsl
Log:
- g.. convert endings back to lf
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.23&r2=1.24&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.23 phpdoc/xsl/htmlhelp.xsl:1.24
--- phpdoc/xsl/htmlhelp.xsl:1.23Sat Jul 30 14:30:40 2005
+++ phpdoc/xsl/htmlhelp.xsl Sat Jul 30 15:42:41 2005
@@ -1,755 +1,755 @@
-
-
-http://www.w3.org/1999/XSL/Transform";
-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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-http://www.w3.org/TR/html4/loose.dtd'"/>
-
-
-
-
-
-
-
-
-
-
-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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- if (typeof displayPage == 'function') {
displayPage(); } else {document.all['pageContent'].style.display =
'block';}
- if(prefs_context_override){return
false;}
-
-
-
-
-
-
-
-
-
-
-
- function displayNotes() { _displayNotes(); }
- if (typeof loadNotes == "function") { loadNotes(); }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<<
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- >>
-
-
-
-
-
-
-
-
- This
page online
-
- Report a
bug
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- :
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- :
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- (
-
-
- ]
-
- )
-
-
-
-
-
-
- [
-
-
-,
-
-
-
-
-
-
-
- &
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+http://www.w3.org/1999/XSL/Transform";
+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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://www.w3.org/TR/html4/loose.dtd'"/>
+
+
+
+
+
+
+
+
+
+
+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
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Sat Jul 30 14:30:40 2005 EDT
Modified files:
/phpdoc/xsl htmlhelp.xsl
Log:
- attempt to fix javascript errors of Bug #29749 while printing
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.22&r2=1.23&ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.22 phpdoc/xsl/htmlhelp.xsl:1.23
--- phpdoc/xsl/htmlhelp.xsl:1.22Thu Jul 14 09:42:28 2005
+++ phpdoc/xsl/htmlhelp.xsl Sat Jul 30 14:30:40 2005
@@ -1,755 +1,755 @@
-
-
-http://www.w3.org/1999/XSL/Transform";
-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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-http://www.w3.org/TR/html4/loose.dtd'"/>
-
-
-
-
-
-
-
-
-
-
-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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- displayPage();
- if(prefs_context_override){return
false;}
-
-
-
-
-
-
-
-
-
-
-
- function displayNotes() { _displayNotes(); }
- loadNotes();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<<
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- >>
-
-
-
-
-
-
-
-
- This
page online
-
- Report a
bug
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- :
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- :
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- (
-
-
- ]
-
- )
-
-
-
-
-
-
- [
-
-
-,
-
-
-
-
-
-
-
- &
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+http://www.w3.org/1999/XSL/Transform";
+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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://www.w3.org/TR/html4/loose.dtd'"/>
+
+
+
+
+
+
+
+
+
+
+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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Thu Jul 14 09:42:28 2005 EDT Modified files: /phpdoc/xsl htmlhelp.xsl Log: * hide ToC header string in preface http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.21&r2=1.22&ty=u Index: phpdoc/xsl/htmlhelp.xsl diff -u phpdoc/xsl/htmlhelp.xsl:1.21 phpdoc/xsl/htmlhelp.xsl:1.22 --- phpdoc/xsl/htmlhelp.xsl:1.21Fri Jun 24 05:22:40 2005 +++ phpdoc/xsl/htmlhelp.xsl Thu Jul 14 09:42:28 2005 @@ -3,7 +3,7 @@ HTML Help specific stylesheet - $Id: htmlhelp.xsl,v 1.21 2005/06/24 09:22:40 techtonik Exp $ + $Id: htmlhelp.xsl,v 1.22 2005/07/14 13:42:28 techtonik Exp $ --> http://www.w3.org/1999/XSL/Transform"; @@ -70,7 +70,7 @@ book toc,title chapter toc,title part toc,title -preface toc,title +preface toc qandadiv toc qandaset toc reference toc,title
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Fri Jun 24 05:22:40 2005 EDT Modified files: /phpdoc/xsl htmlhelp.xsl Log: + add pageContent div in XSL template instead of in file_filter.php http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.20&r2=1.21&ty=u Index: phpdoc/xsl/htmlhelp.xsl diff -u phpdoc/xsl/htmlhelp.xsl:1.20 phpdoc/xsl/htmlhelp.xsl:1.21 --- phpdoc/xsl/htmlhelp.xsl:1.20Tue Jun 21 08:33:25 2005 +++ phpdoc/xsl/htmlhelp.xsl Fri Jun 24 05:22:40 2005 @@ -3,7 +3,7 @@ HTML Help specific stylesheet - $Id: htmlhelp.xsl,v 1.20 2005/06/21 12:33:25 techtonik Exp $ + $Id: htmlhelp.xsl,v 1.21 2005/06/24 09:22:40 techtonik Exp $ --> http://www.w3.org/1999/XSL/Transform"; @@ -25,6 +25,7 @@ - DOCTYPE in output HTML defines DOM standard for browser to handle JS correctly - strip tags from HTML headers - add javascript handlers in body attributes + - add root DHTML div with id ="PageContent" for skinning purposes - header off, footer on (also custom with some js handlers and custom ids) - turn on function index page building (in appendixes) and turn off ToC for it @@ -384,7 +385,53 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Re[2]: [PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
||*()*|| Hi, Nuno. NL> Sorry, I only saw your commits after writing the mail :) Tnx for finding that! There are more modifications to come when I'll test them eventually. So far I've found problems with ZendAPI's subtitle and PHP API reference being wrapped in instead of . These chapters are not present in xCHM so I left them uncommited and didn't modify the filters. t --
Re: [PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Tue Jun 21 08:33:26 2005 EDT
Modified files:
/phpdoc/xsl htmlhelp.xsl
Log:
* is deprecated - changing to
+ javascript attributes to calm tidy
* comments
Probably you need to do some more changes:
$ grep -r _user_notes *
filter_files.php:'',
filter_files.php:'',
filter_files.php:preg_match("!(name=\"_user_notes\">.+)!s", $content, $_index2);
suppfiles/skins/HeaderNostalgia/skin.js:'coords="96,4,141,4,141,20,96,20,96,4" href="#_user_notes" alt="User
notes">' +
Nuno
Sorry, I only saw your commits after writing the mail :)
Nuno
Re: [PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Tue Jun 21 08:33:26 2005 EDT
Modified files:
/phpdoc/xsl htmlhelp.xsl
Log:
* is deprecated - changing to
+ javascript attributes to calm tidy
* comments
Probably you need to do some more changes:
$ grep -r _user_notes *
filter_files.php:'',
filter_files.php:'',
filter_files.php:preg_match("!(name=\"_user_notes\">.+)!s", $content, $_index2);
suppfiles/skins/HeaderNostalgia/skin.js:'coords="96,4,141,4,141,20,96,20,96,4" href="#_user_notes" alt="User notes">'
+
Nuno
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Tue Jun 21 08:33:26 2005 EDT Modified files: /phpdoc/xsl htmlhelp.xsl Log: * is deprecated - changing to + javascript attributes to calm tidy * comments http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.19&r2=1.20&ty=u Index: phpdoc/xsl/htmlhelp.xsl diff -u phpdoc/xsl/htmlhelp.xsl:1.19 phpdoc/xsl/htmlhelp.xsl:1.20 --- phpdoc/xsl/htmlhelp.xsl:1.19Sat Jan 8 13:30:48 2005 +++ phpdoc/xsl/htmlhelp.xsl Tue Jun 21 08:33:25 2005 @@ -3,7 +3,7 @@ HTML Help specific stylesheet - $Id: htmlhelp.xsl,v 1.19 2005/01/08 18:30:48 hsc Exp $ + $Id: htmlhelp.xsl,v 1.20 2005/06/21 12:33:25 techtonik Exp $ --> http://www.w3.org/1999/XSL/Transform"; @@ -14,18 +14,19 @@ exclude-result-prefixes="doc exsl set"> @@ -391,7 +395,7 @@ - + @@ -404,17 +408,20 @@ - - - - - - + + + - +