Mostly working grammar

1 files changed, 39 insertions, 31 deletions

diff --git a/data/demo.sc b/data/demo.sc
index 8e5cb62..6c91d5a 100644
--- a/data/demo.sc
+++ b/data/demo.sc
@@ -1,65 +1,73 @@
-STYLES:
-  NARRATIVE:
-    PRESTITLE:
+STYLES {
+  NARRATIVE {
+     PRESTITLE {
       FONT: Cantarell Bold 16
-  SLIDE:
-    PRESTITLE:
+     }
+  }
+  SLIDE {
+    PRESTITLE {
       TYPE: TEXT[1fx90u+0+0]
       FONT: Cantarell Regular 64
       PAD: 20,20,20,20
       FGCOL: #eeeeee
       ALIGN: center
       BGCOL: rgba(0,0,0,0)
+    }
+  }
+}
 
 PRESTITLE: Hi there, welcome to Colloquium!
 
-It looks like this is the first time you've used Colloquium.  Keep reading to understand a little bit about how Colloquium works and how to use it.
->
-Colloquium works differently to other presentation programs. Colloquium makes /narrative, not slides,/ the centre of attention.  Slides come when you need to illustrate something.  This window is called the /narrative editor/.  Your slides are embedded into the narrative text, like this:
+: It looks like this is the first time you've used Colloquium.  Keep reading to understand a little bit about how Colloquium works and how to use it.
+:
+: Colloquium works differently to other presentation programs. Colloquium makes /narrative, not slides,/ the centre of attention.  Slides come when you need to illustrate something.  This window is called the /narrative editor/.  Your slides are embedded into the narrative text, like this:
 
-SLIDE:
+SLIDE {
   PRESTITLE: Welcome to Colloquium
   IMAGE[506.3ux520.3u+244.5+141.3]: colloquium.svg
   TEXT[983.9ux75.4u+21.1+673.0][center]: This is the presentation title slide, in case you hadn't noticed.
+}
 
-As you can probably tell, the above slide happens to be the title page for the presentation.
-To edit a slide, simply double-click on it.  Try it on this next slide:
+: As you can probably tell, the above slide happens to be the title page for the presentation.
+: To edit a slide, simply double-click on it.  Try it on this next slide:
 
-SLIDE:
+SLIDE {
   SLIDETITLE: Here is the slide title!
   FOOTER
   TEXT[425.5ux85.0u+519.3+526.9]: Close this window when you've finished editing...
   TEXT[383.5ux112.1u+62.0+139.6]: Editing slides works how you expect it to.  Add a new text frame by holding shift and dragging from an empty area.  Then simply type into the new frame.
-  TEXT[442.3ux120.3u+321.6+341.8]> Shift-click and drag frames to move them.
-                                 > Change their shape and size by shift-dragging the handles at the corners.
+  TEXT[442.3ux120.3u+321.6+341.8]: Shift-click and drag frames to move them.
+                                 : Change their shape and size by shift-dragging the handles at the corners.
+}
 
-You can add a new slide from the "Insert" menu or using the toolbar at the top of the narrative window.  Try it now: click to place the cursor at the end of this paragraph, then add a new slide.
+: You can add a new slide from the "Insert" menu or using the toolbar at the top of the narrative window.  Try it now: click to place the cursor at the end of this paragraph, then add a new slide.
 
-What is the narrative window for?  Well, it's up to you!  Here are some suggestions:
+: What is the narrative window for?  Well, it's up to you!  Here are some suggestions:
 BP: Use it just to help plan a smooth flow for your talk, reading it through to spot awkward transitions.
 BP: Write your talk word for word.  Deliver your talk precisely as you planned it, no matter how nervous you get.
 BP: Write bullet-pointed notes to structure your talk.
 BP: Create a written version of your talk to print out and give to your audience as a handout.
 BP: Use it as a journal, adding slides whenever you have an illustration.  You'll have a ready-made presentation on your activity, with no extra effort!
 
-Besides this, Colloquium has some features which will help you when you come to give your presentation.  In the "Tools" menu, you'll find the presentation clock and the test card.
+: Besides this, Colloquium has some features which will help you when you come to give your presentation.  In the "Tools" menu, you'll find the presentation clock and the test card.
 
-Use the test card to make sure your computer is talking to the projector correctly.  It shows you the resolution of the screen, where it thinks the edges are, and some colours.  This helps you spot and fix all-too-common display problems early.
+: Use the test card to make sure your computer is talking to the projector correctly.  It shows you the resolution of the screen, where it thinks the edges are, and some colours.  This helps you spot and fix all-too-common display problems early.
 
-Now, a short warning:
-SLIDE:
+: Now, a short warning:
+SLIDE {
   SLIDETITLE: Alpha test software
   FOOTER
-  TEXT[391.8ux473.5u+567.8+143.7]> Colloquium is "alpha test" software.
-                                 >
-                                 > It will probably crash and lose your work a few times.  Save and back up your work as frequently as possible.
-                                 >
-                                 > However, in years of use it has *never* crashed on me in front of an audience.  You will find most bugs in the editing features, not playback.
-                                 >
-                                 > Creating a backup slide deck in PDF format (File->Export slides as PDF) is nevertheless a wise safety measure.
-                                 >
-                                 > Please report all bugs here:
-                                 > https://github.com/taw10/colloquium/issues
+  TEXT[391.8ux473.5u+567.8+143.7]: Colloquium is "alpha test" software.
+                                 :
+                                 : It will probably crash and lose your work a few times.  Save and back up your work as frequently as possible.
+                                 :
+                                 BP: However, in years of use it has *never* crashed on me in front of an audience.  You will find most bugs in the editing features, not playback.
+                                 :
+                                 : Creating a backup slide deck in PDF format (File->Export slides as PDF) is nevertheless a wise safety measure.
+                                 :
+                                 BP: Please report all bugs here:
+                                 : https://github.com/taw10/colloquium/issues
   IMAGE[452.2ux431.0u+64.8+168.9]: alpha_warning.svg
+}
 
-That's enough to get you started.  I hope you enjoy using Colloquium!
+: That's enough to get you started.  I hope you enjoy using Colloquium!