fpdf: fix autobreak when next page already exists #86
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@sbinet let me know if I should add any test or provide a reproduction repo. |
sbinet
reviewed
Sep 11, 2024
Comment on lines
+2572
to
+2619
| familyStr := f.fontFamily | ||
| style := f.fontStyle | ||
| if f.underline { | ||
| style += "U" | ||
| } | ||
| if f.strikeout { | ||
| style += "S" | ||
| } | ||
| fontsize := f.fontSizePt | ||
| lw := f.lineWidth | ||
| dc := f.color.draw | ||
| fc := f.color.fill | ||
| tc := f.color.text | ||
| cf := f.colorFlag | ||
|
|
||
| f.page += 1 | ||
| f.y = f.tMargin | ||
|
|
||
| // Set line cap style to current value | ||
| // f.out("2 J") | ||
| f.outf("%d J", f.capStyle) | ||
| // Set line join style to current value | ||
| f.outf("%d j", f.joinStyle) | ||
| // Set line width | ||
| f.lineWidth = lw | ||
| f.outf("%.2f w", lw*f.k) | ||
| // Set dash pattern | ||
| if len(f.dashArray) > 0 { | ||
| f.outputDashPattern() | ||
| } | ||
| // Set font | ||
| if familyStr != "" { | ||
| f.SetFont(familyStr, style, fontsize) | ||
| if f.err != nil { | ||
| return | ||
| } | ||
| } | ||
| // Set colors | ||
| f.color.draw = dc | ||
| if dc.str != "0 G" { | ||
| f.out(dc.str) | ||
| } | ||
| f.color.fill = fc | ||
| if fc.str != "0 g" { | ||
| f.out(fc.str) | ||
| } | ||
| f.color.text = tc | ||
| f.colorFlag = cf |
There was a problem hiding this comment.
this seems to be a copy-paste of some of the content of AddPageFormat, w/o the "page open" prolog and some cleanup "postlog".
perhaps we could refactor AddPageFormat to use a non-exported method that does essentially what you copy-pasted here, and use that new non-exported method there ?
There was a problem hiding this comment.
Great idea! Wanted to keep the PR as short as possible but let's make it clean ;)
I'll be quite busy the next few days but I'll try to make the changes until end of week.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes #85.
This is done by only creating a new page if we are currently on the last page.
Otherwise, we just advance the current page by one (use the already existing one) and update the y position to start at the top margin. Additionally we re-set the current font, color, and line styles similar to
AddPageFormat