diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-07-26 20:33:39 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-07-26 20:33:39 -0400 |
| commit | d9dcd8911f88949c268683beb925642a5f2e1035 (patch) | |
| tree | e5fef97a9b0ebda215d4ab19cd94ea3995a3f8e6 | |
| parent | v3: sql (pg, sqlite), indent ... (diff) | |
v3: odf, manpage, "new" indent not implemented
| -rw-r--r-- | lib/sisu/v3/manpage.rb | 6 | ||||
| -rw-r--r-- | lib/sisu/v3/odf.rb | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/sisu/v3/manpage.rb b/lib/sisu/v3/manpage.rb index 0a2c2fcc..e23caa76 100644 --- a/lib/sisu/v3/manpage.rb +++ b/lib/sisu/v3/manpage.rb @@ -202,11 +202,15 @@ WOK or dob.is=='heading' paragraph=dob.obj if dob.is=='para' - if dob.indent =~/[1-9]/ + if dob.indent =~/[1-9]/ \ + and dob.indent == dob.hang util=if dob.bullet_ SiSU_text_utils::Wrap.new("* #{paragraph}",78,dob.indent.to_i*2) else SiSU_text_utils::Wrap.new(paragraph,78,dob.indent.to_i*2) end + elsif dob.hang =~/[0-9]/ \ + and dob.indent != dob.hang # NOT yet implemented + util=SiSU_text_utils::Wrap.new(paragraph,78,dob.indent.to_i*2) else util=if dob.bullet_ SiSU_text_utils::Wrap.new("* #{paragraph}",78,0) diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb index c42ce349..49856a87 100644 --- a/lib/sisu/v3/odf.rb +++ b/lib/sisu/v3/odf.rb @@ -308,7 +308,13 @@ module SiSU_ODF %{#{@brace_url.xml_open}<text:a xlink:type="simple" xlink:href="mailto:\\1">\\1</text:a>#{@brace_url.xml_close}}) dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/, %{#{@brace_url.xml_open}<text:a xlink:type="simple" xlink:href="\\1">\\1</text:a>#{@brace_url.xml_close}}) #http ftp matches with decoration - dob.obj= if dob.is=='para' and dob.indent.to_s =~/[0-9]/ # and t_o.bullet_==true + dob.obj= if dob.is=='para' \ + and dob.indent.to_s =~/[0-9]/ \ + and dob.indent == dob.hang + %{<text:p text:style-name="P1#{dob.indent}">#{dob.obj}#{p_num}</text:p>} + elsif dob.is=='para' \ + and dob.hang.to_s =~/[0-9]/ \ + and dob.indent != dob.hang # NOT yet implemented %{<text:p text:style-name="P1#{dob.indent}">#{dob.obj}#{p_num}</text:p>} else %{<text:p text:style-name="P1">#{dob.obj}#{p_num}</text:p>} end |