-
-
Notifications
You must be signed in to change notification settings - Fork 260
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Naijatype experimental: flicks, v17 & documentation updates #2822
Merged
Merged
Changes from 6 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
e5e4902
58 flicks and docs updates
4b47565
58b welcome tweaks
bc52b54
58c Fix naijatype.kps conflict
e585c65
Merge branch 'master' into naijatype-experimental
rowbory 22c4d9f
58c
426e1b2
58e bump min Keyman version and correct warnings
f9b397b
58f remove VERSION line
c013794
58f fix build folder error
bc14bd1
58g overdue HISTORY update
296b7a3
58h languages update
029ddd4
59 - bugfix -- missing flicks and defaults added
16b3c30
Merge branch 'master' into naijatype-experimental
rowbory d8e2015
59a (History -- oops)
1bbd3d2
Update README.md
0e8e4d3
Merge branch 'keymanapp:master' into naijatype-experimental
rowbory df0ea45
Create Andika-Regular.ttf
370c45b
59b doc updates
f89f92a
Create naijatype24_140x250.jpg
0e73dd5
Merge branch 'master' into naijatype-experimental
rowbory b6d8d8b
59c help version bump
b9e363d
Merge branch 'naijatype-experimental' of https://github.com/rowbory/k…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,202 +1,8 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<KeymanDeveloperProject> | ||
<Options> | ||
<BuildPath>$PROJECTPATH\build</BuildPath> | ||
<CompilerWarningsAsErrors>False</CompilerWarningsAsErrors> | ||
<WarnDeprecatedCode>True</WarnDeprecatedCode> | ||
<CheckFilenameConventions>False</CheckFilenameConventions> | ||
<ProjectType>keyboard</ProjectType> | ||
<Version>2.0</Version> | ||
<BuildPath>$PROJECTPATH\..\LexicalModels\build</BuildPath> | ||
<SkipMetadataFiles>True</SkipMetadataFiles> | ||
</Options> | ||
<Files> | ||
<File> | ||
<ID>id_af30306506b955d0a8dc9617bf1089f6</ID> | ||
<Filename>naijatype.kmn</Filename> | ||
<Filepath>source\naijatype.kmn</Filepath> | ||
<FileVersion>46</FileVersion> | ||
<FileType>.kmn</FileType> | ||
<Details> | ||
<Name>Naija Type</Name> | ||
<Copyright>© 2022 David Rowbory</Copyright> | ||
<Message>Distribute under MIT Licence</Message> | ||
</Details> | ||
</File> | ||
<File> | ||
<ID>id_308f23edb2dd358e589edfa4144f2e6c</ID> | ||
<Filename>naijatype.kps</Filename> | ||
<Filepath>source\naijatype.kps</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.kps</FileType> | ||
<Details> | ||
<Name>Naija Type</Name> | ||
<Copyright>© 2022 David Rowbory</Copyright> | ||
</Details> | ||
</File> | ||
<File> | ||
<ID>id_815284c55e5dac0c2e732d4eea527c91</ID> | ||
<Filename>naijatype.kmp</Filename> | ||
<Filepath>build\naijatype.kmp</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.kmp</FileType> | ||
</File> | ||
<File> | ||
<ID>id_7fa6d6df368880dea1c3fffcaec18c07</ID> | ||
<Filename>naijatype.ico</Filename> | ||
<Filepath>source\icons_pictures\naijatype.ico</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.ico</FileType> | ||
<ParentFileID>id_af30306506b955d0a8dc9617bf1089f6</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_de56594d1fce1a13674518bdfd1b92fb</ID> | ||
<Filename>readme.htm</Filename> | ||
<Filepath>source\doc\readme.htm</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.htm</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_ba2e738d83f8ec67be5e64ffd8b20a96</ID> | ||
<Filename>AndikaAfr-R.ttf</Filename> | ||
<Filepath>source\AndikaAfr-R.ttf</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.ttf</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_114f9ab17d389f40025d7062ffcbc9e6</ID> | ||
<Filename>naijatype_400.jpg</Filename> | ||
<Filepath>source\icons_pictures\naijatype_400.jpg</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.jpg</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_724e5b4c63f10bc0abf7077f7c3172fc</ID> | ||
<Filename>welcome.htm</Filename> | ||
<Filepath>source\welcome\welcome.htm</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.htm</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_dadcad63be72df2b9ff15c117dc49d42</ID> | ||
<Filename>naijatype.js</Filename> | ||
<Filepath>build\naijatype.js</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.js</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_53dcad9f08abab9a591e2c8fc85e8eb0</ID> | ||
<Filename>naijatype.kmx</Filename> | ||
<Filepath>build\naijatype.kmx</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.kmx</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_25b7bed839e9f1f7b98d4ce876d07361</ID> | ||
<Filename>welcome_htm_1b25dce56d8d67ee.jpg</Filename> | ||
<Filepath>source\welcome\welcome_htm_1b25dce56d8d67ee.jpg</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.jpg</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_8393eb55d01b779decfcde925d34f3a2</ID> | ||
<Filename>welcome_htm_6c78ae9d5deefd70.png</Filename> | ||
<Filepath>source\welcome\welcome_htm_6c78ae9d5deefd70.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_23825990ea91da564b07a5055f77c898</ID> | ||
<Filename>welcome_htm_40a42a7c7957dc8a.png</Filename> | ||
<Filepath>source\welcome\welcome_htm_40a42a7c7957dc8a.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_1b8926c4a710710b1705d25b15603f18</ID> | ||
<Filename>welcome_htm_41e1c192be6891d3.png</Filename> | ||
<Filepath>source\welcome\welcome_htm_41e1c192be6891d3.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_65fae3b96acb7d4f1088b30b6b890b9d</ID> | ||
<Filename>welcome_htm_173b460b456a07d2.png</Filename> | ||
<Filepath>source\welcome\welcome_htm_173b460b456a07d2.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_4232035f16bcf1e746d1d28ae0ea565b</ID> | ||
<Filename>welcome_htm_410b4107e0ddd3f4.png</Filename> | ||
<Filepath>source\welcome\welcome_htm_410b4107e0ddd3f4.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_0c88dc4894b4f810ea1c8d3c962bebb2</ID> | ||
<Filename>welcome_htm_d3cc5f241a627df4.png</Filename> | ||
<Filepath>source\welcome\welcome_htm_d3cc5f241a627df4.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_a2d71ff3a47c911d1cd9f0dbc3c1508c</ID> | ||
<Filename>welcome_htm_e972d2eb335edd69.png</Filename> | ||
<Filepath>source\welcome\welcome_htm_e972d2eb335edd69.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_921200e186b7ec22e170d0242a37b95f</ID> | ||
<Filename>comma_punc.png</Filename> | ||
<Filepath>source\welcome\comma_punc.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_c424ff341a731304a794f1ff5fec88b2</ID> | ||
<Filename>popup_a.png</Filename> | ||
<Filepath>source\welcome\popup_a.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_57fda54f0f48d03ae6720b171f34afaf</ID> | ||
<Filename>popup_currency.png</Filename> | ||
<Filepath>source\welcome\popup_currency.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_599d2a0205edfc12c80a98e7a541d08d</ID> | ||
<Filename>popup_e.png</Filename> | ||
<Filepath>source\welcome\popup_e.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
<File> | ||
<ID>id_9573a916be370d168a7f68a93124fd03</ID> | ||
<Filename>popup_punc.png</Filename> | ||
<Filepath>source\welcome\popup_punc.png</Filepath> | ||
<FileVersion></FileVersion> | ||
<FileType>.png</FileType> | ||
<ParentFileID>id_308f23edb2dd358e589edfa4144f2e6c</ParentFileID> | ||
</File> | ||
</Files> | ||
</KeymanDeveloperProject> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line is what caused the build failure -- the .kmx is being put into the wrong folder. This line should be removed (default is
$PROJECTPATH/build
, which is what we want):There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you. Sorry I missed that.