taskjuggler 0.0.6 → 0.0.7

data/lib/TimeSheets.rb

@@ -175,7 +175,9 @@ class TaskJuggler
           warning('ts_res_end_delta',
                   "#{resource.name} requests " +
                   "#{@expectedEnd < @task['end', scenarioIdx] ?
-                    'earlier' : 'later'} end for task #{@task.fullId}")
+                    'earlier' : 'later'} end (#{@expectedEnd}) for task " +
+                  "#{@task.fullId}. Planned end is " +
+                  "#{@task['end', scenarioIdx]}.")
         end
       end
     end
@@ -214,8 +216,7 @@ class TaskJuggler
       scenarioIdx = @timeSheet.scenarioIdx
       startIdx = project.dateToIdx(project['now'], true)
       endIdx = project.dateToIdx(@task['end', scenarioIdx])
-      remainingWork = @task.getEffectiveWork(scenarioIdx, startIdx, endIdx,
-                                             resource)
+      @task.getEffectiveWork(scenarioIdx, startIdx, endIdx, resource)
     end
 
     # The reported expected end of the task.
@@ -231,11 +232,11 @@ class TaskJuggler
     private
 
     def error(id, text)
-      @timeSheet.message('error', id, text, @sourceFileInfo)
+      @timeSheet.error(id, text, @sourceFileInfo)
     end
 
     def warning(id, text)
-      @timeSheet.message('warning', id, text, @sourceFileInfo)
+      @timeSheet.warning(id, text, @sourceFileInfo)
     end
 
   end
@@ -332,18 +333,6 @@ class TaskJuggler
         @resource.getFreeSlots(@scenarioIdx, startIdx, endIdx)
     end
 
-    # Report an error or warning to the TjMessageHandler. In case of an error
-    # an exception is raised.
-    def message(type, id, text, sourceFileInfo)
-      unless text.empty?
-        message = Message.new(id, type, text, @resource, nil, sourceFileInfo)
-        resource.project.messageHandler.send(message)
-      end
-
-      # An empty strings signals an already reported error
-      raise TjException.new, '' if type == 'error'
-    end
-
     # Converts allocation percentage into time slots.
     def percentToSlots(value)
       @percentageUsed = true
@@ -366,16 +355,18 @@ class TaskJuggler
        @resource.project['scheduleGranularity']).to_i
     end
 
-    private
-
-    def error(id, text)
-      message('error', id, text, @sourceFileInfo)
+    def error(id, text, sourceFileInfo = nil)
+      @resource.project.messageHandler.error(
+        id, text, sourceFileInfo || @sourceFileInfo, nil, @resource)
     end
 
-    def warning(id, text)
-      message('warning', id, text, @sourceFileInfo)
+    def warning(id, text, sourceFileInfo = nil)
+      @resource.project.messageHandler.warning(id, text, sourceFileInfo, nil,
+                                               @resource)
     end
 
+    private
+
     def workWithUnit(slots)
       if @percentageUsed
         "#{(slotsToPercent(slots) * 100.0).to_i}%"

data/lib/Tj3Config.rb

@@ -13,7 +13,7 @@
 require 'UTF8String'
 require 'AppConfig'
 
-AppConfig.version = '0.0.6'
+AppConfig.version = '0.0.7'
 AppConfig.packageName = 'taskjuggler'
 AppConfig.softwareName = 'TaskJuggler III'
 AppConfig.packageInfo = 'A Project Management Software'

data/lib/TjTime.rb

@@ -260,8 +260,7 @@ class TaskJuggler
     # Return a new time that is 1 month later than time but at the same time of
     # day.
     def sameTimeNextMonth
-      sec, min, hour, day, month, year, wday, yday, isdst, tz =
-        @time.localtime.to_a
+      sec, min, hour, day, month, year = @time.localtime.to_a
       monMax = month == 2 && leapYear?(year) ? 29 : MON_MAX[month]
       month += 1
       if month > 12

data/lib/TjpSyntaxRules.rb

@@ -57,7 +57,7 @@ EOT
       end
       if @val[1] && @project.account(@val[1])
         error('account_exists', "Account #{@val[1]} has already been defined.",
-              @property, @sourceFileInfo[1])
+              @sourceFileInfo[1], @property)
       end
       @property = Account.new(@project, @val[1], @val[2], @property)
       @property.sourceFileInfo = @sourceFileInfo[0]
@@ -74,8 +74,7 @@ EOT
       # In case we have a nested supplement, we need to prepend the parent ID.
       id = @property.fullId + '.' + id if @property && @property.is_a?(Account)
       if (account = @project.account(id)).nil?
-        error('unknown_account', "Unknown account #{id}", nil,
-              @sourceFileInfo[0])
+        error('unknown_account', "Unknown account #{id}", @sourceFileInfo[0])
       end
       account
     })
@@ -109,7 +108,7 @@ EOT
       level = @project.alertLevelIndex(@val[0])
       unless level
         error('bad_alert', "Unknown alert level #{@val[1]}. Must be " +
-              'green, yellow or red', nil, @sourceFileInfo[0])
+              'green, yellow or red', @sourceFileInfo[0])
       end
       level
     })
@@ -214,6 +213,18 @@ Makes a resource allocation mandatory. This means, that for each time slot
 only then resources are allocated when all mandatory resources are available.
 So either all mandatory resources can be allocated for the time slot, or no
 resource will be allocated.
+EOT
+       )
+    pattern(%w( _shift !allocationShiftAssignment ))
+    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
+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
        )
   end
@@ -257,9 +268,9 @@ EOT
   def rule_allocationShiftAssignment
     pattern(%w( !shiftId !intervalsOptional ), lambda {
       # Make sure we have a ShiftAssignment for the allocation.
-      if @allocate.shift.nil?
-        @allocate.shift = ShiftAssignments.new
-        @allocate.shift.project = @project
+      if @allocate.shifts.nil?
+        @allocate.shifts = ShiftAssignments.new
+        @allocate.shifts.project = @project
       end
 
       if @val[1].nil?
@@ -268,11 +279,11 @@ EOT
         intervals = @val[1]
       end
       intervals.each do |interval|
-        if !@allocate.shift.
+        if !@allocate.shifts.
           addAssignment(ShiftAssignment.new(@val[0].scenario(@scenarioIdx),
                                             interval))
           error('shift_assignment_overlap',
-                'Shifts may not overlap each other.', nil, @sourceFileInfo[0])
+                'Shifts may not overlap each other.', @sourceFileInfo[0])
         end
       end
     })
@@ -316,16 +327,16 @@ EOT
       if @val[1].parent
         error('cost_acct_no_top',
               "The cost account #{@val[1].fullId} is not a top-level account.",
-              nil, @sourceFileInfo[1])
+              @sourceFileInfo[1])
       end
       if @val[2].parent
         error('rev_acct_no_top',
               "The revenue account #{@val[2].fullId} is not a top-level " +
-              "account.", nil, @sourceFileInfo[2])
+              "account.", @sourceFileInfo[2])
       end
       if @val[1] == @val[2]
         error('cost_rev_same',
-              'The cost and revenue accounts may not be the same.', nil,
+              'The cost and revenue accounts may not be the same.',
               @sourceFileInfo[1])
       end
       [ @val[1], @val[2] ]
@@ -351,8 +362,8 @@ EOT
     pattern(%w( _overtime $INTEGER ), lambda {
       if @val[1] < 0 || @val[1] > 2
         error('overtime_range',
-              "Overtime value #{@val[1]} out of range (0 - 2).", @property,
-              @sourceFileInfo[1])
+              "Overtime value #{@val[1]} out of range (0 - 2).",
+              @sourceFileInfo[1], @property)
       end
       @booking.overtime = @val[1]
     })
@@ -373,8 +384,8 @@ EOT
     pattern(%w( _sloppy $INTEGER ), lambda {
       if @val[1] < 0 || @val[1] > 2
         error('sloppy_range',
-              "Sloppyness value #{@val[1]} out of range (0 - 2).", @property,
-              @sourceFileInfo[1])
+              "Sloppyness value #{@val[1]} out of range (0 - 2).",
+              @sourceFileInfo[1], @property)
       end
       @booking.sloppy = @val[1]
     })
@@ -428,7 +439,7 @@ EOT
         end
         chargeSet.complete
       rescue TjException
-        error('chargeset', $!.message, @property, @sourceFileInfo[0])
+        error('chargeset', $!.message, @sourceFileInfo[0], @property)
       end
       masterAccounts = []
       @property['chargeset', @scenarioIdx].each do |set|
@@ -437,7 +448,7 @@ EOT
       if masterAccounts.include?(chargeSet.master)
         error('chargeset_master',
               "All charge sets for this task must have different top-level " +
-              "accounts.", @property, @sourceFileInfo[0])
+              "accounts.", @sourceFileInfo[0], @property)
       end
       @property['chargeset', @scenarioIdx] =
         @property['chargeset', @scenarioIdx] + [ chargeSet ]
@@ -506,7 +517,7 @@ EOT
       unless /#[0-9A-Fa-f]{3}/ =~ col || /#[0-9A-Fa-f]{3}/ =~ col
         error('bad_color',
               "Color values must be specified as '#RGB' or '#RRGGBB' values",
-              nil, @sourceFileInfo[0])
+              @sourceFileInfo[0])
       end
       col
     })
@@ -685,7 +696,7 @@ EOT
       if @val[0] % resolution != 0
         error('misaligned_date',
               "The date must be aligned to the timing resolution (" +
-              "#{resolution / 60} min) of the project.", nil,
+              "#{resolution / 60} min) of the project.",
               @sourceFileInfo[0])
       end
       @val[0]
@@ -736,7 +747,7 @@ EOT
             BULLET1 BULLET2 BULLET3 BULLET4 NUMBER1 NUMBER2 NUMBER3 NUMBER4 )
       if @val[1] == "Some more details\n"
         error('ts_default_details',
-              "'Some more details' is not a valid value", nil,
+              "'Some more details' is not a valid value",
               @sourceFileInfo[1])
       end
       @journalEntry.details = newRichText(@val[1], rtTokenSetMore)
@@ -966,7 +977,7 @@ EOT
       unless (?A..?Z) === @val[0][0]
         error('extend_id_cap',
               "User defined attributes IDs must start with a capital letter",
-              nil, @sourceFileInfo[0])
+              @sourceFileInfo[0])
       end
       @val[0]
     })
@@ -1033,7 +1044,7 @@ EOT
   def rule_flag
     pattern(%w( $ID ), lambda {
       unless @project['flags'].include?(@val[0])
-        error('undecl_flag', "Undeclared flag '#{@val[0]}'", nil,
+        error('undecl_flag', "Undeclared flag '#{@val[0]}'",
               @sourceFileInfo[0])
       end
       @val[0]
@@ -1305,7 +1316,7 @@ EOT
 
   def rule_includeFile
     pattern(%w( !includeFileName ), lambda {
-      @scanner.include(@val[0], @sourceFileInfo[0])
+      @project.inputFiles << @scanner.include(@val[0], @sourceFileInfo[0])
     })
   end
 
@@ -1314,8 +1325,9 @@ EOT
       unless @val[0][-4, 4] == '.tji'
         error('bad_include_suffix', "Included files must have a '.tji'" +
                                     "extension: '#{@val[0]}'",
-              nil, @sourceFileInfo[0])
+              @sourceFileInfo[0])
       end
+      pushFileStack
       @val[0]
     })
     arg(0, 'filename', <<'EOT'
@@ -1328,8 +1340,8 @@ EOT
 
   def rule_includeProperties
     pattern(%w( !includeFileName !includeAttributes ), lambda {
-      pushFileStack
-      @scanner.include(@val[0], @sourceFileInfo[0])
+      popFileStack
+      @project.inputFiles << @scanner.include(@val[0], @sourceFileInfo[0])
     })
   end
 
@@ -1341,7 +1353,7 @@ EOT
         if mode == 0
           unless @val[0] < endSpec
             error('start_before_end', "The end date (#{endSpec}) must be " +
-                  "after the start date (#{@val[0]}).", nil, @sourceFileInfo[0])
+                  "after the start date (#{@val[0]}).", @sourceFileInfo[0])
           end
           Interval.new(@val[0], endSpec)
         else
@@ -1372,7 +1384,7 @@ EOT
       if mode == 0
         unless @val[0] < endSpec
           error('start_before_end', "The end date (#{endSpec}) must be after " +
-                "the start date (#{@val[0]}).", nil, @sourceFileInfo[0])
+                "the start date (#{@val[0]}).", @sourceFileInfo[0])
         end
         Interval.new(@val[0], endSpec)
       else
@@ -1402,7 +1414,7 @@ EOT
                       60 * 60 * 24 * 365 # years
                      ]
       if @val[0] == 0.0
-        error('zero_duration', "The interval duration may not be 0.", nil,
+        error('zero_duration', "The interval duration may not be 0.",
               @sourceFileInfo[1])
       end
       duration = @val[0] * convFactors[@val[1]]
@@ -1472,7 +1484,7 @@ EOT
       level = @project.alertLevelIndex(@val[1])
       unless level
         error('bad_alert', "Unknown alert level #{@val[1]}. Must be " +
-              'green, yellow or red', nil, @sourceFileInfo[0])
+              'green, yellow or red', @sourceFileInfo[0])
       end
       @journalEntry.alertLevel = level
     })
@@ -1515,7 +1527,7 @@ EOT
       resource = @val[0]
       unless resource.leaf?
         error('leaf_resource_id_expected',
-              "#{resource.id} is not a leaf resource.", nil, @sourceFileInfo[0])
+              "#{resource.id} is not a leaf resource.", @sourceFileInfo[0])
       end
       resource
     })
@@ -1894,7 +1906,7 @@ EOT
     pattern(%w( _navigator $ID ), lambda {
       if @project['navigators'][@val[1]]
         error('navigator_exists',
-              "The navigator #{@val[1]} has already been defined.", nil,
+              "The navigator #{@val[1]} has already been defined.",
               @sourceFileInfo[0])
       end
       @navigator = Navigator.new(@val[1], @project)
@@ -1954,12 +1966,12 @@ EOT
       when :taskreport
         if (p1 = @project.task(@val[0])).nil?
           error('unknown_main_node',
-                "Unknown task ID #{@val[0]}", nil, @sourceFileInfo[0])
+                "Unknown task ID #{@val[0]}", @sourceFileInfo[0])
         end
         if @val[1]
           if (p2 = @project.resource(@val[1])).nil?
             error('unknown_sub_node',
-                  "Unknown resource ID #{@val[0]}", nil, @sourceFileInfo[0])
+                  "Unknown resource ID #{@val[0]}", @sourceFileInfo[0])
           end
           return [ p2, p1 ]
         end
@@ -1967,12 +1979,12 @@ EOT
       when :resourcereport
         if (p1 = @project.task(@val[0])).nil?
           error('unknown_main_node',
-                "Unknown task ID #{@val[0]}", nil, @sourceFileInfo[0])
+                "Unknown task ID #{@val[0]}", @sourceFileInfo[0])
         end
         if @val[1]
           if (p2 = @project.resource(@val[1])).nil?
             error('unknown_sub_node',
-                  "Unknown resource ID #{@val[0]}", nil, @sourceFileInfo[0])
+                  "Unknown resource ID #{@val[0]}", @sourceFileInfo[0])
           end
           return [ p2, p1 ]
         end
@@ -2009,12 +2021,12 @@ EOT
     pattern(%w( $ABSOLUTE_ID ), lambda {
       if @val[0].count('.') > 1
         error('operand_attribute',
-              'Attributes must be specified as <scenarioID>.<attribute>', nil,
+              'Attributes must be specified as <scenarioID>.<attribute>',
               @sourceFileInfo[0])
       end
       scenario, attribute = @val[0].split('.')
       if (scenarioIdx = @project.scenarioIdx(scenario)).nil?
-        error('operand_unkn_scen', "Unknown scenario ID #{scenario}", nil,
+        error('operand_unkn_scen', "Unknown scenario ID #{scenario}",
               @sourceFileInfo[0])
       end
       LogicalAttribute.new(attribute, scenarioIdx)
@@ -2026,7 +2038,7 @@ EOT
       if @val[1].nil?
         unless @project['flags'].include?(@val[0])
           error('operand_unkn_flag', "Undeclared flag '#{@val[0]}'",
-                nil, @sourceFileInfo[0])
+                @sourceFileInfo[0])
         end
         LogicalFlag.new(@val[0])
       else
@@ -2310,12 +2322,12 @@ EOT
       unless goodValues.include?(@val[1])
         error('bad_timing_res',
               "Timing resolution must be one of #{goodValues.join(', ')} min.",
-              nil, @sourceFileInfo[1])
+              @sourceFileInfo[1])
       end
       if @val[1] > (Project.maxScheduleGranularity / 60)
         error('too_large_timing_res',
               'The maximum allowed timing resolution for the timezone is ' +
-              "#{Project.maxScheduleGranularity / 60} minutes.", nil,
+              "#{Project.maxScheduleGranularity / 60} minutes.",
               @sourceFileInfo[1])
       end
       @project['scheduleGranularity'] = @val[1] * 60
@@ -2450,7 +2462,9 @@ EOT
   end
 
   def rule_projectBodyInclude
-    pattern(%w( _include !includeFile !projectBodyAttributes . ))
+    pattern(%w( _include !includeFile !projectBodyAttributes . ), lambda {
+      popFileStack
+    })
     lastSyntaxToken(1)
     doc('include.project', <<'EOT'
 Includes the specified file name as if its contents would be written
@@ -2469,6 +2483,7 @@ EOT
 
   def rule_prologInclude
     pattern(%w( _include !includeFile !projectProlog . ), lambda {
+      popFileStack
     })
     lastSyntaxToken(1)
     doc('include.macro', <<'EOT'
@@ -2615,7 +2630,6 @@ EOT
 
   def rule_propertiesInclude
     pattern(%w( _include !includeProperties !properties ), lambda {
-      popFileStack
     })
     doc('include.properties', <<'EOT'
 Includes the specified file name as if its contents would be written
@@ -2637,7 +2651,7 @@ EOT
     pattern(%w( _purge $ID ), lambda {
       if (attributeDefinition = @property.attributeDefinition(@val[1])).nil?
         error('purge_unknown_id',
-              "#{@val[1]} is not a known attribute for this property", nil,
+              "#{@val[1]} is not a known attribute for this property",
               @sourceFileInfo[1])
       end
       if attributeDefinition.scenarioSpecific
@@ -2648,7 +2662,7 @@ EOT
       unless attr.is_a?(Array)
         error('purge_no_list',
               "#{@val[1]} is not a list attribute. Only those can be purged.",
-              nil, @sourceFileInfo[1])
+              @sourceFileInfo[1])
       end
       if attributeDefinition.scenarioSpecific
         @property[@val[1], @scenarioIdx] = attributeDefinition.default.dup
@@ -2863,6 +2877,13 @@ EOT
     singlePattern('_journal')
     descr(<<'EOT'
 The journal entries for the task or resource for the reported interval.
+EOT
+         )
+
+    singlePattern('_journal_sub')
+    descr(<<'EOT'
+The journal entries for the task or resource and all its subtasks or resources
+for the reported interval.
 EOT
          )
 
@@ -2970,7 +2991,12 @@ EOT
          )
 
     singlePattern('_targets')
-    descr('A list of tasks that depend in the current task.')
+    descr(<<'EOT'
+A list of milestones that depend on the current task. For container tasks it
+will also include the targets of the child tasks.  Usually the task name, the
+task ID and the start date will be listed.
+EOT
+         )
 
     singlePattern('_wbs')
     descr('The hierarchical or work breakdown structure index')
@@ -3105,7 +3131,7 @@ EOT
     pattern(%w( _opennodes !nodeIdList ), lambda {
       @property.set('openNodes', @val[1])
     })
-    doc('opennods', 'For internal use only!')
+    doc('opennodes', 'For internal use only!')
 
     pattern(%w( !report ))
 
@@ -3175,7 +3201,7 @@ EOT
       if @val[1] < @property.get('start')
         error('report_end',
               "End date must be before start date #{@property.get('start')}",
-              nil, @sourceFileInfo[1])
+              @sourceFileInfo[1])
       end
       @property.set('end', @val[1])
     })
@@ -3196,7 +3222,7 @@ EOT
       end
       # In case we have a nested supplement, we need to prepend the parent ID.
       if (report = @project.report(id)).nil?
-        error('report_id_expected', "#{id} is not a defined report.", nil,
+        error('report_id_expected', "#{id} is not a defined report.",
               @sourceFileInfo[0])
       end
       report
@@ -3226,7 +3252,7 @@ EOT
       if @val[1] > @property.get('end')
         error('report_start',
               "Start date must be before end date #{@property.get('end')}",
-              nil, @sourceFileInfo[1])
+              @sourceFileInfo[1])
       end
       @property.set('start', @val[1])
     })
@@ -3250,7 +3276,7 @@ EOT
         id = (@property ? @property.fullId + '.' : '') + @val[1]
         if @project.report(id)
           error('report_exists', "report #{id} has already been defined.",
-                @property, @sourceFileInfo[1])
+                @sourceFileInfo[1], @property)
         end
       end
       @property = Report.new(@project, @val[1], @val[2], @property)
@@ -3446,7 +3472,7 @@ EOT
       id = (@resourceprefix.empty? ? '' : @resourceprefix + '.') + @val[0]
       if (resource = @project.resource(id)).nil?
         error('resource_id_expected', "#{id} is not a defined resource.",
-              nil, @sourceFileInfo[0])
+              @sourceFileInfo[0])
       end
       resource
     })
@@ -3460,8 +3486,8 @@ EOT
       end
       if @val[1] && @project.resource(@val[1])
         error('resource_exists',
-              "Resource #{@val[1]} has already been defined.", @property,
-              @sourceFileInfo[1])
+              "Resource #{@val[1]} has already been defined.",
+              @sourceFileInfo[1], @property)
       end
       @property = Resource.new(@project, @val[1], @val[2], @property)
       @property.sourceFileInfo = @sourceFileInfo[0]
@@ -3691,7 +3717,7 @@ EOT
       @project.scenarios.clearProperties if @property.nil?
       if @project.scenario(@val[1])
         error('scenario_exists',
-              "Scenario #{@val[1]} has already been defined.", nil,
+              "Scenario #{@val[1]} has already been defined.",
               @sourceFileInfo[1])
       end
       @property = Scenario.new(@project, @val[1], @val[2], @property)
@@ -3704,7 +3730,7 @@ EOT
   def rule_scenarioId
     pattern(%w( $ID ), lambda {
       if (@scenarioIdx = @project.scenarioIdx(@val[0])).nil?
-        error('unknown_scenario_id', "Unknown scenario: #{@val[0]}", nil,
+        error('unknown_scenario_id', "Unknown scenario: #{@val[0]}",
               @sourceFileInfo[0])
       end
       @scenarioIdx
@@ -3715,7 +3741,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]", nil,
+        error('unknown_scenario_id', "Unknown scenario: @val[0]",
               @sourceFileInfo[0])
       end
     })
@@ -3728,7 +3754,7 @@ EOT
   def rule_scenarioIdx
     pattern(%w( $ID ), lambda {
       if (scenarioIdx = @project.scenarioIdx(@val[0])).nil?
-        error('unknown_scenario_idx', "Unknown scenario #{@val[0]}", nil,
+        error('unknown_scenario_idx', "Unknown scenario #{@val[0]}",
               @sourceFileInfo[0])
       end
       scenarioIdx
@@ -3774,8 +3800,8 @@ EOT
           addAssignment(ShiftAssignment.new(@val[0].scenario(@scenarioIdx),
                                             interval))
           error('shift_assignment_overlap',
-                'Shifts may not overlap each other.', @property,
-                @sourceFileInfo[0])
+                'Shifts may not overlap each other.',
+                @sourceFileInfo[0], @property)
         end
       end
       # Set same value again to set the 'provided' state for the attribute.
@@ -3806,7 +3832,7 @@ EOT
     pattern(%w( _shift !optionalID $STRING ), lambda {
       if @val[1] && @project.shift(@val[1])
         error('shift_exists', "Shift #{@val[1]} has already been defined.",
-              nil, @sourceFileInfo[1])
+              @sourceFileInfo[1])
       end
       @property = Shift.new(@project, @val[1], @val[2], @property)
       @property.sourceFileInfo = @sourceFileInfo[0]
@@ -3819,7 +3845,7 @@ EOT
   def rule_shiftId
     pattern(%w( $ID ), lambda {
       if (shift = @project.shift(@val[0])).nil?
-        error('shift_id_expected', "#{@val[0]} is not a defined shift.", nil,
+        error('shift_id_expected', "#{@val[0]} is not a defined shift.",
               @sourceFileInfo[0])
       end
       shift
@@ -3898,24 +3924,24 @@ EOT
         # <scenario>.<attribute>.<up|down>
         if (scenario = @project.scenarioIdx(args[0])).nil?
           error('sort_unknown_scen',
-                "Unknown scenario #{args[0]} in sorting criterium", nil,
+                "Unknown scenario #{args[0]} in sorting criterium",
                 @sourceFileInfo[0])
         end
         attribute = args[1]
         if args[2] != 'up' && args[2] != 'down'
           error('sort_direction', "Sorting direction must be 'up' or 'down'",
-                nil, @sourceFileInfo[0])
+                @sourceFileInfo[0])
         end
         direction = args[2] == 'up'
       else
         error('sorting_crit_exptd1',
               "Sorting criterium expected (e.g. tree, start.up or " +
-              "plan.end.down).", nil, @sourceFileInfo[0])
+              "plan.end.down).", @sourceFileInfo[0])
       end
       if attribute == 'wbs'
         error('sorting_wbs',
               "Sorting by wbs is not supported. Please use 'tree' " +
-              '(without appended .up or .down) instead.', nil,
+              '(without appended .up or .down) instead.',
               @sourceFileInfo[0])
       end
       [ attribute, direction, scenario ]
@@ -3961,7 +3987,7 @@ EOT
       if @val[0] != 'tree'
         error('sorting_crit_exptd2',
               "Sorting criterium expected (e.g. tree, start.up or " +
-              "plan.end.down).", nil, @sourceFileInfo[0])
+              "plan.end.down).", @sourceFileInfo[0])
       end
       [ 'tree', true, -1 ]
     })
@@ -3974,7 +4000,7 @@ EOT
         if @project.reports[fileName]
           error('report_redefinition',
                 "A report with the name '#{fileName}' has already been " +
-                "defined.", nil, @sourceFileInfo[2])
+                "defined.", @sourceFileInfo[2])
         end
       else
         fileName = "statusSheet#{@project.reports.length + 1}"
@@ -4158,11 +4184,11 @@ EOT
         error('ts_summary_too_long',
               "The summary text must be 480 characters long or shorter. " +
               "This text has #{@val[1].length} characters.",
-              nil, @sourceFileInfo[1])
+              @sourceFileInfo[1])
       end
       if @val[1] == "A summary text\n"
           error('ts_default_summary',
-                "'A summary text' is not a valid summary", nil,
+                "'A summary text' is not a valid summary",
                 @sourceFileInfo[1])
       end
       rtTokenSetIntro =
@@ -4382,7 +4408,7 @@ EOT
       end
       error('too_many_bangs',
             "Too many '!' for relative task in this context.",
-            @property, @sourceFileInfo[0]) if id[0] == ?!
+            @sourceFileInfo[0], @property) if id[0] == ?!
       if task
         task.fullId + '.' + id
       else
@@ -4412,7 +4438,7 @@ EOT
       if @val[1]
         id = (@property ? @property.fullId + '.' : '') + @val[1]
         if @project.task(id)
-          error('task_exists', "Task #{id} has already been defined.", nil,
+          error('task_exists', "Task #{id} has already been defined.",
                 @sourceFileInfo[1])
         end
       end
@@ -4435,7 +4461,7 @@ EOT
         id = @taskprefix + '.' + id unless @taskprefix.empty?
       end
       if (task = @project.task(id)).nil?
-        error('unknown_task', "Unknown task #{id}", nil, @sourceFileInfo[0])
+        error('unknown_task', "Unknown task #{id}", @sourceFileInfo[0])
       end
       task
     })
@@ -4500,8 +4526,8 @@ EOT
 
       if @property['chargeset', @scenarioIdx].empty?
         error('task_without_chargeset',
-              'The task does not have a chargeset defined.', @property,
-              @sourceFileInfo[0])
+              'The task does not have a chargeset defined.',
+              @sourceFileInfo[0], @property)
       end
       case @val[2]
       when 'onstart'
@@ -4538,7 +4564,7 @@ EOT
     pattern(%w( _complete !number), lambda {
       if @val[1] < 0.0 || @val[1] > 100.0
         error('task_complete', "Complete value must be between 0 and 100",
-              @property, @sourceFileInfo[1])
+              @sourceFileInfo[1], @property)
       end
       @property['complete', @scenarioIdx] = @val[1]
     })
@@ -4588,8 +4614,8 @@ EOT
     pattern(%w( _effort !workingDuration ), lambda {
       checkContainer('effort')
       if @val[1] <= 0.0
-        error('effort_zero', "Effort value must be larger than 0", @property,
-              @sourceFileInfo[1])
+        error('effort_zero', "Effort value must be larger than 0",
+              @sourceFileInfo[1], @property)
       end
       @property['effort', @scenarioIdx] = @val[1]
     })
@@ -4766,7 +4792,7 @@ EOT
     pattern(%w( _priority $INTEGER ), lambda {
       if @val[1] < 0 || @val[1] > 1000
         error('task_priority', "Priority must have a value between 0 and 1000",
-              @property, @sourceFileInfo[1])
+              @sourceFileInfo[1], @property)
       end
       @property['priority', @scenarioIdx] = @val[1]
     })
@@ -4791,7 +4817,7 @@ EOT
 
     pattern(%w( _projectid $ID ), lambda {
       unless @project['projectids'].include?(@val[1])
-        error('unknown_projectid', "Unknown project ID #{@val[1]}", nil,
+        error('unknown_projectid', "Unknown project ID #{@val[1]}",
               @sourceFileInfo[1])
       end
       @property['projectid', @scenarioIdx] = @val[1]
@@ -4822,8 +4848,8 @@ EOT
            @property['end', @scenarioIdx].nil?))
         error('not_scheduled',
               "Task #{@property.fullId} is marked as scheduled but does not " +
-              'have a fixed start and end date.', @property,
-              @sourceFileInfo[0])
+              'have a fixed start and end date.',
+              @sourceFileInfo[0], @property)
       end
       @property['scheduled', @scenarioIdx] = true
     })
@@ -4876,8 +4902,8 @@ EOT
       checkContainer('shift')
     })
     doc('shift.task', <<'EOT'
-This keyword has been deprecated. Please use [shifts.task shifts
-(task)] instead.
+This keyword has been deprecated. Please use [[shifts.task|shifts
+(task)]] instead.
 EOT
        )
 
@@ -4887,10 +4913,11 @@ EOT
     doc('shifts.task', <<'EOT'
 Limits the working time for this task during the during the specified interval
 to the working hours of the given shift. Multiple shifts can be defined, but
-shift intervals may not overlap. This is an additional working time limit to
-the working hours of the allocated resources. It does not replace the resource
-working hour restrictions. For a resource to be assigned to a time slot, both
-the task shifts as well as the resource working hours must declare the time slot as duty slot.
+shift intervals may not overlap. This is an additional working time
+restriction ontop of the working hours of the allocated resources. It does not
+replace the resource working hour restrictions. For a resource to be assigned
+to a time slot, both the respective task shift as well as the resource working
+hours must declare the time slot as duty slot.
 EOT
         )
 
@@ -5061,7 +5088,7 @@ EOT
     pattern([ '$TIME', '_-', '$TIME' ], lambda {
       if @val[0] >= @val[2]
         error('time_interval',
-              "End time of interval must be larger than start time", nil,
+              "End time of interval must be larger than start time",
               @sourceFileInfo[0])
       end
       [ @val[0], @val[2] ]
@@ -5174,7 +5201,7 @@ EOT
       @property = nil
       unless @sheetAuthor.leaf?
         error('ts_group_author',
-              'A resource group cannot file a time sheet', nil,
+              'A resource group cannot file a time sheet',
               @sourceFileInfo[1])
       end
       # Currently time sheets are hardcoded for scenario 0.
@@ -5290,11 +5317,11 @@ EOT
       if @val[2].length > 120
         error('ts_headline_too_long',
               "The headline must be 120 or less characters long. This one " +
-              "has #{@val[2].length} characters.", nil, @sourceFileInfo[2])
+              "has #{@val[2].length} characters.", @sourceFileInfo[2])
       end
       if @val[2] == 'Your headline here!'
         error('ts_no_headline',
-              "'Your headline here!' is not a valid headline", nil,
+              "'Your headline here!' is not a valid headline",
               @sourceFileInfo[2])
       end
       @journalEntry = JournalEntry.new(@project['journal'],
@@ -5331,7 +5358,7 @@ EOT
       if @val[1] < @timeSheet.interval.start
         error('ts_end_too_early',
               "The expected task end date must be after the start date of " +
-              "this time sheet report.", nil, @sourceFileInfo[1])
+              "this time sheet report.", @sourceFileInfo[1])
       end
       @timeSheetRecord.expectedEnd = @val[1]
     })
@@ -5346,7 +5373,7 @@ EOT
       priority = @val[1]
       if priority < 1 || priority > 1000
         error('ts_bad_priority',
-              "Priority value #{priority} must be between 1 and 1000.", nil,
+              "Priority value #{priority} must be between 1 and 1000.",
               @sourceFileInfo[1])
       end
       @timeSheetRecord.priority = priority
@@ -5411,11 +5438,8 @@ EOT
       unless @property.leaf?
         error('ts_task_not_leaf',
               'You cannot specify a task that has sub tasks here.',
-              @property, @sourceFileInfo[1])
+              @sourceFileInfo[1], @property)
       end
-      scenarioIdx = @timeSheet.scenarioIdx
-      taskStart = @property['start', scenarioIdx] || @project['start']
-      taskEnd = @property['end', scenarioIdx] || @project['end']
 
       @timeSheetRecord = TimeSheetRecord.new(@timeSheet, @property)
       @timeSheetRecord.sourceFileInfo = @sourceFileInfo[0]
@@ -5433,7 +5457,7 @@ EOT
     pattern(%w( !date ), lambda {
       if @val[0] < @project['start'] || @val[0] > @project['end']
         error('date_in_range', "Date must be within the project time frame " +
-              "#{@project['start']}  - #{@project['end']}", nil,
+              "#{@project['start']}  - #{@project['end']}",
               @sourceFileInfo[0])
       end
       @val[0]
@@ -5443,7 +5467,7 @@ EOT
   def rule_validTimeZone
     pattern(%w( $STRING ), lambda {
       unless TjTime.checkTimeZone(@val[0])
-        error('bad_time_zone', "#{@val[0]} is not a known time zone", nil,
+        error('bad_time_zone', "#{@val[0]} is not a known time zone",
               @sourceFileInfo[0])
       end
       @val[0]
@@ -5458,7 +5482,7 @@ EOT
         if mode == 0
           unless @val[0] < endSpec
             error('start_before_end', "The end date (#{endSpec}) must be " +
-                  "after the start date (#{@val[0]}).", nil,
+                  "after the start date (#{@val[0]}).",
                   @sourceFileInfo[1])
           end
           iv = Interval.new(@val[0], endSpec)
@@ -5495,7 +5519,7 @@ EOT
       if mode == 0
         unless @val[0] < endSpec
           error('start_before_end', "The end date (#{endSpec}) must be after " +
-                "the start date (#{@val[0]}).", nil, @sourceFileInfo[1])
+                "the start date (#{@val[0]}).", @sourceFileInfo[1])
         end
         iv = Interval.new(@val[0], endSpec)
       else
@@ -5610,7 +5634,7 @@ EOT
         # 1.0.
         if @val[0] < 0.0 || @val[0] > 100.0
           error('illegal_percentage',
-                "Percentage values must be between 0 and 100%.", nil,
+                "Percentage values must be between 0 and 100%.",
                 @sourceFileInfo[1])
         end
         @val[0] / 100.0