diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-03-05 21:51:24 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-03-05 21:51:24 -0500 |
| commit | 58cbe6bacc8416ad536787ed1acb6d0f4e889ea9 (patch) | |
| tree | a5f37fb07df47c1d21412f28f7c535d84031269a /lib | |
| parent | debian related sisu markup samples, reorganise (diff) | |
| parent | v2, v3: changelog updates (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v2/defaults.rb | 127 | ||||
| -rw-r--r-- | lib/sisu/v2/manpage.rb | 5 | ||||
| -rw-r--r-- | lib/sisu/v3/defaults.rb | 125 | ||||
| -rw-r--r-- | lib/sisu/v3/manpage.rb | 3 |
4 files changed, 42 insertions, 218 deletions
diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb index 2c3cf207..31cc449e 100644 --- a/lib/sisu/v2/defaults.rb +++ b/lib/sisu/v2/defaults.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -1776,6 +1776,14 @@ for search</title> </h1> <h2 class="top_band_tiny"> Structured information, Serialized Units + + <a href="http://www.sisudoc.org" target="_top" > + <www.sisudoc.org> + </a> + or + <a href="http://www.jus.uio.no/sisu/" target="_top" > + <www.jus.uio.no/sisu/> + </a> </h2> <h2 class="top_band_tiny"> software for electronic texts, document collections, books, digital libraries, and search, @@ -1871,110 +1879,15 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX, P --- </p> <p class="small"> - <a href="http://www.sisudoc.org/sisu/SiSU/license.html" target="_top" > - License + License, SiSU is licensed under + <a href="http://www.gnu.org/licenses/gpl.html" target="_top" > + GPLv3 or later </a> </p> <p class="tiny"> Gnu / Linux / Unix </p> <p class="tiny"> - ============= -</p> -<p class="small"> -<a href="http://www.sisudoc.org/sisu/sisu_markup/" target="_top" > - sisu markup - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_commands/" target="_top" > - sisu commands - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_manual/" target="_top" > - sisu manual - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/man" target="_top" > - sisu man pages - </a> -</p> -<p class="tiny"> - --- -</p> -<p class="tiny"> - document preparation can be on any platform, in any editor: - (syntax highlight support currently for: vim, kate, write, gedit, diakonos) -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/syntax_highlight" target="_top" > - Syntax highlighting - </a> -</p> -<p class="tiny"> - ============= -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/SiSU" target="_top" > - * Composite document - </a> -</p> -<p class="tiny"> - the composite document is a superset of the following documents: -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_description" target="_top" > - SiSU description - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_examples" target="_top" > - SiSU examples - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_chronology" target="_top" > - SiSU chronology - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_technical_info" target="_top" > - SiSU technical - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_faq" target="_top" > - SiSU FAQ - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_download" target="_top" > - SiSU download - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_changelog" target="_top" > - SiSU changelog - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_license" target="_top" > - SiSU license - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_standard" target="_top" > - SiSU standard - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_provisional_patent_application_200408" target="_top" > - SiSU abandoned provisional patent - </a> -</p> -<p class="tiny"> Note: the placement of SiSU documents on the Net predate the release of SiSU. </p> </div> @@ -1989,7 +1902,7 @@ SiSU is a comprehensive future-proofing electronic document management system. Potential users of SiSU include individual authors who want to publish their books or articles electronically to reach a broad audience, web publishers who want to provide multiple channels of access to their electronic documents, or any organizations which centrally manage a medium or large set of electronic documents, especially governmental organizations which may prefer to keep their documents in easily accessible yet non-proprietary formats. </p> <p> -SiSU is an Open Source project initiated and led by Ralph Amissah (<a href="mailto:ralph.amissah@gmail.com">ralph.amissah@gmail.com</a>) and can be contacted via mailing list <a href="http://lists.sisudoc.org/listinfo/sisu">http://lists.sisudoc.org/listinfo/sisu</a> at <a href="mailto:sisu@lists.sisudoc.org">sisu@lists.sisudoc.org</a>. SiSU is licensed under the GNU General Public License. +SiSU is an Open Source project initiated and led by Ralph Amissah <a href="mailto:ralph.amissah@gmail.com"><ralph.amissah@gmail.com></a> and can be contacted via mailing list <a href="http://lists.sisudoc.org/listinfo/sisu"><http://lists.sisudoc.org/listinfo/sisu></a> at <a href="mailto:sisu@lists.sisudoc.org"><sisu@lists.sisudoc.org></a>. SiSU is licensed under the GNU General Public License. </p> <p class="bold"> For less markup than the most elementary HTML you can have more. @@ -2107,7 +2020,7 @@ as a developers tool it is flexible and extensible </p> <br /> <p class="small"> -More information on <a href="http://www.sisudoc.org/sisu/SiSU/"><b>SiSU</b></a> provided at <a href="http://www.sisudoc.org/sisu/SiSU/">www.sisudoc.org/sisu/SiSU</a></p> +<a href="http://www.sisudoc.org"><b>SiSU</b></a> at <a href="http://www.sisudoc.org"><www.sisudoc.org></a> or <a href="http://www.jus.uio.no/sisu/"><www.jus.uio.no/sisu/></a></p> </div> <div id="column_right"> <p class="tiny"> @@ -2120,7 +2033,7 @@ More information on <a href="http://www.sisudoc.org/sisu/SiSU/"><b>SiSU</b></a> <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> +<a href="http://search.sisudoc.org" target="_top" ><search.sisudoc.org></a> </form> <!-- Search SiSU --> </p> @@ -2144,7 +2057,7 @@ SiSU markup is fairly minimalistic, it consists of: a (largely optional) documen <p class="small"> More information on <a href="http://www.sisudoc.org/sisu/SiSU/"><b>SiSU</b></a> provided at: <a href="http://www.sisudoc.org/sisu/SiSU/"> - www.sisudoc.org/sisu/SiSU + <www.sisudoc.org/sisu/SiSU> </a> <p class="tiny"> SiSU was developed in relation to legal documents, and is strong across a wide variety of texts (law, literature...(humanities, law and part of the social sciences)). SiSU handles images but is not suitable for formulae/ statistics, or for technical writing at this time.</p> @@ -2152,22 +2065,22 @@ SiSU was developed in relation to legal documents, and is strong across a wide v SiSU has been developed and has been in use for several years. Requirements to cover a wide range of documents within its use domain have been explored.</p> <p class="small"> <a href="mailto:ralph@amissah.com"> -ralph@amissah.com +<ralph@amissah.com> </a> </p> <p class="small"> <a href="mailto:ralph.amissah@gmail.com"> -ralph.amissah@gmail.com +<ralph.amissah@gmail.com> </a> </p> <p class="small"> <a href="mailto:sisu@lists.sisudoc.org"> -sisu@lists.sisudoc.org. +<sisu@lists.sisudoc.org> </a> </p> <p class="small"> <a href="http://lists.sisudoc.org/listinfo/sisu"> -http://lists.sisudoc.org/listinfo/sisu +<http://lists.sisudoc.org/listinfo/sisu> </a> </p> <p class="small"> diff --git a/lib/sisu/v2/manpage.rb b/lib/sisu/v2/manpage.rb index 2d13793b..18670e2a 100644 --- a/lib/sisu/v2/manpage.rb +++ b/lib/sisu/v2/manpage.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -139,7 +139,6 @@ module SiSU_Manpage if wrap =~ /^\s*[\d*+]+\s+.+?\s*\Z/m wrap.gsub!(/(^| |#{Mx[:nbsp]}|\s|\*)\\\*/,'\1\\\\\*') #man page requires wrap.gsub!(/\s\.(\S+)/,' \\.\1') - wrap.gsub!(/(["''])/,"\\\\\\1") # quotation marks need escape wrap.gsub!(/^\s*([\d*+]+)\s+(.+?)\s*\Z/m, <<GSUB .TP .BI \\1. @@ -301,9 +300,9 @@ WOK dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n") # watch end dob.obj.gsub!(/(^| |#{Mx[:nbsp]}|\s|\*)\\\*/,'\1\\\\\*') #man page requires + dob.obj.gsub!(/┆/,'|') dob.obj.gsub!(/\s\.(\S+)/,' \\.\1') dob.obj.gsub!(/(\n\.)(\S\S\S+)/m,'\1\\.\2') - dob.obj.gsub!(/-/,'\-') #manpages use this dob.obj.gsub!(/~/,'~') if dob.obj #manpages use this if dob.is =~/group|verse|alt|code/ if dob.is =='code' diff --git a/lib/sisu/v3/defaults.rb b/lib/sisu/v3/defaults.rb index 87e8c577..2079da47 100644 --- a/lib/sisu/v3/defaults.rb +++ b/lib/sisu/v3/defaults.rb @@ -1777,6 +1777,14 @@ for search</title> </h1> <h2 class="top_band_tiny"> Structured information, Serialized Units + + <a href="http://www.sisudoc.org" target="_top" > + <www.sisudoc.org> + </a> + or + <a href="http://www.jus.uio.no/sisu/" target="_top" > + <www.jus.uio.no/sisu/> + </a> </h2> <h2 class="top_band_tiny"> software for electronic texts, document collections, books, digital libraries, and search, @@ -1872,110 +1880,15 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX, P --- </p> <p class="small"> - <a href="http://www.sisudoc.org/sisu/SiSU/license.html" target="_top" > - License + License, SiSU is licensed under + <a href="http://www.gnu.org/licenses/gpl.html" target="_top" > + GPLv3 or later </a> </p> <p class="tiny"> Gnu / Linux / Unix </p> <p class="tiny"> - ============= -</p> -<p class="small"> -<a href="http://www.sisudoc.org/sisu/sisu_markup/" target="_top" > - sisu markup - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_commands/" target="_top" > - sisu commands - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_manual/" target="_top" > - sisu manual - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/man" target="_top" > - sisu man pages - </a> -</p> -<p class="tiny"> - --- -</p> -<p class="tiny"> - document preparation can be on any platform, in any editor: - (syntax highlight support currently for: vim, kate, write, gedit, diakonos) -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/syntax_highlight" target="_top" > - Syntax highlighting - </a> -</p> -<p class="tiny"> - ============= -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/SiSU" target="_top" > - * Composite document - </a> -</p> -<p class="tiny"> - the composite document is a superset of the following documents: -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_description" target="_top" > - SiSU description - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_examples" target="_top" > - SiSU examples - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_chronology" target="_top" > - SiSU chronology - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_technical_info" target="_top" > - SiSU technical - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_faq" target="_top" > - SiSU FAQ - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_download" target="_top" > - SiSU download - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_changelog" target="_top" > - SiSU changelog - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_license" target="_top" > - SiSU license - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_standard" target="_top" > - SiSU standard - </a> -</p> -<p class="small"> - <a href="http://www.sisudoc.org/sisu/sisu_provisional_patent_application_200408" target="_top" > - SiSU abandoned provisional patent - </a> -</p> -<p class="tiny"> Note: the placement of SiSU documents on the Net predate the release of SiSU. </p> </div> @@ -1990,7 +1903,7 @@ SiSU is a comprehensive future-proofing electronic document management system. Potential users of SiSU include individual authors who want to publish their books or articles electronically to reach a broad audience, web publishers who want to provide multiple channels of access to their electronic documents, or any organizations which centrally manage a medium or large set of electronic documents, especially governmental organizations which may prefer to keep their documents in easily accessible yet non-proprietary formats. </p> <p> -SiSU is an Open Source project initiated and led by Ralph Amissah (<a href="mailto:ralph.amissah@gmail.com">ralph.amissah@gmail.com</a>) and can be contacted via mailing list <a href="http://lists.sisudoc.org/listinfo/sisu">http://lists.sisudoc.org/listinfo/sisu</a> at <a href="mailto:sisu@lists.sisudoc.org">sisu@lists.sisudoc.org</a>. SiSU is licensed under the GNU General Public License. +SiSU is an Open Source project initiated and led by Ralph Amissah <a href="mailto:ralph.amissah@gmail.com"><ralph.amissah@gmail.com></a> and can be contacted via mailing list <a href="http://lists.sisudoc.org/listinfo/sisu"><http://lists.sisudoc.org/listinfo/sisu></a> at <a href="mailto:sisu@lists.sisudoc.org"><sisu@lists.sisudoc.org></a>. SiSU is licensed under the GNU General Public License. </p> <p class="bold"> For less markup than the most elementary HTML you can have more. @@ -2108,7 +2021,7 @@ as a developers tool it is flexible and extensible </p> <br /> <p class="small"> -More information on <a href="http://www.sisudoc.org/sisu/SiSU/"><b>SiSU</b></a> provided at <a href="http://www.sisudoc.org/sisu/SiSU/">www.sisudoc.org/sisu/SiSU</a></p> +<a href="http://www.sisudoc.org"><b>SiSU</b></a> at <a href="http://www.sisudoc.org"><www.sisudoc.org></a> or <a href="http://www.jus.uio.no/sisu/"><www.jus.uio.no/sisu/></a></p> </div> <div id="column_right"> <p class="tiny"> @@ -2121,7 +2034,7 @@ More information on <a href="http://www.sisudoc.org/sisu/SiSU/"><b>SiSU</b></a> <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> +<a href="http://search.sisudoc.org" target="_top" ><search.sisudoc.org></a> </form> <!-- Search SiSU --> </p> @@ -2145,7 +2058,7 @@ SiSU markup is fairly minimalistic, it consists of: a (largely optional) documen <p class="small"> More information on <a href="http://www.sisudoc.org/sisu/SiSU/"><b>SiSU</b></a> provided at: <a href="http://www.sisudoc.org/sisu/SiSU/"> - www.sisudoc.org/sisu/SiSU + <www.sisudoc.org/sisu/SiSU> </a> <p class="tiny"> SiSU was developed in relation to legal documents, and is strong across a wide variety of texts (law, literature...(humanities, law and part of the social sciences)). SiSU handles images but is not suitable for formulae/ statistics, or for technical writing at this time.</p> @@ -2153,22 +2066,22 @@ SiSU was developed in relation to legal documents, and is strong across a wide v SiSU has been developed and has been in use for several years. Requirements to cover a wide range of documents within its use domain have been explored.</p> <p class="small"> <a href="mailto:ralph@amissah.com"> -ralph@amissah.com +<ralph@amissah.com> </a> </p> <p class="small"> <a href="mailto:ralph.amissah@gmail.com"> -ralph.amissah@gmail.com +<ralph.amissah@gmail.com> </a> </p> <p class="small"> <a href="mailto:sisu@lists.sisudoc.org"> -sisu@lists.sisudoc.org. +<sisu@lists.sisudoc.org> </a> </p> <p class="small"> <a href="http://lists.sisudoc.org/listinfo/sisu"> -http://lists.sisudoc.org/listinfo/sisu +<http://lists.sisudoc.org/listinfo/sisu> </a> </p> <p class="small"> diff --git a/lib/sisu/v3/manpage.rb b/lib/sisu/v3/manpage.rb index 3810a969..e4cb6906 100644 --- a/lib/sisu/v3/manpage.rb +++ b/lib/sisu/v3/manpage.rb @@ -138,7 +138,6 @@ module SiSU_Manpage if wrap =~ /^\s*[\d*+]+\s+.+?\s*\Z/m wrap.gsub!(/(^| |#{Mx[:nbsp]}|\s|\*)\\\*/,'\1\\\\\*') #man page requires wrap.gsub!(/\s\.(\S+)/,' \\.\1') - wrap.gsub!(/(["''])/,"\\\\\\1") # quotation marks need escape wrap.gsub!(/^\s*([\d*+]+)\s+(.+?)\s*\Z/m, <<GSUB .TP .BI \\1. @@ -300,9 +299,9 @@ WOK dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n") # watch end dob.obj.gsub!(/(^| |#{Mx[:nbsp]}|\s|\*)\\\*/,'\1\\\\\*') #man page requires + dob.obj.gsub!(/┆/,'|') dob.obj.gsub!(/\s\.(\S+)/,' \\.\1') dob.obj.gsub!(/(\n\.)(\S\S\S+)/m,'\1\\.\2') - dob.obj.gsub!(/-/,'\-') #manpages use this dob.obj.gsub!(/~/,'~') if dob.obj #manpages use this if dob.is =~/block|group|verse|alt|code/ if dob.is =='code' |