SVN commit 582676 by martin:

Update filter info:
 * more s/filter/supported file format/
 * improve information on PDF export
 * add filter info for KOffice 1.6 beta, noting:
   * PDF import for krita
   * improved PNG support

Doesn't include updates for filter info
on developer pages.


 M  +1 -1      branches/koffice/1.5/koffice/filters/filterstatus.xml  
 M  +7 -1      branches/koffice/1.6/koffice/filters/filterstatus.xml  
 M  +7 -1      trunk/koffice/filters/filterstatus.xml  
 M  +1 -1      trunk/www/areas/koffice/filters/1.4/kofficeversion.inc  
 M  +21 -3     trunk/www/areas/koffice/filters/1.5/index.php  
 M  +1 -1      trunk/www/areas/koffice/filters/1.5/kofficeversion.inc  
 A             trunk/www/areas/koffice/filters/1.6 (directory)   trunk/www/areas/koffice/filters/1.5#582641
 A             trunk/www/areas/koffice/filters/1.6/index.php   trunk/www/areas/koffice/filters/1.5/index.php#582675
 A             trunk/www/areas/koffice/filters/1.6/kexi (directory)   trunk/www/areas/koffice/filters/1.5/kexi#582675
 A             trunk/www/areas/koffice/filters/1.6/kofficeversion.inc   trunk/www/areas/koffice/filters/1.5/kofficeversion.inc#582675
 A             trunk/www/areas/koffice/filters/1.6/kword (directory)   trunk/www/areas/koffice/filters/1.5/kword#582675
 AM            trunk/www/areas/koffice/filters/images/pdf.png  
 M  +19 -3     trunk/www/areas/koffice/filters/index.php  
 M  +2 -2      trunk/www/areas/koffice/filters/menu.inc  
 M  +26 -2     trunk/www/areas/koffice/filters/scripts/FilterStatusStablePhp.xslt  
 M  +1 -1      trunk/www/areas/koffice/menu.inc  


--- branches/koffice/1.5/koffice/filters/filterstatus.xml #582675:582676
@@ -387,7 +387,7 @@
                 <title xml:lang="en_us">OpenEXR</title>
                 <note xml:lang="en_us">
                 &lt;a href="http://www.openexr.com/"&gt;OpenEXR&lt;/a&gt; is a high dynamic-range (HDR) format &lt;br /&gt; 
-                developed by &lt;a href="http://www.ilm.com"&gt;Industrial Light &amp; Magic&lt;/a&gt;
+                developed by &lt;a href="http://www.ilm.com"&gt;Industrial Light &amp;amp; Magic&lt;/a&gt;
                 </note>
                 <stat import="fourstars" export="fourstars"/>
             </filter>
--- branches/koffice/1.6/koffice/filters/filterstatus.xml #582675:582676
@@ -375,7 +375,7 @@
             <filter id="krita_tiff">
                 <websvn importsuffix="#import" exportsuffix="#export" path="koffice/filters/krita/tiff"/>
                 <title xml:lang="en_us">TIFF</title>
-                <stat import="threestars" export="threestars"/>
+                <stat import="fivestars" export="fivestarts"/>
             </filter>
             <filter id="krita_raw">
                 <websvn importsuffix="#import" exportsuffix="#export" path="koffice/filters/krita/raw"/>
@@ -391,6 +391,12 @@
                 </note>
                 <stat import="fourstars" export="fourstars"/>
             </filter>
+            <filter id="krita_pdf">
+                <websvn importsuffix="#import" exportsuffix="#export" path="koffice/filters/krita/pdf"/>
+                <title xml:lang="en_us">PDF</title>
+                <note xml:lang="en_us">Portable Document Format</note>
+                <stat import="threestars" export="threestars"/>
+            </filter>
             <filter id="krita_xcf">
                 <websvn importsuffix="#import" exportsuffix="#export" path="koffice/filters/krita/xcf"/>
                 <title xml:lang="en_us">Gimp (XCF)</title>
--- trunk/koffice/filters/filterstatus.xml #582675:582676
@@ -375,7 +375,7 @@
             <filter id="krita_tiff">
                 <websvn importsuffix="#import" exportsuffix="#export" path="koffice/filters/krita/tiff"/>
                 <title xml:lang="en_us">TIFF</title>
-                <stat import="threestars" export="threestars"/>
+                <stat import="fivestars" export="fivestarts"/>
             </filter>
             <filter id="krita_raw">
                 <websvn importsuffix="#import" exportsuffix="#export" path="koffice/filters/krita/raw"/>
@@ -391,6 +391,12 @@
                 </note>
                 <stat import="fourstars" export="fourstars"/>
             </filter>
+            <filter id="krita_pdf">
+                <websvn importsuffix="#import" exportsuffix="#export" path="koffice/filters/krita/pdf"/>
+                <title xml:lang="en_us">PDF</title>
+                <note xml:lang="en_us">Portable Document Format</note>
+                <stat import="threestars" export="threestars"/>
+            </filter>
             <filter id="krita_xcf">
                 <websvn importsuffix="#import" exportsuffix="#export" path="koffice/filters/krita/xcf"/>
                 <title xml:lang="en_us">Gimp (XCF)</title>
--- trunk/www/areas/koffice/filters/1.4/kofficeversion.inc #582675:582676
@@ -1,4 +1,4 @@
 <?php
-    $page_title="KOffice Filters Status (KOffice 1.4 branch)";
+    $page_title="Supported File Formats (KOffice 1.4)";
     $kofficeversiondescription="the KOffice 1.4 branch";
 ?>
--- trunk/www/areas/koffice/filters/1.5/index.php #582675:582676
@@ -5,7 +5,7 @@
   include("header.inc");
 ?><div>
 <!--Do not modify! This file was generated -->
-  <h2>Which filters are there?</h2>
+  <h2>Which file formats are supported by KOffice?</h2>
   <p>Many KOffice applications support the filter architecture
  (i.e.: they are able to use filters for file conversion.) The filters are not perfect
  and some not even done. The status of the current filters is listed below, sorted per
@@ -103,9 +103,11 @@
       <td width="30%" align="left" valign="top">
         <a href="kword/pdf.php">PDF</a>
       </td>
-      <td width="50%" align="left" valign="top">Portable Document Format: All KOffice applications can export to PDF: use File/Print</td>
+      <td width="50%" align="left" valign="top">Portable Document Format</td>
       <td width="10%" align="center" valign="top">***</td>
-      <td width="10%" align="center" valign="top">***</td>
+      <td width="10%" align="center" valign="top">
+        Yes&nbsp;<a href="#pdfexport">(see&nbsp;below)</a>
+      </td>
     </tr>
     <tr>
       <td width="30%" align="left" valign="top">
@@ -496,6 +498,22 @@
       <td valign="top">The status of this filter is unknown, as its development has been abandoned.</td>
     </tr>
   </table>
+  <h2>
+    <a name="pdfexport">PDF Export</a>
+  </h2>
+  <p>All KOffice applications can export (create) PDF files.  The
+ process for exporting to PDF is the same as in most other KDE
+ applications:</p>
+  <ul>
+    <li>Select <em>File-&gt;Print</em> from the menu;</li>
+    <li>In the <em>Printer Name</em> box, choose the <em>Print to File
+   (PDF)</em> option (illustrated below);
+     <img src="../images/pdf.png"/></li>
+    <li>Enter a file name in the <em>Location</em> box (or use the
+     button next to the <em>Location</em> field for a standard file
+     window;</li>
+    <li>Click <em>Print.</em></li>
+  </ul>
   <h2>Joining the developers</h2>
   <p>There are many filters that we would like and many filters that need improvement, although sadly we do not have enough developers working on KOffice.</p>
   <p>Would <em>you</em> like to <a href="mailto:koffice@kde.org">join the development team</a> and help us?</p>
--- trunk/www/areas/koffice/filters/1.5/kofficeversion.inc #582675:582676
@@ -1,4 +1,4 @@
 <?php
-    $page_title="KOffice Filters Status (KOffice 1.5 branch)";
+    $page_title="Supported File Formats (KOffice 1.5)";
     $kofficeversiondescription="the KOffice 1.5 branch";
 ?>
** trunk/www/areas/koffice/filters/images/pdf.png #property svn:mime-type
   + application/octet-stream
--- trunk/www/areas/koffice/filters/index.php #582675:582676
@@ -1,12 +1,16 @@
 <?php
-    $page_title="KOffice Export/Import Filters";
+    $page_title="Supported File Formats";
     $site_root = '../';
     include("koffice.inc");
     include("header.inc");
 ?>
 
-    <p>Welcome to the KOffice Filter Information Page.</p>
+    <p>These pages provide information about which file formats are
+    supported by KOffice.  They also provide an indication of the
+    extent to which each format is supported.</p>
 
+    <p>Support for file formats is provided by <em>filters</em>.</p>
+
     <h2>About Filters</h2>
     
     <p>Filters are used to convert documents from one <em>file format</em> into
@@ -28,7 +32,7 @@
        For more information on which file formats KOffice supports, see the 
        filter status for recent versions of KOffice below.</p>
    
-    <h2>Current (stable) versions</h2>
+    <h2>Current release: KOffice 1.5</h2>
     
     <p>This information pertains to the currently released stable
     version of KOffice.</p>
@@ -37,6 +41,18 @@
       <li><a href="1.5/">Filter status of KOffice 1.5</a></li>
      </ul>
 
+    <h2>Forthcoming release: KOffice 1.6</h2>
+
+    <p>This information pertains to
+    the <a href="../announcements/announce-1.6-beta1.php">beta
+    version</a> of KOffice, due to be released as KOffice 1.6 in
+    October 2006.  The information here is for guidance only: it may
+    be inaccurate and is subject to change.</p>
+
+     <ul>
+      <li><a href="1.6/">Filter status of KOffice 1.6 (beta)</a></li>
+     </ul>
+
     <h2>Old versions</h2>
     
      <ul>
--- trunk/www/areas/koffice/filters/menu.inc #582675:582676
@@ -1,4 +1,4 @@
 <?php
-$this->appendLink("Filter 1.5 Status", "1.5");
-$this->appendLink("Filter 1.4 Status", "1.4");
+$this->appendLink("KOffice 1.5", "1.5");
+$this->appendLink("KOffice 1.6 (beta)", "1.6");
 ?>
--- trunk/www/areas/koffice/filters/scripts/FilterStatusStablePhp.xslt #582675:582676
@@ -12,7 +12,7 @@
 
 <xsl:comment>Do not modify! This file was generated <!-- Don't panic! This is the source--></xsl:comment>
 
- <h2>Which filters are there?</h2>
+ <h2>Which file formats are supported by KOffice?</h2>
  <p>Many KOffice applications support the filter architecture
  (i.e.: they are able to use filters for file conversion.) The filters are not perfect
  and some not even done. The status of the current filters is listed below, sorted per
@@ -81,7 +81,16 @@
    <xsl:value-of select="/filters/status[@id=$import]/@symbol"/>
  </td>
  <td width="10%" align="center" valign="top">
-   <xsl:value-of select="/filters/status[@id=$export]/@symbol"/>
+   <xsl:choose>
+    <xsl:when test="title='PDF'">
+      <xsl:text disable-output-escaping="yes"><![CDATA[
+        Yes&nbsp;<a href="#pdfexport">(see&nbsp;below)</a>]]>
+      </xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="/filters/status[@id=$export]/@symbol"/>
+    </xsl:otherwise>
+   </xsl:choose>
  </td>
  </tr>
  </xsl:for-each>
@@ -102,6 +111,21 @@
 </xsl:for-each>
 </table>
 
+ <h2><a name="pdfexport">PDF Export</a></h2>
+ <p>All KOffice applications can export (create) PDF files.  The
+ process for exporting to PDF is the same as in most other KDE
+ applications:</p>
+ <ul>
+   <li>Select <em>File->Print</em> from the menu;</li>
+   <li>In the <em>Printer Name</em> box, choose the <em>Print to File
+   (PDF)</em> option (illustrated below);
+     <img src="../images/pdf.png" /></li>
+   <li>Enter a file name in the <em>Location</em> box (or use the
+     button next to the <em>Location</em> field for a standard file
+     window;</li>
+   <li>Click <em>Print.</em></li>
+ </ul>
+
 <h2>Joining the developers</h2>
 <p>There are many filters that we would like and many filters that need improvement, although sadly we do not have enough developers working on KOffice.</p>
 <p>Would <em>you</em> like to <a href="mailto:koffice@kde.org">join the development team</a> and help us?</p>
--- trunk/www/areas/koffice/menu.inc #582675:582676
@@ -32,7 +32,7 @@
 $section->appendDir("KChart", "kchart");
 $section->appendDir("KFormula", "kformula");
 $section->appendDir("Kugar", "kugar");
-$section->appendDir("Import/Export Filters", "filters");
+$section->appendDir("Supported File Formats", "filters");
 
 $section =& $this->appendSection("Documentation");
 $section->appendLink("KOffice $currentversion", "http://docs.kde.org/stable/en/koffice/", false);