taskjuggler 0.0.7 → 0.0.8

data/doc/TaskJuggler/TextScanner/BufferStreamHandle.html

@@ -149,12 +149,18 @@
 				
 					<li><a href="../../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -261,7 +267,7 @@
 				
 					<li><a href="../../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -441,6 +447,10 @@
 				
 					<li><a href="../../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>
@@ -586,12 +596,12 @@ operations on Strings.
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 175</span>
-175:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">buffer</span>)
-176:         <span class="ruby-keyword kw">super</span>()
-177:         <span class="ruby-ivar">@stream</span> = <span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">buffer</span>)
-178:         <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing buffer #{buffer[0, 20]} ...&quot;</span>
-179:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 177</span>
+177:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">buffer</span>)
+178:         <span class="ruby-keyword kw">super</span>()
+179:         <span class="ruby-ivar">@stream</span> = <span class="ruby-constant">StringIO</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">buffer</span>)
+180:         <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing buffer #{buffer[0, 20]} ...&quot;</span>
+181:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/TaskJuggler/TextScanner/FileStreamHandle.html

@@ -151,12 +151,18 @@
 				
 					<li><a href="../../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -263,7 +269,7 @@
 				
 					<li><a href="../../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -443,6 +449,10 @@
 				
 					<li><a href="../../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>
@@ -609,14 +619,14 @@ operations on files.
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 157</span>
-157:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">fileName</span>)
-158:         <span class="ruby-keyword kw">super</span>()
-159:         <span class="ruby-ivar">@fileName</span> = <span class="ruby-identifier">fileName</span>.<span class="ruby-identifier">dup</span>.<span class="ruby-identifier">untaint</span>
-160:         <span class="ruby-ivar">@stream</span> = <span class="ruby-identifier">fileName</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'.'</span> <span class="ruby-operator">?</span> <span class="ruby-identifier">$stdin</span> <span class="ruby-operator">:</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@fileName</span>, <span class="ruby-value str">'r'</span>)
-161:         <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{@fileName} ...&quot;</span>
-162:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">startProgressMeter</span>(<span class="ruby-node">&quot;Reading file #{fileName}&quot;</span>)
-163:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 159</span>
+159:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">fileName</span>)
+160:         <span class="ruby-keyword kw">super</span>()
+161:         <span class="ruby-ivar">@fileName</span> = <span class="ruby-identifier">fileName</span>.<span class="ruby-identifier">dup</span>.<span class="ruby-identifier">untaint</span>
+162:         <span class="ruby-ivar">@stream</span> = <span class="ruby-identifier">fileName</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'.'</span> <span class="ruby-operator">?</span> <span class="ruby-identifier">$stdin</span> <span class="ruby-operator">:</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@fileName</span>, <span class="ruby-value str">'r'</span>)
+163:         <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{@fileName} ...&quot;</span>
+164:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">startProgressMeter</span>(<span class="ruby-node">&quot;Reading file #{fileName}&quot;</span>)
+165:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -653,11 +663,11 @@ operations on files.
 					<div class="method-source-code"
 						id="close-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">close</span>
-166:         <span class="ruby-ivar">@stream</span>.<span class="ruby-identifier">close</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@stream</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">$stdin</span>
-167:         <span class="ruby-keyword kw">super</span>
-168:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 167</span>
+167:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
+168:         <span class="ruby-ivar">@stream</span>.<span class="ruby-identifier">close</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@stream</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">$stdin</span>
+169:         <span class="ruby-keyword kw">super</span>
+170:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/TaskJuggler/TextScanner/MacroStackEntry.html

@@ -149,12 +149,18 @@
 				
 					<li><a href="../../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -261,7 +267,7 @@
 				
 					<li><a href="../../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -441,6 +447,10 @@
 				
 					<li><a href="../../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>

data/doc/TaskJuggler/TextScanner/StreamHandle.html

@@ -165,12 +165,18 @@
 				
 					<li><a href="../../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -277,7 +283,7 @@
 				
 					<li><a href="../../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -457,6 +463,10 @@
 				
 					<li><a href="../../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>
@@ -648,13 +658,12 @@ completely processed.
 57:         <span class="ruby-ivar">@fileName</span> = <span class="ruby-keyword kw">nil</span>
 58:         <span class="ruby-ivar">@stream</span> = <span class="ruby-keyword kw">nil</span>
 59:         <span class="ruby-ivar">@line</span> = <span class="ruby-keyword kw">nil</span>
-60:         <span class="ruby-ivar">@pos</span> = <span class="ruby-value">0</span>
-61:         <span class="ruby-ivar">@endPos</span> = <span class="ruby-value">1</span>
-62:         <span class="ruby-ivar">@scanner</span> = <span class="ruby-keyword kw">nil</span>
-63:         <span class="ruby-ivar">@wrapped</span> = <span class="ruby-keyword kw">false</span>
-64:         <span class="ruby-ivar">@macroStack</span> = []
-65:         <span class="ruby-ivar">@nextMacroEnd</span> = <span class="ruby-keyword kw">nil</span>
-66:       <span class="ruby-keyword kw">end</span></pre>
+60:         <span class="ruby-ivar">@endPos</span> = <span class="ruby-value">1</span>
+61:         <span class="ruby-ivar">@scanner</span> = <span class="ruby-keyword kw">nil</span>
+62:         <span class="ruby-ivar">@wrapped</span> = <span class="ruby-keyword kw">false</span>
+63:         <span class="ruby-ivar">@macroStack</span> = []
+64:         <span class="ruby-ivar">@nextMacroEnd</span> = <span class="ruby-keyword kw">nil</span>
+65:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -691,10 +700,10 @@ completely processed.
 					<div class="method-source-code"
 						id="close-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 68</span>
-68:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
-69:         <span class="ruby-ivar">@stream</span> = <span class="ruby-keyword kw">nil</span>
-70:       <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 67</span>
+67:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
+68:         <span class="ruby-ivar">@stream</span> = <span class="ruby-keyword kw">nil</span>
+69:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -725,10 +734,10 @@ completely processed.
 					<div class="method-source-code"
 						id="dirname-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 129</span>
-129:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dirname</span>
-130:         <span class="ruby-ivar">@fileName</span> <span class="ruby-operator">?</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">dirname</span>(<span class="ruby-ivar">@fileName</span>) <span class="ruby-operator">:</span> <span class="ruby-value str">''</span>
-131:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 131</span>
+131:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dirname</span>
+132:         <span class="ruby-ivar">@fileName</span> <span class="ruby-operator">?</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">dirname</span>(<span class="ruby-ivar">@fileName</span>) <span class="ruby-operator">:</span> <span class="ruby-value str">''</span>
+133:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -759,10 +768,10 @@ completely processed.
 					<div class="method-source-code"
 						id="eof--source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 125</span>
-125:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">eof?</span>
-126:         <span class="ruby-ivar">@stream</span>.<span class="ruby-identifier">eof?</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">eos?</span>
-127:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 127</span>
+127:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">eof?</span>
+128:         <span class="ruby-ivar">@stream</span>.<span class="ruby-identifier">eof?</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">eos?</span>
+129:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -793,12 +802,13 @@ completely processed.
 					<div class="method-source-code"
 						id="inject-acro-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 72</span>
-72:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">injectMacro</span>(<span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span>, <span class="ruby-identifier">text</span>)
-73:         <span class="ruby-ivar">@nextMacroEnd</span> = <span class="ruby-ivar">@pos</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">length</span>
-74:         <span class="ruby-ivar">@line</span> = <span class="ruby-ivar">@line</span>[<span class="ruby-value">0</span>, <span class="ruby-ivar">@pos</span>] <span class="ruby-operator">+</span> <span class="ruby-identifier">text</span> <span class="ruby-operator">+</span> <span class="ruby-ivar">@line</span>[<span class="ruby-ivar">@pos</span><span class="ruby-operator">..</span><span class="ruby-value">1</span>]
+    <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 71</span>
+71:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">injectMacro</span>(<span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span>, <span class="ruby-identifier">text</span>)
+72:         <span class="ruby-identifier">pos</span> = <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span>
+73:         <span class="ruby-ivar">@nextMacroEnd</span> = <span class="ruby-identifier">pos</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">length</span>
+74:         <span class="ruby-ivar">@line</span> = <span class="ruby-ivar">@line</span>[<span class="ruby-value">0</span>, <span class="ruby-identifier">pos</span>] <span class="ruby-operator">+</span> <span class="ruby-identifier">text</span> <span class="ruby-operator">+</span> <span class="ruby-ivar">@line</span>[<span class="ruby-identifier">pos</span><span class="ruby-operator">..</span><span class="ruby-value">1</span>]
 75:         <span class="ruby-ivar">@scanner</span> = <span class="ruby-constant">StringScanner</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@line</span>)
-76:         <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span> = <span class="ruby-ivar">@pos</span>
+76:         <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span> = <span class="ruby-identifier">pos</span>
 77: 
 78:         <span class="ruby-comment cmt"># Simple detection for recursive macro calls.</span>
 79:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <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>
@@ -838,12 +848,12 @@ Return the already processed part of the current line.
 					<div class="method-source-code"
 						id="line-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 144</span>
-144:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">line</span>
-145:         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">''</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@line</span>
-146: 
-147:         <span class="ruby-ivar">@line</span>[<span class="ruby-value">0</span><span class="ruby-operator">..</span>(<span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span> <span class="ruby-operator">-</span> <span class="ruby-value">1</span>)]
-148:       <span class="ruby-keyword kw">end</span></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">line</span>
+147:         <span class="ruby-keyword kw">return</span> <span class="ruby-value str">''</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@line</span>
+148: 
+149:         <span class="ruby-ivar">@line</span>[<span class="ruby-value">0</span><span class="ruby-operator">..</span>(<span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span> <span class="ruby-operator">-</span> <span class="ruby-value">1</span>)]
+150:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -876,15 +886,15 @@ Return the number of the currently processed line.
 					<div class="method-source-code"
 						id="line-o-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 134</span>
-134:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">lineNo</span>
-135:         <span class="ruby-comment cmt"># The IO object counts the lines for us by counting the gets() calls.</span>
-136:         <span class="ruby-identifier">currentLine</span> = <span class="ruby-ivar">@stream</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@scanner</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@stream</span>.<span class="ruby-identifier">lineno</span> <span class="ruby-operator">:</span> <span class="ruby-value">1</span>
-137:         <span class="ruby-comment cmt"># If we've just read the LF, we have to add 1. The LF can only be the</span>
-138:         <span class="ruby-comment cmt"># last character of the line.</span>
-139:         <span class="ruby-identifier">currentLine</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@wrapped</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@line</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@scanner</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">eos?</span>
-140:         <span class="ruby-identifier">currentLine</span>
-141:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 136</span>
+136:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">lineNo</span>
+137:         <span class="ruby-comment cmt"># The IO object counts the lines for us by counting the gets() calls.</span>
+138:         <span class="ruby-identifier">currentLine</span> = <span class="ruby-ivar">@stream</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@scanner</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@stream</span>.<span class="ruby-identifier">lineno</span> <span class="ruby-operator">:</span> <span class="ruby-value">1</span>
+139:         <span class="ruby-comment cmt"># If we've just read the LF, we have to add 1. The LF can only be the</span>
+140:         <span class="ruby-comment cmt"># last character of the line.</span>
+141:         <span class="ruby-identifier">currentLine</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@wrapped</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@line</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@scanner</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">eos?</span>
+142:         <span class="ruby-identifier">currentLine</span>
+143:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -915,10 +925,10 @@ Return the number of the currently processed line.
 					<div class="method-source-code"
 						id="peek-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 121</span>
-121:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">peek</span>(<span class="ruby-identifier">n</span>)
-122:         <span class="ruby-ivar">@scanner</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">peek</span>(<span class="ruby-identifier">n</span>) <span class="ruby-operator">:</span> <span class="ruby-keyword kw">nil</span>
-123:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 123</span>
+123:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">peek</span>(<span class="ruby-identifier">n</span>)
+124:         <span class="ruby-ivar">@scanner</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">peek</span>(<span class="ruby-identifier">n</span>) <span class="ruby-operator">:</span> <span class="ruby-keyword kw">nil</span>
+125:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -977,14 +987,16 @@ Return the number of the currently processed line.
 109:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">token</span> = <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">scan</span>(<span class="ruby-identifier">re</span>)).<span class="ruby-identifier">nil?</span>
 110:         <span class="ruby-comment cmt">#puts &quot;#{re.to_s[0..20]}: [#{token}]&quot;</span>
 111: 
-112:         <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span>
-113:         <span class="ruby-keyword kw">while</span> <span class="ruby-ivar">@nextMacroEnd</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@nextMacroEnd</span> <span class="ruby-operator">&lt;</span> <span class="ruby-ivar">@pos</span>
-114:           <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">pop</span>
-115:           <span class="ruby-ivar">@nextMacroEnd</span> = <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-operator">?</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-operator">:</span> <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">last</span>.<span class="ruby-identifier">endPos</span>
-116:         <span class="ruby-keyword kw">end</span>
-117: 
-118:         <span class="ruby-identifier">token</span>
-119:       <span class="ruby-keyword kw">end</span></pre>
+112:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@nextMacroEnd</span>
+113:           <span class="ruby-identifier">pos</span> = <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span>
+114:           <span class="ruby-keyword kw">while</span> <span class="ruby-ivar">@nextMacroEnd</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@nextMacroEnd</span> <span class="ruby-operator">&lt;</span> <span class="ruby-identifier">pos</span>
+115:             <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">pop</span>
+116:             <span class="ruby-ivar">@nextMacroEnd</span> = <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-operator">?</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-operator">:</span> <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">last</span>.<span class="ruby-identifier">endPos</span>
+117:           <span class="ruby-keyword kw">end</span>
+118:         <span class="ruby-keyword kw">end</span>
+119: 
+120:         <span class="ruby-identifier">token</span>
+121:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/TaskJuggler/TimeSheet.html

@@ -173,12 +173,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -285,7 +291,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -465,6 +471,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>

data/doc/TaskJuggler/TimeSheetReceiver.html

@@ -149,12 +149,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -261,7 +267,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -441,6 +447,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>