diff --git a/markdown2svg.cabal b/markdown2svg.cabal --- a/markdown2svg.cabal +++ b/markdown2svg.cabal @@ -2,7 +2,7 @@ cabal-version: >=1.8 name: markdown2svg -version: 0.0.1.21 +version: 0.0.1.22 stability: Experimental author: Yoshikuni Jujo maintainer: Yoshikuni Jujo @@ -31,7 +31,7 @@ source-repository this type: git location: git://github.com/YoshikuniJujo/markdown2svg.git - tag: 0.0.1.21 + tag: 0.0.1.22 executable markdown2svg hs-source-dirs: src diff --git a/src/SepWords.hs b/src/SepWords.hs --- a/src/SepWords.hs +++ b/src/SepWords.hs @@ -10,6 +10,9 @@ splitWords_ :: Int -> Int -> String -> (String, String) splitWords_ _ _ "" = ("", "") +splitWords_ n k (c : c'@('?') : cs) + | k > n = ([c, c'], cs) + | otherwise = let (l, ls) = splitWords_ n (k + 4) cs in (c : c' : l, ls) splitWords_ n k (c : c'@('」') : cs) | k > n = ([c, c'], cs) | otherwise = let (l, ls) = splitWords_ n (k + 4) cs in (c : c' : l, ls) @@ -33,6 +36,9 @@ sepWords_ :: Int -> Int -> String -> [String] sepWords_ _ _ "" = [""] +sepWords_ n k (c : c'@('?') : cs) + | k > n = [c, c'] : sepWords_ n 0 cs + | otherwise = let l : ls = sepWords_ n (k + 4) cs in (c : c' : l) : ls sepWords_ n k (c : c'@('」') : cs) | k > n = [c, c'] : sepWords_ n 0 cs | otherwise = let l : ls = sepWords_ n (k + 4) cs in (c : c' : l) : ls