3 files changed, 2 insertions(+), 7 deletions(-)

M rhapsode.cabal
M src/SSML.hs
M src/SpeechStyle.hs

@@ 63,7 63,7 @@ library
   build-depends:       base >=4.9 && <=4.12, directory, bytestring,
         html-conduit, xml-conduit, text, containers, data-default-class,
         network-uri,
-        stylist >= 2 && <3, css-syntax, xml-conduit-stylist >= 2 && <3, scientific,
+        stylist >= 2.2 && <3, css-syntax, xml-conduit-stylist >= 2.2 && <3, scientific,
         async, hurl >= 1.4.1.0, filepath, temporary,
         file-embed >= 0.0.9 && < 0.1
   

@@ 71,11 71,6 @@ audioEl self = el "prosody" [("volume", unit2txt <$> cueVolume self)] $
     el "audio" [("src", Just $ src self)] []
 
 -- support
-postorder :: (a -> [b] -> [b]) -> StyleTree a -> [StyleTree b]
-postorder cb (StyleTree self children) =
-    [StyleTree self' children' | self' <- cb self $ Prelude.map style children']
-  where children' = concat $ Prelude.map (postorder cb) children
-
 el :: Name -> [(Name, Maybe Txt.Text)] -> [Node] -> [Node]
 el n attrs children | all (isNothing . snd) attrs = children
     | otherwise = [NodeElement $ Element {

@@ 129,7 129,7 @@ instance PropertyParser SpeechStyle where
     shorthand _ "cue" toks | isCue toks = [("cue-before", toks), ("cue-after", toks)]
 
     shorthand _ "-rhaps-marker" [Ident m] = [
-            ("mark", [String m, Function "counter", Ident m, RightParen]),
+            ("-rhaps-marker", [String m, Function "counter", Ident m, RightParen]),
             ("counter-increment", [Ident m])
         ]