@@ -795,25 +795,32 @@ blockToOpenXML opts blk = withDirection $ blockToOpenXML' opts blk
796blockToOpenXML' :: (PandocMonad m) => WriterOptions -> Block -> WS m [Element]
796blockToOpenXML' :: (PandocMonad m) => WriterOptions -> Block -> WS m [Element]
797blockToOpenXML' _ Null = return []
797blockToOpenXML' _ Null = return []
798−blockToOpenXML' opts (Div (ident,classes,kvs) bs)
798+blockToOpenXML' opts (Div (ident,classes,kvs) bs) = do
799− | Just sty <- lookup dynamicStyleKey kvs = do
799+ stylemod <- case lookup dynamicStyleKey kvs of
800− modify $ \s -> s{stDynamicParaProps = sty : (stDynamicParaProps s)}
802+ s{stDynamicParaProps = sty : (stDynamicParaProps s)}
801− withParaPropM (pStyleM sty) $ blocksToOpenXML opts bs
803+ return $ withParaPropM (pStyleM sty)
802− | Just "rtl" <- lookup "dir" kvs = do
805+ dirmod <- case lookup "dir" kvs of
803− let kvs' = filter (("dir", "rtl")/=) kvs
804− local (\env -> env { envRTL = True }) $
806+ Just "rtl" -> return $ local (\env -> env { envRTL = True })
805− blockToOpenXML opts (Div (ident,classes,kvs') bs)
806− | Just "ltr" <- lookup "dir" kvs = do
807− let kvs' = filter (("dir", "ltr")/=) kvs
808− local (\env -> env { envRTL = False }) $
807+ Just "ltr" -> return $ local (\env -> env { envRTL = False })
809− blockToOpenXML opts (Div (ident,classes,kvs') bs)
808+ _ -> return id
810−blockToOpenXML' opts (Div (_,["references"],_) bs) = do
809+ let (hs, bs') = if "references" `elem` classes
811− let (hs, bs') = span isHeaderBlock bs
810+ then span isHeaderBlock bs
812+ let bibmod = if "references" `elem` classes
813+ then withParaPropM (pStyleM "Bibliography")
812− header <- blocksToOpenXML opts hs
815+ header <- dirmod $ stylemod $ blocksToOpenXML opts hs
813− -- We put the Bibliography style on paragraphs after the header
816+ contents <- dirmod $ bibmod $ stylemod $ blocksToOpenXML opts bs'
814− rest <- withParaPropM (pStyleM "Bibliography") $ blocksToOpenXML opts bs'
817+ id' <- getUniqueId
818+ let bookmarkStart = mknode "w:bookmarkStart" [("w:id", id')
819+ ,("w:name",ident)] ()
820+ let bookmarkEnd = mknode "w:bookmarkEnd" [("w:id", id')] ()
815− return (header ++ rest)
822+ then return $ header ++ contents
816−blockToOpenXML' opts (Div _ bs) = blocksToOpenXML opts bs
823+ else return $ bookmarkStart : header ++ contents ++ [bookmarkEnd]
817blockToOpenXML' opts (Header lev (ident,_,_) lst) = do
824blockToOpenXML' opts (Header lev (ident,_,_) lst) = do
818 setFirstPara
825 setFirstPara
819 paraProps <- withParaPropM (pStyleM ("Heading "++show lev)) $
826 paraProps <- withParaPropM (pStyleM ("Heading "++show lev)) $
@@ -824,11 +831,12 @@ blockToOpenXML' opts (Header lev (ident,_,_) lst) = do
824 then uniqueIdent lst usedIdents
831 then uniqueIdent lst usedIdents
825 else ident
832 else ident
826 modify $ \s -> s{ stSectionIds = Set.insert bookmarkName $ stSectionIds s }
833 modify $ \s -> s{ stSectionIds = Set.insert bookmarkName $ stSectionIds s }
827− id' <- (lift . lift) getUniqueId
834+ id' <- getUniqueId
828 let bookmarkStart = mknode "w:bookmarkStart" [("w:id", id')
835 let bookmarkStart = mknode "w:bookmarkStart" [("w:id", id')
829 ,("w:name",bookmarkName)] ()
836 ,("w:name",bookmarkName)] ()
830 let bookmarkEnd = mknode "w:bookmarkEnd" [("w:id", id')] ()
837 let bookmarkEnd = mknode "w:bookmarkEnd" [("w:id", id')] ()
831− return [mknode "w:p" [] (paraProps ++ [bookmarkStart, bookmarkEnd] ++ contents)]
838+ return [mknode "w:p" [] (paraProps ++ [bookmarkStart] ++ contents
832blockToOpenXML' opts (Plain lst) = withParaProp (pCustomStyle "Compact")
840blockToOpenXML' opts (Plain lst) = withParaProp (pCustomStyle "Compact")
833 $ blockToOpenXML opts (Para lst)
841 $ blockToOpenXML opts (Para lst)
834-- title beginning with fig: indicates that the image is a figure
842-- title beginning with fig: indicates that the image is a figure