11 files changed, 22 insertions, 13 deletions

diff --git a/htdocs/ancestry/layout.chtml b/htdocs/ancestry/layout.chtml
index 4551d04..64d1cd2 100644
--- a/htdocs/ancestry/layout.chtml
+++ b/htdocs/ancestry/layout.chtml
@@ -1,5 +1,5 @@
-% html(); return; /* vim:set ft=sitecing: */
-%%derive page = "/ancestry/page.chtml";
+%%derive page = "/ancestry/page.chtml"; /* vim:set ft=sitecing: */
+%%pragma main=page
 <%decl>
  #define PN_PREV(h,d,t) urlPrev=h; descPrev=d; titlePrev=t;
  #define PN_NEXT(h,d,t) urlNext=h; descNext=d; titleNext=t;
diff --git a/htdocs/exceptions/compile.chtml b/htdocs/exceptions/compile.chtml
index 68dd034..94bd2e1 100644
--- a/htdocs/exceptions/compile.chtml
+++ b/htdocs/exceptions/compile.chtml
@@ -1,5 +1,6 @@
-% html(); return; /* vim:set ft=sitecing: */
+% /* vim:set ft=sitecing: */
 %%derive layout = "/ancestry/layout.chtml";
+%%pragma main=page
 <%constructor>
  b_strict = false;
  PN_PREV("/exceptions/preprocess","preprocess","preprocessing errors");
diff --git a/htdocs/exceptions/index.chtml b/htdocs/exceptions/index.chtml
index 6bb2a3c..c700e42 100644
--- a/htdocs/exceptions/index.chtml
+++ b/htdocs/exceptions/index.chtml
@@ -1,5 +1,6 @@
-% html(); return; /* vim:set ft=sitecing: */
+% /* vim:set ft=sitecing: */
 %%derive layout = "/ancestry/layout.chtml";
+%%pragma main=page
 <%constructor>
  PN_PREV("/simple","simple page","building a really simple page");
  PN_NEXT("/exceptions/preprocess","preprocess","preprocessing errors");
diff --git a/htdocs/exceptions/preprocess.chtml b/htdocs/exceptions/preprocess.chtml
index 88b8741..e42b102 100644
--- a/htdocs/exceptions/preprocess.chtml
+++ b/htdocs/exceptions/preprocess.chtml
@@ -1,5 +1,6 @@
-% html(); return; /* vim:set ft=sitecing: */
+% /* vim:set ft=sitecing: */
 %%derive layout = "/ancestry/layout.chtml";
+%%pragma main=page
 <%constructor>
  b_strict = false;
  PN_PREV("/exceptions","exceptions","exception handling overview");
diff --git a/htdocs/exceptions/runtime.chtml b/htdocs/exceptions/runtime.chtml
index 1fcd80f..989e89f 100644
--- a/htdocs/exceptions/runtime.chtml
+++ b/htdocs/exceptions/runtime.chtml
@@ -1,5 +1,6 @@
-% html(); return; /* vim:set ft=sitecing: */
+% /* vim:set ft=sitecing: */
 %%derive layout = "/ancestry/layout.chtml";
+%%pragma main=page
 <%constructor>
  b_strict = false;
  PN_PREV("/exceptions/compile","compile-time","compile-time errors");
diff --git a/htdocs/index.chtml b/htdocs/index.chtml
index 20d34c2..76d6d7e 100644
--- a/htdocs/index.chtml
+++ b/htdocs/index.chtml
@@ -1,5 +1,5 @@
-% html(); return; /* vim:set ft=sitecing: */
-%%derive layout = "/ancestry/layout.chtml";
+%%derive layout = "/ancestry/layout.chtml"; /* vim:set ft=sitecing: */
+%%pragma main=page
 <%constructor>
  PN_NEXT("/simple","simple page","building a really simple page");
 </%constructor>
diff --git a/htdocs/quickref/index.chtml b/htdocs/quickref/index.chtml
index d139190..5119723 100644
--- a/htdocs/quickref/index.chtml
+++ b/htdocs/quickref/index.chtml
@@ -1,5 +1,6 @@
-% html(); return; /* vim:set ft=sitecing: */
+% /* vim:set ft=sitecing: */
 %%derive layout = "/ancestry/layout.chtml";
+%%pragma main=page
 <%constructor>
  PN_PREV("/exceptions/runtime","runtime","runtime exceptions");
  PN_NEXT("/quickref/metasyntax","syntax","meta syntax");
diff --git a/htdocs/quickref/metasyntax.chtml b/htdocs/quickref/metasyntax.chtml
index 4efc37c..67186f9 100644
--- a/htdocs/quickref/metasyntax.chtml
+++ b/htdocs/quickref/metasyntax.chtml
@@ -1,5 +1,6 @@
-% html(); return; /* vim:set ft=sitecing: */
+% /* vim:set ft=sitecing: */
 %%derive layout = "/ancestry/layout.chtml";
+%%pragma main=page
 <%constructor>
  PN_PREV("/quickref/","quick reference","quick reference");
  PN_NEXT("/sources","sources","source browser");
diff --git a/htdocs/simple.chtml b/htdocs/simple.chtml
index 845b840..d538b01 100644
--- a/htdocs/simple.chtml
+++ b/htdocs/simple.chtml
@@ -1,5 +1,6 @@
-% html(); return; /* vim:set ft=sitecing: */
+% /* vim:set ft=sitecing: */
 %%derive layout = "/ancestry/layout.chtml";
+%%pragma main=page
 <%constructor>
  b_strict = false;
  PN_PREV("/","overview","introduction to site-C-ing");
diff --git a/htdocs/sources.chtml b/htdocs/sources.chtml
index 8c0c701..268b0e0 100644
--- a/htdocs/sources.chtml
+++ b/htdocs/sources.chtml
@@ -1,6 +1,7 @@
-% html(); return; /* vim:set ft=sitecing: */
+% /* vim:set ft=sitecing: */
 %%derive layout = "/ancestry/layout.chtml";
 %%derive sources = "/ancestry/sources.chtml";
+%%pragma main=page
 <%impl>
  #include <sitecing/sitecing_util.h>
 </%impl>
diff --git a/htdocs/view.chtml b/htdocs/view.chtml
index d885330..f729465 100644
--- a/htdocs/view.chtml
+++ b/htdocs/view.chtml
@@ -1,6 +1,7 @@
-% html(); return; /* vim:set ft=sitecing: */
+% /* vim:set ft=sitecing: */
 %%derive page = "/ancestry/page.chtml";
 %%derive sources = "/ancestry/sources.chtml";
+%%pragma main=page
 <%impl>
  #include <iostream>
  #include <fstream>