taskjuggler 0.0.5 → 0.0.6

data/lib/TimeSheetReceiver.rb

@@ -34,6 +34,7 @@ class TaskJuggler
       @sheetHeader = /^[ ]*timesheet\s([a-z][a-z0-9_]*)\s[0-9\-:+]*\s-\s([0-9]*-[0-9]*-[0-9]*)/
       # Regular expression to extract the sheet signature (time period).
       @signatureFilter = /^[ ]*timesheet\s[a-z][a-z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
+      @emailSubject = "Report from %s for %s"
     end
 
   end

data/lib/TimeSheetSender.rb

@@ -48,6 +48,7 @@ encoded and the time sheet header from 'timesheet' to the period end
 date must be in a single line that starts at the beginning of the line.
 
 EOT
+      @mailSubject = 'Your weekly time sheet template for %s'
     end
 
   end

data/lib/TimeSheetSummary.rb

@@ -27,7 +27,7 @@ class TaskJuggler
       super('tj3ts_summary', 'summary')
 
       # This is a LogicalExpression string that controls what resources should
-      # not be getting a time sheet.
+      # not be considered in the summary.
       @hideResource = '0'
       # The base directory of the time sheet templates.
       @templateDir = 'TimeSheetTemplates'
@@ -44,22 +44,23 @@ class TaskJuggler
       @resourceIntro = "  Weekly Report from %s\n\n"
       @resourceSheetSubject = "Weekly report %s"
       @summarySubject = "Weekly staff reports %s"
-      @reminderSubject = "Your weekly report %s is overdue!"
+      @reminderSubject = "Your time sheet for the period ending %s is overdue!"
       @reminderText = <<'EOT'
-The deadline for your report submission has passed but we haven't
-received it yet. Please submit your report immediately so the content
-can still be included in the management reports. Please send a copy
-of your submission noticiation email to your manager. If possible,
-your manager will still try to include your report data in his/her
-report.
+The deadline for your time sheet submission has passed but we haven't received
+it yet. Please submit your time sheet immediately so the content can still be
+included in the management reports. Please send a copy of your submission
+notification email to your manager. If possible, your manager will still try
+to include your report data in his/her report.
 
-Please be aware that post deadline submissions must be processed
-manually and create an additional load for your manager and/or
-project manager.  Please try to submit in time in the future.
+Please be aware that post deadline submissions must be processed manually and
+create an additional load for your manager and/or project manager.  Please try
+to submit in time in the future.
 
 Thanks for your cooperation!
 
 EOT
+      @defaulterHeader = "The following %d person(s) have not yet submitted " +
+                         "their time sheets:\n\n"
     end
 
     def sendSummary(resourceIds)
@@ -77,37 +78,61 @@ EOT
         sheetFile = "#{@sheetDir}/#{@date}/#{resourceId}_#{@date}.tji"
         if File.exist?(templateFile)
           if File.exists?(sheetFile)
-            # Resource has submitted a time sheet
-            sheet = getResourceJournal(sheetFile)
-            summary += sprintf(@resourceIntro, resourceName)
-            summary += sheet
-            info("Adding report from #{resourceName} to summary")
-
-            @sheetRecipients.each do |to|
-              sendEmail(to, sprintf(@resourceSheetSubject, @date), sheet,
-                        nil, resourceEmail)
+            # If there are no recipients specified, we don't need to compile
+            # the summary.
+            unless @digestRecipients.empty? && @sheetRecipients.empty?
+              # Resource has submitted a time sheet
+              sheet = getResourceJournal(sheetFile)
+              summary += sprintf(@resourceIntro, resourceName)
+              summary += sheet + "\n#{'-' * 74}\n\n"
+              info("Adding report from #{resourceName} to summary")
+
+              @sheetRecipients.each do |to|
+                sendEmail(to, sprintf(@resourceSheetSubject, @date), sheet,
+                          nil, "#{resourceName} <#{resourceEmail}>")
+              end
             end
           else
             defaulterList << resource
             # Resource did not submit a time sheet
-            summary += "\n  Report from #{resourceName} is missing\n\n"
             info("Report from #{resourceId} is missing")
           end
-          summary += "\n#{'-' * 74}\n\n"
         end
       end
 
-      # If there is a reminder text defined, resend the template to those
-      # individuals that have not yet submitted their report yet.
-      if @reminderText && !@reminderText.empty?
+      unless defaulterList.empty?
+        # Prepend the defaulter list to the summary.
+        text = sprintf(@defaulterHeader, defaulterList.length)
         defaulterList.each do |resource|
-          sendReminder(resource[0], resource[1], resource[2])
+          text += " * #{resource[1]}\n"
+        end
+        text += "\n#{'-' * 74}\n\n"
+        summary = text + summary
+
+        # Create a file with the IDs of the resources who's reports are
+        # missing.
+        missingFile = "#{@sheetDir}/#{@date}/missing-reports"
+        begin
+          File.open(missingFile, 'w') do |f|
+            defaulterList.each { |resource| f.puts resource[0] }
+          end
+        rescue
+          error("Cannot write file with missing reports (#missingFile): #{$!}")
         end
       end
 
+      # Send out the summary text to the list of digest recipients.
       @digestRecipients.each do |to|
         sendEmail(to, sprintf(@summarySubject, @date), summary)
       end
+
+      # If there is a reminder text defined, resend the template to those
+      # individuals that have not yet submitted their report yet.
+      if @reminderText && !@reminderText.empty?
+        defaulterList.each do |resource|
+          sendReminder(resource[0], resource[1], resource[2])
+        end
+      end
     end
 
     private

data/lib/TimeSheets.rb

@@ -212,7 +212,7 @@ class TaskJuggler
       resource = @timeSheet.resource
       project = resource.project
       scenarioIdx = @timeSheet.scenarioIdx
-      startIdx = project.dateToIdx(project['now'])
+      startIdx = project.dateToIdx(project['now'], true)
       endIdx = project.dateToIdx(@task['end', scenarioIdx])
       remainingWork = @task.getEffectiveWork(scenarioIdx, startIdx, endIdx,
                                              resource)

data/lib/Tj3AppBase.rb

@@ -55,6 +55,9 @@ class TaskJuggler
                format("Don't show program and progress information")) do
         @silent = true
       end
+      @opts.on('--debug', format('Enable Ruby debug mode')) do
+        $DEBUG = true
+      end
 
       yield
 
@@ -81,13 +84,17 @@ class TaskJuggler
 
     def main
       # Install signal handler to exit gracefully on CTRL-C.
-      Kernel.trap('INT') do
+      intHandler = Kernel.trap('INT') do
         puts "\nAborting on user request!"
         exit 1
       end
 
       args = processArguments(ARGV)
 
+      # If DEBUG mode has been enabled, we restore the INT trap handler again
+      # to get Ruby backtrackes.
+      Kernel.trap('INT', intHandler) if $DEBUG
+
       unless @silent
         puts "#{AppConfig.softwareName} v#{AppConfig.version} - " +
              "#{AppConfig.packageInfo}\n\n" +

data/lib/Tj3Config.rb

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

data/lib/TjTime.rb

@@ -348,6 +348,11 @@ class TaskJuggler
       @time.to_i
     end
 
+    def to_ary
+      to_s
+    end
+
+
     # Return the abbreviated month name.
     def shortMonthName
       @time.strftime('%b')

data/lib/TjpSyntaxRules.rb

@@ -56,10 +56,11 @@ EOT
         @property = @project.accout(@accountprefix)
       end
       if @val[1] && @project.account(@val[1])
-        error('account_exists', "Account #{@val[1]} has already been defined.")
+        error('account_exists', "Account #{@val[1]} has already been defined.",
+              @property, @sourceFileInfo[1])
       end
       @property = Account.new(@project, @val[1], @val[2], @property)
-      @property.sourceFileInfo = @scanner.sourceFileInfo
+      @property.sourceFileInfo = @sourceFileInfo[0]
       @property.inheritAttributes
       @scenarioIdx = 0
     })
@@ -73,7 +74,8 @@ 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}")
+        error('unknown_account', "Unknown account #{id}", nil,
+              @sourceFileInfo[0])
       end
       account
     })
@@ -107,7 +109,7 @@ EOT
       level = @project.alertLevelIndex(@val[0])
       unless level
         error('bad_alert', "Unknown alert level #{@val[1]}. Must be " +
-              'green, yellow or red')
+              'green, yellow or red', nil, @sourceFileInfo[0])
       end
       level
     })
@@ -171,7 +173,7 @@ EOT
     pattern(%w( !limits ), lambda {
       limits = @property['limits', @scenarioIdx] = @val[0]
       @allocate.candidates.each do |resource|
-         limits.limits.each_value do |l|
+         limits.limits.each do |l|
            l.resource = resource if resource.leaf?
          end
       end
@@ -257,7 +259,7 @@ EOT
       # Make sure we have a ShiftAssignment for the allocation.
       if @allocate.shift.nil?
         @allocate.shift = ShiftAssignments.new
-        @allocate.shift.setProject(@project)
+        @allocate.shift.project = @project
       end
 
       if @val[1].nil?
@@ -270,7 +272,7 @@ EOT
           addAssignment(ShiftAssignment.new(@val[0].scenario(@scenarioIdx),
                                             interval))
           error('shift_assignment_overlap',
-                'Shifts may not overlap each other.')
+                'Shifts may not overlap each other.', nil, @sourceFileInfo[0])
         end
       end
     })
@@ -313,16 +315,18 @@ EOT
     pattern(%w( _balance !accountId !accountId ), lambda {
       if @val[1].parent
         error('cost_acct_no_top',
-              "The cost account #{@val[1].fullId} is not a top-level account.")
+              "The cost account #{@val[1].fullId} is not a top-level account.",
+              nil, @sourceFileInfo[1])
       end
       if @val[2].parent
         error('rev_acct_no_top',
               "The revenue account #{@val[2].fullId} is not a top-level " +
-              "account.")
+              "account.", nil, @sourceFileInfo[2])
       end
       if @val[1] == @val[2]
         error('cost_rev_same',
-              'The cost and revenue accounts may not be the same.')
+              'The cost and revenue accounts may not be the same.', nil,
+              @sourceFileInfo[1])
       end
       [ @val[1], @val[2] ]
     })
@@ -347,7 +351,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)
+              "Overtime value #{@val[1]} out of range (0 - 2).", @property,
+              @sourceFileInfo[1])
       end
       @booking.overtime = @val[1]
     })
@@ -368,7 +373,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)
+              "Sloppyness value #{@val[1]} out of range (0 - 2).", @property,
+              @sourceFileInfo[1])
       end
       @booking.sloppy = @val[1]
     })
@@ -422,7 +428,7 @@ EOT
         end
         chargeSet.complete
       rescue TjException
-        error('chargeset', $!.message)
+        error('chargeset', $!.message, @property, @sourceFileInfo[0])
       end
       masterAccounts = []
       @property['chargeset', @scenarioIdx].each do |set|
@@ -431,7 +437,7 @@ EOT
       if masterAccounts.include?(chargeSet.master)
         error('chargeset_master',
               "All charge sets for this task must have different top-level " +
-              "accounts.")
+              "accounts.", @property, @sourceFileInfo[0])
       end
       @property['chargeset', @scenarioIdx] =
         @property['chargeset', @scenarioIdx] + [ chargeSet ]
@@ -499,7 +505,8 @@ EOT
       col = @val[0]
       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")
+              "Color values must be specified as '#RGB' or '#RRGGBB' values",
+              nil, @sourceFileInfo[0])
       end
       col
     })
@@ -586,6 +593,18 @@ Specifies an alternative font color for the cells of this column. The
 logical expression specifies for which cells the color should be used. If
 multiple fontcolor patterns are provided for a column, the first
 matching one is used for each cell.
+EOT
+       )
+
+    pattern(%w( _halign !logicalExpression !hAlignment ), lambda {
+      @column.hAlign.addPattern(
+        CellSettingPattern.new(@val[2], @val[1]))
+    })
+    doc('halign.column', <<'EOT'
+Specifies the horizontal alignment of the cell content. The logical expression
+specifies for which cells the alignment setting should be used. If multiple
+halign patterns are provided for a column, the first matching one is used for
+each cell.
 EOT
        )
 
@@ -666,7 +685,8 @@ EOT
       if @val[0] % resolution != 0
         error('misaligned_date',
               "The date must be aligned to the timing resolution (" +
-              "#{resolution / 60} min) of the project.")
+              "#{resolution / 60} min) of the project.", nil,
+              @sourceFileInfo[0])
       end
       @val[0]
     })
@@ -712,11 +732,12 @@ EOT
 
       rtTokenSetMore =
         %w( LINEBREAK SPACE WORD BOLD ITALIC CODE BOLDITALIC PRE HREF HREFEND
-            REF REFEND HLINE TITLE2 TITLE3 TITLE2END TITLE3END BULLET1 BULLET2
-            BULLET3 NUMBER1 NUMBER2 NUMBER3 )
+            REF REFEND HLINE TITLE2 TITLE3 TITLE4 TITLE2END TITLE3END TITLE4END
+            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")
+              "'Some more details' is not a valid value", nil,
+              @sourceFileInfo[1])
       end
       @journalEntry.details = newRichText(@val[1], rtTokenSetMore)
     })
@@ -773,23 +794,19 @@ EOT
       @property = nil
     })
     doc('export', <<'EOT'
-The export report looks like a regular TaskJuggler file but contains fixed
-start and end dates for all tasks. The tasks only have start and end times,
-their description and their project id listed. No other attributes are
-exported unless they are requested using the taskattributes attribute. The
-contents also depends on the extension of the file name. If the file name ends
-with .tjp a complete project with header, resource and shift definitions is
-generated. In case it ends with .tji only the tasks and resource allocations
-are exported.
-
-If specified the resource usage for the tasks is reported as well. But only
-those allocations are listed that belong to tasks listed in the same export
-report.
+The export report looks like a regular TaskJuggler file with the provided
+input data complemented by the results of the scheduling process. The content
+of the report can be controlled with the [[definitions]] attribute. In case
+the file contains the project header, a ''''.tjp'''' extension is added to the
+file name. Otherwise, a ''''.tji'''' extension is used.
+
+The [[resourceattributes]] and [[taskattributes]] attributes provide even more
+control over the content of the file.
 
 The export report can be used to share certain tasks or milestones with other
 projects or to save past resource allocations as immutable part for future
 scheduling runs. When an export report is included the project IDs of the
-included tasks must be declared first with the project id property.`
+included tasks must be declared first with the project id property.
 EOT
        )
     example('Export')
@@ -817,6 +834,8 @@ EOT
 This attributes controls what definitions will be contained in the report. If
 the list includes ''project'', the generated file will have a ''''.tjp''''
 extension. Otherwise it will have a ''''.tji'''' extension.
+
+By default, the report contains everything and the generated files has a ''''.tjp'''' extension.
 EOT
        )
     allOrNothingListRule('exportDefinitions',
@@ -946,7 +965,8 @@ EOT
     pattern(%w( $ID ), lambda {
       unless (?A..?Z) === @val[0][0]
         error('extend_id_cap',
-              "User defined attributes IDs must start with a capital letter")
+              "User defined attributes IDs must start with a capital letter",
+              nil, @sourceFileInfo[0])
       end
       @val[0]
     })
@@ -1005,7 +1025,7 @@ EOT
 The fail attribute adds a logical expression to the property. The condition
 described by the logical expression is checked after the scheduling and an
 error is raised if the condition evaluates to true. This attribute is
-primarily intended for testing purpuses.
+primarily intended for testing purposes.
 EOT
        )
   end
@@ -1013,7 +1033,8 @@ EOT
   def rule_flag
     pattern(%w( $ID ), lambda {
       unless @project['flags'].include?(@val[0])
-        error('undecl_flag', "Undeclared flag '#{@val[0]}'")
+        error('undecl_flag', "Undeclared flag '#{@val[0]}'", nil,
+              @sourceFileInfo[0])
       end
       @val[0]
     })
@@ -1133,6 +1154,15 @@ EOT
     arg(2, 'Resource ID', 'The ID of a defined resource')
     arg(4, 'Scenario ID', 'A scenario ID')
 
+    pattern(%w( _isfeatureof _( $ID _, $ID _) ))
+    doc('isfeatureof', <<'EOT'
+If the provided task or any of its sub-tasks depend on this task or any of its
+sub-tasks, we call this task a feature of the provided task.
+EOT
+       )
+    arg(2, 'Task ID', 'The ID of a defined task')
+    arg(4, 'Scenario ID', 'A scenario ID')
+
     pattern(['_isleaf', '_(', '_)' ])
     doc('isleaf', 'The result is true if the property is not a container.')
 
@@ -1158,6 +1188,23 @@ EOT
        )
   end
 
+  def rule_hAlignment
+    pattern(%w( _center ), lambda {
+      :center
+    })
+    doc('halign.center', 'Center the cell content')
+
+    pattern(%w( _left ), lambda {
+      :left
+    })
+    doc('halign.left', 'Left align the cell content')
+
+    pattern(%w( _right ), lambda {
+      :right
+    })
+    doc('halign.right', 'Right align the cell content')
+  end
+
   def rule_headline
     pattern(%w( _headline $STRING ), lambda {
       @property.set('headline', newRichText(@val[1]))
@@ -1183,6 +1230,7 @@ report is sorted in tree mode (default) then enclosing resources are listed
 even if the expression matches the resource.
 EOT
        )
+    also(%w( sortresources ))
   end
 
   def rule_hidetask
@@ -1195,6 +1243,7 @@ report is sorted in tree mode (default) then enclosing tasks are listed even
 if the expression matches the task.
 EOT
        )
+    also(%w( sorttasks ))
   end
 
   def rule_idOrAbsoluteId
@@ -1256,7 +1305,7 @@ EOT
 
   def rule_includeFile
     pattern(%w( !includeFileName ), lambda {
-      @scanner.include(@val[0])
+      @scanner.include(@val[0], @sourceFileInfo[0])
     })
   end
 
@@ -1264,7 +1313,8 @@ EOT
     pattern(%w( $STRING ), lambda {
       unless @val[0][-4, 4] == '.tji'
         error('bad_include_suffix', "Included files must have a '.tji'" +
-                                    "extension: '#{@val[0]}'")
+                                    "extension: '#{@val[0]}'",
+              nil, @sourceFileInfo[0])
       end
       @val[0]
     })
@@ -1279,7 +1329,7 @@ EOT
   def rule_includeProperties
     pattern(%w( !includeFileName !includeAttributes ), lambda {
       pushFileStack
-      @scanner.include(@val[0])
+      @scanner.include(@val[0], @sourceFileInfo[0])
     })
   end
 
@@ -1291,7 +1341,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]}).")
+                  "after the start date (#{@val[0]}).", nil, @sourceFileInfo[0])
           end
           Interval.new(@val[0], endSpec)
         else
@@ -1322,7 +1372,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]}).")
+                "the start date (#{@val[0]}).", nil, @sourceFileInfo[0])
         end
         Interval.new(@val[0], endSpec)
       else
@@ -1352,7 +1402,8 @@ EOT
                       60 * 60 * 24 * 365 # years
                      ]
       if @val[0] == 0.0
-        error('zero_duration', "The interval duration may not be 0.")
+        error('zero_duration', "The interval duration may not be 0.", nil,
+              @sourceFileInfo[1])
       end
       duration = @val[0] * convFactors[@val[1]]
       resolution = @project.nil? ? 60 * 60 : @project['scheduleGranularity']
@@ -1363,7 +1414,7 @@ EOT
   end
 
   def rule_intervalEnd
-    pattern([ '_ - ', '!date' ], lambda {
+    pattern([ '_-', '!date' ], lambda {
       [ 0, @val[1] ]
     })
 
@@ -1374,7 +1425,7 @@ EOT
 
   def rule_intervalOptionalEnd
     optional
-    pattern([ '_ - ', '!date' ], lambda {
+    pattern([ '_-', '!date' ], lambda {
       [ 0, @val[1] ]
     })
 
@@ -1421,7 +1472,7 @@ EOT
       level = @project.alertLevelIndex(@val[1])
       unless level
         error('bad_alert', "Unknown alert level #{@val[1]}. Must be " +
-              'green, yellow or red')
+              'green, yellow or red', nil, @sourceFileInfo[0])
       end
       @journalEntry.alertLevel = level
     })
@@ -1451,7 +1502,7 @@ EOT
   def rule_journalEntryHeader
     pattern(%w( _journalentry !valDate $STRING ), lambda {
       @journalEntry = JournalEntry.new(@project['journal'], @val[1], @val[2],
-                                       @property, @scanner.sourceFileInfo)
+                                       @property, @sourceFileInfo[0])
     })
     arg(2, 'headline', <<'EOT'
 The headline of the journal entry. It will be interpreted as
@@ -1464,7 +1515,7 @@ EOT
       resource = @val[0]
       unless resource.leaf?
         error('leaf_resource_id_expected',
-              "#{resource.id} is not a leaf resource.")
+              "#{resource.id} is not a leaf resource.", nil, @sourceFileInfo[0])
       end
       resource
     })
@@ -1711,7 +1762,7 @@ EOT
       if @scanner.macroDefined?(@val[1])
         warning('marco_redefinition', "Redefining macro #{@val[1]}")
       end
-      @scanner.addMacro(Macro.new(@val[1], @val[2], @scanner.sourceFileInfo))
+      @scanner.addMacro(Macro.new(@val[1], @val[2], @sourceFileInfo[0]))
     })
     doc('macro', <<'EOT'
 Defines a text fragment that can later be inserted by using the specified ID.
@@ -1730,14 +1781,17 @@ numbers as names.  The number specifies the index of the argument.
  macro FOO [ This ${1} text ]
 
 will expand to ''''This stupid text'''' if called as ''''${FOO "stupid"}''''.
-Macros may call other macros.
+Macros may call other macros. All macro arguments must be enclosed by double
+quotes. In case the argument contains a double quote, it must be escaped by a
+slash (''''/'''').
 
 User defined macro IDs must have at least one uppercase letter as all
 lowercase letter IDs are reserved for built-in macros.
 
-Macro definitions may contain ''''<nowiki>]</nowiki>'''' as long as each
-''''<nowiki>]</nowiki>'''' is preceeded by a corresponding
-''''<nowiki>[</nowiki>''''.
+To terminate the macro definition, the ''''<nowiki>]</nowiki>'''' must be the
+last character in the line. If there are any other characters trailing it
+(even spaces or comments) the ''''<nowiki>]</nowiki>'''' will not be
+considered the end of the macro definition.
 
 In macro calls the macro names can be prefixed by a question mark. In this
 case the macro will expand to nothing if the macro is not defined. Otherwise
@@ -1840,7 +1894,8 @@ EOT
     pattern(%w( _navigator $ID ), lambda {
       if @project['navigators'][@val[1]]
         error('navigator_exists',
-              "The navigator #{@val[1]} has already been defined.")
+              "The navigator #{@val[1]} has already been defined.", nil,
+              @sourceFileInfo[0])
       end
       @navigator = Navigator.new(@val[1], @project)
     })
@@ -1893,6 +1948,49 @@ EOT
     example('Niku')
   end
 
+  def rule_nodeId
+    pattern(%w( !idOrAbsoluteId !subNodeId ), lambda {
+      case @property.typeSpec
+      when :taskreport
+        if (p1 = @project.task(@val[0])).nil?
+          error('unknown_main_node',
+                "Unknown task ID #{@val[0]}", nil, @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])
+          end
+          return [ p2, p1 ]
+        end
+        return [ p1, nil ]
+      when :resourcereport
+        if (p1 = @project.task(@val[0])).nil?
+          error('unknown_main_node',
+                "Unknown task ID #{@val[0]}", nil, @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])
+          end
+          return [ p2, p1 ]
+        end
+        return [ p1, nil ]
+      end
+
+      raise "Node list is not supported for this report type: " +
+            "#{@property.typeSpec}"
+    })
+  end
+
+  def rule_nodeIdList
+    listRule('moreNodeIdList', '!nodeId')
+    pattern([ '_-' ], lambda {
+      []
+    })
+  end
+
   def rule_number
     singlePattern('$INTEGER')
     singlePattern('$FLOAT')
@@ -1911,12 +2009,13 @@ EOT
     pattern(%w( $ABSOLUTE_ID ), lambda {
       if @val[0].count('.') > 1
         error('operand_attribute',
-              'Attributes must be specified as <scenarioID>.<attribute>')
+              'Attributes must be specified as <scenarioID>.<attribute>', nil,
+              @sourceFileInfo[0])
       end
       scenario, attribute = @val[0].split('.')
       if (scenarioIdx = @project.scenarioIdx(scenario)).nil?
-        error('operand_unkn_scen',
-              "Unknown scenario ID #{scenario}")
+        error('operand_unkn_scen', "Unknown scenario ID #{scenario}", nil,
+              @sourceFileInfo[0])
       end
       LogicalAttribute.new(attribute, scenarioIdx)
     })
@@ -1926,7 +2025,8 @@ EOT
     pattern(%w( $ID !argumentList ), lambda {
       if @val[1].nil?
         unless @project['flags'].include?(@val[0])
-          error('operand_unkn_flag', "Undeclared flag '#{@val[0]}'")
+          error('operand_unkn_flag', "Undeclared flag '#{@val[0]}'",
+                nil, @sourceFileInfo[0])
         end
         LogicalFlag.new(@val[0])
       else
@@ -1966,10 +2066,10 @@ EOT
     arg(0, 'operand', <<'EOT'
 An operand can consist of a date, a text string, a [[functions|function]], a
 property attribute or a numerical value. It can also be the name of a declared
-flag. Use the scenario.attribute notation to use an attribute of the currently
-evaluated property. The scenario ID always has to be specified, also for
-non-scenario specific attributes. This is necessary to distinguish them from
-flags.
+flag. Use the ''''scenario_id.attribute'''' notation to use an attribute of the
+currently evaluated property. The scenario ID always has to be specified, also
+for non-scenario specific attributes. This is necessary to distinguish them
+from flags.
 
 An operand can be a negated operand by prefixing a ~ charater or it can be
 another logical expression enclosed in braces.
@@ -2087,11 +2187,11 @@ EOT
 
   def rule_plusOrMinus
     singlePattern('_+')
-    singlePattern('_ - ')
+    singlePattern('_-')
   end
 
   def rule_project
-    pattern(%w( !projectProlog !projectDeclaration !properties ), lambda {
+    pattern(%w( !projectProlog !projectDeclaration !properties . ), lambda {
       @val[1]
     })
   end
@@ -2132,8 +2232,9 @@ EOT
 Set the average number of working hours per day. This is used as
 the base to convert working hours into working days. This affects
 for example the length task attribute. The default value is 8 hours
-and should work for most Western countries. The value you specify
-should match the settings you specified for workinghours.
+and should work for most Western countries. The value you specify should match
+the settings you specified as your default [[workinghours.project|working
+hours]].
 EOT
        )
     example('Project')
@@ -2161,9 +2262,9 @@ EOT
     pattern(%w( _now !date ), lambda {
       @project['now'] = @val[1]
       @scanner.addMacro(Macro.new('now', @val[1].to_s,
-                                  @scanner.sourceFileInfo))
+                                  @sourceFileInfo[0]))
       @scanner.addMacro(Macro.new('today', @val[1].to_s(@project['timeFormat']),
-                                  @scanner.sourceFileInfo))
+                                  @sourceFileInfo[0]))
     })
     doc('now', <<'EOT'
 Specify the date that TaskJuggler uses for calculation as current
@@ -2208,12 +2309,14 @@ EOT
       goodValues = [ 5, 10, 15, 20, 30, 60 ]
       unless goodValues.include?(@val[1])
         error('bad_timing_res',
-              "Timing resolution must be one of #{goodValues.join(', ')} min.")
+              "Timing resolution must be one of #{goodValues.join(', ')} min.",
+              nil, @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.")
+              "#{Project.maxScheduleGranularity / 60} minutes.", nil,
+              @sourceFileInfo[1])
       end
       @project['scheduleGranularity'] = @val[1] * 60
     })
@@ -2283,6 +2386,7 @@ EOT
                                           @messageHandler)
       @project['start'] = @val[4].start
       @project['end'] = @val[4].end
+      @projectId = @val[1]
       setGlobalMacros
       @property = nil
       @reportCounter = 0
@@ -2381,10 +2485,12 @@ EOT
 
   def rule_properties
     pattern(%w( !propertiesBody . ))
+    lastSyntaxToken(1)
   end
 
   def rule_propertiesBody
     repeatable
+    optional
 
     pattern(%w( !account ))
 
@@ -2435,7 +2541,7 @@ EOT
     pattern(%w( _projectid $ID ), lambda {
       @project['projectids'] << @val[1]
       @project['projectids'].uniq!
-      @project['projectid'] = @val[1]
+      @project['projectid'] = @projectId = @val[1]
     })
     doc('projectid', <<'EOT'
 This declares a new project id and activates it. All subsequent
@@ -2511,7 +2617,6 @@ EOT
     pattern(%w( _include !includeProperties !properties ), lambda {
       popFileStack
     })
-    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
@@ -2532,7 +2637,8 @@ 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")
+              "#{@val[1]} is not a known attribute for this property", nil,
+              @sourceFileInfo[1])
       end
       if attributeDefinition.scenarioSpecific
         attr = @property[@val[1], 0]
@@ -2541,7 +2647,8 @@ EOT
       end
       unless attr.is_a?(Array)
         error('purge_no_list',
-              "#{@val[1]} is not a list attribute. Only those can be purged.")
+              "#{@val[1]} is not a list attribute. Only those can be purged.",
+              nil, @sourceFileInfo[1])
       end
       if attributeDefinition.scenarioSpecific
         @property[@val[1], @scenarioIdx] = attributeDefinition.default.dup
@@ -2620,17 +2727,19 @@ properties.
 EOT
          )
 
-    singlePattern('_alertmessage')
+    singlePattern('_alertmessages')
     descr(<<'EOT'
 The headlines, the summary and the details of the message from the journal
-entries that caused the current alert level for this task.
+entries that caused the current alert level to be larger than the defaul level
+for this task or any of its sub tasks.
 EOT
          )
 
-    singlePattern('_alertsummary')
+    singlePattern('_alertsummaries')
     descr(<<'EOT'
 The headlines and the summary message from the journal entries that caused the
-current alert level for this task.
+current alert level to be larger than the default for this task or any of its
+sub tasks.
 EOT
          )
 
@@ -2754,6 +2863,20 @@ EOT
     singlePattern('_journal')
     descr(<<'EOT'
 The journal entries for the task or resource for the reported interval.
+EOT
+         )
+
+    singlePattern('_journalmessages')
+    descr(<<'EOT'
+The headlines, the summary and the details of the message from the journal
+entries that caused the current alert level for this task.
+EOT
+         )
+
+    singlePattern('_journalsummaries')
+    descr(<<'EOT'
+The headlines and the summary message from the journal entries that caused the
+current alert level for this task.
 EOT
          )
 
@@ -2788,7 +2911,7 @@ EOT
     descr('The criticalness of the task with respect to all the paths that ' +
           'it is a part of.')
 
-    singlePattern('_precursor')
+    singlePattern('_precursors')
     descr(<<EOT
 A list of tasks the current task depends on. The list contains the names, the
 IDs, the date and the type of dependency. For the type the following symbols
@@ -2979,6 +3102,11 @@ EOT
        )
     also(%w( epilog footer header ))
 
+    pattern(%w( _opennodes !nodeIdList ), lambda {
+      @property.set('openNodes', @val[1])
+    })
+    doc('opennods', 'For internal use only!')
+
     pattern(%w( !report ))
 
     pattern(%w( _right $STRING ), lambda {
@@ -3046,7 +3174,8 @@ EOT
     pattern(%w( _end !date ), lambda {
       if @val[1] < @property.get('start')
         error('report_end',
-              "End date must be before start date #{@property.get('start')}")
+              "End date must be before start date #{@property.get('start')}",
+              nil, @sourceFileInfo[1])
       end
       @property.set('end', @val[1])
     })
@@ -3067,7 +3196,8 @@ 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.")
+        error('report_id_expected', "#{id} is not a defined report.", nil,
+              @sourceFileInfo[0])
       end
       report
     })
@@ -3095,7 +3225,8 @@ EOT
     pattern(%w( _start !date ), lambda {
       if @val[1] > @property.get('end')
         error('report_start',
-              "Start date must be before end date #{@property.get('end')}")
+              "Start date must be before end date #{@property.get('end')}",
+              nil, @sourceFileInfo[1])
       end
       @property.set('start', @val[1])
     })
@@ -3118,11 +3249,12 @@ EOT
       if @val[1]
         id = (@property ? @property.fullId + '.' : '') + @val[1]
         if @project.report(id)
-          error('report_exists', "report #{id} has already been defined.")
+          error('report_exists', "report #{id} has already been defined.",
+                @property, @sourceFileInfo[1])
         end
       end
       @property = Report.new(@project, @val[1], @val[2], @property)
-      @property.sourceFileInfo = @scanner.sourceFileInfo
+      @property.sourceFileInfo = @sourceFileInfo[0]
       @property.inheritAttributes
       case @val[0]
       when 'taskreport'
@@ -3303,7 +3435,7 @@ EOT
     pattern(%w( !taskId !valIntervals ), lambda {
       checkBooking(@val[0], @property)
       @booking = Booking.new(@property, @val[0], @val[1])
-      @booking.sourceFileInfo = @scanner.sourceFileInfo
+      @booking.sourceFileInfo = @sourceFileInfo[0]
       @booking
     })
     arg(0, 'id', 'Absolute ID of a defined task')
@@ -3313,7 +3445,8 @@ EOT
     pattern(%w( $ID ), lambda {
       id = (@resourceprefix.empty? ? '' : @resourceprefix + '.') + @val[0]
       if (resource = @project.resource(id)).nil?
-        error('resource_id_expected', "#{id} is not a defined resource.")
+        error('resource_id_expected', "#{id} is not a defined resource.",
+              nil, @sourceFileInfo[0])
       end
       resource
     })
@@ -3326,10 +3459,12 @@ EOT
         @property = @project.resource(@resourceprefix)
       end
       if @val[1] && @project.resource(@val[1])
-        error('resource_exists', "Resource #{@val[1]} has already been defined.")
+        error('resource_exists',
+              "Resource #{@val[1]} has already been defined.", @property,
+              @sourceFileInfo[1])
       end
       @property = Resource.new(@project, @val[1], @val[2], @property)
-      @property.sourceFileInfo = @scanner.sourceFileInfo
+      @property.sourceFileInfo = @sourceFileInfo[0]
       @property.inheritAttributes
       @scenarioIdx = 0
     })
@@ -3443,8 +3578,8 @@ EOT
     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.
-Outside of the defined shift intervals the resource uses its normal working
-hours and vacations.
+In case a shift is defined for a certain interval, the shift working hours
+replace the standard resource working hours for this interval.
 EOT
         )
 
@@ -3555,7 +3690,9 @@ EOT
       # first.
       @project.scenarios.clearProperties if @property.nil?
       if @project.scenario(@val[1])
-        error('scenario_exists', "Scenario #{@val[1]} has already been defined.")
+        error('scenario_exists',
+              "Scenario #{@val[1]} has already been defined.", nil,
+              @sourceFileInfo[1])
       end
       @property = Scenario.new(@project, @val[1], @val[2], @property)
       @property.inheritAttributes
@@ -3567,7 +3704,8 @@ EOT
   def rule_scenarioId
     pattern(%w( $ID ), lambda {
       if (@scenarioIdx = @project.scenarioIdx(@val[0])).nil?
-        error('unknown_scenario_id', "Unknown scenario: #{@val[0]}")
+        error('unknown_scenario_id', "Unknown scenario: #{@val[0]}", nil,
+              @sourceFileInfo[0])
       end
       @scenarioIdx
     })
@@ -3577,7 +3715,8 @@ 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]", nil,
+              @sourceFileInfo[0])
       end
     })
   end
@@ -3589,7 +3728,8 @@ EOT
   def rule_scenarioIdx
     pattern(%w( $ID ), lambda {
       if (scenarioIdx = @project.scenarioIdx(@val[0])).nil?
-        error('unknown_scenario_idx', "Unknown scenario #{@val[0]}")
+        error('unknown_scenario_idx', "Unknown scenario #{@val[0]}", nil,
+              @sourceFileInfo[0])
       end
       scenarioIdx
     })
@@ -3613,6 +3753,7 @@ Shifts have a global name space. All IDs must be unique within the shifts of
 the project.
 EOT
        )
+    also(%w( shifts.task shifts.resource ))
   end
 
   def rule_shiftAssignment
@@ -3620,7 +3761,7 @@ EOT
       # Make sure we have a ShiftAssignment for the property.
       if @property['shifts', @scenarioIdx].nil?
         @property['shifts', @scenarioIdx] = ShiftAssignments.new
-        @property['shifts', @scenarioIdx].setProject(@project)
+        @property['shifts', @scenarioIdx].project = @project
       end
 
       if @val[1].nil?
@@ -3633,7 +3774,8 @@ EOT
           addAssignment(ShiftAssignment.new(@val[0].scenario(@scenarioIdx),
                                             interval))
           error('shift_assignment_overlap',
-                'Shifts may not overlap each other.')
+                'Shifts may not overlap each other.', @property,
+                @sourceFileInfo[0])
         end
       end
       # Set same value again to set the 'provided' state for the attribute.
@@ -3663,10 +3805,11 @@ EOT
   def rule_shiftHeader
     pattern(%w( _shift !optionalID $STRING ), lambda {
       if @val[1] && @project.shift(@val[1])
-        error('shift_exists', "Shift #{@val[1]} has already been defined.")
+        error('shift_exists', "Shift #{@val[1]} has already been defined.",
+              nil, @sourceFileInfo[1])
       end
       @property = Shift.new(@project, @val[1], @val[2], @property)
-      @property.sourceFileInfo = @scanner.sourceFileInfo
+      @property.sourceFileInfo = @sourceFileInfo[0]
       @property.inheritAttributes
       @scenarioIdx = 0
     })
@@ -3676,7 +3819,8 @@ 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.")
+        error('shift_id_expected', "#{@val[0]} is not a defined shift.", nil,
+              @sourceFileInfo[0])
       end
       shift
     })
@@ -3746,33 +3890,38 @@ EOT
       args = @val[0].split('.')
       case args.length
       when 2
+        # <attribute>.<up|down>
         scenario = -1
         direction = args[1] == 'up'
         attribute = args[0]
       when 3
+        # <scenario>.<attribute>.<up|down>
         if (scenario = @project.scenarioIdx(args[0])).nil?
           error('sort_unknown_scen',
-                "Unknown scenario #{args[0]} in sorting criterium")
+                "Unknown scenario #{args[0]} in sorting criterium", nil,
+                @sourceFileInfo[0])
         end
         attribute = args[1]
         if args[2] != 'up' && args[2] != 'down'
-          error('sort_direction', "Sorting direction must be 'up' or 'down'")
+          error('sort_direction', "Sorting direction must be 'up' or 'down'",
+                nil, @sourceFileInfo[0])
         end
         direction = args[2] == 'up'
       else
         error('sorting_crit_exptd1',
               "Sorting criterium expected (e.g. tree, start.up or " +
-              "plan.end.down).")
+              "plan.end.down).", nil, @sourceFileInfo[0])
       end
       if attribute == 'wbs'
         error('sorting_wbs',
               "Sorting by wbs is not supported. Please use 'tree' " +
-              '(without appended .up or .down) instead.')
+              '(without appended .up or .down) instead.', nil,
+              @sourceFileInfo[0])
       end
       [ attribute, direction, scenario ]
     })
     arg(0, 'criteria', <<'EOT'
-The soring criteria must consist of a property attribute ID. See [[columnid]]
+The sorting criteria must consist of a property attribute ID. See [[columnid]]
 for a complete list of available attributes. The ID must be suffixed by '.up'
 or '.down' to determine the sorting direction. Optionally the ID may be
 prefixed with a scenario ID and a dot to determine the scenario that should be
@@ -3812,7 +3961,7 @@ EOT
       if @val[0] != 'tree'
         error('sorting_crit_exptd2',
               "Sorting criterium expected (e.g. tree, start.up or " +
-              "plan.end.down).")
+              "plan.end.down).", nil, @sourceFileInfo[0])
       end
       [ 'tree', true, -1 ]
     })
@@ -3825,7 +3974,7 @@ EOT
         if @project.reports[fileName]
           error('report_redefinition',
                 "A report with the name '#{fileName}' has already been " +
-                "defined.")
+                "defined.", nil, @sourceFileInfo[2])
         end
       else
         fileName = "statusSheet#{@project.reports.length + 1}"
@@ -3883,7 +4032,7 @@ EOT
     pattern(%w( _status !alertLevel $STRING ), lambda {
       @journalEntry = JournalEntry.new(@project['journal'], @sheetEnd,
                                        @val[2], @property,
-                                       @scanner.sourceFileInfo)
+                                       @sourceFileInfo[0])
       @journalEntry.alertLevel = @val[1]
       @journalEntry.author = @sheetAuthor
 
@@ -3924,6 +4073,14 @@ EOT
     optionsRule('statusSheetAttributes')
   end
 
+  def rule_statusSheetFile
+    pattern(%w( !statusSheet . ), lambda {
+      @val[0]
+    })
+    lastSyntaxToken(1)
+  end
+
+
   def rule_statusSheetHeader
     pattern(%w( _statussheet !resourceId !valIntervalOrDate ), lambda {
       @sheetAuthor = @val[1]
@@ -3985,6 +4142,14 @@ EOT
       @property = @val[1]
     })
   end
+
+  def rule_subNodeId
+    optional
+    pattern(%w( _: !idOrAbsoluteId ), lambda {
+      @val[1]
+    })
+  end
+
   def rule_summary
     pattern(%w( _summary $STRING ), lambda {
       return if @val[1].empty?
@@ -3992,11 +4157,13 @@ EOT
       if @val[1].length > 480
         error('ts_summary_too_long',
               "The summary text must be 480 characters long or shorter. " +
-              "This text has #{@val[1].length} characters.")
+              "This text has #{@val[1].length} characters.",
+              nil, @sourceFileInfo[1])
       end
       if @val[1] == "A summary text\n"
           error('ts_default_summary',
-                "'A summary text' is not a valid summary")
+                "'A summary text' is not a valid summary", nil,
+                @sourceFileInfo[1])
       end
       rtTokenSetIntro =
         %w( LINEBREAK SPACE WORD BOLD ITALIC CODE BOLDITALIC HREF HREFEND )
@@ -4130,7 +4297,7 @@ EOT
     pattern(%w( !resourceId !valIntervals ), lambda {
       checkBooking(@property, @val[0])
       @booking = Booking.new(@val[0], @property, @val[1])
-      @booking.sourceFileInfo = @scanner.sourceFileInfo
+      @booking.sourceFileInfo = @sourceFileInfo[0]
       @booking
     })
   end
@@ -4215,7 +4382,7 @@ EOT
       end
       error('too_many_bangs',
             "Too many '!' for relative task in this context.",
-            @property) if id[0] == ?!
+            @property, @sourceFileInfo[0]) if id[0] == ?!
       if task
         task.fullId + '.' + id
       else
@@ -4245,11 +4412,13 @@ EOT
       if @val[1]
         id = (@property ? @property.fullId + '.' : '') + @val[1]
         if @project.task(id)
-          error('task_exists', "Task #{id} has already been defined.")
+          error('task_exists', "Task #{id} has already been defined.", nil,
+                @sourceFileInfo[1])
         end
       end
       @property = Task.new(@project, @val[1], @val[2], @property)
-      @property.sourceFileInfo = @scanner.sourceFileInfo
+      @property['projectid', 0] = @projectId
+      @property.sourceFileInfo = @sourceFileInfo[0]
       @property.inheritAttributes
       @scenarioIdx = 0
     })
@@ -4266,7 +4435,7 @@ EOT
         id = @taskprefix + '.' + id unless @taskprefix.empty?
       end
       if (task = @project.task(id)).nil?
-        error('unknown_task', "Unknown task #{id}")
+        error('unknown_task', "Unknown task #{id}", nil, @sourceFileInfo[0])
       end
       task
     })
@@ -4331,7 +4500,8 @@ EOT
 
       if @property['chargeset', @scenarioIdx].empty?
         error('task_without_chargeset',
-              'The task does not have a chargeset defined.')
+              'The task does not have a chargeset defined.', @property,
+              @sourceFileInfo[0])
       end
       case @val[2]
       when 'onstart'
@@ -4368,7 +4538,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)
+              @property, @sourceFileInfo[1])
       end
       @property['complete', @scenarioIdx] = @val[1]
     })
@@ -4418,7 +4588,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)
+        error('effort_zero', "Effort value must be larger than 0", @property,
+              @sourceFileInfo[1])
       end
       @property['effort', @scenarioIdx] = @val[1]
     })
@@ -4595,7 +4766,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)
+              @property, @sourceFileInfo[1])
       end
       @property['priority', @scenarioIdx] = @val[1]
     })
@@ -4620,7 +4791,8 @@ EOT
 
     pattern(%w( _projectid $ID ), lambda {
       unless @project['projectids'].include?(@val[1])
-        error('unknown_projectid', "Unknown project ID #{@val[1]}")
+        error('unknown_projectid', "Unknown project ID #{@val[1]}", nil,
+              @sourceFileInfo[1])
       end
       @property['projectid', @scenarioIdx] = @val[1]
     })
@@ -4642,6 +4814,17 @@ EOT
        )
 
     pattern(%w( _scheduled ), lambda {
+      if (@property['milestone', @scenarioIdx] &&
+          @property['start', @scenarioIdx].nil? &&
+          @property['end', @scenarioIdx].nil?) ||
+         (!@property['milestone', @scenarioIdx] &&
+          (@property['start', @scenarioIdx].nil? ||
+           @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])
+      end
       @property['scheduled', @scenarioIdx] = true
     })
     doc('scheduled', <<'EOT'
@@ -4875,10 +5058,11 @@ EOT
   end
 
   def rule_timeInterval
-    pattern([ '$TIME', '_ - ', '$TIME' ], lambda {
+    pattern([ '$TIME', '_-', '$TIME' ], lambda {
       if @val[0] >= @val[2]
         error('time_interval',
-              "End time of interval must be larger than start time")
+              "End time of interval must be larger than start time", nil,
+              @sourceFileInfo[0])
       end
       [ @val[0], @val[2] ]
     })
@@ -4931,7 +5115,10 @@ EOT
     optional
     repeatable
 
-    pattern(%w( !tsNewTaskHeader !tsTaskBody ))
+    pattern(%w( !tsNewTaskHeader !tsTaskBody ), lambda {
+      @property = nil
+      @timeSheetRecord = nil
+    })
     doc('newtask', <<'EOT'
 The keyword can be used add a new task to the project. If the task ID requires
 further parent task that don't exist yet, these tasks will be created as well.
@@ -4942,7 +5129,7 @@ EOT
     example('TimeSheet1', '3')
 
     pattern(%w( _shift !shiftId ), lambda {
-
+      #TODO
     })
     doc('shift.timesheet', <<'EOT'
 Specifies an alternative [[shift]] for the time sheet period. This shift will
@@ -4968,6 +5155,13 @@ EOT
     example('TimeSheet1', '4')
   end
 
+  def rule_timeSheetFile
+    pattern(%w( !timeSheet . ), lambda {
+      @val[0]
+    })
+    lastSyntaxToken(1)
+  end
+
   def rule_timeSheetBody
     pattern(%w( _{ !timeSheetAttributes _} ), lambda {
 
@@ -4976,16 +5170,17 @@ EOT
 
   def rule_timeSheetHeader
     pattern(%w( _timesheet !resourceId !valIntervalOrDate ), lambda {
-      sheetAuthor = @val[1]
+      @sheetAuthor = @val[1]
       @property = nil
-      unless sheetAuthor.leaf?
+      unless @sheetAuthor.leaf?
         error('ts_group_author',
-              'A resource group cannot file a time sheet')
+              'A resource group cannot file a time sheet', nil,
+              @sourceFileInfo[1])
       end
       # Currently time sheets are hardcoded for scenario 0.
-      @timeSheet = TimeSheet.new(sheetAuthor, @val[2],
+      @timeSheet = TimeSheet.new(@sheetAuthor, @val[2],
                                  @project['trackingScenarioIdx'])
-      @timeSheet.sourceFileInfo = @scanner.sourceFileInfo
+      @timeSheet.sourceFileInfo = @sourceFileInfo[0]
       @project.timeSheets << @timeSheet
     })
   end
@@ -5039,7 +5234,7 @@ EOT
     pattern(%w( _newtask !taskIdUnverifd $STRING ), lambda {
       @timeSheetRecord = TimeSheetRecord.new(@timeSheet, @val[1])
       @timeSheetRecord.name = @val[2]
-      @timeSheetRecord.sourceFileInfo = @scanner.sourceFileInfo
+      @timeSheetRecord.sourceFileInfo = @sourceFileInfo[0]
     })
     arg(1, 'task', 'ID of the new task')
   end
@@ -5095,20 +5290,21 @@ 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.")
+              "has #{@val[2].length} characters.", nil, @sourceFileInfo[2])
       end
       if @val[2] == 'Your headline here!'
         error('ts_no_headline',
-              "'Your headline here!' is not a valid headline")
+              "'Your headline here!' is not a valid headline", nil,
+              @sourceFileInfo[2])
       end
       @journalEntry = JournalEntry.new(@project['journal'],
                                        @timeSheet.interval.end,
                                        @val[2],
                                        @property || @timeSheet.resource,
-                                       @scanner.sourceFileInfo)
+                                       @sourceFileInfo[0])
       @journalEntry.alertLevel = @val[1]
       @journalEntry.timeSheetRecord = @timeSheetRecord
-      @journalEntry.author = @timeSheet.resource
+      @journalEntry.author = @sheetAuthor
       @timeSheetRecord.status = @journalEntry if @timeSheetRecord
     })
   end
@@ -5135,7 +5331,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.")
+              "this time sheet report.", nil, @sourceFileInfo[1])
       end
       @timeSheetRecord.expectedEnd = @val[1]
     })
@@ -5150,7 +5346,8 @@ EOT
       priority = @val[1]
       if priority < 1 || priority > 1000
         error('ts_bad_priority',
-              "Priority value #{priority} must be between 1 and 1000.")
+              "Priority value #{priority} must be between 1 and 1000.", nil,
+              @sourceFileInfo[1])
       end
       @timeSheetRecord.priority = priority
     })
@@ -5213,14 +5410,15 @@ EOT
       @property = @val[1]
       unless @property.leaf?
         error('ts_task_not_leaf',
-              'You cannot specify a task that has sub tasks here.')
+              'You cannot specify a task that has sub tasks here.',
+              @property, @sourceFileInfo[1])
       end
       scenarioIdx = @timeSheet.scenarioIdx
       taskStart = @property['start', scenarioIdx] || @project['start']
       taskEnd = @property['end', scenarioIdx] || @project['end']
 
       @timeSheetRecord = TimeSheetRecord.new(@timeSheet, @property)
-      @timeSheetRecord.sourceFileInfo = @scanner.sourceFileInfo
+      @timeSheetRecord.sourceFileInfo = @sourceFileInfo[0]
     })
     arg(1, 'task', 'ID of an already existing task')
   end
@@ -5235,7 +5433,8 @@ 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']}")
+              "#{@project['start']}  - #{@project['end']}", nil,
+              @sourceFileInfo[0])
       end
       @val[0]
     })
@@ -5244,7 +5443,8 @@ 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")
+        error('bad_time_zone', "#{@val[0]} is not a known time zone", nil,
+              @sourceFileInfo[0])
       end
       @val[0]
     })
@@ -5258,7 +5458,8 @@ EOT
         if mode == 0
           unless @val[0] < endSpec
             error('start_before_end', "The end date (#{endSpec}) must be " +
-                  "after the start date (#{@val[0]}).")
+                  "after the start date (#{@val[0]}).", nil,
+                  @sourceFileInfo[1])
           end
           iv = Interval.new(@val[0], endSpec)
         else
@@ -5294,7 +5495,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]}).")
+                "the start date (#{@val[0]}).", nil, @sourceFileInfo[1])
         end
         iv = Interval.new(@val[0], endSpec)
       else
@@ -5330,7 +5531,7 @@ EOT
 The warn attribute adds a logical expression to the property. The condition
 described by the logical expression is checked after the scheduling and an
 warning is generated if the condition evaluates to true. This attribute is
-primarily intended for testing purpuses.
+primarily intended for testing purposes.
 EOT
        )
   end
@@ -5367,7 +5568,7 @@ EOT
 
   def rule_weekDayIntervalEnd
     optional
-    pattern([ '_ - ', '!weekday' ], lambda {
+    pattern([ '_-', '!weekday' ], lambda {
       @val[1]
     })
     arg(1, 'end weekday',
@@ -5409,7 +5610,8 @@ EOT
         # 1.0.
         if @val[0] < 0.0 || @val[0] > 100.0
           error('illegal_percentage',
-                "Percentage values must be between 0 and 100%.")
+                "Percentage values must be between 0 and 100%.", nil,
+                @sourceFileInfo[1])
         end
         @val[0] / 100.0
       end
@@ -5441,8 +5643,12 @@ EOT
 Set the default working hours for all subsequent resource definitions.
 The working hours specification limits the availability of resources to
 certain time slots of week days.
+
+These default working hours can be replaced with other working hours for
+individual resources.
 EOT
        )
+    also(%w( dailyworkinghours workinghours.resource workinghours.shift ))
   end
 
   def rule_workinghoursResource
@@ -5452,16 +5658,26 @@ Set the working hours for a specific resource. The working hours specification
 limits the availability of resources to certain time slots of week days.
 EOT
        )
+    also(%w( workinghours.project workinghours.shift ))
   end
 
   def rule_workinghoursShift
     pattern(%w( !workinghours ))
     doc('workinghours.shift', <<'EOT'
-Set the default working hours for the shift. The working hours specification
-limits the availability of resources or the activity on a task to certain time
+Set the working hours for the shift. The working hours specification limits
+the availability of resources or the activity on a task to certain time
 slots of week days.
+
+The shift working hours will replace the default or resource working hours for
+the specified time frame when assigning the shift to a resource.
+
+In case the shift is used for a task, resources are only assigned during the
+working hours of this shift and during the working hours of the allocated
+resource. Allocations only happen when both the task shift and the resource
+work hours allow work to happen.
 EOT
        )
+    also(%w( workinghours.project workinghours.resource ))
   end
 
   def rule_yesNo