taskjuggler 0.0.3 → 0.0.4

data/doc/classes/TaskJuggler/TextParser/TextParserResultArray.html

@@ -99,9 +99,9 @@ containing the results of a repeatable rule.
 
       <div class="name-list">
 
-        <a href="#M000284">&lt;&lt;</a>&nbsp;&nbsp;
+        <a href="#M000546">&lt;&lt;</a>&nbsp;&nbsp;
 
-        <a href="#M000283">new</a>&nbsp;&nbsp;
+        <a href="#M000545">new</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -122,12 +122,12 @@ containing the results of a repeatable rule.
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000283" class="method-detail">
-        <a name="M000283"></a>
+      <div id="method-M000545" class="method-detail">
+        <a name="M000545"></a>
 
         <div class="method-heading">
 
-          <a href="#M000283" class="method-signature">
+          <a href="#M000545" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">()</span>
 
@@ -138,8 +138,8 @@ containing the results of a repeatable rule.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000283-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000283-source">
+            onclick="toggleCode('M000545-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000545-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/TextParser.rb, line 49</span>
 49:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>
@@ -155,12 +155,12 @@ containing the results of a repeatable rule.
       <h3 class="section-bar">Public Instance methods</h3>
 
 
-      <div id="method-M000284" class="method-detail">
-        <a name="M000284"></a>
+      <div id="method-M000546" class="method-detail">
+        <a name="M000546"></a>
 
         <div class="method-heading">
 
-          <a href="#M000284" class="method-signature">
+          <a href="#M000546" class="method-signature">
 
           <span class="method-name">&lt;&lt;</span><span class="method-args">(arg)</span>
 
@@ -178,8 +178,8 @@ Array.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000284-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000284-source">
+            onclick="toggleCode('M000546-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000546-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/TextParser.rb, line 57</span>
 57:       <span class="ruby-keyword kw">def</span> <span class="ruby-operator">&lt;&lt;</span>(<span class="ruby-identifier">arg</span>)

data/doc/classes/TaskJuggler/TextParser/TokenDoc.html

@@ -104,7 +104,7 @@ and a reference to a specific pattern are optional.
 
       <div class="name-list">
 
-        <a href="#M000252">new</a>&nbsp;&nbsp;
+        <a href="#M000577">new</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -167,12 +167,12 @@ and a reference to a specific pattern are optional.
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000252" class="method-detail">
-        <a name="M000252"></a>
+      <div id="method-M000577" class="method-detail">
+        <a name="M000577"></a>
 
         <div class="method-heading">
 
-          <a href="#M000252" class="method-signature">
+          <a href="#M000577" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(name, arg)</span>
 
@@ -188,8 +188,8 @@ Strings that hold the name and textual description of the parser token.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000252-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000252-source">
+            onclick="toggleCode('M000577-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000577-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/TextParser/TokenDoc.rb, line 25</span>
 25:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">arg</span>)

data/doc/classes/TaskJuggler/TextReport.html

@@ -104,13 +104,13 @@ footer and a central text with margin elements left and right.
 
       <div class="name-list">
 
-        <a href="#M000610">generateIntermediateFormat</a>&nbsp;&nbsp;
+        <a href="#M000394">generateIntermediateFormat</a>&nbsp;&nbsp;
 
-        <a href="#M000609">new</a>&nbsp;&nbsp;
+        <a href="#M000393">new</a>&nbsp;&nbsp;
 
-        <a href="#M000612">to_csv</a>&nbsp;&nbsp;
+        <a href="#M000396">to_csv</a>&nbsp;&nbsp;
 
-        <a href="#M000611">to_html</a>&nbsp;&nbsp;
+        <a href="#M000395">to_html</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -181,12 +181,12 @@ footer and a central text with margin elements left and right.
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000609" class="method-detail">
-        <a name="M000609"></a>
+      <div id="method-M000393" class="method-detail">
+        <a name="M000393"></a>
 
         <div class="method-heading">
 
-          <a href="#M000609" class="method-signature">
+          <a href="#M000393" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(report)</span>
 
@@ -197,8 +197,8 @@ footer and a central text with margin elements left and right.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000609-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000609-source">
+            onclick="toggleCode('M000393-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000393-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 24</span>
 24:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">report</span>)
@@ -216,12 +216,12 @@ footer and a central text with margin elements left and right.
       <h3 class="section-bar">Public Instance methods</h3>
 
 
-      <div id="method-M000610" class="method-detail">
-        <a name="M000610"></a>
+      <div id="method-M000394" class="method-detail">
+        <a name="M000394"></a>
 
         <div class="method-heading">
 
-          <a href="#M000610" class="method-signature">
+          <a href="#M000394" class="method-signature">
 
           <span class="method-name">generateIntermediateFormat</span><span class="method-args">()</span>
 
@@ -232,34 +232,36 @@ footer and a central text with margin elements left and right.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000610-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000610-source">
+            onclick="toggleCode('M000394-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000394-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 30</span>
 30:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateIntermediateFormat</span>
-31:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'center'</span>)
-32:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-33:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">20</span>
-34:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">60</span>
-35:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-36:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-value">25</span>
-37:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">75</span>
-38:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+31:       <span class="ruby-keyword kw">super</span>
+32: 
+33:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'center'</span>)
+34:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+35:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">20</span>
+36:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">60</span>
+37:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+38:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-value">25</span>
 39:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">75</span>
-40:           <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">25</span>
-41:         <span class="ruby-keyword kw">else</span>
-42:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">100</span>
-43:         <span class="ruby-keyword kw">end</span>
-44:       <span class="ruby-keyword kw">else</span>
-45:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-46:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">50</span>
-47:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-48:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-value">100</span>
-49:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-50:           <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">100</span>
-51:         <span class="ruby-keyword kw">end</span>
-52:       <span class="ruby-keyword kw">end</span>
-53:     <span class="ruby-keyword kw">end</span>
+40:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+41:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">75</span>
+42:           <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">25</span>
+43:         <span class="ruby-keyword kw">else</span>
+44:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">100</span>
+45:         <span class="ruby-keyword kw">end</span>
+46:       <span class="ruby-keyword kw">else</span>
+47:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+48:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">50</span>
+49:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+50:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-value">100</span>
+51:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+52:           <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">100</span>
+53:         <span class="ruby-keyword kw">end</span>
+54:       <span class="ruby-keyword kw">end</span>
+55:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -267,12 +269,12 @@ footer and a central text with margin elements left and right.
       </div>
 
 
-      <div id="method-M000612" class="method-detail">
-        <a name="M000612"></a>
+      <div id="method-M000396" class="method-detail">
+        <a name="M000396"></a>
 
         <div class="method-heading">
 
-          <a href="#M000612" class="method-signature">
+          <a href="#M000396" class="method-signature">
 
           <span class="method-name">to_csv</span><span class="method-args">()</span>
 
@@ -283,13 +285,13 @@ footer and a central text with margin elements left and right.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000612-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000612-source">
+            onclick="toggleCode('M000396-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000396-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 80</span>
-80:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_csv</span>
-81:       <span class="ruby-keyword kw">nil</span>
-82:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 83</span>
+83:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_csv</span>
+84:       <span class="ruby-keyword kw">nil</span>
+85:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -297,12 +299,12 @@ footer and a central text with margin elements left and right.
       </div>
 
 
-      <div id="method-M000611" class="method-detail">
-        <a name="M000611"></a>
+      <div id="method-M000395" class="method-detail">
+        <a name="M000395"></a>
 
         <div class="method-heading">
 
-          <a href="#M000611" class="method-signature">
+          <a href="#M000395" class="method-signature">
 
           <span class="method-name">to_html</span><span class="method-args">()</span>
 
@@ -313,34 +315,35 @@ footer and a central text with margin elements left and right.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000611-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000611-source">
+            onclick="toggleCode('M000395-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000395-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 55</span>
-55:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_html</span>
-56:       <span class="ruby-identifier">html</span> = []
-57: 
-58:       <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-value str">'header'</span>)
-59:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@lWidth</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-ivar">@cWidth</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-ivar">@rWidth</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-60:         <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">table</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'table'</span>, <span class="ruby-value str">'align'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'center'</span>,
-61:                                         <span class="ruby-value str">'cellspacing'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'1'</span>,
-62:                                         <span class="ruby-value str">'cellpadding'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'2'</span>, <span class="ruby-value str">'width'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'100%'</span>,
-63:                                         <span class="ruby-value str">'class'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'textPageSkel'</span>))
-64:         <span class="ruby-identifier">table</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">tr</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'tr'</span>))
-65: 
-66:         <span class="ruby-node">%w( left center right)</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">i</span><span class="ruby-operator">|</span>
-67:           <span class="ruby-identifier">width</span> = <span class="ruby-identifier">instance_variable_get</span>(<span class="ruby-value str">'@'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">i</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">chr</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'Width'</span>)
-68:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">width</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-69:             <span class="ruby-identifier">tr</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">td</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'td'</span>, <span class="ruby-value str">'width'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;#{width}%&quot;</span>))
-70:             <span class="ruby-identifier">td</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-identifier">i</span>)
-71:           <span class="ruby-keyword kw">end</span>
-72:         <span class="ruby-keyword kw">end</span>
-73: 
-74:       <span class="ruby-keyword kw">end</span>
-75:       <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-value str">'footer'</span>)
+    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 57</span>
+57:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_html</span>
+58:       <span class="ruby-identifier">html</span> = []
+59: 
+60:       <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-value str">'header'</span>)
+61:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@lWidth</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-ivar">@cWidth</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-ivar">@rWidth</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
+62:         <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">table</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'table'</span>, <span class="ruby-value str">'align'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'center'</span>,
+63:                                         <span class="ruby-value str">'cellspacing'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'1'</span>,
+64:                                         <span class="ruby-value str">'cellpadding'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'2'</span>, <span class="ruby-value str">'width'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'100%'</span>,
+65:                                         <span class="ruby-value str">'class'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'textPageSkel'</span>))
+66:         <span class="ruby-identifier">table</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">tr</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'tr'</span>))
+67: 
+68:         <span class="ruby-node">%w( left center right)</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">i</span><span class="ruby-operator">|</span>
+69:           <span class="ruby-identifier">width</span> = <span class="ruby-identifier">instance_variable_get</span>(<span class="ruby-value str">'@'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">i</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">chr</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'Width'</span>)
+70:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">width</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
+71:             <span class="ruby-identifier">tr</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">td</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'td'</span>, <span class="ruby-value str">'width'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;#{width}%&quot;</span>,
+72:                                        <span class="ruby-value str">'style'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'vertical-align:top'</span>))
+73:             <span class="ruby-identifier">td</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">el</span> = <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-identifier">i</span>))
+74:           <span class="ruby-keyword kw">end</span>
+75:         <span class="ruby-keyword kw">end</span>
 76: 
-77:       <span class="ruby-identifier">html</span>
-78:     <span class="ruby-keyword kw">end</span>
+77:       <span class="ruby-keyword kw">end</span>
+78:       <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-value str">'footer'</span>)
+79: 
+80:       <span class="ruby-identifier">html</span>
+81:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 

data/doc/classes/TaskJuggler/TextScanner.html

@@ -104,33 +104,33 @@ file can include an other file.
 
       <div class="name-list">
 
-        <a href="#M000734">addMacro</a>&nbsp;&nbsp;
+        <a href="#M000476">addMacro</a>&nbsp;&nbsp;
 
-        <a href="#M000728">close</a>&nbsp;&nbsp;
+        <a href="#M000470">close</a>&nbsp;&nbsp;
 
-        <a href="#M000737">error</a>&nbsp;&nbsp;
+        <a href="#M000479">error</a>&nbsp;&nbsp;
 
-        <a href="#M000736">expandMacro</a>&nbsp;&nbsp;
+        <a href="#M000478">expandMacro</a>&nbsp;&nbsp;
 
-        <a href="#M000731">fileName</a>&nbsp;&nbsp;
+        <a href="#M000473">fileName</a>&nbsp;&nbsp;
 
-        <a href="#M000729">include</a>&nbsp;&nbsp;
+        <a href="#M000471">include</a>&nbsp;&nbsp;
 
-        <a href="#M000735">macroDefined?</a>&nbsp;&nbsp;
+        <a href="#M000477">macroDefined?</a>&nbsp;&nbsp;
 
-        <a href="#M000739">message</a>&nbsp;&nbsp;
+        <a href="#M000481">message</a>&nbsp;&nbsp;
 
-        <a href="#M000726">new</a>&nbsp;&nbsp;
+        <a href="#M000468">new</a>&nbsp;&nbsp;
 
-        <a href="#M000732">nextToken</a>&nbsp;&nbsp;
+        <a href="#M000474">nextToken</a>&nbsp;&nbsp;
 
-        <a href="#M000727">open</a>&nbsp;&nbsp;
+        <a href="#M000469">open</a>&nbsp;&nbsp;
 
-        <a href="#M000733">returnToken</a>&nbsp;&nbsp;
+        <a href="#M000475">returnToken</a>&nbsp;&nbsp;
 
-        <a href="#M000730">sourceFileInfo</a>&nbsp;&nbsp;
+        <a href="#M000472">sourceFileInfo</a>&nbsp;&nbsp;
 
-        <a href="#M000738">warning</a>&nbsp;&nbsp;
+        <a href="#M000480">warning</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -160,12 +160,12 @@ Class <a href="TextScanner/StreamHandle.html" class="link">TaskJuggler::TextScan
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000726" class="method-detail">
-        <a name="M000726"></a>
+      <div id="method-M000468" class="method-detail">
+        <a name="M000468"></a>
 
         <div class="method-heading">
 
-          <a href="#M000726" class="method-signature">
+          <a href="#M000468" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(masterFile, messageHandler)</span>
 
@@ -185,25 +185,26 @@ messages.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000726-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000726-source">
+            onclick="toggleCode('M000468-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000468-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 146</span>
-146:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">masterFile</span>, <span class="ruby-identifier">messageHandler</span>)
-147:       <span class="ruby-ivar">@masterFile</span> = <span class="ruby-identifier">masterFile</span>
-148:       <span class="ruby-ivar">@messageHandler</span> = <span class="ruby-identifier">messageHandler</span>
-149:       <span class="ruby-comment cmt"># This table contains all macros that may be expanded when found in the</span>
-150:       <span class="ruby-comment cmt"># text.</span>
-151:       <span class="ruby-ivar">@macroTable</span> = <span class="ruby-constant">MacroTable</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">messageHandler</span>)
-152:       <span class="ruby-comment cmt"># This Array stores the currently processed nested files. It's an Array</span>
-153:       <span class="ruby-comment cmt"># of Arrays. The nested Array consists of 3 elements, the @cf,</span>
-154:       <span class="ruby-comment cmt"># @tokenBuffer and the @pos of the file.</span>
-155:       <span class="ruby-ivar">@fileStack</span> = []
-156:       <span class="ruby-comment cmt"># This Array stores the currently processed nested macros.</span>
-157:       <span class="ruby-ivar">@macroStack</span> = []
-158:       <span class="ruby-comment cmt"># In certain situation we want to ignore Macro replacement and this flag</span>
-159:       <span class="ruby-comment cmt"># is set to true.</span>
-160:       <span class="ruby-ivar">@ignoreMacros</span> = <span class="ruby-keyword kw">false</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 145</span>
+145:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">masterFile</span>, <span class="ruby-identifier">messageHandler</span>)
+146:       <span class="ruby-ivar">@masterFile</span> = <span class="ruby-identifier">masterFile</span>
+147:       <span class="ruby-ivar">@messageHandler</span> = <span class="ruby-identifier">messageHandler</span>
+148:       <span class="ruby-comment cmt"># This table contains all macros that may be expanded when found in the</span>
+149:       <span class="ruby-comment cmt"># text.</span>
+150:       <span class="ruby-ivar">@macroTable</span> = <span class="ruby-constant">MacroTable</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">messageHandler</span>)
+151:       <span class="ruby-comment cmt"># This Array stores the currently processed nested files. It's an Array</span>
+152:       <span class="ruby-comment cmt"># of Arrays. The nested Array consists of 3 elements, the @cf,</span>
+153:       <span class="ruby-comment cmt"># @tokenBuffer and the @pos of the file.</span>
+154:       <span class="ruby-ivar">@fileStack</span> = []
+155:       <span class="ruby-comment cmt"># This Array stores the currently processed nested macros.</span>
+156:       <span class="ruby-ivar">@macroStack</span> = []
+157:       <span class="ruby-comment cmt"># In certain situation we want to ignore Macro replacement and this flag</span>
+158:       <span class="ruby-comment cmt"># is set to true.</span>
+159:       <span class="ruby-ivar">@ignoreMacros</span> = <span class="ruby-keyword kw">false</span>
+160:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-keyword kw">false</span>
 161:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -215,12 +216,12 @@ messages.
       <h3 class="section-bar">Public Instance methods</h3>
 
 
-      <div id="method-M000734" class="method-detail">
-        <a name="M000734"></a>
+      <div id="method-M000476" class="method-detail">
+        <a name="M000476"></a>
 
         <div class="method-heading">
 
-          <a href="#M000734" class="method-signature">
+          <a href="#M000476" class="method-signature">
 
           <span class="method-name">addMacro</span><span class="method-args">(macro)</span>
 
@@ -235,13 +236,13 @@ Add a <a href="Macro.html">Macro</a> to the macro translation table.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000734-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000734-source">
+            onclick="toggleCode('M000476-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000476-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 325</span>
-325:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addMacro</span>(<span class="ruby-identifier">macro</span>)
-326:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">add</span>(<span class="ruby-identifier">macro</span>)
-327:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 334</span>
+334:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addMacro</span>(<span class="ruby-identifier">macro</span>)
+335:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">add</span>(<span class="ruby-identifier">macro</span>)
+336:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -249,12 +250,12 @@ Add a <a href="Macro.html">Macro</a> to the macro translation table.
       </div>
 
 
-      <div id="method-M000728" class="method-detail">
-        <a name="M000728"></a>
+      <div id="method-M000470" class="method-detail">
+        <a name="M000470"></a>
 
         <div class="method-heading">
 
-          <a href="#M000728" class="method-signature">
+          <a href="#M000470" class="method-signature">
 
           <span class="method-name">close</span><span class="method-args">()</span>
 
@@ -269,16 +270,18 @@ Finish processing and reset all data structures.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000728-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000728-source">
+            onclick="toggleCode('M000470-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000470-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 180</span>
-180:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
-181:       <span class="ruby-constant">Log</span>.<span class="ruby-identifier">startProgressMeter</span>(<span class="ruby-node">&quot;Reading file #{@masterFile}&quot;</span>)
-182:       <span class="ruby-constant">Log</span>.<span class="ruby-identifier">stopProgressMeter</span>
-183:       <span class="ruby-ivar">@fileStack</span> = []
-184:       <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-185:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 181</span>
+181:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
+182:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@fileNameIsBuffer</span>
+183:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">startProgressMeter</span>(<span class="ruby-node">&quot;Reading file #{@masterFile}&quot;</span>)
+184:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">stopProgressMeter</span>
+185:       <span class="ruby-keyword kw">end</span>
+186:       <span class="ruby-ivar">@fileStack</span> = []
+187:       <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+188:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -286,12 +289,12 @@ Finish processing and reset all data structures.
       </div>
 
 
-      <div id="method-M000737" class="method-detail">
-        <a name="M000737"></a>
+      <div id="method-M000479" class="method-detail">
+        <a name="M000479"></a>
 
         <div class="method-heading">
 
-          <a href="#M000737" class="method-signature">
+          <a href="#M000479" class="method-signature">
 
           <span class="method-name">error</span><span class="method-args">(id, text, property = nil)</span>
 
@@ -306,13 +309,13 @@ Call this function to report any errors related to the parsed input.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000737-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000737-source">
+            onclick="toggleCode('M000479-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000479-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 348</span>
-348:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">error</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span> = <span class="ruby-keyword kw">nil</span>)
-349:       <span class="ruby-identifier">message</span>(<span class="ruby-value str">'error'</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span>)
-350:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 360</span>
+360:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">error</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span> = <span class="ruby-keyword kw">nil</span>)
+361:       <span class="ruby-identifier">message</span>(<span class="ruby-value str">'error'</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span>)
+362:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -320,12 +323,12 @@ Call this function to report any errors related to the parsed input.
       </div>
 
 
-      <div id="method-M000736" class="method-detail">
-        <a name="M000736"></a>
+      <div id="method-M000478" class="method-detail">
+        <a name="M000478"></a>
 
         <div class="method-heading">
 
-          <a href="#M000736" class="method-signature">
+          <a href="#M000478" class="method-signature">
 
           <span class="method-name">expandMacro</span><span class="method-args">(args)</span>
 
@@ -336,22 +339,25 @@ Call this function to report any errors related to the parsed input.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000736-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000736-source">
+            onclick="toggleCode('M000478-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000478-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 334</span>
-334:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">expandMacro</span>(<span class="ruby-identifier">args</span>)
-335:       <span class="ruby-identifier">macro</span>, <span class="ruby-identifier">text</span> = <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">resolve</span>(<span class="ruby-identifier">args</span>, <span class="ruby-identifier">sourceFileInfo</span>)
-336:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">text</span> <span class="ruby-operator">==</span> <span class="ruby-value str">''</span>
-337: 
-338:       <span class="ruby-ivar">@macroStack</span> <span class="ruby-operator">&lt;&lt;</span> [ <span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span> ]
-339:       <span class="ruby-comment cmt"># Mark end of macro with a 0 element</span>
-340:       <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value">0</span>
-341:       <span class="ruby-identifier">text</span>.<span class="ruby-identifier">reverse</span>.<span class="ruby-identifier">each_utf8_char</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">c</span><span class="ruby-operator">|</span>
-342:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-343:       <span class="ruby-keyword kw">end</span>
-344:       <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">line</span> = <span class="ruby-value str">''</span>
-345:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 343</span>
+343:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">expandMacro</span>(<span class="ruby-identifier">args</span>)
+344:       <span class="ruby-identifier">macro</span>, <span class="ruby-identifier">text</span> = <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">resolve</span>(<span class="ruby-identifier">args</span>, <span class="ruby-identifier">sourceFileInfo</span>)
+345:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">text</span> <span class="ruby-operator">==</span> <span class="ruby-value str">''</span>
+346: 
+347:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">length</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">20</span>
+348:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'macro_stack_overflow'</span>, <span class="ruby-value str">&quot;Too many nested macro calls.&quot;</span>)
+349:       <span class="ruby-keyword kw">end</span>
+350:       <span class="ruby-ivar">@macroStack</span> <span class="ruby-operator">&lt;&lt;</span> [ <span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span> ]
+351:       <span class="ruby-comment cmt"># Mark end of macro with a 0 element</span>
+352:       <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value">0</span>
+353:       <span class="ruby-identifier">text</span>.<span class="ruby-identifier">reverse</span>.<span class="ruby-identifier">each_utf8_char</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">c</span><span class="ruby-operator">|</span>
+354:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
+355:       <span class="ruby-keyword kw">end</span>
+356:       <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">line</span> = <span class="ruby-value str">''</span>
+357:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -359,12 +365,12 @@ Call this function to report any errors related to the parsed input.
       </div>
 
 
-      <div id="method-M000731" class="method-detail">
-        <a name="M000731"></a>
+      <div id="method-M000473" class="method-detail">
+        <a name="M000473"></a>
 
         <div class="method-heading">
 
-          <a href="#M000731" class="method-signature">
+          <a href="#M000473" class="method-signature">
 
           <span class="method-name">fileName</span><span class="method-args">()</span>
 
@@ -380,13 +386,13 @@ text buffer, the text will be returned.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000731-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000731-source">
+            onclick="toggleCode('M000473-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000473-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 230</span>
-230:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fileName</span>
-231:       <span class="ruby-ivar">@cf</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">fileName</span> <span class="ruby-operator">:</span> <span class="ruby-ivar">@masterFile</span>
-232:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 234</span>
+234:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fileName</span>
+235:       <span class="ruby-ivar">@cf</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">fileName</span> <span class="ruby-operator">:</span> <span class="ruby-ivar">@masterFile</span>
+236:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -394,12 +400,12 @@ text buffer, the text will be returned.
       </div>
 
 
-      <div id="method-M000729" class="method-detail">
-        <a name="M000729"></a>
+      <div id="method-M000471" class="method-detail">
+        <a name="M000471"></a>
 
         <div class="method-heading">
 
-          <a href="#M000729" class="method-signature">
+          <a href="#M000471" class="method-signature">
 
           <span class="method-name">include</span><span class="method-args">(fileName)</span>
 
@@ -416,42 +422,43 @@ where we started with the new file.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000729-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000729-source">
+            onclick="toggleCode('M000471-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000471-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 190</span>
-190:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">include</span>(<span class="ruby-identifier">fileName</span>)
-191:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">empty?</span>
-192:         <span class="ruby-identifier">path</span> = <span class="ruby-ivar">@masterPath</span>
-193:       <span class="ruby-keyword kw">else</span>
-194:         <span class="ruby-identifier">path</span> = <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">dirname</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span>
-195:         <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>[<span class="ruby-value">1</span>, <span class="ruby-value">2</span>] = [ <span class="ruby-ivar">@tokenBuffer</span>, <span class="ruby-ivar">@pos</span> ]
-196:       <span class="ruby-keyword kw">end</span>
-197:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileName</span>[<span class="ruby-value">0</span>] <span class="ruby-operator">!=</span> <span class="ruby-value str">'/'</span>
-198:         <span class="ruby-comment cmt"># If the included file is not an absolute name, we interpret the file</span>
-199:         <span class="ruby-comment cmt"># name relative to the including file.</span>
-200:         <span class="ruby-identifier">fileName</span> = <span class="ruby-identifier">path</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">fileName</span>
-201:       <span class="ruby-keyword kw">end</span>
-202: 
-203:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-204: 
-205:       <span class="ruby-comment cmt"># Check the current file stack to find recusions.</span>
-206:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@pos</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">fileName</span> <span class="ruby-operator">==</span> <span class="ruby-ivar">@pos</span>.<span class="ruby-identifier">fileName</span>
-207:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'include_recursion'</span>, <span class="ruby-node">&quot;Recursive inclusion of #{fileName} detected&quot;</span>)
-208:       <span class="ruby-keyword kw">else</span>
-209:         <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span>
-210:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileName</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">entry</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">fileName</span>
-211:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'include_recursion'</span>, <span class="ruby-node">&quot;Recursive inclusion of #{fileName} &quot;</span> <span class="ruby-operator">+</span>
-212:                   <span class="ruby-value str">&quot;detected&quot;</span>)
-213:           <span class="ruby-keyword kw">end</span>
-214:         <span class="ruby-keyword kw">end</span>
-215:       <span class="ruby-keyword kw">end</span>
-216:       <span class="ruby-keyword kw">begin</span>
-217:         <span class="ruby-ivar">@fileStack</span> <span class="ruby-operator">&lt;&lt;</span> [ (<span class="ruby-ivar">@cf</span> = <span class="ruby-constant">FileStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>)), <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span> ]
-218:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
-219:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'bad_include'</span>, <span class="ruby-node">&quot;Cannot open include file #{fileName}&quot;</span>)
-220:       <span class="ruby-keyword kw">end</span>
-221:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 193</span>
+193:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">include</span>(<span class="ruby-identifier">fileName</span>)
+194:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileName</span>[<span class="ruby-value">0</span>] <span class="ruby-operator">!=</span> <span class="ruby-value str">'/'</span>
+195:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">empty?</span>
+196:           <span class="ruby-identifier">path</span> = <span class="ruby-ivar">@masterPath</span>
+197:         <span class="ruby-keyword kw">else</span>
+198:           <span class="ruby-identifier">pathOfCallingFile</span> = <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">dirname</span>
+199:           <span class="ruby-identifier">path</span> = <span class="ruby-identifier">pathOfCallingFile</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-value">? </span><span class="ruby-value str">''</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">pathOfCallingFile</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span>
+200:           <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>[<span class="ruby-value">1</span>, <span class="ruby-value">2</span>] = [ <span class="ruby-ivar">@tokenBuffer</span>, <span class="ruby-ivar">@pos</span> ]
+201:         <span class="ruby-keyword kw">end</span>
+202:         <span class="ruby-comment cmt"># If the included file is not an absolute name, we interpret the file</span>
+203:         <span class="ruby-comment cmt"># name relative to the including file.</span>
+204:         <span class="ruby-identifier">fileName</span> = <span class="ruby-identifier">path</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">fileName</span>
+205:       <span class="ruby-keyword kw">end</span>
+206: 
+207:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+208: 
+209:       <span class="ruby-comment cmt"># Check the current file stack to find recusions.</span>
+210:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@pos</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">fileName</span> <span class="ruby-operator">==</span> <span class="ruby-ivar">@pos</span>.<span class="ruby-identifier">fileName</span>
+211:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'include_recursion'</span>, <span class="ruby-node">&quot;Recursive inclusion of #{fileName} detected&quot;</span>)
+212:       <span class="ruby-keyword kw">else</span>
+213:         <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span>
+214:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileName</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">entry</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">fileName</span>
+215:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'include_recursion'</span>, <span class="ruby-node">&quot;Recursive inclusion of #{fileName} &quot;</span> <span class="ruby-operator">+</span>
+216:                   <span class="ruby-value str">&quot;detected&quot;</span>)
+217:           <span class="ruby-keyword kw">end</span>
+218:         <span class="ruby-keyword kw">end</span>
+219:       <span class="ruby-keyword kw">end</span>
+220:       <span class="ruby-keyword kw">begin</span>
+221:         <span class="ruby-ivar">@fileStack</span> <span class="ruby-operator">&lt;&lt;</span> [ (<span class="ruby-ivar">@cf</span> = <span class="ruby-constant">FileStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>)), <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span> ]
+222:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
+223:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'bad_include'</span>, <span class="ruby-node">&quot;Cannot open include file #{fileName}&quot;</span>)
+224:       <span class="ruby-keyword kw">end</span>
+225:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -459,12 +466,12 @@ where we started with the new file.
       </div>
 
 
-      <div id="method-M000735" class="method-detail">
-        <a name="M000735"></a>
+      <div id="method-M000477" class="method-detail">
+        <a name="M000477"></a>
 
         <div class="method-heading">
 
-          <a href="#M000735" class="method-signature">
+          <a href="#M000477" class="method-signature">
 
           <span class="method-name">macroDefined?</span><span class="method-args">(name)</span>
 
@@ -480,13 +487,13 @@ added already.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000735-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000735-source">
+            onclick="toggleCode('M000477-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000477-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 330</span>
-330:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">macroDefined?</span>(<span class="ruby-identifier">name</span>)
-331:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">name</span>)
-332:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 339</span>
+339:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">macroDefined?</span>(<span class="ruby-identifier">name</span>)
+340:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">name</span>)
+341:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -494,12 +501,12 @@ added already.
       </div>
 
 
-      <div id="method-M000739" class="method-detail">
-        <a name="M000739"></a>
+      <div id="method-M000481" class="method-detail">
+        <a name="M000481"></a>
 
         <div class="method-heading">
 
-          <a href="#M000739" class="method-signature">
+          <a href="#M000481" class="method-signature">
 
           <span class="method-name">message</span><span class="method-args">(type, id, text, property)</span>
 
@@ -510,29 +517,29 @@ added already.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000739-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000739-source">
+            onclick="toggleCode('M000481-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000481-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 356</span>
-356:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">message</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span>)
-357:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">empty?</span>
-358:         <span class="ruby-identifier">message</span> = <span class="ruby-constant">Message</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">type</span>, <span class="ruby-identifier">text</span> <span class="ruby-operator">+</span> <span class="ruby-value str">&quot;\n&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">line</span>.<span class="ruby-identifier">to_s</span>,
-359:                               <span class="ruby-identifier">property</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">sourceFileInfo</span>)
-360:         <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">send</span>(<span class="ruby-identifier">message</span>)
-361: 
-362:         <span class="ruby-keyword kw">until</span> <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">empty?</span>
-363:           <span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span> = <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">pop</span>
-364:           <span class="ruby-identifier">args</span>.<span class="ruby-identifier">collect!</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">a</span><span class="ruby-operator">|</span> <span class="ruby-value str">'&quot;'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">a</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'&quot;'</span> }
-365:           <span class="ruby-identifier">message</span> = <span class="ruby-constant">Message</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'macro_stack'</span>, <span class="ruby-value str">'info'</span>,
-366:                                 <span class="ruby-node">&quot;   #{macro.name} #{args.join(' ')}&quot;</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span>,
-367:                                 <span class="ruby-identifier">macro</span>.<span class="ruby-identifier">sourceFileInfo</span>)
-368:           <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">send</span>(<span class="ruby-identifier">message</span>)
-369:         <span class="ruby-keyword kw">end</span>
-370:       <span class="ruby-keyword kw">end</span>
-371: 
-372:       <span class="ruby-comment cmt"># An empty strings signals an already reported error</span>
-373:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">''</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">type</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'error'</span>
-374:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 368</span>
+368:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">message</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span>)
+369:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">empty?</span>
+370:         <span class="ruby-identifier">message</span> = <span class="ruby-constant">Message</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">type</span>, <span class="ruby-identifier">text</span> <span class="ruby-operator">+</span> <span class="ruby-value str">&quot;\n&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">line</span>.<span class="ruby-identifier">to_s</span>,
+371:                               <span class="ruby-identifier">property</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">sourceFileInfo</span>)
+372:         <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">send</span>(<span class="ruby-identifier">message</span>)
+373: 
+374:         <span class="ruby-keyword kw">until</span> <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">empty?</span>
+375:           <span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span> = <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">pop</span>
+376:           <span class="ruby-identifier">args</span>.<span class="ruby-identifier">collect!</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">a</span><span class="ruby-operator">|</span> <span class="ruby-value str">'&quot;'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">a</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'&quot;'</span> }
+377:           <span class="ruby-identifier">message</span> = <span class="ruby-constant">Message</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'macro_stack'</span>, <span class="ruby-value str">'info'</span>,
+378:                                 <span class="ruby-node">&quot;   #{macro.name} #{args.join(' ')}&quot;</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span>,
+379:                                 <span class="ruby-identifier">macro</span>.<span class="ruby-identifier">sourceFileInfo</span>)
+380:           <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">send</span>(<span class="ruby-identifier">message</span>)
+381:         <span class="ruby-keyword kw">end</span>
+382:       <span class="ruby-keyword kw">end</span>
+383: 
+384:       <span class="ruby-comment cmt"># An empty strings signals an already reported error</span>
+385:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">''</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">type</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'error'</span>
+386:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -540,12 +547,12 @@ added already.
       </div>
 
 
-      <div id="method-M000732" class="method-detail">
-        <a name="M000732"></a>
+      <div id="method-M000474" class="method-detail">
+        <a name="M000474"></a>
 
         <div class="method-heading">
 
-          <a href="#M000732" class="method-signature">
+          <a href="#M000474" class="method-signature">
 
           <span class="method-name">nextToken</span><span class="method-args">()</span>
 
@@ -561,73 +568,78 @@ be an Array of the form [ TokenType, TokenValue ].
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000732-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000732-source">
+            onclick="toggleCode('M000474-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000474-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 248</span>
-248:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">nextToken</span>
-249:       <span class="ruby-comment cmt"># If we have a pushed-back token, return that first.</span>
-250:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
-251:         <span class="ruby-identifier">res</span> = <span class="ruby-ivar">@tokenBuffer</span>
-252:         <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-253:         <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@tokenBufferPos</span>
-254:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">res</span>
-255:       <span class="ruby-keyword kw">end</span>
-256: 
-257:       <span class="ruby-comment cmt"># Start processing characters from the input.</span>
-258:       <span class="ruby-identifier">startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-259:       <span class="ruby-identifier">token</span> = [ <span class="ruby-value str">'.'</span>, <span class="ruby-value str">'&lt;END&gt;'</span> ]
-260:       <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>
-261:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">c</span>
-262:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">' '</span>, <span class="ruby-value str">&quot;\n&quot;</span>, <span class="ruby-value str">&quot;\t&quot;</span>
-263:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">tok</span> = <span class="ruby-identifier">readBlanks</span>(<span class="ruby-identifier">c</span>))
-264:             <span class="ruby-identifier">token</span> = <span class="ruby-identifier">tok</span>
-265:             <span class="ruby-keyword kw">break</span>
-266:           <span class="ruby-keyword kw">end</span>
-267:           <span class="ruby-identifier">startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-268:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'#'</span>
-269:           <span class="ruby-identifier">skipComment</span>
-270:           <span class="ruby-identifier">startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-271:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'/'</span>
-272:           <span class="ruby-identifier">skipCPlusPlusComments</span>
-273:           <span class="ruby-identifier">startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-274:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'0'</span><span class="ruby-operator">..</span><span class="ruby-value str">'9'</span>
-275:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readNumber</span>(<span class="ruby-identifier">c</span>)
-276:           <span class="ruby-keyword kw">break</span>
-277:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">&quot;'&quot;</span>
-278:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readString</span>(<span class="ruby-identifier">c</span>)
-279:           <span class="ruby-keyword kw">break</span>
-280:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&quot;'</span>
-281:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readString</span>(<span class="ruby-identifier">c</span>)
-282:           <span class="ruby-keyword kw">break</span>
-283:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'-'</span>
-284:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">handleDash</span>
-285:           <span class="ruby-keyword kw">break</span>
-286:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'!'</span>
-287:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readRelativeId</span>(<span class="ruby-identifier">c</span>)
-288:           <span class="ruby-keyword kw">break</span>
-289:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'a'</span><span class="ruby-operator">..</span><span class="ruby-value str">'z'</span>, <span class="ruby-value str">'A'</span><span class="ruby-operator">..</span><span class="ruby-value str">'Z'</span>, <span class="ruby-value str">'_'</span>
-290:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readId</span>(<span class="ruby-identifier">c</span>)
-291:           <span class="ruby-keyword kw">break</span>
-292:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&lt;'</span>, <span class="ruby-value str">'&gt;'</span>, <span class="ruby-value str">'='</span>
-293:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readOperator</span>(<span class="ruby-identifier">c</span>)
-294:           <span class="ruby-keyword kw">break</span>
-295:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'['</span>
-296:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readMacro</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 252</span>
+252:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">nextToken</span>
+253:       <span class="ruby-comment cmt"># If we have a pushed-back token, return that first.</span>
+254:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
+255:         <span class="ruby-identifier">res</span> = <span class="ruby-ivar">@tokenBuffer</span>
+256:         <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+257:         <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@tokenBufferPos</span>
+258:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">res</span>
+259:       <span class="ruby-keyword kw">end</span>
+260: 
+261:       <span class="ruby-comment cmt"># Start processing characters from the input.</span>
+262:       <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
+263:       <span class="ruby-identifier">token</span> = [ <span class="ruby-value str">'.'</span>, <span class="ruby-value str">'&lt;END&gt;'</span> ]
+264:       <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>
+265:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">c</span>
+266:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">' '</span>, <span class="ruby-value str">&quot;\n&quot;</span>, <span class="ruby-value str">&quot;\t&quot;</span>
+267:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">tok</span> = <span class="ruby-identifier">readBlanks</span>(<span class="ruby-identifier">c</span>))
+268:             <span class="ruby-identifier">token</span> = <span class="ruby-identifier">tok</span>
+269:             <span class="ruby-keyword kw">break</span>
+270:           <span class="ruby-keyword kw">end</span>
+271:           <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
+272:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'#'</span>
+273:           <span class="ruby-identifier">skipComment</span>
+274:           <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
+275:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'/'</span>
+276:           <span class="ruby-identifier">skipCPlusPlusComments</span>
+277:           <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
+278:           <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'0'</span><span class="ruby-operator">..</span><span class="ruby-value str">'9'</span>
+279:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readNumber</span>(<span class="ruby-identifier">c</span>)
+280:           <span class="ruby-keyword kw">break</span>
+281:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">&quot;'&quot;</span>
+282:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readString</span>(<span class="ruby-identifier">c</span>)
+283:           <span class="ruby-keyword kw">break</span>
+284:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&quot;'</span>
+285:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readString</span>(<span class="ruby-identifier">c</span>)
+286:           <span class="ruby-keyword kw">break</span>
+287:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'-'</span>
+288:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">handleDash</span>
+289:           <span class="ruby-keyword kw">break</span>
+290:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'!'</span>
+291:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'='</span>
+292:             <span class="ruby-identifier">token</span> = [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'!='</span> ]
+293:           <span class="ruby-keyword kw">else</span>
+294:             <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
+295:             <span class="ruby-identifier">token</span> = [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'!'</span> ]
+296:           <span class="ruby-keyword kw">end</span>
 297:           <span class="ruby-keyword kw">break</span>
-298:         <span class="ruby-keyword kw">when</span> <span class="ruby-keyword kw">nil</span>
-299:           <span class="ruby-comment cmt"># We've reached an end of file or buffer</span>
+298:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'a'</span><span class="ruby-operator">..</span><span class="ruby-value str">'z'</span>, <span class="ruby-value str">'A'</span><span class="ruby-operator">..</span><span class="ruby-value str">'Z'</span>, <span class="ruby-value str">'_'</span>
+299:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readId</span>(<span class="ruby-identifier">c</span>)
 300:           <span class="ruby-keyword kw">break</span>
-301:         <span class="ruby-keyword kw">else</span>
-302:           <span class="ruby-identifier">str</span> = <span class="ruby-value str">&quot;&quot;</span>
-303:           <span class="ruby-identifier">str</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-304:           <span class="ruby-identifier">token</span> = [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-identifier">str</span> ]
-305:           <span class="ruby-keyword kw">break</span>
-306:         <span class="ruby-keyword kw">end</span>
-307:       <span class="ruby-keyword kw">end</span>
-308:       <span class="ruby-ivar">@pos</span> = <span class="ruby-identifier">startOfToken</span>
-309:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">token</span>
-310:     <span class="ruby-keyword kw">end</span>
+301:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&lt;'</span>, <span class="ruby-value str">'&gt;'</span>, <span class="ruby-value str">'='</span>
+302:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readOperator</span>(<span class="ruby-identifier">c</span>)
+303:           <span class="ruby-keyword kw">break</span>
+304:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'['</span>
+305:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readMacro</span>
+306:           <span class="ruby-keyword kw">break</span>
+307:         <span class="ruby-keyword kw">when</span> <span class="ruby-keyword kw">nil</span>
+308:           <span class="ruby-comment cmt"># We've reached an end of file or buffer</span>
+309:           <span class="ruby-keyword kw">break</span>
+310:         <span class="ruby-keyword kw">else</span>
+311:           <span class="ruby-identifier">str</span> = <span class="ruby-value str">&quot;&quot;</span>
+312:           <span class="ruby-identifier">str</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
+313:           <span class="ruby-identifier">token</span> = [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-identifier">str</span> ]
+314:           <span class="ruby-keyword kw">break</span>
+315:         <span class="ruby-keyword kw">end</span>
+316:       <span class="ruby-keyword kw">end</span>
+317:       <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@startOfToken</span>
+318:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">token</span>
+319:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -635,12 +647,12 @@ be an Array of the form [ TokenType, TokenValue ].
       </div>
 
 
-      <div id="method-M000727" class="method-detail">
-        <a name="M000727"></a>
+      <div id="method-M000469" class="method-detail">
+        <a name="M000469"></a>
 
         <div class="method-heading">
 
-          <a href="#M000727" class="method-signature">
+          <a href="#M000469" class="method-signature">
 
           <span class="method-name">open</span><span class="method-args">(fileNameIsBuffer = false)</span>
 
@@ -656,23 +668,24 @@ Start the processing. if <em>fileNameIsBuffer</em> is true, we operate on a
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000727-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000727-source">
+            onclick="toggleCode('M000469-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000469-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 165</span>
 165:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">open</span>(<span class="ruby-identifier">fileNameIsBuffer</span> = <span class="ruby-keyword kw">false</span>)
-166:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileNameIsBuffer</span>
-167:         <span class="ruby-ivar">@fileStack</span> = [ [ <span class="ruby-ivar">@cf</span> = <span class="ruby-constant">BufferStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@masterFile</span>), <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span> ] ]
-168:       <span class="ruby-keyword kw">else</span>
-169:         <span class="ruby-keyword kw">begin</span>
-170:           <span class="ruby-ivar">@fileStack</span> = [ [ <span class="ruby-ivar">@cf</span> = <span class="ruby-constant">FileStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@masterFile</span>), <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span> ] ]
-171:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
-172:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-node">&quot;Cannot open file #{@masterFile}&quot;</span>
-173:         <span class="ruby-keyword kw">end</span>
-174:       <span class="ruby-keyword kw">end</span>
-175:       <span class="ruby-ivar">@masterPath</span> = <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">dirname</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span>
-176:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@lastPos</span> = <span class="ruby-keyword kw">nil</span>
-177:     <span class="ruby-keyword kw">end</span>
+166:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-identifier">fileNameIsBuffer</span>
+167:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileNameIsBuffer</span>
+168:         <span class="ruby-ivar">@fileStack</span> = [ [ <span class="ruby-ivar">@cf</span> = <span class="ruby-constant">BufferStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@masterFile</span>), <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span> ] ]
+169:       <span class="ruby-keyword kw">else</span>
+170:         <span class="ruby-keyword kw">begin</span>
+171:           <span class="ruby-ivar">@fileStack</span> = [ [ <span class="ruby-ivar">@cf</span> = <span class="ruby-constant">FileStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@masterFile</span>), <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span> ] ]
+172:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
+173:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-node">&quot;Cannot open file #{@masterFile}&quot;</span>
+174:         <span class="ruby-keyword kw">end</span>
+175:       <span class="ruby-keyword kw">end</span>
+176:       <span class="ruby-ivar">@masterPath</span> = <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">dirname</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span>
+177:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@lastPos</span> = <span class="ruby-keyword kw">nil</span>
+178:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -680,12 +693,12 @@ Start the processing. if <em>fileNameIsBuffer</em> is true, we operate on a
       </div>
 
 
-      <div id="method-M000733" class="method-detail">
-        <a name="M000733"></a>
+      <div id="method-M000475" class="method-detail">
+        <a name="M000475"></a>
 
         <div class="method-heading">
 
-          <a href="#M000733" class="method-signature">
+          <a href="#M000475" class="method-signature">
 
           <span class="method-name">returnToken</span><span class="method-args">(token)</span>
 
@@ -701,19 +714,19 @@ token can be returned before the next nextToken() call.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000733-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000733-source">
+            onclick="toggleCode('M000475-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000475-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 314</span>
-314:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">returnToken</span>(<span class="ruby-identifier">token</span>)
-315:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
-316:         <span class="ruby-identifier">$stderr</span>.<span class="ruby-identifier">puts</span> <span class="ruby-ivar">@tokenBuffer</span>
-317:         <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Fatal Error: Cannot return more than 1 token in a row&quot;</span>
-318:       <span class="ruby-keyword kw">end</span>
-319:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-identifier">token</span>
-320:       <span class="ruby-ivar">@tokenBufferPos</span> = <span class="ruby-ivar">@pos</span>
-321:       <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@lastPos</span>
-322:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 323</span>
+323:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">returnToken</span>(<span class="ruby-identifier">token</span>)
+324:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
+325:         <span class="ruby-identifier">$stderr</span>.<span class="ruby-identifier">puts</span> <span class="ruby-ivar">@tokenBuffer</span>
+326:         <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Fatal Error: Cannot return more than 1 token in a row&quot;</span>
+327:       <span class="ruby-keyword kw">end</span>
+328:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-identifier">token</span>
+329:       <span class="ruby-ivar">@tokenBufferPos</span> = <span class="ruby-ivar">@pos</span>
+330:       <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@lastPos</span>
+331:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -721,12 +734,12 @@ token can be returned before the next nextToken() call.
       </div>
 
 
-      <div id="method-M000730" class="method-detail">
-        <a name="M000730"></a>
+      <div id="method-M000472" class="method-detail">
+        <a name="M000472"></a>
 
         <div class="method-heading">
 
-          <a href="#M000730" class="method-signature">
+          <a href="#M000472" class="method-signature">
 
           <span class="method-name">sourceFileInfo</span><span class="method-args">()</span>
 
@@ -742,13 +755,13 @@ processing prosition.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000730-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000730-source">
+            onclick="toggleCode('M000472-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000472-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 224</span>
-224:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">sourceFileInfo</span>
-225:       <span class="ruby-ivar">@pos</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@pos</span>.<span class="ruby-identifier">clone</span> <span class="ruby-operator">:</span> <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-226:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 228</span>
+228:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">sourceFileInfo</span>
+229:       <span class="ruby-ivar">@pos</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@pos</span>.<span class="ruby-identifier">dup</span> <span class="ruby-operator">:</span> <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
+230:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -756,12 +769,12 @@ processing prosition.
       </div>
 
 
-      <div id="method-M000738" class="method-detail">
-        <a name="M000738"></a>
+      <div id="method-M000480" class="method-detail">
+        <a name="M000480"></a>
 
         <div class="method-heading">
 
-          <a href="#M000738" class="method-signature">
+          <a href="#M000480" class="method-signature">
 
           <span class="method-name">warning</span><span class="method-args">(id, text, property = nil)</span>
 
@@ -772,13 +785,13 @@ processing prosition.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000738-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000738-source">
+            onclick="toggleCode('M000480-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000480-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 352</span>
-352:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">warning</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span> = <span class="ruby-keyword kw">nil</span>)
-353:       <span class="ruby-identifier">message</span>(<span class="ruby-value str">'warning'</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span>)
-354:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 364</span>
+364:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">warning</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span> = <span class="ruby-keyword kw">nil</span>)
+365:       <span class="ruby-identifier">message</span>(<span class="ruby-value str">'warning'</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span>)
+366:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>