Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Docx writer: Combine reference.docx numbering with pandoc's.

Browse source 
This should have fixed #1305, allowing the reference.docx to define
section numbering, but it doesn't.  Now the headings appear with proper
indentation, but the numbers don't appear.  Unclear why.  styles.xml and
numbering.xml basically match the docx which has the expected result.
This commit is contained in:
John MacFarlane 2014-06-03 13:14:32 -07:00
parent ec047aaa8c
commit 0ddb4cd2e8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Text/Pandoc/Writers/Docx.hs
View file

@ -289,8 +289,10 @@ writeDocx opts doc@(Pandoc meta _) = do
-- construct word/numbering.xml
let numpath = "word/numbering.xml"
numEntry <- (toEntry numpath epochtime . renderXml)
`fmap` mkNumbering (stLists st)
numbering <- parseXml refArchive distArchive numpath
newNumElts <- mkNumbering (stLists st)
let numEntry = toEntry numpath epochtime $ renderXml numbering{ elContent =
elContent numbering ++ map Elem newNumElts }
let docPropsPath = "docProps/core.xml"
let docProps = mknode "cp:coreProperties"
[("xmlns:cp","http://schemas.openxmlformats.org/package/2006/metadata/core-properties")
@ -392,12 +394,10 @@ styleToOpenXml style = parStyle : map toStyle alltoktypes
baseListId :: Int
baseListId = 1000
mkNumbering :: [ListMarker] -> IO Element
mkNumbering :: [ListMarker] -> IO [Element]
mkNumbering lists = do
elts <- mapM mkAbstractNum (ordNub lists)
return $ mknode "w:numbering"
[("xmlns:w","http://schemas.openxmlformats.org/wordprocessingml/2006/main")]
$ elts ++ zipWith mkNum lists [baseListId..(baseListId + length lists - 1)]
return $ elts ++ zipWith mkNum lists [baseListId..(baseListId + length lists - 1)]
mkNum :: ListMarker -> Int -> Element
mkNum marker numid =