[Octave-cvsupdate] SF.net SVN: octave:[9679] trunk/octave-forge/main/io/inst

[<prn...@us...>]

Revision: 9679
          http://octave.svn.sourceforge.net/octave/?rev=9679&view=rev
Author:   prnienhuis
Date:     2012-02-25 15:59:51 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Updated help texts

Modified Paths:
--------------
    trunk/octave-forge/main/io/inst/odsfinfo.m
    trunk/octave-forge/main/io/inst/odsopen.m
    trunk/octave-forge/main/io/inst/odswrite.m
    trunk/octave-forge/main/io/inst/xls2oct.m
    trunk/octave-forge/main/io/inst/xlsfinfo.m
    trunk/octave-forge/main/io/inst/xlsopen.m
    trunk/octave-forge/main/io/inst/xlsread.m
    trunk/octave-forge/main/io/inst/xlswrite.m

Modified: trunk/octave-forge/main/io/inst/odsfinfo.m
===================================================================
--- trunk/octave-forge/main/io/inst/odsfinfo.m	2012-02-24 20:52:30 UTC (rev 9678)
+++ trunk/octave-forge/main/io/inst/odsfinfo.m	2012-02-25 15:59:51 UTC (rev 9679)
@@ -38,7 +38,7 @@
 ## spreadsheet has to be parsed to get the sheet names, let alone exploring
 ## used data ranges.
 ##
-## By specifying a value of 'jod' or 'otk' for @var{reqintf} the automatic
+## By specifying a value of 'jod', 'otk' or 'uno' for @var{reqintf} the automatic
 ## selection of the java interface is bypassed and the specified interface
 ## will be used (if at all present).
 ##

Modified: trunk/octave-forge/main/io/inst/odsopen.m
===================================================================
--- trunk/octave-forge/main/io/inst/odsopen.m	2012-02-24 20:52:30 UTC (rev 9678)
+++ trunk/octave-forge/main/io/inst/odsopen.m	2012-02-25 15:59:51 UTC (rev 9679)
@@ -26,7 +26,7 @@
 ## To make this function work at all, you need the Java package >= 1.2.5 plus
 ## ODFtoolkit (version 0.7.5 or 0.8.6) & xercesImpl, and/or jOpenDocument, and/or
 ## OpenOffice.org (or clones) installed on your computer + proper javaclasspath
-## set. These interfaces are referred to as OTK, JOD, adn UNO resp., and are
+## set. These interfaces are referred to as OTK, JOD, and UNO resp., and are
 ## preferred in that order by default (depending on their presence).
 ## For (currently experimental) UNO support, Octave-Java package 1.2.8 + latest
 ## fixes is imperative; furthermore the relevant classes had best be added to

Modified: trunk/octave-forge/main/io/inst/odswrite.m
===================================================================
--- trunk/octave-forge/main/io/inst/odswrite.m	2012-02-24 20:52:30 UTC (rev 9678)
+++ trunk/octave-forge/main/io/inst/odswrite.m	2012-02-25 15:59:51 UTC (rev 9679)
@@ -57,7 +57,8 @@
 ##
 ## The optional last argument @var{reqintf} can be used to override 
 ## the automatic selection by odswrite of one interface out of the
-## supported ones: Java/ODFtooolkit ('OTK'), or Java/jOpenDocument ('JOD').
+## supported ones: Java/ODFtooolkit ('OTK'), Java/jOpenDocument ('JOD'),
+## or Java/OpenOffice.org ('UNO').
 ##
 ## odswrite is a mere wrapper for various scripts which find out what
 ## ODS interface to use (ODF toolkit or jOpenDocument) plus code to mimic

Modified: trunk/octave-forge/main/io/inst/xls2oct.m
===================================================================
--- trunk/octave-forge/main/io/inst/xls2oct.m	2012-02-24 20:52:30 UTC (rev 9678)
+++ trunk/octave-forge/main/io/inst/xls2oct.m	2012-02-25 15:59:51 UTC (rev 9679)
@@ -72,7 +72,7 @@
 ## Be aware that Excel trims @var{rawarr} from empty outer rows & columns, 
 ## so any returned cell array may turn out to be smaller than requested
 ## in @var{range}.
-## When using COM or POI interface, formulas in cells are evaluated; if
+## When using COM, POI, or UNO interface, formulas in cells are evaluated; if
 ## that fails cached values are retrieved. These may be outdated 
 ## depending on Excel's "Automatic calculation" settings when the
 ## spreadsheet was saved.

Modified: trunk/octave-forge/main/io/inst/xlsfinfo.m
===================================================================
--- trunk/octave-forge/main/io/inst/xlsfinfo.m	2012-02-24 20:52:30 UTC (rev 9678)
+++ trunk/octave-forge/main/io/inst/xlsfinfo.m	2012-02-25 15:59:51 UTC (rev 9679)
@@ -35,10 +35,10 @@
 ## string) unless @var{filename} is a readable Excel 97-2003 .xls file or
 ## an Excel 2007 .xlsx / .xlsb file in which case @var{fformat} is set to
 ## "xlWorkbookNormal". Excel 95 .xls files can only be read through the JXL
-## (JExcelAPI) java-based interface.
+## (JExcelAPI) or UNO (OpenOffice.org) Java-based interfaces.
 ##
 ## If no return arguments are specified the sheet names are echoed to the 
-## terminal screen; in case of java interfaces for each sheet the actual
+## terminal screen; in case of Java interfaces for each sheet the actual
 ## occupied data range is echoed as well. The occupied cell range will have
 ## to be determined behind the scenes first; this can take some time for the
 ## Java-based interfaces.
@@ -48,8 +48,9 @@
 ## cell ranges in each worksheet using a java-based interface (the COM / ActiveX
 ## interface can't supply this information).
 ##
-## For use on OOXML spreadsheets one needs full POI support (see xlsopen) and
-## 'poi' needs to be specified for @var{reqintf}. For Excel 95 file use 'jxl'.
+## For use on OOXML spreadsheets one needs full POI and/or UNO support (see
+## xlsopen) and 'poi' or 'uno' needs to be specified for @var{reqintf}. For
+## Excel 95 file use 'jxl' or 'uno'.
 ##
 ## Examples:
 ##

Modified: trunk/octave-forge/main/io/inst/xlsopen.m
===================================================================
--- trunk/octave-forge/main/io/inst/xlsopen.m	2012-02-24 20:52:30 UTC (rev 9678)
+++ trunk/octave-forge/main/io/inst/xlsopen.m	2012-02-25 15:59:51 UTC (rev 9679)
@@ -34,6 +34,7 @@
 ## following jars in your javaclasspath: poi-ooxml-schemas-3.5.jar,
 ## xbean.jar and dom4j-1.6.1.jar (or later versions). Later OpenOffice.org
 ## versions (UNO) have support for OOXML as well.
+## Excel'95 spreadsheets can only be read by JExcelAPI and OpenOffice.org.
 ##
 ## @var{filename} should be a valid .xls or xlsx Excel file name (including
 ## extension). But if you use the COM interface you can specify any extension

Modified: trunk/octave-forge/main/io/inst/xlsread.m
===================================================================
--- trunk/octave-forge/main/io/inst/xlsread.m	2012-02-24 20:52:30 UTC (rev 9678)
+++ trunk/octave-forge/main/io/inst/xlsread.m	2012-02-25 15:59:51 UTC (rev 9679)
@@ -74,9 +74,9 @@
 ## the automatic selection by xlsread of one interface out of the
 ## supported ones: COM/Excel, Java/Apache POI, or Java/JExcelAPI
 ## (in that built-in order of preference).
-## For reading from OOXML files a value of 'poi' must be specified
+## For reading from OOXML files a value of 'poi' or 'uno' must be specified
 ## for @var{reqintf} (see help for xlsopen); for Excel'95 files use
-## 'com', or if Excel is not installed use 'jxl' or 'basic' (POI
+## 'com', or if Excel is not installed use 'jxl', 'basic', or 'uno' (POI
 ## can't read Excel 95 but will try to fall back to JXL).
 ## As @var{reqintf} can also be a cell array of strings, one can
 ## select or exclude one or more interfaces.

Modified: trunk/octave-forge/main/io/inst/xlswrite.m
===================================================================
--- trunk/octave-forge/main/io/inst/xlswrite.m	2012-02-24 20:52:30 UTC (rev 9678)
+++ trunk/octave-forge/main/io/inst/xlswrite.m	2012-02-25 15:59:51 UTC (rev 9679)
@@ -62,9 +62,12 @@
 ##
 ## The optional last argument @var{reqintf} can be used to override 
 ## the automatic selection by xlswrite of one interface out of the
-## supported ones: COM/Excel, Java/Apache POI, or Java/JExcelAPI.
-## For writing to OOXML files (.xlsx) a value of 'poi' (case-insensitive)
-## must be specified for @var{reqintf}.
+## supported ones: 'com' (ActiveX/Excel), 'poi' (Java/Apache POI), 'jxl'
+## (Java/JExcelAPI), or 'uno' (Java/OpenOffice.org). 'oxs' (Java/OpenXLS)
+## is implemented but disabled for writing. For writing to OOXML files
+## (.xlsx) a value of 'poi' or 'uno' must be specified for @var{reqintf}.
+## The value of @var{reqintf} is case-insensitive. Multiple interfaces
+## can be selected if entered as a cell array of strings.
 ##
 ## xlswrite is a mere wrapper for various scripts which find out what
 ## Excel interface to use (COM, Java/POI) plus code to mimic the other

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.