From fcf437efc8fe4fdff8017bdcb9b7e152c748b487 Mon Sep 17 00:00:00 2001
From: John Skaller <skaller@users.sourceforge.net>
Date: Tue, 12 Jul 2016 19:46:42 +1000
Subject: [PATCH] New version 2016.07.12-rc1

---
 buildsystem/version.py                    |  6 +++---
 src/packages/flx.fdoc                     | 14 +++++++++-----
 src/web/tutopt/sdlgui/gui_03_draw_01.fdoc |  3 +++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/buildsystem/version.py b/buildsystem/version.py
index 3d7db69e4..62d703c36 100644
--- a/buildsystem/version.py
+++ b/buildsystem/version.py
@@ -1,5 +1,5 @@
 flx_version_major = "2016"
-flx_version_minor = "06"
-flx_version_patch = "29"
-flx_version_release = "-pelican"
+flx_version_minor = "07"
+flx_version_patch = "12"
+flx_version_release = "-rc1"
 flx_version = flx_version_major+"."+flx_version_minor+"."+flx_version_patch+flx_version_release
diff --git a/src/packages/flx.fdoc b/src/packages/flx.fdoc
index a65f968e2..c6fb879b1 100644
--- a/src/packages/flx.fdoc
+++ b/src/packages/flx.fdoc
@@ -3106,11 +3106,15 @@ class Flx
           var dvars = FlxDepvars::cal_depvars(toolchain,*config,control,*loopctl);
           println$ f"Processing [%02d/%02d]: %S" (i, n, file);
           var pe = processing_env(toolchain,*config,*control,dvars);
-proc ehandler() {
-  eprintln("BATCH MODE ERROR HANDLER");
-  System::exit 1;
-}
-          result = pe.runit(ehandler);
+          call_with_trap {
+            proc ehandler() {
+              eprintln("BATCH MODE ERROR HANDLER");
+              result = 1;
+              goto err;
+             }
+             result = pe.runit(ehandler);
+           err:>
+          };
           if result == 0 do ++pass; else ++fail; done
           if control*.NONSTOP==0 and  result != 0 goto endoff;
           ++i;
diff --git a/src/web/tutopt/sdlgui/gui_03_draw_01.fdoc b/src/web/tutopt/sdlgui/gui_03_draw_01.fdoc
index d83025c3e..0e6daae3e 100644
--- a/src/web/tutopt/sdlgui/gui_03_draw_01.fdoc
+++ b/src/web/tutopt/sdlgui/gui_03_draw_01.fdoc
@@ -1,3 +1,5 @@
+@title basic drawing
+@felix
 include "gui/__init__";
 open FlxGui;
 
@@ -33,4 +35,5 @@ w.update();
 w.show();
 
 Faio::sleep(clock,15.0);
+@