aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fontconfig/conf.d/65-nonlatin.conf2
-rw-r--r--fontconfig/fc-case/CaseFolding.txt8
-rw-r--r--mesalib/src/mapi/glapi/gen/GL3x.xml3
-rw-r--r--mesalib/src/mesa/drivers/dri/common/dri_util.c57
-rw-r--r--mesalib/src/mesa/main/fbobject.c9
-rw-r--r--mesalib/src/mesa/main/queryobj.c2
-rw-r--r--mesalib/src/mesa/main/texparam.c2
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in33
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in14
-rw-r--r--xorg-server/xkeyboard-config/symbols/apl25
-rw-r--r--xorg-server/xkeyboard-config/symbols/ara2
-rw-r--r--xorg-server/xkeyboard-config/symbols/il4
-rw-r--r--xorg-server/xkeyboard-config/symbols/rs4
-rw-r--r--xorg-server/xkeyboard-config/symbols/us135
14 files changed, 162 insertions, 138 deletions
diff --git a/fontconfig/conf.d/65-nonlatin.conf b/fontconfig/conf.d/65-nonlatin.conf
index 36aa3e518..9306f7492 100644
--- a/fontconfig/conf.d/65-nonlatin.conf
+++ b/fontconfig/conf.d/65-nonlatin.conf
@@ -164,10 +164,8 @@
<family>NanumGothicCoding</family> <!-- hangul (ko) -->
<family>NanumGothic</family> <!-- hangul (ko) -->
<family>UnDotum</family> <!-- hangul (ko) -->
- <family>UnBatang</family> <!-- hangul (ko) -->
<family>Baekmuk Dotum</family> <!-- hangul (ko) -->
<family>Baekmuk Gulim</family> <!-- hangul (ko) -->
- <family>Baekmuk Batang</family> <!-- hangul (ko) -->
<family>TlwgTypo</family> <!-- thai -->
<family>TlwgTypist</family> <!-- thai -->
<family>TlwgTypewriter</family> <!-- thai -->
diff --git a/fontconfig/fc-case/CaseFolding.txt b/fontconfig/fc-case/CaseFolding.txt
index 0d9a4090c..df1813d2a 100644
--- a/fontconfig/fc-case/CaseFolding.txt
+++ b/fontconfig/fc-case/CaseFolding.txt
@@ -1,8 +1,8 @@
-# CaseFolding-6.1.0.txt
-# Date: 2011-07-25, 21:21:56 GMT [MD]
+# CaseFolding-6.2.0.txt
+# Date: 2012-08-14, 17:54:49 GMT [MD]
#
# Unicode Character Database
-# Copyright (c) 1991-2011 Unicode, Inc.
+# Copyright (c) 1991-2012 Unicode, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html
# For documentation, see http://www.unicode.org/reports/tr44/
#
@@ -1222,3 +1222,5 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
10425; C; 1044D; # DESERET CAPITAL LETTER ENG
10426; C; 1044E; # DESERET CAPITAL LETTER OI
10427; C; 1044F; # DESERET CAPITAL LETTER EW
+#
+# EOF
diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml
index 83b5d499a..1b7adddfa 100644
--- a/mesalib/src/mapi/glapi/gen/GL3x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL3x.xml
@@ -601,8 +601,7 @@
<param name="data" type="GLint64 *"/>
</function>
- <function name="GetBufferParameteri64v" offset="assign" es2="3.0"
- exec="skip">
+ <function name="GetBufferParameteri64v" offset="assign" es2="3.0">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint64 *"/>
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index 983bbea49..917b9465b 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -563,40 +563,43 @@ dri2GetAPIMask(__DRIscreen *screen)
/** Core interface */
const __DRIcoreExtension driCoreExtension = {
- { __DRI_CORE, __DRI_CORE_VERSION },
- NULL,
- driDestroyScreen,
- driGetExtensions,
- driGetConfigAttrib,
- driIndexConfigAttrib,
- NULL,
- driDestroyDrawable,
- NULL,
- NULL,
- driCopyContext,
- driDestroyContext,
- driBindContext,
- driUnbindContext
+ .base = { __DRI_CORE, __DRI_CORE_VERSION },
+
+ .createNewScreen = NULL,
+ .destroyScreen = driDestroyScreen,
+ .getExtensions = driGetExtensions,
+ .getConfigAttrib = driGetConfigAttrib,
+ .indexConfigAttrib = driIndexConfigAttrib,
+ .createNewDrawable = NULL,
+ .destroyDrawable = driDestroyDrawable,
+ .swapBuffers = NULL,
+ .createNewContext = NULL,
+ .copyContext = driCopyContext,
+ .destroyContext = driDestroyContext,
+ .bindContext = driBindContext,
+ .unbindContext = driUnbindContext
};
/** DRI2 interface */
const __DRIdri2Extension driDRI2Extension = {
- { __DRI_DRI2, 3 },
- dri2CreateNewScreen,
- dri2CreateNewDrawable,
- dri2CreateNewContext,
- dri2GetAPIMask,
- dri2CreateNewContextForAPI,
- dri2AllocateBuffer,
- dri2ReleaseBuffer,
- dri2CreateContextAttribs
+ .base = { __DRI_DRI2, 3 },
+
+ .createNewScreen = dri2CreateNewScreen,
+ .createNewDrawable = dri2CreateNewDrawable,
+ .createNewContext = dri2CreateNewContext,
+ .getAPIMask = dri2GetAPIMask,
+ .createNewContextForAPI = dri2CreateNewContextForAPI,
+ .allocateBuffer = dri2AllocateBuffer,
+ .releaseBuffer = dri2ReleaseBuffer,
+ .createContextAttribs = dri2CreateContextAttribs
};
const __DRI2configQueryExtension dri2ConfigQueryExtension = {
- { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION },
- dri2ConfigQueryb,
- dri2ConfigQueryi,
- dri2ConfigQueryf,
+ .base = { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION },
+
+ .configQueryb = dri2ConfigQueryb,
+ .configQueryi = dri2ConfigQueryi,
+ .configQueryf = dri2ConfigQueryf,
};
void
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index ef739c162..223aef18d 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -31,6 +31,7 @@
* Brian Paul
*/
+#include <stdbool.h>
#include "buffers.h"
#include "context.h"
@@ -162,13 +163,13 @@ invalidate_framebuffer(struct gl_framebuffer *fb)
static struct gl_framebuffer *
get_framebuffer_target(struct gl_context *ctx, GLenum target)
{
+ bool have_fb_blit = _mesa_is_gles3(ctx) ||
+ (ctx->Extensions.EXT_framebuffer_blit && _mesa_is_desktop_gl(ctx));
switch (target) {
case GL_DRAW_FRAMEBUFFER:
- return ctx->Extensions.EXT_framebuffer_blit && _mesa_is_desktop_gl(ctx)
- ? ctx->DrawBuffer : NULL;
+ return have_fb_blit ? ctx->DrawBuffer : NULL;
case GL_READ_FRAMEBUFFER:
- return ctx->Extensions.EXT_framebuffer_blit && _mesa_is_desktop_gl(ctx)
- ? ctx->ReadBuffer : NULL;
+ return have_fb_blit ? ctx->ReadBuffer : NULL;
case GL_FRAMEBUFFER_EXT:
return ctx->DrawBuffer;
default:
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index dbf40d051..fecbd3f12 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -321,7 +321,7 @@ _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id)
q = _mesa_lookup_query_object(ctx, id);
if (!q) {
- if (ctx->API == API_OPENGL_CORE) {
+ if (ctx->API != API_OPENGL) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glBeginQuery{Indexed}(non-gen name)");
return;
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index 8ce054618..92c89102f 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -349,7 +349,7 @@ set_tex_parameteri(struct gl_context *ctx,
if (texObj->MaxLevel == params[0])
return GL_FALSE;
if (params[0] < 0 || texObj->Target == GL_TEXTURE_RECTANGLE_ARB) {
- _mesa_error(ctx, GL_INVALID_OPERATION,
+ _mesa_error(ctx, GL_INVALID_VALUE,
"glTexParameter(param=%d)", params[0]);
return GL_FALSE;
}
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 205f5c119..fcccd1b73 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -7,57 +7,50 @@
<configItem>
<name>apl</name>
<_shortDescription>apl</_shortDescription>
- <_description>APL Keyboard Symbols</_description>
+ <_description>APL keyboard symbols</_description>
<languageList><iso639Id>eng</iso639Id></languageList>
</configItem>
<variantList>
<variant>
<configItem>
<name>dyalog</name>
- <shortDescription>dyalog</shortDescription>
- <description>dyalog</description>
+ <shortDescription>dlg</shortDescription>
+ <description>APL keyboard symbols (Dyalog)</description>
</configItem>
</variant>
<variant>
<configItem>
<name>sax</name>
<shortDescription>sax</shortDescription>
- <description>sax</description>
+ <description>APL keyboard symbols (sax)</description>
</configItem>
</variant>
<variant>
<configItem>
<name>unified</name>
- <shortDescription>unified</shortDescription>
- <description>unified</description>
+ <shortDescription>ufd</shortDescription>
+ <description>APL keyboard symbols (unified)</description>
</configItem>
</variant>
<variant>
<configItem>
<name>apl2</name>
<shortDescription>apl2</shortDescription>
- <description>apl2</description>
+ <description>APL keyboard symbols (IBM APL2)</description>
</configItem>
</variant>
<variant>
<configItem>
<name>aplplusII</name>
- <shortDescription>aplplusII</shortDescription>
- <description>aplplusII</description>
+ <shortDescription>aplII</shortDescription>
+ <description>APL keyboard symbols (Manugistics APL*PLUS II)</description>
</configItem>
</variant>
<variant>
<configItem>
<name>aplx</name>
<shortDescription>aplx</shortDescription>
- <description>aplx</description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>dyalog_base</name>
- <shortDescription>dyalog_base</shortDescription>
- <description>dyalog without box or op-codes</description>
+ <description>APL keyboard symbols (APLX unified)</description>
</configItem>
</variant>
</variantList>
@@ -362,14 +355,14 @@
<configItem>
<name>il</name>
<_shortDescription>he</_shortDescription>
- <_description>Hebrew (Biblical SIL)</_description>
+ <_description>Hebrew</_description>
<languageList><iso639Id>heb</iso639Id></languageList>
</configItem>
<variantList>
<variant>
<configItem>
- <name>SIL Phonetic</name>
- <_description>Biblical SIL phonetic</_description>
+ <name>biblicalSIL</name>
+ <_description>Hebrew (Biblical, SIL phonetic)</_description>
<languageList><iso639Id>heb</iso639Id></languageList>
</configItem>
</variant>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 313f4884d..5f0618166 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1296,7 +1296,7 @@
<variant>
<configItem>
<name>dvorak-intl</name>
- <_description>English (Dvorak international with dead keys)</_description>
+ <_description>English (Dvorak, international with dead keys)</_description>
</configItem>
</variant>
<variant>
@@ -1375,9 +1375,15 @@
<variant>
<configItem>
<name>workman</name>
- <_description>English (US, Workman)</_description>
+ <_description>English (Workman)</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>workman-intl</name>
+ <_description>English (Workman, international with dead keys)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -4235,7 +4241,7 @@
<name>rs</name>
<!-- Keyboard indicator for Serbian layouts -->
<_shortDescription>sr</_shortDescription>
- <_description>Serbian (Cyrillic)</_description>
+ <_description>Serbian</_description>
<languageList>
<iso639Id>srp</iso639Id>
</languageList>
@@ -5511,7 +5517,7 @@
<configItem>
<name>gag</name>
<_shortDescription>gag</_shortDescription>
- <_description>Gagauz</_description>
+ <_description>Moldavian (Gagauz)</_description>
<languageList><iso639Id>gag</iso639Id></languageList>
</configItem>
</variant>
diff --git a/xorg-server/xkeyboard-config/symbols/apl b/xorg-server/xkeyboard-config/symbols/apl
index 6fa993e36..ebc4115e6 100644
--- a/xorg-server/xkeyboard-config/symbols/apl
+++ b/xorg-server/xkeyboard-config/symbols/apl
@@ -41,6 +41,8 @@
default partial alphanumeric_keys
xkb_symbols "basic" {
include "apl(dyalog_base)" // forward reference good APL keyboard without Dyalogs extras
+
+ name[Group1]= "APL keyboard symbols";
};
// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
@@ -62,7 +64,6 @@ xkb_symbols "basic" {
partial hidden alphanumeric_keys
xkb_symbols "common" {
- name[Group1]= "APL";
key <AB01> { [ U2282 ] }; // Z: ⊂ -- Subset Of
key <AB02> { [ U2283 ] }; // X: ⊃ -- Superset Of
@@ -127,7 +128,7 @@ xkb_symbols "common" {
partial alphanumeric_keys
xkb_symbols "unified" {
- name[Group1]= "APL Keyboard Symbols: Unified Layout";
+ name[Group1]= "APL keyboard symbols (unified)";
include "apl(common)"
@@ -160,7 +161,7 @@ xkb_symbols "unified" {
partial alphanumeric_keys
xkb_symbols "sax" {
- name[Group1]= "APL Keyboard Symbols";
+ name[Group1]= "APL keyboard symbols (sax)";
include "apl(unified)"
@@ -222,7 +223,7 @@ xkb_symbols "sax" {
partial alphanumeric_keys
xkb_symbols "apl2" {
- name[Group1]= "APL Keyboard Symbols: IBM APL2";
+ name[Group1]= "APL keyboard symbols (IBM APL2)";
include "apl(common)"
@@ -282,10 +283,10 @@ xkb_symbols "apl2" {
partial alphanumeric_keys
xkb_symbols "aplplusII" {
- name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II";
// AFS - short for APL Functional Symbol
include "apl(apl2)"
+ name[Group1]= "APL keyboard symbols (Manugistics APL*PLUS II)";
key <AC10> { [ bracketleft, parenleft, U234E ] }; // ;: ⍎ -- [See B key in SAX layout]
key <AC11> { [ bracketright, parenright, U2355 ] }; // ': ⍕ -- [See N key in SAX layout]
@@ -319,10 +320,10 @@ xkb_symbols "aplplusII" {
partial alphanumeric_keys
xkb_symbols "aplx" {
- name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout";
-
include "apl(unified)"
+ name[Group1]= "APL keyboard symbols (APLX unified)";
+
key <AB08> { [ U235D, U236A ] }; // ,: ⍝ ⍪ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Comma Bar
key <AB09> { [ U2340, U2364 ] }; // .: ⍀ ⍤ -- APL Functional Symbol Backslash Bar / APL Functional Symbol Jot Diaeresis
key <AB10> { [ U233F ] }; // /: ⌿ -- APL Functional Symbol Slash Bar
@@ -361,9 +362,8 @@ xkb_symbols "aplx" {
// the alphabet and similar. If this keyboard is placed as the 2nd layout then it can
// be reached with a latching shift to increase group by one.
-partial alphanumeric_keys
+partial hidden alphanumeric_keys
xkb_symbols "dyalog_base" {
- name[Group1]="APL";
// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
@@ -433,9 +433,8 @@ xkb_symbols "dyalog_base" {
key <TLDE> { [ U22c4 ] }; // diamond
};
-partial keypad_keys
+partial hidden keypad_keys
xkb_symbols "dyalog_box" {
- name[Group1]="Dyalog box";
// ┌───┬───┬───┬───┐
// │ │ │ │ │
@@ -463,8 +462,8 @@ xkb_symbols "dyalog_box" {
};
+partial hidden
xkb_symbols "dyalog_codes" {
- name[Group1]="Dyalog Codes";
// Layout of private use area for this. In the style of the Unicode book
//
@@ -601,6 +600,6 @@ xkb_symbols "dyalog" {
include "apl(dyalog_base)"
include "apl(dyalog_box)"
include "apl(dyalog_codes)"
- name[Group1] = "Dyalog APL complete";
+ name[Group1] = "APL keyboard symbols (Dyalog)";
};
diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara
index 76e03b1dd..146e9b325 100644
--- a/xorg-server/xkeyboard-config/symbols/ara
+++ b/xorg-server/xkeyboard-config/symbols/ara
@@ -62,8 +62,6 @@ xkb_symbols "basic" {
key <AB09> { [ Arabic_zain, period ] };
key <AB10> { [ Arabic_zah, Arabic_question_mark ] };
- include "level3(ralt_switch)"
-
// End alphanumeric section
};
diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il
index 6617d2dfc..78425339b 100644
--- a/xorg-server/xkeyboard-config/symbols/il
+++ b/xorg-server/xkeyboard-config/symbols/il
@@ -258,6 +258,8 @@ xkb_symbols "biblical" {
key <SPCE> { [ space, space, thinspace, nobreakspace ] };
};
+// EXTRAS
+
// Biblical hebrew (SIL) US Standard layout version 1.5
// This map is based closely on v 1.5 of the standard. The only deviation being the replacement of the composite characters sin and shin
// by their more recent Unicodev6 counterparts
@@ -267,7 +269,7 @@ xkb_symbols "biblical" {
// This linux port created and maintained by Dennis Meulensteen, dennis@meulensteen.nl
partial alphanumeric_keys
xkb_symbols "biblicalSIL" {
- name[Group1]= "Israel - Biblical Hebrew SIL Phonetic";
+ name[Group1]= "Hebrew (Biblical, SIL phonetic)";
key.type = "FOUR_LEVEL_SEMIALPHABETIC";
key <TLDE> { [ U20AC, U20AA, U0024 ] }; //Euro, Shekel, Dollar -
diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs
index 71541bcbc..1b88d0131 100644
--- a/xorg-server/xkeyboard-config/symbols/rs
+++ b/xorg-server/xkeyboard-config/symbols/rs
@@ -42,7 +42,7 @@ partial alphanumeric_keys
xkb_symbols "yz" {
// Cyrillic_zhe and Cyrillic_ze swapped.
- name[Group1]= "Serbian (Z and ZHE swapped)";
+ name[Group1]= "Serbian (Cyrillic, Z and ZHE swapped)";
include "rs(basic)"
@@ -280,7 +280,7 @@ xkb_symbols "latinunicodeyz" {
xkb_symbols "alternatequotes" {
// Another acceptable »pair of quotes« for Serbian
- name[Group1]= "Serbian (with guillemets)";
+ name[Group1]= "Serbian (Cyrillic with guillemets)";
include "rs(basic)"
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index 06cd3ce33..84bf15e76 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -259,7 +259,7 @@ xkb_symbols "dvorak" {
partial alphanumeric_keys
xkb_symbols "dvorak-intl" {
- name[Group1]= "English (Dvorak international with dead keys)";
+ name[Group1]= "English (Dvorak, international with dead keys)";
include "us(dvorak)"
@@ -729,7 +729,7 @@ xkb_symbols "mac" {
};
// Colemak symbols for xkb on X.Org Server 7.x
-// 2006-01-01 Shai Coleman, http://colemak.com/ . Public domain.
+// 2006-01-01 Shai Coleman, http://colemak.com/
partial alphanumeric_keys
xkb_symbols "colemak" {
@@ -1190,69 +1190,92 @@ xkb_symbols "htcdream" {
};
// Workman Keyboard Layout symbols for xkb on X.Org Server 7.x
-// 09-06-2010 OJ Bucao.
-partial default alphanumeric_keys
+// 09-06-2010 OJ Bucao. http://www.workmanlayout.com
+
+partial alphanumeric_keys
xkb_symbols "workman" {
- include "us(basic)"
+ name[Group1]= "English (Workman)";
- name[Group1]= "English (US, Workman)";
+ include "us(basic)"
// Alphanumeric section
- key <TLDE> { [ grave, asciitilde, dead_tilde, asciitilde ] };
- key <AE01> { [ 1, exclam, exclamdown, onesuperior ] };
- key <AE02> { [ 2, at, masculine, twosuperior ] };
- key <AE03> { [ 3, numbersign, ordfeminine, threesuperior ] };
- key <AE04> { [ 4, dollar, cent, sterling ] };
- key <AE05> { [ 5, percent, EuroSign, yen ] };
- key <AE06> { [ 6, asciicircum, hstroke, Hstroke ] };
- key <AE07> { [ 7, ampersand, eth, ETH ] };
- key <AE08> { [ 8, asterisk, thorn, THORN ] };
- key <AE09> { [ 9, parenleft, leftsinglequotemark, leftdoublequotemark ] };
- key <AE10> { [ 0, parenright, rightsinglequotemark, rightdoublequotemark ] };
- key <AE11> { [ minus, underscore, endash, emdash ] };
- key <AE12> { [ equal, plus, multiply, division ] };
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ d, D ] };
+ key <AD03> { [ r, R ] };
+ key <AD04> { [ w, W ] };
+ key <AD05> { [ b, B ] };
+ key <AD06> { [ j, J ] };
+ key <AD07> { [ f, F ] };
+ key <AD08> { [ u, U ] };
+ key <AD09> { [ p, P ] };
+ key <AD10> { [ semicolon, colon ] };
+
+ key <AC01> { [ a, A ] };
+ key <AC02> { [ s, S ] };
+ key <AC03> { [ h, H ] };
+ key <AC04> { [ t, T ] };
+ key <AC05> { [ g, G ] };
+ key <AC06> { [ y, Y ] };
+ key <AC07> { [ n, N ] };
+ key <AC08> { [ e, E ] };
+ key <AC09> { [ o, O ] };
+ key <AC10> { [ i, I ] };
+
+ key <AB01> { [ z, Z ] };
+ key <AB02> { [ x, X ] };
+ key <AB03> { [ m, M ] };
+ key <AB04> { [ c, C ] };
+ key <AB05> { [ v, V ] };
+ key <AB06> { [ k, K ] };
+ key <AB07> { [ l, L ] };
+ // End alphanumeric section
- key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] };
- key <AD02> { [ d, D, aring, Aring ] };
- key <AD03> { [ r, R, atilde, Atilde ] };
- key <AD04> { [ w, W, oslash, Ooblique ] };
- key <AD05> { [ b, B, dead_ogonek, asciitilde ] };
- key <AD06> { [ j, J, dstroke, Dstroke ] };
- key <AD07> { [ f, F, lstroke, Lstroke ] };
- key <AD08> { [ u, U, uacute, Uacute ] };
- key <AD09> { [ p, P, udiaeresis, Udiaeresis ] };
- key <AD10> { [ semicolon, colon, odiaeresis, Odiaeresis ] };
- key <AD11> { [ bracketleft, braceleft, guillemotleft, 0x1002039 ] };
- key <AD12> { [ bracketright, braceright, guillemotright, 0x100203a ] };
- key <BKSL> { [ backslash, bar, asciitilde, asciitilde ] };
+ key <CAPS> { [ BackSpace, Escape, BackSpace, BackSpace ] };
- key <AC01> { [ a, A, aacute, Aacute ] };
- key <AC02> { [ s, S, dead_grave, asciitilde ] };
- key <AC03> { [ h, H, ssharp, asciitilde ] };
- key <AC04> { [ t, T, dead_acute, dead_doubleacute ] };
- key <AC05> { [ g, G, dead_diaeresis, asciitilde ] };
- key <AC06> { [ y, Y, dead_caron, asciitilde ] };
- key <AC07> { [ n, N, ntilde, Ntilde ] };
- key <AC08> { [ e, E, eacute, Eacute ] };
- key <AC09> { [ o, O, iacute, Iacute ] };
- key <AC10> { [ i, I, oacute, Oacute ] };
- key <AC11> { [ apostrophe, quotedbl, otilde, Otilde ] };
+ include "level3(ralt_switch)"
+};
- key <AB01> { [ z, Z, ae, AE ] };
- key <AB02> { [ x, X, dead_circumflex, asciitilde ] };
- key <AB03> { [ m, M, ccedilla, Ccedilla ] };
- key <AB04> { [ c, C, oe, OE ] };
- key <AB05> { [ v, V, dead_breve, asciitilde ] };
- key <AB06> { [ k, K, dead_abovering, asciitilde ] };
- key <AB07> { [ l, L, dead_macron, asciitilde ] };
- key <AB08> { [ comma, less, dead_cedilla, asciitilde ] };
- key <AB09> { [ period, greater, dead_abovedot, asciitilde ] };
- key <AB10> { [ slash, question, questiondown, asciitilde ] };
+partial alphanumeric_keys
+xkb_symbols "workman-intl" {
- key <CAPS> { [ BackSpace, Escape, BackSpace, BackSpace ] };
- key <LSGT> { [ minus, underscore, endash, emdash ] };
- key <SPCE> { [ space, space, space, nobreakspace ] };
+ name[Group1]= "English (Workman, international with dead keys)";
+
+ include "us(intl)"
+
+ // Alphanumeric section
+ key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] };
+ key <AD02> { [ d, D, eth, ETH ] };
+ key <AD03> { [ r, R, registered, registered ] };
+ key <AD04> { [ w, W, aring, Aring ] };
+ key <AD05> { [ b, B, b, B ] };
+ key <AD06> { [ j, J, j, J ] };
+ key <AD07> { [ f, F, f, F ] };
+ key <AD08> { [ u, U, uacute, Uacute ] };
+ key <AD09> { [ p, P, odiaeresis, Odiaeresis ] };
+ key <AD10> { [ semicolon, colon, paragraph, degree ] };
+
+ key <AC01> { [ a, A, aacute, Aacute ] };
+ key <AC02> { [ s, S, ssharp, section ] };
+ key <AC03> { [ h, H, h, H ] };
+ key <AC04> { [ t, T, thorn, THORN ] };
+ key <AC05> { [ g, G, g, G ] };
+ key <AC06> { [ y, Y, udiaeresis, Udiaeresis ] };
+ key <AC07> { [ n, N, ntilde, Ntilde ] };
+ key <AC08> { [ e, E, eacute, Eacute ] };
+ key <AC09> { [ o, O, oacute, Oacute ] };
+ key <AC10> { [ i, I, iacute, Iacute ] };
+
+ key <AB01> { [ z, Z, ae, AE ] };
+ key <AB02> { [ x, X, x, X ] };
+ key <AB03> { [ m, M, mu, mu ] };
+ key <AB04> { [ c, C, copyright, cent ] };
+ key <AB05> { [ v, V, v, V ] };
+ key <AB06> { [ k, K, oe, OE ] };
+ key <AB07> { [ l, L, oslash, Ooblique ] };
+ // End alphanumeric section
+
+ key <CAPS> { [ BackSpace, Escape, BackSpace, BackSpace ] };
include "level3(ralt_switch)"
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 14:24:09 +0000