Skip to content

Commit

Permalink
Merge pull request #145 from kmwallio/beta
Browse files Browse the repository at this point in the history
0.2.3 Changes with Link Grammar Support
  • Loading branch information
kmwallio committed Apr 10, 2021
2 parents 42cedb1 + 318fede commit 5fc261a
Show file tree
Hide file tree
Showing 174 changed files with 5,736 additions and 5,606 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-tests.yml
Expand Up @@ -20,7 +20,7 @@ jobs:
run: sudo apt-get update

- name: Install build essentials
run: sudo apt-get install build-essential meson ninja-build valac cmake libgtkspell3-3-dev libwebkit2gtk-4.0-dev libmarkdown2-dev libxml2-dev libclutter-1.0-dev libarchive-dev libgtk-3-dev libgee-0.8-dev libgtksourceview-4-dev libsecret-1-dev libhandy-1-dev
run: sudo apt-get install build-essential meson ninja-build valac cmake libgtkspell3-3-dev libwebkit2gtk-4.0-dev libmarkdown2-dev libxml2-dev libclutter-1.0-dev libarchive-dev libgtk-3-dev libgee-0.8-dev libgtksourceview-4-dev libsecret-1-dev libhandy-1-dev liblink-grammar-dev

- name: Init submodules
run: git submodule init
Expand Down
6 changes: 4 additions & 2 deletions .thiefsheets
Expand Up @@ -15,11 +15,13 @@
"flatpak",
"src",
"meson",
"po"
"po",
"tests"
],
"folder-order" : [
"docs",
"po"
"po",
"tests"
],
"notes" : "",
"icon" : ""
Expand Down
23 changes: 14 additions & 9 deletions README.md
Expand Up @@ -36,20 +36,22 @@ yay -S thiefmd
* Search `Ctrl+F` for the current file, and `Ctrl+Shift+F` for the *entire* library
* Writing Statistics
* Focus Mode (Word, Sentence, and Paragraph)
* Spell Check, Write-Good Style Suggestions, and Grammar Check
* Basic Bibtex Support
* Open File & Syntax Highlighting
* Right-Click Insert Citation Support in Markdown Documents
* Basic Screenwriting Support
* Open Fountain Files
* Export to HTML & PDF

# Translating

[Poeditor](https://poeditor.com/join/project?hash=iQkE5oTIOV) can be used to help translate ThiefMD.

* French Translation by [David Bosman](https://github.com/davidbosman)
* Slovak Translation by [Marek L'ach](https://github.com/marek-lach)
* Swedish Translation by [Åke Engelbrektson](https://github.com/eson57)
* Czech Translation by [Vojtěch Perník](https://github.com/pervoj)

## Planning

Expand All @@ -68,31 +70,31 @@ yay -S thiefmd

## Screenshots

![](docs/images/theme_preferences.png)
![](https://thiefmd.com/images/theme_preferences.png)

Download themes from [https://themes.thiefmd.com](https://themes.thiefmd.com) or [make your own](https://themes.thiefmd.com/howto). [Ulysses Themes](https://styles.ulysses.app/themes) can also be imported through the preferences `Ctrl+,`.

![](docs/images/drag_n_drop_sheets.gif)
![](https://thiefmd.com/images/drag_n_drop_sheets.gif)

Drag and Drop organizing of the library.

![](docs/images/epub-export.png)
![](https://thiefmd.com/images/epub-export.png)

Live Preview & Export Preview

![](docs/images/typewriter_scrolling.gif)
![](https://thiefmd.com/images/typewriter_scrolling.gif)

Typewriter Scrolling.

![](docs/images/focus_mode.png)
![](https://thiefmd.com/images/focus_mode.png)

Focus Mode

![](docs/images/write-good.png)
![](https://thiefmd.com/images/write-good.png)

[Write-Good](https://github.com/ThiefMD/libwritegood-vala) recommendations and highlighting.

![](docs/images/thiefmd-screenplay.png)
![](https://thiefmd.com/images/thiefmd-screenplay.png)

[Fountain](https://fountain.io) syntax highlighting.

Expand All @@ -118,6 +120,7 @@ libgee-0.8-dev
libgtksourceview-4-dev
libsecret-1-dev
libhandy-1-dev
liblink-grammar-dev
```

### Fedora
Expand All @@ -138,6 +141,7 @@ libxml2-devel
libgee-devel
libsecret-devel
libhandy1-devel
link-grammar-devel
```

## Building
Expand All @@ -158,7 +162,7 @@ $ sudo ninja install

* [Contributors who help make ThiefMD awesome](https://github.com/kmwallio/ThiefMD/graphs/contributors)
* Code ~~stolen~~ *forked* from [Quilter](https://github.com/lainsce/quilter)
* Fonts are [iA Writer Duospace](https://github.com/iaolo/iA-Fonts) and [Courier Prime](https://quoteunquoteapps.com/courierprime)
* Fonts are [Stolen Victory](https://github.com/ThiefMD/StolenVictoryDuo), [Victor Mono](https://rubjo.github.io/victor-mono/), [iA Writer Duospace](https://github.com/iaolo/iA-Fonts), and [Courier Prime](https://quoteunquoteapps.com/courierprime)
* Inspired by [Ulysses](https://ulysses.app)
* Preview CSS is [Splendor](http://markdowncss.github.io/splendor) + [Modest](http://markdowncss.github.io/modest)
* Preview Scroll stolen from [this Stackoverflow](https://stackoverflow.com/questions/8922107/javascript-scrollintoview-middle-alignment) by [Rohan Orton](https://stackoverflow.com/users/2800005/rohan-orton)
Expand All @@ -167,3 +171,4 @@ $ sudo ninja install
* Fountain Rendering by [Fountain.js](https://github.com/thombruce/fountain.js/)
* Multi-format Export & Import by [Pandoc](https://pandoc.org)
* Write-Good based on [btford/write-good](https://github.com/btford/write-good)
* Grammar Checked with [Link Grammar Parser](https://www.abisource.com/projects/link-grammar/)
11 changes: 10 additions & 1 deletion com.github.kmwallio.thiefmd.spec
@@ -1,5 +1,5 @@
Name: com.github.kmwallio.thiefmd
Version: 0.2.2
Version: 0.2.3
Release: 1%{?dist}
Summary: The markdown editor worth stealing.
License: GPL-3.0+
Expand Down Expand Up @@ -313,10 +313,15 @@ rm -vf %{buildroot}%{_libdir}/libultheme.a
"/usr/share/fonts/truetype/thiefmd/Courier Prime-BoldItalic.ttf"
"/usr/share/fonts/truetype/thiefmd/Courier Prime-Italic.ttf"
"/usr/share/fonts/truetype/thiefmd/Courier Prime-Regular.ttf"
"/usr/share/fonts/truetype/thiefmd/Stolen Victory Sans-Italic.ttf"
"/usr/share/fonts/truetype/thiefmd/Stolen Victory Sans-Regular.ttf"
"/usr/share/fonts/truetype/thiefmd/Stolen Victory Duo-Italic.ttf"
"/usr/share/fonts/truetype/thiefmd/Stolen Victory Duo-Regular.ttf"
/usr/share/fonts/truetype/thiefmd/iAWriterDuospace-Bold.ttf
/usr/share/fonts/truetype/thiefmd/iAWriterDuospace-BoldItalic.ttf
/usr/share/fonts/truetype/thiefmd/iAWriterDuospace-Italic.ttf
/usr/share/com.github.kmwallio.thiefmd/gtksourceview-4/language-specs/README.md
/usr/share/locale/cs/LC_MESSAGES/com.github.kmwallio.thiefmd.mo
/usr/share/locale/en_GB/LC_MESSAGES/com.github.kmwallio.thiefmd.mo
/usr/share/locale/es/LC_MESSAGES/com.github.kmwallio.thiefmd.mo
/usr/share/locale/fr/LC_MESSAGES/com.github.kmwallio.thiefmd.mo
Expand All @@ -327,6 +332,10 @@ rm -vf %{buildroot}%{_libdir}/libultheme.a
%postun -p /sbin/ldconfig

%changelog
* Sat Apr 10 2021 kmwallio <mwallio@gmail.com> - 0.2.3
- Add Link Grammar Checking
- Improved List and Header Formatting
- Fix bugs
* Sun Mar 28 2021 kmwallio <mwallio@gmail.com> - 0.2.2
- Fix image upload support when blogging
- Add watchdog for pandoc preview
Expand Down
28 changes: 24 additions & 4 deletions data/com.github.kmwallio.thiefmd.appdata.xml
Expand Up @@ -47,19 +47,39 @@
<image>https://thiefmd.com/images/thief_window.png</image>
</screenshot>
<screenshot>
<caption>ThiefMD, a Markdown Editor, rendering a live preview of markdown being modified</caption>
<image>https://thiefmd.com/images/preview.png</image>
<caption>ThiefMD, a Markdown Editor, showing Fountain Screenplay support</caption>
<image>https://thiefmd.com/images/thiefmd-screenplay.png</image>
</screenshot>
<screenshot>
<caption>ThiefMD, a Markdown Editor, showing Theme selection preferences to change the user interface</caption>
<image>https://thiefmd.com/images/theme_preferences.png</image>
<caption>ThiefMD, a Markdown Editor, rendering a live preview of markdown being modified</caption>
<image>https://thiefmd.com/images/preview.png</image>
</screenshot>
<screenshot>
<caption>ThiefMD, a Markdown Editor, showing Write-Good suggestions finding passive voice</caption>
<image>https://thiefmd.com/images/write-good.png</image>
</screenshot>
<screenshot>
<caption>ThiefMD, a Markdown Editor, showing Grammar Errors and Project Notes</caption>
<image>https://thiefmd.com/images/grammar-notes.png</image>
</screenshot>
<screenshot>
<caption>ThiefMD, a Markdown Editor, showing Theme selection preferences to change the user interface</caption>
<image>https://thiefmd.com/images/theme_preferences.png</image>
</screenshot>
</screenshots>
<releases>
<release version="0.2.3" date="2021-04-10" urgency="low">
<description>
<p>Check, 1, 2. Check 1, 2. Does this look right to you?</p>
<p>Spell-Check, Check. Write-Good Check, Check. Grammar Check... Check! ThiefMD offers Spell Check, Write-Good Style Check, and now Grammar Check!</p>
<ul>
<li>Link-Grammar Checking</li>
<li>Improved List and Header Formatting (List item spanning more than one line now lines up with the bullet)</li>
<li>Bug fixes</li>
</ul>
</description>
<url>https://github.com/kmwallio/ThiefMD/releases/tag/v0.2.3-draftcheck</url>
</release>
<release version="0.2.2" date="2021-03-27" urgency="low">
<description>
<p>This one's for the creators, the note takers, and the plain-text savers. Notes support, screen play support, citation insertion, and more.</p>
Expand Down
2 changes: 1 addition & 1 deletion data/com.github.kmwallio.thiefmd.gschema.xml
Expand Up @@ -166,7 +166,7 @@
<description>CSS to use for PDF Export</description>
</key>
<key name="font-family" type="s">
<default>"iA Writer Duospace"</default>
<default>"Stolen Victory Duo"</default>
<summary>Font Family to use</summary>
<description>Font Family for editor to use</description>
</key>
Expand Down
Binary file added data/font/Stolen Victory Duo-Italic.ttf
Binary file not shown.
Binary file added data/font/Stolen Victory Duo-Regular.ttf
Binary file not shown.
Binary file added data/font/Stolen Victory Sans-Italic.ttf
Binary file not shown.
Binary file added data/font/Stolen Victory Sans-Regular.ttf
Binary file not shown.
108 changes: 108 additions & 0 deletions data/font/StolenVictory-LICENSE.md
@@ -0,0 +1,108 @@
# Stolen Victory Duospace Typeface

Copyright © 2021 ThiefMD. with Reserved Font Name "Stolen Victory Duospace"

# Based on Victor Mono

Copyright © 2019 Rune Bjørnerås. Under an MIT License.

# Based on iA Writer Typeface

Copyright © 2017 IBM Corp. with Reserved Font Name "iA Writer"

# Based on IBM Plex Typeface

Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"

# License

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL

-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
23 changes: 23 additions & 0 deletions data/font/VictorMono.License.md
@@ -0,0 +1,23 @@
MIT License

Copyright (c) 2019 Rune Bjørnerås

https://rubjo.github.io/victor-mono

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 1 addition & 1 deletion data/language-specs
Submodule language-specs updated 1 files
+1 −1 markdown.lang
13 changes: 8 additions & 5 deletions data/meson.build
Expand Up @@ -9,14 +9,17 @@ endforeach


font_types = ['Bold', 'Italic', 'BoldItalic', 'Regular']
fonts = ['Courier Prime', 'iAWriterDuospace']
fonts = ['Courier Prime', 'iAWriterDuospace', 'Stolen Victory Duo', 'Stolen Victory Sans']

foreach f : fonts
foreach ft : font_types
install_data(
join_paths('font', f + '-' + ft + '.ttf'),
install_dir: join_paths(get_option('datadir'), 'fonts', 'truetype', 'thiefmd')
)
if (run_command('[', '-e', join_paths('font', f + '-' + ft + '.ttf'), ']').returncode() == 0)
# message('Installing ' + f + '-' + ft + '.ttf')
install_data(
join_paths('font', f + '-' + ft + '.ttf'),
install_dir: join_paths(get_option('datadir'), 'fonts', 'truetype', 'thiefmd')
)
endif
endforeach
endforeach

Expand Down
2 changes: 1 addition & 1 deletion data/preview/preview.css
Expand Up @@ -150,7 +150,7 @@ code {
}

p,
*:not(div):not(img):not(body):not(html):not(li):not(blockquote):not(p) {
*:not(div):not(img):not(body):not(html):not(li):not(blockquote):not(p):not(span) {
margin: 1rem auto 1rem;
max-width: 48rem;
}
Expand Down
8 changes: 8 additions & 0 deletions debian/changelog
@@ -1,3 +1,11 @@
com.github.kmwallio.thiefmd (0.2.3) groovy; urgency=low

* Add Link Grammar Checking
* Improved List and Header Formatting
* Bug fixes

-- kmwallio <mwallio@gmail.com> Sat, 10 Apr 2021 10:36:34 -0700

com.github.kmwallio.thiefmd (0.2.2) groovy; urgency=low

* Add watchdog for pandoc
Expand Down

0 comments on commit 5fc261a

Please sign in to comment.