diff options
| -rw-r--r-- | CHANGELOG | 15 | ||||
| -rw-r--r-- | lib/sisu/v0/dal.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v0/html_format.rb | 15 |
3 files changed, 26 insertions, 6 deletions
@@ -3,6 +3,21 @@ Reverse Chronological: %% STABLE MANIFEST +%% 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 + sisu_0.60.1.orig.tar.gz + sisu_0.60.1-1.dsc + sisu_0.60.1-1.diff.gz + + * param, multi-line parse, fixing @link: header + + * dal, fix to shortcut for listing available generated output (without source) + + * html, where no ocn selected, keep ocn id, just remove visible reference to + ocn, as search result links will continue to function + + * sisu_manual, link to markup and book examples updated/corrected + %% sisu_0.60.0.orig.tar.gz (2007-10-03:40/3) http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz 1d8d5b58c96bf403961fd4f5b78a5e7d 1474187 sisu_0.60.0.orig.tar.gz diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb index 0af589f2..15d1c55c 100644 --- a/lib/sisu/v0/dal.rb +++ b/lib/sisu/v0/dal.rb @@ -376,7 +376,7 @@ module SiSU_DAL para.gsub!(/^@(\S+?):([+-])\s+/,'0~\1\2 ') end if para !~/^%+\s/ and - para =~/^(?:_\*\s+)?\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]+))\]\}(?:\.\.\/\S+?\/|\S+?\.(?:sst|ssm)\b)(?:\s+~\{.+?\}~)?(?:\s+\*~\S+)*\s*$/ + para =~/^(?:_\*\s+)?\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.(?:sst|ssm)\b)(?:\s+~\{.+?\}~)?(?:\s+\*~\S+)*\s*$/ txt,cmd,source,url_dir,note,manifest=nil,nil,nil,nil,nil,nil url_and_stub=SiSU_Env::Info_env.new.url if defined? url_and_stub.remote diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb index 5a28c271..e1109a6a 100644 --- a/lib/sisu/v0/html_format.rb +++ b/lib/sisu/v0/html_format.rb @@ -63,16 +63,21 @@ module SiSU_HTML_Format @md=md @paranum=paranum[/(\d+)/m,1] @paranum ||='' - @paranum='' if @md.mod.inspect =~/--no-ocn/ end def ocn_display - ocn_class=if @md.mod.inspect =~/--no-ocn/; 'ocn_off' - else 'ocn' - end - @paranum.gsub(/^(\d+|)$/, + if @md.markup.inspect =~/no_ocn/ or @md.mod.inspect =~/--no-ocn/ + ocn_class='ocn_off' + @paranum.gsub(/^(\d+|)$/, + %{ <p class="#{ocn_class}"> + + </p>}) + else + ocn_class='ocn' + @paranum.gsub(/^(\d+|)$/, %{ <p class="#{ocn_class}"> \\1 </p>}) + end end def name %{<a name="#@paranum" />} |