More improvements to demo doc

2 files changed, 50 insertions, 65 deletions

diff --git a/data/colloquium.svg b/data/colloquium.svg
index ecbdd07..403a307 100644
--- a/data/colloquium.svg
+++ b/data/colloquium.svg
@@ -9,21 +9,21 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="130.16031"
-   height="143.73679"
+   width="148.48413"
+   height="148.64584"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
    sodipodi:docname="colloquium.svg">
   <defs
      id="defs4">
     <filter
        inkscape:collect="always"
        id="filter3822"
-       x="-0.26724891"
-       width="1.5344978"
-       y="-0.26724891"
-       height="1.5344978">
+       x="-0.2672489"
+       width="1.5344979"
+       y="-0.2672489"
+       height="1.5344979">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="7.3970682"
@@ -38,16 +38,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="3.959798"
-     inkscape:cx="62.032708"
-     inkscape:cy="69.511641"
+     inkscape:cx="75.613848"
+     inkscape:cy="67.491328"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1122"
-     inkscape:window-height="855"
-     inkscape:window-x="481"
-     inkscape:window-y="148"
-     inkscape:window-maximized="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
      fit-margin-top="10"
      fit-margin-left="10"
      fit-margin-right="10"
@@ -60,7 +60,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -68,65 +68,56 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-325.14297,-446.66111)">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffff97;fill-opacity:1;stroke:none;stroke-width:2.4000001;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3822);enable-background:accumulate"
+     transform="translate(-306.88987,-441.75205)">
+    <circle
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffff97;fill-opacity:1;stroke:none;stroke-width:2.4000001;marker:none;filter:url(#filter3822);enable-background:accumulate"
        id="path2985-8"
-       sodipodi:cx="379.28571"
-       sodipodi:cy="514.14789"
-       sodipodi:rx="33.214287"
-       sodipodi:ry="33.214287"
-       d="m 412.49999,514.14789 a 33.214287,33.214287 0 1 1 -66.42857,0 33.214287,33.214287 0 1 1 66.42857,0 z"
-       transform="matrix(1.2242336,0,0,1.2242336,-85.04861,-115.28925)" />
+       transform="matrix(1.2242336,0,0,1.2242336,-85.04861,-115.28925)"
+       cx="379.28571"
+       cy="514.14789"
+       r="33.214287" />
     <rect
-       style="color:#000000;fill:#ffffff;stroke:#000000;stroke-width:2.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        id="rect2987"
        width="30.357143"
        height="37.5"
        x="364.35968"
        y="541.64789" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffff97;fill-opacity:1;stroke:none;stroke-width:0.99999998000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+    <circle
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffff97;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        id="path2985"
-       sodipodi:cx="379.28571"
-       sodipodi:cy="514.14789"
-       sodipodi:rx="33.214287"
-       sodipodi:ry="33.214287"
-       d="m 412.49999,514.14789 c 0,18.34374 -14.87054,33.21428 -33.21428,33.21428 -18.34375,0 -33.21429,-14.87054 -33.21429,-33.21428 0,-18.34375 14.87054,-33.21429 33.21429,-33.21429 18.34374,0 33.21428,14.87054 33.21428,33.21429 z" />
+       cx="379.28571"
+       cy="514.14789"
+       r="33.214287" />
     <path
        style="fill:none;stroke:#fafafa;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 46.845824,99.542612 -9.848987,-30.557114 3.788072,3.409264 2.65165,-3.282995 2.904189,3.282995 3.156727,-2.777919 2.020305,2.777919 3.409265,-2.777919 2.146574,3.282996 2.399112,-2.272844 1.38896,2.77792 2.65165,-1.894036 2.77792,2.777919 3.661803,-1.641497 -11.616755,27.905459"
        id="path3826"
        inkscape:connector-curvature="0"
        transform="translate(325.14297,446.66111)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:none;stroke:#797979;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+    <circle
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#797979;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        id="path2985-1"
-       sodipodi:cx="379.28571"
-       sodipodi:cy="514.14789"
-       sodipodi:rx="33.214287"
-       sodipodi:ry="33.214287"
-       d="m 412.49999,514.14789 a 33.214287,33.214287 0 1 1 -66.42857,0 33.214287,33.214287 0 1 1 66.42857,0 z" />
+       cx="379.28571"
+       cy="514.14789"
+       r="33.214287" />
     <g
        id="g3784"
-       transform="matrix(0.96170227,0.27409625,-0.27409625,0.96170227,156.72282,-87.963287)">
+       transform="rotate(15.908164,393.13729,516.84966)">
       <rect
          y="474.50504"
          x="346.96429"
          height="30.714273"
          width="64.285698"
          id="rect3776"
-         style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
       <rect
          y="474.50504"
          x="323.21429"
          height="7.5"
          width="111.78572"
          id="rect3778"
-         style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
       <path
          inkscape:connector-curvature="0"
          id="path3782"
@@ -134,22 +125,22 @@
          style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <path
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 359.48815,547.46641 39.90102,9.34391"
        id="path3846"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 359.48815,566.53304 39.90102,9.34391"
        id="path3846-5"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 359.48815,560.1775 39.90102,9.34391"
        id="path3846-2"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 359.48815,553.82195 39.90102,9.34391"
        id="path3846-8"
        inkscape:connector-curvature="0" />
diff --git a/data/demo.sc b/data/demo.sc
index 7dd96fd..8ce4434 100644
--- a/data/demo.sc
+++ b/data/demo.sc
@@ -17,14 +17,12 @@
 
 }\paraspace[0,0,10,10]\pad[10,10,10,10]\fgcol[#222222]\bgcol[#ffffff]\fontsize[40]{\bold{}Hi there, welcome to \bold{Colloquium}!}
 \fontsize[16]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 \italic{narrative, not slides,} the centre of attention.  Slides come when you need to illustrate something.  This window is called the \oblique{narrative editor}.  Your slides are embedded into the narrative text, like this:
-\slide{
-\prestitle{Presentation title!}
-\f[836.7ux156.5u+100.3+565.5]{hel\fontsize[40]{lo?}}
-\f[506.3ux520.3u+448.1+150.6]{\image[1fx1f+0+0,filename="colloquium.svg"]{}}}
+Colloquium works differently to other presentation programs. Colloquium makes \italic{narrative, not slides,} the centre of attention.  Slides come when you need to illustrate something.  This window is called the \oblique{narrative editor}.  Your slides are embedded into the narrative text, like this:\slide{
+\prestitle{Welcome to Colloquium}
+
+\f[506.3ux520.3u+244.5+141.3]{\image[1fx1f+0+0,filename="colloquium.svg"]{}}\f[537.4ux62.0u+257.8+692.6]{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:
-\slide{
+To edit a slide, simply double-click on it.  Try it on this next slide:\slide{
 \slidetitle{Here is the slide title!}
 \footer{}
 \f[425.5ux85.0u+519.3+526.9]{Close this window when you've finished editing...}\f[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.}\f[442.3ux120.3u+321.6+341.8]{Shift-click and drag frames to move them.
@@ -36,20 +34,16 @@ What is the narrative window for?  Well, it's up to you!  Here are some suggesti
 \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!
-If you have two screens connected to your computer at the moment, you could try a mock presentation now.
 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.
-Now, a short warning:
-\slide{\slidetitle{Alpha test software}\footer\f[415.5ux432.1u+564.7+185.0]{Colloquium is "alpha test" software.
-
-It will probably crash on you and eat your work.
+Now, a short warning:\slide{\slidetitle{Alpha test software}\footer\f[394.9ux428.0u+571.9+178.8]{Colloquium is "alpha test" software.
 
-Save and back up your work as frequently as possible.
+It will probably crash on you and eat your work a few times.  Save and back up your work as frequently as possible.
 
-That said, it has never crashed on me in front of a live audience.  You will find most bugs in the editing features, not playback.
+However, in years of use it has \bold{never} crashed on me in front of an audience.  You will find most bugs in the editing features, not playback.
 
-Nevertheless, creating a backup slide deck in PDF format (File->Export slides as PDF) is wise.
+Creating a backup slide deck in PDF format (File->Export slides as PDF) is a wise safety measure.
 
 Please report all bugs here:
-https://www.bitwiz.me.uk/tracker}\f[452.2ux431.0u+53.4+144.1]{\image[1fx1f+0+0,filename="alpha_warning.svg"]{}}}
+https://www.bitwiz.me.uk/tracker}\f[452.2ux431.0u+64.8+168.9]{\image[1fx1f+0+0,filename="alpha_warning.svg"]{}}}
 That's enough to get you started.  I hope you enjoy using Colloquium!