diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-02-05 00:44:13 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-02-05 00:45:59 -0500 |
| commit | e74053c57b5c3bbd7f4f3676b5a6e867783af6ed (patch) | |
| tree | 63afa9f5cbd0547128c6d107d3eceb5f9ee2d88a | |
| parent | v5 v6: html, name tag related (output "cleaning") (diff) | |
v5 v6: options, html --strict instruction
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 5 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 5 | ||||
| -rw-r--r-- | lib/sisu/v5/options.rb | 13 | ||||
| -rw-r--r-- | lib/sisu/v5/sysenv.rb | 13 | ||||
| -rw-r--r-- | lib/sisu/v6/options.rb | 13 | ||||
| -rw-r--r-- | lib/sisu/v6/sysenv.rb | 13 |
6 files changed, 60 insertions, 2 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 321ac1fb..fd184ca7 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -40,7 +40,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.1.orig.tar.xz * ao, document tags +* options + * --strict html option + * html cleaning + * --strict html option + (various changes, e.g. ocn [url]#37 only available as [url]#o37) * tags * error/warn messages, including wrappers round require diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 0b2cf5e8..8433dc63 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -30,7 +30,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.1.orig.tar.xz * ao, document tags +* options + * --strict html option + * html cleaning + * --strict html option + (various changes, e.g. ocn [url]#37 only available as [url]#o37) * tags * error/warn messages, including wrappers round require diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v5/options.rb index 112a7a09..d3a40407 100644 --- a/lib/sisu/v5/options.rb +++ b/lib/sisu/v5/options.rb @@ -769,12 +769,23 @@ module SiSU_Commandline { bool: false, set: :off } else { bool: true, set: :na } end - act[:html]=if (cmd =~/h/ \ + act[:html]=if mod.inspect =~/"--html-strict"/ \ + or ((cmd =~/h/ || mod.inspect =~/"--html"/) \ + && mod.inspect =~/"--strict"/) + act[:html_strict]={ bool: true, set: :on } + act[:html_scroll]={ bool: true, set: :on } + act[:html_seg]={ bool: true, set: :on } + { bool: true, set: :on } + elsif (cmd =~/h/ \ || mod.inspect =~/"--html"/) + act[:html_strict]={ bool: false, set: :off } act[:html_scroll]={ bool: true, set: :on } act[:html_seg]={ bool: true, set: :on } { bool: true, set: :on } else + act[:html_strict]=(mod.inspect =~/"--strict"/) \ + ? { bool: true, set: :on } + : { bool: false, set: :na } act[:html_scroll]=(mod.inspect =~/"--html-scroll"/) \ ? { bool: true, set: :on } : { bool: false, set: :na } diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/sysenv.rb index 60a6053a..3779ff51 100644 --- a/lib/sisu/v5/sysenv.rb +++ b/lib/sisu/v5/sysenv.rb @@ -3905,6 +3905,19 @@ WOK true end end + def html_strict? + if cmd_rc_act[:html_strict][:set]==:on + true + elsif cmd_rc_act[:html_strict][:set]==:off + false + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.html_strict? \ + and doc_rc.html_strict? ==:on + true + else + false + end + end def toc? if cmd_rc_act[:toc][:set]==:on true diff --git a/lib/sisu/v6/options.rb b/lib/sisu/v6/options.rb index 93d11acc..30d3a257 100644 --- a/lib/sisu/v6/options.rb +++ b/lib/sisu/v6/options.rb @@ -769,12 +769,23 @@ module SiSU_Commandline { bool: false, set: :off } else { bool: true, set: :na } end - act[:html]=if (cmd =~/h/ \ + act[:html]=if mod.inspect =~/"--html-strict"/ \ + or ((cmd =~/h/ || mod.inspect =~/"--html"/) \ + && mod.inspect =~/"--strict"/) + act[:html_strict]={ bool: true, set: :on } + act[:html_scroll]={ bool: true, set: :on } + act[:html_seg]={ bool: true, set: :on } + { bool: true, set: :on } + elsif (cmd =~/h/ \ || mod.inspect =~/"--html"/) + act[:html_strict]={ bool: false, set: :off } act[:html_scroll]={ bool: true, set: :on } act[:html_seg]={ bool: true, set: :on } { bool: true, set: :on } else + act[:html_strict]=(mod.inspect =~/"--strict"/) \ + ? { bool: true, set: :on } + : { bool: false, set: :na } act[:html_scroll]=(mod.inspect =~/"--html-scroll"/) \ ? { bool: true, set: :on } : { bool: false, set: :na } diff --git a/lib/sisu/v6/sysenv.rb b/lib/sisu/v6/sysenv.rb index 8f40212b..10de1fdd 100644 --- a/lib/sisu/v6/sysenv.rb +++ b/lib/sisu/v6/sysenv.rb @@ -3905,6 +3905,19 @@ WOK true end end + def html_strict? + if cmd_rc_act[:html_strict][:set]==:on + true + elsif cmd_rc_act[:html_strict][:set]==:off + false + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.html_strict? \ + and doc_rc.html_strict? ==:on + true + else + false + end + end def toc? if cmd_rc_act[:toc][:set]==:on true |