[Octave-cvsupdate] SF.net SVN: octave:[5820] trunk/octave-forge/extra/generate_html/inst

[<ha...@us...>]

Revision: 5820
          http://octave.svn.sourceforge.net/octave/?rev=5820&view=rev
Author:   hauberg
Date:     2009-05-13 21:52:52 +0000 (Wed, 13 May 2009)

Log Message:
-----------
Simplify API

Modified Paths:
--------------
    trunk/octave-forge/extra/generate_html/inst/generate_html_manual.m
    trunk/octave-forge/extra/generate_html/inst/generate_package_html.m

Modified: trunk/octave-forge/extra/generate_html/inst/generate_html_manual.m
===================================================================
--- trunk/octave-forge/extra/generate_html/inst/generate_html_manual.m	2009-05-13 19:31:37 UTC (rev 5819)
+++ trunk/octave-forge/extra/generate_html/inst/generate_html_manual.m	2009-05-13 21:52:52 UTC (rev 5820)
@@ -117,7 +117,7 @@
   for k = 1:length (index)
     if (!isempty (index {k}))
       printf ("Chapter: %s\n", index {k}.name); fflush (stdout);
-      generate_package_html (index {k}, full_fun_dir, options, :, root);
+      generate_package_html (index {k}, outdir, options);
       %reference = txi2reference (index {k}.filename);
     endif
   endfor

Modified: trunk/octave-forge/extra/generate_html/inst/generate_package_html.m
===================================================================
--- trunk/octave-forge/extra/generate_html/inst/generate_package_html.m	2009-05-13 19:31:37 UTC (rev 5819)
+++ trunk/octave-forge/extra/generate_html/inst/generate_package_html.m	2009-05-13 21:52:52 UTC (rev 5820)
@@ -48,13 +48,15 @@
 ## @seealso{get_html_options}
 ## @end deftypefn
 
-function generate_package_html (name, outdir = ".", options = struct (), fundir = outdir, root = "")
+function generate_package_html (name, outdir = "manual", options = struct ())
   ## Check input
   if (ischar (name))
+    packname = name;
     pkg ("load", name);
     desc = pkg ("describe", name){1};
   elseif (isstruct (name))
     desc = name;
+    packname = "";
   else
     error (["generate_package_html: first input must either be the name of a ", \
             "package, or a structure giving its description."]);
@@ -64,18 +66,16 @@
     error ("generate_package_html: second input argument must be a string");
   endif
   
-  if (!ischar (fundir))
-    error ("generate_package_html: fourth input argument must be a string");
-  endif
-  
   ## Create output directory if needed
   if (!exist (outdir, "dir"))
     mkdir (outdir);
   endif
-  
-  if (!exist (fundir, "dir"))
-    mkdir (fundir);
+
+  if (!exist (fullfile (outdir, packname), "dir"))
+    mkdir (fullfile (outdir, packname));
   endif
+
+  [local_fundir, fundir] = mk_function_dir (outdir, options);
   
   ## If options is a string, call get_html_options
   if (ischar (options))
@@ -111,7 +111,7 @@
       fun = F {l};
       outname = fullfile (fundir, sprintf ("%s.html", fun));
       try
-        html_help_text (fun, outname, options, root);
+        html_help_text (fun, outname, options, "../");
         implemented {k}{l} = true;
       catch
         warning ("marking '%s' as not implemented", fun);
@@ -125,12 +125,12 @@
   #########################
   overview_filename = get_overview_filename (options, desc.name);
 
-  fid = fopen (fullfile (outdir, overview_filename), "w");
+  fid = fopen (fullfile (outdir, packname, overview_filename), "w");
   if (fid < 0)
     error ("generate_package_html: couldn't open overview file for writing");
   endif
   
-  [header, title, footer] = get_overview_header_title_and_footer (options, desc.name, root);
+  [header, title, footer] = get_overview_header_title_and_footer (options, desc.name, "../");
 
   fprintf (fid, "%s\n", header);  
   fprintf (fid, "<h2 class=\"tbdesc\">%s</h2>\n\n", desc.name);
@@ -157,7 +157,7 @@
     for l = 1:length (F)
       fun = F {l};
       if (implemented {k}{l})
-        link = sprintf ("%s/%s/%s.html", root, fundir, fun);
+        link = sprintf ("../%s/%s.html", local_fundir, fun);
         fprintf (fid, "    <div class=\"func\"><b><a href=\"%s\">%s</a></b></div>\n",
                  link, fun);
         fprintf (fid, "    <div class=\"ftext\">%s</div>\n\n",


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