taskjuggler 0.1.1 → 0.2.0

data/doc/TaskJuggler/TextParser/Scanner/MacroStackEntry.html

@@ -207,12 +207,24 @@
 				
 					<li><a href="../../../TaskJuggler/HTMLGraphics.html">TaskJuggler::HTMLGraphics</a></li>
 				
+					<li><a href="../../../TaskJuggler/ICalReport.html">TaskJuggler::ICalReport</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar.html">TaskJuggler::ICalendar</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar/Component.html">TaskJuggler::ICalendar::Component</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar/Event.html">TaskJuggler::ICalendar::Event</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar/Journal.html">TaskJuggler::ICalendar::Journal</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar/Person.html">TaskJuggler::ICalendar::Person</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar/Todo.html">TaskJuggler::ICalendar::Todo</a></li>
+				
 					<li><a href="../../../TaskJuggler/Interval.html">TaskJuggler::Interval</a></li>
 				
 					<li><a href="../../../TaskJuggler/IntervalList.html">TaskJuggler::IntervalList</a></li>
 				
-					<li><a href="../../../TaskJuggler/IntervalListAttribute.html">TaskJuggler::IntervalListAttribute</a></li>
-				
 					<li><a href="../../../TaskJuggler/JobInfo.html">TaskJuggler::JobInfo</a></li>
 				
 					<li><a href="../../../TaskJuggler/Journal.html">TaskJuggler::Journal</a></li>
@@ -327,6 +339,8 @@
 				
 					<li><a href="../../../TaskJuggler/ReportContext.html">TaskJuggler::ReportContext</a></li>
 				
+					<li><a href="../../../TaskJuggler/ReportScenario.html">TaskJuggler::ReportScenario</a></li>
+				
 					<li><a href="../../../TaskJuggler/ReportServer.html">TaskJuggler::ReportServer</a></li>
 				
 					<li><a href="../../../TaskJuggler/ReportServerIface.html">TaskJuggler::ReportServerIface</a></li>
@@ -385,6 +399,8 @@
 				
 					<li><a href="../../../TaskJuggler/Scoreboard.html">TaskJuggler::Scoreboard</a></li>
 				
+					<li><a href="../../../TaskJuggler/ScoreboardInterval.html">TaskJuggler::ScoreboardInterval</a></li>
+				
 					<li><a href="../../../TaskJuggler/SheetHandlerBase.html">TaskJuggler::SheetHandlerBase</a></li>
 				
 					<li><a href="../../../TaskJuggler/SheetReceiver.html">TaskJuggler::SheetReceiver</a></li>
@@ -431,6 +447,10 @@
 				
 					<li><a href="../../../TaskJuggler/TableReport.html">TaskJuggler::TableReport</a></li>
 				
+					<li><a href="../../../TaskJuggler/TagFile.html">TaskJuggler::TagFile</a></li>
+				
+					<li><a href="../../../TaskJuggler/TagFile/TagFileEntry.html">TaskJuggler::TagFile::TagFileEntry</a></li>
+				
 					<li><a href="../../../TaskJuggler/Task.html">TaskJuggler::Task</a></li>
 				
 					<li><a href="../../../TaskJuggler/TaskDepListAttribute.html">TaskJuggler::TaskDepListAttribute</a></li>
@@ -481,6 +501,10 @@
 				
 					<li><a href="../../../TaskJuggler/TextReport.html">TaskJuggler::TextReport</a></li>
 				
+					<li><a href="../../../TaskJuggler/TimeInterval.html">TaskJuggler::TimeInterval</a></li>
+				
+					<li><a href="../../../TaskJuggler/TimeIntervalListAttribute.html">TaskJuggler::TimeIntervalListAttribute</a></li>
+				
 					<li><a href="../../../TaskJuggler/TimeSheet.html">TaskJuggler::TimeSheet</a></li>
 				
 					<li><a href="../../../TaskJuggler/TimeSheetReceiver.html">TaskJuggler::TimeSheetReceiver</a></li>

data/doc/TaskJuggler/TextParser/Scanner/StreamHandle.html

@@ -225,12 +225,24 @@
 				
 					<li><a href="../../../TaskJuggler/HTMLGraphics.html">TaskJuggler::HTMLGraphics</a></li>
 				
+					<li><a href="../../../TaskJuggler/ICalReport.html">TaskJuggler::ICalReport</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar.html">TaskJuggler::ICalendar</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar/Component.html">TaskJuggler::ICalendar::Component</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar/Event.html">TaskJuggler::ICalendar::Event</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar/Journal.html">TaskJuggler::ICalendar::Journal</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar/Person.html">TaskJuggler::ICalendar::Person</a></li>
+				
+					<li><a href="../../../TaskJuggler/ICalendar/Todo.html">TaskJuggler::ICalendar::Todo</a></li>
+				
 					<li><a href="../../../TaskJuggler/Interval.html">TaskJuggler::Interval</a></li>
 				
 					<li><a href="../../../TaskJuggler/IntervalList.html">TaskJuggler::IntervalList</a></li>
 				
-					<li><a href="../../../TaskJuggler/IntervalListAttribute.html">TaskJuggler::IntervalListAttribute</a></li>
-				
 					<li><a href="../../../TaskJuggler/JobInfo.html">TaskJuggler::JobInfo</a></li>
 				
 					<li><a href="../../../TaskJuggler/Journal.html">TaskJuggler::Journal</a></li>
@@ -345,6 +357,8 @@
 				
 					<li><a href="../../../TaskJuggler/ReportContext.html">TaskJuggler::ReportContext</a></li>
 				
+					<li><a href="../../../TaskJuggler/ReportScenario.html">TaskJuggler::ReportScenario</a></li>
+				
 					<li><a href="../../../TaskJuggler/ReportServer.html">TaskJuggler::ReportServer</a></li>
 				
 					<li><a href="../../../TaskJuggler/ReportServerIface.html">TaskJuggler::ReportServerIface</a></li>
@@ -403,6 +417,8 @@
 				
 					<li><a href="../../../TaskJuggler/Scoreboard.html">TaskJuggler::Scoreboard</a></li>
 				
+					<li><a href="../../../TaskJuggler/ScoreboardInterval.html">TaskJuggler::ScoreboardInterval</a></li>
+				
 					<li><a href="../../../TaskJuggler/SheetHandlerBase.html">TaskJuggler::SheetHandlerBase</a></li>
 				
 					<li><a href="../../../TaskJuggler/SheetReceiver.html">TaskJuggler::SheetReceiver</a></li>
@@ -449,6 +465,10 @@
 				
 					<li><a href="../../../TaskJuggler/TableReport.html">TaskJuggler::TableReport</a></li>
 				
+					<li><a href="../../../TaskJuggler/TagFile.html">TaskJuggler::TagFile</a></li>
+				
+					<li><a href="../../../TaskJuggler/TagFile/TagFileEntry.html">TaskJuggler::TagFile::TagFileEntry</a></li>
+				
 					<li><a href="../../../TaskJuggler/Task.html">TaskJuggler::Task</a></li>
 				
 					<li><a href="../../../TaskJuggler/TaskDepListAttribute.html">TaskJuggler::TaskDepListAttribute</a></li>
@@ -499,6 +519,10 @@
 				
 					<li><a href="../../../TaskJuggler/TextReport.html">TaskJuggler::TextReport</a></li>
 				
+					<li><a href="../../../TaskJuggler/TimeInterval.html">TaskJuggler::TimeInterval</a></li>
+				
+					<li><a href="../../../TaskJuggler/TimeIntervalListAttribute.html">TaskJuggler::TimeIntervalListAttribute</a></li>
+				
 					<li><a href="../../../TaskJuggler/TimeSheet.html">TaskJuggler::TimeSheet</a></li>
 				
 					<li><a href="../../../TaskJuggler/TimeSheetReceiver.html">TaskJuggler::TimeSheetReceiver</a></li>
@@ -762,10 +786,10 @@ enclosing file once the included files has been completely processed.
 					<div class="method-source-code"
 						id="dirname-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 136</span>
-136:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dirname</span>
-137:         <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>
-138:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 145</span>
+145:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dirname</span>
+146:         <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>
+147:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -796,10 +820,10 @@ enclosing file once the included files has been completely processed.
 					<div class="method-source-code"
 						id="eof--source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 132</span>
-132:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">eof?</span>
-133:         <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>
-134:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 141</span>
+141:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">eof?</span>
+142:         <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>
+143:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -816,7 +840,7 @@ enclosing file once the included files has been completely processed.
 				<div class="method-heading">
 				
 					<span class="method-name">injectMacro</span><span
-						class="method-args">(macro, args, text)</span>
+						class="method-args">(macro, args, text, callLength)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -830,16 +854,17 @@ enclosing file once the included files has been completely processed.
 					<div class="method-source-code"
 						id="inject-acro-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 80</span>
-80:       <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>)
-81:         <span class="ruby-identifier">injectText</span>(<span class="ruby-identifier">text</span>)
-82: 
-83:         <span class="ruby-comment cmt"># Simple detection for recursive macro calls.</span>
-84:         <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>
-85: 
-86:         <span class="ruby-ivar">@macroStack</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-constant">MacroStackEntry</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span>, <span class="ruby-identifier">text</span>, <span class="ruby-ivar">@nextMacroEnd</span>)
-87:         <span class="ruby-keyword kw">true</span>
-88:       <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 88</span>
+88:       <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>, <span class="ruby-identifier">callLength</span>)
+89:         <span class="ruby-comment cmt"># We add 3 chars more for the ${}.</span>
+90:         <span class="ruby-identifier">injectText</span>(<span class="ruby-identifier">text</span>, <span class="ruby-identifier">callLength</span>)
+91: 
+92:         <span class="ruby-comment cmt"># Simple detection for recursive macro calls.</span>
+93:         <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>
+94: 
+95:         <span class="ruby-ivar">@macroStack</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-constant">MacroStackEntry</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span>, <span class="ruby-identifier">text</span>, <span class="ruby-ivar">@nextMacroEnd</span>)
+96:         <span class="ruby-keyword kw">true</span>
+97:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -856,7 +881,7 @@ enclosing file once the included files has been completely processed.
 				<div class="method-heading">
 				
 					<span class="method-name">injectText</span><span
-						class="method-args">(text)</span>
+						class="method-args">(text, callLength)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -874,13 +899,21 @@ input stream at the current cursor position.
 						id="inject-ext-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 72</span>
-72:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">injectText</span>(<span class="ruby-identifier">text</span>)
-73:         <span class="ruby-identifier">pos</span> = <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span>
-74:         <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>
-75:         <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>]
-76:         <span class="ruby-ivar">@scanner</span> = <span class="ruby-constant">StringScanner</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@line</span>)
-77:         <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span> = <span class="ruby-identifier">pos</span>
-78:       <span class="ruby-keyword kw">end</span></pre>
+72:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">injectText</span>(<span class="ruby-identifier">text</span>, <span class="ruby-identifier">callLength</span>)
+73:         <span class="ruby-comment cmt"># Current scanner position in _bytes_ form start</span>
+74:         <span class="ruby-identifier">pos</span> = <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span>
+75:         <span class="ruby-comment cmt"># Remove the macro call from the end of the already parsed input.</span>
+76:         <span class="ruby-identifier">preCall</span> = <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pre_match</span>[<span class="ruby-value">0</span><span class="ruby-operator">..</span><span class="ruby-operator">-</span>(<span class="ruby-identifier">callLength</span> <span class="ruby-operator">+</span> <span class="ruby-value">1</span>)]
+77:         <span class="ruby-comment cmt"># Store the end position of the inserted macro in bytes.</span>
+78:         <span class="ruby-ivar">@nextMacroEnd</span> = <span class="ruby-identifier">preCall</span>.<span class="ruby-identifier">bytesize</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">bytesize</span>
+79:         <span class="ruby-comment cmt"># Compose the new @line from the cleaned input, the injected text and</span>
+80:         <span class="ruby-comment cmt"># the remainer of the old @line.</span>
+81:         <span class="ruby-ivar">@line</span> = <span class="ruby-identifier">preCall</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">text</span> <span class="ruby-operator">+</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">post_match</span>
+82:         <span class="ruby-comment cmt"># Start the StringScanner again at the first character of the injected</span>
+83:         <span class="ruby-comment cmt"># text.</span>
+84:         <span class="ruby-ivar">@scanner</span> = <span class="ruby-constant">StringScanner</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@line</span>)
+85:         <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span> = <span class="ruby-identifier">preCall</span>.<span class="ruby-identifier">bytesize</span>
+86:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -913,12 +946,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/taskjuggler/TextParser/Scanner.rb, line 151</span>
-151:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">line</span>
-152:         <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>
-153: 
-154:         <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>)]
-155:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 160</span>
+160:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">line</span>
+161:         <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>
+162: 
+163:         (<span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pre_match</span> <span class="ruby-operator">||</span> <span class="ruby-value str">''</span>) <span class="ruby-operator">+</span> (<span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">matched</span> <span class="ruby-operator">||</span> <span class="ruby-value str">''</span>)
+164:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -951,15 +984,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/taskjuggler/TextParser/Scanner.rb, line 141</span>
-141:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">lineNo</span>
-142:         <span class="ruby-comment cmt"># The IO object counts the lines for us by counting the gets() calls.</span>
-143:         <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>
-144:         <span class="ruby-comment cmt"># If we've just read the LF, we have to add 1. The LF can only be the</span>
-145:         <span class="ruby-comment cmt"># last character of the line.</span>
-146:         <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>
-147:         <span class="ruby-identifier">currentLine</span>
-148:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 150</span>
+150:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">lineNo</span>
+151:         <span class="ruby-comment cmt"># The IO object counts the lines for us by counting the gets() calls.</span>
+152:         <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>
+153:         <span class="ruby-comment cmt"># If we've just read the LF, we have to add 1. The LF can only be the</span>
+154:         <span class="ruby-comment cmt"># last character of the line.</span>
+155:         <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>
+156:         <span class="ruby-identifier">currentLine</span>
+157:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -990,10 +1023,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/taskjuggler/TextParser/Scanner.rb, line 128</span>
-128:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">peek</span>(<span class="ruby-identifier">n</span>)
-129:         <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>
-130:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 137</span>
+137:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">peek</span>(<span class="ruby-identifier">n</span>)
+138:         <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>
+139:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1024,44 +1057,44 @@ Return the number of the currently processed line.
 					<div class="method-source-code"
 						id="scan-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 90</span>
- 90:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">scan</span>(<span class="ruby-identifier">re</span>)
- 91:         <span class="ruby-comment cmt"># We read the file line by line with gets(). If we don't have a line</span>
- 92:         <span class="ruby-comment cmt"># yet or we've reached the end of a line, we get the next one.</span>
- 93:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">||</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">eos?</span>
- 94:           <span class="ruby-keyword kw">if</span> (<span class="ruby-ivar">@line</span> = <span class="ruby-ivar">@stream</span>.<span class="ruby-identifier">gets</span>)
- 95:             <span class="ruby-comment cmt"># Update activity meter about every 1024 lines.</span>
- 96:             <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">activity</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-ivar">@stream</span>.<span class="ruby-identifier">lineno</span> &amp; <span class="ruby-value">0x3FF</span>) <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
- 97:             <span class="ruby-comment cmt"># Check for DOS or Mac end of line signatures.</span>
- 98:             <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@line</span>[<span class="ruby-value">1</span>] <span class="ruby-operator">==</span> <span class="ruby-value">\r\</span>
- 99:               <span class="ruby-comment cmt"># Mac: Convert CR into LF</span>
-100:               <span class="ruby-ivar">@line</span>[<span class="ruby-value">1</span>] = <span class="ruby-value">\n\</span>
-101:             <span class="ruby-keyword kw">elsif</span> <span class="ruby-ivar">@line</span>[<span class="ruby-value">2</span>] <span class="ruby-operator">==</span> <span class="ruby-value">\r\</span>
-102:               <span class="ruby-comment cmt"># DOS: Convert CR+LF into LF</span>
-103:               <span class="ruby-ivar">@line</span> = <span class="ruby-ivar">@line</span>.<span class="ruby-identifier">chomp</span> <span class="ruby-operator">+</span> <span class="ruby-value str">&quot;\n&quot;</span>
-104:             <span class="ruby-keyword kw">end</span>
-105:           <span class="ruby-keyword kw">else</span>
-106:             <span class="ruby-comment cmt"># We've reached the end of the current file.</span>
-107:             <span class="ruby-ivar">@scanner</span> = <span class="ruby-keyword kw">nil</span>
-108:             <span class="ruby-comment cmt"># Return special EOF symbol.</span>
-109:             <span class="ruby-keyword kw">return</span> <span class="ruby-value">:scannerEOF</span>
-110:           <span class="ruby-keyword kw">end</span>
-111:           <span class="ruby-ivar">@scanner</span> = <span class="ruby-constant">StringScanner</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@line</span>)
-112:           <span class="ruby-ivar">@wrapped</span> = <span class="ruby-ivar">@line</span>[<span class="ruby-value">1</span>] <span class="ruby-operator">==</span> <span class="ruby-value">\n\</span>
-113:         <span class="ruby-keyword kw">end</span>
-114:         <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>
-115:         <span class="ruby-comment cmt">#puts &quot;#{re.to_s[0..20]}: [#{token}]&quot;</span>
-116: 
-117:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@nextMacroEnd</span>
-118:           <span class="ruby-identifier">pos</span> = <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span>
-119:           <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>
-120:             <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">pop</span>
-121:             <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>
-122:           <span class="ruby-keyword kw">end</span>
-123:         <span class="ruby-keyword kw">end</span>
-124: 
-125:         <span class="ruby-identifier">token</span>
-126:       <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/taskjuggler/TextParser/Scanner.rb, line 99</span>
+ 99:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">scan</span>(<span class="ruby-identifier">re</span>)
+100:         <span class="ruby-comment cmt"># We read the file line by line with gets(). If we don't have a line</span>
+101:         <span class="ruby-comment cmt"># yet or we've reached the end of a line, we get the next one.</span>
+102:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">||</span> <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">eos?</span>
+103:           <span class="ruby-keyword kw">if</span> (<span class="ruby-ivar">@line</span> = <span class="ruby-ivar">@stream</span>.<span class="ruby-identifier">gets</span>)
+104:             <span class="ruby-comment cmt"># Update activity meter about every 1024 lines.</span>
+105:             <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">activity</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-ivar">@stream</span>.<span class="ruby-identifier">lineno</span> &amp; <span class="ruby-value">0x3FF</span>) <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
+106:             <span class="ruby-comment cmt"># Check for DOS or Mac end of line signatures.</span>
+107:             <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@line</span>[<span class="ruby-value">1</span>] <span class="ruby-operator">==</span> <span class="ruby-value">\r\</span>
+108:               <span class="ruby-comment cmt"># Mac: Convert CR into LF</span>
+109:               <span class="ruby-ivar">@line</span>[<span class="ruby-value">1</span>] = <span class="ruby-value">\n\</span>
+110:             <span class="ruby-keyword kw">elsif</span> <span class="ruby-ivar">@line</span>[<span class="ruby-value">2</span>] <span class="ruby-operator">==</span> <span class="ruby-value">\r\</span>
+111:               <span class="ruby-comment cmt"># DOS: Convert CR+LF into LF</span>
+112:               <span class="ruby-ivar">@line</span> = <span class="ruby-ivar">@line</span>.<span class="ruby-identifier">chomp</span> <span class="ruby-operator">+</span> <span class="ruby-value str">&quot;\n&quot;</span>
+113:             <span class="ruby-keyword kw">end</span>
+114:           <span class="ruby-keyword kw">else</span>
+115:             <span class="ruby-comment cmt"># We've reached the end of the current file.</span>
+116:             <span class="ruby-ivar">@scanner</span> = <span class="ruby-keyword kw">nil</span>
+117:             <span class="ruby-comment cmt"># Return special EOF symbol.</span>
+118:             <span class="ruby-keyword kw">return</span> <span class="ruby-value">:scannerEOF</span>
+119:           <span class="ruby-keyword kw">end</span>
+120:           <span class="ruby-ivar">@scanner</span> = <span class="ruby-constant">StringScanner</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@line</span>)
+121:           <span class="ruby-ivar">@wrapped</span> = <span class="ruby-ivar">@line</span>[<span class="ruby-value">1</span>] <span class="ruby-operator">==</span> <span class="ruby-value">\n\</span>
+122:         <span class="ruby-keyword kw">end</span>
+123:         <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>
+124:         <span class="ruby-comment cmt">#puts &quot;#{re.to_s[0..20]}: [#{token}]&quot;</span>
+125: 
+126:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@nextMacroEnd</span>
+127:           <span class="ruby-identifier">pos</span> = <span class="ruby-ivar">@scanner</span>.<span class="ruby-identifier">pos</span>
+128:           <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>
+129:             <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">pop</span>
+130:             <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>
+131:           <span class="ruby-keyword kw">end</span>
+132:         <span class="ruby-keyword kw">end</span>
+133: 
+134:         <span class="ruby-identifier">token</span>
+135:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>