svn: /phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/ docgen.php

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn: /phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/ docgen.php

Justin Martin-5
frozenfire                               Sat, 26 Feb 2011 19:36:47 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=308711

Log:
Fixed inheritance issue for fields, which had caused the list of fields to include all parent fields as well.

Changed paths:
    U   phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/docgen.php

Modified: phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/docgen.php
===================================================================
--- phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/docgen.php 2011-02-26 19:08:55 UTC (rev 308710)
+++ phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/docgen.php 2011-02-26 19:36:47 UTC (rev 308711)
@@ -634,9 +634,10 @@

    $markup = "<classsynopsisinfo role=\"comment\">Fields</classsynopsisinfo>\n";
  foreach ($gtkfields as $field) {
+ if(strcasecmp($field->owner_type->name, $id) !== 0) continue;
  $markup .= str_repeat(' ', $ident) ."<fieldsynopsis>\n";
  $markup .= str_repeat(' ', $ident + 1) .'<modifier>'. $field->value_type->name ."</modifier>\n";
- $markup .= str_repeat(' ', $ident + 1) .'<varname linkend="'. $id .'.fields.'. format_id($field->name) .'">'. $field->name ."</varname>\n";
+ $markup .= str_repeat(' ', $ident + 1) .'<varname linkend="'. format_id($field->owner_type->name) .'.fields.'. format_id($field->name) .'">'. $field->name ."</varname>\n";
  $markup .= str_repeat(' ', $ident) ."</fieldsynopsis>\n";
  }

@@ -655,12 +656,13 @@
  $markup .= str_repeat(' ', $ident + 1) ."<variablelist>\n";

  foreach ($gtkfields as $field) {
- $markup .= str_repeat(' ', $ident + 2) .'<varlistentry xml:id="'. $id .'.fields.'. format_id($field->name) ."\">\n";
+ if(strcasecmp($field->owner_type_name, $id) !== 0) continue;
+ $markup .= str_repeat(' ', $ident + 2) .'<varlistentry xml:id="'. format_id($field->owner_type->name) .'.fields.'. format_id($field->name) ."\">\n";
  $markup .= str_repeat(' ', $ident + 3) .'<term><varname>'. $field->name ."</varname></term>\n";
-     $markup .= str_repeat(' ', $ident + 3) ."<listitem>\n";
-       $markup .= str_repeat(' ', $ident + 4) ."<para></para>\n";
-     $markup .= str_repeat(' ', $ident + 3) ."</listitem>\n";
-     $markup .= str_repeat(' ', $ident + 2) ."</varlistentry>\n";
+     $markup .= str_repeat(' ', $ident + 3) ."<listitem>\n";
+       $markup .= str_repeat(' ', $ident + 4) ."<para></para>\n";
+     $markup .= str_repeat(' ', $ident + 3) ."</listitem>\n";
+     $markup .= str_repeat(' ', $ident + 2) ."</varlistentry>\n";
  }

  $markup .= str_repeat(' ', $ident + 1) ."</variablelist>\n";


--
PHP-GTK Documentation Mailing List (http://gtk.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php