WIP
WIP WIP: keymap generation test passes meta: Update features and version WiP: cargo.lock WIP: don't crash WIP: no outlines parsing: New tests WIP: base level works WIP: remove old keyboard symbols correctly input WIP: lodaing files WIP: fallback works Valid fallback
This commit is contained in:
		@ -1,64 +0,0 @@
 | 
			
		||||
<?xml version="1.0"?>
 | 
			
		||||
<geometry version="0.90">
 | 
			
		||||
  <bounds x="10" y="10" width="410.0000" height="229"/>
 | 
			
		||||
 | 
			
		||||
  <outline id="default" corner-radius="1.000000">
 | 
			
		||||
    <point x="0.000000" y="0.000000"/>
 | 
			
		||||
    <point x="37.46341" y="0.000000"/>
 | 
			
		||||
    <point x="37.46341" y="52"/>
 | 
			
		||||
    <point x="0.000000" y="52"/>
 | 
			
		||||
  </outline>
 | 
			
		||||
  <outline id="altline" corner-radius="1.000000">
 | 
			
		||||
    <point x="0.000000" y="0.000000"/>
 | 
			
		||||
    <point x="48.39024" y="0.000000"/>
 | 
			
		||||
    <point x="48.39024" y="52"/>
 | 
			
		||||
    <point x="0.000000" y="52"/>
 | 
			
		||||
  </outline>
 | 
			
		||||
  <outline id="outline7" corner-radius="1.000000">
 | 
			
		||||
    <point x="0.000000" y="0.000000"/>
 | 
			
		||||
    <point x="88.97561" y="0.000000"/>
 | 
			
		||||
    <point x="88.97561" y="52"/>
 | 
			
		||||
    <point x="0.000000" y="52"/>
 | 
			
		||||
  </outline>
 | 
			
		||||
  <outline id="spaceline" corner-radius="1.000000">
 | 
			
		||||
    <point x="0.000000" y="0.000000"/>
 | 
			
		||||
    <point x="150.5853" y="0.000000"/>
 | 
			
		||||
    <point x="150.5853" y="52"/>
 | 
			
		||||
    <point x="0.000000" y="52"/>
 | 
			
		||||
  </outline>
 | 
			
		||||
 | 
			
		||||
  <button name="Shift_L" oref="altline" />
 | 
			
		||||
  <button name="BackSpace" oref="altline" />
 | 
			
		||||
  <button name="preferences" oref="altline" />
 | 
			
		||||
  <button name="show_numbers" oref="altline" keycode="0" />
 | 
			
		||||
  <button name="show_letters" oref="altline" keycode="0" />
 | 
			
		||||
  <button name="show_symbols" oref="altline" keycode="0" />
 | 
			
		||||
  <button name="period" oref="altline" />
 | 
			
		||||
  <button name="space" oref="spaceline" />
 | 
			
		||||
  <button name="Return" oref="outline7" />
 | 
			
		||||
 | 
			
		||||
  <view>
 | 
			
		||||
    <section angle="0">q w e r t y u i o p</section>
 | 
			
		||||
    <section angle="0">a s d f g h j k l</section>
 | 
			
		||||
    <section angle="0"> Shift_L   z x c v b n m  BackSpace </section>
 | 
			
		||||
    <section angle="0"> show_numbers preferences         space        period    Return    </section>
 | 
			
		||||
  </view>
 | 
			
		||||
  <view>
 | 
			
		||||
    <section angle="0">Q W E R T Y U I O P</section>
 | 
			
		||||
    <section angle="0">A S D F G H J K L</section>
 | 
			
		||||
    <section angle="0"> Shift_L   Z X C V B N M  BackSpace </section>
 | 
			
		||||
    <section angle="0"> show_numbers preferences         space        period    Return    </section>
 | 
			
		||||
  </view>
 | 
			
		||||
  <view>
 | 
			
		||||
    <section angle="0">1 2 3 4 5 6 7 8 9 0</section>
 | 
			
		||||
    <section angle="0">at numbersign dollar percent ampersand minus underscore plus parenleft parenright</section>
 | 
			
		||||
    <section angle="0"> show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace </section>
 | 
			
		||||
    <section angle="0"> show_letters preferences         space        period    Return    </section>
 | 
			
		||||
  </view>
 | 
			
		||||
  <view>
 | 
			
		||||
    <section angle="0">asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph</section>
 | 
			
		||||
    <section angle="0">copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright</section>
 | 
			
		||||
    <section angle="0"> show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace </section>
 | 
			
		||||
    <section angle="0"> show_letters preferences         space        period    Return    </section>
 | 
			
		||||
  </view>
 | 
			
		||||
</geometry>
 | 
			
		||||
@ -1,118 +0,0 @@
 | 
			
		||||
<?xml version='1.0' encoding='ASCII' standalone='yes'?>
 | 
			
		||||
<symbols version="0.90">
 | 
			
		||||
  <symbol label="*">asterisk</symbol>
 | 
			
		||||
  <symbol label="+/=">show_symbols</symbol>
 | 
			
		||||
  <symbol label="q">q</symbol>
 | 
			
		||||
  <symbol label="Q">Q</symbol>
 | 
			
		||||
  <symbol label="1">1</symbol>
 | 
			
		||||
  <symbol label="~">asciitilde</symbol>
 | 
			
		||||
  <symbol label="w">w</symbol>
 | 
			
		||||
  <symbol label="W">W</symbol>
 | 
			
		||||
  <symbol label="2">2</symbol>
 | 
			
		||||
  <symbol label="`">quoteleft</symbol>
 | 
			
		||||
  <symbol label="e">e</symbol>
 | 
			
		||||
  <symbol label="E">E</symbol>
 | 
			
		||||
  <symbol label="3">3</symbol>
 | 
			
		||||
  <symbol label="|">bar</symbol>
 | 
			
		||||
  <symbol label="r">r</symbol>
 | 
			
		||||
  <symbol label="R">R</symbol>
 | 
			
		||||
  <symbol label="4">4</symbol>
 | 
			
		||||
  <symbol label="·">U00B7</symbol>
 | 
			
		||||
  <symbol label="t">t</symbol>
 | 
			
		||||
  <symbol label="T">T</symbol>
 | 
			
		||||
  <symbol label="5">5</symbol>
 | 
			
		||||
  <symbol label="√">squareroot</symbol>
 | 
			
		||||
  <symbol label="y">y</symbol>
 | 
			
		||||
  <symbol label="Y">Y</symbol>
 | 
			
		||||
  <symbol label="6">6</symbol>
 | 
			
		||||
  <symbol label="π">Greek_pi</symbol>
 | 
			
		||||
  <symbol label="u">u</symbol>
 | 
			
		||||
  <symbol label="U">U</symbol>
 | 
			
		||||
  <symbol label="7">7</symbol>
 | 
			
		||||
  <symbol label="÷">division</symbol>
 | 
			
		||||
  <symbol label="i">i</symbol>
 | 
			
		||||
  <symbol label="I">I</symbol>
 | 
			
		||||
  <symbol label="8">8</symbol>
 | 
			
		||||
  <symbol label="×">multiply</symbol>
 | 
			
		||||
  <symbol label="o">o</symbol>
 | 
			
		||||
  <symbol label="O">O</symbol>
 | 
			
		||||
  <symbol label="9">9</symbol>
 | 
			
		||||
  <symbol label="¶">paragraph</symbol>
 | 
			
		||||
  <symbol label="p">p</symbol>
 | 
			
		||||
  <symbol label="P">P</symbol>
 | 
			
		||||
  <symbol label="0">0</symbol>
 | 
			
		||||
  <symbol label="τ">Greek_tau</symbol>
 | 
			
		||||
  <symbol label="a">a</symbol>
 | 
			
		||||
  <symbol label="A">A</symbol>
 | 
			
		||||
  <symbol label="@">at</symbol>
 | 
			
		||||
  <symbol label="©">copyright</symbol>
 | 
			
		||||
  <symbol label="s">s</symbol>
 | 
			
		||||
  <symbol label="S">S</symbol>
 | 
			
		||||
  <symbol label="#">numbersign</symbol>
 | 
			
		||||
  <symbol label="®">U00AE</symbol>
 | 
			
		||||
  <symbol label="d">d</symbol>
 | 
			
		||||
  <symbol label="D">D</symbol>
 | 
			
		||||
  <symbol label="$">dollar</symbol>
 | 
			
		||||
  <symbol label="£">U00A3</symbol>
 | 
			
		||||
  <symbol label="f">f</symbol>
 | 
			
		||||
  <symbol label="F">F</symbol>
 | 
			
		||||
  <symbol label="%">percent</symbol>
 | 
			
		||||
  <symbol label="€">EuroSign</symbol>
 | 
			
		||||
  <symbol label="g">g</symbol>
 | 
			
		||||
  <symbol label="G">G</symbol>
 | 
			
		||||
  <symbol label="&">ampersand</symbol>
 | 
			
		||||
  <symbol label="¥">U00A5</symbol>
 | 
			
		||||
  <symbol label="h">h</symbol>
 | 
			
		||||
  <symbol label="H">H</symbol>
 | 
			
		||||
  <symbol label="-">minus</symbol>
 | 
			
		||||
  <symbol label="^">asciicircum</symbol>
 | 
			
		||||
  <symbol label="j">j</symbol>
 | 
			
		||||
  <symbol label="J">J</symbol>
 | 
			
		||||
  <symbol label="_">underscore</symbol>
 | 
			
		||||
  <symbol label="°">degree</symbol>
 | 
			
		||||
  <symbol label="k">k</symbol>
 | 
			
		||||
  <symbol label="K">K</symbol>
 | 
			
		||||
  <symbol label="+">plus</symbol>
 | 
			
		||||
  <symbol label="=">equal</symbol>
 | 
			
		||||
  <symbol label="l">l</symbol>
 | 
			
		||||
  <symbol label="L">L</symbol>
 | 
			
		||||
  <symbol label="(">parenleft</symbol>
 | 
			
		||||
  <symbol label="{">braceleft</symbol>
 | 
			
		||||
  <symbol label=")">parenright</symbol>
 | 
			
		||||
  <symbol label="}">braceright</symbol>
 | 
			
		||||
  <symbol keyval="65293" icon="key-enter">Return</symbol>
 | 
			
		||||
  <symbol keyval="65505" icon="key-shift">Shift_L</symbol>
 | 
			
		||||
  <symbol label="z">z</symbol>
 | 
			
		||||
  <symbol label="Z">Z</symbol>
 | 
			
		||||
  <symbol label=",">comma</symbol>
 | 
			
		||||
  <symbol label="\">backslash</symbol>
 | 
			
		||||
  <symbol label="x">x</symbol>
 | 
			
		||||
  <symbol label="X">X</symbol>
 | 
			
		||||
  <symbol label=""">quotedbl</symbol>
 | 
			
		||||
  <symbol label="/">slash</symbol>
 | 
			
		||||
  <symbol label="c">c</symbol>
 | 
			
		||||
  <symbol label="C">C</symbol>
 | 
			
		||||
  <symbol label="'">quoteright</symbol>
 | 
			
		||||
  <symbol label="<">less</symbol>
 | 
			
		||||
  <symbol label="v">v</symbol>
 | 
			
		||||
  <symbol label="V">V</symbol>
 | 
			
		||||
  <symbol label=":">colon</symbol>
 | 
			
		||||
  <symbol label=">">greater</symbol>
 | 
			
		||||
  <symbol label="b">b</symbol>
 | 
			
		||||
  <symbol label="B">B</symbol>
 | 
			
		||||
  <symbol label=";">semicolon</symbol>
 | 
			
		||||
  <symbol label="n">n</symbol>
 | 
			
		||||
  <symbol label="N">N</symbol>
 | 
			
		||||
  <symbol label="!">exclam</symbol>
 | 
			
		||||
  <symbol label="[">bracketleft</symbol>
 | 
			
		||||
  <symbol label="m">m</symbol>
 | 
			
		||||
  <symbol label="M">M</symbol>
 | 
			
		||||
  <symbol label="?">question</symbol>
 | 
			
		||||
  <symbol label="]">bracketright</symbol>
 | 
			
		||||
  <symbol label=".">period</symbol>
 | 
			
		||||
  <symbol label="123">show_numbers</symbol>
 | 
			
		||||
  <symbol label="ABC">show_letters</symbol>
 | 
			
		||||
  <symbol label="☺" icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
 | 
			
		||||
  <symbol label=" ">space</symbol>
 | 
			
		||||
  <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
 | 
			
		||||
</symbols>
 | 
			
		||||
							
								
								
									
										165
									
								
								data/keyboards/us.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										165
									
								
								data/keyboards/us.yaml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,165 @@
 | 
			
		||||
---
 | 
			
		||||
bounds: { x: 10, y: 10, width: 410, height: 229 }
 | 
			
		||||
 | 
			
		||||
outlines:
 | 
			
		||||
    default:
 | 
			
		||||
        corner_radius: 1
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 37.46341, height: 52 }
 | 
			
		||||
    altline:
 | 
			
		||||
        corner_radius: 1
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
 | 
			
		||||
    outline7:
 | 
			
		||||
        corner_radius: 1
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
 | 
			
		||||
    spaceline:
 | 
			
		||||
        corner_radius: 1
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
 | 
			
		||||
 | 
			
		||||
views:
 | 
			
		||||
    base:
 | 
			
		||||
        - "q w e r t y u i o p"
 | 
			
		||||
        - "a s d f g h j k l"
 | 
			
		||||
        - "Shift_L   z x c v b n m  BackSpace"
 | 
			
		||||
        - "show_numbers preferences         space        period    Return"
 | 
			
		||||
    upper:
 | 
			
		||||
        - "Q W E R T Y U I O P"
 | 
			
		||||
        - "A S D F G H J K L"
 | 
			
		||||
        - "Shift_L   Z X C V B N M  BackSpace"
 | 
			
		||||
        - "show_numbers preferences         space        period    Return"
 | 
			
		||||
    numbers:
 | 
			
		||||
        - "1 2 3 4 5 6 7 8 9 0"
 | 
			
		||||
        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
 | 
			
		||||
        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
 | 
			
		||||
        - "show_letters preferences         space        period    Return"
 | 
			
		||||
    symbols:
 | 
			
		||||
        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
 | 
			
		||||
        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
 | 
			
		||||
        - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
 | 
			
		||||
        - "show_letters preferences         space        period    Return"
 | 
			
		||||
 | 
			
		||||
buttons:
 | 
			
		||||
    Shift_L:
 | 
			
		||||
        action:
 | 
			
		||||
            set_view: "upper"
 | 
			
		||||
        outline: "altline"
 | 
			
		||||
        icon: "key-shift"
 | 
			
		||||
    BackSpace:
 | 
			
		||||
        outline: "altline"
 | 
			
		||||
        icon: "edit-clear-symbolic"
 | 
			
		||||
    preferences:
 | 
			
		||||
        action: "show_prefs"
 | 
			
		||||
        outline: "altline"
 | 
			
		||||
        icon: "keyboard-mode-symbolic"
 | 
			
		||||
    show_numbers:
 | 
			
		||||
        action:
 | 
			
		||||
            set_view: "numbers"
 | 
			
		||||
        outline: "altline"
 | 
			
		||||
        label: "123"
 | 
			
		||||
    show_letters:
 | 
			
		||||
        action:
 | 
			
		||||
            set_view: "base"
 | 
			
		||||
        outline: "altline"
 | 
			
		||||
        label: "ABC"
 | 
			
		||||
    show_symbols:
 | 
			
		||||
        action:
 | 
			
		||||
            set_view: "symbols"
 | 
			
		||||
        outline: "altline"
 | 
			
		||||
        label: "+/="
 | 
			
		||||
    period:
 | 
			
		||||
        outline: altline
 | 
			
		||||
        label: "."
 | 
			
		||||
    space:
 | 
			
		||||
        outline: spaceline
 | 
			
		||||
        label: " "
 | 
			
		||||
    Return:
 | 
			
		||||
        outline: outline7
 | 
			
		||||
        icon: "key-enter"
 | 
			
		||||
    asterisk:
 | 
			
		||||
        label: "*"
 | 
			
		||||
    asciitilde:
 | 
			
		||||
        label: "~"
 | 
			
		||||
    quoteleft:
 | 
			
		||||
        label: "`"
 | 
			
		||||
    bar:
 | 
			
		||||
        label: "|"
 | 
			
		||||
    U00B7:
 | 
			
		||||
        label: "·"
 | 
			
		||||
    squareroot:
 | 
			
		||||
        label: "√"
 | 
			
		||||
    Greek_pi:
 | 
			
		||||
        label: "π"
 | 
			
		||||
    division:
 | 
			
		||||
        label: "÷"
 | 
			
		||||
    multiply:
 | 
			
		||||
        label: "×"
 | 
			
		||||
    paragraph:
 | 
			
		||||
        label: "¶"
 | 
			
		||||
    Greek_tau:
 | 
			
		||||
        label: "τ"
 | 
			
		||||
    copyright:
 | 
			
		||||
        label: "©"
 | 
			
		||||
    numbersign:
 | 
			
		||||
        label: "#"
 | 
			
		||||
    U00AE:
 | 
			
		||||
        label: "®"
 | 
			
		||||
    at:
 | 
			
		||||
        label: "@"
 | 
			
		||||
    dollar:
 | 
			
		||||
        label: "$"
 | 
			
		||||
    U00A3:
 | 
			
		||||
        label: "£"
 | 
			
		||||
    percent:
 | 
			
		||||
        label: "%"
 | 
			
		||||
    EuroSign:
 | 
			
		||||
        label: "€"
 | 
			
		||||
    ampersand:
 | 
			
		||||
        label: "&"
 | 
			
		||||
    U00A5:
 | 
			
		||||
        label: "¥"
 | 
			
		||||
    minus:
 | 
			
		||||
        label: "-"
 | 
			
		||||
    asciicircum:
 | 
			
		||||
        label: "^"
 | 
			
		||||
    underscore:
 | 
			
		||||
        label: "_"
 | 
			
		||||
    degree:
 | 
			
		||||
        label: "°"
 | 
			
		||||
    plus:
 | 
			
		||||
        label: "+"
 | 
			
		||||
    equal:
 | 
			
		||||
        label: "="
 | 
			
		||||
    parenleft:
 | 
			
		||||
        label: "("
 | 
			
		||||
    parenright:
 | 
			
		||||
        label: ")"
 | 
			
		||||
    braceleft:
 | 
			
		||||
        label: "{"
 | 
			
		||||
    braceright:
 | 
			
		||||
        label: "}"
 | 
			
		||||
    comma:
 | 
			
		||||
        label: ","
 | 
			
		||||
    backslash:
 | 
			
		||||
        label: "\\"
 | 
			
		||||
    slash:
 | 
			
		||||
        label: "/"
 | 
			
		||||
    quotedbl:
 | 
			
		||||
        label: "\""
 | 
			
		||||
    quoteright:
 | 
			
		||||
        label: "'"
 | 
			
		||||
    less:
 | 
			
		||||
        label: "<"
 | 
			
		||||
    greater:
 | 
			
		||||
        label: ">"
 | 
			
		||||
    colon:
 | 
			
		||||
        label: ":"
 | 
			
		||||
    semicolon:
 | 
			
		||||
        label: ";"
 | 
			
		||||
    exclam:
 | 
			
		||||
        label: "!"
 | 
			
		||||
    question:
 | 
			
		||||
        label: "?"
 | 
			
		||||
    bracketleft:
 | 
			
		||||
        label: "["
 | 
			
		||||
    bracketright:
 | 
			
		||||
        label: "]"
 | 
			
		||||
 | 
			
		||||
@ -2,7 +2,6 @@
 | 
			
		||||
<gresources>
 | 
			
		||||
  <gresource prefix="/sm/puri/squeekboard">
 | 
			
		||||
   <file compressed="true">style.css</file>
 | 
			
		||||
   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/compact.xml</file>
 | 
			
		||||
   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/extended.xml</file>
 | 
			
		||||
   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/number-keypad.xml</file>
 | 
			
		||||
   <file compressed="true" preprocess="xml-stripblanks">keyboards/keyboards.xml</file>
 | 
			
		||||
@ -33,7 +32,6 @@
 | 
			
		||||
   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/th.xml</file>
 | 
			
		||||
   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ua.xml</file>
 | 
			
		||||
   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ug.xml</file>
 | 
			
		||||
   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/us.xml</file>
 | 
			
		||||
   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/zh-bopomofo.xml</file>
 | 
			
		||||
   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/number.xml</file>
 | 
			
		||||
   <file>icons/key-enter.svg</file>
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user