diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-02-22 21:49:29 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-02-22 21:49:29 -0500 |
| commit | ddb044eee0b419c83eee7101cfd36798936200b4 (patch) | |
| tree | 386804f30fff52c3f27be4dab8d6b74db7113942 /lib/sisu/v4/odf.rb | |
| parent | debian/changelog (4.0.8-1) (diff) | |
| parent | v4: documentation, sisu markup (sisu_markup.sst, man page sisu.1, sisu.1.html) (diff) | |
Merge tag 'sisu_4.0.9' into debian/sid
SiSU 4.0.9
Diffstat (limited to 'lib/sisu/v4/odf.rb')
| -rw-r--r-- | lib/sisu/v4/odf.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/sisu/v4/odf.rb b/lib/sisu/v4/odf.rb index ca02d16a..c3746b06 100644 --- a/lib/sisu/v4/odf.rb +++ b/lib/sisu/v4/odf.rb @@ -191,9 +191,11 @@ module SiSU_ODF @@fns=@md.fns end unless @@docstart - breakpage=if (@md.pagenew or @md.pagebreak) \ - and (@md.pagenew =~ m or @md.pagebreak =~m) + breakpage=if (@md.pagenew || @md.pagebreak) \ + and (@md.pagenew =~m or @md.pagebreak =~m) '<text:p text:style-name="P_normal_page_new"> </text:p>' + elsif @md.pageline \ + and @md.pageline =~m #fix else '' end end @@ -526,6 +528,8 @@ module SiSU_ODF if dob.obj==Mx[:br_page] \ or dob.obj==Mx[:br_page_new] dob=br.br_page + elsif dob.obj==Mx[:br_page_line] + dob=br.br_page_line elsif dob.obj==Mx[:br_obj] dob=br.obj_sep end @@ -725,6 +729,8 @@ WOK breakpage=if @md.pagenew \ or @md.pagebreak ' fo:break-before="page"' + elsif @md.pageline ##fix + '' else '' end x=<<WOK |