Skip to content

Double quote content stream operator fixes #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 16, 2020
Merged

Double quote content stream operator fixes #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a9ecdf
Fix wrong symbol checks used for the double quote content stream oper…
adrg Apr 16, 2020
c92242d
Fix text extraction parameter check for the double quote operator
adrg Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contentstream/creator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,15 +825,15 @@ func (cc *ContentCreator) Add_quote(textstr core.PdfObjectString) *ContentCreato
return cc
}

// Add_quotes appends "''" operand to the content stream:
// Add_quotes appends `"` operand to the content stream:
// Move to next line and show a string, using `aw` and `ac` as word
// and character spacing respectively.
//
// See section 9.4.3 "Text Showing Operators" and
// Table 209 (pp. 258-259 PDF32000_2008).
func (cc *ContentCreator) Add_quotes(textstr core.PdfObjectString, aw, ac float64) *ContentCreator {
op := ContentStreamOperation{}
op.Operand = "''"
op.Operand = `"`
op.Params = makeParamsFromFloats([]float64{aw, ac})
op.Params = append(op.Params, makeParamsFromStrings([]core.PdfObjectString{textstr})...)
cc.operands = append(cc.operands, &op)
Expand Down
2 changes: 1 addition & 1 deletion contentstream/operand_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@ var validOperands = map[string]struct{}{
"W*": struct{}{},
"y": struct{}{},
`'`: struct{}{},
`''`: struct{}{},
`"`: struct{}{},
}
2 changes: 1 addition & 1 deletion extractor/text.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func (e *Extractor) extractPageText(contents string, resources *model.PdfPageRes
to.nextLine()
return to.showText(charcodes)
case `"`: // Set word and character spacing, move to next line, and show text.
if ok, err := to.checkOp(op, 1, true); !ok {
if ok, err := to.checkOp(op, 3, true); !ok {
common.Log.Debug("ERROR: \" err=%v", err)
return err
}
Expand Down
2 changes: 1 addition & 1 deletion render/internal/context/text_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func (ts *TextState) ProcQ(data []byte, ctx Context) {
ts.ProcTj(data, ctx)
}

// ProcDQ processes a `''` operation, which advances the text state to a new
// ProcDQ processes a `"` operation, which advances the text state to a new
// line and then displays a text string using aw and ac as word and character
// spacing.
//
Expand Down
2 changes: 1 addition & 1 deletion render/renderer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ func (r renderer) renderContentStream(ctx context.Context, contents string, reso

textState.ProcQ(charcodes, ctx)
// Move to the next line and show text string.
case `''`:
case `"`:
if len(op.Params) != 3 {
return errRange
}
Expand Down