From eacca80ea6ba4932123c91f71f291fada0d46713 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 12 Oct 2007 01:09:54 +0100 Subject: start readying for 0.61 --- CHANGELOG | 29 ++++++++++++++-------- .../sisu_manual/sisu_download.ssi | 4 +-- .../sisu_markup_samples/sisu_manual/sisu_help.sst | 9 ++++++- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9285442c..47a68840 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,27 +1,34 @@ -* See homepage at: http://www.jus.uio.no/sisu * & http://www.jus.uio.no/sisu/SiSU/download * & http://www.jus.uio.no/sisu/SiSU/changelog +* homepage at: +* +* +* +* |data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm|@|^| +* |data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi|@|^| + Reverse Chronological: %% STABLE MANIFEST -%% sisu_0.61.0.orig.tar.gz (2007-10-12:41/4) +%% sisu_0.61.0.orig.tar.gz (2007-10-12:41/5) http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz sisu_0.61.0.orig.tar.gz sisu_0.61.0-1.dsc sisu_0.61.0-1.diff.gz - * dal, shortcut for available outputs, present as grouped text object, as - this makes more sense for search results - matches all versions of a - document [affects document objects and numbering where used, hence version - number bump] + * dal, markup shortcut for available outputs, present as grouped text object, + (as opposed to each available output being a separate object) this makes + more sense for search results - where matched returns all versions of a + document, (rather than just e.g. the document title) [affects document + objects and numbering where used, hence version number bump] * html, pdf, text object switch off @markup: no_ocn (or command line flag --no-ocn), in html objects are still named, (i.e. will still work with - searches though the meaning of the numbers returned is obscured) + searches though the relevance of the numbers returned is obscured) - * shared markup source, composite documents, look to processing directory - * text: share source - * binary: sisupod (make) - [fixes shared markup source bug, present in 0.60] + * shared markup source, composite documents, look to processing directory for + both text (share source) and binary (sisupod (make)) + [fixes 0.60 shared markup source bug, introduced by falling out of step + with processing changes introduced in 0.60] * processing flag shortcuts, * sisurc.yml reduced -1 outputs [to -hwpoyv] (minimum output used in diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi index 1b3ffd77..69f753cc 100644 --- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi +++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi @@ -55,7 +55,7 @@ Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report
http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~ -_* {~^ sisu_0.61.0.orig.tar.gz (of 2007-10-08:41/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz +_* {~^ sisu_0.61.0.orig.tar.gz (of 2007-10-12:41/5) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz _1 cgi generated sample search form @@ -150,7 +150,7 @@ _1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_sam The RPM is generated Alien~{ http://www.kitenet.net/programs/alien/ }~ from two deb packages (sisu and sisu-doc). Dependencies are not handled, not even that of the essential Ruby. -_* {~^ sisu-0.61.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.61.0-2.noarch.rpm ~{
2e7ef817d1b6a1aa7c1c2782810cacf5
untested, created using: alien -r sisu_0.61.0-1_all.deb }~ +_* {~^ sisu-0.61.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.61.0-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.61.0-1_all.deb }~ _* {~^ sisu-markup-samples_1.0.8.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{
untested, created using alien }~ diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst index c3fb7830..6001d6ea 100644 --- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst +++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst @@ -51,10 +51,17 @@ The most up to date information on sisu should be contained in the sisu_manual, _1 http://sisudoc.org/sisu/sisu_manual/ -The manual source can be found within the SiSU tarball at: +The manual can be generated from source, found respectively, either within the SiSU tarball +or installed locally at: _1 ./data/doc/sisu/sisu_markup_samples/sisu_manual/ +_1 /usr/share/doc/sisu/sisu_markup_samples/sisu_manual/ + +move to the respective directory and type e.g.: + +_1 sisu sisu_manual.ssm + % The manual pages provided with SiSU are also available online, and there is an interactive help, which is being superseded by the man page, and possibly some document which contains this component. 2~ SiSU man pages *~man -- cgit v1.2.3 From 640d12c3676ede35f52427192a56e9736ae3d1d0 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 12 Oct 2007 20:19:17 +0100 Subject: sisu manual and man page update --- data/doc/sisu/html/sisu.1.html | 375 ++++++--------------- .../sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb | 3 + .../sisu_manual/sisu_commands.sst | 2 +- man/man1/sisu.1 | 283 +++------------- 4 files changed, 171 insertions(+), 492 deletions(-) diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html index b34bac56..bea9e725 100644 --- a/data/doc/sisu/html/sisu.1.html +++ b/data/doc/sisu/html/sisu.1.html @@ -560,26 +560,28 @@ changed/configured in the sisurc.yml file):

verbose output

-5.0.1 COMMAND LINE WITH FLAGS - BATCH PROCESSING -

In the -data directory run sisu -mh filename or wildcard eg. cisg.sst documents. -

-Running sisu (alone without any flags, filenames or wildcards) brings up -the interactive help, as does any sisu command that is not recognised. Enter -to escape. -

6. HELP +5.1 COMMAND LINE WITH FLAGS - BATCH PROCESSING +

In the data +directory run sisu -mh filename or wildcard eg. cisg.sst documents. +

Running +sisu (alone without any flags, filenames or wildcards) brings up the interactive +help, as does any sisu command that is not recognised. Enter to escape. +

+6. HELP

6.1 SISU MANUAL -

The most up to date information on -sisu should be contained in the sisu_manual, available at: -

<http://www.jus.uio.no/sisu/sisu_manual/ +

The most up to date information on sisu should +be contained in the sisu_manual, available at: +

<http://sisudoc.org/sisu/sisu_manual/ >
-

and (from SiSU 0.59 onwards) installed locally at: -

/usr/share/doc/sisu/sisu_manual/
+

The manual can be generated from source, found respectively, either +within the SiSU tarball or installed locally at: +

./data/doc/sisu/sisu_markup_samples/sisu_manual/
-

or equivalent directory -

Within the SiSU tarball at: -

./data/doc/sisu/sisu_manual/
+

/usr/share/doc/sisu/sisu_markup_samples/sisu_manual/
+ +

move to the respective directory and type e.g.: +

sisu sisu_manual.ssm

6.2 SISU MAN PAGES

If SiSU is installed on your system usual man commands @@ -647,10 +649,7 @@ see:

sisu generated html

/usr/share/doc/sisu/html/sisu_help_sources/index.html
-

<http://sisudoc.org/sisu_manual/sisu_help_sources/index.html ->
- -

<http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/index.html +

<http://sisudoc.org/sisu/sisu_help_sources/index.html >

7. INTRODUCTION TO SISU MARKUP[^9] @@ -690,7 +689,7 @@ as code

7.2.1 ONLINE

Online markup examples are available together with the respective outputs produced from -<http://www.jus.uio.no/sisu/SiSU/2.html +<http://www.jus.uio.no/sisu/SiSU/examples.html > or from <http://www.jus.uio.no/sisu/sisu_examples/ > @@ -756,7 +755,7 @@ documents that request them, all documents in a directory, or be site-wide. (A document is affected by a single skin) @bold: /Gnu|Debian|Ruby|SiSU/ @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/ - { Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html + { Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU { SiSU @ Freshmeat }http://freshmeat.net/projects/sisu/ { SiSU @ Ruby Application Archive }http://raa.ruby-lang.org/project/sisu/ @@ -845,41 +844,35 @@ pg=[Project  Gutenberg  text  number]

@prefix_b:

@rcs: $Id: sisu_markup.sst,v 1.2 2007/09/08 17:12:47 ralph Exp $  [used  by  rcs  or  cvs - to  embed  version  (revision  control)  information  into under ./_sisu/skin -~/.sisu/skin or /etc/sisu/skin. A skin may affect single documents that request -them, all documents in a directory, or be site-wide. (A document is affected -by a single skin) document,  rcs  or  cvs  can  usefully  provide  a  history  of -under ./_sisu/skin ~/.sisu/skin or /etc/sisu/skin. A skin may affect single -documents that request them, all documents in a directory, or be site-wide. -(A document is affected by a single skin) updates  to  a  document  ] -

@structure: -PART; CHAPTER; SECTION; ARTICLE; none; none; optional, document structure -can be defined by words to match or regular expression (the regular expression -is assumed to start at the beginning of a line of text i.e. ^) default markers -:A~ to :C~ and 1~ to 6~ can be used within text instead, without this header -tag, and may be used to supplement the instructions provided in this header -tag if provided (@structure: is a synonym for @toc:) -

@level: newpage=3; -breakpage=4  [paragraph  level,  used  by  latex  to  breakpages,  the  page  in - newpage] -

@markup: information on the markup used, e.g. new=1,2,3; break=4; -num_top=4  [or newpage=1,2,3;  breakpage=4;  num_top=4] newpage and breakpage, -heading level, used by LaTeX to breakpages. breakpage: starts on a new page -in single column text and on a new column in double column text; newpage: -starts on a new page for both single and double column texts. num_top=4 - [auto-number  document,  starting  at  level  4.  the new default  is  to  provide - 3  levels,  as  in  1  level  4,  1.1  1.1.1  level  6,  markup  to  be  merged  within  level] -num_extract  [take  numbering  of  headings  provided  (manually  in  and  use - for  numbering  of  Available  where  a  clear  numbering  structure  is  without - the  repetition  of  a  number in  a  header.]  [In  0.38  notation,  you  would  map - to  the equivalent  levels,  the  examples  provided  would  map  to  the following - new=A,B,C;  break=1;  num_top=1   [or  newpage=A,B,C; breakpage=1;  num_top=1] -see headings] -

@bold:  [regular  expression  of  words/phrases  to  be  made - bold] -

@italics:  [regular  expression  of  words/phrases  to  italicise] -

-@vocabulary: name of taxonomy/vocabulary/wordlist to use against document + to  embed  version  (revision  control)  information  into  rcs  or  cvs  can  usefully + provide  a  history  of +

@structure: PART; CHAPTER; SECTION; ARTICLE; none; +none; optional, document structure can be defined by words to match or +regular expression (the regular expression is assumed to start at the beginning +of a line of text i.e. ^) default markers :A~ to :C~ and 1~ to 6~ can be used +within text instead, without this header tag, and may be used to supplement +the instructions provided in this header tag if provided (@structure: is +a synonym for @toc:) +

@level: newpage=3; breakpage=4  [paragraph  level, + used  by  latex  to  breakpages,  the  page  in  newpage] +

@markup: information +on the markup used, e.g. new=1,2,3; break=4; num_top=4  [or newpage=1,2,3; + breakpage=4;  num_top=4] newpage and breakpage, heading level, used by LaTeX +to breakpages. breakpage: starts on a new page in single column text and +on a new column in double column text; newpage: starts on a new page for +both single and double column texts. num_top=4  [auto-number  document,  starting + at  level  4.  the new default  is  to  provide  3  levels,  as  in  1  level  4,  1.1 + 1.1.1  level  6,  markup  to  be  merged  within  level] num_extract  [take  numbering + of  headings  provided  (manually  in  and  use  for  numbering  of  Available  where + a  clear  numbering  structure  is  without  the  repetition  of  a  number in  a + header.]  [In  0.38  notation,  you  would  map  to  the equivalent  levels,  the  examples + provided  would  map  to  the following  new=A,B,C;  break=1;  num_top=1   [or  newpage=A,B,C; +breakpage=1;  num_top=1] see headings] +

@bold:  [regular  expression  of  words/phrases + to  be  made  bold] +

@italics:  [regular  expression  of  words/phrases  to  italicise] + +

@vocabulary: name of taxonomy/vocabulary/wordlist to use against document

@skin: skin_doc_[name_of_desired_document_skin] skins change default settings related to the appearance of documents generated, such as the @@ -2082,7 +2075,7 @@ index.html

19. MARKUP AND OUTPUT EXAMPLES

19.1 MARKUP EXAMPLES

Current markup examples -and document output samples are provided at <http://www.jus.uio.no/sisu/SiSU/2.html +and document output samples are provided at <http://www.jus.uio.no/sisu/SiSU/examples.html >

Some markup with syntax highlighting may be found under <http://www.jus.uio.no/sisu/sample/syntax @@ -2553,39 +2546,39 @@ parts (such as images) will be downloaded and generated locally. 

  sisu -3 http://[provide  url  to  valid  .sst  or  .ssm  file]

Any of the source documents in the sisu examples page can be used in -this way, see <http://www.jus.uio.no/sisu/SiSU/2.html -> and use the url for the -desired document. -

NOTE: to set up a remote machine to serve SiSU documents -in this way, images should be in the directory relative to the document +this way, see <http://www.jus.uio.no/sisu/SiSU/examples.html +> and use the url +for the desired document. +

NOTE: to set up a remote machine to serve SiSU +documents in this way, images should be in the directory relative to the -

source ../_sisu/image +

document source ../_sisu/image

sisupod - zipped sisu files -

A sisupod is the zipped -content of a sisu marked up text or texts and any other associated parts -to the document such as images. -

SiSU can be run against a sisupod on a -(local or) remote machine, provide the processing instruction and the url, -the sisupod will be downloaded and the documents it contains generated +

A sisupod is +the zipped content of a sisu marked up text or texts and any other associated +parts to the document such as images. +

SiSU can be run against a sisupod +on a (local or) remote machine, provide the processing instruction and +the url, the sisupod will be downloaded and the documents it contains generated locally. 


  sisu -3 http://[provide  url  to  valid  sisupod.zip  or  .ssp  file]

Any of the source documents in the sisu examples page can be used in -this way, see <http://www.jus.uio.no/sisu/SiSU/2.html -> and use the url for the -desired document. +this way, see <http://www.jus.uio.no/sisu/SiSU/examples.html +> and use the url +for the desired document.

REMOTE DOCUMENT OUTPUT

28. REMOTE OUTPUT -

Once properly -configured SiSU output can be automatically posted once generated to a -designated remote machine using either rsync, or scp. -

In order to do this -some ssh authentication agent and keychain or similar tool will need to -be configured. Once that is done the placement on a remote host can be done -seamlessly with the -r (for scp) or -R (for rsync) flag, which may be used -in conjunction with other processing flags, e.g. +

+Once properly configured SiSU output can be automatically posted once generated +to a designated remote machine using either rsync, or scp. +

In order to +do this some ssh authentication agent and keychain or similar tool will +need to be configured. Once that is done the placement on a remote host +can be done seamlessly with the -r (for scp) or -R (for rsync) flag, which +may be used in conjunction with other processing flags, e.g. 


  sisu -3R sisu_remote.sst
@@ -2833,7 +2826,7 @@ to date as within the package itself:
 
 30.4 MARKUP SAMPLES
 
 
  A number of markup samples (along with output) are available off: 
-
  <http://www.jus.uio.no/sisu/SiSU/2.html
+
  <http://www.jus.uio.no/sisu/SiSU/examples.html
 >
 
 
  Additional markup samples are packaged separately in the file: 
@@ -3105,18 +3098,11 @@ following:
 
    man sisu_help

  
 
  man2html 
-
    <file:///usr/share/doc/sisu/html/sisu_help.1.html>

- 
 
    <http://www.jus.uio.no/sisu/man/sisu_help.1.html
 >

  
 
  sisu generated output - links to html 
-
    <file:///usr/share/doc/sisu/sisu_manual/sisu_help/index.html>

- 
-
    <http://sisudoc.org/sisu_manual/sisu_help/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_help/index.html
+
    <http://sisudoc.org/sisu/sisu_help/index.html
 >

  
 
  help sources lists 
@@ -3124,14 +3110,7 @@ following:
 listed here: 
 
    man sisu_help_sources

  
-
    <file:///usr/share/doc/sisu/sisu_manual/sisu_help_sources/index.html>

- 
-
    <file:///usr/share/doc/sisu/html/sisu_help_sources/index.html>

- 
-
    <http://sisudoc.org/sisu_manual/sisu_help_sources/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/index.html
+
    <http://sisudoc.org/sisu/sisu_help_sources/index.html
 >

  
 
 34.1 MAN PAGES 
@@ -3155,182 +3134,83 @@ listed here:
 prepared in SiSU and output is available in multiple formats including
 amongst others html, pdf, and odf which may be also be accessed via the
 html pages[^28] 
-
 34.2.1 LOCALLY INSTALLED 
-
  <file:///usr/share/doc/sisu/sisu_manual/sisu_manual/index.html>
-
-
  <file:///usr/share/doc/sisu/sisu_manual/sisu_help/index.html> 
-
  <file:///usr/share/doc/sisu/sisu_manual/sisu_help_sources/index.html>
-
-
    /usr/share/doc/sisu/sisu_manual/sisu/index.html

- 
-
    /usr/share/doc/sisu/sisu_manual/sisu_complete/index.html

- 
-
    /usr/share/doc/sisu/sisu_manual/sisu_pdf/index.html

- 
-
    /usr/share/doc/sisu/sisu_manual/sisu_postgresql/index.html

- 
-
    /usr/share/doc/sisu/sisu_manual/sisu_sqlite/index.html

- 
-
    /usr/share/doc/sisu/sisu_manual/sisu_termsheet/index.html

- 
-
    /usr/share/doc/sisu/sisu_manual/sisu_webrick/index.html

- 
-
 34.2.2 WWW.SISUDOC.ORG 
-
  <http://sisudoc.org/sisu_manual/sisu_manual/index.html
+
 34.2.1 WWW.SISUDOC.ORG 
+
  <http://sisudoc.org/sisu/sisu_manual/index.html
 >
 
-
    <http://sisudoc.org/sisu_manual/sisu/index.html
->

- 
-
    <http://sisudoc.org/sisu_manual/sisu_commands/index.html
->

- 
-
    <http://sisudoc.org/sisu_manual/sisu_complete/index.html
->

- 
-
    <http://sisudoc.org/sisu_manual/sisu_configuration/index.html
->

- 
-
    <http://sisudoc.org/sisu_manual/sisu_description/index.html
->

- 
-
    <http://sisudoc.org/sisu_manual/sisu_examples/index.html
->

- 
-
    <http://sisudoc.org/sisu_manual/sisu_faq/index.html
->

- 
-
    <http://sisudoc.org/sisu_manual/sisu_filetypes/index.html
->

- 
-
    <http://sisudoc.org/sisu_manual/sisu_help/index.html
->

- 
-
    <http://sisudoc.org/sisu_manual/sisu_help_sources/index.html
->

- 
-
    <http://sisudoc.org/sisu_manual/sisu_howto/index.html
+
    <http://sisudoc.org/sisu/sisu_manual/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_introduction/index.html
+
    <http://sisudoc.org/sisu/sisu_commands/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_manual/index.html
+
    <http://sisudoc.org/sisu/sisu_complete/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_markup/index.html
+
    <http://sisudoc.org/sisu/sisu_configuration/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_output_overview/index.html
+
    <http://sisudoc.org/sisu/sisu_description/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_pdf/index.html
+
    <http://sisudoc.org/sisu/sisu_examples/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_postgresql/index.html
+
    <http://sisudoc.org/sisu/sisu_faq/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_quickstart/index.html
+
    <http://sisudoc.org/sisu/sisu_filetypes/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_remote/index.html
+
    <http://sisudoc.org/sisu/sisu_help/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_search/index.html
+
    <http://sisudoc.org/sisu/sisu_help_sources/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_skin/index.html
+
    <http://sisudoc.org/sisu/sisu_howto/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_sqlite/index.html
+
    <http://sisudoc.org/sisu/sisu_introduction/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_syntax_highlighting/index.html
+
    <http://sisudoc.org/sisu/sisu_manual/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_vim/index.html
+
    <http://sisudoc.org/sisu/sisu_markup/index.html
 >

  
-
    <http://sisudoc.org/sisu_manual/sisu_webrick/index.html
+
    <http://sisudoc.org/sisu/sisu_output_overview/index.html
 >

  
-
 34.2.3 WWW.JUS.UIO.NO/SISU 
-
  <http://www.jus.uio.no/sisu/sisu_manual/sisu_manual/index.html
->
-
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu/index.html
+
    <http://sisudoc.org/sisu/sisu_pdf/index.html
 >

  
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_commands/index.html
+
    <http://sisudoc.org/sisu/sisu_postgresql/index.html
 >

  
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_complete/index.html
+
    <http://sisudoc.org/sisu/sisu_quickstart/index.html
 >

  
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_configuration/index.html
+
    <http://sisudoc.org/sisu/sisu_remote/index.html
 >

  
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_description/index.html
+
    <http://sisudoc.org/sisu/sisu_search/index.html
 >

  
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_examples/index.html
+
    <http://sisudoc.org/sisu/sisu_skin/index.html
 >

  
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_faq/index.html
+
    <http://sisudoc.org/sisu/sisu_sqlite/index.html
 >

  
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_filetypes/index.html
+
    <http://sisudoc.org/sisu/sisu_syntax_highlighting/index.html
 >

  
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_help/index.html
+
    <http://sisudoc.org/sisu/sisu_vim/index.html
 >

  
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_howto/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_introduction/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_manual/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_markup/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_output_overview/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_pdf/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_postgresql/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_quickstart/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_remote/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_search/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_skin/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_sqlite/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_syntax_highlighting/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_vim/index.html
->

- 
-
    <http://www.jus.uio.no/sisu/sisu_manual/sisu_webrick/index.html
+
    <http://sisudoc.org/sisu/sisu_webrick/index.html
 >

  
 
 34.3 MAN2HTML 
@@ -3350,40 +3230,9 @@ html pages[^28]
  
 
    /usr/share/doc/sisu/html/sisu_webrick.1.html

  
-
 34.3.2 WWW.SISUDOC.ORG 
-
  <http:///sisudoc.org/man/sisu_manual.1.html
-> 
-
  <http:///sisudoc.org/man/sisu_help.1.html
->
-
-
  <http:///sisudoc.org/man/sisu_help_sources.1.html
-> 
-
    <http://sisudoc.org/man/sisu.1.html
->

- 
-
    <http://sisudoc.org/man/sisu_complete.7.html
->

- 
-
    <http://sisudoc.org/man/sisu_pdf.7.html
->

- 
-
    <http://sisudoc.org/man/sisu_postgresql.7.html
->

- 
-
    <http://sisudoc.org/man/sisu_sqlite.7.html
->

- 
-
    <http://sisudoc.org/man/sisu_webrick.1.html
->

- 
-
 34.3.3 WWW.JUS.UIO.NO/SISU 
+
 34.3.2 WWW.JUS.UIO.NO/SISU 
 
  <http://www.jus.uio.no/sisu/man/sisu.1.html
 > 
-
  <http://www.jus.uio.no/sisu/man/sisu_help.1.html
->
-
-
  <http://www.jus.uio.no/sisu/man/sisu_help_sources.1.html
-> 
 
    <http://www.jus.uio.no/sisu/man/sisu.1.html
 >

  
@@ -3428,15 +3277,15 @@ Type: information
 
  Filetype: SiSU text insert
 
 
0.58 
-
  Sourcefile Digest, MD5(sisu._sst)= 7d1c79519108da1773a33367e1eba6b5
+
  Sourcefile Digest, MD5(sisu._sst)= 8aad6597f7572baae4f0ef75999e5b4f
 
-
  Skin_Digest: MD5(skin_sisu_manual.rb)= 20fc43cf3eb6590bc3399a1aef65c5a9
+
  Skin_Digest: MD5(skin_sisu_manual.rb)= 072b2584bedea82ea8a416587b9fa244
 
 
  Generated 
-
  Document (metaverse) last generated: Sat Sep 29 17:05:37
+
  Document (metaverse) last generated: Fri Oct 12 20:14:00
 
 
+0100 2007 
-
  Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25) 
+
  Generated by: SiSU 0.61.0 of 2007w41/1 (2007-10-08) 
 
  Ruby version:
 ruby 1.8.6 (2007-06-07 patchlevel 36)  [i486-linux] 
 
 
@@ -3554,15 +3403,15 @@ distributable are not freely changeable. .
  • named index.html or mo
 
 
    
 
-
    * Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25) 
    
+
    * Generated by: SiSU 0.61.0 of 2007w41/1 (2007-10-08) 
    
 
    
 
 
    * Ruby version: ruby
 1.8.6 (2007-06-07 patchlevel 36) [i486-linux] 
    
 
    
 
-
    * Last Generated on: Sat Sep 29
-17:05:38 +0100 2007 
    
+
    * Last Generated on: Fri Oct 12
+20:14:00 +0100 2007 
    
 
    
 
 
    * SiSU http://www.jus.uio.no/sisu
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
index 4a2b0011..92ee2b34 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
@@ -21,6 +21,9 @@ module SiSU_Viz
       #['sisu_manual_search','sisu_manual']
       #['sisu','ruby','sisu_search_libre','ruby','open_society']
     end
+    #def ocn_display_off
+    #  false
+    #end
     #% path
     def path_root
       './sisu/'                                                                  # the only parameter that cannot be changed here
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst
index 8b339c4d..d8cd48cb 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst
@@ -257,7 +257,7 @@ add -v for verbose mode and -c for color, e.g. sisu -2vc [filename or wildcard]
 
 consider -u for appended url info or -v for verbose output
 
-3~ Command Line with Flags - Batch Processing
+2~ Command Line with Flags - Batch Processing
 
 In the data directory run sisu -mh filename or wildcard eg. "sisu -h cisg.sst" or "sisu -h *.{sst,ssm}" to produce html version of all documents.
 
diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index e07eb22a..d3a3ba14 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2007-09-29" "0.59.1" "SiSU"
+.TH "sisu" "1" "2007-09-29" "0.61.0" "SiSU"
 .SH NAME
 sisu \- documents: markup, structuring, publishing in multiple standard formats, and search
 .SH SYNOPSIS
@@ -598,7 +598,7 @@ wildcard]
 consider \-u for appended url info or \-v for verbose output
 
 .SH
-5.0.1 COMMAND LINE WITH FLAGS \- BATCH PROCESSING
+5.1 COMMAND LINE WITH FLAGS \- BATCH PROCESSING
 
 .BR
 In the data directory run sisu \-mh filename or wildcard eg. \"sisu \-h
@@ -622,26 +622,24 @@ The most up to date information on sisu should be contained in the sisu_manual,
 available at:
 
 .BR
-  
+  
 
 .BR
-and (from
+The manual can be generated from source, found respectively, either within the
 .B SiSU
-0.59 onwards) installed locally at:
+tarball or installed locally at:
 
 .BR
-  /usr/share/doc/sisu/sisu_manual/
+  \./data/doc/sisu/sisu_markup_samples/sisu_manual/
 
 .BR
-or equivalent directory
+  /usr/share/doc/sisu/sisu_markup_samples/sisu_manual/
 
 .BR
-Within the
-.B SiSU
-tarball at:
+move to the respective directory and type e.g.:
 
 .BR
-  \./data/doc/sisu/sisu_manual/
+  sisu sisu_manual.ssm
 
 .SH
 6.2 SISU MAN PAGES
@@ -760,10 +758,7 @@ For lists of alternative help sources, see:
   /usr/share/doc/sisu/html/sisu_help_sources/index.html
 
 .BR
-  
-
-.BR
-  
+  
 
 .SH
 7. INTRODUCTION TO SISU MARKUP[^9]
@@ -823,7 +818,7 @@ markup or sisu \-\-help markup
 
 .BR
 Online markup examples are available together with the respective outputs
-produced from  or from
+produced from  or from
 
 
 .BR
@@ -896,7 +891,7 @@ This current document has a header similar to this one (without the comments):
   % skins modify the appearance of a document and are placed in a sub\-directory under \./_sisu/skin ~/.sisu/skin or /etc/sisu/skin. A skin may affect single documents that request them, all documents in a directory, or be site\-wide. (A document is affected by a single skin)
   @bold: /Gnu|Debian|Ruby|SiSU/
   @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
-  { Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+  { Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
   { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
   { SiSU @ Freshmeat }http://freshmeat.net/projects/sisu/
   { SiSU @ Ruby Application Archive }http://raa.ruby\-lang.org/project/sisu/
@@ -2852,7 +2847,7 @@ skin_poems.rb
 
 .BR
 Current markup examples and document output samples are provided at
-
+
 
 .BR
 Some markup with syntax highlighting may be found under
@@ -3471,8 +3466,8 @@ processing instruction and the url. The source file and any associated parts
 
 .BR
 Any of the source documents in the sisu examples page can be used in this way,
-see  and use the url for the desired
-document.
+see  and use the url for the
+desired document.
 
 .BR
 NOTE: to set up a remote machine to serve
@@ -3500,8 +3495,8 @@ documents it contains generated locally.
 
 .BR
 Any of the source documents in the sisu examples page can be used in this way,
-see  and use the url for the desired
-document.
+see  and use the url for the
+desired document.
 
 .SH
 REMOTE DOCUMENT OUTPUT
@@ -3919,7 +3914,7 @@ sisu \-\-help \-\-markup
 A number of markup samples (along with output) are available off:
 
 .BR
-
+
 
 .BR
 Additional markup samples are packaged separately in the file:
@@ -4316,9 +4311,6 @@ try one of the following:
 .BR
 .B man2html
 
-.BR
-  
-
 .BR
   
 
@@ -4326,13 +4318,7 @@ try one of the following:
 .B sisu generated output \- links to html
 
 .BR
-  
-
-.BR
-  
-
-.BR
-  
+  
 
 .BR
 .B help sources lists
@@ -4344,16 +4330,7 @@ Alternative sources for this help sources page listed here:
   man sisu_help_sources
 
 .BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
+  
 
 .SH
 34.1 MAN PAGES
@@ -4394,199 +4371,85 @@ and output is available in multiple formats including amongst others html,
 pdf, and odf which may be also be accessed via the html pages[^28]
 
 .SH
-34.2.1 LOCALLY INSTALLED
-
-.BR
-
-
-.BR
-
-
-.BR
-
-
-.BR
-  /usr/share/doc/sisu/sisu_manual/sisu/index.html
-
-.BR
-  /usr/share/doc/sisu/sisu_manual/sisu_complete/index.html
-
-.BR
-  /usr/share/doc/sisu/sisu_manual/sisu_pdf/index.html
-
-.BR
-  /usr/share/doc/sisu/sisu_manual/sisu_postgresql/index.html
-
-.BR
-  /usr/share/doc/sisu/sisu_manual/sisu_sqlite/index.html
-
-.BR
-  /usr/share/doc/sisu/sisu_manual/sisu_termsheet/index.html
-
-.BR
-  /usr/share/doc/sisu/sisu_manual/sisu_webrick/index.html
-
-.SH
-34.2.2 WWW.SISUDOC.ORG
-
-.BR
-
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.SH
-34.2.3 WWW.JUS.UIO.NO/SISU
+34.2.1 WWW.SISUDOC.ORG
 
 .BR
-
+
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .BR
-  
+  
 
 .SH
 34.3 MAN2HTML
@@ -4619,47 +4482,11 @@ pdf, and odf which may be also be accessed via the html pages[^28]
   /usr/share/doc/sisu/html/sisu_webrick.1.html
 
 .SH
-34.3.2 WWW.SISUDOC.ORG
-
-.BR
-
-
-.BR
-
-
-.BR
-
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.BR
-  
-
-.SH
-34.3.3 WWW.JUS.UIO.NO/SISU
+34.3.2 WWW.JUS.UIO.NO/SISU
 
 .BR
 
 
-.BR
-
-
-.BR
-
-
 .BR
   
 
@@ -4746,24 +4573,24 @@ Filetype:
 
 .BR
 Sourcefile Digest, MD5(sisu._sst)=
-.I 7d1c79519108da1773a33367e1eba6b5
+.I 8aad6597f7572baae4f0ef75999e5b4f
 
 .BR
 Skin_Digest: MD5(skin_sisu_manual.rb)=
-.I 20fc43cf3eb6590bc3399a1aef65c5a9
+.I 072b2584bedea82ea8a416587b9fa244
 
 .BR
 .B Generated
 
 .BR
 Document (metaverse) last generated:
-.I Sat Sep 29 17:05:37 +0100 2007
+.I Fri Oct 12 20:14:00 +0100 2007
 
 .BR
 Generated by:
 .I SiSU
-.I 0.59.1
-of 2007w39/2 (2007\-09\-25)
+.I 0.61.0
+of 2007w41/1 (2007\-10\-08)
 
 .BR
 Ruby version:
@@ -4920,10 +4747,10 @@ pdf: 
 at: 
 .TP
 .TP
-* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25)
+* Generated by: SiSU 0.61.0 of 2007w41/1 (2007-10-08)
 .TP
 * Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux]
 .TP
-* Last Generated on: Sat Sep 29 17:05:38 +0100 2007
+* Last Generated on: Fri Oct 12 20:14:00 +0100 2007
 .TP
 * SiSU http://www.jus.uio.no/sisu
-- 
cgit v1.2.3


From 6867253ed06ebfd365a9300f57e550b2b9379441 Mon Sep 17 00:00:00 2001
From: Ralph Amissah 
Date: Fri, 12 Oct 2007 20:21:49 +0100
Subject: minor cleaning, note that object character numbering for html and pdf
 can be changed within skin

---
 conf/sisu/skin/doc/skin_sisu.rb | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/conf/sisu/skin/doc/skin_sisu.rb b/conf/sisu/skin/doc/skin_sisu.rb
index ad1d42a6..ca82f4dc 100644
--- a/conf/sisu/skin/doc/skin_sisu.rb
+++ b/conf/sisu/skin/doc/skin_sisu.rb
@@ -11,65 +11,54 @@
 module SiSU_Viz
   require SiSU_lib + '/defaults'
   class Skin
-    #% widget
     def widget_search
       true
     end
     def widget_promo
-#put  s "#{__LINE__} #{__FILE__}"
       #['sisu','ruby','sisu_search_libre','ruby','open_society']
     end
-    #% path
+    #def ocn_display_off
+    #  false
+    #end
     def path_root
-#puts "#{__LINE__} #{__FILE__}"
       './sisu/'                                                                  # the only parameter that cannot be changed here
     end
     def path_rel
-#puts "#{__LINE__} #{__FILE__}"
       '../'
     end
-    #% url
     def url_home
-#puts "#{__LINE__} #{__FILE__}"
       'http://www.jus.uio.no/sisu/'
     end
     def url_site                                                                     # used in pdf header
-#puts "#{__LINE__} #{__FILE__}"
       'http://www.jus.uio.no/sisu'
     end
     def url_txt                                                                      # text to go with url usually stripped url
-#puts "#{__LINE__} #{__FILE__}"
       'www.jus.uio.no/sisu/'
     end
     def url_home_url
-#puts "#{__LINE__} #{__FILE__}"
       '../index.html'
     end
     #def url_root_http
       #root server path info, used in document information
     #end
-    #% color
     def color_band1
       '"#ffffff"'
     end
     def color_band2
       '"#ffffff"'
     end
-    #% text
     def text_hp
       ' SiSU'
     end
     def text_home
       'SiSU'
     end
-    #% icon
     def icon_home_button
       'sisu.png'
     end
     def icon_home_banner
       icon_home_button
     end
-    #% banner
     def banner_home_button
       %{
    #{png_home}
    \n}
     end
-- 
cgit v1.2.3


From c6090f3f0277ba4fe62841a39c0f0fde2cd8c5bc Mon Sep 17 00:00:00 2001
From: Ralph Amissah 
Date: Fri, 12 Oct 2007 20:27:00 +0100
Subject: for html and latex/pdf permit switch off of object numbering display
 from within skins

---
 lib/sisu/v0/html_format.rb |  6 +++++-
 lib/sisu/v0/texpdf.rb      | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb
index e1109a6a..090c779a 100644
--- a/lib/sisu/v0/html_format.rb
+++ b/lib/sisu/v0/html_format.rb
@@ -63,9 +63,13 @@ module SiSU_HTML_Format
       @md=md
       @paranum=paranum[/(\d+)/m,1]
       @paranum ||=''
+      vz=SiSU_Env::Get_init.instance.skin
+      @skin_no_ocn=if defined? vz.ocn_display_off and vz.ocn_display_off == true; true
+      else false
+      end
     end
     def ocn_display
-      if @md.markup.inspect =~/no_ocn/ or @md.mod.inspect =~/--no-ocn/
+      if @md.markup.inspect =~/no_ocn/ or @md.mod.inspect =~/--no-ocn/ or @skin_no_ocn
         ocn_class='ocn_off'
         @paranum.gsub(/^(\d+|)$/,
         %{  
    
diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb
index be8c973e..4b4613b0 100644
--- a/lib/sisu/v0/texpdf.rb
+++ b/lib/sisu/v0/texpdf.rb
@@ -240,6 +240,10 @@ module SiSU_TeX
         @tex=SiSU_TeX_Pdf::Use_TeX.new(@md,@orientation)
         @vz=SiSU_Env::Get_init.instance.skin
         @dp=@@dp ||=SiSU_Env::Info_env.new.digest.pattern
+        vz=SiSU_Env::Get_init.instance.skin
+        @skin_no_ocn=if defined? vz.ocn_display_off and vz.ocn_display_off == true; true
+        else false
+        end
       end
       def songsheet
         begin
@@ -268,7 +272,11 @@ module SiSU_TeX
           if @md.flag_tables
            data=tables(data)
           end
-          data=number_paras(data) if @md.markup.inspect !~/no_ocn/ and @md.mod.inspect !~/--no-ocn/ #check
+          ocn=if @md.markup.inspect =~/no_ocn/ or @md.mod.inspect =~/--no-ocn/ or @skin_no_ocn
+            false
+           else true
+           end
+          data=number_paras(data,ocn)
           data=markup(data)
           output(data)
         rescue; SiSU_Errors::Info_error.new($!,$@,@md.fns,@md.cmd).error
@@ -554,13 +562,15 @@ WOK
         end
         @tex_file << "\n\\end{document}"
       end
-      def number_paras(data)
+      def number_paras(data,ocn)
         @tex_file=[]
         data.each do |para|
           if para =~/<\\~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/ and para !~/\\end\{longtable\}|/ #catch 
             m=/(.+?)<\\~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/m
             parablock=para[m,1]
-            paranum=para[m,2]
+            paranum=if ocn; para[m,2]
+            else ''
+            end
             do_duo=SiSU_TeX_Pdf::Format_text_object.new(@md,parablock,paranum)
             para=do_duo.para_num if parablock
           elsif para =~/^<~\d+;(?:[oh]|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/ #2005 this is added for tables, rationalise
-- 
cgit v1.2.3


From 01f5d52b9af88378d49af20ade8dc6d8d0573830 Mon Sep 17 00:00:00 2001
From: Ralph Amissah 
Date: Fri, 12 Oct 2007 20:28:10 +0100
Subject: available outputs shortcut display, description of odf:odt expanded

---
 lib/sisu/v0/dal.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb
index 8e514725..132da336 100644
--- a/lib/sisu/v0/dal.rb
+++ b/lib/sisu/v0/dal.rb
@@ -385,7 +385,7 @@ module SiSU_DAL
             when /doc.html/;           ' html, scroll, document in one'
             when /landscape.pdf/;      ' pdf, landscape'
             when /portrait.pdf/;       ' pdf, portrait'
-            when /opendocument.odt/;   ' open document'
+            when /opendocument.odt/;   ' odf:odt, open document text'
             when /scroll.xhtml/;       ' xhtml scroll'
             when /sax.xml/;            ' xml, sax'
             when /dom.xml/;            ' xml, dom'
-- 
cgit v1.2.3


From b05af2073ff99a2aa218e452afec41907a240dc3 Mon Sep 17 00:00:00 2001
From: Ralph Amissah 
Date: Fri, 12 Oct 2007 20:29:42 +0100
Subject: xml dom extract footnote from grouped text

---
 lib/sisu/v0/xml.rb     | 1 +
 lib/sisu/v0/xml_dom.rb | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/sisu/v0/xml.rb b/lib/sisu/v0/xml.rb
index d6db3ca7..e739bf59 100644
--- a/lib/sisu/v0/xml.rb
+++ b/lib/sisu/v0/xml.rb
@@ -256,6 +256,7 @@ WOK
       def poem_structure(para='',ocn='')
         para.gsub!(/<:verse(?:-end)?>/,'')
         para=@trans.markup_group(para)
+        #para.gsub!(/\s\s/,'  ')
         para.strip!
         @@xml[:body] << %{#{@tab*0}} << "\n"
         @@xml[:body] << %{#{@tab*1}#{ocn}} << "\n"
diff --git a/lib/sisu/v0/xml_dom.rb b/lib/sisu/v0/xml_dom.rb
index 83b15dc8..14cc162f 100644
--- a/lib/sisu/v0/xml_dom.rb
+++ b/lib/sisu/v0/xml_dom.rb
@@ -287,6 +287,8 @@ WOK
       def group_structure(para='',ocn='')
         para.gsub!(/<:group(?:-end)?>/,'')
         para=@trans.markup_group(para)
+        para.gsub!(/~\{(\d+)\s+(.+?)\s*<#@dp>\}~/m,
+          '\1\2 ')
         para.strip!
         @@xml[:body] << %{#{@tab*6}} << "\n"
         @@xml[:body] << %{#{@tab*7}#{ocn}} << "\n"
-- 
cgit v1.2.3


From 6acc0270d1323cbdfd4a7c89377cdb7604895d63 Mon Sep 17 00:00:00 2001
From: Ralph Amissah 
Date: Fri, 12 Oct 2007 20:30:33 +0100
Subject: special character exceptions, some fixes, primarily underscore

---
 CHANGELOG                       | 15 ++++++++++-----
 lib/sisu/v0/html_tune.rb        |  2 +-
 lib/sisu/v0/manpage.rb          |  4 ++--
 lib/sisu/v0/odf.rb              |  7 +++++--
 lib/sisu/v0/plaintext.rb        |  4 ++--
 lib/sisu/v0/shared_html_lite.rb |  2 +-
 lib/sisu/v0/shared_xml.rb       |  4 ++--
 lib/sisu/v0/texpdf_format.rb    |  1 +
 8 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 47a68840..4dd3eccb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,9 +21,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz
     document, (rather than just e.g. the document title) [affects document
     objects and numbering where used, hence version number bump]
 
-  * html, pdf, text object switch off @markup: no_ocn (or command line flag
-    --no-ocn), in html objects are still named, (i.e. will still work with
-    searches though the relevance of the numbers returned is obscured)
+  * html, pdf, switch text object numbering off, may be set in: (a) document
+    header, @markup: no_ocn; (b) skin (for documents sharing that skin) "def
+    ocn_display_off" and set to true;  or (c) as a processing flag "sisu -hpv
+    --no-ocn [filename]". NOTE, now in html objects are still named, (i.e. will
+    still work with searches though the relevance of the numbers returned is
+    obscured)
 
   * shared markup source, composite documents, look to processing directory for
     both text (share source) and binary (sisupod (make))
@@ -35,8 +38,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz
       dynamic building of some documents)
     * sysenv (default) replaced (obsoleted) -A with -a
 
-  * sisu manual, download info, change links to source to archive, rather than
-    transient repo
+  * sisu manual, manpage, download info, change links to source to archive,
+    rather than transient repo
+
+  * special character exceptions, some fixes
 
 %% sisu_0.60.1.orig.tar.gz (2007-10-07:40/7)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.1.orig.tar.gz
diff --git a/lib/sisu/v0/html_tune.rb b/lib/sisu/v0/html_tune.rb
index b98f19d8..82183a02 100644
--- a/lib/sisu/v0/html_tune.rb
+++ b/lib/sisu/v0/html_tune.rb
@@ -333,7 +333,7 @@ module SiSU_Tune
             end
             para.gsub!(//m,'>') #code-block: angle brackets special characters
+        else para.gsub!(/(?=^|[^}])_/m,'>') #code-block: angle brackets special characters
         end
         @tuned_file << para
       end
diff --git a/lib/sisu/v0/manpage.rb b/lib/sisu/v0/manpage.rb
index 304bcda1..10480b90 100644
--- a/lib/sisu/v0/manpage.rb
+++ b/lib/sisu/v0/manpage.rb
@@ -338,8 +338,8 @@ WOK
           para.gsub!(/-/,'\-') #manpages use this
           para.gsub!(/~/,'~') if para #manpages use this
           if para =~/<:(?:group|verse|alt|code)(?:-end)?>(?:\s+<~(\d+);(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>)?/
-            if para =~/<:code>/
-              para.gsub!(/_/m,'>') #code-block: angle brackets special characters
+            if para =~/<:code>/ #code-block: angle brackets special characters
+              para.gsub!(/(?=^|[^}])_/m,'>')
             end
             para.gsub!(//,"\n\n.P\n\n")                                   # watch
             para.gsub!(/<:(?:group|verse|alt)(?:\\-end)?>(?:\s+<~(\d+);(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>)?/,'')
diff --git a/lib/sisu/v0/odf.rb b/lib/sisu/v0/odf.rb
index 610a51aa..171372a9 100644
--- a/lib/sisu/v0/odf.rb
+++ b/lib/sisu/v0/odf.rb
@@ -473,8 +473,11 @@ module SiSU_ODF
             para=para_array.join(' ')
             para=para.strip
           end
-          para.gsub!(/_/m,'>') #code-block: angle brackets special characters
-          #para.gsub!(//,'>')
+          if para =~/<:code>/ #code-block: angle brackets special characters
+            para.gsub!(/(?=^|[^}])_/m,'>')
+          end
+          ##para.gsub!(/_/m,'\1>') #code-block: angle brackets special characters
+          #para.gsub!(/_/m,'>') #code-block: angle brackets special characters
           para.gsub!(/^(<:i[1-9]>\s+)?_\*\s+/,'\1 ') # bullet_09.png
           #para.gsub!(/^(<:i[1-9]>\s+)?_\*\s+/,'\1● ')     #bullet
           #para.gsub!(/^(<:i[1-9]>\s+)?_\*\s+/,'\1● ') # bullet utf8, make smaller if used
diff --git a/lib/sisu/v0/plaintext.rb b/lib/sisu/v0/plaintext.rb
index c308dfb2..361624e1 100644
--- a/lib/sisu/v0/plaintext.rb
+++ b/lib/sisu/v0/plaintext.rb
@@ -335,8 +335,8 @@ WOK
             para.gsub!(/©/,'©')
           end
           if para =~/<:(?:group|verse|alt|code)(?:-end)?>(?:\s+<~(\d+);(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>)?/
-            if para =~/<:code>/
-              para.gsub!(/_/m,'>') #code-block: angle brackets special characters
+            if para =~/<:code>/ #code-block: angle brackets special characters
+              para.gsub!(/(?=^|[^}])_/m,'>')
             end
             para.gsub!(//,"\n")                                   # watch
             para.gsub!(/<:(?:group|verse|alt|code)(?:-end)?>(?:\s+<~(\d+);(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>)?/,'')
diff --git a/lib/sisu/v0/shared_html_lite.rb b/lib/sisu/v0/shared_html_lite.rb
index 85368a28..d63f4cef 100644
--- a/lib/sisu/v0/shared_html_lite.rb
+++ b/lib/sisu/v0/shared_html_lite.rb
@@ -133,7 +133,7 @@ module SiSU_Format_Shared
         para.gsub!(/\b[_\\]((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,'\1\2') #http ftp matches escaped, no decoration
         para.gsub!(/((?:^|\s)[}])((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,'\1\2\3') #special case \{ e.g. \}http://url
         para.gsub!(/(^|\s)((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?=\s|$))/,%{\\1#{@url_brace.xml_open}\\2#{@url_brace.xml_close}\\3}) #http ftp matches with decoration
-      else para.gsub!(/_/m,'>') #code-block: angle brackets special characters
+      else para.gsub!(/(?=^|[^}])_/m,'>') #code-block: angle brackets special characters
       end
       para
     end
diff --git a/lib/sisu/v0/shared_xml.rb b/lib/sisu/v0/shared_xml.rb
index da1891e5..62e8b5ca 100644
--- a/lib/sisu/v0/shared_xml.rb
+++ b/lib/sisu/v0/shared_xml.rb
@@ -365,7 +365,7 @@ module SiSU_XML_munge
         para.gsub!(/ /,' ')
         #para.gsub!(/ /,' ') #clean
       else
-        para.gsub!(/_/m,'>') #code-block: angle brackets special characters
+        para.gsub!(/(?=^|[^}])_/m,'>') #code-block: angle brackets special characters
         para.gsub!(/ /,' ')
       end
       para
@@ -391,7 +391,7 @@ module SiSU_XML_munge
     def markup_group(para='')
       para.gsub!(//,'>')
       para.gsub!(/<:?br(?:\s+\/)?>/,'
    ')
-      para.gsub!(/<(link xmlns:xlink=".+?)">/,'<"\1">')
+      para.gsub!(/<(link xmlns:xlink=".+?")>/,'<\1>')
       para.gsub!(/<(\/link)>/,'<\1>')
       para.gsub!(/<(\/?en)>/,'<\1>')
       para
diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v0/texpdf_format.rb
index bf93ce9c..7798e886 100644
--- a/lib/sisu/v0/texpdf_format.rb
+++ b/lib/sisu/v0/texpdf_format.rb
@@ -519,6 +519,7 @@ WOK
       @string.gsub!(/(.+?)<\/i>/,'\emph{\1}')
       @string.gsub!(/(.+?)<\/italic>/,'\emph{\1}')
       @string.gsub!(/(.+?)<\/u>/,'\uline{\1}') # ulem
+      @string.gsub!(/(.+?)<\/cite>/,"``\\1''") # quote
       @string.gsub!(/(.+?)<\/ins>/,'\uline{\1}') # ulem
       @string.gsub!(/(.+?)<\/del>/,'\sout{\1}') # ulem
       @string.gsub!(/(.+?)<\/sub>/,"\$_{\\textrm{\\1}}\$")
-- 
cgit v1.2.3