From 90de712b04a2c4eb00b99cd20d2e0e379a5fd49c Mon Sep 17 00:00:00 2001
From: Ben Bullock <benkasminbullock@gmail.com>
Date: Fri, 20 May 2022 05:53:31 +0900
Subject: [PATCH] Resolve inconsistencies between variants

Mostly add but in one case remove group that is inconsistent between variants.
---
 kanji/06442.svg             |  4 ++--
 kanji/06687-Kaisho.svg      |  2 +-
 kanji/06687-KaishoVtFst.svg |  2 +-
 kanji/06b1d-Kaisho.svg      |  2 +-
 kanji/06f5f.svg             |  2 +-
 kanji/06fc0-Kaisho.svg      |  2 +-
 kanji/0904a-Kaisho.svg      |  2 +-
 kanji/095a2-Kaisho.svg      | 18 ++++++++++--------
 kanji/096a8.svg             |  2 +-
 9 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/kanji/06442.svg b/kanji/06442.svg
index 665669607..38325f1a4 100644
--- a/kanji/06442.svg
+++ b/kanji/06442.svg
@@ -43,8 +43,8 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:06442-s3" kvg:type="㇀" d="M12.15,67.13c1.04,0.84,2.57,1.09,3.95,0.13C22.25,63,26,60.5,37.25,52.42"/>
 	</g>
 	<g id="kvg:06442-g2" kvg:position="right" kvg:phon="聶">
-		<g id="kvg:06442-g3" kvg:element="聶" kvg:variant="true" kvg:position="top">
-			<g id="kvg:06442-g4" kvg:element="耳" kvg:original="聶" kvg:partial="true">
+		<g id="kvg:06442-g3" kvg:variant="true" kvg:original="聶">
+			<g id="kvg:06442-g4" kvg:element="耳" kvg:partial="true" kvg:position="top">
 				<path id="kvg:06442-s4" kvg:type="㇐" d="M46.24,20.2c2.51,0.55,4.95,0.15,7.01-0.16c11.87-1.78,23.18-3.58,33.84-4.71c2.06-0.22,4.24-0.19,6.25,0.28"/>
 				<path id="kvg:06442-s5" kvg:type="㇑a" d="M55.84,21.79c1,1,1.38,2.46,1.38,3.64c0,2.28,0.02,19.12,0.02,27.3"/>
 				<path id="kvg:06442-s6" kvg:type="㇐a" d="M58.5,30.75c5.6-0.79,16.75-2.34,23.01-2.91"/>
diff --git a/kanji/06687-Kaisho.svg b/kanji/06687-Kaisho.svg
index d1e9f5d0b..695c6428b 100644
--- a/kanji/06687-Kaisho.svg
+++ b/kanji/06687-Kaisho.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:06687-Kaisho-s3" kvg:type="㇐a" d="M14.06,50.5c2.83-0.3,5.64-0.71,8.44-1.14c0.64-0.1,1.26-0.19,1.89-0.29"/>
 		<path id="kvg:06687-Kaisho-s4" kvg:type="㇐a" d="M14.42,72.86c5.91-0.53,8.28-1.47,15.4-1.93"/>
 	</g>
-	<g id="kvg:06687-Kaisho-g2" kvg:position="right">
+	<g id="kvg:06687-Kaisho-g2" kvg:element="叚" kvg:position="right">
 		<path id="kvg:06687-Kaisho-s5" kvg:type="㇕" d="M42.31,21.37c5.69-1.12,9.98-2.6,15.92-3.5c1.49-0.22,2.39,1.04,2.18,2.06c-0.89,4.25-2.66,14.07-3.24,18.78"/>
 		<path id="kvg:06687-Kaisho-s6" kvg:type="㇐" d="M41.97,42.05c4.8-0.54,13.28-2.3,17.69-2.81"/>
 		<path id="kvg:06687-Kaisho-s7" kvg:type="㇑" d="M40.14,18.9c0.86,0.85,1.75,2.31,1.86,3.64c0,15.96,0,61.71-0.25,69.71"/>
diff --git a/kanji/06687-KaishoVtFst.svg b/kanji/06687-KaishoVtFst.svg
index bc297329a..d11d2cf0c 100644
--- a/kanji/06687-KaishoVtFst.svg
+++ b/kanji/06687-KaishoVtFst.svg
@@ -43,7 +43,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:06687-KaishoVtFst-s3" kvg:type="㇐a" d="M14.06,50.5c2.83-0.3,5.64-0.71,8.44-1.14c0.64-0.1,1.26-0.19,1.89-0.29"/>
 		<path id="kvg:06687-KaishoVtFst-s4" kvg:type="㇐a" d="M14.42,72.86c5.91-0.53,8.28-1.47,15.4-1.93"/>
 	</g>
-	<g id="kvg:06687-KaishoVtFst-g2" kvg:position="right">
+	<g id="kvg:06687-KaishoVtFst-g2" kvg:element="叚" kvg:position="right">
 		<path id="kvg:06687-KaishoVtFst-s5" kvg:type="㇑" d="M40.14,18.9c0.86,0.85,1.75,2.31,1.86,3.64c0,15.96,0,61.71-0.25,69.71"/>
 		<path id="kvg:06687-KaishoVtFst-s6" kvg:type="㇕" d="M42.31,21.37c5.69-1.12,9.98-2.6,15.92-3.5c1.49-0.22,2.39,1.04,2.18,2.06c-0.89,4.25-2.66,14.07-3.24,18.78"/>
 		<path id="kvg:06687-KaishoVtFst-s7" kvg:type="㇐" d="M41.97,42.05c4.8-0.54,13.28-2.3,17.69-2.81"/>
diff --git a/kanji/06b1d-Kaisho.svg b/kanji/06b1d-Kaisho.svg
index 89cb841b7..fdc4c2307 100644
--- a/kanji/06b1d-Kaisho.svg
+++ b/kanji/06b1d-Kaisho.svg
@@ -37,7 +37,7 @@ kvg:type CDATA #IMPLIED >
 <svg xmlns="http://www.w3.org/2000/svg" width="109" height="109" viewBox="0 0 109 109">
 <g id="kvg:StrokePaths_06b1d-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:06b1d-Kaisho" kvg:element="欝">
-	<g id="kvg:06b1d-Kaisho-g1" kvg:position="top">
+	<g id="kvg:06b1d-Kaisho-g1" kvg:element="棥" kvg:position="top">
 		<g id="kvg:06b1d-Kaisho-g2" kvg:element="爻">
 			<g id="kvg:06b1d-Kaisho-g3" kvg:element="乂" kvg:position="top">
 				<path id="kvg:06b1d-Kaisho-s1" kvg:type="㇒" d="M59.77,9.64c0.04,0.35,0.08,0.91-0.08,1.42c-0.97,3-6.53,9.58-14.13,13.61"/>
diff --git a/kanji/06f5f.svg b/kanji/06f5f.svg
index 12c0e11ad..8f770e884 100644
--- a/kanji/06f5f.svg
+++ b/kanji/06f5f.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:06f5f-s2" kvg:type="㇔" d="M14.75,40.25c3.79,1.54,9.8,6.35,10.75,8.75"/>
 		<path id="kvg:06f5f-s3" kvg:type="㇀" d="M13.25,88.71c1.5,1.31,3.31,1.36,4.25-0.25C20.25,83.75,23,78,25.5,72"/>
 	</g>
-	<g id="kvg:06f5f-g2" kvg:position="right">
+	<g id="kvg:06f5f-g2" kvg:element="舄" kvg:position="right">
 		<g id="kvg:06f5f-g3" kvg:element="臼">
 			<path id="kvg:06f5f-s4" kvg:type="㇒" d="M59.03,11.96c0.04,0.26,0.2,0.77-0.08,1.04c-2.95,2.75-6.25,5.98-14.4,8.91"/>
 			<path id="kvg:06f5f-s5" kvg:type="㇑" d="M42.83,21.07c0.67,0.61,0.99,1.96,1.11,3.21c0.33,3.48,2.52,19.32,3.13,25.48"/>
diff --git a/kanji/06fc0-Kaisho.svg b/kanji/06fc0-Kaisho.svg
index 63ff10e91..1ac1c3d85 100644
--- a/kanji/06fc0-Kaisho.svg
+++ b/kanji/06fc0-Kaisho.svg
@@ -42,7 +42,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:06fc0-Kaisho-s2" kvg:type="㇔" d="M11.25,42.5c3.79,1.15,9.8,4.72,10.75,6.5"/>
 		<path id="kvg:06fc0-Kaisho-s3" kvg:type="㇀" d="M10.25,87.21c1.5,1.31,3.31,1.36,4.25-0.25c2.75-4.7,5.5-10.45,8-16.45"/>
 	</g>
-	<g id="kvg:06fc0-Kaisho-g2" kvg:position="right">
+	<g id="kvg:06fc0-Kaisho-g2" kvg:element="敫" kvg:position="right">
 		<g id="kvg:06fc0-Kaisho-g3" kvg:position="left">
 			<g id="kvg:06fc0-Kaisho-g4" kvg:element="白">
 				<g id="kvg:06fc0-Kaisho-g5" kvg:position="top">
diff --git a/kanji/0904a-Kaisho.svg b/kanji/0904a-Kaisho.svg
index 3c0bb1308..f7c407acd 100644
--- a/kanji/0904a-Kaisho.svg
+++ b/kanji/0904a-Kaisho.svg
@@ -37,7 +37,7 @@ kvg:type CDATA #IMPLIED >
 <svg xmlns="http://www.w3.org/2000/svg" width="109" height="109" viewBox="0 0 109 109">
 <g id="kvg:StrokePaths_0904a-Kaisho" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:0904a-Kaisho" kvg:element="遊">
-	<g id="kvg:0904a-Kaisho-g1" kvg:position="nyoc">
+	<g id="kvg:0904a-Kaisho-g1" kvg:element="斿" kvg:position="nyoc">
 		<g id="kvg:0904a-Kaisho-g2" kvg:element="方">
 			<g id="kvg:0904a-Kaisho-g3" kvg:element="亠" kvg:position="top">
 				<path id="kvg:0904a-Kaisho-s1" kvg:type="㇑a" d="M42.71,11.28c3.54,2.22,8.48,7.72,9.12,10.89"/>
diff --git a/kanji/095a2-Kaisho.svg b/kanji/095a2-Kaisho.svg
index 1abdbb452..68e1ea168 100644
--- a/kanji/095a2-Kaisho.svg
+++ b/kanji/095a2-Kaisho.svg
@@ -51,14 +51,16 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:095a2-Kaisho-s8" kvg:type="㇐a" d="M65.55,36.76C72.25,36,79.75,35,88.6,34.7"/>
 		</g>
 	</g>
-	<path id="kvg:095a2-Kaisho-s9" kvg:type="㇔" d="M42.1,44.92c1.66,1.34,4.28,5.52,4.69,7.61"/>
-	<path id="kvg:095a2-Kaisho-s10" kvg:type="㇒" d="M62.2,42.14c0.02,0.24,0.04,0.61-0.03,0.95c-0.41,2.01-2.78,6.42-6.01,9.12"/>
-	<g id="kvg:095a2-Kaisho-g4" kvg:element="天">
-		<path id="kvg:095a2-Kaisho-s11" kvg:type="㇐" d="M36.85,57.61c0.75,0.29,2.12,0.35,2.87,0.29c5.03-0.4,21.78-3.4,26.63-3.61c1.25-0.05,2,0.14,2.62,0.28"/>
-		<g id="kvg:095a2-Kaisho-g5" kvg:element="大">
-			<path id="kvg:095a2-Kaisho-s12" kvg:type="㇐" d="M33.29,70.04c0.54,0.22,1.94,0.4,2.52,0.3c5.46-0.93,29.06-3.61,34.96-3.79c0.75-0.02,1.81,0.08,3.49,0.46"/>
-			<path id="kvg:095a2-Kaisho-s13" kvg:type="㇒" d="M52.85,58.09c0.44,0.49,1,1.71,0.85,2.65C51,77.5,43.5,85.25,31.41,91.12"/>
-			<path id="kvg:095a2-Kaisho-s14" kvg:type="㇏" d="M52.74,67.59c4.31,4.79,13.65,16.08,17.95,19.29c1.47,1.09,1.97,1.25,2.64,1.36"/>
+	<g id="kvg:095a2-Kaisho-g4" kvg:element="关">
+		<path id="kvg:095a2-Kaisho-s9" kvg:type="㇔" d="M42.1,44.92c1.66,1.34,4.28,5.52,4.69,7.61"/>
+		<path id="kvg:095a2-Kaisho-s10" kvg:type="㇒" d="M62.2,42.14c0.02,0.24,0.04,0.61-0.03,0.95c-0.41,2.01-2.78,6.42-6.01,9.12"/>
+		<g id="kvg:095a2-Kaisho-g5" kvg:element="天">
+			<path id="kvg:095a2-Kaisho-s11" kvg:type="㇐" d="M36.85,57.61c0.75,0.29,2.12,0.35,2.87,0.29c5.03-0.4,21.78-3.4,26.63-3.61c1.25-0.05,2,0.14,2.62,0.28"/>
+			<g id="kvg:095a2-Kaisho-g6" kvg:element="大">
+				<path id="kvg:095a2-Kaisho-s12" kvg:type="㇐" d="M33.29,70.04c0.54,0.22,1.94,0.4,2.52,0.3c5.46-0.93,29.06-3.61,34.96-3.79c0.75-0.02,1.81,0.08,3.49,0.46"/>
+				<path id="kvg:095a2-Kaisho-s13" kvg:type="㇒" d="M52.85,58.09c0.44,0.49,1,1.71,0.85,2.65C51,77.5,43.5,85.25,31.41,91.12"/>
+				<path id="kvg:095a2-Kaisho-s14" kvg:type="㇏" d="M52.74,67.59c4.31,4.79,13.65,16.08,17.95,19.29c1.47,1.09,1.97,1.25,2.64,1.36"/>
+			</g>
 		</g>
 	</g>
 </g>
diff --git a/kanji/096a8.svg b/kanji/096a8.svg
index bfeccef05..cdc6e962f 100644
--- a/kanji/096a8.svg
+++ b/kanji/096a8.svg
@@ -44,7 +44,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:096a8-s3" kvg:type="㇑" d="M15.89,16.71c0.36,1.54,0.1,3.95,0.31,5.04c0.2,1.09,0,68.44-0.2,75.25"/>
 		</g>
 	</g>
-	<g id="kvg:096a8-g3" kvg:position="right">
+	<g id="kvg:096a8-g3" kvg:element="遀" kvg:position="right">
 		<g id="kvg:096a8-g4" kvg:position="nyoc">
 			<g id="kvg:096a8-g5" kvg:element="左" kvg:position="top">
 				<g id="kvg:096a8-g6" kvg:element="隋" kvg:part="2" kvg:position="nyoc">