svn: /phpdoc/doc-base/trunk/scripts/docgen/ docgen.php

From: Date: Tue, 01 Jun 2010 19:42:51 +0000
Subject: svn: /phpdoc/doc-base/trunk/scripts/docgen/ docgen.php
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-6772@lists.php.net to get a copy of this message
philip Tue, 01 Jun 2010 19:42:51 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=300071 Log: Removed some extra <para>'s, as per the updated doc skeletons Changed paths: U phpdoc/doc-base/trunk/scripts/docgen/docgen.php Modified: phpdoc/doc-base/trunk/scripts/docgen/docgen.php =================================================================== --- phpdoc/doc-base/trunk/scripts/docgen/docgen.php 2010-06-01 19:37:58 UTC (rev 300070) +++ phpdoc/doc-base/trunk/scripts/docgen/docgen.php 2010-06-01 19:42:51 UTC (rev 300071) @@ -281,22 +281,20 @@ if ($ident = get_ident_size('PARAMETERS_DESCRIPTION', $content)) { $count = 1; - $markup = "<para>\n"; - $markup .= str_repeat(' ', $ident + 1) ."<variablelist>\n"; + $markup = "<variablelist>\n"; foreach ($parameters as $param) { - $markup .= str_repeat(' ', $ident + 2) ."<varlistentry>\n"; - $markup .= str_repeat(' ', $ident + 3) .'<term><parameter>'. ($param->getName() ? $param->getName() : 'param'. $count) ."</parameter></term>\n"; - $markup .= str_repeat(' ', $ident + 3) ."<listitem>\n"; - $markup .= str_repeat(' ', $ident + 4) ."<para>\n"; - $markup .= str_repeat(' ', $ident + 5) ."\n"; - $markup .= str_repeat(' ', $ident + 4) ."</para>\n"; - $markup .= str_repeat(' ', $ident + 3) ."</listitem>\n"; - $markup .= str_repeat(' ', $ident + 2) ."</varlistentry>\n"; + $markup .= str_repeat(' ', $ident + 1) ."<varlistentry>\n"; + $markup .= str_repeat(' ', $ident + 2) .'<term><parameter>'. ($param->getName() ? $param->getName() : 'param'. $count) ."</parameter></term>\n"; + $markup .= str_repeat(' ', $ident + 2) ."<listitem>\n"; + $markup .= str_repeat(' ', $ident + 3) ."<para>\n"; + $markup .= str_repeat(' ', $ident + 4) ."\n"; + $markup .= str_repeat(' ', $ident + 3) ."</para>\n"; + $markup .= str_repeat(' ', $ident + 2) ."</listitem>\n"; + $markup .= str_repeat(' ', $ident + 1) ."</varlistentry>\n"; - $count++; + $count++; } - $markup .= str_repeat(' ', $ident + 1) ."</variablelist>\n"; - $markup .= str_repeat(' ', $ident) ."</para>"; + $markup .= str_repeat(' ', $ident) ."</variablelist>"; $content = preg_replace('/\{PARAMETERS_DESCRIPTION\}/', $markup, $content, 1); } @@ -920,11 +918,9 @@ $out = <<<ROLE <refsect1 role="seealso"> &reftitle.seealso; - <para> - <simplelist> - <member></member> - </simplelist> - </para> + <simplelist> + <member></member> + </simplelist> </refsect1> ROLE; } @@ -934,10 +930,9 @@ $out = <<<ROLE <refsect1 role="examples"> &reftitle.examples; - <para> - <example> - <title><function>$funcname</function> example</title> - <programlisting role="php"> + <example> + <title><function>$funcname</function> example</title> + <programlisting role="php"> <![CDATA[ <?php @@ -945,15 +940,14 @@ ?> ]]> - </programlisting> - &example.outputs.similar; - <screen> + </programlisting> + &example.outputs.similar; + <screen> <![CDATA[ ... ]]> - </screen> - </example> - </para> + </screen> + </example> </refsect1> ROLE; } @@ -963,42 +957,38 @@ $out = <<<ROLE <refsect1 role="examples"> &reftitle.examples; - <para> - <example> - <title>Object oriented style</title> - <programlisting role="php"> + <example> + <title>Object oriented style</title> + <programlisting role="php"> <![CDATA[ <?php /* ... */ ?> ]]> - </programlisting> - &example.outputs.similar; - <screen> + </programlisting> + &example.outputs.similar; + <screen> <![CDATA[ ... ]]> - </screen> - </example> - </para> - <para> - <example> - <title>Procedural style</title> - <programlisting role="php"> + </screen> + </example> + <example> + <title>Procedural style</title> + <programlisting role="php"> <![CDATA[ <?php /* ... */ ?> ]]> - </programlisting> - &example.outputs.similar; - <screen> + </programlisting> + &example.outputs.similar; + <screen> <![CDATA[ ... ]]> - </screen> - </example> - </para> + </screen> + </example> </refsect1> ROLE; }

« previous php.doc.cvs (#6772) next »