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.17 +version: 0.0.1.18 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.17 + tag: 0.0.1.18 executable markdown2svg hs-source-dirs: src diff --git a/src/SepWords.hs b/src/SepWords.hs --- a/src/SepWords.hs +++ b/src/SepWords.hs @@ -19,6 +19,9 @@ 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 ca@(c@('「') : cs) + | k > n = ("", ca) + | otherwise = let (l, ls) = splitWords_ n (k + 2) cs in (c : l, ls) splitWords_ n k (c : cs) | isSpace c && k > n = ("", cs) | not (isAscii c) && k > n = ([c], cs) @@ -39,6 +42,9 @@ 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@('「') : cs) + | k > n = let l : ls = sepWords_ n 2 cs in "" : (c : l) : ls + | otherwise = let l : ls = sepWords_ n (k + 2) cs in (c : l) : ls sepWords_ n k (c : cs) | isSpace c && k > n = "" : sepWords_ n 0 cs | not (isAscii c) && k > n = [c] : sepWords_ n 0 cs