← Back to branch summary

~ubuntu-branches/ubuntu/hardy/console-setup/hardy-proposed

« back to all changes in this revision

Viewing changes to Keyboard/ckb/symbols/macintosh_vndr/pt

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2007-06-03 14:53:42 UTC
  • Revision ID: james.westby@ubuntu.com-20070603145342-cr4a4wcfj2eg73fp
Tags: 1.16ubuntu1
https://launchpad.net/bugs/84156
* Resynchronise with Debian. Remaining changes:
  - Use keymapper to generate decision trees for a restricted subset of
    the pc105 model.
  - If the detect-keyboard debconf plugin is available
    (cdebconf-newt-detect-keys in the installer), then offer to use it to
    detect the keyboard layout.
  - Only default to Canadian layout for fr_CA; use U.S. English for other
    *_CA locales.
  - Set default charmap for d-i to UTF-8.
  - Remove unhelpful defaults for several questions.
  - Allow preseeding of console-setup/modelcode, console-setup/layoutcode,
    console-setup/variantcode, console-setup/optionscode, and
    console-setup/fontsize.
  - Reset console-setup/toggle to the default if it's set to "No toggling"
    and you select a non-Latin layout.
  - Change the default font from Terminus to VGA where supported.
  - Add a few bits of installer integration to console-setup-udeb borrowed
    from kbd-chooser.
  - console-setup Depends: perl; something in ckbcomp is causing perl to
    'use utf8' implicitly, and some of the necessary modules aren't in
    perl-base.
  - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current
    tty, since the current tty might belong to X and changing X's tty out
    of raw mode is a very bad idea.
  - Automatically save the font and keymap to /etc in
    /etc/init.d/console-setup if it isn't being run from init. Similarly,
    ensure that the font and keymap are saved to /etc during initial
    installation.
  - Disable workaround in ckbcomp for the kernel not applying Caps Lock to
    non-ASCII letters, except for Turkish layouts; the cure is worse than
    the disease because it makes Caps Lock equivalent to Shift Lock.
  - Use 'setupcon --save-only' to make sure the font is available on the
    root filesystem for the next boot but not to load it immediately,
    avoiding console manipulation when X or usplash is running.
  - Set keymap and font in the initramfs if possible.
  - Set default variant for French to oss.
  - Fix handling of commas in layout and variant names.
  - Fix keymap reduction not to try to express keymap A in terms of keymap
    B when B includes keys not mapped by A.
  - debian/config.proto: Set sparc default model to pc105.
  - debian/control: Remove outdated note about loadkeys in
    console-setup-udeb's description.
* Allow kbd's initramfs hook as an alternative to that provided by
  console-tools.
* Don't run 'setupcon -k' from rcS if usplash is running, as that means
  the console will be in raw mode and loadkeys will do confusing things to
  the keymap (LP: #84156).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Keyboard/ckb/symbols/macintosh_vndr/pt
8
8
    // Describes the differences between a very simple en_US
9
9
    // keyboard and a very simple Portuguese keybaord
10
10
 
11
 
    name[Group1]= "Portuguese";
12
 
 
13
 
    key <LSGT> {        [            less,         greater      ],
14
 
                        [             bar,       brokenbar      ]       };
15
 
    key <AE02> {        [               2,        quotedbl      ],      
16
 
                        [              at,       oneeighth      ]       };
17
 
    key <AE04> {        [               4,          dollar      ],
18
 
                        [         section,          dollar      ]       };
19
 
    key <AE03> {        [               3,      numbersign      ],
20
 
                        [        sterling,        sterling      ]       };
 
11
    include "latin"
 
12
 
 
13
    name[Group1]= "Portugal - Mac";
 
14
 
 
15
    key <LSGT> {        [            less,         greater,           bar,       brokenbar      ]       };
 
16
    key <AE02> {        [               2,        quotedbl,            at,       oneeighth      ]       };
 
17
    key <AE04> {        [               4,          dollar,          section,          dollar   ]       };
 
18
    key <AE03> {        [               3,      numbersign,         sterling,        sterling           ]       };
21
19
    key <AE06> {        [               6,       ampersand      ]       };
22
20
    key <AE07> {        [               7,           slash      ]       };
23
 
    key <AE08> {        [               8,       parenleft      ],
24
 
                        [     bracketleft,       braceleft      ]       };
25
 
    key <AE09> {        [               9,      parenright      ],
26
 
                        [    bracketright,      braceright      ]       };
 
21
    key <AE08> {        [               8,       parenleft,      bracketleft,       braceleft           ]       };
 
22
    key <AE09> {        [               9,      parenright,     bracketright,      braceright           ]       };
27
23
    key <AE10> {        [               0,           equal      ]       };
28
24
    key <AE11> {        [      apostrophe,        question      ]       };
29
 
    key <AE12> {        [            plus,        asterisk      ],
30
 
                        [            dead_diaeresis             ]       };
 
25
    key <AE12> {        [            plus,        asterisk,             dead_diaeresis             ]    };
31
26
    key <AB08> {        [           comma,       semicolon      ]       };
32
27
    key <AB09> {        [          period,           colon      ]       };
33
28
    key <AB10> {        [           minus,      underscore      ]       };
38
33
    key <AD12> {        [      dead_acute,      dead_grave      ]       };
39
34
    // End alphanumeric section
40
35
 
 
36
    include "eurosign(e)"
 
37
    include "level3(ralt_switch)"
41
38
};
42
39
 
43
40
partial alphanumeric_keys 
44
41
xkb_symbols "Sundeadkeys" {
45
42
    include "macintosh_vndr/pt(basic)" // for consistent naming
 
43
    name[Group1]= "Portugal - Mac, Sun dead keys";
46
44
    
47
 
    key <AE12> {        [            plus,        asterisk      ],
48
 
                        [ SunFA_Diaeresis, SunFA_Diaeresis      ]       };
 
45
    key <AE12> {        [            plus,        asterisk,  SunFA_Diaeresis, SunFA_Diaeresis      ]    };
49
46
    key <AC11> {        [     SunFA_Tilde,    SunFA_Circum      ]       };
50
47
    key <AD12> {        [     SunFA_Acute,     SunFA_Grave      ]       };
51
48
};
58
55
partial alphanumeric_keys 
59
56
xkb_symbols "nodeadkeys" {
60
57
    include "macintosh_vndr/pt(basic)" // for consistent naming
 
58
    name[Group1]= "Portugal - Mac, eliminate dead keys";
61
59
 
62
 
    key <AE12> {        [            plus,        asterisk      ],
63
 
                        [        quotedbl,        quotedbl      ]       };
 
60
    key <AE12> {        [            plus,        asterisk,      quotedbl,        quotedbl      ]       };
64
61
    key <AC11> {        [      asciitilde,     asciicircum      ]       };
65
62
    key <AD12> {        [           acute,           grave      ]       };
66
63
};