[PHP-DOC] cvs: phd /themes/php phpdotnet.php

2007-08-30 Thread Hannes Magnusson 
bjori   Thu Aug 30 13:55:44 2007 UTC

  Modified files:  
/phd/themes/php phpdotnet.php 
  Log:
  Fix external links
  # (should be prefixed with »)
  
  
http://cvs.php.net/viewvc.cgi/phd/themes/php/phpdotnet.php?r1=1.12&r2=1.13&diff_format=u
Index: phd/themes/php/phpdotnet.php
diff -u phd/themes/php/phpdotnet.php:1.12 phd/themes/php/phpdotnet.php:1.13
--- phd/themes/php/phpdotnet.php:1.12   Thu Aug 30 13:54:16 2007
+++ phd/themes/php/phpdotnet.phpThu Aug 30 13:55:44 2007
@@ -1,5 +1,5 @@
 %s%2$s', 
$this->chunked ? "" : "#", $href, $fragment, $class, $content);
 } else {
-return sprintf('', $this->chunked 
? "" : "#", $href, $fragment, $class);
+return sprintf('%s', 
$this->chunked ? "" : "#", $href, $fragment, $class, $content);
 }
 }
 return "";

[PHP-DOC] cvs: phd /themes/php phpdotnet.php

2007-08-25 Thread Hannes Magnusson 
bjori   Sat Aug 25 13:24:10 2007 UTC

  Modified files:  
/phd/themes/php phpdotnet.php 
  Log:
  Fix html markup
  
  
http://cvs.php.net/viewvc.cgi/phd/themes/php/phpdotnet.php?r1=1.10&r2=1.11&diff_format=u
Index: phd/themes/php/phpdotnet.php
diff -u phd/themes/php/phpdotnet.php:1.10 phd/themes/php/phpdotnet.php:1.11
--- phd/themes/php/phpdotnet.php:1.10   Sat Aug 25 13:13:49 2007
+++ phd/themes/php/phpdotnet.phpSat Aug 25 13:24:10 2007
@@ -1,5 +1,5 @@
 %s — %s', 
$href, $short, $long);
+$content .= sprintf('%s — 
%s', $href, $short, $long);
 } else {
-$content .= sprintf('%s', $href, 
$long ? $long : $short);
+$content .= sprintf('%s', 
$href, $long ? $long : $short);
 }
 }
 $content .="";

[PHP-DOC] cvs: phd /themes/php phpdotnet.php

2007-08-25 Thread Hannes Magnusson 
bjori   Sat Aug 25 13:13:49 2007 UTC

  Modified files:  
/phd/themes/php phpdotnet.php 
  Log:
  Use the short-description as link and print the long description beside it
  
  
http://cvs.php.net/viewvc.cgi/phd/themes/php/phpdotnet.php?r1=1.9&r2=1.10&diff_format=u
Index: phd/themes/php/phpdotnet.php
diff -u phd/themes/php/phpdotnet.php:1.9 phd/themes/php/phpdotnet.php:1.10
--- phd/themes/php/phpdotnet.php:1.9Fri Aug 24 09:11:23 2007
+++ phd/themes/php/phpdotnet.phpSat Aug 25 13:13:49 2007
@@ -1,5 +1,5 @@
 ';
 foreach($chunks as $chunkid => $junk) {
 $href = $this->chunked ? $chunkid .'.'. $this->ext : "#$chunkid";
-$content .= sprintf('%s', $href, 
PhDHelper::getDescription($chunkid, true));
+$long = PhDHelper::getDescription($chunkid, true);
+$short = PhDHelper::getDescription($chunkid, false);
+if ($long && $short && $long != $short) {
+$content .= sprintf('%s — %s', $href, 
$short, $long);
+} else {
+$content .= sprintf('%s', $href, $long ? 
$long : $short);
+}
 $children = PhDHelper::getChildren($chunkid);
 if (count($children)) {
 $content .= '';
 foreach(PhDHelper::getChildren($chunkid) as $childid => $junk) 
{
 $href = $this->chunked ? $childid .'.'. $this->ext : 
"#$childid";
-$content .= sprintf('%s', $href, 
PhDHelper::getDescription($childid, true));
+$long = PhDHelper::getDescription($childid, true);
+$short = PhDHelper::getDescription($childid, false);
+if ($long && $short && $long != $short) {
+$content .= sprintf('%s — %s', 
$href, $short, $long);
+} else {
+$content .= sprintf('%s', $href, 
$long ? $long : $short);
+}
 }
 $content .="";
 }

[PHP-DOC] cvs: phd /themes/php phpdotnet.php

2007-08-24 Thread Hannes Magnusson 
bjori   Fri Aug 24 09:11:23 2007 UTC

  Modified files:  
/phd/themes/php phpdotnet.php 
  Log:
  s are root containers
  
  
http://cvs.php.net/viewvc.cgi/phd/themes/php/phpdotnet.php?r1=1.8&r2=1.9&diff_format=u
Index: phd/themes/php/phpdotnet.php
diff -u phd/themes/php/phpdotnet.php:1.8 phd/themes/php/phpdotnet.php:1.9
--- phd/themes/php/phpdotnet.php:1.8Sun Aug 19 12:11:11 2007
+++ phd/themes/php/phpdotnet.phpFri Aug 24 09:11:23 2007
@@ -1,5 +1,5 @@
  'format_chunk',
 'sect5' => 'format_chunk',
 'section'   => 'format_chunk',
-'set'   => 'format_chunk',
+'set'   => 'format_root_chunk',
 'setindex'  => 'format_chunk',
 );
 protected $textmap =array(

[PHP-DOC] cvs: phd /themes/php phpdotnet.php

2007-08-19 Thread Hannes Magnusson 
bjori   Sun Aug 19 12:11:11 2007 UTC

  Modified files:  
/phd/themes/php phpdotnet.php 
  Log:
  Fix empty  elements (Reported by Nicolas)
  
  
http://cvs.php.net/viewvc.cgi/phd/themes/php/phpdotnet.php?r1=1.7&r2=1.8&diff_format=u
Index: phd/themes/php/phpdotnet.php
diff -u phd/themes/php/phpdotnet.php:1.7 phd/themes/php/phpdotnet.php:1.8
--- phd/themes/php/phpdotnet.php:1.7Sat Aug 18 22:49:00 2007
+++ phd/themes/php/phpdotnet.phpSun Aug 19 12:11:11 2007
@@ -1,5 +1,5 @@
 chunked ?
 $href : (isset($linkto) ? $linkto : $href),
 $class, $content . PhDHelper::getDescription($id, false));
+} elseif ($props["empty"]) {
+return sprintf('%s%2$s', 
$this->chunked ? "" : "#", $href, $fragment, $class, $content);
 } else {
 return sprintf('', $this->chunked 
? "" : "#", $href, $fragment, $class);
 }

[PHP-DOC] cvs: phd /themes/php phpdotnet.php

2007-08-18 Thread Hannes Magnusson 
bjori   Sat Aug 18 22:49:00 2007 UTC

  Modified files:  
/phd/themes/php phpdotnet.php 
  Log:
  Suppress the titleabbrev tag
  
  
http://cvs.php.net/viewvc.cgi/phd/themes/php/phpdotnet.php?r1=1.6&r2=1.7&diff_format=u
Index: phd/themes/php/phpdotnet.php
diff -u phd/themes/php/phpdotnet.php:1.6 phd/themes/php/phpdotnet.php:1.7
--- phd/themes/php/phpdotnet.php:1.6Sat Aug 18 18:53:46 2007
+++ phd/themes/php/phpdotnet.phpSat Aug 18 22:49:00 2007
@@ -1,11 +1,12 @@
  'format_suppressed_tags',
 'link'  => 'format_link',
 'refpurpose'=> 'format_refpurpose',
+'titleabbrev'   => 'format_suppressed_tags',
 'type'  => array(
 /* DEFAULT */  'format_suppressed_tags',
 'methodparam'   => false,
@@ -59,6 +60,7 @@
 'methodsynopsis'=> false,
 ),
 'refname'   => 'format_refname_text',
+'titleabbrev'   => 'format_suppressed_tags',
 );
 private   $versions = array();
 protected $chunked = true;

[PHP-DOC] cvs: phd /themes/php phpdotnet.php

2007-08-18 Thread Hannes Magnusson 
bjori   Sat Aug 18 18:53:47 2007 UTC

  Modified files:  
/phd/themes/php phpdotnet.php 
  Log:
  Fix  (thanks Nicolas!)
  
  
  
http://cvs.php.net/viewvc.cgi/phd/themes/php/phpdotnet.php?r1=1.5&r2=1.6&diff_format=u
Index: phd/themes/php/phpdotnet.php
diff -u phd/themes/php/phpdotnet.php:1.5 phd/themes/php/phpdotnet.php:1.6
--- phd/themes/php/phpdotnet.php:1.5Tue Aug 14 20:08:19 2007
+++ phd/themes/php/phpdotnet.phpSat Aug 18 18:53:46 2007
@@ -1,5 +1,5 @@
 %s',
+return sprintf('%s',
 $this->chunked ? "" : "#",
 $this->chunked ?
 $href : (isset($linkto) ? $linkto : $href),

[PHP-DOC] cvs: phd /themes/php phpdotnet.php

2007-08-14 Thread Hannes Magnusson 
bjori   Tue Aug 14 20:08:19 2007 UTC

  Modified files:  
/phd/themes/php phpdotnet.php 
  Log:
  Typo
  
  
http://cvs.php.net/viewvc.cgi/phd/themes/php/phpdotnet.php?r1=1.4&r2=1.5&diff_format=u
Index: phd/themes/php/phpdotnet.php
diff -u phd/themes/php/phpdotnet.php:1.4 phd/themes/php/phpdotnet.php:1.5
--- phd/themes/php/phpdotnet.php:1.4Tue Aug 14 17:51:13 2007
+++ phd/themes/php/phpdotnet.phpTue Aug 14 20:08:19 2007
@@ -1,5 +1,5 @@
  1) {
-$content = '';
 foreach($chunks as $chunkid => $junk) {
 $content .= sprintf('%s — 
%s', $this->chunked ? "" : "#", $chunkid, $this->ext, 
PhDHelper::getDescription($chunkid, false), PhDHelper::getDescription($chunkid, 
true));
 }

[PHP-DOC] cvs: phd /themes/php phpdotnet.php

2007-08-14 Thread Hannes Magnusson 
bjori   Tue Aug 14 17:51:13 2007 UTC

  Modified files:  
/phd/themes/php phpdotnet.php 
  Log:
  - The index page should also list its grandchildren
  - All "containers" (articles, chapters, sections, parts...) should list their 
childrens at the top
with the exception of reference pages
  
  
http://cvs.php.net/viewvc.cgi/phd/themes/php/phpdotnet.php?r1=1.3&r2=1.4&diff_format=u
Index: phd/themes/php/phpdotnet.php
diff -u phd/themes/php/phpdotnet.php:1.3 phd/themes/php/phpdotnet.php:1.4
--- phd/themes/php/phpdotnet.php:1.3Fri Aug 10 20:18:21 2007
+++ phd/themes/php/phpdotnet.phpTue Aug 14 17:51:13 2007
@@ -1,5 +1,5 @@
  'format_chunk',
 'part'  => 'format_chunk',
 ),
-'book'  => 'format_container_chunk',
+'book'  => 'format_root_chunk',
 'chapter'   => 'format_container_chunk',
 'colophon'  => 'format_chunk',
 'glossary'  => array(
@@ -157,27 +157,60 @@
 public function format_container_chunk($open, $name, $attrs) {
 $this->CURRENT_ID = $id = $attrs[PhDReader::XMLNS_XML]["id"];
 if ($open) {
-return "";
+$content = "";
+
+if ($name != "reference") {
+$chunks = PhDHelper::getChildren($id);
+$content .= '';
+foreach($chunks as $chunkid => $junk) {
+$content .= sprintf('%s', 
$this->chunked ? "" : "#", $chunkid, $this->ext, 
PhDHelper::getDescription($chunkid, true));
+}
+$content .= "\n";
+}
+return $content;
 }
-$chunks = PhDHelper::getChildren($id);
+
 $content = "";
-if (count($chunks) > 1) {
-$content = '';
-if ($name == "reference") {
+if ($name == "reference") {
+$chunks = PhDHelper::getChildren($id);
+if (count($chunks) > 1) {
+$content = '%s — 
%s', $this->chunked ? "" : "#", $chunkid, $this->ext, 
PhDHelper::getDescription($chunkid, false), PhDHelper::getDescription($chunkid, 
true));
 }
-} else {
-foreach($chunks as $chunkid => $junk) {
-$content .= sprintf('%s', 
$this->chunked ? "" : "#", $chunkid, $this->ext, 
PhDHelper::getDescription($chunkid, true));
-}
+$content .= "\n";
 }
-$content .= "\n";
 }
 $content .= "\n";
 
 return $content;
 }
+public function format_root_chunk($open, $name, $attrs) {
+$this->CURRENT_ID = $id = $attrs[PhDReader::XMLNS_XML]["id"];
+if ($open) {
+return "";
+}
+
+$chunks = PhDHelper::getChildren($id);
+$content = '';
+foreach($chunks as $chunkid => $junk) {
+$href = $this->chunked ? $chunkid .'.'. $this->ext : "#$chunkid";
+$content .= sprintf('%s', $href, 
PhDHelper::getDescription($chunkid, true));
+$children = PhDHelper::getChildren($chunkid);
+if (count($children)) {
+$content .= '';
+foreach(PhDHelper::getChildren($chunkid) as $childid => $junk) 
{
+$href = $this->chunked ? $childid .'.'. $this->ext : 
"#$childid";
+$content .= sprintf('%s', $href, 
PhDHelper::getDescription($childid, true));
+}
+$content .="";
+}
+$content .= "";
+}
+$content .= "";
+
+return $content;
+}
 
 public function format_suppressed_tags($open, $name) {
 /* ignore it */