Fixed a few issues with examples.

Foml.php

@@ -29,12 +29,10 @@ static function GeneratePhp($Template)
     // and return a temporary filename instead of a string.
     static function GenerateXslFo($Template, $Args=null)
     {
-        //Dump($_php); exit;
         ob_start();
         Foml::RenderFoml($Template, $Args);
         $xslFo = ob_get_contents();
         ob_end_clean();
-        //Dump($xslFo); exit;
         return $xslFo;
     }
 

FomlDoc.php

@@ -1,10 +1,15 @@
 <?php
 class FomlDoc extends FomlNode
 {
+    public $state;
 
-    function RenderToString()
+    function __construct()
     {
         $this->state = new FomlRenderState();
+    }
+
+    function RenderToString()
+    {
         ob_start();
         $this->Render();
         $output = ob_get_contents();

FomlFilter.php

@@ -3,6 +3,19 @@ class FomlFilter
 {
     public $children = array();
 
+    // $Node is an instance of parent FomlFilterNode.
+    // it is important because it contains a FomlRenderState 
+    // instance that indicates the current output mode of this
+    // document.
+
+    // REVISIT - this expression should be evaluated 
+    // in the eval context where all variables are available.
+    function __construct($Node, $Arg)
+    {
+        $this->node = $Node;
+        $this->arg = $Arg;
+    }
+
     function RenderPrefix()
     {
     }

FomlFilterNode.php

@@ -17,7 +17,7 @@ function __construct($Matches)
         if (isset(FomlParser::$FILTER_CLASSES[$filter]))
         {
             $filterClass = FomlParser::$FILTER_CLASSES[$filter];
-            $this->filter  = new $filterClass($args);
+            $this->filter  = new $filterClass($this, $args);
         } else {
             throw new FomlException("Unknown filter '{$filter}'");
         }

FomlIncludeFilter.php

@@ -3,20 +3,13 @@ class FomlIncludeFilter extends FomlFilter
 {
     public $args;
 
-    function __construct($Args)
-    {
-        // REVISIT - this expression should be evaluated 
-        // in the eval context where all variables are available.
-        $this->args = $Args;
-    }
-
     function RenderPrefix()
     {
         // REVISIT : can't just print the PHP here because we are
         // called from within the eval context.  However doing it this
         // way hides all of the variables, which might be a problem.
-        $fileName = eval("return {$this->args};");
-        eval('?'.'>'. FomlParser::ParseFile($fileName));
+        $fileName = eval("return {$this->arg};");
+        eval('?'.'>'. FomlParser::ParseFile($fileName, $this->node->state));
     }
 }
 

FomlNamespaceFilter.php

@@ -3,8 +3,9 @@ class FomlNamespaceFilter extends FomlFilter
 {
     public $namespace;
 
-    function __construct($Arg)
+    function __construct($Arg, $Node)
     {
+        parent::__construct($Arg, $Node);
         $this->namespace = $Arg;
     }
 

FomlParser.php

@@ -17,16 +17,17 @@ class FomlParser
                                    );
 
     // returns a FomlDocument instance
-    static function ParseFile($FileName)
+    static function ParseFile($FileName, $State=null)
     {
         $foml = file_get_contents($FileName);
-        return FomlParser::ParseString($foml);
+        return FomlParser::ParseString($foml, $State);
     }
 
-    static function ParseString($Foml)
+    static function ParseString($Foml, $State)
     {
         $tree = FomlParseTree::Parse($Foml);
         $doc = $tree->Generate();
+        if ($State) $doc->state = $State;  // for subdocuments, pass the parent document state along
         return $doc->RenderToString();  // returns php code
     }
 }

examples/Sampler.php

@@ -5,6 +5,14 @@
 Foml::$keepTempFiles = false;
 $debug = false;
 
+// debugging preformatted recursive dump
+function Dump($Var)
+{
+    print "<pre>";
+    print_r($Var);
+    print "</pre>";
+}
+
 if (!$debug) {
     Foml::RenderInline("foml/Sampler.foml");
  } else {

examples/foml/Sampler.foml

@@ -24,8 +24,8 @@
         -#----------------------------------------
         -# plain text
         -#----------------------------------------
-        / This should not appear in the output
-          and neither should this.
+        / This should be embedded as XML comments in the output
+          and so should this indented continuation.
 
         FOML Sampler