Merge branch 'main' into outline_view

This commit is contained in:
Veronica Berglyd Olsen
2022-06-05 13:36:54 +02:00
47 changed files with 1881 additions and 1510 deletions
+1
View File
@@ -4,5 +4,6 @@
# Mars
@tag: Mars
@location: Space
Its red. Dusty and red.
+1 -1
View File
@@ -4,7 +4,7 @@
### Making a Scene
@pov: Jane
@char: John
@char: John, Jane
@location: Earth
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. The scene document can be sorted after the chapter document, or as a child of the chapter. Both result in the same output in the end, so it is a matter of preference.
+2 -1
View File
@@ -1,5 +1,5 @@
%%~name: Chapter Two
%%~path: e7ded148d6e4a/88706ddc78b1b
%%~path: 7031beac91f75/88706ddc78b1b
%%~kind: NOVEL/DOCUMENT
## Where has John Gone?
@@ -11,6 +11,7 @@
### Jane Cannot Find John
@pov: Jane
@focus: John
@location: Space
Jane has been looking all over for John. Hes nowhere to be found on Earth, so Jane goes to space.
+1
View File
@@ -4,6 +4,7 @@
### We Found John!
@pov: John
@focus: 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.
+2 -1
View File
@@ -4,5 +4,6 @@
# Earth
@tag: Earth
@location: Space
Third planet from the sun, fairly dense, and with lots of people on it.
Third planet from the sun, fairly dense, and with lots of people on it.
+1 -1
View File
@@ -1,6 +1,6 @@
%%~name: Delete Me!
%%~path: 98acd8c76c93a/b8136a5a774a0
%%~kind: NOVEL/DOCUMENT
%%~kind: TRASH/DOCUMENT
### Delete Me!
This scene is trash.
+3 -3
View File
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-05-17 18:36:56">
<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-06-05 13:28:34">
<project>
<name>Sample Project</name>
<title>Sample Project</title>
<author>Jane Smith</author>
<author>Jay Doh</author>
<saveCount>1329</saveCount>
<saveCount>1331</saveCount>
<autoCount>220</autoCount>
<editTime>67104</editTime>
<editTime>67108</editTime>
</project>
<settings>
<doBackup>False</doBackup>