svn: /pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/ examples/worksheet-setMerge.php spreadsheet-excel-writer-format/setmerge.xml spreadsheet-excel-writer-worksheet/setmerge.xml

cweiske                                  Thu, 15 Oct 2009 17:11:56 +0000

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

Log:
Fix bug #5403: function argument descriptions inadequate

Bug: http://pear.php.net/bugs/5403 (unknown) 
      
Changed paths:
    A   pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/examples/
    A   pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/examples/worksheet-setMerge.php
    U   pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/spreadsheet-excel-writer-format/setmerge.xml
    U   pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/spreadsheet-excel-writer-worksheet/setmerge.xml

Added: pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/examples/worksheet-setMerge.php
===================================================================
--- pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/examples/worksheet-setMerge.php	                        (rev 0)
+++ pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/examples/worksheet-setMerge.php	2009-10-15 17:11:56 UTC (rev 289675)
@@ -0,0 +1,17 @@
+<?php
+require_once 'Spreadsheet/Excel/Writer.php';
+
+$workbook  = new Spreadsheet_Excel_Writer();
+$worksheet = $workbook->addWorksheet('SetMerge');
+
+// Sets the color of a cell's content
+$format = $workbook->addFormat();
+$format->setFgColor(10);
+$worksheet->write(0, 0, 'Cell Start', $format);
+
+// Merge cells from row 0, col 0 to row 2, col 2
+$worksheet->setMerge(0, 0, 2, 2);
+
+$workbook->send('SetMerge.xls');
+$workbook->close();
+?>
\ No newline at end of file

Modified: pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/spreadsheet-excel-writer-format/setmerge.xml
===================================================================
--- pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/spreadsheet-excel-writer-format/setmerge.xml	2009-10-15 16:58:21 UTC (rev 289674)
+++ pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/spreadsheet-excel-writer-format/setmerge.xml	2009-10-15 17:11:56 UTC (rev 289675)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" version="lillet" xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-format.setmerge">
+<refentry xmlns="http://docbook.org/ns/docbook"
+ version="lillet"
+ xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-format.setmerge"
+>
    <refnamediv>
     <refname>Format::setMerge</refname>
     <refpurpose>This is an alias for the unintuitive setAlign('merge')</refpurpose>
@@ -11,13 +14,11 @@
      </funcsynopsisinfo>
      <funcprototype>
       <funcdef>void <function>Format::setMerge</function></funcdef>
-
-
       <paramdef choice="req"/>
-
      </funcprototype>
     </funcsynopsis>
    </refsynopsisdiv>
+
    <refsection xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-format.setmerge.desc">
     &title.desc;
     <para>
@@ -26,26 +27,11 @@
    </refsection>


-
-
    <refsection xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-format.setmerge.note">
     &title.note;
-
     &note.notstatic;

-
-
-  <simpara/>
+    <simpara/>
    </refsection>

-   <refsection xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-format.setmerge.example">
-    &title.example;
-    <example><info><title>Using <function>setMerge</function></title></info>
-
-      <programlisting role="php">
-     <![CDATA[
-]]>
-     </programlisting>
-    </example>
-   </refsection>
-  </refentry>
+</refentry>

Modified: pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/spreadsheet-excel-writer-worksheet/setmerge.xml
===================================================================
--- pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/spreadsheet-excel-writer-worksheet/setmerge.xml	2009-10-15 16:58:21 UTC (rev 289674)
+++ pear/peardoc/trunk/en/package/fileformats/spreadsheet-excel-writer/spreadsheet-excel-writer-worksheet/setmerge.xml	2009-10-15 17:11:56 UTC (rev 289675)
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" version="lillet" xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-worksheet.setmerge">
+<refentry xmlns="http://docbook.org/ns/docbook"
+ version="lillet"
+ xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-worksheet.setmerge"
+>
    <refnamediv>
     <refname>Worksheet::setMerge</refname>
     <refpurpose>Sets a merged cell range</refpurpose>
    </refnamediv>
+
    <refsynopsisdiv>
     <funcsynopsis>
      <funcsynopsisinfo>
@@ -17,12 +21,13 @@
       <paramdef choice="req">integer <parameter>$last_col</parameter></paramdef>
      </funcprototype>
     </funcsynopsis>
-    </refsynopsisdiv>
+   </refsynopsisdiv>

-    <refsection xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-worksheet.setmerge.desc">
+   <refsection xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-worksheet.setmerge.desc">
      &title.desc;
      &notdocumented;
-    </refsection>
+   </refsection>
+
    <refsection xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-worksheet.setmerge.param">
     &title.param;
     <para>
@@ -88,14 +93,32 @@
      </variablelist>
     </para>
    </refsection>
+
    <refsection xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-worksheet.setmerge.throws">
     &title.throws;
         <para>
       <emphasis>throws</emphasis> no exceptions thrown
     </para>
-       </refsection>
+   </refsection>
    <refsection xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-worksheet.setmerge.note">
     &title.note;
     &note.notstatic;
    </refsection>
+
+
+   <refsection xml:id="package.fileformats.spreadsheet-excel-writer.spreadsheet-excel-writer-worksheet.setmerge.example">
+    &title.example;
+    <example>
+     <info><title>Using <function>setMerge</function></title></info>
+     <programlisting role="php">
+       <xi:include parse="text"
+                   xmlns:xi="http://www.w3.org/2001/XInclude"
+                   href="&package.fileformats.spreadsheet-excel-writer.examples.worksheet-setMerge.php;"
+       >
+         <xi:fallback>FIXME:MISSING XINCLUDE CONTENT</xi:fallback>
+       </xi:include>
+     </programlisting>
+    </example>
+   </refsection>
+
 </refentry>