@@ -158,9 +158,9 @@ inPreformattedTags s = do
160orderedListToOpenDocument :: WriterOptions -> Int -> [[Block]] -> State WriterState Doc
160orderedListToOpenDocument :: WriterOptions -> Int -> [[Block]] -> State WriterState Doc
161−orderedListToOpenDocument o pn is =
161+orderedListToOpenDocument o pn bs =
162 vcat . map (inTagsIndented "text:list-item") <$>
162 vcat . map (inTagsIndented "text:list-item") <$>
163− mapM (orderedItemToOpenDocument o pn . map plainToPara) is
163+ mapM (orderedItemToOpenDocument o pn . map plainToPara) bs
165orderedItemToOpenDocument :: WriterOptions -> Int -> [Block] -> State WriterState Doc
165orderedItemToOpenDocument :: WriterOptions -> Int -> [Block] -> State WriterState Doc
166orderedItemToOpenDocument o n (b:bs)
166orderedItemToOpenDocument o n (b:bs)
@@ -198,8 +198,8 @@ listItemsToOpenDocument s o is =
199deflistItemToOpenDocument :: WriterOptions -> ([Inline],[Block]) -> State WriterState Doc
199deflistItemToOpenDocument :: WriterOptions -> ([Inline],[Block]) -> State WriterState Doc
200deflistItemToOpenDocument o (t,d) = do
200deflistItemToOpenDocument o (t,d) = do
201− t' <- withParagraphStyle o "Definition-term" [Para t]
201+ t' <- withParagraphStyle o "Definition_20_Term" [Para t]
202− d' <- withParagraphStyle o "Definition-definition" (map plainToPara d)
202+ d' <- withParagraphStyle o "Definition_20_Definition" (map plainToPara d)
203 return $ t' $$ d'
203 return $ t' $$ d'
205inBlockQuote :: WriterOptions -> Int -> [Block] -> State WriterState Doc
205inBlockQuote :: WriterOptions -> Int -> [Block] -> State WriterState Doc
@@ -338,8 +338,8 @@ generateStyles acc =
338 fonts = inTagsIndented "office:font-face-decls"
338 fonts = inTagsIndented "office:font-face-decls"
339 (vcat $ map font ["Lucida Sans Unicode", "Tahoma", "Times New Roman"])
339 (vcat $ map font ["Lucida Sans Unicode", "Tahoma", "Times New Roman"])
340 font fn = selfClosingTag "style:font-face"
340 font fn = selfClosingTag "style:font-face"
341− [ ("style:name", fn)
341+ [ ("style:name" , "'" ++ fn ++ "'")
342− , ("svg:font-family", fn)]
342+ , ("svg:font-family", fn )]
343 in scripts $$ fonts $$ inTagsIndented "office:automatic-styles" (vcat $ reverse acc)
343 in scripts $$ fonts $$ inTagsIndented "office:automatic-styles" (vcat $ reverse acc)
345bulletListStyle :: Int -> State WriterState (Int,(Int,[Doc]))
345bulletListStyle :: Int -> State WriterState (Int,(Int,[Doc]))