diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-11-05 23:40:24 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-11-05 23:40:24 -0500 |
| commit | 636e311e5c3a1fb444b6d913c9caee0ec6bd51f5 (patch) | |
| tree | 68443e4b40d832efbd096242e547ac8f214c1fa4 /lib/sisu/v5/options.rb | |
| parent | debian/changelog (4.2.10-1) (diff) | |
| parent | v5: xml, scaffold, re-activated, split into sisu structure & collapsed structure (diff) | |
Merge tag 'sisu_4.2.11' into debian/sid
SiSU 4.2.11
Diffstat (limited to 'lib/sisu/v5/options.rb')
| -rw-r--r-- | lib/sisu/v5/options.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v5/options.rb index 5bf851e3..7203f8b2 100644 --- a/lib/sisu/v5/options.rb +++ b/lib/sisu/v5/options.rb @@ -861,6 +861,12 @@ module SiSU_Commandline || mod.inspect =~/"--xml-dom"/) \ ? { bool: true, set: :on } : { bool: false, set: :na } + act[:xml_scaffold_structure_sisu]=mod.inspect =~/"--xml-scaffold"|"--xml-scaffold-sisu"/ \ + ? { bool: true, set: :on } + : { bool: false, set: :na } + act[:xml_scaffold_structure_collapse]=mod.inspect =~/"--xml-scaffold-collapse"/ \ + ? { bool: true, set: :on } + : { bool: false, set: :na } act[:xhtml]=(cmd =~/b/ \ || mod.inspect =~/"--xhtml"/) \ ? { bool: true, set: :on } @@ -979,7 +985,9 @@ module SiSU_Commandline || act[:sisupod][:set]==:on \ || act[:concordance][:set]==:on \ || act[:xml_dom][:set]==:on \ - || act[:xml_sax][:set]==:on ) + || act[:xml_sax][:set]==:on \ + || act[:xml_scaffold_structure_sisu][:set]==:on \ + || act[:xml_scaffold_structure_collapse][:set]==:on ) { bool: true, set: :on } #if cmd !~/[mn]/ # extra+=if cmd =~/[abegHhIiLNOoPpQTtwXxyz]/ \ @@ -1021,7 +1029,9 @@ module SiSU_Commandline || act[:sisupod][:set]==:on \ || act[:concordance][:set]==:on \ || act[:xml_dom][:set]==:on \ - || act[:xml_sax][:set]==:on ) + || act[:xml_sax][:set]==:on \ + || act[:xml_scaffold_structure_sisu][:set]==:on \ + || act[:xml_scaffold_structure_collapse][:set]==:on ) { bool: true, set: :on } ## if cmd !~/y/ ## extra+=if cmd =~/[abeHhIiNopQSstwXxz]/ \ |