Skip to content

Commit

Permalink
Docx parser: implement PAGEREF fields
Browse files Browse the repository at this point in the history
These fields, often used in tables of contents, can be a hyperlink.
  • Loading branch information
mbrackeantidot authored and Guillaume Chapuis committed Oct 1, 2021
1 parent 7562e28 commit 0b232b2
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 7 deletions.
1 change: 1 addition & 0 deletions src/Text/Pandoc/Readers/Docx.hs
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ parPartToInlines' (PlainOMath exps) =
parPartToInlines' (Field info children) =
case info of
HyperlinkField url -> parPartToInlines' $ ExternalHyperLink url children
PagerefField fieldAnchor True -> parPartToInlines' $ InternalHyperLink fieldAnchor children
_ -> smushInlines <$> mapM parPartToInlines' children
parPartToInlines' NullParPart = return mempty

Expand Down
25 changes: 25 additions & 0 deletions src/Text/Pandoc/Readers/Docx/Fields.hs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@ import Text.Parsec
import Text.Parsec.Text (Parser)

type URL = T.Text
type Anchor = T.Text

data FieldInfo = HyperlinkField URL
-- The boolean indicates whether the field is a hyperlink.
| PagerefField Anchor Bool
| UnknownField
deriving (Show)

Expand All @@ -33,6 +36,8 @@ fieldInfo :: Parser FieldInfo
fieldInfo =
try (HyperlinkField <$> hyperlink)
<|>
try ((uncurry PagerefField) <$> pageref)
<|>
return UnknownField

escapedQuote :: Parser T.Text
Expand Down Expand Up @@ -72,3 +77,23 @@ hyperlink = do
("\\l", s) : _ -> farg <> "#" <> s
_ -> farg
return url

-- See §17.16.5.45
pagerefSwitch :: Parser (T.Text, T.Text)
pagerefSwitch = do
sw <- string "\\h"
spaces
farg <- fieldArgument
return (T.pack sw, farg)

pageref :: Parser (Anchor, Bool)
pageref = do
many space
string "PAGEREF"
spaces
farg <- fieldArgument
switches <- spaces *> many pagerefSwitch
let isLink = case switches of
("\\h", _) : _ -> True
_ -> False
return (farg, isLink)
4 changes: 4 additions & 0 deletions test/Tests/Readers/Docx.hs
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ tests = [ testGroup "document"
"nested fields with <w:instrText> tag"
"docx/nested_instrText.docx"
"docx/nested_instrText.native"
, testCompare
"pageref hyperlinks in <w:instrText> tag"
"docx/pageref.docx"
"docx/pageref.native"
, testCompare
"inline image"
"docx/image.docx"
Expand Down
6 changes: 3 additions & 3 deletions test/docx/0_level_headers.native
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
[])
,Para [Str "CONTENTS"]
,Para [Strong [Str "Section",Space,Str "Page"]]
,Para [Str "FIGURES",Space,Str "iv"]
,Para [Str "TABLES",Space,Str "v"]
,Para [Str "SECTION",Space,Str "1",Space,Str "Introduction",Space,Str "2"]
,Para [Str "FIGURES",Space,Link ("",[],[]) [Str "iv"] ("#figures","")]
,Para [Str "TABLES",Space,Link ("",[],[]) [Str "v"] ("#tables","")]
,Para [Str "SECTION",Space,Str "1",Space,Str "Introduction",Space,Link ("",[],[]) [Str "2"] ("#introduction","")]
,Header 1 ("figures",["Heading-0"],[]) [Str "FIGURES"]
,Para [Strong [Str "Figure",Space,Str "Page"]]
,Para [Strong [Str "No",Space,Str "table",Space,Str "of",Space,Str "figures",Space,Str "entries",Space,Str "found."]]
Expand Down
Binary file modified test/docx/golden/nested_anchors_in_header.docx
Binary file not shown.
8 changes: 4 additions & 4 deletions test/docx/nested_anchors_in_header.native
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[Header 1 ("\1086\1075\1083\1072\1074\1083\1077\1085\1080\1077",["TOC-Heading"],[]) [Str "\1054\1075\1083\1072\1074\1083\1077\1085\1080\1077"]
,Para [Link ("",[],[]) [Str "Short",Space,Str "instructions",Space,Str "1"] ("#short-instructions","")]
,Para [Link ("",[],[]) [Str "Some",Space,Str "instructions",Space,Str "1"] ("#some-instructions","")]
,Para [Link ("",[],[]) [Str "Remote",Space,Str "folder",Space,Str "or",Space,Str "longlonglonglonglong",Space,Str "file",Space,Str "with",Space,Str "manymanymanymany",Space,Str "letters",Space,Str "inside",Space,Str "opening",Space,Str "2"] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-opening","")]
,Para [Link ("",[],[]) [Str "Remote",Space,Str "folder",Space,Str "or",Space,Str "longlonglonglonglong",Space,Str "file",Space,Str "with",Space,Str "manymanymanymany",Space,Str "letters",Space,Str "inside",Space,Str "closing",Space,Str "2"] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-closing","")]
,Para [Link ("",[],[]) [Str "Short",Space,Str "instructions",Space,Link ("",[],[]) [Str "1"] ("#short-instructions","")] ("#short-instructions","")]
,Para [Link ("",[],[]) [Str "Some",Space,Str "instructions",Space,Link ("",[],[]) [Str "1"] ("#some-instructions","")] ("#some-instructions","")]
,Para [Link ("",[],[]) [Str "Remote",Space,Str "folder",Space,Str "or",Space,Str "longlonglonglonglong",Space,Str "file",Space,Str "with",Space,Str "manymanymanymany",Space,Str "letters",Space,Str "inside",Space,Str "opening",Space,Link ("",[],[]) [Str "2"] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-opening","")] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-opening","")]
,Para [Link ("",[],[]) [Str "Remote",Space,Str "folder",Space,Str "or",Space,Str "longlonglonglonglong",Space,Str "file",Space,Str "with",Space,Str "manymanymanymany",Space,Str "letters",Space,Str "inside",Space,Str "closing",Space,Link ("",[],[]) [Str "2"] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-closing","")] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-closing","")]
,Header 1 ("short-instructions",[],[]) [Str "Short",Space,Str "instructions"]
,Para [Link ("",[],[]) [Str "Open",Space,Str "remote",Space,Str "folder"] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-opening","")]
,Para [Str "Do",Space,Str "staff"]
Expand Down
Binary file added test/docx/pageref.docx
Binary file not shown.
4 changes: 4 additions & 0 deletions test/docx/pageref.native
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[Para [Str "Title",Space,Link ("",[],[]) [Str "2"] ("#title","")]
,Para [Str "Title2",Space,Link ("",[],[]) [Str "2"] ("#title2","")]
,Header 1 ("title", [],[]) [Str "Title"]
,Header 1 ("title2",[],[]) [Str "Title2"]]

0 comments on commit 0b232b2

Please sign in to comment.