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

OpenDocument writer: Avoid duplicate attributes.

Browse source 
We use the innermost attribute in nested cases.

Closes #4634.
This commit is contained in:
John MacFarlane 2019-06-12 21:51:09 -07:00
parent 11bb862767
commit fa50da3030
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/Text/Pandoc/Writers/OpenDocument.hs
View file

@ -18,7 +18,7 @@ import Prelude
import Control.Arrow ((***), (>>>)) import Control.Arrow ((***), (>>>))
import Control.Monad.State.Strict hiding (when) import Control.Monad.State.Strict hiding (when)
import Data.Char (chr) import Data.Char (chr)
import Data.List (sortBy) import Data.List (sortBy, foldl')
import qualified Data.Map as Map import qualified Data.Map as Map
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import Data.Ord (comparing) import Data.Ord (comparing)
@ -159,7 +159,8 @@ inTextStyle d = do
[("style:name", styleName) [("style:name", styleName)
,("style:family", "text")] ,("style:family", "text")]
$ selfClosingTag "style:text-properties" $ selfClosingTag "style:text-properties"
(concatMap textStyleAttr (Set.toList at))) (sortBy (comparing fst) . Map.toList
$ foldl' textStyleAttr mempty (Set.toList at)))
return $ inTags False return $ inTags False
"text:span" [("text:style-name",styleName)] d "text:span" [("text:style-name",styleName)] d
@ -692,25 +693,27 @@ data TextStyle = Italic
| Language Lang | Language Lang
deriving ( Eq,Ord ) deriving ( Eq,Ord )
textStyleAttr :: TextStyle -> [(String,String)] textStyleAttr :: Map.Map String String
textStyleAttr s -> TextStyle
| Italic <- s = [("fo:font-style" ,"italic" ) -> Map.Map String String
,("style:font-style-asian" ,"italic" ) textStyleAttr m s
,("style:font-style-complex" ,"italic" )] | Italic <- s = Map.insert "fo:font-style" "italic" .
| Bold <- s = [("fo:font-weight" ,"bold" ) Map.insert "style:font-style-asian" "italic" .
,("style:font-weight-asian" ,"bold" ) Map.insert "style:font-style-complex" "italic" $ m
,("style:font-weight-complex" ,"bold" )] | Bold <- s = Map.insert "fo:font-weight" "bold" .
| Strike <- s = [("style:text-line-through-style", "solid" )] Map.insert "style:font-weight-asian" "bold" .
| Sub <- s = [("style:text-position" ,"sub 58%" )] Map.insert "style:font-weight-complex" "bold" $ m
| Sup <- s = [("style:text-position" ,"super 58%" )] | Strike <- s = Map.insert "style:text-line-through-style" "solid" m
| SmallC <- s = [("fo:font-variant" ,"small-caps")] | Sub <- s = Map.insert "style:text-position" "sub 58%" m
| Pre <- s = [("style:font-name" ,"Courier New") | Sup <- s = Map.insert "style:text-position" "super 58%" m
,("style:font-name-asian" ,"Courier New") | SmallC <- s = Map.insert "fo:font-variant" "small-caps" m
,("style:font-name-complex" ,"Courier New")] | Pre <- s = Map.insert "style:font-name" "Courier New" .
Map.insert "style:font-name-asian" "Courier New" .
Map.insert "style:font-name-complex" "Courier New" $ m
| Language lang <- s | Language lang <- s
= [("fo:language" ,langLanguage lang) = Map.insert "fo:language" (langLanguage lang) .
,("fo:country" ,langRegion lang)] Map.insert "fo:country" (langRegion lang) $ m
| otherwise = [] | otherwise = m
withLangFromAttr :: PandocMonad m => Attr -> OD m a -> OD m a withLangFromAttr :: PandocMonad m => Attr -> OD m a -> OD m a
withLangFromAttr (_,_,kvs) action = withLangFromAttr (_,_,kvs) action =

2
test/writer.opendocument
View file

@ -1011,7 +1011,7 @@
</text:list-style> </text:list-style>
<style:style style:name="T1" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T1" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
<style:style style:name="T2" style:family="text"><style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" /></style:style> <style:style style:name="T2" style:family="text"><style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" /></style:style>
<style:style style:name="T3" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" /></style:style> <style:style style:name="T3" style:family="text"><style:text-properties fo:font-style="italic" fo:font-weight="bold" style:font-style-asian="italic" style:font-style-complex="italic" style:font-weight-asian="bold" style:font-weight-complex="bold" /></style:style>
<style:style style:name="T4" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style> <style:style style:name="T4" style:family="text"><style:text-properties style:text-line-through-style="solid" /></style:style>
<style:style style:name="T5" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" style:text-line-through-style="solid" /></style:style> <style:style style:name="T5" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" style:text-line-through-style="solid" /></style:style>
<style:style style:name="T6" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style> <style:style style:name="T6" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>