documentation minor update, add epub, modify some dir paths

2 files changed, 62 insertions, 21 deletions

diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb
index 52c2cd45..a654aed7 100644
--- a/lib/sisu/v2/defaults.rb
+++ b/lib/sisu/v2/defaults.rb
@@ -1715,13 +1715,14 @@ WOK
 <title>SiSU information Structuring Universe - Structured
 information, Serialized Units - software for electronic texts,
 documents, books, digital libraries in plaintext, html, XHTML, XML,
-ODF (OpenDocument), LaTeX, PDF, SQL (PostgreSQL and SQLite), and
+ODF (OpenDocument), EPUB, LaTeX, PDF, SQL (PostgreSQL and SQLite), and
 for search</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="dc.title" content="SiSU information Structuring Universe, Structured information Serialised Units, #{@date.year_static}" />
-<meta name="dc.author" content="Ralph Amissah" />
+<meta name="dc.title" 
+  content="SiSU information Structuring Universe, Structured information Serialised Units, #{@date.year_static}" />
+<meta name="dc.creator" content="Ralph Amissah" />
 <meta name="dc.subject" content=
-"document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
+"document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, EPUB, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
 <meta name="dc.publisher" content=
 "SiSU http://www.jus.uio.no/sisu" />
 <meta name="dc.language" content="en" />
@@ -1751,20 +1752,10 @@ software for electronic texts, document collections, books, digital libraries, a
  with "atomic search" and text positioning system (shared text citation numbering: "<i>ocn</i>")
 </h2>
 <h2 class="top_band_tiny">
-outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQL (PostgreSQL and SQLite)
+outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX, PDF, SQL (PostgreSQL and SQLite)
 </h2>
 </div>
 <div id="top_band_search">
-<!-- SiSU Search -->
-<a name="search"></a><form method="get" action="http://search.sisudoc.org" target="_top">
-<input type="text" name="s1" size="24" maxlength="255" />
-<br />
-<input type="submit" name="ignore" value="search" />
-<input type="hidden" name="db" value="SiSU_sisu" />
-<input type="radio" name="view" value="index" checked="checked" /> idx
-<input type="radio" name="view" value="text" /> txt
-</form>
-<!-- SiSU Search -->
 </div>
 <div id="column_left">
 <p class="bold">
@@ -1776,7 +1767,7 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
   ---
 </p>
 <p class="small">
-  <a href="http://www.jus.uio.no/sisu/sisu_manual/" target="_top" >
+  <a href="http://www.sisudoc.org/sisu/sisu_manual/" target="_top" >
     SiSU Manual
   </a>
 </p>
@@ -1784,7 +1775,7 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
   ---
 </p>
 <p class="small">
-  <a href="http://www.jus.uio.no/sisu/SiSU/1.html#summary" target="_top" >
+  <a href="http://www.jus.uio.no/sisu/SiSU/examples.html#summary" target="_top" >
     What does SiSU do? Summary
   </a>
 </p>
@@ -1796,6 +1787,16 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
     Book Samples and Markup Examples
   </a>
 </p>
+<p class="small">
+  <a href="http://www.jus.uio.no/sisu/sisu_site_metadata/harvest_authors.html" target="_top" >
+   sorted by Author (sisu metadata)
+  </a>
+</p>
+<p class="small">
+  <a href="http://www.jus.uio.no/sisu/sisu_site_metadata/harvest_topics.html" target="_top" >
+   sorted by Topic (sisu metadata)
+  </a>
+</p>
 <p class="tiny">
   ---
 </p>
@@ -1849,6 +1850,21 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
   =============
 </p>
 <p class="small">
+<a href="http://www.jus.uio.no/sisu/sisu_markup/" target="_top" >
+    sisu markup
+  </a>
+</p>
+<p class="small">
+  <a href="http://www.jus.uio.no/sisu/sisu_commands/" target="_top" >
+    sisu commands
+  </a>
+</p>
+<p class="small">
+  <a href="http://www.jus.uio.no/sisu/sisu_manual/" target="_top" >
+    sisu manual
+  </a>
+</p>
+<p class="small">
   <a href="http://www.jus.uio.no/sisu/man" target="_top" >
     sisu man pages
   </a>
@@ -1964,13 +1980,13 @@ markup defines document structure (this may be done once in a header pattern-mat
 </p>
 <p><b>(iii)</b>
 <b>(a)</b>
-multiple outputs primarily industry established and institutionally accepted open standard formats, include amongst others: plaintext (UTF-8); html; (structured) XML; ODF (Open Document text)l; LaTeX; PDF (via LaTeX); SQL type databases (currently PostgreSQL and SQLite). Also produces: concordance files; document content certificates (md5 or sha256 digests of headings, paragraphs, images etc.) and html manifests (and sitemaps of content).
+multiple outputs primarily industry established and institutionally accepted open standard formats, include amongst others: plaintext (UTF-8); html; (structured) XML; ODF (Open Document text); EPUB; LaTeX; PDF (via LaTeX); SQL type databases (currently PostgreSQL and SQLite). Also produces: concordance files; document content certificates (md5 or sha256 digests of headings, paragraphs, images etc.) and html manifests (and sitemaps of content).
 
 <b>(b)
 </b>
 takes advantage of the strengths implicit in these very different output types, (e.g. PDFs produced using typesetting of LaTeX, databases populated with documents at an individual object/paragraph level, making possible granular search (and related possibilities))</p>
 <p><b>(iv)</b>
-outputs share a common numbering system (dubbed "object citation numbering" (ocn)) that is meaningful (to man and machine) across various digital outputs whether paper, screen, or database oriented, (PDF, html, XML, sqlite, postgresql), this numbering system can be used to reference content.</p>
+outputs share a common numbering system (dubbed "object citation numbering" (ocn)) that is meaningful (to man and machine) across various digital outputs whether paper, screen, or database oriented, (PDF, html, XML, EPUB, sqlite, postgresql), this numbering system can be used to reference content.</p>
 <p>
 <b>(v)</b>
 SQL databases are populated at an object level (roughly headings, paragraphs, verse, tables) and become searchable with that degree of granularity, the output information provides the object/paragraph numbers which are relevant across all generated outputs; it is also possible to look at just the matching paragraphs of the documents in the database; [output indexing also work well with search indexing tools like hyperesteier].</p>
@@ -2040,7 +2056,7 @@ document source may be bundled together (automatically) with associated document
 </p>
 <p>
 <b>(xxii)</b>
-for basic document generation, the only software dependency is Ruby, and a few standard Unix tools (this covers plaintext, html, XML, ODF, LaTeX). To use a database you of course need that, and to convert the LaTeX generated to PDF, a LaTeX processor like tetex or texlive.
+for basic document generation, the only software dependency is Ruby, and a few standard Unix tools (this covers plaintext, html, XML, ODF, EPUB, LaTeX). To use a database you of course need that, and to convert the LaTeX generated to PDF, a LaTeX processor like tetex or texlive.
 </p>
 <p>
 as a developers tool it is flexible and extensible
@@ -2051,6 +2067,20 @@ More information on <a href="http://www.jus.uio.no/sisu/SiSU/"><b>SiSU</b></a> p
 </div>
 <div id="column_right">
 <p class="tiny">
+<!-- Search SiSU -->
+<a name="search"></a><form method="get" action="http://search.sisudoc.org" target="_top">
+<input type="text" name="s1" size="24" maxlength="255" />
+<br />
+<input type="submit" name="ignore" value="search" />
+<input type="hidden" name="db" value="SiSUv2_sisu" />
+<input type="hidden" name="a" value="1" />
+<input type="radio" name="view" value="index" checked="checked" /> idx
+<input type="radio" name="view" value="text" /> txt
+<a href="http://search.sisudoc.org" target="_top" >search.sisudoc.org</a>
+</form>
+<!-- Search SiSU -->
+</p>
+<p class="tiny">
 SiSU ("SiSU information Structuring Universe" or "Structured information, Serialized Units"),<sup>1</sup> is a Unix command line oriented framework for document structuring, publishing and search. Featuring minimalistic markup, multiple standard outputs, a common citation system, and granular search.
 </p>
 <p class="tiny">
diff --git a/lib/sisu/v2/help.rb b/lib/sisu/v2/help.rb
index 894f1654..38f0a782 100644
--- a/lib/sisu/v2/help.rb
+++ b/lib/sisu/v2/help.rb
@@ -75,7 +75,7 @@ module SiSU_Help
     def help_request
       begin
         gotten=nil
-        regx=/^(list|com(?:mands)?|mod(?:ifiers)|markup|syntax|example(?:37|38)?|head(?:ers?)?|(?:heading|title|level|structure)s?|endnotes|footnotes|tables?|customise|skin|dir(?:ectories)?|paths?|lang(?:uage)?|modules|setup|conf(?:ig(?:ure)?)?|standards?|li[cs]en[sc]e|scratch|install|termsheet|dublin(?:core)?|dc|customise|styles?|appearance|theme|env(ironment)?|dir(?:ector(?:y|ies))?|metaverse|abstract|features|summary|(?:short)?cuts?|sisu|about|ext(?:ernal)?(?:_?prog(?:rams)?)?)|utf-?8|plaintext|html|xml|xhtml|odf|odt|opendocument|css|pdf|latex|tex|(?:tex)?info|search|(?:hyper)?est(?:raier)?|searchform|cgi|sql|db|postgresql|pg?sql|sqlite|convert|php|webrick|sitemaps?|ya?ml|ansi|colors|-[AabcDdEeFHhIMmNnopqrRSstUuVvwXxyZz0-9]|-[Ddcv]|-[CcFLSVvW]/
+        regx=/^(list|com(?:mands)?|mod(?:ifiers)|markup|syntax|example(?:37|38)?|head(?:ers?)?|(?:heading|title|level|structure)s?|endnotes|footnotes|tables?|customise|skin|dir(?:ectories)?|paths?|lang(?:uage)?|modules|setup|conf(?:ig(?:ure)?)?|standards?|li[cs]en[sc]e|scratch|install|termsheet|dublin(?:core)?|dc|customise|styles?|appearance|theme|env(ironment)?|dir(?:ector(?:y|ies))?|metaverse|abstract|features|summary|(?:short)?cuts?|sisu|about|ext(?:ernal)?(?:_?prog(?:rams)?)?)|utf-?8|plaintext|html|xml|xhtml|epub|odf|odt|opendocument|css|pdf|latex|tex|(?:tex)?info|search|(?:hyper)?est(?:raier)?|searchform|cgi|sql|db|postgresql|pg?sql|sqlite|convert|php|webrick|sitemaps?|ya?ml|ansi|colors|-[AabcDdEeFHhIMmNnopqrRSstUuVvwXxyZz0-9]|-[Ddcv]|-[CcFLSVvW]/
       help_info=%{#{@cX.blue_hi}SiSU help#{@cX.off} #{@cX.ruby}~#{@cX.off} #{@request}}
       help_list=%{#{@cX.blue}sisu --help#{@cX.off} #{@cX.cyan}type keyword else "enter" to exit help:\n\tkeywords include:#{@cX.off} #{@cX.brown}list, (com)mands, short(cuts), (mod)ifiers, (env)ironment, markup, syntax, headers, headings, endnotes, tables, example, customise, skin, (dir)ectories, path, (lang)uage, db, install, setup, (conf)igure, convert, external_programs, dublincore, termsheet, search, sql, hyper(est)raier, features, external_programs, license#{@cX.off} \n}
       help_prompt=%{#{@cX.fuschia}exit, [or carriage return to exit help] #{@cX.off}\n#{@cX.blue_hi}SiSU help#{@cX.off} #{@cX.ruby}~#{@cX.off} }
@@ -125,6 +125,7 @@ module SiSU_Help
           when /xhtml|-b/;                             @help.xhtml
           when /xml|-[xX]/;                            @help.xml
           when /odf|odt|opendocument|-o/;              @help.odf
+          when /epub|-e/;                              @help.epub
           when /php/;                                  @help.php
           when /pdf|-p/;                               @help.pdf
           when /latex|tex/;                            @help.latex
@@ -995,6 +996,7 @@ WOK
   pdf viewer:                                    #{@cX.blue}#{@env.program.pdf_viewer}#{@cX.off}
   xml viewer:                                    #{@cX.blue}#{@env.program.xml_editor}#{@cX.off}
   odf viewer:                                    #{@cX.blue}#{@env.program.odf_viewer}#{@cX.off}
+  epub viewer:                                   #{@cX.blue}#{@env.program.epub_viewer}#{@cX.off}
                                                   (default selections can be changed in sisurc.yml under program_select:)
   #{@cX.green}programs used if available#{@cX.off}
   word count:                                    #{program_found?(@env.program.wc)}
@@ -1504,6 +1506,8 @@ WOK
     sisu -X [filename/wildcard]    xml document (dom type parsing)
 
     sisu -o [filename/wildcard]    odt document, (odf open document format)
+
+    sisu -e [filename/wildcard]    odt document, (epub document)
 WOK
       help_commands
     end
@@ -1514,6 +1518,13 @@ WOK
 WOK
       help_commands
     end
+    def epub
+      print <<WOK
+
+    sisu -e [filename/wildcard]    epub document, (open format for e-books)
+WOK
+      help_commands
+    end
     def php
       print <<WOK