[PHP-DOC] cvs: livedocs / build.sh style_mapping.php /themes/default livedoc.css /themes/php.net livedoc.css /themes/smarty livedoc.css
bjori Tue Jun 19 23:33:48 2007 UTC
Modified files:
/livedocs build.sh style_mapping.php
/livedocs/themes/defaultlivedoc.css
/livedocs/themes/php.netlivedoc.css
/livedocs/themes/smarty livedoc.css
Log:
Add example image support (sync with phpdoc)
http://cvs.php.net/viewvc.cgi/livedocs/build.sh?r1=1.33r2=1.34diff_format=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.33 livedocs/build.sh:1.34
--- livedocs/build.sh:1.33 Tue Jun 19 23:22:52 2007
+++ livedocs/build.sh Tue Jun 19 23:33:48 2007
@@ -65,6 +65,23 @@
# make search cache database
mv ${GENDIR}/livedoc-cache-idx.$i.sqlite ${OUTPUTDIR}/$i/
chmod 0666 ${OUTPUTDIR}/$i/livedoc-cache-idx.$i.sqlite
+
+ if test $i = en; then
+ echo Copying image examples from ${PHPDOC}/en
+ mkdir ${OUTPUTDIR}/figures
+ for folder in `find ${PHPDOC}/en -type d -name figures`; do
+ echo $folder
+ sect=`dirname ${folder} | xargs basename`
+ for file in ${folder}/*; do
+ if test -f $file; then
+ name=`basename ${file}`
+ echo cp ${file}
${OUTPUTDIR}/figures/${sect}.${name}
+ fi
+ done
+ done
+ echo Done
+ fi
+
cd $curpath
done;
http://cvs.php.net/viewvc.cgi/livedocs/style_mapping.php?r1=1.35r2=1.36diff_format=u
Index: livedocs/style_mapping.php
diff -u livedocs/style_mapping.php:1.35 livedocs/style_mapping.php:1.36
--- livedocs/style_mapping.php:1.35 Tue Jun 19 23:22:52 2007
+++ livedocs/style_mapping.php Tue Jun 19 23:33:48 2007
@@ -18,7 +18,7 @@
// | Helper functions for formatting elements |
// +--+
//
-// $Id: style_mapping.php,v 1.35 2007/06/19 23:22:52 philip Exp $
+// $Id: style_mapping.php,v 1.36 2007/06/19 23:33:48 bjori Exp $
// almost XPATH.. ;-)
$map = array(
@@ -78,6 +78,7 @@
'refsect2/title'= 'h4',
'replaceable' = 'span',
'screen'= 'format_listing',
+ 'screenshot/graphic'= 'format_image',
'section/title' = 'h1',
'sect1/title' = 'h2',
'sect2/title' = 'h3',
@@ -393,6 +394,10 @@
return sprintf('div class=%scode%s%s/div',
$node-attributes['role'], LTR, $content);
}
+function format_image($node, $map = array()) {
+ return sprintf('img src=%s class=%s /',
$node-attributes['fileref'], $node-tagname);
+}
+
function format_params($node)
{
$node-parent = null;
http://cvs.php.net/viewvc.cgi/livedocs/themes/default/livedoc.css?r1=1.8r2=1.9diff_format=u
Index: livedocs/themes/default/livedoc.css
diff -u livedocs/themes/default/livedoc.css:1.8
livedocs/themes/default/livedoc.css:1.9
--- livedocs/themes/default/livedoc.css:1.8 Wed Feb 9 19:03:56 2005
+++ livedocs/themes/default/livedoc.css Tue Jun 19 23:33:48 2007
@@ -1,4 +1,4 @@
-/* $Id: livedoc.css,v 1.8 2005/02/09 19:03:56 iliaa Exp $ */
+/* $Id: livedoc.css,v 1.9 2007/06/19 23:33:48 bjori Exp $ */
body {
font-family: verdana;
font-size: 11pt;
@@ -154,7 +154,7 @@
div.shellcode, div.xmlcode, div.phpcode,
div.inicode, div.htmlcode, div.screen,
div.apache-confcode, div.code,
-div.synopsis {
+div.synopsis, div.screenshot {
background-color: #ee;
border: solid 2px #dd;
padding: 0.6em;
http://cvs.php.net/viewvc.cgi/livedocs/themes/php.net/livedoc.css?r1=1.7r2=1.8diff_format=u
Index: livedocs/themes/php.net/livedoc.css
diff -u livedocs/themes/php.net/livedoc.css:1.7
livedocs/themes/php.net/livedoc.css:1.8
--- livedocs/themes/php.net/livedoc.css:1.7 Sat Aug 21 14:31:35 2004
+++ livedocs/themes/php.net/livedoc.css Tue Jun 19 23:33:48 2007
@@ -1,4 +1,4 @@
-/* $Id: livedoc.css,v 1.7 2004/08/21 14:31:35 derick Exp $ */
+/* $Id: livedoc.css,v 1.8 2007/06/19 23:33:48 bjori Exp $ */
body {
font-family: verdana;
font-size: 11pt;
@@ -179,7 +179,7 @@
div.shellcode, div.xmlcode, div.phpcode,
div.inicode, div.htmlcode, div.screen,
div.apache-confcode, div.code,
-div.synopsis {
+div.synopsis, div.screenshot {
background-color: #ee;
border: solid 2px #dd;
padding: 0.6em;
http://cvs.php.net/viewvc.cgi/livedocs/themes/smarty/livedoc.css?r1=1.2r2=1.3diff_format=u
Index: livedocs/themes/smarty/livedoc.css
diff -u livedocs/themes/smarty/livedoc.css:1.2
livedocs/themes/smarty/livedoc.css:1.3
--- livedocs/themes/smarty/livedoc.css:1.2 Tue May 4 15:29:23 2004
+++ livedocs/themes/smarty/livedoc.css Tue Jun 19 23:33:48 2007
@@ -1,4 +1,4 @@
-/* $Id: livedoc.css,v 1.2 2004/05/04 15:29:23 nlopess Exp $ */
+/* $Id: livedoc.css,v 1.3 2007/06/19 23:33:48 bjori Exp $ */
body {
font-family:
[PHP-DOC] cvs: livedocs / build.sh
iliaa Mon Aug 14 16:37:19 2006 UTC
Modified files:
/livedocs build.sh
Log:
Don't lose phpdoc build options
# Patch by Sean Coates
http://cvs.php.net/viewvc.cgi/livedocs/build.sh?r1=1.30r2=1.31diff_format=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.30 livedocs/build.sh:1.31
--- livedocs/build.sh:1.30 Wed Jul 6 18:08:39 2005
+++ livedocs/build.sh Mon Aug 14 16:37:19 2006
@@ -25,7 +25,7 @@
echo -n Configuring ${BUILDTYPE} for $i:
date
cd ${PHPDOC}
- if ! ./configure --with-lang=$i --with-php=${PHP} ; then
+ if ! ./configure --with-lang=$i --with-php=${PHP}
$PHPDOC_CONFIG_OPTS ; then
continue
fi
fi
[PHP-DOC] cvs: livedocs / build.sh toc_peardoc.xsl
iliaa Wed Jul 6 12:30:55 2005 EDT
Added files:
/livedocs toc_peardoc.xsl
Modified files:
/livedocs build.sh
Log:
Added PEAR's xsl file and added configure flags to handle it.
# Once again thanks to Alan for doing all the hard work.
http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.28r2=1.29ty=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.28 livedocs/build.sh:1.29
--- livedocs/build.sh:1.28 Wed Feb 9 17:15:59 2005
+++ livedocs/build.sh Wed Jul 6 12:30:54 2005
@@ -36,7 +36,14 @@
if test $i = en; then
echo -n Making TOC:
date
- if ! ${XSLTPROC} ${LIVEDOCS}/toc.xsl ${PHPDOC}/manual.xml
${GENDIR}/toc-ugly.xml ; then
+
+ if test -e ${LIVEDOCS}/toc_${BUILDTYPE}.xsl; then
+ XSLTFILE=toc${BUILDTYPE}.xsl
+ else
+ XSLTFILE=toc.xsl
+ fi
+
+ if ! ${XSLTPROC} ${LIVEDOCS}/${XSLTFILE} ${PHPDOC}/manual.xml
${GENDIR}/toc-ugly.xml ; then
continue
fi
http://cvs.php.net/co.php/livedocs/toc_peardoc.xsl?r=1.1p=1
Index: livedocs/toc_peardoc.xsl
+++ livedocs/toc_peardoc.xsl
?xml version=1.0 encoding=UTF-8?
xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; version=1.0
xsl:template match=book
toc
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:apply-templates select=bookinfo/
xsl:apply-templates select=preface/
xsl:apply-templates select=part/
/toc
/xsl:template
xsl:template match=bookinfo|preface
dir
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
/dir
/xsl:template
xsl:template match=part
part
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
xsl:apply-templates select=chapter/
xsl:apply-templates select=reference/
xsl:apply-templates select=appendix/
/part
/xsl:template
xsl:template match=chapter
chapter
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
xsl:apply-templates select=sect1|section/
/chapter
/xsl:template
xsl:template match=appendix
appendix
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
xsl:apply-templates select=sect1/
/appendix
/xsl:template
xsl:template match=reference
reference
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
xsl:apply-templates select=section|refentry/
/reference
/xsl:template
xsl:template match=section
sect1
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
xsl:apply-templates select=section/
/sect1
/xsl:template
xsl:template match=sect1
sect1
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
xsl:apply-templates select=sect2|refentry/
/sect1
/xsl:template
xsl:template match=sect2
sect2
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
xsl:apply-templates select=sect3/
/sect2
/xsl:template
xsl:template match=sect3
sect3
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
xsl:apply-templates select=sect4/
/sect3
/xsl:template
xsl:template match=sect4
sect4
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:attribute name=titlexsl:value-of
select=title//xsl:attribute
/sect4
/xsl:template
xsl:template match=refentry
sect2
xsl:attribute name=idxsl:value-of select=@id//xsl:attribute
xsl:attribute name=titlexsl:value-of
select=refnamediv/refname/function|refnamediv/refname//xsl:attribute
/sect2
/xsl:template
/xsl:stylesheet
[PHP-DOC] cvs: livedocs / build.sh
iliaa Wed Jul 6 14:08:39 2005 EDT
Modified files:
/livedocs build.sh
Log:
Set xsl file name correctly
http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.29r2=1.30ty=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.29 livedocs/build.sh:1.30
--- livedocs/build.sh:1.29 Wed Jul 6 12:30:54 2005
+++ livedocs/build.sh Wed Jul 6 14:08:39 2005
@@ -38,7 +38,7 @@
date
if test -e ${LIVEDOCS}/toc_${BUILDTYPE}.xsl; then
- XSLTFILE=toc${BUILDTYPE}.xsl
+ XSLTFILE=toc_${BUILDTYPE}.xsl
else
XSLTFILE=toc.xsl
fi
[PHP-DOC] cvs: livedocs / build.sh mk_notes.php
iliaa Wed Feb 9 14:37:02 2005 EDT
Modified files:
/livedocs mk_notes.php build.sh
Log:
Fixed building on notes based on a bz2 file.
http://cvs.php.net/diff.php/livedocs/mk_notes.php?r1=1.5r2=1.6ty=u
Index: livedocs/mk_notes.php
diff -u livedocs/mk_notes.php:1.5 livedocs/mk_notes.php:1.6
--- livedocs/mk_notes.php:1.5 Thu Nov 11 14:33:27 2004
+++ livedocs/mk_notes.php Wed Feb 9 14:37:02 2005
@@ -19,7 +19,7 @@
// | livedocs.|
// +--+
//
-// $Id: mk_notes.php,v 1.5 2004/11/11 19:33:27 wez Exp $
+// $Id: mk_notes.php,v 1.6 2005/02/09 19:37:02 iliaa Exp $
$create = SQL
BEGIN;
@@ -35,7 +35,7 @@
SQL;
$dbname = $argv[1] . '/livedoc-notes.sqlite';
$tmpdir = $argv[2];
-$mirror = $argv[3];
+$mirror = !empty($argv[3]) ? $argv[3] : 'www';
if (file_exists($dbname)) {
if (filemtime($dbname) time() + (60 * 60)) {
@@ -79,8 +79,7 @@
} while (true);
-} else {
-
+} else if (extension_loaded('bz2')) {
$name = tempnam($tmpdir, 'notes');
copy('http://'.$mirror.'.php.net/backend/notes/all.bz2', $name);
$fp = fopen(compress.bzip2://.$name, 'r');
@@ -101,6 +100,10 @@
}
}
+ if ($buffer) {
+ sqlite_query($DB, $buffer);
+ }
+
$n_data = ftell($fp);
}
http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.26r2=1.27ty=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.26 livedocs/build.sh:1.27
--- livedocs/build.sh:1.26 Thu Nov 11 14:33:27 2004
+++ livedocs/build.sh Wed Feb 9 14:37:02 2005
@@ -6,12 +6,12 @@
echo
-if test -n $NOTES_MIRROR$NOTES_TOKEN ; then
+#if test -n $NOTES_MIRROR$NOTES_TOKEN ; then
echo Building user notes
TOKEN=$NOTES_TOKEN
export TOKEN
${PHP} ${LIVEDOCSFORPHP}/mk_notes.php ${OUTPUTDIR} ${GENDIR}
${NOTES_MIRROR}
-fi
+#fi
# running ./buildconf
cd ${PHPDOC}
[PHP-DOC] cvs: livedocs / build.sh
didou Tue May 4 11:18:51 2004 EDT
Modified files:
/livedocs build.sh
Log:
test
http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.21r2=1.22ty=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.21 livedocs/build.sh:1.22
--- livedocs/build.sh:1.21 Wed Mar 17 05:45:50 2004
+++ livedocs/build.sh Tue May 4 11:18:50 2004
@@ -41,6 +41,7 @@
echo -n Making index for $i:
date
+ echo ${PHP} ${LIVEDOCSFORPHP}/mkindex.php ${PHPDOCFORPHP} $i ${GENDIRFORPHP}
${BUILDTYPE}
${PHP} ${LIVEDOCSFORPHP}/mkindex.php ${PHPDOCFORPHP} $i ${GENDIRFORPHP}
${BUILDTYPE}
mv ${GENDIR}/livedoc-idx.$i.sqlite ${OUTPUTDIR}
# create output dir
@@ -57,4 +58,4 @@
echo -n End:
date
-rm -f ${GENDIR}/toc-ugly.xml ${GENDIR}/toc-insert.sql
+#rm -f ${GENDIR}/toc-ugly.xml ${GENDIR}/toc-insert.sql
[PHP-DOC] cvs: livedocs / build.sh
didou Tue May 4 11:19:57 2004 EDT
Modified files:
/livedocs build.sh
Log:
revert wrong commit
http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.22r2=1.23ty=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.22 livedocs/build.sh:1.23
--- livedocs/build.sh:1.22 Tue May 4 11:18:50 2004
+++ livedocs/build.sh Tue May 4 11:19:57 2004
@@ -41,7 +41,6 @@
echo -n Making index for $i:
date
- echo ${PHP} ${LIVEDOCSFORPHP}/mkindex.php ${PHPDOCFORPHP} $i ${GENDIRFORPHP}
${BUILDTYPE}
${PHP} ${LIVEDOCSFORPHP}/mkindex.php ${PHPDOCFORPHP} $i ${GENDIRFORPHP}
${BUILDTYPE}
mv ${GENDIR}/livedoc-idx.$i.sqlite ${OUTPUTDIR}
# create output dir
[PHP-DOC] cvs: livedocs / build.sh
momoSun Feb 1 13:25:28 2004 EDT
Modified files:
/livedocs build.sh
Log:
2. the correct fix for relative paths
http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.18r2=1.19ty=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.18 livedocs/build.sh:1.19
--- livedocs/build.sh:1.18 Fri Jan 30 00:49:15 2004
+++ livedocs/build.sh Sun Feb 1 13:25:28 2004
@@ -30,7 +30,6 @@
#xmllint --format ${GENDIR}/toc-ugly.xml ${GENDIR}/toc.xml
${PHP} ${LIVEDOCSFORPHP}/mktoc.php ${GENDIRFORPHP}/toc-ugly.xml
${GENDIR}/toc-insert.sql
- cd $curpath
fi
echo -n Making index for $i:
@@ -45,6 +44,7 @@
# make search cache database
mv ${GENDIR}/livedoc-cache-idx.$i.sqlite ${OUTPUTDIR}/$i/
chmod 0666 ${OUTPUTDIR}/$i/livedoc-cache-idx.$i.sqlite
+ cd $curpath
done;
echo -n End:
[PHP-DOC] cvs: livedocs / build.sh
nlopess Fri Jan 23 13:27:17 2004 EDT
Modified files:
/livedocs build.sh
Log:
toc.xml only for debug
http://cvs.php.net/diff.php/livedocs/build.sh?r1=1.16r2=1.17ty=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.16 livedocs/build.sh:1.17
--- livedocs/build.sh:1.16 Tue Jan 13 05:57:06 2004
+++ livedocs/build.sh Fri Jan 23 13:27:17 2004
@@ -24,8 +24,11 @@
echo -n Making TOC:
date
xsltproc ${LIVEDOCS}/toc.xsl ${PHPDOC}/manual.xml
${GENDIR}/toc-ugly.xml
- xmllint --format ${GENDIR}/toc-ugly.xml ${GENDIR}/toc.xml
- ${PHP} ${LIVEDOCS}/mktoc.php ${GENDIR}/toc.xml
${GENDIR}/toc-insert.sql
+
+ #Just for debuging
+ #xmllint --format ${GENDIR}/toc-ugly.xml ${GENDIR}/toc.xml
+
+ ${PHP} ${LIVEDOCS}/mktoc.php ${GENDIR}/toc-ugly.xml
${GENDIR}/toc-insert.sql
fi
echo -n Making index for $i:
@@ -45,4 +48,4 @@
echo -n End:
date
-rm -f ${GENDIR}/toc-ugly.xml ${GENDIR}/toc.xml ${GENDIR}/toc-insert.sql
+rm -f ${GENDIR}/toc-ugly.xml ${GENDIR}/toc-insert.sql
