Skip to content

Commit

Permalink
Merge pull request #52 from Nuclear-Squid/0.7
Browse files Browse the repository at this point in the history
Draft: minor fixes for the 0.7 branch
  • Loading branch information
Nuclear-Squid committed Feb 6, 2024
2 parents 58a75bb + aaf32ed commit b03d43e
Show file tree
Hide file tree
Showing 16 changed files with 955 additions and 180 deletions.
156 changes: 78 additions & 78 deletions 0_7_0/ergol.ahk

Large diffs are not rendered by default.

Binary file modified 0_7_0/ergol.klc
Binary file not shown.
10 changes: 7 additions & 3 deletions 0_7_0/ergol.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions 0_7_0/ergol.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ base = '''
┆ ~ ┃ ! ¡ │ @ « │ # » │ $ ¢ │ % ‰ ┃ ^ │ & │ * │ ( │ ) ┃ _ – ┆ + ± ┆
┆ ` ┃ 1 „ │ 2 “ │ 3 ” │ 4 £ │ 5 € ┃ 6 ¥ │ 7 ¤ │ 8 § │ 9 ¶ │ 0 ° ┃ / ÷ ┆ = ≠ ┆
╰╌╌╌╌╌╂─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╂╌╌╌╌╌┼╌╌╌╌╌┤
· ┃ Q │ C │ O │ P │ W ┃ J │ M │ D _ │** │ F ┃ { ┆ } ┆
· ┃ Q │ C │ O │ P │ W ┃ J │ M │ D _ │** │ F ┃ { ┆ } ┆
· ┃ â │ ç │ œ │ ô │ – ┃ │ µ │ _ │ *¨ │ û ┃ [ ┆ ] ┆
· ┠─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╂╌╌╌╌╌┼╌╌╌╌╌┤
· ┃ A │ S │ E │ N │ ; • ┃ L │ R │ T │ I │ U ┃ " ┆ | ┆
Expand All @@ -29,7 +29,7 @@ altgr = '''
┆ ┃ ¹ │ ² │ ³ │ ⁴ │ ⁵ ┃ ⁶ │ ⁷ │ ⁸ │ ⁹ │ ⁰ ┃ ┆ ┆
┆ ┃ ₁ │ ₂ │ ₃ │ ₄ │ ₅ ┃ ₆ │ ₇ │ ₈ │ ₉ │ ₀ ┃ ┆ ┆
╰╌╌╌╌╌╂─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╂╌╌╌╌╌┼╌╌╌╌╌┤
· ┃ │ │ *¤ │ ‰ ┃ *^ │ │ × │ *´ │ *` ┃ ┆ ┆
· ┃ │ │ *¤ │ ‰ ┃ *^ │ │ × │ *´ │ *` ┃ ┆ ┆
· ┃ @ │ < │ > │ $ │ % ┃ ^ │ & │ * │ ' │ ` ┃ ┆ ┆
· ┠─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╂╌╌╌╌╌┼╌╌╌╌╌┤
· ┃ │ ⁽ │ ⁾ │ │ ≠ ┃ */ │ ± │ — │ ÷ │ *¨ ┃ ┆ ┆
Expand Down
6 changes: 3 additions & 3 deletions 0_7_0/ergol.xkb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Project page : https://github.com/Nuclear-Squid/ergol
// Author : NuclearSquid
// Version : 0.7.0 LTS
// Last change : 2024-01-28
// Last change : 2024-02-05
// License : WTFPL - Do What The Fuck You Want Public License
//
// French (Ergo-L)
Expand All @@ -22,7 +22,7 @@ xkb_keymap {
// ┆ ~ ┃ ! ¡ │ @ « │ # » │ $ ¢ │ % ‰ ┃ ^ │ & │ * │ ( │ ) ┃ _ – ┆ + ± ┆
// ┆ ` ┃ 1 „ │ 2 “ │ 3 ” │ 4 £ │ 5 € ┃ 6 ¥ │ 7 ¤ │ 8 § │ 9 ¶ │ 0 ° ┃ / ÷ ┆ = ≠ ┆
// ╰╌╌╌╌╌╂─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╂╌╌╌╌╌┼╌╌╌╌╌┤
// ┃ Q │ C │ O │ P │ W ┃ J │ M │ D _ │** │ F ┃ { ┆ } ┆
// ┃ Q │ C │ O │ P │ W ┃ J │ M │ D _ │** │ F ┃ { ┆ } ┆
// ┃ â │ ç │ œ │ ô │ – ┃ │ µ │ _ │***¨ │ û ┃ [ ┆ ] ┆
// ┠─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╂╌╌╌╌╌┼╌╌╌╌╌┤
// ┃ A │ S │ E │ N │ ; • ┃ L │ R │ T │ I │ U ┃ " ┆ | ┆
Expand Down Expand Up @@ -87,7 +87,7 @@ xkb_keymap {
key <AD06> {[ j , J , VoidSymbol , VoidSymbol ],[ asciicircum , dead_circumflex ]}; // j J ^ ^
key <AD07> {[ m , M , mu , VoidSymbol ],[ ampersand , VoidSymbol ]}; // m M µ &
key <AD08> {[ d , D , underscore , underscore ],[ asterisk , multiply ]}; // d D _ _ * ×
key <AD09> {[ ISO_Level3_Latch, ISO_Level3_Latch, dead_diaeresis , VoidSymbol ],[ apostrophe , dead_acute ]}; // *¨ *¨ ¨ ' ´
key <AD09> {[ ISO_Level3_Latch, ISO_Level3_Latch, dead_diaeresis , dead_diaeresis ],[ apostrophe , dead_acute ]}; // *¨ *¨ ¨ ¨ ' ´
key <AD10> {[ f , F , ucircumflex , Ucircumflex ],[ grave , dead_grave ]}; // f F û Û ` `

// Letters, second row
Expand Down
6 changes: 3 additions & 3 deletions 0_7_0/ergol.xkb_custom
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Project page : https://github.com/Nuclear-Squid/ergol
// Author : NuclearSquid
// Version : 0.7.0 LTS
// Last change : 2024-01-28
// Last change : 2024-02-05
// License : WTFPL - Do What The Fuck You Want Public License
//
// French (Ergo-L)
Expand All @@ -11,7 +11,7 @@
// ┆ ~ ┃ ! ¡ │ @ « │ # » │ $ ¢ │ % ‰ ┃ ^ │ & │ * │ ( │ ) ┃ _ – ┆ + ± ┆
// ┆ ` ┃ 1 „ │ 2 “ │ 3 ” │ 4 £ │ 5 € ┃ 6 ¥ │ 7 ¤ │ 8 § │ 9 ¶ │ 0 ° ┃ / ÷ ┆ = ≠ ┆
// ╰╌╌╌╌╌╂─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╂╌╌╌╌╌┼╌╌╌╌╌┤
// ┃ Q │ C │ O │ P │ W ┃ J │ M │ D _ │** │ F ┃ { ┆ } ┆
// ┃ Q │ C │ O │ P │ W ┃ J │ M │ D _ │** │ F ┃ { ┆ } ┆
// ┃ â │ ç │ œ │ ô │ – ┃ │ µ │ _ │***¨ │ û ┃ [ ┆ ] ┆
// ┠─────┼─────┼─────┼─────┼─────╂─────┼─────┼─────┼─────┼─────╂╌╌╌╌╌┼╌╌╌╌╌┤
// ┃ A │ S │ E │ N │ ; • ┃ L │ R │ T │ I │ U ┃ " ┆ | ┆
Expand Down Expand Up @@ -62,7 +62,7 @@ xkb_symbols "ergol" {
key <AD06> {[ j , J , asciicircum , dead_circumflex , VoidSymbol , VoidSymbol , VoidSymbol , VoidSymbol ]}; // j J ^ ^
key <AD07> {[ m , M , ampersand , VoidSymbol , mu , VoidSymbol , VoidSymbol , VoidSymbol ]}; // m M µ &
key <AD08> {[ d , D , asterisk , multiply , underscore , underscore , VoidSymbol , VoidSymbol ]}; // d D _ _ * ×
key <AD09> {[ ISO_Level5_Latch, ISO_Level5_Latch, apostrophe , dead_acute , dead_diaeresis , VoidSymbol , VoidSymbol , VoidSymbol ]}; // *¨ *¨ ¨ ' ´
key <AD09> {[ ISO_Level5_Latch, ISO_Level5_Latch, apostrophe , dead_acute , dead_diaeresis , dead_diaeresis , VoidSymbol , VoidSymbol ]}; // *¨ *¨ ¨ ¨ ' ´
key <AD10> {[ f , F , grave , dead_grave , ucircumflex , Ucircumflex , VoidSymbol , VoidSymbol ]}; // f F û Û ` `

// Letters, second row
Expand Down
Binary file added 0_7_0/ergol_KbdEditInstaller.exe
Binary file not shown.
Binary file added 0_7_0/ergol_ahk.exe
Binary file not shown.
47 changes: 0 additions & 47 deletions fortunes.md

This file was deleted.

Binary file added img/ergol.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b03d43e

Please sign in to comment.