From: <prn...@us...> - 2012-09-07 14:11:58
|
Revision: 10971 http://octave.svn.sourceforge.net/octave/?rev=10971&view=rev Author: prnienhuis Date: 2012-09-07 14:11:47 +0000 (Fri, 07 Sep 2012) Log Message: ----------- CRLF to LF Modified Paths: -------------- trunk/octave-forge/main/io/INDEX trunk/octave-forge/main/io/PKG_ADD trunk/octave-forge/main/io/PKG_DEL Modified: trunk/octave-forge/main/io/INDEX =================================================================== --- trunk/octave-forge/main/io/INDEX 2012-09-07 12:58:28 UTC (rev 10970) +++ trunk/octave-forge/main/io/INDEX 2012-09-07 14:11:47 UTC (rev 10971) @@ -1,44 +1,45 @@ -io >> Input from and output to external formats -File I/O - append_save - fexist -Miscellaneous conversion functions - object2json - pch2mat -CSV file functions - csv2cell - csvconcat - csvexplode - cell2csv -XML I/O - xmlread - xmlwrite -Spreadsheet I/O user functions for MS-Excel - oct2xls - xls2oct - xlsclose - xlsfinfo - xlsopen - xlsread - xlswrite -Spreadsheet I/O user functions for OpenOffice.org Calc - oct2ods - ods2oct - odsclose - odsfinfo - odsopen - odsread - odswrite -Spreadsheet utility functions - calccelladdress - chk_spreadsheet_support - parsecell -Spreadsheet I/O internal functions - getusedrange - parse_sp_range - spsh_chkrange - spsh_prstype -Spreadsheet function test scripts - io_xls_testscript - io_ods_testscript - +io >> Input from and output to external formats + File I/O + append_save + fexist + Miscellaneous conversion functions + object2json + pch2mat + CSV file functions + csv2cell + csvconcat + csvexplode + cell2csv + XML I/O + xmlread + xmlwrite + Spreadsheet I/O user functions for MS-Excel + oct2xls + xls2oct + xlsclose + xlsfinfo + xlsopen + xlsread + xlswrite + Spreadsheet I/O user functions for OpenOffice.org Calc + oct2ods + ods2oct + odsclose + odsfinfo + odsopen + odsread + odswrite + Spreadsheet utility functions + calccelladdress + chk_spreadsheet_support + parsecell + Spreadsheet I/O internal functions + getusedrange + parse_sp_range + spsh_chkrange + spsh_prstype + Spreadsheet function test scripts + io_xls_testscript + io_ods_testscript + + \ No newline at end of file Modified: trunk/octave-forge/main/io/PKG_ADD =================================================================== --- trunk/octave-forge/main/io/PKG_ADD 2012-09-07 12:58:28 UTC (rev 10970) +++ trunk/octave-forge/main/io/PKG_ADD 2012-09-07 14:11:47 UTC (rev 10971) @@ -1,16 +1,17 @@ -## PKG_ADD -## add paths of io pkg java jars if java pkg is installed and loaded -pkglist = pkg ("list"); -javapkgind = find (cellfun (@(x) strcmp(x.name, "java"), pkglist), 1, "first"); -if (! isempty (javapkgind)) - javapkg = pkglist{javapkgind}; - if (javapkg.loaded) - # Assume jar files are in /lib/java and let chk_spreadsheet_support sort it out - libdir = octave_config_info ("libdir"); - ## Allow time for package to be fully loaded - pause (0.25); - spr_status = chk_spreadsheet_support ([ libdir filesep "java" ]); - endif -endif -## Clean up -clear javapkgind javapkg libdir spr_status pkglist ; \ No newline at end of file +## PKG_ADD + ## add paths of io pkg java jars if java pkg is installed and loaded + pkglist = pkg ("list"); + javapkgind = find (cellfun (@(x) strcmp(x.name, "java"), pkglist), 1, "first"); + if (! isempty (javapkgind)) + keyboard + javapkg = pkglist{javapkgind}; + if (javapkg.loaded) + # Assume jar files are in /lib/java and let chk_spreadsheet_support sort it out + libdir = octave_config_info ("libdir"); + ## Allow time for package to be fully loaded + pause (0.25); + spr_status = chk_spreadsheet_support ([ libdir filesep "java" ]); + endif + endif + ## Clean up + clear javapkgind javapkg libdir spr_status pkglist ; \ No newline at end of file Modified: trunk/octave-forge/main/io/PKG_DEL =================================================================== --- trunk/octave-forge/main/io/PKG_DEL 2012-09-07 12:58:28 UTC (rev 10970) +++ trunk/octave-forge/main/io/PKG_DEL 2012-09-07 14:11:47 UTC (rev 10971) @@ -1,7 +1,8 @@ -## PKG_DEL -## -## Below are base names of spreadsheet I/O Java class libs. -## They'll stay (harmless) in the javaclasspath until termination of the current Octave session. -## {'poi-3', 'poi-ooxml-3', xbean', 'poi-ooxml-schemas', 'dom4j-1.6.1', 'jxl', 'openxls', ... -## 'odfdom', 'xercesImpl', 'jopendocument', ... -## 'program', 'unoil', 'jurt', 'juh', 'unoloader', 'ridl'} +## PKG_DEL + ## + ## Below are base names of spreadsheet I/O Java class libs. + ## They'll stay (harmless) in the javaclasspath until termination of the current Octave session. + ## {'poi-3', 'poi-ooxml-3', xbean', 'poi-ooxml-schemas', 'dom4j-1.6.1', 'jxl', 'openxls', ... + ## 'odfdom', 'xercesImpl', 'jopendocument', ... + ## 'program', 'unoil', 'jurt', 'juh', 'unoloader', 'ridl'} + \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |