delete the Greek `extended` variant, as it does not extend `basic` at all

Until commit 9350c7347a from two years ago, the `extended` variant
contained *fewer* symbols than the `basic` variant, and did not contain
any symbols that `basic` did not have.  The extra symbols that it did
have over the `simple` variant were all present in the same locations
in the `basic` variant.  So at that point the `extended` variant was
fully redundant.  The mentioned commit 9350c7347a did not "perfect"
the `extended` layout but merely added some symbols in ill-considered
places.  Such adjustments are stuff for the `custom` layout instead.

This addresses and closes issue #412.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

4 files changed, 2 insertions, 67 deletions

diff --git a/rules/base.xml b/rules/base.xml
index 79c6cc56..4e18bd12 100644
--- a/rules/base.xml
+++ b/rules/base.xml
@@ -4002,12 +4002,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>extended</name>
-            <description>Greek (extended)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>nodeadkeys</name>
             <description>Greek (no dead keys)</description>
           </configItem>
diff --git a/rules/compat/variantsMapping.lst b/rules/compat/variantsMapping.lst
index c06fde66..1c3230f0 100644
--- a/rules/compat/variantsMapping.lst
+++ b/rules/compat/variantsMapping.lst
@@ -28,3 +28,4 @@ de	lld		it	lldde	// Delete in 2028.
 ara	qwerty		ara	basic	// Delete in 2028.
 ara	qwerty_digits	ara	digits	// Delete in 2028.
 mao	basic		nz	mao	// Delete in 2028.
+gr	extended	gr	basic	// Delete in 2028.
diff --git a/symbols/gr b/symbols/gr
index ab199b0e..2af55f02 100644
--- a/symbols/gr
+++ b/symbols/gr
@@ -125,60 +125,10 @@ xkb_symbols "simple" {
     include "kpdl(comma)"
 };
 
-
-// Greek - Extended
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━━┓
-// │ ~   │ !   │ @   │ #   │ $   │ %   │ ^   │ &   │ *   │ (   │ )   │ _   │ +   ┃Backspace  ┃
-// │ `   │ 1   │ 2 ² │ 3 ³ │ 4 £ │ 5 € │ 6   │ 7   │ 8   │ 9   │ 0 ° │ - ± │ =   ┃           ┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━━━┫
-// ┃       ┃ :   │ Σ   │ Ε   │ Ρ   │ Τ   │ Υ   │ Θ   │ Ι   │ Ο   │ Π   │ {   │ }   ┃Enter    ┃
-// ┃Tab    ┃ ; · │ ς   │ ε € │ ρ ® │ τ   │ υ ¥ │ θ   │ ι   │ ο   │ π   │ [   │ ]   ┃         ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓        ┃
-// ┃Caps    ┃ Α   │ Σ   │ Δ   │ Φ   │ Γ   │ Η   │ Ξ   │ Κ   │ Λ   │ ¨   │ "   │ |   ┃        ┃
-// ┃Lock    ┃ α   │ σ   │ δ   │ φ   │ γ   │ η   │ ξ   │ κ   │ λ   │ ´   │ '   │ \   ┃        ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━━━┫
-// ┃       ┃ »   │ Ζ   │ Χ   │ Ψ   │ Ω   │ Β   │ Ν   │ Μ   │ <   │ >   │ ?   ┃               ┃
-// ┃Shift  ┃ «   │ ζ § │ χ   │ ψ © │ ω   │ β   │ ν   │ μ   │ , « │ . » │ /   ┃Shift          ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴──┲━━┷━━━━┳┷━━━━━┻┳━━━━━━━┳━━━━━━┫
-// ┃       ┃       ┃       ┃                                  ┃       ┃       ┃       ┃      ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃              Space               ┃AltGr  ┃Meta   ┃Menu   ┃Ctrl  ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹──────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━┛
-
-partial alphanumeric_keys
-xkb_symbols "extended" {
-
-    include "gr(simple)"
-
-    name[Group1] = "Greek (extended)";
-
-    key.type[Group1] = "THREE_LEVEL";
-
-    key <TLDE>	{[  any,  any,          U2015 ]}; // ―
-    key <AE02>	{[  any,  any,    twosuperior ]}; // ²
-    key <AE03>	{[  any,  any,  threesuperior ]}; // ³
-    key <AE04>	{[  any,  any,       sterling ]}; // £
-    key <AE10>	{[  any,  any,         degree ]}; // °
-    key <AE11>	{[  any,  any,      plusminus ]}; // ±
-
-    key <AD01>	{[  any,  any, periodcentered ]}; // ·
-    key <AD04>	{[  any,  any,     registered ]}; // ®
-    key <AD06>	{[  any,  any,            yen ]}; // ¥
-
-    key <AB01>	{[  any,  any,        section ]}; // §
-    key <AB03>	{[  any,  any,      copyright ]}; // ©
-    key <AB08>	{[  any,  any,  guillemotleft ]}; // «
-    key <AB09>	{[  any,  any, guillemotright ]}; // »
-
-    include "eurosign(5)"
-    include "eurosign(e)"
-
-    include "level3(ralt_switch)"
-};
-
 partial alphanumeric_keys
 xkb_symbols "polytonic" {
 
-    include "gr(extended)"
+    include "gr(basic)"
 
     name[Group1] = "Greek (polytonic)";
 
diff --git a/symbols/sun_vndr/gr b/symbols/sun_vndr/gr
index 1b8b5233..32823ca0 100644
--- a/symbols/sun_vndr/gr
+++ b/symbols/sun_vndr/gr
@@ -100,16 +100,6 @@ partial alphanumeric_keys
 };
 
 partial alphanumeric_keys
-	xkb_symbols "bare" {
-	include "gr(bare)"
-};
-
-partial alphanumeric_keys
-	xkb_symbols "extended" {
-	include "gr(extended)"
-};
-
-partial alphanumeric_keys
 	xkb_symbols "polytonic" {
 	include "gr(polytonic)"
 };