From 830ffcf837f2508ee81597c5b1b77a8066155a9c Mon Sep 17 00:00:00 2001 From: jackson <63016612+fairybow@users.noreply.github.com> Date: Wed, 1 Feb 2023 20:42:14 -0500 Subject: [PATCH] Fountain preview support :blossom: - Adjusted Readme - Added Set menu option for Preview Type (Fountain or Markdown) - Added Fountain support to Preview - Added Fountain.js assets to support the above --- README.md | 27 +- fernanda/docs/dependencies.md | 2 + fernanda/docs/fountain.js/LICENSE.md | 21 ++ fernanda/docs/fountain.js/readme.md | 110 +++++++ fernanda/docs/todo.md | 1 + fernanda/docs/zips/Fountain.js.zip | Bin 0 -> 131816 bytes fernanda/fernanda.vcxproj | 3 +- fernanda/fernanda.vcxproj.filters | 9 +- fernanda/res/preview.qrc | 5 +- fernanda/res/preview/fountain.html | 27 ++ fernanda/res/preview/include/fountain-js.css | 305 ++++++++++++++++++ fernanda/res/preview/include/fountain.min.js | 12 + .../res/preview/{index.html => markdown.html} | 4 +- fernanda/src/mainwindow.cpp | 9 + fernanda/src/mainwindow.h | 2 + fernanda/src/preview.cpp | 25 +- fernanda/src/preview.h | 13 +- fernanda/src/userdata.cpp | 3 + fernanda/src/userdata.h | 1 + fernanda/src/version.h | 4 +- 20 files changed, 558 insertions(+), 25 deletions(-) create mode 100644 fernanda/docs/fountain.js/LICENSE.md create mode 100644 fernanda/docs/fountain.js/readme.md create mode 100644 fernanda/docs/zips/Fountain.js.zip create mode 100644 fernanda/res/preview/fountain.html create mode 100644 fernanda/res/preview/include/fountain-js.css create mode 100644 fernanda/res/preview/include/fountain.min.js rename fernanda/res/preview/{index.html => markdown.html} (90%) diff --git a/README.md b/README.md index f31f731..e4bb50d 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Fernanda's look was inspired by the nice and quiet feeling of using [WordStar](h Fernanda got its name because I just really like the name a lot. But, as it turns out, Fernanda means an ["adventurous, bold journey"](https://en.wikipedia.org/wiki/Fernanda) (the kind one might be *called* to, say), and I think that's neat. -[⏎](#top) +[:leftwards_arrow_with_hook:](#top) ## :honeybee: **Build** @@ -79,11 +79,14 @@ Among the other fonts used are: Solarized theme palettes by [@altercation](https://github.com/altercation/solarized) -Markdown preview support provided with: +[Markdown](https://www.markdownguide.org/)/[Fountain](https://fountain.io/) preview support provided with: - [Marked.js](https://github.com/markedjs/marked) -- and [Markdown.css](https://bitbucket.org/kevinburke/markdowncss) +- [Markdown.css](https://bitbucket.org/kevinburke/markdowncss) +- and [Fountain.js](https://github.com/mattdaly/Fountain.js) -[⏎](#top) +> **Note:** Markdown/Fountain support is, at the moment, extremely barebones! + +[:leftwards_arrow_with_hook:](#top) ## :star: **Features** @@ -95,7 +98,7 @@ Markdown preview support provided with: - Save backups (in [`{userdata}\backup\.rollback`](#folders)) - Global line, word, and character totals - Export to PDF or directory -- Markdown preview +- Markdown/Fountain preview --- @@ -153,7 +156,7 @@ If you want to manually rename, move, or delete items within a `.story` file via
-[⏎](#top) +[:leftwards_arrow_with_hook:](#top) ## :floppy_disk: **Installation** @@ -179,7 +182,7 @@ You can grab the installer on the [Releases](https://github.com/fairybow/fernand They can be opened via the `Help` menu. -[⏎](#top) +[:leftwards_arrow_with_hook:](#top) ## :compass: **Roadmap** @@ -194,11 +197,11 @@ If I think of something big, I'll try to add it right here. Otherwise, these thi - Persist undo/redo stacks between file changes - Separators and possibly customizable file icons, for better mental organization at-a-glance - Simple storage of links and research materials -- Fountain preview/export support +- Markdown/Fountain export More to come. -[⏎](#top) +[:leftwards_arrow_with_hook:](#top) ## :smiley_cat: **Thanks** @@ -206,7 +209,7 @@ A major thanks to [@philipplenk](https://codemetas.de/) for their teaching and i A major thanks, too, to [@rikyoz](https://github.com/rikyoz/) for their tireless work on the very amazing [Bit7z library](https://github.com/rikyoz/bit7z). -[⏎](#top) +[:leftwards_arrow_with_hook:](#top) ## :hibiscus: **Screens** @@ -275,8 +278,8 @@ A major thanks, too, to [@rikyoz](https://github.com/rikyoz/) for their tireless -[⏎](#top) +[:leftwards_arrow_with_hook:](#top) ## :heartpulse: **Bye** -[⏎](#top) +[:leftwards_arrow_with_hook:](#top) diff --git a/fernanda/docs/dependencies.md b/fernanda/docs/dependencies.md index db2ac2c..7747aa5 100644 --- a/fernanda/docs/dependencies.md +++ b/fernanda/docs/dependencies.md @@ -29,6 +29,7 @@ - text.h (+ version.h) - preview.h - layout.h + - userdata.h (+ path.h) - resource.h - path.h - splitter.h @@ -280,6 +281,7 @@ ### preview.h ``` #include "layout.h" +#include "userdata.h" #includeuTsHe{2??OKM;Va%>mz}ORlREat9$;hy|G}98><4JPG`w>MGP-4O;jC=
zc>W?RPlxStV7Mk59tsJk6l=cy8IASHO*ptT_+afNh%5|_8{|gZZoAsLX`Ke;mg%W=
zJRkQLzSHD0^N+-p=`n=~y|qQo_sQ%>Q&W$lLOXcwhl{i;{l@?)7b4f)iLE&U-TY>!
z?pE*jD|N~Nh3~eflezDw50lRyAsO5>>zUNm@4$cCg_NpBjIH&FXU->{|Nbu0U*q{(
zcJ)&9F~w5C_K{jyB2femXhHSq&>BmrA6+Mrnq9+mF{4!@l%g=p8RTtv*lpy9Z+F?~
zOtV07TIIzN9^ei6Xn02t#jk>>x1N)tB&S4q6BR0fB6olwBv&3zaj{Ym9>L|_c=3Mn
z |B7e+0%(hO NMfSfm{Ww~
z8d^BC!9yL--?VH87rKGJV;>sxC90~YQaTubWX<8pf_Ythu#er |1^hn`~6TD$N;X%HItH2J^I!^h@*RUP5kMzPhNUr&`|^J
z))N&C>rVl%De?pen 6qpmKiRTx7&DC$doxDz=hjSqy)dX?$2))oTWR{CR&4}l!=-ng+*vCb4lb5xqrW3
zK-)UMSq==rnSe*7r41*+VP@0o>JyQfO4fDS$7<5roYYM`S|PZPvl2#0e#tI^O<9)%
zDX3Blyym%SVZW!(IBBFCytNI$r@F+==hvUmdW%2(loPhT+L1sC+szxMZi(3mHR@Jv
zD>#u&tAM2T-_<&Q}oAAn0eTCd)$R@HPiQEO!UL32ss
zwo=f!wuRMazyIr6ULjM96A~X^HzMSFT|Ti^dS;`eQ@IYWpPP_D7qw?}uHJzSuQ*UG
z)@PvC-dz-vs$1t};6RG};CQ;D*hrT45rhC~_HX*!sB?{Hv|E3wEsG9M@Ka;02LB%Z
zS>qV#05WV^5EF+P?O|ZKfk?(
ws{v0WZ;v8RI78K94~
z7|!zN{qpFO#s>g7Be);bygahyG2Zm%m?V%!9Op!uNj)L;zNpfjo2l#R1Mgr|SY4R~Ft
zgTtNukF5WD