diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:16 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:16 +0100 |
commit | e1ec4bd2dad2bd22ad97cea398ae1cfcfae183a2 (patch) | |
tree | 6ffe3ae1b2453578a032ce053934a31f980645e9 /lib/sisu/v0/html_format.rb | |
parent | regex matching of images, (and rearrangement of conditionals) (diff) |
mostly the arrangement of conditionals
Diffstat (limited to 'lib/sisu/v0/html_format.rb')
-rw-r--r-- | lib/sisu/v0/html_format.rb | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb index e770a339..27e6b817 100644 --- a/lib/sisu/v0/html_format.rb +++ b/lib/sisu/v0/html_format.rb @@ -64,12 +64,16 @@ module SiSU_HTML_Format @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 + @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/ or @skin_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+|)$/, %{ <p class="#{ocn_class}"> @@ -227,7 +231,8 @@ module SiSU_HTML_Format </td>} end def pdf - pdf=if @md.programs[:pdf] and @cf_defaults.cf_0 =~/p/ + pdf=if @md.programs[:pdf] \ + and @cf_defaults.cf_0 =~/p/ %{ <td align="center" bgcolor=#{@vz.color_band2}> <a href="#{@md.fn[:pdf_p]}" target="_top" #{@vz.js_portrait}> @@ -255,7 +260,8 @@ module SiSU_HTML_Format end end def concordance(text) - if @md.concord_make and @md.wc_words < 300000 #max word count for display of concordance here as would now be a large file + if @md.concord_make \ + and @md.wc_words < 300000 #max word count for display of concordance here as would now be a large file %{<td align="center" bgcolor=#{@vz.color_band2}> <a href="#{@md.fn[:concordance]}" target="_top" #{@vz.js_concordance}> #{text} |