summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPTPi <PTPi>2013-09-13 06:38:30 +0000
committerPTPi <PTPi>2013-09-13 06:38:30 +0000
commit23002f2fff99b7015941833411a1e072851df895 (patch)
tree556bbbb178842445c078228bd908bcba4f77351b
parent5fcf73d04a21622b908b07ae12705fd438defeb4 (diff)
downloadgroff-23002f2fff99b7015941833411a1e072851df895.tar.gz
Bug fixes to FLOAT.
-rw-r--r--contrib/mom/BUGS11
-rw-r--r--contrib/mom/om.tmac16
2 files changed, 19 insertions, 8 deletions
diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index f057d6c3..5ee7ec19 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -25,6 +25,17 @@ Also, please--no html email. That, too, gets nuked.
Version 2.0-a_1
===============
+Forced floats that fit on the page causing floats on the next page
+to be treated as forced.
+---Fixed---
+
+Forced floats not advancing on the page after output if the float is
+forced to the next page, causing running text to overprint.
+---Fixed---
+
+Text after defered floats not being shimmed properly.
+---Fixed---
+
Tables that span pages overprinting first two lines of table on new
pages.
---Fixed---
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index d017546e..ef02e376 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -9379,6 +9379,7 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM] \\$\\n[#DOC_COVER_TITLE_NUM]
. rr float-depth:\\n[loop-count]
. \}
. ev
+. vs \\n[#DOC_LEAD]u
. SHIM
. rr defer
. rr loop-count
@@ -15891,17 +15892,15 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
. sp
. \}
. el \{\
-. ie \\n[#FORCE] \{\
+. if !\\n[defer] .nr defer 0 1
+. rn FLOAT*DIV FLOAT*DIV:\\n+[defer]
+. if \\n[D-float] .nr D-float:\\n[defer] \\n[D-float]
+. nr float-depth:\\n[defer] \\n[dn]
+. if \\n[#FORCE] \{\
. NEWPAGE
. rr #FORCE
. \}
-. el \{\
-. if !\\n[defer] .nr defer 0 1
-. rn FLOAT*DIV FLOAT*DIV:\\n+[defer]
-. if \\n[D-float] .nr D-float:\\n[defer] \\n[D-float]
-. nr float-depth:\\n[defer] \\n[dn]
-. return \" output div after header
-. \}
+. return \" output div after header
. \}
. \}
. sp 0\\*[float-adj:top]\\*[float-adj]
@@ -15934,6 +15933,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
. rm float-adj
. rm float-adj:top
. rm float-adj:bottom
+. rr #FORCE
. \}
.END
\#