Changes to be committed: modified: rules/base.extras.xml modified: symbols/hu

1 files changed, 107 insertions, 40 deletions

diff --git a/symbols/hu b/symbols/hu
index 724b036c..875f1387 100644
--- a/symbols/hu
+++ b/symbols/hu
@@ -438,7 +438,7 @@ xkb_symbols "def_common" {
 // 
 //
 // (C) 2013 Andras Tisza
-// (C) 2017,2018  Viktor Kovacs <kovacs.viktor.dev@gmail.com>
+// (C) 2017,2018,2020  Viktor Kovacs <kov.h.vik.developer@gmail.com>
 //
 // Permission is granted to anyone to use, distribute and modify
 // this file in any way, provided that the above copyright notice
@@ -450,50 +450,28 @@ xkb_symbols "def_common" {
 // Changes:
 // 2013 - Planned Old Hungarian layout
 // 2017 - Added Old Hungarian layout
-//2018 - Resolved several easy-to-use issue, added extra punctuation and quotation marks  
+// 2018 - Resolved several easy-to-use issue, added extra punctuation and quotation marks  
+// 2020 - Added ligature capable layout ( with Zero-widt-joiner), added copyright, copyleft symbols 
 
 partial alphanumeric_keys
 xkb_symbols "oldhun" {
 name[Group1]="Old Hungarian";
+include "hu(oldhun_base)"
+include "hu(oldhun_origin)"
 include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "ohu_lig" {
+name[Group1]="Old Hungarian (for ligatures)";
+include "hu(oldhun_base)"
+include "hu(oldhun_lig)"
+include "level3(ralt_switch)"
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "oldhun_base" { 
 key.type[Group1]="FOUR_LEVEL_ALPHABETIC";
-// In the remarks you can read characters displayed only Unicode point
-    key <AE01> {[U10CFA,         apostrophe,	U2E42,	1    ]};
-//Old Hungarian one, reversed 9 double low quotemark
-    
-    key <AE02> {[                 U10CFB,	quotedbl,U201F,	2]};
-//Old Hungarian five, reversed 9 double upper quotemark
-    
-    key <AE03> {[                 U10CFC,	plus,minus,	3]};
-//Old Hungarian ten
-    
-    key <AE04> {[       U10CFD,	exclam,		U203C,	4]};
-//Old Hungarian fifty,double exclam
-    
-    key <AE05> {[       U10CFE,	percent,U2026,	5]};
-//Old Hungarian hundred, triple dot
-    
-    key <AE06> {[       U10CFF,	slash, backslash,6]};
-//Old Hungarian thousand
- 
-    key <AE07> {[U10CC6,	U10C86,	equal,7]};
-//Old Hungarian cs, Cs
-    
-    key <AE08> {[ U10CDA,	U10C9A,		parenleft,8]};
-//Old Hungarian ny, Ny
-    
-    key <AE09> {[U10CE8,	U10CA8,	parenright,9 ]};
-//Old Hungarian ty, Ty
-    
-    key <AE10> {[     U10CDE,     U10C9E,    U10CDD,       U10C9D          ]};
-//Old Hungarian Rudimenta oe, Oe, Nikolsburg oe, Oe
-    
-    key <AE11> {[U10CED,         U10CAD		]};
-//Old Hungarian ue , Ue
-    
-    key <AE12> {[U10CDC,         U10C9C		 ]};
-//Old Hungarian oo, OO
-    
     key <AD01> {[U10CCE,         U10C8E,	backslash	    ]};
 //Old-Hungarian gy, Gy
     
@@ -599,7 +577,96 @@ key.type[Group1]="FOUR_LEVEL_ALPHABETIC";
 	key <LSGT> {[U10CD1,         U10C91,	less	]};
 //Old Hungarian ii,II
 	
+	    };
+
+hidden partial alphanumeric_keys
+xkb_symbols "oldhun_origin" {
+key.type[Group1]="FOUR_LEVEL_ALPHABETIC";
 	key <TLDE> {[	section,	U200F,	U200E,	0]};
 //Right to left mark, left to right mark
+//Zero-width-joiner reqired for ligatures
 
-	    };
+// In the remarks you can read characters displayed only Unicode point
+    key <AE01> {[U10CFA,         apostrophe,	U2E42,	1    ]};
+//Old Hungarian one, reversed 9 double low quotemark
+    
+    key <AE02> {[                 U10CFB,	quotedbl,U201F,	2]};
+//Old Hungarian five, reversed 9 double upper quotemark
+    
+    key <AE03> {[                 U10CFC,	plus,minus,	3]};
+//Old Hungarian ten
+    
+    key <AE04> {[       U10CFD,	exclam,		U203C,	4]};
+//Old Hungarian fifty,double exclam
+    
+    key <AE05> {[       U10CFE,	percent,U2026,	5]};
+//Old Hungarian hundred, triple dot
+    
+    key <AE06> {[       U10CFF,	slash, backslash,6]};
+//Old Hungarian thousand
+ 
+    key <AE07> {[U10CC6,	U10C86,	equal,7]};
+//Old Hungarian cs, Cs
+    
+    key <AE08> {[ U10CDA,	U10C9A,		parenleft,8]};
+//Old Hungarian ny, Ny
+    
+    key <AE09> {[U10CE8,	U10CA8,	parenright,9 ]};
+//Old Hungarian ty, Ty
+    
+    key <AE10> {[     U10CDE,     U10C9E,    U10CDD,       U10C9D          ]};
+//Old Hungarian Rudimenta oe, Oe, Nikolsburg oe, Oe
+    
+    key <AE11> {[U10CED,         U10CAD,	section]};
+//Old Hungarian ue , Ue
+    
+    key <AE12> {[U10CDC,         U10C9C,	copyright,	U1F12F ]};
+//Old Hungarian oo, OO, copyleft
+    
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "oldhun_lig" {
+key.type[Group1]="FOUR_LEVEL_ALPHABETIC";
+	key <TLDE> {[	U200D,	U200F,	U200E,	0]};
+//Zero-width-joiner,Right to left mark, left to right mark
+//Zero-width-joiner reqired for ligatures
+
+// In the remarks you can read characters displayed only Unicode point
+    key <AE01> {[U10CFA,         apostrophe,	U2E42,	1    ]};
+//Old Hungarian one, reversed 9 double low quotemark
+    
+    key <AE02> {[                 U10CFB,	quotedbl,U201F,	2]};
+//Old Hungarian five, reversed 9 double upper quotemark
+    
+    key <AE03> {[                 U10CFC,	plus,minus,	3]};
+//Old Hungarian ten
+    
+    key <AE04> {[       U10CFD,	exclam,		U203C,	4]};
+//Old Hungarian fifty,double exclam
+    
+    key <AE05> {[       U10CFE,	percent,U2026,	5]};
+//Old Hungarian hundred, triple dot
+    
+    key <AE06> {[       U10CFF,	slash, backslash,6]};
+//Old Hungarian thousand
+ 
+    key <AE07> {[U10CC6,	U10C86,	equal,7]};
+//Old Hungarian cs, Cs
+    
+    key <AE08> {[ U10CDA,	U10C9A,		parenleft,8]};
+//Old Hungarian ny, Ny
+    
+    key <AE09> {[U10CE8,	U10CA8,	parenright,9 ]};
+//Old Hungarian ty, Ty
+    
+    key <AE10> {[     U10CDE,     U10C9E,    U10CDD,       U10C9D          ]};
+//Old Hungarian Rudimenta oe, Oe, Nikolsburg oe, Oe
+    
+    key <AE11> {[U10CED,         U10CAD,	section]};
+//Old Hungarian ue , Ue
+    
+    key <AE12> {[U10CDC,         U10C9C,	copyright,	U1F12F ]};
+//Old Hungarian oo, OO, copyleft
+    
+};