Merge branch 'master' into difflib_spelling

This commit is contained in:
Veronica K. B. Olsen
2019-11-08 00:27:34 +01:00
13 changed files with 113 additions and 106 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 KiB

After

Width:  |  Height:  |  Size: 242 KiB

@@ -1,3 +0,0 @@
# Very Deep File
This file is still editable.
@@ -2,10 +2,4 @@
**By Jane Doh**
More Text
Even More Text
What is this?
Where is this?
Its also possible to add some text on this page.
@@ -0,0 +1,5 @@
# Mars
@tag: Mars
Its red. Dusty and red.
@@ -2,18 +2,18 @@
@pov: Jane
@char: John
@location: Space
@location: Earth
Some text here would look good as well, and maybe some "dialogue"?
A scene is defined by a level three heading, like the one at the top of this page. The scene will be assigned to the chapter preceding it in the project tree.
#### Some Section
Each paragraph in the scene is separated by a blank line. The text supports minimal formatting, like **bold**, _italic_ and __underscore__.
So, this is some __text__ that weve been adding to this document. It is utterly meaningless text, _but_ since this is just dummy text, that doesnt really matter. The text is perfectly happy to live in this document regardless.
In addition, the editor supports automatic formatting of “quotes”, both double and single. Depending on the syntax highlighter, these can be in different colours.
This paragraph is also meaningless. At least a bit. Its also very short. But we could make it less meaningless if we wanted to … but we wont, will we.
If you have the need for it, you can also add text that can be automatically replaced by other text when you generate a preview or export the project. Now, lets auto-replace this A with <A>, and this C with <C>. While <E> is just <E>. Press Ctrl+R to see what this looks like in the view pane.
This one is a bit longer. “It also has some dialogue in it” she said, before she moved on to check if the spellchecker worked. It did. “Cool,” she concluded.
#### Some Section Here
Lets auto-replace this A with <A>, and this C with <C>. While <E> is just <E>.
If you need to split a scene file up into further pieces, you can do so with the level four heading, like above. This is referred to as a section.
Lets also add some text with a non-breaking space in it, like right here!
Both scene and section titles can be left out of the final exported document. The formatting of titles can be selected from the export dialog.
@@ -1,5 +1,6 @@
## So it Begins
@pov: Jane
@location: Earth
% The first chapter with much action and such.
% We can add a chapter file, but keep the scene files separate. In the chapter file we can set the meta data that applies to the whole chapter if we wish.
@@ -1,5 +1,13 @@
## Where has John Gone?
@pov: Jane
@location: Space
% We continue the saga of John and Jane
% Further chapters can be added by adding another chapter file. This time we can add a quick scene in the same file to introduce it.
### Jane Cannot Find John
@pov: Jane
@location: Space
Jane has been looking all over for John. Hes nowhere to be found on Earth, so Jane goes to space.
@@ -1,17 +1,21 @@
# Lorem Ipsum
# A Note on Structure
## Header 2
This file is just a note. You can save notes anywhere you like in the project tree. Notes can be filtered out when you export the project.
### Header 3
In root folders that isnt the Novel root folder, you can _only_ add notes. In the Novel root folder, you can choose between a number of layouts. Some of them are just to let yourself know what each file is for.
#### Header 4
## Headers in Notes
**Lorem** ipsum dolor sit amet, consectetur "adipiscing" elit. Proin vitae nisi augue. Sed elementum lacus risus, eu lobortis ipsum malesuada rutrum. Nam egestas elit id commodo porta. **Ut eget lacinia ipsum, non interdum mi.** Sed tincidunt commodo metus, at faucibus nisi finibus eget. In malesuada egestas nulla et tempor. _Nulla eu sem_ vel mi sollicitudin cursus. “Nullam ultricies ex eu dui scelerisque, ut venenatis turpis ultricies.”
Unlike in novel files, headers in notes have no particular meaning other than visual aids for you, and for correct formatting in the export or view pane.
Nunc in ex molestie, __efficitur__ diam semper, pellentesque eros. Morbi vel lacus quis turpis sagittis iaculis. Sed rhoncus tortor et finibus lobortis. Suspendisse non ultrices odio, at venenatis mi. Sed congue congue tortor, et egestas neque malesuada ac. Nulla facilisi. Maecenas finibus elementum vestibulum. Nam id rhoncus mauris, vel “ullamcorper” «neque».
## Folders in the Tree View
Quisque mattis magna purus, vel ultricies sem feugiat pellentesque. Nam mi nisl, consectetur vel facilisis nec, condimentum at libero. Sed dolor lacus, fermentum vel nisi sed, auctor pretium urna. Nulla accumsan arcu ut ligula faucibus, non facilisis mi tempor. Nam consectetur dui dapibus lectus cursus, sed laoreet nisl maximus. Maecenas eleifend sapien eu porttitor placerat. Maecenas quis massa non tortor imperdiet porta. Nunc non tristique magna. Vivamus ornare quam convallis metus vestibulum, id molestie quam pretium. Maecenas tincidunt tincidunt tortor lobortis suscipit. Vivamus tempor dolor quis auctor sollicitudin. Integer imperdiet urna dui, at vehicula dui consequat vitae. Donec aliquet feugiat tellus sed dignissim. Nulla pretium libero ut elit porta sagittis. Praesent commodo vulputate lacinia.
The folders in the tree view have no structural meaning other than theyre a way for you to organise your files into groups in whatever way suits you. They are not intended to represent chapters, but you can of course use them for that. If you do, know that you still need to define chapter headers in your structure so novelWriter knows where you want them.
## Linking Files and Notes
You can link files and notes together by assigning tags to them, and then reference them from other files. The file class of a file determines which reference keywords apply to each file. For instance a file in the Characters root folder can be referenced using either the @char keyword or the @pov keyword.
If you want to see the content of the file the reference points to, you can click Ctrl+Enter with the cursor on top of the reference, and the view pane will show you the file. In the view pane, all references are clickable, so you can navigate further. At the bottom of the view pane, a list of files referencing the one your viewing will appear. This panel updates when you navigate, unless you make it sticky by clicking the sticky checkbox.
Proin cursus augue nec dignissim tincidunt. Nunc tincidunt efficitur sapien, ac dictum ligula varius eu. In pretium tristique volutpat. Aenean efficitur enim ut eros finibus, nec gravida neque vestibulum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam fermentum sit amet libero vel placerat. Nunc in nunc vulputate, elementum nisl vitae, dignissim leo. Nunc felis augue, dapibus sit amet orci et, fermentum posuere velit. Curabitur eros purus, pretium ac magna non, tempor gravida justo. Vivamus in ipsum magna.
Sed quis felis ante. Sed rhoncus turpis risus, ac malesuada velit dictum eget. Curabitur malesuada justo a augue lacinia dictum. Cras hendrerit lorem turpis, et ultrices lectus fermentum at. Quisque volutpat dignissim felis id commodo. Mauris convallis arcu id tempor tincidunt. Cras porttitor ut erat non bibendum. Cras non velit ac libero tincidunt suscipit. Aliquam at neque lacus.
@@ -1,23 +1,6 @@
### We Found John!
@pov: John
@location: Mars
Jane has been searching for a while, and she finally found John on Mars. He was indeed in space! What was he doing on Mars anyway? Well, it turns out, he was farming potatoes.
Farming potatoes you say? Why would you do that?
No one knows, but it seemed like a good idea at the time I suppose.
### A Note on Potato Farming on Mars
@pov: John
% Were adding a second scene to the same file here, which is perfectly fine I may add.
Potatoes cannot be farmed on Mars. That is simply a fact. There is no soil. Unless John brings the soil himself. Wait, did he?
I dont want to know.
#### Conclusion
Why would anyone write about such things? let alone make a film about it?
@@ -1,5 +1,7 @@
## Interlude
% Notice that this is a file with the flag N.Un. The N means its a novel file, and the Un means its an unnumbered chapter. Unnumbered chapters can be treated separately from numbered chapters during export. Perfect for when you want to add an interlude, or for a prologue or epilogue.
I am the very model of a modern Major-General
I've information vegetable, animal, and mineral
I know the kings of England, and I quote the fights historical
@@ -13,3 +15,5 @@ With many cheerful facts about the square of the hypotenuse
With many cheerful facts about the square of the hypotenuse
With many cheerful facts about the square of the hypotenuse
With many cheerful facts about the square of the hypotepotenuse
% Notice that the lines in the verse have highlighted spaces at the end of each line. (If the syntax theme allows it.) These are two spaces, which indicates that you want a hard line break at that point. The blank lines still indicate a paragraph. Press Ctrl+R to see what this renders like.
@@ -3,6 +3,16 @@
@pov: John
@location: Earth
This is the second scene in out story. We have no idea whats going on, so were just going to ramble on until we have a few lines of text so that the editor has something to work with.
Adding more scenes to a chapter is as easy as adding more scene files, with a level three heading, or just adding another level three heading in the same file if that works for the way you want to structure your files.
In fact, if you wish, you can add all the scenes in the chapter file too. All novelWriter cares about is the level of the headings.
### More Scenes
@pov: Jane
@location: Earth
This is a second scene in the same file as the previous scene. You can always split the files up later.
In fact, this scene is supposed to be about John, but we dont really know anything about John, except that he is somewhere in space. Perhaps hes lost? Or has gone where no man has gone before? Where is Jane then?
@@ -2,5 +2,6 @@
@tag: Space
This is somewhere in outer space.
Space … its an awful lot of nothing, with bits in it here and there. Some of which, people like to call home.
+56 -56
View File
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="0.3.2" fileVersion="1.0" timeStamp="2019-11-03 12:08:56">
<novelWriterXML appVersion="0.4.0" fileVersion="1.0" timeStamp="2019-11-07 22:03:42">
<project>
<name>Sample Project</name>
<title>Sample Project</title>
@@ -9,9 +9,9 @@
</project>
<settings>
<spellCheck>True</spellCheck>
<lastEdited>636b6aa9b697b</lastEdited>
<lastViewed>bb2c23b3c42cc</lastViewed>
<lastWordCount>895</lastWordCount>
<lastEdited>96b68994dfa3d</lastEdited>
<lastViewed>b3e74dbc1f584</lastViewed>
<lastWordCount>855</lastWordCount>
<autoReplace>
<A>B</A>
<B>E</B>
@@ -38,7 +38,7 @@
<name>Novel</name>
<type>ROOT</type>
<class>NOVEL</class>
<status>New</status>
<status>Started</status>
<expanded>True</expanded>
</item>
<item handle="53b69b83cdafc" order="0" parent="7031beac91f75">
@@ -48,53 +48,53 @@
<status>Started</status>
<expanded>False</expanded>
<layout>TITLE</layout>
<charCount>73</charCount>
<wordCount>16</wordCount>
<paraCount>5</paraCount>
<cursorPos>85</cursorPos>
<charCount>72</charCount>
<wordCount>15</wordCount>
<paraCount>2</paraCount>
<cursorPos>78</cursorPos>
</item>
<item handle="e7ded148d6e4a" order="1" parent="7031beac91f75">
<name>Some Chapter</name>
<name>A Folder</name>
<type>FOLDER</type>
<class>NOVEL</class>
<status>Notes</status>
<status>1st Draft</status>
<expanded>True</expanded>
</item>
<item handle="6a2d6d5f4f401" order="0" parent="e7ded148d6e4a">
<name>Chapter One</name>
<type>FILE</type>
<class>NOVEL</class>
<status>New</status>
<status>Notes</status>
<expanded>False</expanded>
<layout>CHAPTER</layout>
<charCount>12</charCount>
<wordCount>3</wordCount>
<paraCount>0</paraCount>
<cursorPos>75</cursorPos>
<cursorPos>45</cursorPos>
</item>
<item handle="636b6aa9b697b" order="1" parent="e7ded148d6e4a">
<name>Making a Scene</name>
<type>FILE</type>
<class>NOVEL</class>
<status>Notes</status>
<status>1st Draft</status>
<expanded>False</expanded>
<layout>SCENE</layout>
<charCount>783</charCount>
<wordCount>146</wordCount>
<charCount>1076</charCount>
<wordCount>196</wordCount>
<paraCount>6</paraCount>
<cursorPos>0</cursorPos>
<cursorPos>59</cursorPos>
</item>
<item handle="bc0cbd2a407f3" order="2" parent="e7ded148d6e4a">
<name>Another Scene</name>
<type>FILE</type>
<class>NOVEL</class>
<status>Notes</status>
<status>1st Draft</status>
<expanded>False</expanded>
<layout>SCENE</layout>
<charCount>412</charCount>
<wordCount>82</wordCount>
<paraCount>2</paraCount>
<cursorPos>43</cursorPos>
<charCount>476</charCount>
<wordCount>93</wordCount>
<paraCount>3</paraCount>
<cursorPos>551</cursorPos>
</item>
<item handle="ba8a28a246524" order="3" parent="e7ded148d6e4a">
<name>Interlude</name>
@@ -106,43 +106,43 @@
<charCount>633</charCount>
<wordCount>101</wordCount>
<paraCount>3</paraCount>
<cursorPos>164</cursorPos>
<cursorPos>1238</cursorPos>
</item>
<item handle="96b68994dfa3d" order="4" parent="e7ded148d6e4a">
<name>A Note on Ipsums</name>
<name>A Note on Structure</name>
<type>FILE</type>
<class>NOVEL</class>
<status>Started</status>
<status>2nd Draft</status>
<expanded>False</expanded>
<layout>NOTE</layout>
<charCount>2571</charCount>
<wordCount>377</wordCount>
<paraCount>5</paraCount>
<cursorPos>0</cursorPos>
<charCount>1692</charCount>
<wordCount>313</wordCount>
<paraCount>6</paraCount>
<cursorPos>216</cursorPos>
</item>
<item handle="88706ddc78b1b" order="5" parent="e7ded148d6e4a">
<name>Chapter Two</name>
<type>FILE</type>
<class>NOVEL</class>
<status>New</status>
<status>1st Draft</status>
<expanded>False</expanded>
<layout>CHAPTER</layout>
<charCount>20</charCount>
<wordCount>4</wordCount>
<paraCount>0</paraCount>
<cursorPos>76</cursorPos>
<charCount>139</charCount>
<wordCount>28</wordCount>
<paraCount>1</paraCount>
<cursorPos>343</cursorPos>
</item>
<item handle="ae7339df26ded" order="6" parent="e7ded148d6e4a">
<name>We Found John!</name>
<type>FILE</type>
<class>NOVEL</class>
<status>New</status>
<status>1st Draft</status>
<expanded>False</expanded>
<layout>SCENE</layout>
<charCount>567</charCount>
<wordCount>112</wordCount>
<paraCount>6</paraCount>
<cursorPos>326</cursorPos>
<charCount>189</charCount>
<wordCount>37</wordCount>
<paraCount>1</paraCount>
<cursorPos>224</cursorPos>
</item>
<item handle="f6622b4617424" order="1" parent="None">
<name>Characters</name>
@@ -193,7 +193,7 @@
<name>Earth</name>
<type>FILE</type>
<class>WORLD</class>
<status>None</status>
<status>Main</status>
<expanded>False</expanded>
<layout>NOTE</layout>
<charCount>76</charCount>
@@ -205,13 +205,25 @@
<name>Space</name>
<type>FILE</type>
<class>WORLD</class>
<status>None</status>
<status>Minor</status>
<expanded>False</expanded>
<layout>NOTE</layout>
<charCount>38</charCount>
<wordCount>7</wordCount>
<charCount>115</charCount>
<wordCount>24</wordCount>
<paraCount>1</paraCount>
<cursorPos>57</cursorPos>
<cursorPos>133</cursorPos>
</item>
<item handle="5eaea4e8cdee8" order="2" parent="15c4492bd5107">
<name>Mars</name>
<type>FILE</type>
<class>WORLD</class>
<status>Major</status>
<expanded>False</expanded>
<layout>NOTE</layout>
<charCount>28</charCount>
<wordCount>6</wordCount>
<paraCount>1</paraCount>
<cursorPos>45</cursorPos>
</item>
<item handle="98acd8c76c93a" order="3" parent="None">
<name>Trash</name>
@@ -232,17 +244,5 @@
<paraCount>1</paraCount>
<cursorPos>36</cursorPos>
</item>
<item handle="4cd0bd12b087d" order="1" parent="98acd8c76c93a">
<name>Orphaned File 1</name>
<type>FILE</type>
<class>NO_CLASS</class>
<status>None</status>
<expanded>False</expanded>
<layout>NO_LAYOUT</layout>
<charCount>42</charCount>
<wordCount>8</wordCount>
<paraCount>1</paraCount>
<cursorPos>47</cursorPos>
</item>
</content>
</novelWriterXML>