taskjuggler 3.0.0 → 3.1.0

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
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               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
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

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
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               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
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -61,6 +61,18 @@ EOT
     optionsRule('accountAttributes')
   end
 
+  def rule_accountCredit
+    pattern(%w( !valDate $STRING !number ), lambda {
+      AccountCredit.new(@val[0], @val[1], @val[2])
+    })
+    arg(1, 'description', 'Short description of the transaction')
+    arg(2, 'amount', 'Amount to be booked.')
+  end
+
+  def rule_accountCredits
+    listRule('moreAccountCredits', '!accountCredit')
+  end
+
   def rule_accountHeader
     pattern(%w( _account !optionalID $STRING ), lambda {
       if @property.nil? && !@accountprefix.empty?
@@ -91,18 +103,78 @@ EOT
     })
   end
 
+  def rule_accountReport
+    pattern(%w( !accountReportHeader !reportBody ), lambda {
+      @property = @property.parent
+    })
+    level(:beta)
+    doc('accountreport', <<'EOT'
+The report lists accounts and their respective values in a table. The report can operate in two modes:
+
+# Balance mode: If a [[balance]] has been set, the report will include the
+defined cost and revenue accounts as well as all their sub accounts. To reduce
+the list of included accounts, you can use the [[hideaccount]],
+[[rollupaccount]] or [[accountroot]] attributes. The order of the task can
+be controlled with [[sortaccounts]]. If the first sorting criteria is tree
+sorting, the parent accounts will always be included to form the tree.
+Tree sorting is the default. You need to change it if you do not want certain
+parent accounts to be included in the report. Additionally, it will contain a line at the end that lists the balance (revenue - cost).
+
+# Normal mode: All reports are listed in the order and completeness as defined
+by the other report attributes. No balance line will be included.
+EOT
+       )
+    example('AccountReport')
+  end
+
+  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))
+        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
+
   def rule_accountScenarioAttributes
-    pattern(%w( _credit !valDate $STRING !number ), lambda {
-      #@property['credit', @scenarioIdx] +=
-      #  AccountCredit.new(@val[1], @val[2], @val[3])
+    pattern(%w( _aggregate !aggregate ), lambda {
+      @property.set('aggregate', @val[1])
+    })
+    doc('aggregate', <<'EOT'
+Specifies whether the account is used to track task or resource specific
+amounts. The default is to track tasks.
+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
     })
-    doc('credit', <<'EOT'
-Book the specified amount to the account at the specified date.
+    doc('credits', <<'EOT'
+Book the specified amounts to the account at the specified date. The
+desciptions are just used for documentary purposes.
 EOT
        )
     example('Account', '1')
-    arg(2, 'description', 'Short description of the transaction')
-    arg(3, 'amount', 'Amount to be booked.')
 
     pattern(%w( !flags ))
     doc('flags.account', <<'EOT'
@@ -114,28 +186,48 @@ EOT
     # Other attributes will be added automatically.
   end
 
+  def rule_aggregate
+    pattern(%w( _resources ), lambda {
+      :resources
+    })
+    descr('Aggregate resources')
+
+    pattern(%w( _tasks ), lambda {
+      :tasks
+    })
+    descr('Aggregate tasks')
+  end
+
   def rule_alertLevel
     pattern(%w( $ID ), lambda {
-      level = @project.alertLevelIndex(@val[0])
+      level = @project['alertLevels'].indexById(@val[0])
       unless level
-        error('bad_alert', "Unknown alert level #{@val[1]}. Must be " +
-              'green, yellow or red', @sourceFileInfo[0])
+        levels = @project['alertLevels'].map { |l| l.id }
+        error('bad_alert', "Unknown alert level #{@val[0]}. Must be " +
+              "one of #{levels.join(', ')}", @sourceFileInfo[0])
       end
       level
     })
-    doc('alert level', <<'EOT'
-Specify the alert level for this entry. Supported values are green, yellow and
-red. The default value is green. This attribute is inteded to be used for
-status reporting. When used for a journal entry that is associated with a
-property, the value can be reported in the alert column. When multiple entries
-have been specified for the property, the entry with the date closest to the
-report end date will be used. Container properties will inherit the highest
-alert level of all its sub properties unless it has an own journal entry dated
-closer to the report end than all of its sub properties.
+    arg(0, 'alert level', <<'EOT'
+By default supported values are ''''green'''', ''''yellow'''' and ''''red''''.
+The default value is ''''green''''. You can define your own levels with
+[[alertlevels]].
 EOT
        )
   end
 
+  def rule_alertLevelDefinition
+    pattern(%w( $ID $STRING !color ), lambda {
+      [ @val[0], @val[1], @val[2] ]
+    })
+    arg(0, 'ID', "A unique ID for the alert level")
+    arg(1, 'color name', 'A unique name of the alert level color')
+  end
+
+  def rule_alertLevelDefinitions
+    listRule('moreAlertLevelDefinitions', '!alertLevelDefinition')
+  end
+
   def rule_allocate
     pattern(%w( _allocate !allocations ), lambda {
       checkContainer('allocate')
@@ -192,7 +284,8 @@ EOT
          end
       end
     })
-    doc('limits.allocate', 'This keyword is deprecated. Don\'t use it anymore!')
+    level(:removed)
+    doc('limits.allocate', '')
 
     pattern(%w( _select !allocationSelectionMode ), lambda {
       @allocate.setSelectionMode(@val[1])
@@ -230,7 +323,38 @@ So either all mandatory resources can be allocated for the time slot, or no
 resource will be allocated.
 EOT
        )
-    pattern(%w( _shift !allocationShiftAssignment ))
+    pattern(%w( !allocateShiftAssignments !shiftAssignment ), lambda {
+      begin
+        @allocate.shifts = @shiftAssignments
+      rescue AttributeOverwrite
+        # Multiple shift assignments are a common idiom, so don't warn about
+        # them.
+      end
+      @shiftAssignments = nil
+    })
+    level(:deprecated)
+    also('shifts.allocate')
+    doc('shift.allocate', <<'EOT'
+Limits the allocations of resources during the specified interval to the
+specified shift. Multiple shifts can be defined, but shift intervals may not
+overlap. Allocation shifts are an additional restriction to the
+[[shifts.task|task shifts]] and [[shifts.resource|resource shifts]] or
+[[workinghours.resource|resource working hours]]. Allocations will only be
+made for time slots that are specified as duty time in all relevant shifts.
+The restriction to the shift is only active during the specified time
+interval. Outside of this interval, no restrictions apply.
+EOT
+       )
+
+    pattern(%w( !allocateShiftsAssignments !shiftAssignments ), lambda {
+      begin
+        @allocate.shifts = @shiftAssignments
+      rescue AttributeOverwrite
+        # Multiple shift assignments are a common idiom, so don't warn about
+        # them.
+      end
+      @shiftAssignments = nil
+    })
     doc('shifts.allocate', <<'EOT'
 Limits the allocations of resources during the specified interval to the
 specified shift. Multiple shifts can be defined, but shift intervals may not
@@ -280,27 +404,15 @@ EOT
     descr('Pick a random resource from the list.')
   end
 
-  def rule_allocationShiftAssignment
-    pattern(%w( !shiftId !intervalsOptional ), lambda {
-      # Make sure we have a ShiftAssignment for the allocation.
-      if @allocate.shifts.nil?
-        @allocate.shifts = ShiftAssignments.new
-        @allocate.shifts.project = @project
-      end
+  def rule_allocateShiftAssignments
+    pattern(%w( _shift ), lambda {
+      @shiftAssignments = @allocate.shifts
+    })
+  end
 
-      if @val[1].nil?
-        intervals = [ TimeInterval.new(@project['start'], @project['end']) ]
-      else
-        intervals = @val[1]
-      end
-      intervals.each do |interval|
-        if !@allocate.shifts.
-          addAssignment(ShiftAssignment.new(@val[0].scenario(@scenarioIdx),
-                                            interval))
-          error('shift_assignment_overlap',
-                'Shifts may not overlap each other.', @sourceFileInfo[0])
-        end
-      end
+  def rule_allocateShiftsAssignments
+    pattern(%w( _shifts ), lambda {
+      @shiftAssignments = @allocate.shifts
     })
   end
 
@@ -338,29 +450,38 @@ EOT
   end
 
   def rule_balance
-    pattern(%w( _balance !accountId !accountId ), lambda {
-      if @val[1].parent
+    pattern(%w( _balance !balanceAccounts ), lambda {
+      @val[1]
+    })
+    doc('balance', <<'EOT'
+During report generation, TaskJuggler can consider some accounts to be revenue accounts, while other can be considered cost accounts. By using the balance attribute, two top-level accounts can be designated for a profit-loss-analysis. This analysis includes all sub accounts of these two top-level accounts.
+
+To clear a previously set balance, just use a ''''-''''.
+EOT
+       )
+    example('AccountReport')
+  end
+
+  def rule_balanceAccounts
+    pattern(%w( !accountId !accountId ), lambda {
+      if @val[0].parent
         error('cost_acct_no_top',
-              "The cost account #{@val[1].fullId} is not a top-level account.",
-              @sourceFileInfo[1])
+              "The cost account #{@val[0].fullId} is not a top-level account.",
+              @sourceFileInfo[0])
       end
-      if @val[2].parent
+      if @val[1].parent
         error('rev_acct_no_top',
-              "The revenue account #{@val[2].fullId} is not a top-level " +
-              "account.", @sourceFileInfo[2])
+              "The revenue account #{@val[1].fullId} is not a top-level " +
+              "account.", @sourceFileInfo[1])
       end
-      if @val[1] == @val[2]
+      if @val[0] == @val[1]
         error('cost_rev_same',
               'The cost and revenue accounts may not be the same.',
-              @sourceFileInfo[1])
+              @sourceFileInfo[0])
       end
-      [ @val[1], @val[2] ]
+      [ @val[0], @val[1] ]
     })
-    doc('balance', <<'EOT'
-During report generation, TaskJuggler can consider some accounts to be revenue accounts, while other can be considered cost accounts. By using the balance attribute, two top-level accounts can be designated for a profit-loss-analysis. This analysis includes all sub accounts of these two top-level accounts.
-EOT
-       )
-    arg(1, 'cost account', <<'EOT'
+    arg(0, 'cost account', <<'EOT'
 The top-level account that is used for all cost related charges.
 EOT
        )
@@ -368,6 +489,10 @@ EOT
 The top-level account that is used for all revenue related charges.
 EOT
        )
+
+    pattern([ '_-' ], lambda {
+      [ nil, nil ]
+    })
   end
 
   def rule_bookingAttributes
@@ -383,7 +508,7 @@ EOT
       @booking.overtime = @val[1]
     })
     doc('overtime.booking', <<'EOT'
-This attribute enables bookings during off-hours and vacations. It implicitly
+This attribute enables bookings during off-hours and leaves. It implicitly
 sets the [[sloppy.booking|sloppy]] attribute accordingly.
 EOT
        )
@@ -406,7 +531,7 @@ EOT
     })
     doc('sloppy.booking', <<'EOT'
 Controls how strict TaskJuggler checks booking intervals for conflicts with
-working periods and vacations. This attribute only affects the check for
+working periods and leaves. This attribute only affects the check for
 conflicts. No assignments will be made unless the [[overtime.booking|
 overtime]] attribute is set accordingly.
 EOT
@@ -462,20 +587,20 @@ EOT
       end
       if masterAccounts.include?(chargeSet.master)
         error('chargeset_master',
-              "All charge sets for this task must have different top-level " +
-              "accounts.", @sourceFileInfo[0], @property)
+              "All charge sets for this property must have different " +
+              "top-level accounts.", @sourceFileInfo[0], @property)
       end
       @property['chargeset', @scenarioIdx] =
         @property['chargeset', @scenarioIdx] + [ chargeSet ]
     })
     doc('chargeset', <<'EOT'
-A chargeset defines how the turnover associated with the task will be charged
-to one or more accounts. A task may have any number of charge sets, but each
-chargeset must deal with a different top-level account. A charge set consists
-of one or more accounts. Each account must be a leaf account. The account ID
-may be followed by a percentage value that determines the share for this
-account. The total percentage of all accounts must be exactly 100%. If some
-accounts don't have a percentage specification, the remainder to 100% is
+A chargeset defines how the turnover associated with the property will be
+charged to one or more accounts. A property may have any number of charge sets,
+but each chargeset must deal with a different top-level account. A charge set
+consists of one or more accounts. Each account must be a leaf account. The
+account ID may be followed by a percentage value that determines the share for
+this account. The total percentage of all accounts must be exactly 100%. If
+some accounts don't have a percentage specification, the remainder to 100% is
 distributed evenly to them.
 EOT
        )
@@ -500,6 +625,20 @@ EOT
 
   def rule_chargeSetItem
     pattern(%w( !accountId !optionalPercent ), lambda {
+      if @property.is_a?(Task)
+        aggregate = :tasks
+      elsif @property.is_a?(Resource)
+        aggregate = :resources
+      else
+        raise "Unknown property type #{@property.class}"
+      end
+
+      if @val[0].get('aggregate') != aggregate
+        error('account_bad_aggregate',
+              "The account #{@val[0].fullId} cannot aggregate amounts " +
+              "related to #{aggregate}.")
+      end
+
       [ @val[0], @val[1] ]
     })
     arg(0, 'account', 'The ID of a previously defined leaf account.')
@@ -883,21 +1022,22 @@ EOT
 
   def rule_exportHeader
     pattern(%w( _export !optionalID $STRING ), lambda {
-      report = newReport(@val[1], @val[2], :export, @sourceFileInfo[0])
+      newReport(@val[1], @val[2], :export, @sourceFileInfo[0])
+      @property.set('formats', [ :tjp ])
 
       # By default, we export all scenarios.
       scenarios = Array.new(@project.scenarios.items) { |i| i }
       scenarios.delete_if { |sc| !@project.scenario(sc).get('active') }
-      report.set('scenarios', scenarios)
+      @property.set('scenarios', scenarios)
       # Show all tasks, sorted by seqno-up.
-      report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      report.set('sortTasks', [ [ 'seqno', true, -1 ] ])
+      @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
       # Show all resources, sorted by seqno-up.
-      report.set('hideResource',
-                  LogicalExpression.new(LogicalOperation.new(0)))
-      report.set('sortResources', [ [ 'seqno', true, -1 ] ])
+      @property.set('hideResource',
+                    LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
     })
-    arg(1, 'file name', <<'EOT'
+    arg(2, 'file name', <<'EOT'
 The name of the report file to generate. It must end with a .tjp or .tji
 extension, or use . to use the standard output channel.
 EOT
@@ -940,7 +1080,7 @@ EOT
        )
     allOrNothingListRule('exportableResourceAttributes',
                          { 'booking' => 'Include bookings',
-                           'vacation' => 'Include vacations',
+                           'leaves' => 'Include leaves',
                            'workinghours' => 'Include working hours' })
 
     pattern(%w( !rollupresource ))
@@ -1418,6 +1558,15 @@ EOT
     pattern(['_isresource', '_(', '_)' ])
     doc('isresource', 'The result is true if the property is a resource.')
 
+    pattern(%w( _isresponsibilityof _( $ID _, $ID _) ))
+    doc('isresponsibilityof', <<'EOT'
+Will evaluate to true for tasks that have the specified resource
+assigned as [[responsible]] in the specified scenario.
+EOT
+       )
+    arg(2, 'Resource ID', 'The ID of a defined resource')
+    arg(4, 'Scenario ID', 'A scenario ID')
+
     pattern(['_istask', '_(', '_)' ])
     doc('istask', 'The result is true if the property is a task.')
 
@@ -1461,6 +1610,19 @@ EOT
        )
   end
 
+  def rule_hideaccount
+    pattern(%w( _hideaccount !logicalExpression ), lambda {
+      @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
+listed even if the expression matches the account.
+EOT
+       )
+    also(%w( sortaccounts ))
+  end
+
   def rule_hidejournalentry
     pattern(%w( _hidejournalentry !flagLogicalExpression ), lambda {
       @property.set('hideJournalEntry', @val[1])
@@ -1530,8 +1692,9 @@ EOT
       unless @project.scenario(sc).get('active')
         warning('ical_sc_disabled',
                 "Scenario #{sc} has been disabled")
+      else
+        @property.set('scenarios', [ @val[1] ])
       end
-      @property.set('scenarios', [ @val[1] ])
     })
     doc('scenario.ical', <<'EOT'
 Id of the scenario that should be included in the report. By default, the
@@ -1543,21 +1706,23 @@ EOT
 
   def rule_iCalReportHeader
     pattern(%w( _icalreport !optionalID $STRING ), lambda {
-      report = newReport(@val[1], @val[2], :iCal, @sourceFileInfo[0])
-
+      newReport(@val[1], @val[2], :iCal, @sourceFileInfo[0])
       @property.set('formats', [ :iCal ])
+
       # By default, we export only the first scenario.
-      report.set('scenarios', [ 0 ])
+      unless @project.scenario(0).get('active')
+        @property.set('scenarios', [ 0 ])
+      end
       # Show all tasks, sorted by seqno-up.
-      report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      report.set('sortTasks', [ [ 'seqno', true, -1 ] ])
+      @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
       # Show all resources, sorted by seqno-up.
-      report.set('hideResource',
-                  LogicalExpression.new(LogicalOperation.new(0)))
-      report.set('sortResources', [ [ 'seqno', true, -1 ] ])
+      @property.set('hideResource',
+                    LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
       # Show all journal entries.
-      report.set('hideJournalEntry',
-                 LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('hideJournalEntry',
+                    LogicalExpression.new(LogicalOperation.new(0)))
     })
     arg(1, 'file name', <<'EOT'
 The name of the report file to generate without an extension.  Use . to use
@@ -1869,17 +2034,11 @@ EOT
     optional
     repeatable
 
-    pattern(%w( _alert $ID ), lambda {
-      level = @project.alertLevelIndex(@val[1])
-      unless level
-        error('bad_alert', "Unknown alert level #{@val[1]}. Must be " +
-              'green, yellow or red', @sourceFileInfo[0])
-      end
-      @journalEntry.alertLevel = level
+    pattern(%w( _alert !alertLevel ), lambda {
+      @journalEntry.alertLevel = @val[1]
     })
     doc('alert', <<'EOT'
-Specify the alert level for this entry. Supported values are green, yellow and
-red. The default value is green. This attribute is inteded to be used for
+Specify the alert level for this entry. This attribute is inteded to be used for
 status reporting. When used for a journal entry that is associated with a
 property, the value can be reported in the alert column. When multiple entries
 have been specified for the property, the entry with the date closest to the
@@ -1960,6 +2119,98 @@ EOT
     arg(0, 'resource', 'The ID of a leaf resource')
   end
 
+  def rule_leave
+    pattern(%w( !leaveType !vacationName !intervalOrDate ), lambda {
+      Leave.new(@val[0].intern, @val[2], @val[1])
+    })
+  end
+
+  def rule_leaveList
+    listRule('moreLeaveList', '!leave')
+  end
+
+  def rule_leaveName
+    optional
+    pattern(%w( $STRING ), lambda {
+      @val[0]
+    })
+    arg(0, 'name', 'An optional name or reason for the leave')
+  end
+
+  def rule_leaveAllowance
+    pattern(%w( _annual !valDate !optionalMinus !workingDuration ), lambda {
+      LeaveAllowance.new(:annual, @val[1], (@val[2] ? -1 : 1) * @val[3])
+    })
+  end
+
+  def rule_leaveAllowanceList
+    listRule('moreLeaveAllowanceList', '!leaveAllowance')
+  end
+
+  def rule_leaveAllowances
+    pattern(%w( _leaveallowances !leaveAllowanceList ), lambda {
+      appendScListAttribute('leaveallowances', @val[1])
+    })
+    doc('leaveallowance', <<'EOT'
+Add or subtract leave allowances. Currently, only allowances for the annual
+leaves are supported. Allowances can be negative to deal with expired
+allowances. The ''''leaveallowancebalance'''' report [[columns|column]] can be
+used to report the current annual leave balance.
+
+Leaves outside of the project period are silently ignored and will not be
+considered in the leave balance calculation. Therefor, leave allowances are
+only allowed within the project period.
+EOT
+      )
+    level(:beta)
+    example('Leave')
+  end
+
+  def rule_leaves
+    pattern(%w( _leaves !leaveList ), lambda {
+      LeaveList.new(@val[1])
+    })
+    doc('leaves', <<'EOT'
+Describe a list of leave periods. A leave can be due to a public holiday,
+personal or sick leave. At global scope, the leaves determine which day is
+considered a working day. Subsequent resource definitions will inherit the
+leave list.
+
+Leaves can be defined at global level, at resource level and at shift level
+and intervals may overlap. The leave types have different priorities. A higher
+priority leave type can overwrite a lower priority type. This means that
+resource level leaves can overwrite global leaves when they have a higher
+priority. A sub resource can overwrite a leave of a enclosing resource.
+
+Leave periods outside of the project interval are silently ignored. For leave
+periods that are partially outside of the project period only the part inside
+the project period will be considered.
+EOT
+       )
+    level(:beta)
+    example('Leave')
+  end
+
+  def rule_leaveType
+    singlePattern('_project')
+    descr('Assignment to another project (lowest priority)')
+
+    singlePattern('_annual')
+    descr('Personal leave based on annual allowance')
+
+    singlePattern('_special')
+    descr('Personal leave based on a special occasion')
+
+    singlePattern('_sick')
+    descr('Sick leave')
+
+    singlePattern('_unpaid')
+    descr('Unpaid leave')
+
+    singlePattern('_holiday')
+    descr('Public or bank holiday (highest priority)')
+  end
+
   def rule_limitAttributes
     optionsRule('limitAttributesBody')
   end
@@ -2296,10 +2547,6 @@ EOT
     commaListRule('!journalSortCriterium')
   end
 
-  def rule_moreLeafResources
-    commaListRule('!resourceLeafList')
-  end
-
   def rule_moreListOfDays
     commaListRule('!weekDayInterval')
   end
@@ -2333,6 +2580,7 @@ Defines a navigator object with the specified ID. This object can be used in
 reports to include a navigation bar with references to other reports.
 EOT
           )
+    example('navigator')
   end
 
   def rule_navigatorAttributes
@@ -2512,6 +2760,7 @@ EOT
         error('operand_unkn_scen', "Unknown scenario ID #{scenario}",
               @sourceFileInfo[0])
       end
+      # TODO: Do at least some basic sanity checks of the attribute is valid.
       LogicalAttribute.new(attribute, @project.scenario(scenarioIdx))
     })
     pattern(%w( !date ), lambda {
@@ -2629,6 +2878,13 @@ EOT
        )
   end
 
+  def rule_optionalMinus
+    optional
+    pattern(%w( _- ), lambda {
+      true
+    })
+  end
+
   def rule_optionalPercent
     optional
     pattern(%w( !number _% ), lambda {
@@ -2697,6 +2953,44 @@ EOT
     repeatable
     optional
 
+    pattern(%w( _alertlevels !alertLevelDefinitions ), lambda {
+      if @val[1].length < 2
+        error('too_few_alert_levels',
+              'You must specify at least 2 different alert levels.',
+              @sourceFileInfo[1])
+      end
+      levels = @project['alertLevels']
+      levels.clear
+      @val[1].each do |level|
+        if levels.indexById(level[0])
+          error('alert_level_redef',
+                "Alert level '#{level[0]}' has been defined multiple times.",
+                @sourceFileInfo[1])
+        end
+
+        if levels.indexByName(level[1])
+          error('alert_name_redef',
+                "Alert level name '#{level[1]}' has been defined multiple " +
+                "times.", @sourceFileInfo[1])
+        end
+
+        @project['alertLevels'].add(AlertLevelDefinition.new(*level))
+      end
+    })
+    level(:beta)
+    doc('alertlevels', <<'EOT'
+By default TaskJuggler supports the pre-defined alert levels: green, yellow
+and red. This attribute can be used to replace them with your own set of alert
+levels. You can define any number of levels, but you need to define at least
+two and they must be specified in ascending order from the least severity to
+highest severity. Additionally, you need to provide a 15x15 pixel image file
+with the name ''''flag-X.png'''' for each level where ''''X'''' matches the ID
+of the alert level. These files need to be in the ''''icons'''' directory to
+be found by the browser when showing HTML reports.
+EOT
+       )
+    example('AlertLevels')
+
     pattern(%w( !currencyFormat ), lambda {
       @project['currencyFormat'] = @val[0]
     })
@@ -2860,7 +3154,7 @@ to the specified workinghours and vacation. It affects the conversion of
 working hours, working days, working weeks, working months and working years
 into each other.
 
-When public holidays and vacations are disregarded, this value should be equal
+When public holidays and leaves are disregarded, this value should be equal
 to the number of working days per week times 52.1428 (the average number of
 weeks per year). E. g. for a culture with 5 working days it is 260.714 (the
 default), for 6 working days it is 312.8568 and for 7 working days it is
@@ -2919,26 +3213,18 @@ EOT
   def rule_projectionAttributes
     optional
     repeatable
-    pattern(%w( _sloppy ), lambda {
-      warning('projection_sloppy',
-              'The sloppy projection mode has been deprecated. The ' +
-              'functionality is no longer supported.')
-    })
-    doc('sloppy.projection', <<'EOT'
-The sloppy projection mode has been deprecated. Please use
-[[trackingscenario]] feature instead.
-EOT
-       )
+    pattern(%w( _sloppy ))
+    level(:deprecated)
+    also('trackingscenario')
+    doc('sloppy.projection', '')
 
     pattern(%w( _strict ), lambda {
       warning('projection_strict',
               'The strict mode is now always used.')
     })
-    doc('strict.projection', <<'EOT'
-The strict projection mode has been deprecated. Please use
-[[trackingscenario]] feature instead.
-EOT
-       )
+    level(:deprecated)
+    also('trackingscenario')
+    doc('strict.projection', '')
   end
 
   def rule_projectProlog
@@ -2969,15 +3255,13 @@ EOT
     lastSyntaxToken(1)
     doc('include.project', <<'EOT'
 Includes the specified file name as if its contents would be written
-instead of the include property. The only exception is the include
-statement itself. When the included files contains other include
-statements or report definitions, the filenames are relative to file
+instead of the include property. When the included files contains other
+include statements or report definitions, the filenames are relative to file
 where they are defined in.
 
-The included files may only contain content that may be present in a project
-header section.
-
-If the include statement is the last statement in the file it must have the option block. The option block can be empty, but the curly braces must be present.
+This version of the include directive may only be used inside the [[project]]
+header section. The included files must only contain content that may be
+present in a project header section.
 EOT
        )
   end
@@ -2992,7 +3276,8 @@ statement itself. When the included files contains other include
 statements or report definitions, the filenames are relative to file
 where they are defined in.
 
-The included file may only contain macro definitions.
+The included file may only contain macro definitions. This version of the
+include directive can only be used before the [[project]] header.
 EOT
        )
   end
@@ -3021,8 +3306,6 @@ EOT
       @project['revenueAccount'] = @val[0][1]
     })
 
-    pattern(%w( !export ))
-
     pattern(%w( _flags !declareFlagList ), lambda {
       unless @project['flags'].include?(@val[1])
         @project['flags'] += @val[1]
@@ -3033,9 +3316,14 @@ Declare one or more flag for later use. Flags can be used to mark tasks, resourc
 EOT
        )
 
-    pattern(%w( !iCalReport ))
     pattern(%w( !propertiesInclude ))
 
+    pattern(%w( !leaves ), lambda {
+      @val[0].each do |v|
+        @project['leaves'] << v
+      end
+    })
+
     pattern(%w( !limits ), lambda {
       @project['limits'] = @val[0]
     })
@@ -3048,8 +3336,6 @@ EOT
 
     pattern(%w( !macro ))
 
-    pattern(%w( !nikuReport ))
-
     pattern(%w( !navigator ))
 
     pattern(%w( _projectid $ID ), lambda {
@@ -3082,12 +3368,10 @@ Set the default rate for all subsequently defined resources. The rate describes
 EOT
         )
 
-    pattern(%w( !report ))
+    pattern(%w( !reportProperties ))
     pattern(%w( !resource ))
-    pattern(%w( !tagfile ))
     pattern(%w( !shift ))
     pattern(%w( !statusSheet ))
-    pattern(%w( !statusSheetReport ))
 
     pattern(%w( _supplement !supplement ))
     doc('supplement', <<'EOT'
@@ -3105,10 +3389,11 @@ EOT
 
     pattern(%w( !task ))
     pattern(%w( !timeSheet ))
-    pattern(%w( !timeSheetReport ))
     pattern(%w( _vacation !vacationName !intervals ), lambda {
       begin
-        @project['vacations'] = @project['vacations'] + @val[2]
+        @val[2].each do |interval|
+          @project['leaves'] << Leave.new(:holiday, interval)
+        end
       rescue AttributeOverwrite
       end
     })
@@ -3129,6 +3414,7 @@ EOT
   def rule_propertiesInclude
     pattern(%w( _include !includeProperties !properties . ), lambda {
     })
+    lastSyntaxToken(1)
     doc('include.properties', <<'EOT'
 Includes the specified file name as if its contents would be written
 instead of the include property. The only exception is the include
@@ -3157,11 +3443,6 @@ EOT
       else
         attr = @property.get(@val[1])
       end
-      unless attr.is_a?(Array)
-        error('purge_no_list',
-              "#{@val[1]} is not a list attribute. Only those can be purged.",
-              @sourceFileInfo[1])
-      end
       if @property.attributeDefinition(@val[1]).scenarioSpecific
         @property.getAttribute(@val[1], @scenarioIdx).reset
       else
@@ -3169,11 +3450,16 @@ EOT
       end
     })
     doc('purge', <<'EOT'
-List attributes, like regular attributes, can inherit their values from the
-enclosing property. By defining more values for such a list attribute, the new
-values will be appended to the existing ones. The purge statement clears such
-a list atribute. A subsequent definition for the attribute within the property
-will then add their values to an empty list.
+Many attributes inherit their values from the enclosing property or the global
+scope. In certain circumstances, this is not desirable, e. g. for list
+attributes. A list attribute is any attribute that takes a comma separated
+list of values as argument. [[allocate]] and [[flags.task]] are
+good examples of commonly used list attributes. By defining values for
+such a list attribute in a nested property, the new values will be appended to
+the list that was inherited from the enclosing property. The purge
+attribute resets any attribute to its default value. A subsequent definition
+for the attribute within the property will then add their values to an empty
+list. The value of the enclosing property is not affected by purge.
 EOT
        )
     arg(1, 'attribute', 'Any name of a list attribute')
@@ -3202,35 +3488,29 @@ EOT
     })
   end
 
-  def rule_report
-    pattern(%w( !reportHeader !reportBody ), lambda {
-      @property = @property.parent
-    })
-    doc('report', <<'EOT'
-Reports are used to store and vizualize the results of a scheduled project.
-The content, the output format and the appearance of a report can be adjusted
-with report attributes. Reports can be nested to create structured document
-trees. As with other properties, the resource attributes can be inherited from
-the enclosing report or the project.
 
-By default, report definitions do not generate any files. With more complex
-projects, most report definitions will be used to describe elements of
-composed reports. If you want to generate a file from this report, you must
-specify the list of [[formats]] that you want to generate. The report name
-will then be used as a base name to create the file. The suffix will be
-appended based on the generated format.
+  def rule_reports
+    pattern(%w( !accountReport ))
+    pattern(%w( !resourceReport ))
+    pattern(%w( !taskReport ))
+    pattern(%w( !textReport ))
+  end
 
-Reports have a local name space. All IDs must be unique within the reports
-that belong to the same enclosing report. To reference a report for inclusion
-into another report, you need to specify the full report ID. This is composed
-of the report ID, prefixed by a dot-separated list of all parent report IDs.
+  def rule_reportableAttributes
+    singlePattern('_annualleave')
+    descr(<<'EOT'
+The number of annual leave units within the reported time period. The unit
+can be adjusted with [[loadunit]].
 EOT
-       )
-    also(%w( resourcereport taskreport textreport ))
-  end
+         )
 
+    singlePattern('_annualleavebalance')
+    descr(<<'EOT'
+The balance of the annual leave at the end of the reporting interval. The unit
+can be adjusted with [[loadunit]].
+EOT
+         )
 
-  def rule_reportableAttributes
     singlePattern('_alert')
     descr(<<'EOT'
 The alert level of the property that was reported with the date closest to the
@@ -3242,9 +3522,13 @@ EOT
          )
 
     singlePattern('_alertmessages')
+    level(:deprecated)
+    also('journal')
     descr('Deprecated. Please use ''''journal'''' instead')
 
     singlePattern('_alertsummaries')
+    level(:deprecated)
+    also('journal')
     descr('Deprecated. Please use ''''journal'''' instead')
 
     singlePattern('_alerttrend')
@@ -3255,6 +3539,12 @@ or flat.
 EOT
          )
 
+    singlePattern('_balance')
+    descr('The account balance at the beginning of the reported period.')
+
+    singlePattern('_bsi')
+    descr('The hierarchical or work breakdown structure index (i. e. 1.2.3)')
+
     singlePattern('_chart')
     descr(<<'EOT'
 A Gantt chart. This column type requires all lines to have the same fixed
@@ -3282,6 +3572,8 @@ EOT
     pattern([ '_completed' ], lambda {
       'complete'
     })
+    level(:deprecated)
+    also('complete')
     descr('Deprecated alias for complete')
 
     singlePattern('_criticalness')
@@ -3368,17 +3660,35 @@ EOT
     descr(<<'EOT'
 The Full-Time-Equivalent of a resource or group. This is the ratio of the
 resource working time and the global working time. Working time is defined by
-working hours and vacations. The FTE value can vary over time and is
+working hours and leaves. The FTE value can vary over time and is
 calculated for the report interval or the user specified interval.
+EOT
+         )
+
+    singlePattern('_gauge')
+    descr(<<'EOT'
+When [[complete]] values have been provided to capture the actual progress on
+tasks, the gauge column will list whether the task is ahead of, behind or on
+schedule.
 EOT
          )
 
     singlePattern('_headcount')
-    descr('The headcount number of the resource or group')
+    descr(<<'EOT'
+For resources this is the headcount number of the resource or resource group.
+For a single resource this is the [[efficiency]] rounded to the next integer.
+For a group it is the sum of the sub resources headcount.
+
+For tasks it's the number of different resources allocated to the task during
+the report interval. Resources are weighted with their rounded efficiencies.
+EOT
+         )
 
     pattern([ '_hierarchindex' ], lambda {
       'bsi'
     })
+    level(:deprecated)
+    also('bsi')
     descr('Deprecated alias for bsi')
 
     singlePattern('_hourly')
@@ -3411,12 +3721,18 @@ EOT
          )
 
     singlePattern('_journal_sub')
+    level(:deprecated)
+    also('journal')
     descr('Deprecated. Please use ''''journal'''' instead')
 
     singlePattern('_journalmessages')
+    level(:deprecated)
+    also('journal')
     descr('Deprecated. Please use ''''journal'''' instead')
 
     singlePattern('_journalsummaries')
+    level(:deprecated)
+    also('journal')
     descr('Deprecated. Please use ''''journal'''' instead')
 
     singlePattern('_line')
@@ -3521,6 +3837,20 @@ EOT
     singlePattern('_seqno')
     descr('The index of the item based on the declaration order')
 
+    singlePattern('_sickleave')
+    descr(<<'EOT'
+The number of sick leave units within the reported time period. The unit can
+be adjusted with [[loadunit]].
+EOT
+         )
+
+    singlePattern('_specialleave')
+    descr(<<'EOT'
+The number of special leave units within the reported time period. The unit
+can be adjusted with [[loadunit]].
+EOT
+         )
+
     singlePattern('_start')
     descr('The start date of the task')
 
@@ -3544,10 +3874,16 @@ EOT
     pattern([ '_wbs' ], lambda {
       'bsi'
     })
+    level(:deprecated)
+    also('bsi')
     descr('Deprecated alias for bsi.')
 
-    singlePattern('_bsi')
-    descr('The hierarchical or work breakdown structure index')
+    singlePattern('_unpaidleave')
+    descr(<<'EOT'
+The number of unpaid leave units within the reported time period. The unit
+can be adjusted with [[loadunit]].
+EOT
+         )
 
     singlePattern('_weekly')
     descr('A group of columns with one column for each week')
@@ -3561,6 +3897,23 @@ EOT
     optional
     repeatable
 
+    pattern(%w( _accountroot !accountId), lambda {
+      if @val[1].leaf?
+        error('accountroot_leaf',
+              "#{@val[1].fullId} is not a container account",
+              @sourceFileInfo[1])
+      end
+      @property.set('accountRoot', @val[1])
+    })
+    doc('accountroot', <<'EOT'
+Only accounts below the specified root-level accounts are exported. The exported
+accounts will have the ID of the root-level account stripped from their ID, so that
+the sub-accounts of the root-level account become top-level accounts in the report
+file.
+EOT
+       )
+    example('AccountReport')
+
     pattern(%w( !balance ), lambda {
       @property.set('costAccount', @val[0][0])
       @property.set('revenueAccount', @val[0][1])
@@ -3586,6 +3939,7 @@ be interpreted as [[Rich_Text_Attributes|Rich Text]].
 EOT
        )
     arg(1, 'text', 'The text')
+    example('textreport')
 
     pattern(%w( _columns !columnDef !moreColumnDef ), lambda {
       columns = [ @val[1] ]
@@ -3631,6 +3985,7 @@ Define a text section that is put at the bottom of the report. The
 text will be interpreted as [[Rich_Text_Attributes|Rich Text]].
 EOT
        )
+    example('textreport')
     also(%w( epilog header prolog ))
 
     pattern(%w( !formats ))
@@ -3643,10 +3998,12 @@ Define a text section that is put at the top of the report. The
 text will be interpreted as [[Rich_Text_Attributes|Rich Text]].
 EOT
        )
+    example('textreport')
     also(%w( epilog footer prolog ))
 
     pattern(%w( !headline ))
     pattern(%w( !hidejournalentry ))
+    pattern(%w( !hideaccount ))
     pattern(%w( !hideresource ))
     pattern(%w( !hidetask ))
     pattern(%w( !journalReportAttributes ))
@@ -3667,6 +4024,7 @@ will be interpreted as [[Rich_Text_Attributes|Rich Text]]. The margin will not
 span the [[header]] or [[footer]] sections.
 EOT
        )
+    example('textreport')
 
     pattern(%w( _loadunit !loadunit ), lambda {
       @property.set('loadUnit', @val[1])
@@ -3698,7 +4056,7 @@ EOT
     also(%w( epilog footer header ))
 
     pattern(%w( !purge ))
-    pattern(%w( !report ))
+    pattern(%w( !reports ))
 
     pattern(%w( _right $STRING ), lambda {
       @property.set('right', newRichText(@val[1], @sourceFileInfo[1]))
@@ -3709,7 +4067,9 @@ will be interpreted as [[Rich_Text_Attributes|Rich Text]]. The margin will not
 span the [[header]] or [[footer]] sections.
 EOT
        )
+    example('textreport')
 
+    pattern(%w( !rollupaccount ))
     pattern(%w( !rollupresource ))
     pattern(%w( !rolluptask ))
 
@@ -3737,6 +4097,7 @@ used.
 EOT
        )
 
+    pattern(%w( !sortAccounts ))
     pattern(%w( !sortJournalEntries ))
     pattern(%w( !sortResources ))
     pattern(%w( !sortTasks ))
@@ -3834,6 +4195,31 @@ EOT
     singlePattern('$ID')
   end
 
+  def rule_reportName
+    pattern(%w( $STRING ), lambda {
+      @val[0]
+    })
+    arg(0, 'name', <<'EOT'
+The name of the report. This will be the base name for generated output files.
+The suffix will depend on the specified [[formats]]. It will also be used in
+navigation bars.
+
+By default, report definitions do not generate any files. With more complex
+projects, most report definitions will be used to describe elements of
+composed reports. If you want to generate a file from this report, you must
+specify the list of [[formats]] that you want to generate. The report name
+will then be used as a base name to create the file. The suffix will be
+appended based on the generated format.
+
+Reports have a local name space. All IDs and file names must be unique within
+the reports that belong to the same enclosing report. To reference a report
+for inclusion into another report, you need to specify the full report ID.
+This is composed of the report ID, prefixed by a dot-separated list of all
+parent report IDs.
+EOT
+       )
+  end
+
   def rule_reportPeriod
     pattern(%w( _period !interval ), lambda {
       @property.set('start', @val[1].start)
@@ -3846,6 +4232,28 @@ EOT
        )
   end
 
+  def rule_reportProperties
+    pattern(%w( !export ))
+    pattern(%w( !iCalReport ))
+    pattern(%w( !nikuReport ))
+    pattern(%w( !reports ))
+    pattern(%w( !tagfile ))
+    pattern(%w( !statusSheetReport ))
+    pattern(%w( !timeSheetReport ))
+  end
+
+  def rule_reportPropertiesBody
+    optional
+    repeatable
+
+    pattern(%w( !macro ))
+    pattern(%w( !reportProperties ))
+  end
+
+  def rule_reportPropertiesFile
+    pattern(%w( !reportPropertiesBody . ))
+  end
+
   def rule_reportStart
     pattern(%w( _start !date ), lambda {
       if @val[1] > @property.get('end')
@@ -3866,93 +4274,6 @@ EOT
     optionsRule('reportAttributes')
   end
 
-  def rule_reportHeader
-    pattern(%w( !reportType !optionalID $STRING ), lambda {
-      if @property.nil? && !@reportprefix.empty?
-        @property = @project.report(@reportprefix)
-      end
-      if @val[1]
-        id = (@property ? @property.fullId + '.' : '') + @val[1]
-        if @project.report(id)
-          error('report_exists', "report #{id} has already been defined.",
-                @sourceFileInfo[1], @property)
-        end
-      end
-      @property = Report.new(@project, @val[1], @val[2], @property)
-      @property.sourceFileInfo = @sourceFileInfo[0]
-      @property.inheritAttributes
-      case @val[0]
-      when 'taskreport'
-        @property.typeSpec = :taskreport
-        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?('softTask')
-          @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
-      when 'resourcereport'
-        @property.typeSpec = :resourcereport
-        if @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
-      when 'textreport'
-        @property.typeSpec = :textreport
-      else
-        raise "Unsupported report type #{@val[0]}"
-      end
-    })
-    arg(2, 'name', <<'EOT'
-The name of the report. This will be the base name for generated output files.
-The suffix will depend on the specified [[formats]].It will also be used in
-navigation bars.
-EOT
-       )
-  end
-
   def rule_reportTitle
     pattern(%w( _title $STRING ), lambda {
       @property.set('title', @val[1])
@@ -3964,47 +4285,6 @@ EOT
        )
   end
 
-  def rule_reportType
-    singlePattern('_resourcereport')
-    doc('resourcereport', <<'EOT'
-The report lists resources and their respective values in a table. The task
-that are the resources are allocated to can be listed as well. To reduce the
-list of included resources, you can use the [[hideresource]],
-[[rollupresource]] or [[resourceroot]] attributes. The order of the task can
-be controlled with [[sortresources]]. If the first sorting criteria is tree
-sorting, the parent resources will always be included to form the tree.
-Tree sorting is the default. You need to change it if you do not want certain
-parent resources to be included in the report.
-
-The tasks that the resources are allocated to can be included as well. Use the
-[[hidetask]] attribute for this. See [[report]] for a complete list of
-attributes and the full syntax for this keyword.
-EOT
-       )
-    singlePattern('_taskreport')
-    doc('taskreport', <<'EOT'
-The report lists tasks and their respective values in a table. To reduce the
-list of included tasks, you can use the [[hidetask]], [[rolluptask]] or
-[[taskroot]] attributes. The order of the task can be controlled with
-[[sorttasks]]. If the first sorting criteria is tree sorting, the parent tasks
-will always be included to form the tree. Tree sorting is the default. You
-need to change it if you do not want certain parent tasks to be included in
-the report.
-
-The resources that are allocated to each task can be listed as well. Use the
-[[hideresource]] attribute for this. See [[report]] for a complete list of
-attributes and the full syntax for this keyword.
-EOT
-       )
-    singlePattern('_textreport')
-    doc('textreport', <<'EOT'
-This report consists of 5 RichText sections, a header, a center section with a
-left and right margin and a footer. The sections may contain the output of
-other defined reports. See [[report]] for further details.
-EOT
-       )
-  end
-
   def rule_resource
     pattern(%w( !resourceHeader !resourceBody ), lambda {
        @property = @property.parent
@@ -4117,16 +4397,70 @@ EOT
   end
 
   def rule_resourceLeafList
-    pattern(%w( !leafResourceId !moreLeafResources ), lambda {
-      [ @val[0] ] + (@val[1].nil? ? [] : @val[1])
-    })
+    listRule('moreResourceLeafList', '!leafResourceId')
   end
 
   def rule_resourceList
     listRule('moreResources', '!resourceId')
   end
 
+  def rule_resourceReport
+    pattern(%w( !resourceReportHeader !reportBody ), lambda {
+      @property = @property.parent
+    })
+    doc('resourcereport', <<'EOT'
+The report lists resources and their respective values in a table. The task
+that are the resources are allocated to can be listed as well. To reduce the
+list of included resources, you can use the [[hideresource]],
+[[rollupresource]] or [[resourceroot]] attributes. The order of the task can
+be controlled with [[sortresources]]. If the first sorting criteria is tree
+sorting, the parent resources will always be included to form the tree.
+Tree sorting is the default. You need to change it if you do not want certain
+parent resources to be included in the report.
+
+The tasks that the resources are allocated to can be included as well. Use the
+[[hidetask]] attribute for this.
+EOT
+       )
+  end
+
+  def rule_resourceReportHeader
+    pattern(%w( _resourcereport !optionalID !reportName ), lambda {
+      newReport(@val[1], @val[2], :resourcereport, @sourceFileInfo[0])
+
+      if @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
+
   def rule_resourceScenarioAttributes
+    pattern(%w( !chargeset ))
+
     pattern(%w( _efficiency !number ), lambda {
       @property['efficiency', @scenarioIdx] = @val[1]
     })
@@ -4184,6 +4518,15 @@ EOT
 
     pattern(%w( !fail ))
 
+    pattern(%w( !leaveAllowances ))
+
+    pattern(%w( !leaves ), lambda {
+      begin
+        @property['leaves', @scenarioIdx] += @val[0]
+      rescue AttributeOverwrite
+      end
+    })
+
     pattern(%w( !limits ), lambda {
       @property['limits', @scenarioIdx] = @val[0]
     })
@@ -4221,14 +4564,36 @@ The rate specifies the daily cost of the resource.
 EOT
        )
 
-    pattern(%w( _shift !shiftAssignments ))
+    pattern(%w( !resourceShiftAssignments !shiftAssignments ), lambda {
+      checkContainer('shifts')
+      # Set same value again to set the 'provided' state for the attribute.
+      begin
+        @property['shifts', @scenarioIdx] = @shiftAssignments
+      rescue AttributeOverwrite
+        # Multiple shift assignments are a common idiom, so don't warn about
+        # them.
+      end
+      @shiftAssignments = nil
+    })
+    level(:deprecated)
+    also('shift.resource')
     doc('shift.resource', <<'EOT'
 This keyword has been deprecated. Please use [[shifts.resource|shifts
 (resource)]] instead.
 EOT
        )
 
-    pattern(%w( _shifts !shiftAssignments ))
+    pattern(%w( !resourceShiftsAssignments !shiftAssignments ), lambda {
+      checkContainer('shifts')
+      # Set same value again to set the 'provided' state for the attribute.
+      begin
+        @property['shifts', @scenarioIdx] = @shiftAssignments
+      rescue AttributeOverwrite
+        # Multiple shift assignments are a common idiom, so don't warn about
+        # them.
+      end
+      @shiftAssignments = nil
+    })
     doc('shifts.resource', <<'EOT'
 Limits the working time of a resource to a defined shift during the specified
 interval. Multiple shifts can be defined, but shift intervals may not overlap.
@@ -4239,8 +4604,10 @@ EOT
 
     pattern(%w( _vacation !vacationName !intervals ), lambda {
       begin
-        @property['vacations', @scenarioIdx] =
-          @property['vacations', @scenarioIdx ] + @val[2]
+        @val[2].each do |interval|
+          # We map the old 'vacation' attribute to public holidays.
+          @property['leaves', @scenarioIdx] << Leave.new(:holiday, interval)
+        end
       rescue AttributeOverwrite
       end
     })
@@ -4258,6 +4625,29 @@ EOT
     # Other attributes will be added automatically.
   end
 
+  def rule_resourceShiftAssignments
+    pattern(%w( _shift ), lambda {
+      @shiftAssignments = @property['shifts', @scenarioIdx]
+    })
+  end
+
+  def rule_resourceShiftsAssignments
+    pattern(%w( _shifts ), lambda {
+      @shiftAssignments = @property['shifts', @scenarioIdx]
+    })
+  end
+
+  def rule_rollupaccount
+    pattern(%w( _rollupaccount !logicalExpression ), lambda {
+      @property.set('rollupAccount', @val[1])
+    })
+    doc('rollupaccount', <<'EOT'
+Do not show sub-accounts of accounts that match the specified logical
+expression.
+EOT
+       )
+  end
+
   def rule_rollupresource
     pattern(%w( _rollupresource !logicalExpression ), lambda {
       @property.set('rollupResource', @val[1])
@@ -4323,6 +4713,8 @@ EOT
     pattern(%w( _disabled ), lambda {
       @property.set('active', false)
     })
+    level(:deprecated)
+    also('active')
     doc('disabled', <<'EOT'
 This attribute is deprecated. Please use [active] instead.
 
@@ -4334,6 +4726,8 @@ EOT
     pattern(%w( _enabled ), lambda {
       @property.set('active', true)
     })
+    level(:deprecated)
+    also('active')
     doc('enabled', <<'EOT'
 This attribute is deprecated. Please use [active] instead.
 
@@ -4342,11 +4736,9 @@ scenario.
 EOT
        )
 
-    pattern(%w( _projection !projection ), lambda {
-      warning('projection',
-              'The \'projection\' keyword has been deprecated. Please use ' +
-              '[[trackingscenario]] feature instead.')
-    })
+    pattern(%w( _projection !projection ))
+    level(:deprecated)
+    also('booking.task')
     doc('projection', <<'EOT'
 This keyword has been deprecated! Don't use it anymore!
 
@@ -4400,7 +4792,7 @@ EOT
   def rule_scenarioIdCol
     pattern(%w( $ID_WITH_COLON ), lambda {
       if (@scenarioIdx = @project.scenarioIdx(@val[0])).nil?
-        error('unknown_scenario_id', "Unknown scenario: @val[0]",
+        error('unknown_scenario_id', "Unknown scenario: #{@val[0]}",
               @sourceFileInfo[0])
       end
     })
@@ -4432,7 +4824,7 @@ 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
-vacations and a time zone.
+leaves and a time zone.
 
 Shifts have a global name space. All IDs must be unique within the shifts of
 the project.
@@ -4444,27 +4836,23 @@ EOT
   def rule_shiftAssignment
     pattern(%w( !shiftId !intervalOptional ), lambda {
       # Make sure we have a ShiftAssignment for the property.
-      sa = @property['shifts', @scenarioIdx] || ShiftAssignments.new
-      sa.project = @project
+      unless @shiftAssignments
+        @shiftAssignments = ShiftAssignments.new
+        @shiftAssignments.project = @project
+      end
 
       if @val[1].nil?
         interval = TimeInterval.new(@project['start'], @project['end'])
       else
         interval = @val[1]
       end
-      if !sa.addAssignment(ShiftAssignment.new(@val[0].scenario(@scenarioIdx),
-                                               interval))
+      if !@shiftAssignments.addAssignment(
+         ShiftAssignment.new(@val[0].scenario(@scenarioIdx), interval))
         error('shift_assignment_overlap',
               'Shifts may not overlap each other.',
               @sourceFileInfo[0], @property)
       end
-      # Set same value again to set the 'provided' state for the attribute.
-      begin
-        @property['shifts', @scenarioIdx] = sa
-      rescue AttributeOverwrite
-        # Multiple shift assignments are a common idiom, so don't warn about
-        # them.
-      end
+      @shiftAssignments.assignments.last
     })
   end
 
@@ -4513,11 +4901,22 @@ EOT
   end
 
   def rule_shiftScenarioAttributes
+    pattern(%w( !leaves ), lambda {
+      begin
+        @property['leaves', @scenarioIdx] += @val[0]
+      rescue AttributeOverwrite
+      end
+    })
+
     pattern(%w( _replace ), lambda {
       @property['replace', @scenarioIdx] = true
     })
     doc('replace', <<'EOT'
-Use this attribute if the vacation definition for the shift should replace the vacation settings of a resource. This is only effective for shifts that are assigned to resources directly. It is not effective for shifts that are assigned to tasks or allocations.
+This replace mode is only effective for shifts that are assigned to resources
+directly. When replace mode is activated the leave definitions of the shift
+will replace all the leave definitions of the resource for the given period.
+
+The mode is not effective for shifts that are assigned to tasks or allocations.
 EOT
        )
 
@@ -4544,8 +4943,13 @@ EOT
        )
 
     pattern(%w( _vacation !vacationName !intervalsOptional ), lambda {
-      @property['vacations', @scenarioIdx] =
-        @property['vacations', @scenarioIdx ] + @val[2]
+      begin
+        @val[2].each do |interval|
+          # We map the old 'vacation' attribute to public holidays.
+          @property['leaves', @scenarioIdx] << Leave.new(:holiday, interval)
+        end
+      rescue AttributeOverwrite
+      end
     })
     doc('vacation.shift', <<'EOT'
 Specify a vacation period associated with this shift.
@@ -4640,6 +5044,19 @@ EOT
         )
   end
 
+  def rule_sortAccounts
+    pattern(%w( _sortaccounts !sortCriteria ), lambda {
+      @property.set('sortAccounts', @val[1])
+    })
+    doc('sortaccounts', <<'EOT'
+Determines how the accounts are sorted in the report. Multiple criteria can be
+specified as a comma separated list. If one criteria is not sufficient to sort
+a group of accounts, the next criteria will be used to sort the accounts in
+this group.
+EOT
+       )
+  end
+
   def rule_sortResources
     pattern(%w( _sortresources !sortCriteria ), lambda {
       @property.set('sortResources', @val[1])
@@ -4680,27 +5097,23 @@ EOT
   end
   def rule_ssReportHeader
     pattern(%w( _statussheetreport !optionalID $STRING ), lambda {
-      if (fileName = @val[2]) != '.'
-        if @project.reports[fileName]
-          error('report_redefinition',
-                "A report with the name '#{fileName}' has already been " +
-                "defined.", @sourceFileInfo[2])
-        end
-      else
-        fileName = "statusSheet#{@project.reports.length + 1}"
+      newReport(@val[1], @val[2], :statusSheet, @sourceFileInfo[0])
+      @property.set('formats', [ :tjp ])
+
+      unless @project.scenario(0).get('active')
+        @property.set('scenarios', [ 0 ])
       end
-      report = newReport(@val[1], fileName, :statusSheet, @sourceFileInfo[0])
-      report.set('scenarios', [ 0 ])
       # Show all tasks, sorted by id-up.
-      report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      report.set('sortTasks', [ [ 'id', true, -1 ] ])
+      @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('sortTasks', [ [ 'id', true, -1 ] ])
       # Show all resources, sorted by seqno-up.
-      report.set('hideResource', LogicalExpression.new(LogicalOperation.new(0)))
-      report.set('sortResources', [ [ 'seqno', true, -1 ] ])
-      report.set('loadUnit', :hours)
-      report.set('definitions', [])
+      @property.set('hideResource',
+                    LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
+      @property.set('loadUnit', :hours)
+      @property.set('definitions', [])
     })
-    arg(1, 'file name', <<'EOT'
+    arg(2, 'file name', <<'EOT'
 The name of the status sheet report file to generate. It must end with a .tji
 extension, or use . to use the standard output channel.
 EOT
@@ -4759,7 +5172,7 @@ EOT
                                        @sourceFileInfo[0])
       @journalEntry.alertLevel = @val[1]
       @journalEntry.author = @sheetAuthor
-
+      @journalEntry.moderators << @sheetModerator
     })
   end
 
@@ -4812,8 +5225,18 @@ EOT
               'No trackingscenario defined.')
       end
       @sheetAuthor = @val[1]
+      @sheetModerator = @val[1]
       @sheetStart = @val[2].start
       @sheetEnd = @val[2].end
+      # Make sure that we don't have any status sheet entries from the same
+      # author for the same report period. There may have been a previous
+      # submission of the same report and this is an update to it. All old
+      # entries must be removed before we process the sheet.
+      @project['journal'].delete_if do |e|
+        # Journal entries from status sheets have the sheet end date as entry
+        # date.
+        e.moderators.include?(@sheetModerator) && e.date == @sheetEnd
+      end
     })
     arg(1, 'reporter', <<'EOT'
 The ID of a defined resource. This identifies the status reporter. Unless the
@@ -4941,7 +5364,7 @@ EOT
     pattern(%w( _report !reportId ), lambda {
       @property = @val[1]
     })
-    arg(1, 'report ID', 'The ID of an already defined report.')
+    arg(1, 'report ID', 'The absolute ID of an already defined report.')
   end
 
   def rule_supplementResource
@@ -4955,7 +5378,7 @@ EOT
     pattern(%w( _task !taskId ), lambda {
       @property = @val[1]
     })
-    arg(1, 'task ID', 'The ID of an already defined task.')
+    arg(1, 'task ID', 'The absolute ID of an already defined task.')
   end
 
   def rule_tagfile
@@ -4973,16 +5396,16 @@ EOT
 
   def rule_tagfileHeader
     pattern(%w( _tagfile !optionalID $STRING ), lambda {
-      report = newReport(@val[1], @val[2], :tagfile, @sourceFileInfo[0])
-
+      newReport(@val[1], @val[2], :tagfile, @sourceFileInfo[0])
       @property.set('formats', [ :ctags ])
+
       # Include all tasks.
-      report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      report.set('sortTasks', [ [ 'seqno', true, -1 ] ])
+      @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
       # Include all resources.
-      report.set('hideResource',
-                  LogicalExpression.new(LogicalOperation.new(0)))
-      report.set('sortResources', [ [ 'seqno', true, -1 ] ])
+      @property.set('hideResource',
+                    LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
     })
     arg(2, 'file name', <<'EOT'
 The name of the tagfile to generate. You can leave it empty and it will
@@ -5032,6 +5455,7 @@ EOT
         @property.adopt(task)
       end
     })
+    level(:experimental)
     doc('adopt.task', <<'EOT'
 Add a previously defined task to the sub-tasks of this task. This can be used
 to create virtual sub projects that contain of task trees that were defined as
@@ -5039,10 +5463,7 @@ sub tasks of other tasks. Adopted tasks don't inherit anything from their step
 parents. However, the adopting task is scheduled to fit all adopted childs as
 well.
 
-The adopting task and the adopted task must not share a common top-level task.
-Adopted tasks may not have overlaping sub trees.
-
-'''This feature is experimental right now. Don't use it!'''.
+A top-level tasks must never include the same task more than once.
 EOT
        )
 
@@ -5135,7 +5556,7 @@ Specifies the minimum required gap between the end of a preceding task and the
 start of this task, or the start of a following task and the end of this task.
 This is working time, not calendar time. 7d means 7 working days, not one
 week. Whether a day is considered a working day or not depends on the defined
-working hours and global vacations.
+working hours and global leaves.
 EOT
        )
 
@@ -5285,15 +5706,65 @@ EOT
     })
   end
 
-  def rule_taskScenarioAttributes
-
-    pattern(%w( _account $ID ), lambda {
-      # TODO
+  def rule_taskReport
+    pattern(%w( !taskReportHeader !reportBody ), lambda {
+      @property = @property.parent
     })
-    doc('account.task', <<'EOT'
-This property has been deprecated. Use [[charge]] instead.
+    doc('taskreport', <<'EOT'
+The report lists tasks and their respective values in a table. To reduce the
+list of included tasks, you can use the [[hidetask]], [[rolluptask]] or
+[[taskroot]] attributes. The order of the task can be controlled with
+[[sorttasks]]. If the first sorting criteria is tree sorting, the parent tasks
+will always be included to form the tree. Tree sorting is the default. You
+need to change it if you do not want certain parent tasks to be included in
+the report.
+
+The resources that are allocated to each task can be listed as well. Use the
+[[hideresource]] attribute for this.
 EOT
-        )
+       )
+    example('HtmlTaskReport')
+  end
+
+  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))
+        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
+
+  def rule_taskScenarioAttributes
+
+    pattern(%w( _account $ID ))
+    level(:removed)
+    also('chargeset')
+    doc('account.task', '')
 
     pattern(%w( !allocate ))
 
@@ -5381,10 +5852,13 @@ EOT
     })
     doc('complete', <<'EOT'
 Specifies what percentage of the task is already completed. This can be useful
-for project tracking. Reports with calendar elements may show the completed
-part of the task in a different color. The completion percentage has no impact
-on the scheduler. It's meant for documentation purposes only.
-Tasks may not have subtasks if this attribute is used.
+for simple progress tracking like in a TODO list. The provided completion
+degree is used for the ''''complete'''' and ''''gauge'''' columns in reports.
+Reports with calendar elements may show the completed part of the task in a
+different color.
+
+The completion percentage has no impact on the scheduler. It's meant for
+documentation purposes only.
 EOT
         )
     example('Complete', '1')
@@ -5479,12 +5953,13 @@ EOT
         @property['charge', @scenarioIdx] +
         [ Charge.new(@val[1], :onEnd, @property, @scenarioIdx) ]
     })
+    level(:deprecated)
     doc('endcredit', <<'EOT'
 Specifies an amount that is credited to the accounts specified by the
-[[chargeset]] attributes at the moment the tasks ends. This attribute has been
-deprecated and should no longer be used. Use [[charge]] instead.
+[[chargeset]] attributes at the moment the tasks ends.
 EOT
        )
+    also('charge')
     example('Account', '1')
     pattern(%w( !flags ))
     doc('flags.task', <<'EOT'
@@ -5511,7 +5986,7 @@ 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
-vacations matter. If a resource has additinal working hours defined, it's
+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
@@ -5593,12 +6068,13 @@ EOT
       @property['charge', @scenarioIdx] +=
         [ Charge.new(@val[1], :onStart, @property, @scenarioIdx) ]
     })
+    level(:deprecated)
     doc('startcredit', <<'EOT'
 Specifies an amount that is credited to the account specified by the
-[[chargeset]] attributes at the moment the tasks starts. This attribute has
-been deprecated and should no longer be used. Use [[charge]] instead.
+[[chargeset]] attributes at the moment the tasks starts.
 EOT
        )
+    also('charge')
     pattern(%w( !taskPeriod ))
 
     pattern(%w( _precedes !taskPredList ), lambda {
@@ -5742,17 +6218,34 @@ end attribute comes after the start attribute.
 EOT
        )
 
-    pattern(%w( _shift !shiftAssignments ), lambda {
+    pattern(%w( !taskShiftAssignments !shiftAssignments ), lambda {
       checkContainer('shift')
+      # Set same value again to set the 'provided' state for the attribute.
+      begin
+        @property['shifts', @scenarioIdx] = @shiftAssignments
+      rescue AttributeOverwrite
+        # Multiple shift assignments are a common idiom, so don't warn about
+        # them.
+      end
+      @shiftAssignments = nil
     })
+    level(:deprecated)
     doc('shift.task', <<'EOT'
 This keyword has been deprecated. Please use [[shifts.task|shifts
 (task)]] instead.
 EOT
        )
+    also('shifts.task')
 
-    pattern(%w( _shifts !shiftAssignments ), lambda {
+    pattern(%w( !taskShiftsAssignments !shiftAssignments ), lambda {
       checkContainer('shifts')
+      begin
+        @property['shifts', @scenarioIdx] = @shiftAssignments
+      rescue AttributeOverwrite
+        # Multiple shift assignments are a common idiom, so don't warn about
+        # them.
+      end
+      @shiftAssignments = nil
     })
     doc('shifts.task', <<'EOT'
 Limits the working time for this task during the during the specified interval
@@ -5790,6 +6283,37 @@ EOT
     # Other attributes will be added automatically.
   end
 
+  def rule_taskShiftAssignments
+    pattern(%w( _shift ), lambda {
+      @shiftAssignments = @property['shifts', @scenarioIdx]
+    })
+  end
+
+  def rule_taskShiftsAssignments
+    pattern(%w( _shifts ), lambda {
+      @shiftAssignments = @property['shifts', @scenarioIdx]
+    })
+  end
+
+  def rule_textReport
+    pattern(%w( !textReportHeader !reportBody ), lambda {
+      @property = @property.parent
+    })
+    doc('textreport', <<'EOT'
+This report consists of 5 RichText sections, a header, a center section with a
+left and right margin and a footer. The sections may contain the output of
+other defined reports.
+EOT
+       )
+    example('textreport')
+  end
+
+  def rule_textReportHeader
+    pattern(%w( _textreport !optionalID !reportName ), lambda {
+      newReport(@val[1], @val[2], :textreport, @sourceFileInfo[0])
+    })
+  end
+
   def rule_timeformat
     pattern(%w( _timeformat $STRING ), lambda {
       @val[1]
@@ -6009,7 +6533,7 @@ EOT
     doc('shift.timesheet', <<'EOT'
 Specifies an alternative [[shift]] for the time sheet period. This shift will
 override any existing working hour definitions for the resource. It will not
-override already declared [[vacation|vacations]] though.
+override already declared [[leaves]] though.
 
 The primary use of this feature is to let the resources report different total
 work time for the report period.
@@ -6118,19 +6642,23 @@ EOT
   end
   def rule_tsReportHeader
     pattern(%w( _timesheetreport !optionalID $STRING ), lambda {
-      report = newReport(@val[1], @val[2], :timeSheet, @sourceFileInfo[0])
+      newReport(@val[1], @val[2], :timeSheet, @sourceFileInfo[0])
+      @property.set('formats', [ :tjp ])
 
-      report.set('scenarios', [ 0 ])
+      unless @project.scenario(0).get('active')
+        @property.set('scenarios', [ 0 ])
+      end
       # Show all tasks, sorted by seqno-up.
-      report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      report.set('sortTasks', [ [ 'seqno', true, -1 ] ])
+      @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
       # Show all resources, sorted by seqno-up.
-      report.set('hideResource', LogicalExpression.new(LogicalOperation.new(0)))
-      report.set('sortResources', [ [ 'seqno', true, -1 ] ])
-      report.set('loadUnit', :hours)
-      report.set('definitions', [])
+      @property.set('hideResource',
+                    LogicalExpression.new(LogicalOperation.new(0)))
+      @property.set('sortResources', [ [ 'seqno', true, -1 ] ])
+      @property.set('loadUnit', :hours)
+      @property.set('definitions', [])
     })
-    arg(1, 'file name', <<'EOT'
+    arg(2, 'file name', <<'EOT'
 The name of the time sheet report file to generate. It must end with a .tji
 extension, or use . to use the standard output channel.
 EOT
@@ -6319,7 +6847,7 @@ EOT
   def rule_vacationName
     optional
     pattern(%w( $STRING )) # We just throw the name away
-    arg(0, 'name', 'An optional name for the vacation')
+    arg(0, 'name', 'An optional name or reason for the leave')
   end
 
   def rule_valDate
@@ -6478,7 +7006,7 @@ EOT
                       60 * 60, # hours
                       60 * 60 * @project['dailyworkinghours'], # days
                       60 * 60 * @project['dailyworkinghours'] *
-                      (@project['yearlyworkingdays'] / 52.1429), # weeks
+                      (@project.weeklyWorkingDays), # weeks
                       60 * 60 * @project['dailyworkinghours'] *
                       (@project['yearlyworkingdays'] / 12), # months
                       60 * 60 * @project['dailyworkinghours'] *