taskjuggler 3.4.0 → 3.5.0

data/lib/taskjuggler/TextParser/Rule.rb

@@ -3,7 +3,7 @@
 #
 # = Rule.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -53,6 +53,11 @@ class TaskJuggler::TextParser
       @patterns << pattern
     end
 
+    def include?(token)
+      @patterns.each { |p| return true if p[0][1] == token }
+      false
+    end
+
     # Mark the rule as an optional element of the syntax.
     def setOptional
       @optional = true

data/lib/taskjuggler/TextParser/Scanner.rb

@@ -3,7 +3,7 @@
 #
 # = Scanner.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TextParser/SourceFileInfo.rb

@@ -3,7 +3,7 @@
 #
 # = SourceFileInfo.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TextParser/StackElement.rb

@@ -3,7 +3,7 @@
 #
 # = StackElement.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TextParser/State.rb

@@ -3,7 +3,7 @@
 #
 # = State.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TextParser/TokenDoc.rb

@@ -3,7 +3,7 @@
 #
 # = TokenDoc.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TimeSheetReceiver.rb

@@ -3,7 +3,7 @@
 #
 # = TimeSheetReceiver.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TimeSheetSender.rb

@@ -3,7 +3,7 @@
 #
 # = TimeSheetSender.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TimeSheetSummary.rb

@@ -3,7 +3,7 @@
 #
 # = TimeSheetSummary.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TimeSheets.rb

@@ -3,7 +3,7 @@
 #
 # = TimeSheets.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/Tj3AppBase.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3AppBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -11,7 +11,6 @@
 # published by the Free Software Foundation.
 #
 
-require 'rubygems'
 require 'optparse'
 require 'term/ansicolor'
 require 'taskjuggler/Tj3Config'
@@ -163,6 +162,8 @@ EOT
                 "#{'*' * 79}\nYou have triggered a bug in " +
                 "#{AppConfig.softwareName} version #{AppConfig.version}!\n" +
                 "Please see the user manual on how to get this bug fixed!\n" +
+                "http://www.taskjuggler.org/tj3/manual/Reporting_Bugs.html#" +
+                "Reporting_Bugs_and_Feature_Requests\n" +
                 "#{'*' * 79}\n")
         end
       end

data/lib/taskjuggler/Tj3Config.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3Config.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -14,11 +14,11 @@
 require 'taskjuggler/UTF8String'
 require 'taskjuggler/AppConfig'
 
-AppConfig.version = '3.4.0'
+AppConfig.version = '3.5.0'
 AppConfig.packageName = 'taskjuggler'
 AppConfig.softwareName = 'TaskJuggler'
 AppConfig.packageInfo = 'A Project Management Software'
-AppConfig.copyright = [ (2006..2012).to_a ]
+AppConfig.copyright = [ (2006..2013).to_a ]
 AppConfig.authors = [ 'Chris Schlaeger <chris@linux.com>' ]
 AppConfig.contact = 'http://www.taskjuggler.org'
 AppConfig.license = <<'EOT'

data/lib/taskjuggler/Tj3SheetAppBase.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3SheetAppBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TjException.rb

@@ -3,7 +3,7 @@
 #
 # = TjException.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TjTime.rb

@@ -3,7 +3,7 @@
 #
 # = TjTime.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@ class TaskJuggler
   # time zones.
   class TjTime
 
-    attr_reader :time, :timeZone
+    attr_reader :time
 
     # The number of days per month. Leap years are taken care of separately.
     MON_MAX = [ 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ]
@@ -40,17 +40,13 @@ class TaskJuggler
     # is a Time object it's assumed to be in local time. If it's a string, it
     # is parsed as a date. Or else it is interpreted as seconds after Epoch.
     def initialize(t = nil)
-      @timeZone = @@tz
-
       case t
       when nil
         @time = Time.now
       when Time
         @time = t
-        @timeZone = nil
       when TjTime
         @time = t.time
-        @timeZone = nil
       when String
         parse(t)
       when Array
@@ -367,16 +363,18 @@ class TaskJuggler
 
     # This function is just a wrapper around Time.strftime(). In case @time is
     # nil, it returns 'unkown'.
-    def to_s(format = nil)
+    def to_s(format = nil, tz = nil)
       return 'unknown' if @time.nil?
+
+      t = tz == 'UTC' ? gmtime : localtime
       if format.nil?
         fmt = '%Y-%m-%d-%H:%M' + (@time.sec == 0 ? '' : ':%S') + '-%z'
       else
         # Handle TJ specific extensions to the strftime format.
-        fmt = format.sub(/%Q/, "#{((localtime.mon - 1) / 3) + 1}")
+        fmt = format.sub(/%Q/, "#{((t.mon - 1) / 3) + 1}")
       end
       # Always report values in local timezone
-      localtime.strftime(fmt)
+      t.strftime(fmt)
     end
 
     # Return the seconds since Epoch.
@@ -515,7 +513,6 @@ class TaskJuggler
                                  "(0 - 59) but is #{tzMinute}"
         end
         @time += sign * (tzHour * 3600 + tzMinute * 60)
-        @timeZone = 'UTC'
       else
         @time = Time.mktime(year, month, day, hour, minute, second)
       end
@@ -550,9 +547,17 @@ class TaskJuggler
       end
     end
 
-    def localtime
-      return @time if @timeZone == @@tz
+    def gmtime
+      if @time.utc?
+        # @time is already in the right zone (UTC)
+        @time
+      else
+        # To convert a Time object from local time to UTC.
+        @time.dup.gmtime
+      end
+    end
 
+    def localtime
       if @time.utc?
         if @@tz == 'UTC'
           # @time is already in the right zone (UTC)

data/lib/taskjuggler/TjpExample.rb

@@ -3,7 +3,7 @@
 #
 # = TjpExample.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TjpSyntaxRules.rb

@@ -3,7 +3,7 @@
 #
 # = TjpSyntaxRules.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -130,24 +130,24 @@ EOT
 
   def rule_accountReportHeader
     pattern(%w( _accountreport !optionalID !reportName ), lambda {
-      newReport(@val[1], @val[2], :accountreport, @sourceFileInfo[0])
-
-      unless @property.modified?('columns')
-        # Set the default columns for this report.
-        %w( bsi name monthly ).each do |col|
-          @property.get('columns') <<
-          TableColumnDefinition.new(col, columnTitle(col))
+      newReport(@val[1], @val[2], :accountreport, @sourceFileInfo[0]) do
+        unless @property.modified?('columns')
+          # Set the default columns for this report.
+          %w( bsi name monthly ).each do |col|
+            @property.get('columns') <<
+            TableColumnDefinition.new(col, columnTitle(col))
+          end
+        end
+        # Show all accounts, sorted by tree, seqno-up.
+        unless @property.modified?('hideAccount')
+          @property.set('hideAccount',
+                        LogicalExpression.new(LogicalOperation.new(0)))
+        end
+        unless @property.modified?('sortAccounts')
+          @property.set('sortAccounts',
+                        [ [ 'tree', true, -1 ],
+                          [ 'seqno', true, -1 ] ])
         end
-      end
-      # Show all accounts, sorted by tree, seqno-up.
-      unless @property.modified?('hideAccount')
-        @property.set('hideAccount',
-                      LogicalExpression.new(LogicalOperation.new(0)))
-      end
-      unless @property.modified?('sortAccounts')
-        @property.set('sortAccounts',
-                      [ [ 'tree', true, -1 ],
-                        [ 'seqno', true, -1 ] ])
       end
     })
   end
@@ -164,11 +164,7 @@ EOT
     example('AccountReport')
 
     pattern(%w( _credits !accountCredits ), lambda {
-      begin
-        @property['credits', @scenarioIdx] += @val[1]
-      rescue AttributeOverwrite
-        # Adding multiple credits for an account is a pretty common idiom.
-      end
+      @property['credits', @scenarioIdx] += @val[1]
     })
     doc('credits', <<'EOT'
 Book the specified amounts to the account at the specified date. The
@@ -232,13 +228,7 @@ EOT
   def rule_allocate
     pattern(%w( _allocate !allocations ), lambda {
       checkContainer('allocate')
-      # Don't use << operator here so the 'provided' flag gets set properly.
-      begin
-        @property['allocate', @scenarioIdx] =
-          @property['allocate', @scenarioIdx] + @val[1]
-      rescue AttributeOverwrite
-        # Adding multiple allocates for a task is a pretty common idiom.
-      end
+      @property['allocate', @scenarioIdx] += @val[1]
     })
     doc('allocate', <<'EOT'
 Specify which resources should be allocated to the task. The
@@ -745,9 +735,9 @@ EOT
     })
     doc('cellcolor.column', <<'EOT'
 Specifies an alternative background color for the cells of this column. The
-logical expression specifies for which cells the color should be used. If
-multiple cellcolor patterns are provided for a column, the first
-matching one is used for each cell.
+[[logicalexpression|logical expression]] specifies for which cells the color
+should be used. If multiple cellcolor patterns are provided for a column, the
+first matching one is used for each cell.
 EOT
        )
 
@@ -769,9 +759,9 @@ EOT
     })
     doc('fontcolor.column', <<'EOT'
 Specifies an alternative font color for the cells of this column. The
-logical expression specifies for which cells the color should be used. If
-multiple fontcolor patterns are provided for a column, the first
-matching one is used for each cell.
+[[logicalexpression|logical expression]] specifies for which cells the color
+should be used. If multiple fontcolor patterns are provided for a column, the
+first matching one is used for each cell.
 EOT
        )
 
@@ -780,10 +770,10 @@ EOT
         CellSettingPattern.new(@val[2], @val[1]))
     })
     doc('halign.column', <<'EOT'
-Specifies the horizontal alignment of the cell content. The logical expression
-specifies for which cells the alignment setting should be used. If multiple
-halign patterns are provided for a column, the first matching one is used for
-each cell.
+Specifies the horizontal alignment of the cell content. The
+[[logicalexpression|logical expression]] specifies for which cells the alignment
+setting should be used. If multiple halign patterns are provided for a column,
+the first matching one is used for each cell.
 EOT
        )
 
@@ -876,9 +866,10 @@ EOT
     doc('tooltip.column', <<'EOT'
 Specifies an alternative content for the tooltip. This will replace the
 original content of the tooltip that would be available for columns with text
-that does not fit the column with.  The logical expression specifies for which
-cells the text should be used. If multiple tooltip patterns are provided for a
-column, the first matching one is taken for each cell.
+that does not fit the column with.  The [[logicalexpression|logical expression]]
+specifies for which cells the text should be used. If multiple tooltip
+patterns are provided for a column, the first matching one is taken for each
+cell.
 EOT
        )
     arg(2, 'text', <<'EOT'
@@ -891,11 +882,12 @@ EOT
       @column.width = @val[1]
     })
     doc('width.column', <<'EOT'
-Specifies the width of the column in screen pixels. If the content of the
-column does not fit into this width, it will be cut off. In some cases a
+Specifies the maximum width of the column in screen pixels. If the content of
+the column does not fit into this width, it will be cut off. In some cases a
 scrollbar is added or a tooltip window with the complete content is shown when
 the mouse is moved over the column. The latter is only supported in
-interactive output formats.
+interactive output formats. The resulting column width may be smaller if the
+column has a fixed width (e. g. the chart column).
 EOT
        )
   end
@@ -954,6 +946,9 @@ This is result in a date 2 weeks earlier than the current (or specified) date.
 See [[duration]] for a complete list of supported time intervals. Don't forget
 to put at least one space character after the date to prevent TaskJuggler from
 interpreting the interval as an hour.
+
+Date attributes may be invalid in some cases. This needs special care in
+[[logicalexpression|logical expressions]].
 EOT
        )
   end
@@ -1209,31 +1204,33 @@ EOT
 
   def rule_exportHeader
     pattern(%w( _export !optionalID $STRING ), lambda {
-      newReport(@val[1], @val[2], :export, @sourceFileInfo[0])
-      unless @property.modified?('formats')
-        @property.set('formats', [ :tjp ])
-      end
+      newReport(@val[1], @val[2], :export, @sourceFileInfo[0]) do
+        unless @property.modified?('formats')
+          @property.set('formats', [ :tjp ])
+        end
 
-      # By default, we export all scenarios.
-      unless @property.modified?('scenarios')
-        scenarios = Array.new(@project.scenarios.items) { |i| i }
-        scenarios.delete_if { |sc| !@project.scenario(sc).get('active') }
-        @property.set('scenarios', scenarios)
-      end
-      # Show all tasks, sorted by seqno-up.
-      unless @property.modified?('hideTask')
-        @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      end
-      unless @property.modified?('sortTasks')
-        @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
-      end
-      # Show all resources, sorted by seqno-up.
-      unless @property.modified?('hideResource')
-        @property.set('hideResource',
-                      LogicalExpression.new(LogicalOperation.new(0)))
-      end
-      unless @property.modified?('sortResources')
-        @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
+        # By default, we export all scenarios.
+        unless @property.modified?('scenarios')
+          scenarios = Array.new(@project.scenarios.items) { |i| i }
+          scenarios.delete_if { |sc| !@project.scenario(sc).get('active') }
+          @property.set('scenarios', scenarios)
+        end
+        # Show all tasks, sorted by seqno-up.
+        unless @property.modified?('hideTask')
+          @property.set('hideTask',
+                        LogicalExpression.new(LogicalOperation.new(0)))
+        end
+        unless @property.modified?('sortTasks')
+          @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
+        end
+        # Show all resources, sorted by seqno-up.
+        unless @property.modified?('hideResource')
+          @property.set('hideResource',
+                        LogicalExpression.new(LogicalOperation.new(0)))
+        end
+        unless @property.modified?('sortResources')
+          @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
+        end
       end
     })
     arg(2, 'file name', <<'EOT'
@@ -1263,6 +1260,28 @@ EOT
     })
     doc('date.extend', <<'EOT'
 Extend the property with a new attribute of type date.
+EOT
+       )
+    arg(2, 'name', 'The name of the new attribute. It is used as header ' +
+                   'in report columns and the like.')
+
+    pattern(%w( _number !extendId  $STRING !extendOptionsBody ), lambda {
+      # Extend the propertySet definition and parser rules
+      if extendPropertySetDefinition(FloatAttribute, nil)
+        @ruleToExtendWithScenario.addPattern(TextParser::Pattern.new(
+          [ '_' + @val[1], '!number' ], lambda {
+            @property[@val[0], @scenarioIdx] = @val[1]
+          }))
+      else
+        @ruleToExtend.addPattern(TextParser::Pattern.new(
+          [ '_' + @val[1], '!number' ], lambda {
+            @property.set(@val[0], @val[1])
+          }))
+      end
+    })
+    doc('number.extend', <<'EOT'
+Extend the property with a new attribute of type number. Possible values for
+this attribute could be integer or floating point numbers.
 EOT
        )
     arg(2, 'name', 'The name of the new attribute. It is used as header ' +
@@ -1405,10 +1424,10 @@ EOT
       end
     })
     doc('fail', <<'EOT'
-The fail attribute adds a logical expression to the property. The condition
-described by the logical expression is checked after the scheduling and an
-error is raised if the condition evaluates to true. This attribute is
-primarily intended for testing purposes.
+The fail attribute adds a [[logicalexpression|logical expression]] to the
+property. The condition described by the logical expression is checked after
+the scheduling and an error is raised if the condition evaluates to true. This
+attribute is primarily intended for testing purposes.
 EOT
        )
   end
@@ -1522,11 +1541,7 @@ EOT
       @val[1].each do |flag|
         next if @property['flags', @scenarioIdx].include?(flag)
 
-        # We allow multiple instances of flag definitions.
-        begin
-          @property['flags', @scenarioIdx] += [ flag ]
-        rescue AttributeOverwrite
-        end
+        @property['flags', @scenarioIdx] += [ flag ]
       end
     })
   end
@@ -1684,6 +1699,10 @@ EOT
     pattern(['_istask', '_(', '_)' ])
     doc('istask', 'The result is true if the property is a task.')
 
+    pattern(%w( _isvalid _( $ID _) ))
+    doc('isvalid', 'Returns false if argument is not an assigned or ' +
+                   'properly computed value.')
+
     pattern(%w( _treelevel _( _) ))
     doc('treelevel', <<'EOT'
 Returns the nesting level of a property in the property tree.
@@ -1729,8 +1748,9 @@ EOT
       @property.set('hideAccount', @val[1])
     })
     doc('hideaccount', <<'EOT'
-Do not include accounts that match the specified logical expression. If the
-report is sorted in ''''tree'''' mode (default) then enclosing accounts are
+Do not include accounts that match the specified [[logicalexpression|logical
+expression]]. If the report is sorted in ''''tree'''' mode (default) then
+enclosing accounts are
 listed even if the expression matches the account.
 EOT
        )
@@ -1752,9 +1772,9 @@ EOT
       @property.set('hideResource', @val[1])
     })
     doc('hideresource', <<'EOT'
-Do not include resources that match the specified logical expression. If the
-report is sorted in ''''tree'''' mode (default) then enclosing resources are
-listed even if the expression matches the resource.
+Do not include resources that match the specified [[logicalexpression|logical
+expression]]. If the report is sorted in ''''tree'''' mode (default) then
+enclosing resources are listed even if the expression matches the resource.
 EOT
        )
     also(%w( sortresources ))
@@ -1765,9 +1785,9 @@ EOT
       @property.set('hideTask', @val[1])
     })
     doc('hidetask', <<'EOT'
-Do not include tasks that match the specified logical expression. If the
-report is sorted in ''''tree'''' mode (default) then enclosing tasks are
-listed even if the expression matches the task.
+Do not include tasks that match the specified [[logicalexpression|logical
+expression]]. If the report is sorted in ''''tree'''' mode (default) then
+enclosing tasks are listed even if the expression matches the task.
 EOT
        )
     also(%w( sorttasks ))
@@ -1820,23 +1840,24 @@ EOT
 
   def rule_iCalReportHeader
     pattern(%w( _icalreport !optionalID $STRING ), lambda {
-      newReport(@val[1], @val[2], :iCal, @sourceFileInfo[0])
-      @property.set('formats', [ :iCal ])
-
-      # By default, we export only the first scenario.
-      unless @project.scenario(0).get('active')
-        @property.set('scenarios', [ 0 ])
-      end
-      # Show all tasks, sorted by seqno-up.
-      @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
-      # Show all resources, sorted by seqno-up.
-      @property.set('hideResource',
-                    LogicalExpression.new(LogicalOperation.new(0)))
-      @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
-      # Show all journal entries.
-      @property.set('hideJournalEntry',
-                    LogicalExpression.new(LogicalOperation.new(0)))
+      newReport(@val[1], @val[2], :iCal, @sourceFileInfo[0]) do
+        @property.set('formats', [ :iCal ])
+
+        # By default, we export only the first scenario.
+        unless @project.scenario(0).get('active')
+          @property.set('scenarios', [ 0 ])
+        end
+        # Show all tasks, sorted by seqno-up.
+        @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+        @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
+        # Show all resources, sorted by seqno-up.
+        @property.set('hideResource',
+                      LogicalExpression.new(LogicalOperation.new(0)))
+        @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
+        # Show all journal entries.
+        @property.set('hideJournalEntry',
+                      LogicalExpression.new(LogicalOperation.new(0)))
+      end
     })
     arg(1, 'file name', <<'EOT'
 The name of the report file to generate without an extension.  Use . to use
@@ -2609,17 +2630,27 @@ in the report.
 Operands can be previously declared flags, built-in [[functions]], property
 attributes (specified as scenario.attribute) or another logical expression.
 When you combine logical operations to a more complex expression, the
-operators are evaluated from left to right. '''a | b & c''' is identical to
-'''(a | b) & c'''. It's highly recommended that you always use brackets to
+operators are evaluated from left to right. ''''a | b & c'''' is identical to
+''''(a | b) & c''''. It's highly recommended that you always use brackets to
 control the evaluation sequence. Currently, TaskJuggler does not support the
 concept of operator precedence or right-left associativity. This may change in
 the future.
 
 An operand can also be just a number. 0 evaluates to false, all other numbers
-to true. The logical expression can also be the special constants ''''@all'''' or ''''@none''''. The first always evaluates to true, the latter to false.
+to true. The logical expression can also be the special constants ''''@all''''
+or ''''@none''''. The first always evaluates to true, the latter to false.
+
+Date attributes needs special attention. Attributes like [[maxend]] can
+be undefined. To use such an attribute in a comparison, you need to test for
+the validity first. E. g. to compare the end date of the ''''plan''''
+scenario with the ''''maxend'''' value use ''''isvalid(plan.maxend) &
+(plan.end > plan.maxend)''''. The ''''&'''' and ''''|'''' operators are lazy.
+If the result is already known after evaluation the first operand, the second
+operand will not be evaluated any more.
 EOT
        )
     also(%w( functions ))
+    example('LogicalExpression', '1')
   end
 
   def rule_macro
@@ -2751,7 +2782,7 @@ EOT
     })
     doc('hidereport', <<'EOT'
 This attribute can be used to exclude the reports that match the specified
-expression from the navigation bar.
+[[logicalexpression|logical expression]] from the navigation bar.
 EOT
           )
   end
@@ -2810,8 +2841,9 @@ EOF
 
   def rule_nikuReportHeader
     pattern(%w( _nikureport !optionalID $STRING ), lambda {
-      newReport(@val[1], @val[2], :niku, @sourceFileInfo[0])
-      @property.set('numberFormat', RealFormat.new(['-', '', '', '.', 2]))
+      newReport(@val[1], @val[2], :niku, @sourceFileInfo[0]) do
+        @property.set('numberFormat', RealFormat.new(['-', '', '', '.', 2]))
+      end
     })
     arg(1, 'file name', <<'EOT'
 The name of the time sheet report file to generate. It must end with a .tji
@@ -3229,6 +3261,24 @@ EOT
       @project['numberFormat'] = @val[0]
     })
 
+    pattern(%w( _outputdir $STRING ), lambda {
+      # Directory name must be terminated by a slash.
+      if @val[1].empty?
+        error('outdir_empty', 'Output directory may not be empty.')
+      end
+      if !File.directory?(@val[1])
+        error('outdir_missing',
+              "Output directory '#{@val[1]}' does not exist or is not " +
+              "a directory!")
+      end
+      @project.outputDir = @val[1] + (@val[1][-1] == ?/ ? '' : '/')
+    })
+    doc('outputdir',
+        'Specifies the directory into which the reports should be generated. ' +
+        'This will not affect reports whos name start with a slash. This ' +
+        'setting can be overwritten by the command line option.')
+    arg(1, 'directory', 'Path to an existing directory')
+
     pattern(%w( !scenario ))
     pattern(%w( _shorttimeformat $STRING ), lambda {
       @project['shortTimeFormat'] = @val[1]
@@ -3465,6 +3515,24 @@ EOT
 
     pattern(%w( !account ))
 
+    pattern(%w( _auxdir $STRING ), lambda {
+      auxdir = @val[1]
+      # Ensure that the directory always ends with a '/'.
+      auxdir += '/' unless auxdir[-1] == ?/
+      @project['auxdir'] = auxdir
+    })
+    level(:beta)
+    doc('auxdir', <<'EOT'
+Specifies an alternative directory for the auxiliary report files such as CSS,
+JavaScript and icon files. This setting will affect all subsequent report
+definitions unless it gets overridden. If this attribute is not set, the
+directory and its contents will be generated automatically. If this attribute
+is provided, the user has to ensure that the directory exists and is filled
+with the proper data. The specified path can be absolute or relative to the
+generated report file.
+EOT
+       )
+
     pattern(%w( _copyright $STRING ), lambda {
       @project['copyright'] = @val[1]
     })
@@ -3730,7 +3798,11 @@ EOT
          )
 
     singlePattern('_balance')
-    descr('The account balance at the beginning of the reported period.')
+    descr(<<'EOT'
+The account balance at the beginning of the reported period. This is the
+balance before any transactions of the reported period have been credited.
+EOT
+         )
 
     singlePattern('_bsi')
     descr('The hierarchical or work breakdown structure index (i. e. 1.2.3)')
@@ -4093,6 +4165,12 @@ will also include the targets of the child tasks. Targets may not have any
 follower tasks.
 
 The list can be customized by the [[listitem.column|listitem]] attribute.
+EOT
+         )
+
+    singlePattern('_turnover')
+    descr(<<'EOT'
+The financial turnover of an account during the reporting interval.
 EOT
          )
 
@@ -4146,12 +4224,12 @@ EOT
       @property.set('auxdir', auxdir)
     })
     level(:beta)
-    doc('auxdir', <<'EOT'
+    doc('auxdir.report', <<'EOT'
 Specifies an alternative directory for the auxiliary report files such as CSS,
-JavaScript and icon files. If this attribute is not set, the directoy will be
-generated automatically. If an alternative is provided, the user has to ensure
+JavaScript and icon files. If this attribute is not set, the directory will be
+generated automatically. If this attribute is provided, the user has to ensure
 that the directory exists and is filled with the proper data. The specified
-path and be absolute or relative to the generated report file.
+path can be absolute or relative to the generated report file.
 EOT
        )
 
@@ -4706,34 +4784,34 @@ EOT
 
   def rule_resourceReportHeader
     pattern(%w( _resourcereport !optionalID !reportName ), lambda {
-      newReport(@val[1], @val[2], :resourcereport, @sourceFileInfo[0])
-
-      unless @property.modified?('columns')
-        # Set the default columns for this report.
-        %w( no name ).each do |col|
-          @property.get('columns') <<
-          TableColumnDefinition.new(col, columnTitle(col))
+      newReport(@val[1], @val[2], :resourcereport, @sourceFileInfo[0]) do
+        unless @property.modified?('columns')
+          # Set the default columns for this report.
+          %w( no name ).each do |col|
+            @property.get('columns') <<
+            TableColumnDefinition.new(col, columnTitle(col))
+          end
+        end
+        # Show all resources, sorted by tree and id-up.
+        unless @property.modified?('hideResource')
+          @property.set('hideResource',
+                        LogicalExpression.new(LogicalOperation.new(0)))
+        end
+        unless @property.modified?('sortResources')
+          @property.set('sortResources', [ [ 'tree', true, -1 ],
+                        [ 'id', true, -1 ] ])
+        end
+        # Hide all resources, but set sorting to tree, start-up, seqno-up.
+        unless @property.modified?('hideTask')
+          @property.set('hideTask',
+                        LogicalExpression.new(LogicalOperation.new(1)))
+        end
+        unless @property.modified?('sortTasks')
+          @property.set('sortTasks',
+                        [ [ 'tree', true, -1 ],
+                          [ 'start', true, 0 ],
+                          [ 'seqno', true, -1 ] ])
         end
-      end
-      # Show all resources, sorted by tree and id-up.
-      unless @property.modified?('hideResource')
-        @property.set('hideResource',
-                      LogicalExpression.new(LogicalOperation.new(0)))
-      end
-      unless @property.modified?('sortResources')
-        @property.set('sortResources', [ [ 'tree', true, -1 ],
-                      [ 'id', true, -1 ] ])
-      end
-      # Hide all resources, but set sorting to tree, start-up, seqno-up.
-      unless @property.modified?('hideTask')
-        @property.set('hideTask',
-                      LogicalExpression.new(LogicalOperation.new(1)))
-      end
-      unless @property.modified?('sortTasks')
-        @property.set('sortTasks',
-                      [ [ 'tree', true, -1 ],
-                        [ 'start', true, 0 ],
-                        [ 'seqno', true, -1 ] ])
       end
     })
   end
@@ -4801,10 +4879,7 @@ EOT
     pattern(%w( !leaveAllowances ))
 
     pattern(%w( !leaves ), lambda {
-      begin
-        @property['leaves', @scenarioIdx] += @val[0]
-      rescue AttributeOverwrite
-      end
+      @property['leaves', @scenarioIdx] += @val[0]
     })
 
     pattern(%w( !limits ), lambda {
@@ -4884,11 +4959,8 @@ EOT
 
     pattern(%w( _vacation !vacationName !intervals ), lambda {
       @val[2].each do |interval|
-        begin
-          # We map the old 'vacation' attribute to public holidays.
-          @property['leaves', @scenarioIdx] += [ Leave.new(:holiday, interval) ]
-        rescue AttributeOverwrite
-        end
+        # We map the old 'vacation' attribute to public holidays.
+        @property['leaves', @scenarioIdx] += [ Leave.new(:holiday, interval) ]
       end
     })
     doc('vacation.resource', <<'EOT'
@@ -4922,8 +4994,8 @@ EOT
       @property.set('rollupAccount', @val[1])
     })
     doc('rollupaccount', <<'EOT'
-Do not show sub-accounts of accounts that match the specified logical
-expression.
+Do not show sub-accounts of accounts that match the specified
+[[logicalexpression|logical expression]].
 EOT
        )
   end
@@ -4933,8 +5005,8 @@ EOT
       @property.set('rollupResource', @val[1])
     })
     doc('rollupresource', <<'EOT'
-Do not show sub-resources of resources that match the specified logical
-expression.
+Do not show sub-resources of resources that match the specified
+[[logicalexpression|logical expression]].
 EOT
        )
     example('RollupResource')
@@ -4945,7 +5017,8 @@ EOT
       @property.set('rollupTask', @val[1])
     })
     doc('rolluptask', <<'EOT'
-Do not show sub-tasks of tasks that match the specified logical expression.
+Do not show sub-tasks of tasks that match the specified
+[[logicalexpression|logical expression]].
 EOT
        )
   end
@@ -5053,6 +5126,10 @@ EOT
       end
       @property = Scenario.new(@project, @val[1], @val[2], @property)
       @property.inheritAttributes
+
+      if @project.scenarios.length > 1
+        MessageHandlerInstance.instance.hideScenario = false
+      end
     })
     arg(1, 'id', 'The ID of the scenario')
     arg(2, 'name', 'The name of the scenario')
@@ -5103,8 +5180,9 @@ EOT
     })
     doc('shift', <<'EOT'
 A shift combines several workhours related settings in a reusable entity.
-Besides the weekly working hours it can also hold information such as
-leaves and a time zone.
+Besides the weekly working hours it can also hold information such as leaves
+and a time zone. It lets you create a work time calendar that can be used to
+limit the working time for resources or tasks.
 
 Shifts have a global name space. All IDs must be unique within the shifts of
 the project.
@@ -5182,10 +5260,7 @@ EOT
 
   def rule_shiftScenarioAttributes
     pattern(%w( !leaves ), lambda {
-      begin
-        @property['leaves', @scenarioIdx] += @val[0]
-      rescue AttributeOverwrite
-      end
+      @property['leaves', @scenarioIdx] += @val[0]
     })
 
     pattern(%w( _replace ), lambda {
@@ -5224,11 +5299,8 @@ EOT
 
     pattern(%w( _vacation !vacationName !intervalsOptional ), lambda {
       @val[2].each do |interval|
-        begin
-          # We map the old 'vacation' attribute to public holidays.
-          @property['leaves', @scenarioIdx] += [ Leave.new(:holiday, interval) ]
-        rescue AttributeOverwrite
-        end
+        # We map the old 'vacation' attribute to public holidays.
+        @property['leaves', @scenarioIdx] += [ Leave.new(:holiday, interval) ]
       end
     })
     doc('vacation.shift', <<'EOT'
@@ -5377,22 +5449,23 @@ EOT
   end
   def rule_ssReportHeader
     pattern(%w( _statussheetreport !optionalID $STRING ), lambda {
-      newReport(@val[1], @val[2], :statusSheet, @sourceFileInfo[0])
-      @property.set('formats', [ :tjp ])
+      newReport(@val[1], @val[2], :statusSheet, @sourceFileInfo[0]) do
+        @property.set('formats', [ :tjp ])
 
-      unless (@project['trackingScenarioIdx'])
-        error('ss_no_tracking_scenario',
-              'You must have a tracking scenario defined to use status sheets.')
-      end
-      # Show all tasks, sorted by id-up.
-      @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      @property.set('sortTasks', [ [ 'id', true, -1 ] ])
-      # Show all resources, sorted by seqno-up.
-      @property.set('hideResource',
-                    LogicalExpression.new(LogicalOperation.new(0)))
-      @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
-      @property.set('loadUnit', :hours)
-      @property.set('definitions', [])
+        unless (@project['trackingScenarioIdx'])
+          error('ss_no_tracking_scenario',
+                'You must have a tracking scenario defined to use status sheets.')
+        end
+        # Show all tasks, sorted by id-up.
+        @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+        @property.set('sortTasks', [ [ 'id', true, -1 ] ])
+        # Show all resources, sorted by seqno-up.
+        @property.set('hideResource',
+                      LogicalExpression.new(LogicalOperation.new(0)))
+        @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
+        @property.set('loadUnit', :hours)
+        @property.set('definitions', [])
+      end
     })
     arg(2, 'file name', <<'EOT'
 The name of the status sheet report file to generate. It must end with a .tji
@@ -5681,16 +5754,17 @@ EOT
 
   def rule_tagfileHeader
     pattern(%w( _tagfile !optionalID $STRING ), lambda {
-      newReport(@val[1], @val[2], :tagfile, @sourceFileInfo[0])
-      @property.set('formats', [ :ctags ])
+      newReport(@val[1], @val[2], :tagfile, @sourceFileInfo[0]) do
+        @property.set('formats', [ :ctags ])
 
-      # Include all tasks.
-      @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
-      # Include all resources.
-      @property.set('hideResource',
-                    LogicalExpression.new(LogicalOperation.new(0)))
-      @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
+        # Include all tasks.
+        @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+        @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
+        # Include all resources.
+        @property.set('hideResource',
+                      LogicalExpression.new(LogicalOperation.new(0)))
+        @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
+      end
     })
     arg(2, 'file name', <<'EOT'
 The name of the tagfile to generate. Use ''''tags'''' if you want vim and
@@ -6017,33 +6091,33 @@ EOT
 
   def rule_taskReportHeader
     pattern(%w( _taskreport !optionalID !reportName ), lambda {
-      newReport(@val[1], @val[2], :taskreport, @sourceFileInfo[0])
-
-      unless @property.modified?('columns')
-        # Set the default columns for this report.
-        %w( bsi name start end effort chart ).each do |col|
-          @property.get('columns') <<
-          TableColumnDefinition.new(col, columnTitle(col))
+      newReport(@val[1], @val[2], :taskreport, @sourceFileInfo[0]) do
+        unless @property.modified?('columns')
+          # Set the default columns for this report.
+          %w( bsi name start end effort chart ).each do |col|
+            @property.get('columns') <<
+            TableColumnDefinition.new(col, columnTitle(col))
+          end
+        end
+        # Show all tasks, sorted by tree, start-up, seqno-up.
+        unless @property.modified?('hideTask')
+          @property.set('hideTask',
+                        LogicalExpression.new(LogicalOperation.new(0)))
+        end
+        unless @property.modified?('sortTasks')
+          @property.set('sortTasks',
+                        [ [ 'tree', true, -1 ],
+                          [ 'start', true, 0 ],
+                          [ 'seqno', true, -1 ] ])
+        end
+        # Show no resources, but set sorting to id-up.
+        unless @property.modified?('hideResource')
+          @property.set('hideResource',
+                        LogicalExpression.new(LogicalOperation.new(1)))
+        end
+        unless @property.modified?('sortResources')
+          @property.set('sortResources', [ [ 'id', true, -1 ] ])
         end
-      end
-      # Show all tasks, sorted by tree, start-up, seqno-up.
-      unless @property.modified?('hideTask')
-        @property.set('hideTask',
-                      LogicalExpression.new(LogicalOperation.new(0)))
-      end
-      unless @property.modified?('sortTasks')
-        @property.set('sortTasks',
-                      [ [ 'tree', true, -1 ],
-                        [ 'start', true, 0 ],
-                        [ 'seqno', true, -1 ] ])
-      end
-      # Show no resources, but set sorting to id-up.
-      unless @property.modified?('hideResource')
-        @property.set('hideResource',
-                      LogicalExpression.new(LogicalOperation.new(1)))
-      end
-      unless @property.modified?('sortResources')
-        @property.set('sortResources', [ [ 'id', true, -1 ] ])
       end
     })
   end
@@ -6114,12 +6188,8 @@ EOT
         mode = :perDiem
         amount = @val[1] / 7.0
       end
-      # Multiple 'charge' attributes are allowed.
-      begin
-        @property['charge', @scenarioIdx] +=
-          [ Charge.new(amount, mode, @property, @scenarioIdx) ]
-      rescue AttributeOverwrite
-      end
+      @property['charge', @scenarioIdx] +=
+        [ Charge.new(amount, mode, @property, @scenarioIdx) ]
     })
     doc('charge', <<'EOT'
 Specify a one-time or per-period charge to a certain account. The charge can
@@ -6156,9 +6226,8 @@ EOT
 
     pattern(%w( _depends !taskDepList ), lambda {
       checkContainer('depends')
+      @property['depends', @scenarioIdx] += @val[1]
       begin
-        @property['depends', @scenarioIdx] =
-          @property['depends', @scenarioIdx] + @val[1]
         @property['forward', @scenarioIdx] = true
       rescue AttributeOverwrite
       end
@@ -6263,9 +6332,9 @@ EOT
       setDurationAttribute('length', @val[1])
     })
     doc('length', <<'EOT'
-Specifies the global working time to be used for this task. The value is
-specified in working time, not calendar time. 7d means 7 working days, or 7
-times 8 hours (assuming default settings), not one week.
+Specifies the duration of this task as working time, not calendar time. 7d
+means 7 working days, or 7 times 8 hours (assuming default settings), not one
+week.
 
 A task with a length specification may have resource allocations. Resources
 are allocated when they are available.  There is no guarantee that the task
@@ -6274,12 +6343,14 @@ on the duration of the task. A time slot where none of the specified resources
 is available is still considered working time, if there is no global vacation
 and global working hours are defined accordingly.
 
-For the length calculation, only the global working hours and the global
-leaves matter. If a resource has additinal working hours defined, it's
-quite possible that a task with a length of 5d will have an allocated effort
-larger than 40 hours. Resource working hours only have an impact on whether an
-allocation is made or not for a particular time slot. They don't effect the
-resulting duration of the task.
+For the length calculation, the global working hours and the global leaves
+matter unless the task has [[shifts.task|shifts]] assigned. In the latter case
+the working hours and leaves of the shift apply for the specified period to
+determine if a slot is working time or not. If a resource has additinal
+working hours defined, it's quite possible that a task with a length of 5d
+will have an allocated effort larger than 40 hours.  Resource working hours
+only have an impact on whether an allocation is made or not for a particular
+time slot. They don't effect the resulting duration of the task.
 
 Tasks may not have subtasks if this attribute is used. Setting this attribute
 will reset the [[duration]], [[effort]] and [[milestone]] attributes.
@@ -6368,8 +6439,8 @@ EOT
 
     pattern(%w( _precedes !taskPredList ), lambda {
       checkContainer('precedes')
-      begin
         @property['precedes', @scenarioIdx] += @val[1]
+      begin
         @property['forward', @scenarioIdx] = false
       rescue AttributeOverwrite
       end
@@ -6814,10 +6885,13 @@ EOT
       @timeSheetRecord = nil
     })
     doc('newtask', <<'EOT'
-The keyword can be used add a new task to the project. If the task ID requires
-further parent task that don't exist yet, these tasks will be created as well.
-If the task exists already, an error is generated. The new task can be used
-immediately to report progress and status against it.
+The keyword can be used to request a new task to the project. If the task ID
+requires further parent task that don't exist yet, these tasks will be
+requested as well. If the task exists already, an error will be generated. The
+newly requested task can be used immediately to report progress and status
+against it. These tasks will not automatically be added to the project plan.
+The project manager has to manually create them after reviewing the request
+during the time sheet reviews.
 EOT
        )
     example('TimeSheet1', '3')
@@ -6979,51 +7053,51 @@ EOT
 
   def rule_traceReportHeader
     pattern(%w( _tracereport !optionalID !reportName ), lambda {
-      newReport(@val[1], @val[2], :tracereport, @sourceFileInfo[0])
-
-      # The top-level always inherits the global timeFormat setting. This is
-      # not desireable in this case, so we ignore this.
-      if (@property.level == 0 && !@property.provided('timeFormat')) ||
-         (@property.level > 0 && !@property.modified?('timeFormat'))
-        # CSV readers such of Libre-/OpenOffice can't deal with time zones. We
-        # probably also don't need seconds.
-        @property.set('timeFormat', '%Y-%m-%d-%H:%M')
-      end
-      unless @property.modified?('columns')
-        # Set the default columns for this report.
-        %w( end ).each do |col|
-          @property.get('columns') <<
-          TableColumnDefinition.new(col, columnTitle(col))
+      newReport(@val[1], @val[2], :tracereport, @sourceFileInfo[0]) do
+        # The top-level always inherits the global timeFormat setting. This is
+        # not desireable in this case, so we ignore this.
+        if (@property.level == 0 && !@property.provided('timeFormat')) ||
+           (@property.level > 0 && !@property.modified?('timeFormat'))
+          # CSV readers such of Libre-/OpenOffice can't deal with time zones. We
+          # probably also don't need seconds.
+          @property.set('timeFormat', '%Y-%m-%d-%H:%M')
+        end
+        unless @property.modified?('columns')
+          # Set the default columns for this report.
+          %w( end ).each do |col|
+            @property.get('columns') <<
+            TableColumnDefinition.new(col, columnTitle(col))
+          end
+        end
+        # Hide all accounts.
+        unless @property.modified?('hideAccount')
+          @property.set('hideAccount',
+                        LogicalExpression.new(LogicalOperation.new(1)))
+        end
+        unless @property.modified?('sortAccounts')
+          @property.set('sortAccounts',
+                        [ [ 'tree', true, -1 ],
+                          [ 'seqno', true, -1 ] ])
+        end
+        # Show all tasks, sorted by tree, start-up, seqno-up.
+        unless @property.modified?('hideTask')
+          @property.set('hideTask',
+                        LogicalExpression.new(LogicalOperation.new(0)))
+        end
+        unless @property.modified?('sortTasks')
+          @property.set('sortTasks',
+                        [ [ 'tree', true, -1 ],
+                          [ 'start', true, 0 ],
+                          [ 'seqno', true, -1 ] ])
+        end
+        # Show no resources, but set sorting to id-up.
+        unless @property.modified?('hideResource')
+          @property.set('hideResource',
+                        LogicalExpression.new(LogicalOperation.new(1)))
+        end
+        unless @property.modified?('sortResources')
+          @property.set('sortResources', [ [ 'id', true, -1 ] ])
         end
-      end
-      # Hide all accounts.
-      unless @property.modified?('hideAccount')
-        @property.set('hideAccount',
-                      LogicalExpression.new(LogicalOperation.new(1)))
-      end
-      unless @property.modified?('sortAccounts')
-        @property.set('sortAccounts',
-                      [ [ 'tree', true, -1 ],
-                        [ 'seqno', true, -1 ] ])
-      end
-      # Show all tasks, sorted by tree, start-up, seqno-up.
-      unless @property.modified?('hideTask')
-        @property.set('hideTask',
-                      LogicalExpression.new(LogicalOperation.new(0)))
-      end
-      unless @property.modified?('sortTasks')
-        @property.set('sortTasks',
-                      [ [ 'tree', true, -1 ],
-                        [ 'start', true, 0 ],
-                        [ 'seqno', true, -1 ] ])
-      end
-      # Show no resources, but set sorting to id-up.
-      unless @property.modified?('hideResource')
-        @property.set('hideResource',
-                      LogicalExpression.new(LogicalOperation.new(1)))
-      end
-      unless @property.modified?('sortResources')
-        @property.set('sortResources', [ [ 'id', true, -1 ] ])
       end
     })
   end
@@ -7038,23 +7112,24 @@ EOT
   end
   def rule_tsReportHeader
     pattern(%w( _timesheetreport !optionalID $STRING ), lambda {
-      newReport(@val[1], @val[2], :timeSheet, @sourceFileInfo[0])
-      @property.set('formats', [ :tjp ])
+      newReport(@val[1], @val[2], :timeSheet, @sourceFileInfo[0]) do
+        @property.set('formats', [ :tjp ])
 
-      unless (scenarioIdx = @project['trackingScenarioIdx'])
-        error('ts_no_tracking_scenario',
-              'You must have a tracking scenario defined to use time sheets.')
-      end
-      @property.set('scenarios', [ scenarioIdx ])
-      # Show all tasks, sorted by seqno-up.
-      @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
-      # Show all resources, sorted by seqno-up.
-      @property.set('hideResource',
-                    LogicalExpression.new(LogicalOperation.new(0)))
-      @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
-      @property.set('loadUnit', :hours)
-      @property.set('definitions', [])
+        unless (scenarioIdx = @project['trackingScenarioIdx'])
+          error('ts_no_tracking_scenario',
+                'You must have a tracking scenario defined to use time sheets.')
+        end
+        @property.set('scenarios', [ scenarioIdx ])
+        # Show all tasks, sorted by seqno-up.
+        @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+        @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
+        # Show all resources, sorted by seqno-up.
+        @property.set('hideResource',
+                      LogicalExpression.new(LogicalOperation.new(0)))
+        @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
+        @property.set('loadUnit', :hours)
+        @property.set('definitions', [])
+      end
     })
     arg(2, 'file name', <<'EOT'
 The name of the time sheet report file to generate. It must end with a .tji
@@ -7354,10 +7429,10 @@ EOT
       end
     })
     doc('warn', <<'EOT'
-The warn attribute adds a logical expression to the property. The condition
-described by the logical expression is checked after the scheduling and an
-warning is generated if the condition evaluates to true. This attribute is
-primarily intended for testing purposes.
+The warn attribute adds a [[logicalexpression|logical expression]] to the
+property. The condition described by the logical expression is checked after
+the scheduling and an warning is generated if the condition evaluates to true.
+This attribute is primarily intended for testing purposes.
 EOT
        )
   end