Merge pull request #1920 from Maks3w/hotfix/docbook-to-rst

[Doc2Rst] Add missing blankline and exclude nested block elements when wrapping paragraphs
zendframework · Jul 19, 2012 · 1649232 · 1649232
2 parents 47e00c7 + a51d940
commit 1649232
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/bin/doc2rst.php b/bin/doc2rst.php
@@ -164,7 +164,17 @@ public static function removeIndent($indent)
      */
     public static function wrap($text)
     {
-        return wordwrap($text, 115 - self::$indentation);
+        $output = '';
+        foreach (explode("\n", $text) as $line) {
+            if (substr($line, 0, 1) != ' ') {
+                $output .= wordwrap($line, 115 - self::$indentation);
+            } else {
+                $output .= $line;
+            }
+            $output .= "\n";
+        }
+
+        return substr($output, 0, -1);
     }
 
     /**

diff --git a/bin/doc2rst.xsl b/bin/doc2rst.xsl
@@ -246,6 +246,11 @@
     <xsl:template match="//doc:varlistentry/doc:listitem" priority="1">
         <xsl:apply-templates mode="indent"/>
     </xsl:template>
+    <!-- varlistentry/listitem/methodsynopsys -->
+    <xsl:template match="//doc:varlistentry/doc:listitem/doc:methodsynopsis" priority="1">
+        <xsl:call-template name="methodsynopsis"/>
+        <xsl:text>&#xA;</xsl:text>
+    </xsl:template>
 
     <!--
     #################