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

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

Revision: 5943
          http://octave.svn.sourceforge.net/octave/?rev=5943&view=rev
Author:   hauberg
Date:     2009-06-14 19:42:49 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
Simplify manual code to match new directory layout

Modified Paths:
--------------
    trunk/octave-forge/extra/generate_html/inst/generate_html_manual.m
    trunk/octave-forge/extra/generate_html/inst/texi2html.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-06-14 18:39:58 UTC (rev 5942)
+++ trunk/octave-forge/extra/generate_html/inst/generate_html_manual.m	2009-06-14 19:42:49 UTC (rev 5943)
@@ -43,11 +43,15 @@
   if (!exist (outdir, "dir"))
     mkdir (outdir);
   endif
+  outdir = fullfile (outdir, "manual");
+  if (!exist (outdir, "dir"))
+    mkdir (outdir);
+  endif
   
   chapter_dir = mk_chapter_dir (outdir, options);
-  [fun_dir, full_fun_dir] = mk_function_dir (outdir, options);
+  mk_function_dir (outdir, options);
   
-  ds_handler = @(fun) docstring_handler (fun, fun_dir);
+  ds_handler = @(fun) docstring_handler (fun);
   
   ## Get file list
   file_list = get_txi_files (srcdir);
@@ -95,7 +99,7 @@
     text = strcat ("@defindex op\n\n", text);
 
     ## Convert to HTML and write to disc
-    [header, body, footer] = texi2html (text, options, get_root (outdir, chapter_dir));
+    [header, body, footer] = texi2html (text, options, "../../");
     
     fid = fopen (fullfile (chapter_dir, sprintf ("%s.html", name)), "w");
     fprintf (fid, "%s\n%s\n%s\n", header, body, footer);
@@ -113,7 +117,6 @@
   index = txi2index (srcdir);
   
   ## Generate the documentation
-  root = get_root (outdir, full_fun_dir);
   options.include_package_list_item = false;
   options.include_package_page = false;
   options.include_overview = false;
@@ -121,14 +124,14 @@
   for k = 1:length (index)
     if (!isempty (index {k}))
       printf ("Chapter: %s\n", index {k}.name); fflush (stdout);
+      index {k}.name = ""; # remove the name to avoid  each chapter having its own dir
       generate_package_html (index {k}, outdir, options);
-      %reference = txi2reference (index {k}.filename);
     endif
   endfor
 endfunction
 
-function retval = docstring_handler (fun, fun_dir)
-  retval = sprintf ("@ifhtml\n@html\n<div class='seefun'>See <a href='../%s/%s.html'>%s</a></div>\n@end html\n@end ifhtml\n",
-                    fun_dir, fun, fun);
+function retval = docstring_handler (fun)
+  retval = sprintf ("@ifhtml\n@html\n<div class='seefun'>See <a href='../function/%s.html'>%s</a></div>\n@end html\n@end ifhtml\n",
+                    fun, fun);
 endfunction
 

Modified: trunk/octave-forge/extra/generate_html/inst/texi2html.m
===================================================================
--- trunk/octave-forge/extra/generate_html/inst/texi2html.m	2009-06-14 18:39:58 UTC (rev 5942)
+++ trunk/octave-forge/extra/generate_html/inst/texi2html.m	2009-06-14 19:42:49 UTC (rev 5943)
@@ -70,9 +70,11 @@
   endif
 
   ## Run makeinfo
+  orig_text = text;
   [text, status] = __makeinfo__ (text, "html", seealso);
   if (status != 0)
-    warning ("texi2html: couln't parse texinfo."); # XXX: make this an error
+    txi_out = orig_text (1:min (100, length (orig_text)));
+    warning ("texi2html: couldn't parse texinfo: \n%s", txi_out); # XXX: make this an error
   endif
       
   ## Split text into header, body, and footer using the text we added above


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