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,18 +1,18 @@
-% 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;
 </%decl>
 %%impl #include <sitecing/util.h>
 %%impl #include "acconfig.h"
 %%var bool b_svn = false;
 %%var std::string urlPrev;
 %%var std::string descPrev;
 %%var std::string titlePrev;
 %%var std::string urlNext;
 %%var std::string descNext;
 %%var std::string titleNext;
 <%constructor>
  if(strstr(PACKAGE_STRING,"svn"))
   b_svn = true;
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,18 +1,19 @@
-% 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");
  PN_NEXT("/exceptions/runtime","runtime","runtime exceptions");
 </%constructor>
 <%codemethod string title() %>
  return "compile-time exceptions handling";
 </%codemethod>
 <%method void content() %>
  <h1>site-C-ing compile-time exception handling</h1>
  <p>
   Similar to <a href="/exceptions/preprocess">preprocessing exceptions</a>
   there is a wide range of errors you may put into your code which will pass
   through preprocessor and will be caught later at the compile-time.
  </p>
  <p>
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,18 +1,19 @@
-% 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");
 </%constructor>
 <%codemethod string title() %>
  return "exceptions handling";
 </%codemethod>
 <%method void content() %>
  <h1>site-C-ing exception handling</h1>
  <p>
   The purpose of this section is to give an overview of the <em>site-C-ing</em>
   exception handling mechanism. Before the web visitor can see the page each
   site-C-ing component goes through a few stages, namely, preprocessing,
   compiling and execution. Having three stages to go through also means three
   stages one can fail to go through and three exciting opportunities to handle
   different 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,18 +1,19 @@
-% 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");
  PN_NEXT("/exceptions/compile","compile-time","compile-time errors");
 </%constructor>
 <%codemethod string title() %>
  return "preprocessor exceptions handling";
 </%codemethod>
 <%method void content() %>
  <h1>site-C-ing preprocessor exception handling</h1>
  <p>
   It was one of those days when you just can't type right and can't think of
   what you're typing. It is not unusual that, under such circumstances, you end
   up with a code like <a
   href="/view/htdocs/exceptions/development/preprocess.chtml" target="insert"
   title="the link opens in the frame below">this</a> -- by the time you were
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,18 +1,19 @@
-% 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");
  PN_NEXT("/quickref/","quick reference","quick reference");
 </%constructor>
 <%codemethod string title() %>
  return "runtime exceptions handling";
 </%codemethod>
 <%method void content() %>
  <h1>site-C-ing runtime exception handling</h1>
  <p>
   The component may throw an exception while executing and the
   <em>site-C-ing</em> will gladly pass it to the handler component which will
   give the user appropriate output (unless it throws an exception itself, of
   course). Here you will see an example output provided by the handler bundled
   with the <em>site-C-ing</em>.
diff --git a/htdocs/index.chtml b/htdocs/index.chtml
index 20d34c2..76d6d7e 100644
--- a/htdocs/index.chtml
+++ b/htdocs/index.chtml
@@ -1,18 +1,18 @@
-% 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>
 <%codemethod string title() %>
  return "introduction";
 </%codemethod>
 <%method void content() %>
  <h1>introduction to site-C-ing</h1>
  <p>
   This is a sample site, which is supposed to demonstrate <em>site-C-ing</em>
   features. Since the <em>site-C-ing</em> is still at the early stages of
   development or rather proof of concept, this site is also far from being
   complete. I am planning to add more pages as the time permits, though.
  </p>
  <p>
   Once you download and install <a
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,17 +1,18 @@
-% 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");
 </%constructor>
 <%codemethod string title() %>
  return "quick reference";
 </%codemethod>
 <%method void content() %>
  <h1>site-C-ing quick reference</h1>
  <p>
   I am hoping to put together some quick reference documentation here. For now,
   I am adding the <a href="/quickref/metasyntax">component meta-syntax quick
   reference</a>.
  </p>
 </%method>
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,18 +1,19 @@
-% 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");
 </%constructor>
 <%codemethod string title() %>
  return "meta syntax quick reference";
 </%codemethod>
 <%method void content() %>
  <h1>site-C-ing meta syntax quick reference</h1>
 
  <h2>Table of Contents</h2>
 
  <ul class="quickref toc">
   <li><a href="#qr__line">% ...</a></li>
   <li><a href="#qr__inline">&lt;% ... %&gt;</a></li>
   <li><a href="#qr__code">&lt;%code&gt;</a></li>
diff --git a/htdocs/simple.chtml b/htdocs/simple.chtml
index 845b840..d538b01 100644
--- a/htdocs/simple.chtml
+++ b/htdocs/simple.chtml
@@ -1,18 +1,19 @@
-% 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");
  PN_NEXT("/exceptions","exceptions","exception handling overview");
 </%constructor>
 <%codemethod string title() %>
  return "simple page";
 </%codemethod>
 <%method void content() %>
  <h1>building a really simple page</h1>
  <p>
   Building a really simple page is really simple. I will not go into much detail
   here. The example provided should speak for itself.
  </p>
  <p>
   The component being written doesn't do much but show you the calendar for the
diff --git a/htdocs/sources.chtml b/htdocs/sources.chtml
index 8c0c701..268b0e0 100644
--- a/htdocs/sources.chtml
+++ b/htdocs/sources.chtml
@@ -1,19 +1,20 @@
-% 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>
 <%constructor>
  b_strict = false;
  PN_PREV("/quickref/metasyntax","syntax","meta syntax");
 </%constructor>
 <%codemethod string title() %>
  return "runtime exceptions handling";
 </%codemethod>
 <%method void content() %>
  <h1>browse this site sources</h1>
 
  <ul class="sourcebrowser">
 % for(int n=0;n<source_files_count;n++) {
 %  sourcefile_t& sf = source_files[n];
diff --git a/htdocs/view.chtml b/htdocs/view.chtml
index d885330..f729465 100644
--- a/htdocs/view.chtml
+++ b/htdocs/view.chtml
@@ -1,19 +1,20 @@
-% 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>
  using namespace std;
  #include <sitecing/util.h>
  #include <sitecing/sitecing_util.h>
  #include <konforka/exception.h>
  #include "acconfig.h"
 </%impl>
 <%codemethod string title() %>
  return "introduction";
 </%codemethod>
 <%method void body() %>
  <%code>
   string rfile = sitecing::normalize_path(
    sitecing::strip_prefix(__CGI->get_meta("PATH_INFO"),"/view.chtml"),