CREATE OR REPLACE FUNCTION "201409"."04_svg_pathcmd_rev"(text)
RETURNS TABLE(sid int, cid int, str text, cmd text, pxy numeric[])
LANGUAGE plpgsql IMMUTABLE AS $BODY$

/* "201409"."02_svg_pathcmd" を修正
	Zz コマンドを処理
	Ss コマンドで四点返す
	Qq コマンドを対象外に。今後必要なら追加 */

DECLARE r record ;
	cmd text ;
	cmd_prev text ; -- 追加
	ar1 numeric[] ;
	ar2 numeric[] ;
	ar3 numeric[] ; -- 追加 : コマンド S 用
	pxy numeric[] ;
	mxy numeric[] ; -- 追加
BEGIN
FOR r IN
	WITH b AS (
		-- Z コマンドを含むように修正
		SELECT (regexp_matches($1, '(\w[\d\-\.\,]*)', 'g'))[1] str
	), c AS (
		SELECT row_number() over() :: int cid, b.str, left(b.str, 1) lab
		FROM b
	)
	SELECT sum(CASE WHEN lab ~* 'M' THEN 1 END)
		over(ORDER BY c.cid) :: int sid, *
	FROM c ORDER BY 1, c.cid
LOOP
	cmd = r.lab ;
	ar1 = string_to_array(regexp_replace(right(r.str, -1)
		, '(\d)-', '\1,-', 'g'), ',') ;
	IF cmd ~* 'M' THEN
		pxy = CASE WHEN cmd = 'M' THEN ar1
			ELSE ARRAY[pxy[1] + ar1[1], pxy[2] + ar1[2]]
			END ;
		mxy = pxy ; -- 追加
		ar2 = NULL ;
	ELSEIF cmd ~* 'Z' THEN -- このブロック追加
		ar2 = CASE WHEN pxy = mxy THEN NULL :: numeric[]
			ELSE pxy || mxy END ; 
	ELSEIF cmd ~* '[HVLT]' THEN
		ar2 = pxy || CASE
			WHEN cmd = 'H' THEN ARRAY[ar1[1], pxy[2]]
			WHEN cmd = 'h' THEN ARRAY[pxy[1] + ar1[1], pxy[2]]
			WHEN cmd = 'V' THEN ARRAY[pxy[1], ar1[1]]
			WHEN cmd = 'v' THEN ARRAY[pxy[1], pxy[2] + ar1[1]]
			WHEN cmd ~ '[LT]' THEN ar1
			ELSE ARRAY[pxy[1] + ar1[1], pxy[2] + ar1[2]]
			END ;
		pxy = ar2[3:4] ;
	/* 修正前
	ELSEIF cmd ~* '[QS]' THEN
		ar2 = pxy || CASE
			WHEN cmd ~ '[QS]' THEN ar1
			ELSE ARRAY[pxy[1] + ar1[1]
				, pxy[2] + ar1[2]
				, pxy[1] + ar1[3]
				, pxy[2] + ar1[4]]
			END ;
		pxy = ar2[5:6] ; */
	-- 以下ブロック修正後
	ELSEIF cmd ~* 'S' THEN
		IF cmd_prev ~* '[CS]' THEN
			-- 起点の制御点が直前ベジェの終点の制御点の対向
			ar3 = ARRAY[pxy[1] + (pxy[1] - ar2[5])
				, pxy[2] + (pxy[2] - ar2[6])] ;
			ar2 = pxy || ar3 || CASE
				WHEN cmd = 'S' THEN ar1
				ELSE ARRAY[pxy[1] + ar1[1]
					, pxy[2] + ar1[2]
					, pxy[1] + ar1[3]
					, pxy[2] + ar1[4]]
				END ;
		ELSE
			-- 制御点二つが同じ位置
			ar2 = pxy || CASE
				WHEN cmd = 'S' THEN ar1[1:2] || ar1
				ELSE ARRAY[pxy[1] + ar1[1]
					, pxy[2] + ar1[2]
					, pxy[1] + ar1[1]
					, pxy[2] + ar1[2]
					, pxy[1] + ar1[3]
					, pxy[2] + ar1[4]]
				END ;
		END IF ;
		pxy = ar2[7:8] ;
	ELSEIF cmd ~* 'C' THEN
		ar2 = pxy || CASE
			WHEN cmd = 'C' THEN ar1
			ELSE ARRAY[pxy[1] + ar1[1]
				, pxy[2] + ar1[2]
				, pxy[1] + ar1[3]
				, pxy[2] + ar1[4]
				, pxy[1] + ar1[5]
				, pxy[2] + ar1[6]]
			END ;
		pxy = ar2[7:8] ;
	END IF ;
	cmd_prev = cmd ; -- 追加
	IF ar2 IS NOT NULL THEN
		RETURN QUERY SELECT r.sid, r.cid, r.str, cmd, ar2 ;
	END IF ;
END LOOP ;
END ;
$BODY$ ;

-- Ex
WITH a AS (
	SELECT *, "201409"."04_svg_pathcmd_rev"(d) rec
	FROM "201409"."02_svg_path"
)
SELECT pid, (rec).* FROM a ;

WITH a AS (
	SELECT * FROM "201409"."02_svg_path"
), b AS (
	SELECT pid, "201409"."04_svg_pathcmd_rev"(d) rec FROM a
), c AS (
	SELECT pid, (rec).* FROM b
), d AS (
	SELECT pid, sid, cid, pxy, array_length(pxy, 1) len FROM c
), e AS (
	SELECT pid, sid, cid
		, ST_MakeLine(ST_Point(pxy[1], pxy[2])
			, ST_Point(pxy[len - 1], pxy[len])) geom
	FROM d
	ORDER BY pid, sid, cid
), f AS (
	SELECT pid, sid, ST_LineMerge(ST_Collect(geom)) geom
	FROM e
	GROUP BY pid, sid
), g1 AS (
	-- Exterior
	SELECT * FROM f WHERE sid = 1
), g2 AS (
	-- Interior
	SELECT pid, array_agg(geom) geom FROM f WHERE sid > 1 GROUP BY pid
), g3 AS (
	SELECT pid, CASE WHEN g2.pid IS NULL THEN ST_MakePolygon(g1.geom)
			ELSE ST_MakePolygon(g1.geom, g2.geom) END geom
	FROM g1 LEFT JOIN g2 USING (pid)
)
SELECT pid, fill, ST_AsText(geom)
FROM a JOIN g3 USING (pid)
ORDER BY pid ;

library(RPostgreSQL)
library(maptools)
library(rgeos)
con = dbConnect(PostgreSQL(), dbname='xxx', port=xxx
	, user='xxx', password='xxx')
df1 = dbGetQuery(con, '
	WITH a AS (
		SELECT * FROM "201409"."02_svg_path"
	), b AS (
		SELECT pid, "201409"."04_svg_pathcmd_rev"(d) rec FROM a
	), c AS (
		SELECT pid, (rec).* FROM b
	), d AS (
		SELECT pid, sid, cid, pxy, array_length(pxy, 1) len FROM c
	), e AS (
		-- Inverse Y
		SELECT pid, sid, cid, ST_MakeLine(
			ST_Point(pxy[1], pxy[2] * -1)
			, ST_Point(pxy[len - 1], pxy[len] * -1)) geom
		FROM d
		ORDER BY pid, sid, cid
	), f AS (
		SELECT pid, sid, ST_LineMerge(ST_Collect(geom)) geom
		FROM e
		GROUP BY pid, sid
	), g1 AS (
		-- Exterior
		SELECT * FROM f WHERE sid = 1
	), g2 AS (
		-- Interior
		SELECT pid, array_agg(geom) geom FROM f WHERE sid > 1
		GROUP BY pid
	), g3 AS (
		SELECT pid, CASE WHEN g2.pid IS NULL THEN
					ST_MakePolygon(g1.geom)
				ELSE ST_MakePolygon(g1.geom, g2.geom)
				END geom
		FROM g1 LEFT JOIN g2 USING (pid)
	)
	-- Group by color
	SELECT fill, ST_AsText(ST_Collect(geom))
	FROM a JOIN g3 USING (pid)
	GROUP BY fill
	ORDER BY fill ;
')
invisible(dbDisconnect(con))
windows(height=(340-46)/96, width=(444-8)/96)
par(plt=rep(c(1,99)/100, 2), xaxs='i', yaxs='i')
for(i in 1:nrow(df1)){
	plot(add=ifelse(i==1, F, T)
		, readWKT(df1[i,2]), border=1, col=df1[i,1])
}