keyboard/altgr/weur: dweurak metadata overrides

diff --git a/keyboard/altgr/weur.eng.inc.pl b/keyboard/altgr/weur.eng.inc.pl
index 8d5a390a7ae3de80f7f5204556369441a40a0ef4..51b8fd06e9c60126cbfc598fc401fb87ef0b80c9 100644 (file)
--- a/keyboard/altgr/weur.eng.inc.pl
+++ b/keyboard/altgr/weur.eng.inc.pl
@@ -4,6 +4,25 @@ use warnings;
 no warnings 'qw';
 use Shiar_Sheet::KeyboardChars 'kbmodes';
 
 no warnings 'qw';
 use Shiar_Sheet::KeyboardChars 'kbmodes';
 

+my %info = (
+       mode => {
+               ''  => 'altgr-shifted ⌥',
+               '*' => 'μ greek prefix ⌥*',
+       },
+       version => '1.0', # upstream v2.0 2021/04/12
+       title => 'Western European',
+       map => 'qwerty', # specific positioning
+       category => 'latin/thirdparty/xorg',
+       intro => join("\n",
+               'Layout (<a href="https://altgr-weur.eu/" target=_blank>available</a> for major OSes)',
+               'to provide all accented characters commonly used',
+               'in 10 Western European languages available through one AltGr keystroke.',
+       ),
+       description => [
+               "QWERTY for Western European languages",
+       ],
+);
+

 my %rows = (
        '' => {
                '!'  => "\N{COMBINING DOT ABOVE}",
 my %rows = (
        '' => {
                '!'  => "\N{COMBINING DOT ABOVE}",


@@ -156,8 +175,20 @@ my %rows = (
 );
 
 our %get;
 );
 
 our %get;

-my $dweur = $get{map} && $get{map} eq 'dvorak';
-if ($dweur) {
+if ($get{map} and $get{map} eq 'dvorak') {
+       %info = (%info,
+               map   => 'dvorak',
+               title => 'dWEURak',
+               intro => join("\n",
+                       'Layout for <a href="https://altgr-weur.eu/" target=_blank>Western European</a> languages',
+                       'repositioned for Dvorak letters instead of original <span class=family-name>Qwerty</span>.',
+               ),
+               description => [
+                       "Dvorak for Western European languages",
+               ],
+       );
+       $info{version} .= '.1';
+

        my $dq = q{
                'z ,l .d pj yk  fq gt  r, l'
                dv hb s8  tw 8.
        my $dq = q{
                'z ,l .d pj yk  fq gt  r, l'
                dv hb s8  tw 8.


@@ -172,21 +203,4 @@ if ($dweur) {
        $rows{S} = delete $rows{'*'};
 }
 
        $rows{S} = delete $rows{'*'};
 }
 

-+{
-       %{ kbmodes(\%rows) },
-       mode => {
-               ''  => 'altgr-shifted ⌥',
-               '*' => 'μ greek prefix ⌥*',
-       },
-       version => '1.0', # upstream v2.0 2021/04/12
-       title => $dweur ? 'dWEURak' : 'Western European',
-       category => 'latin/thirdparty/xorg',
-       intro => join("\n",
-               'Layout (<a href="https://altgr-weur.eu/" target=_blank>available</a> for major OSes)',
-               'to provide all accented characters commonly used',
-               'in 10 Western European languages available through one AltGr keystroke.',
-       ),
-       description => [
-               "QWERTY for Western European languages",
-       ],
-}
++{ %{ kbmodes(\%rows) }, %info }