taskjuggler 0.0.11 → 0.1.0

data/lib/taskjuggler/Tj3Config.rb

@@ -14,7 +14,7 @@
 require 'taskjuggler/UTF8String'
 require 'taskjuggler/AppConfig'
 
-AppConfig.version = '0.0.11'
+AppConfig.version = '0.1.0'
 AppConfig.packageName = 'taskjuggler'
 AppConfig.softwareName = 'TaskJuggler III'
 AppConfig.packageInfo = 'A Project Management Software'

data/lib/taskjuggler/TjTime.rb

@@ -143,32 +143,37 @@ class TaskJuggler
 
     # Return true if time is smaller than _t_.
     def <(t)
+      return false unless t
       @time < t.time
     end
 
     # Return true if time is smaller or equal than _t_.
     def <=(t)
+      return false unless t
       @time <= t.time
     end
 
     # Return true if time is larger than _t_.
     def >(t)
+      return true unless t
       @time > t.time
     end
 
     # Return true if time is larger or equal than _t_.
     def >=(t)
+      return true unless t
       @time >= t.time
     end
 
     # Return true if time and _t_ are identical.
     def ==(t)
-      return false if t.nil?
+      return false unless t
       @time == t.time
     end
 
     # Coparison operator for time with another time _t_.
     def <=>(t)
+      return -1 unless t
       @time <=> t.time
     end
 

data/lib/taskjuggler/TjpSyntaxRules.rb

@@ -635,21 +635,22 @@ each cell.
 EOT
        )
 
-    pattern(%w( _listmode $INTEGER ), lambda {
-      @column.listMode = @val[1]
+    pattern(%w( _listitem $STRING ), lambda {
+      @column.listItem = @val[1]
     })
-    also(%w( listtype.column ))
-    doc('listmode.column', <<'EOT'
-Specifies how the list items look like. The result of this setting depends on
-the actual column. Please refer to the [columnid|documentation for the
-specific column] to learn more about the effect that this setting has.
+    doc('listitem.column', <<'EOT'
+Specifies a RichText pattern that is used to generate the text for the list
+items. The pattern should contain at least one ''''<nowiki><</nowiki>-query
+attribute='XXX'->'''' element that will be replaced with the value of
+attribute XXX. For the replacement, the property of the query will be the list
+item.
 EOT
        )
 
     pattern(%w( _listtype !listType ), lambda {
       @column.listType = @val[1]
     })
-    also(%w( listmode.column ))
+    also(%w( listitem.column ))
     doc('listtype.column', <<'EOT'
 Specifies what type of list should be used. This attribute only affects
 columns that contain a list of items.
@@ -727,6 +728,22 @@ EOT
        )
   end
 
+  def rule_currencyFormat
+    pattern(%w( _currencyformat $STRING $STRING $STRING $STRING $INTEGER ),
+        lambda {
+      RealFormat.new(@val.slice(1, 5))
+    })
+    doc('currencyformat',
+        'These values specify the default format used for all currency ' +
+        'values.')
+    example('Currencyformat')
+    arg(1, 'negativeprefix', 'Prefix for negative numbers')
+    arg(2, 'negativesuffix', 'Suffix for negative numbers')
+    arg(3, 'thousandsep', 'Separator used for every 3rd digit')
+    arg(4, 'fractionsep', 'Separator used to separate the fraction digits')
+    arg(5, 'fractiondigits', 'Number of fraction digits to show')
+  end
+
   def rule_date
     pattern(%w( !dateCalcedOrNot ), lambda {
       resolution = @project.nil? ? Project.maxScheduleGranularity :
@@ -870,7 +887,7 @@ EOT
 
       # By default, we export all scenarios.
       scenarios = Array.new(@project.scenarios.items) { |i| i }
-      scenarios.delete_if { |sc| !@project.scenario(sc).get('enabled') }
+      scenarios.delete_if { |sc| !@project.scenario(sc).get('active') }
       report.set('scenarios', scenarios)
       # Show all tasks, sorted by seqno-up.
       report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
@@ -925,9 +942,12 @@ EOT
                          { 'vacation' => 'Include vacations',
                            'workinghours' => 'Include working hours' })
 
+    pattern(%w( !rollupresource ))
+    pattern(%w( !rolluptask ))
+
     pattern(%w( _scenarios !scenarioIdList ), lambda {
       # Don't include disabled scenarios in the report
-      @val[1].delete_if { |sc| !@project.scenario(sc).get('enabled') }
+      @val[1].delete_if { |sc| !@project.scenario(sc).get('active') }
       @property.set('scenarios', @val[1])
     })
     doc('scenarios.export', <<'EOT'
@@ -1125,8 +1145,7 @@ EOT
   def rule_fail
     pattern(%w( _fail !logicalExpression ), lambda {
       begin
-        @property['fail', @scenarioIdx] =
-          @property['fail', @scenarioIdx] + [ @val[1] ]
+        @property.set('fail', @property.get('fail') + [ @val[1] ])
       rescue AttributeOverwrite
       end
     })
@@ -1149,15 +1168,109 @@ EOT
     })
   end
 
+  def rule_flagLogicalExpression
+    pattern(%w( !flagOperation ), lambda {
+      LogicalExpression.new(@val[0], sourceFileInfo)
+    })
+    doc('logicalflagexpression', <<'EOT'
+A logical flag expression is a combination of operands and mathematical
+operations.  The final result of a logical expression is always true or false.
+Logical expressions are used the reduce the properties in a report to a
+certain subset or to select alternatives for the cell content of a table. When
+used with attributes like [[hidejournalentry]] the logical expression
+evaluates to true for a certain property, this property is hidden or rolled-up
+in the report.
+
+Operands must be previously declared flags 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
+control the evaluation sequence. Currently, TaskJuggler does not support the
+concept of operator precedence or right-left associativity. This may change in
+the future.
+EOT
+       )
+    also(%w( functions ))
+  end
+
+  def rule_flagOperand
+    pattern(%w( _( !flagOperation _) ), lambda {
+      @val[1]
+    })
+    pattern(%w( _~ !flagOperand ), lambda {
+      operation = LogicalOperation.new(@val[1])
+      operation.operator = '~'
+      operation
+    })
+
+    pattern(%w( $ID ), lambda {
+      unless @project['flags'].include?(@val[0])
+        error('operand_unkn_flag', "Undeclared flag '#{@val[0]}'",
+              @sourceFileInfo[0])
+      end
+      LogicalFlag.new(@val[0])
+    })
+  end
+
+  def rule_flagOperation
+    pattern(%w( !flagOperand !flagOperationChain ), lambda {
+      operation = LogicalOperation.new(@val[0])
+      if @val[1]
+        # Further operators/operands create an operation tree.
+        @val[1].each do |ops|
+          operation = LogicalOperation.new(operation)
+          operation.operator = ops[0]
+          operation.operand2 = ops[1]
+        end
+      end
+      operation
+    })
+    arg(0, 'operand', <<'EOT'
+An operand is a declared flag. An operand can be a negated operand by
+prefixing a ~ charater or it can be another logical expression enclosed in
+braces.
+EOT
+        )
+  end
+
+  def rule_flagOperationChain
+    optional
+    repeatable
+    pattern(%w( !flagOperatorAndOperand), lambda {
+      @val[0]
+    })
+  end
+
+  def rule_flagOperatorAndOperand
+    pattern(%w( !flagOperator !flagOperand), lambda{
+      [ @val[0], @val[1] ]
+    })
+    arg(1, 'operand', <<'EOT'
+An operand is a declared flag. An operand can be a negated operand by
+prefixing a ~ charater or it can be another logical expression enclosed in
+braces.
+EOT
+        )
+  end
+
+  def rule_flagOperator
+    singlePattern('_|')
+    descr('The \'or\' operator')
+
+    singlePattern('_&')
+    descr('The \'and\' operator')
+  end
+
+
   def rule_flags
     pattern(%w( _flags !flagList ), lambda {
       @val[1].each do |flag|
-        unless @property['flags', @scenarioIdx].include?(flag)
-          # We allow multiple instances of flag definitions.
-          begin
-            @property['flags', @scenarioIdx] += @val[1]
-          rescue AttributeOverwrite
-          end
+        next if @property['flags', @scenarioIdx].include?(flag)
+
+        # We allow multiple instances of flag definitions.
+        begin
+          @property['flags', @scenarioIdx] << flag
+        rescue AttributeOverwrite
         end
       end
     })
@@ -1245,6 +1358,14 @@ EOT
        )
     arg(2, 'ID', 'A scenario ID')
 
+    pattern(%w( _ischildof _( $ID _) ))
+    doc('ischildof', <<'EOT'
+Will evaluate to true for tasks and resources if current property is a child
+of the provided parent property.
+EOT
+       )
+    arg(2, 'ID', 'The ID of the parent')
+
     pattern(%w( _isdependencyof _( $ID _, $ID _, $INTEGER _) ))
     doc('isdependencyof', <<'EOT'
 Will evaluate to true for tasks that depend on the specified task in
@@ -1278,6 +1399,13 @@ EOT
     pattern(['_isleaf', '_(', '_)' ])
     doc('isleaf', 'The result is true if the property is not a container.')
 
+    pattern(%w( _ismilestone _( $ID _) ))
+    doc('ismilestone', <<'EOT'
+The result is true if the property is a milestone in the provided scenario.
+EOT
+       )
+    arg(2, 'Scenario ID', 'A scenario ID')
+
     pattern(%w( _isongoing _( $ID _) ))
     doc('isongoing', <<'EOT'
 Will evaluate to true for tasks that overlap with the report period in given
@@ -1332,14 +1460,24 @@ EOT
        )
   end
 
+  def rule_hidejournalentry
+    pattern(%w( _hidejournalentry !flagLogicalExpression ), lambda {
+      @property.set('hideJournalEntry', @val[1])
+    })
+    doc('hidejournalentry', <<'EOT'
+Do not include journal entries that match the specified logical expression.
+EOT
+       )
+  end
+
   def rule_hideresource
     pattern(%w( _hideresource !logicalExpression ), lambda {
       @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.
+report is sorted in ''''tree'''' mode (default) then enclosing resources are
+listed even if the expression matches the resource.
 EOT
        )
     also(%w( sortresources ))
@@ -1351,8 +1489,8 @@ EOT
     })
     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.
+report is sorted in ''''tree'''' mode (default) then enclosing tasks are
+listed even if the expression matches the task.
 EOT
        )
     also(%w( sorttasks ))
@@ -1611,6 +1749,19 @@ EOT
 
     pattern(%w( !author ))
 
+    pattern(%w( _flags !flagList ), lambda {
+      @val[1].each do |flag|
+        next if @journalEntry.flags.include?(flag)
+
+        @journalEntry.flags << flag
+      end
+    })
+    doc('flags.journalentry', <<'EOT'
+Journal entries can have flags attached to them. These can be used to
+include only entries in a report that have a certain flag.
+EOT
+       )
+
     pattern(%w( !summary ))
 
     pattern(%w( !details ))
@@ -1983,7 +2134,7 @@ EOT
   end
 
   def rule_morePredTasks
-    commaListRule('!taskPredList')
+    commaListRule('!taskPred')
   end
 
   def rule_moreSortCriteria
@@ -2042,10 +2193,16 @@ EOT
     pattern(%w( !headline ))
     pattern(%w( !hideresource ))
     pattern(%w( !hidetask ))
+
+    pattern(%w( !numberFormat ), lambda {
+      @property.set('numberFormat', @val[0])
+    })
+
     pattern(%w( !reportEnd ))
     pattern(%w( !reportPeriod ))
     pattern(%w( !reportStart ))
     pattern(%w( !reportTitle ))
+
     pattern(%w( _timeoff $STRING $STRING ), lambda {
       @property.set('timeOffId', @val[1])
       @property.set('timeOffName', @val[2])
@@ -2067,6 +2224,7 @@ EOF
   def rule_nikuReportHeader
     pattern(%w( _nikureport !optionalID $STRING ), lambda {
       newReport(@val[1], @val[2], :niku, sourceFileInfo)
+      @property.set('numberFormat', RealFormat.new(['-', '', '', '.', 2]))
     })
     arg(1, 'file name', <<'EOT'
 The name of the time sheet report file to generate. It must end with a .tji
@@ -2139,6 +2297,21 @@ EOT
     singlePattern('$FLOAT')
   end
 
+  def rule_numberFormat
+    pattern(%w( _numberformat $STRING $STRING $STRING $STRING $INTEGER ),
+        lambda {
+      RealFormat.new(@val.slice(1, 5))
+    })
+    doc('numberformat',
+        'These values specify the default format used for all numerical ' +
+        'real values.')
+    arg(1, 'negativeprefix', 'Prefix for negative numbers')
+    arg(2, 'negativesuffix', 'Suffix for negative numbers')
+    arg(3, 'thousandsep', 'Separator used for every 3rd digit')
+    arg(4, 'fractionsep', 'Separator used to separate the fraction digits')
+    arg(5, 'fractiondigits', 'Number of fraction digits to show')
+  end
+
   def rule_operand
     pattern(%w( _( !operation _) ), lambda {
       @val[1]
@@ -2160,7 +2333,7 @@ EOT
         error('operand_unkn_scen', "Unknown scenario ID #{scenario}",
               @sourceFileInfo[0])
       end
-      LogicalAttribute.new(attribute, scenarioIdx)
+      LogicalAttribute.new(attribute, @project.scenario(scenarioIdx))
     })
     pattern(%w( !date ), lambda {
       LogicalOperation.new(@val[0])
@@ -2345,19 +2518,9 @@ EOT
     repeatable
     optional
 
-    pattern(%w( _currencyformat $STRING $STRING $STRING $STRING $INTEGER ),
-        lambda {
-      @project['currencyFormat'] = RealFormat.new(@val.slice(1, 5))
+    pattern(%w( !currencyFormat ), lambda {
+      @project['currencyFormat'] = @val[0]
     })
-    doc('currencyformat',
-        'These values specify the default format used for all currency ' +
-        'values.')
-    example('Currencyformat')
-    arg(1, 'negativeprefix', 'Prefix for negative numbers')
-    arg(2, 'negativesuffix', 'Suffix for negative numbers')
-    arg(3, 'thousandsep', 'Separator used for every 3rd digit')
-    arg(4, 'fractionsep', 'Separator used to separate the fraction digits')
-    arg(5, 'fractiondigits', 'Number of fraction digits to show')
 
     pattern(%w( _currency $STRING ), lambda {
       @project['currency'] = @val[1]
@@ -2416,18 +2579,9 @@ EOT
     arg(1, 'date', 'Alternative date to be used as current date for all ' +
         'computations')
 
-    pattern(%w( _numberformat $STRING $STRING $STRING $STRING $INTEGER ),
-        lambda {
-      @project['numberFormat'] = RealFormat.new(@val.slice(1, 5))
+    pattern(%w( !numberFormat ), lambda {
+      @project['numberFormat'] = @val[0]
     })
-    doc('numberformat',
-        'These values specify the default format used for all numerical ' +
-        'real values.')
-    arg(1, 'negativeprefix', 'Prefix for negative numbers')
-    arg(2, 'negativesuffix', 'Suffix for negative numbers')
-    arg(3, 'thousandsep', 'Separator used for every 3rd digit')
-    arg(4, 'fractionsep', 'Separator used to separate the fraction digits')
-    arg(5, 'fractiondigits', 'Number of fraction digits to show')
 
     pattern(%w( !scenario ))
     pattern(%w( _shorttimeformat $STRING ), lambda {
@@ -2478,6 +2632,29 @@ Do not use this option after you've set the time zone!
 EOT
         )
 
+    pattern(%w( _trackingscenario !scenarioId ), lambda {
+      @project['trackingScenarioIdx'] = @val[1]
+      # The tracking scenario and all child scenarios will always be scheduled
+      # in projection mode.
+      @project.scenario(@val[1]).all.each do |scenario|
+        scenario.set('projection', true)
+      end
+    })
+    doc('trackingscenario', <<'EOT'
+Specifies which scenario is used to capture what actually has happened with
+the project. All sub-scenarios of this scenario inherit the bookings of the
+tracking scenario and may not have any bookings of their own. The tracking
+scenario must also be specified to use time and status sheet reports.
+
+The tracking scenario and all scenarios derived from it will be scheduled in
+projection mode. This means that the scheduler will only add bookings after
+the current date or the date specified by [[now]]. It is assumed that all
+allocations prior to this date have been provided as [[booking.task|
+task bookings]] or [[booking.resource|resource bookings]].
+EOT
+       )
+    example('TimeSheet1', '2')
+
     pattern(%w( _weekstartsmonday ), lambda {
       @project['weekStartsMonday'] = true
     })
@@ -2514,6 +2691,14 @@ EOT
 
   def rule_projectDeclaration
     pattern(%w( !projectHeader !projectBody ), lambda {
+      # If the user has specified a tracking scenario, we mark all children of
+      # that scenario to disallow own bookings. These scenarios will inherit
+      # their bookings from the tracking scenario.
+      if (idx = @project['trackingScenarioIdx'])
+        @project.scenario(idx).allLeaves(true).each do |scenario|
+          scenario.set('ownbookings', false)
+        end
+      end
       @val[0]
     })
     doc('project', <<'EOT'
@@ -2554,19 +2739,23 @@ EOT
     optional
     repeatable
     pattern(%w( _sloppy ), lambda {
-      @property.set('strict', false)
+      warning('projection_sloppy',
+              'The sloppy projection mode has been deprecated. The ' +
+              'functionality is no longer supported.')
     })
     doc('sloppy.projection', <<'EOT'
-In sloppy mode tasks with no bookings will be filled from the original start.
+The sloppy projection mode has been deprecated. Please use
+[[trackingscenario]] feature instead.
 EOT
        )
 
     pattern(%w( _strict ), lambda {
-      @property.set('strict', true)
+      warning('projection_strict',
+              'The strict mode is now always used.')
     })
     doc('strict.projection', <<'EOT'
-In strict mode all tasks will be filled starting with the current date. No
-bookings will be added prior to the current date.
+The strict projection mode has been deprecated. Please use
+[[trackingscenario]] feature instead.
 EOT
        )
   end
@@ -2748,16 +2937,6 @@ part-time, or vice versa, please refer to the 'Shift' property.
 EOT
        )
     arg(1, 'name', 'Name or purpose of the vacation')
-
-    pattern(%w( _trackingscenario !scenarioId ), lambda {
-      @project['trackingScenarioIdx'] = @val[1]
-    })
-    doc('trackingscenario', <<'EOT'
-Specifies which scenario should be used for time sheet reports. By default,
-the top-level scenario will be used.
-EOT
-       )
-    example('TimeSheet1', '2')
   end
 
   def rule_propertiesFile
@@ -2800,7 +2979,7 @@ EOT
               "#{@val[1]} is not a list attribute. Only those can be purged.",
               @sourceFileInfo[1])
       end
-      @property.getAttr(@val[1], @scenarioIdx).reset
+      @property.getAttribute(@val[1], @scenarioIdx).reset
     })
     doc('purge', <<'EOT'
 List attributes, like regular attributes, can inherit their values from the
@@ -2935,13 +3114,7 @@ EOT
     descr(<<'EOT'
 The resources that have this resource assigned as manager.
 
-The list can be customized by the [listmode.column listmode] attribute. The
-following modes are supported:
-
-# ID
-# Name ''(This is the default)''
-# Name (ID)
-# ID: Name
+The list can be customized by the [listitem.column listitem] attribute.
 EOT
          )
 
@@ -2983,21 +3156,9 @@ symbols are used for <nowiki><dep></nowiki>.
 * '''<nowiki>]->]</nowiki>''': End-to-End dependency
 * '''<nowiki>[->]</nowiki>''': Start-to-End dependency
 
-The list can be customized by the [listmode.column listmode] attribute. The
-following modes are supported:
-
-# ID <nowiki><dep></nowiki> Date
-# Name <nowiki><dep></nowiki> Date
-# Name (ID) <nowiki><dep></nowiki> Date
-# ID: Name <nowiki><dep></nowiki> Date
-# ID <nowiki><dep></nowiki>
-# Name <nowiki><dep></nowiki>
-# Name (ID) <nowiki><dep></nowiki>
-# ID: Name <nowiki><dep></nowiki>
-# ID
-# Name
-# Name (ID)
-# ID: Name
+The list can be customized by the [listitem.column listitem] attribute.
+The dependency symbol can be generated via the ''''dependency'''' attribute
+inthe query, the target date via the ''''date'''' attribute.
 EOT
          )
 
@@ -3022,9 +3183,9 @@ EOT
     descr('The headcount number of the resource or group')
 
     pattern([ '_hierarchindex' ], lambda {
-      'wbs'
+      'bsi'
     })
-    descr('Deprecated alias for wbs')
+    descr('Deprecated alias for bsi')
 
     singlePattern('_hourly')
     descr('A group of columns with one column for each hour')
@@ -3041,17 +3202,7 @@ A list of milestones that are a prerequiste for the current task. For
 container tasks it will also include the inputs of the child tasks. Inputs may
 not have any predecessors.
 
-The list can be customized by the [listmode.column listmode] attribute. The
-following modes are supported:
-
-# ID
-# Name
-# Name (ID)
-# ID: Name
-# ID (Date)
-# Name (Date)
-# Name (ID) Date ''(This is the default)''
-# ID: Name Date
+The list can be customized by the [listitem.column listitem] attribute.
 EOT
          )
 
@@ -3089,13 +3240,7 @@ EOT
     descr(<<'EOT'
 A list of managers that the resource reports to.
 
-The list can be customized by the [listmode.column listmode] attribute. The
-following modes are supported:
-
-# ID
-# Name ''(This is the default)''
-# Name (ID)
-# ID: Name
+The list can be customized by the [listitem.column listitem] attribute.
 EOT
         )
 
@@ -3138,21 +3283,9 @@ are used
 * '''<nowiki>]->]</nowiki>''': End-to-End dependency
 * '''<nowiki>[->]</nowiki>''': Start-to-End dependency
 
-The list can be customized by the [listmode.column listmode] attribute. The
-following modes are supported:
-
-# ID <nowiki><dep></nowiki> Date
-# Name <nowiki><dep></nowiki> Date
-# Name (ID) <nowiki><dep></nowiki> Date
-# ID: Name <nowiki><dep></nowiki> Date
-# ID <nowiki><dep></nowiki>
-# Name <nowiki><dep></nowiki>
-# Name (ID) <nowiki><dep></nowiki>
-# ID: Name <nowiki><dep></nowiki>
-# ID
-# Name
-# Name (ID)
-# ID: Name
+The list can be customized by the [listitem.column listitem] attribute.
+The dependency symbol can be generated via the ''''dependency'''' attribute
+inthe query, the target date via the ''''date'''' attribute.
 EOT
          )
 
@@ -3169,13 +3302,7 @@ EOT
     descr(<<'EOT'
 All resources that have this resource assigned as a direct or indirect manager.
 
-The list can be customized by the [listmode.column listmode] attribute. The
-following modes are supported:
-
-# ID
-# Name ''(This is the default)''
-# Name (ID)
-# ID: Name
+The list can be customized by the [listitem.column listitem] attribute.
 EOT
          )
 
@@ -3183,13 +3310,7 @@ EOT
     descr(<<'EOT'
 A list of resources that are assigned to the task in the report time frame.
 
-The list can be customized by the [listmode.column listmode] attribute. The
-following modes are supported:
-
-# ID
-# Name ''(This is the default)''
-# Name (ID)
-# ID: Name
+The list can be customized by the [listitem.column listitem] attribute.
 EOT
          )
 
@@ -3197,13 +3318,7 @@ EOT
     descr(<<'EOT'
 The responsible people for this task.
 
-The list can be customized by the [listmode.column listmode] attribute. The
-following modes are supported:
-
-# ID
-# Name ''(This is the default)''
-# Name (ID)
-# ID: Name
+The list can be customized by the [listitem.column listitem] attribute.
 EOT
          )
 
@@ -3236,21 +3351,16 @@ A list of milestones that depend on the current task. For container tasks it
 will also include the targets of the child tasks. Targets may not have any
 follower tasks.
 
-The list can be customized by the [listmode.column listmode] attribute. The
-following modes are supported:
-
-# ID
-# Name
-# Name (ID)
-# ID: Name
-# ID (Date)
-# Name (Date)
-# Name (ID) Date ''(This is the default)''
-# ID: Name Date
+The list can be customized by the [listitem.column listitem] attribute.
 EOT
          )
 
-    singlePattern('_wbs')
+    pattern([ '_wbs' ], lambda {
+      'bsi'
+    })
+    descr('Deprecated alias for bsi.')
+
+    singlePattern('_bsi')
     descr('The hierarchical or work breakdown structure index')
 
     singlePattern('_weekly')
@@ -3304,6 +3414,10 @@ report.
 EOT
        )
 
+    pattern(%w( !currencyFormat ), lambda {
+      @property.set('currencyFormat', @val[0])
+    })
+
     pattern(%w( !reportEnd ))
 
     pattern(%w( _epilog $STRING ), lambda {
@@ -3346,6 +3460,7 @@ EOT
     also(%w( epilog footer prolog ))
 
     pattern(%w( !headline ))
+    pattern(%w( !hidejournalentry ))
     pattern(%w( !hideresource ))
 
     pattern(%w( !hidetask ))
@@ -3368,6 +3483,10 @@ Determines what unit should be used to display all load values in this report.
 EOT
        )
 
+    pattern(%w( !numberFormat ), lambda {
+      @property.set('numberFormat', @val[0])
+    })
+
     pattern(%w( !reportPeriod ))
 
     pattern(%w( _prolog $STRING ), lambda {
@@ -3397,27 +3516,12 @@ span the [[header]] or [[footer]] sections.
 EOT
        )
 
-    pattern(%w( _rollupresource !logicalExpression ), lambda {
-      @property.set('rollupResource', @val[1])
-    })
-    doc('rollupresource', <<'EOT'
-Do not show sub-resources of resources that match the specified logical
-expression.
-EOT
-       )
-    example('RollupResource')
-
-    pattern(%w( _rolluptask !logicalExpression ), lambda {
-      @property.set('rollupTask', @val[1])
-    })
-    doc('rolluptask', <<'EOT'
-Do not show sub-tasks of tasks that match the specified logical expression.
-EOT
-       )
+    pattern(%w( !rollupresource ))
+    pattern(%w( !rolluptask ))
 
     pattern(%w( _scenarios !scenarioIdList ), lambda {
       # Don't include disabled scenarios in the report
-      @val[1].delete_if { |sc| !@project.scenario(sc).get('enabled') }
+      @val[1].delete_if { |sc| !@project.scenario(sc).get('active') }
       @property.set('scenarios', @val[1])
     })
     doc('scenarios', <<'EOT'
@@ -3445,6 +3549,11 @@ EOT
     pattern(%w( !reportStart ))
 
     pattern(%w( _resourceroot !resourceId), lambda {
+      if @val[1].leaf?
+        error('resourceroot_leaf',
+              "#{@val[1].fullId} is not a group resource",
+              @sourceFileInfo[1])
+      end
       @property.set('resourceRoot', @val[1])
     })
     doc('resourceroot', <<'EOT'
@@ -3457,6 +3566,11 @@ EOT
     example('ResourceRoot')
 
     pattern(%w( _taskroot !taskId), lambda {
+      if @val[1].leaf?
+        error('taskroot_leaf',
+              "#{@val[1].fullId} is not a container task",
+              @sourceFileInfo[1])
+      end
       @property.set('taskRoot', @val[1])
     })
     doc('taskroot', <<'EOT'
@@ -3577,7 +3691,7 @@ EOT
         @property.typeSpec = :taskreport
         unless @property.modified?('columns')
           # Set the default columns for this report.
-          %w( wbs name start end effort chart ).each do |col|
+          %w( bsi name start end effort chart ).each do |col|
             @property.get('columns') <<
             TableColumnDefinition.new(col, columnTitle(col))
           end
@@ -3752,6 +3866,12 @@ EOT
 
   def rule_resourceBooking
     pattern(%w( !resourceBookingHeader !bookingBody ), lambda {
+      unless @project.scenario(@scenarioIdx).get('ownbookings')
+        error('no_own_resource_booking',
+              "The scenario #{@project.scenario(@scenarioIdx).fullId} " +
+              'inherits its bookings from the tracking ' +
+              'scenario. You cannot specificy additional bookings for it.')
+      end
       @val[0].task.addBooking(@scenarioIdx, @val[0])
     })
   end
@@ -3837,14 +3957,16 @@ EOT
 
     pattern(%w( _booking !resourceBooking ))
     doc('booking.resource', <<'EOT'
-The booking attribute can be used to report completed work. This can be part
-of the necessary effort or the whole effort. When the scenario is scheduled in
-[[projection]] mode, TaskJuggler assumes that only the work reported with
-bookings has been done up to now. It then schedules a plan for the still
-missing effort. All task with bookings must be scheduled in ''''asap'''' mode.
+The booking attribute can be used to report actually completed work.  A task
+with bookings must be [[scheduling|scheduled]] in ''''asap'''' mode.  If the
+scenario is not the [[trackingscenario|tracking scenario]] or derived from it,
+the scheduler will not allocate resources prior to the current date or the
+date specified with [[now]] when a task has at least one booking.
 
 Bookings are only valid in the scenario they have been defined in. They will
-not be passed to any other scenario.
+in general not be passed to any other scenario. If you have defined a
+[[trackingscenario|tracking scenario]], the bookings of this scenario will be
+passed to all the derived scenarios of the tracking scenario.
 
 The sloppy attribute can be used when you want to skip non-working time or
 other allocations automatically. If it's not given, all bookings must only
@@ -3941,6 +4063,29 @@ EOT
     # Other attributes will be added automatically.
   end
 
+  def rule_rollupresource
+    pattern(%w( _rollupresource !logicalExpression ), lambda {
+      @property.set('rollupResource', @val[1])
+    })
+    doc('rollupresource', <<'EOT'
+Do not show sub-resources of resources that match the specified logical
+expression.
+EOT
+       )
+    example('RollupResource')
+  end
+
+  def rule_rolluptask
+    pattern(%w( _rolluptask !logicalExpression ), lambda {
+      @property.set('rollupTask', @val[1])
+    })
+    doc('rolluptask', <<'EOT'
+Do not show sub-tasks of tasks that match the specified logical expression.
+EOT
+       )
+  end
+
+
   def rule_scenario
     pattern(%w( !scenarioHeader !scenarioBody ), lambda {
       @property = @property.parent
@@ -3971,53 +4116,47 @@ EOT
     optional
     repeatable
 
+    pattern(%w( _active !yesNo), lambda {
+      @property.set('active', @val[1])
+    })
+    doc('active', <<'EOT'
+Enable the scenario to be scheduled or not. By default, all scenarios will be
+scheduled. If a scenario is marked as inactive, it not be scheduled and will
+be ignored in the reports.
+EOT
+       )
     pattern(%w( _disabled ), lambda {
-      @property.set('enabled', false)
+      @property.set('active', false)
     })
     doc('disabled', <<'EOT'
+This attribute is deprecated. Please use [active] instead.
+
 Disable the scenario for scheduling. The default for the top-level
 scenario is to be enabled.
 EOT
        )
     example('Scenario')
     pattern(%w( _enabled ), lambda {
-      @property.set('enabled', true)
+      @property.set('active', true)
     })
     doc('enabled', <<'EOT'
+This attribute is deprecated. Please use [active] instead.
+
 Enable the scenario for scheduling. This is the default for the top-level
 scenario.
-EOT
-       )
-
-    pattern(%w( _minslackrate !number ), lambda {
-       @property.set('minslackrate', @val[1] / 100.0)
-    })
-    doc('minslackrate', <<'EOT'
-Specifies the minimum percentage of slack a task path must have before it is
-marked as critical. A path is any list of explicitely or implicitely connected
-tasks measured from first task to last task. The slack is the time between
-start of the first task and end of the last task that is not covered by any
-task of the path.
-
-Larger values in combination with a project that uses lots of inherited
-dependencies and long dependency pathes can result in very long scheduling
-times. The more slack you require, the more pathes have to be searched till
-the end. For larger projects an increase of 5% can turn a 10 second scheduling
-run into a 1 hour or more scheduling run. If you need larger slack rate
-values, avoid the use of inherited dependencies.
-
-The default value is 0% which turns off the critical path detector.
 EOT
        )
 
     pattern(%w( _projection !projection ), lambda {
-      @property.set('projection', true)
+      warning('projection',
+              'The \'projection\' keyword has been deprecated. Please use ' +
+              '[[trackingscenario]] feature instead.')
     })
     doc('projection', <<'EOT'
-Enables the projection mode for the scenario. All tasks will be scheduled
-taking the manual bookings into account. The tasks will be extended by
-scheduling new bookings starting with the current date until the specified
-effort, length or duration has been reached.
+This keyword has been deprecated! Don't use it anymore!
+
+Projection mode is now automatically enabled as soon as a scenario has
+bookings.
 EOT
        )
 
@@ -4259,9 +4398,9 @@ EOT
               "Sorting criterium expected (e.g. tree, start.up or " +
               "plan.end.down).", @sourceFileInfo[0])
       end
-      if attribute == 'wbs'
-        error('sorting_wbs',
-              "Sorting by wbs is not supported. Please use 'tree' " +
+      if attribute == 'bsi'
+        error('sorting_bsi',
+              "Sorting by bsi is not supported. Please use 'tree' " +
               '(without appended .up or .down) instead.',
               @sourceFileInfo[0])
       end
@@ -4367,6 +4506,20 @@ EOT
 
     pattern(%w( !author ))
     pattern(%w( !details ))
+
+    pattern(%w( _flags !flagList ), lambda {
+      @val[1].each do |flag|
+        next if @journalEntry.flags.include?(flag)
+
+        @journalEntry.flags << flag
+      end
+    })
+    doc('flags.statussheet', <<'EOT'
+Status sheet entries can have flags attached to them. These can be used to
+include only entries in a report that have a certain flag.
+EOT
+       )
+
     pattern(%w( !summary ))
   end
 
@@ -4430,6 +4583,10 @@ EOT
 
   def rule_statusSheetHeader
     pattern(%w( _statussheet !resourceId !valIntervalOrDate ), lambda {
+      unless (scenarioIdx = @project['trackingScenarioIdx'])
+        error('ss_no_tracking_scenario',
+              'No trackingscenario defined.')
+      end
       @sheetAuthor = @val[1]
       @sheetStart = @val[2].start
       @sheetEnd = @val[2].end
@@ -4451,7 +4608,8 @@ A status sheet report is a template for a status sheet. It collects all the
 status information of the top-level task that a resource is responsible for.
 This report is typically used by managers or team leads to review the time
 sheet status information and destill it down to a summary that can be
-forwarded to the next person in the reporting chain.
+forwarded to the next person in the reporting chain. The report will be for
+the specified [trackingscenario].
 EOT
        )
   end
@@ -4658,6 +4816,12 @@ EOT
 
   def rule_taskBooking
     pattern(%w( !taskBookingHeader !bookingBody ), lambda {
+      unless @project.scenario(@scenarioIdx).get('ownbookings')
+        error('no_own_task_booking',
+              "The scenario #{@project.scenario(@scenarioIdx).fullId} " +
+              'inherits its bookings from the tracking ' +
+              'scenario. You cannot specificy additional bookings for it.')
+      end
       @val[0].task.addBooking(@scenarioIdx, @val[0])
     })
   end
@@ -4863,14 +5027,16 @@ EOT
 
     pattern(%w( _booking !taskBooking ))
     doc('booking.task', <<'EOT'
-The booking attribute can be used to report completed work. This can be part
-of the necessary effort or the whole effort. When the scenario is scheduled in
-[[projection]] mode, TaskJuggler assumes that only the work reported with
-bookings has been done up to now. It then schedules a plan for the still
-missing effort. All task with bookings must be scheduled in ''''asap'''' mode.
+The booking attribute can be used to report actually completed work.  A task
+with bookings must be [[scheduling|scheduled]] in ''''asap'''' mode.  If the
+scenario is not the [[trackingscenario|tracking scenario]] or derived from it,
+the scheduler will not allocate resources prior to the current date or the
+date specified with [[now]] when a task has at least one booking.
 
 Bookings are only valid in the scenario they have been defined in. They will
-not be passed to any other scenario.
+in general not be passed to any other scenario. If you have defined a
+[[trackingscenario|tracking scenario]], the bookings of this scenario will be
+passed to all the derived scenarios of the tracking scenario.
 
 The sloppy attribute can be used when you want to skip non-working time or
 other allocations automatically. If it's not given, all bookings must only
@@ -5147,8 +5313,7 @@ EOT
        )
 
     pattern(%w( _startcredit !number ), lambda {
-      @property['charge', @scenarioIdx] =
-        @property['charge', @scenarioIdx] +
+      @property['charge', @scenarioIdx] +=
         [ Charge.new(@val[1], :onStart, @property, @scenarioIdx) ]
     })
     doc('startcredit', <<'EOT'
@@ -5162,8 +5327,7 @@ EOT
     pattern(%w( _precedes !taskPredList ), lambda {
       checkContainer('precedes')
       begin
-        @property['precedes', @scenarioIdx] =
-          @property['precedes', @scenarioIdx] + @val[1]
+        @property['precedes', @scenarioIdx] += @val[1]
         @property['forward', @scenarioIdx] = false
       rescue AttributeOverwrite
       end
@@ -5206,6 +5370,7 @@ of the subtask.
 EOT
        )
     arg(1, 'value', 'Priority value (1 - 1000)')
+    example('Priority')
 
     pattern(%w( _projectid $ID ), lambda {
       unless @project['projectids'].include?(@val[1])
@@ -5226,8 +5391,8 @@ EOT
        )
 
     pattern(%w( _responsible !resourceList ), lambda {
-      @property['responsible', @scenarioIdx] =
-        @property['responsible', @scenarioIdx] + @val[1]
+      @property['responsible', @scenarioIdx] += @val[1]
+      @property['responsible', @scenarioIdx].uniq!
     })
     doc('responsible', <<'EOT'
 The ID of the resource that is responsible for this task. This value is for
@@ -5610,9 +5775,12 @@ EOT
               'A resource group cannot file a time sheet',
               @sourceFileInfo[1])
       end
+      unless (scenarioIdx = @project['trackingScenarioIdx'])
+        error('ts_no_tracking_scenario',
+              'No trackingscenario defined.')
+      end
       # Currently time sheets are hardcoded for scenario 0.
-      @timeSheet = TimeSheet.new(@sheetAuthor, @val[2],
-                                 @project['trackingScenarioIdx'])
+      @timeSheet = TimeSheet.new(@sheetAuthor, @val[2], scenarioIdx)
       @timeSheet.sourceFileInfo = @sourceFileInfo[0]
       @project.timeSheets << @timeSheet
     })
@@ -5627,7 +5795,7 @@ For projects that flow mostly according to plan, TaskJuggler already knows
 much of the information that should be contained in the time sheets. With this
 property, you can generate a report that contains drafts of the time sheets
 for one or more resources. The time sheet drafts will be for the
-specified report period.
+specified report period and the specified [trackingscenario].
 EOT
        )
   end
@@ -5710,6 +5878,20 @@ EOT
     repeatable
 
     pattern(%w( !details ))
+
+    pattern(%w( _flags !flagList ), lambda {
+      @val[1].each do |flag|
+        next if @journalEntry.flags.include?(flag)
+
+        @journalEntry.flags << flag
+      end
+    })
+    doc('flags.timesheet', <<'EOT'
+Time sheet entries can have flags attached to them. These can be used to
+include only entries in a report that have a certain flag.
+EOT
+       )
+
     pattern(%w( !summary ))
   end
 
@@ -5958,8 +6140,7 @@ EOT
   def rule_warn
     pattern(%w( _warn !logicalExpression ), lambda {
       begin
-        @property['warn', @scenarioIdx] =
-          @property['warn', @scenarioIdx] + [ @val[1] ]
+        @property.set('warn', @property.get('warn') + [ @val[1] ])
       rescue AttributeOverwrite
       end
     })