taskjuggler 0.0.4 → 0.0.5

data/lib/TjpSyntaxRules.rb

@@ -352,7 +352,16 @@ EOT
       @booking.overtime = @val[1]
     })
     doc('overtime.booking', <<'EOT'
-This attribute enables bookings to override working hours and vacations.
+This attribute enables bookings during off-hours and vacations. It implicitly
+sets the [[sloppy.booking|sloppy]] attribute accordingly.
+EOT
+       )
+    arg(1, 'value', <<'EOT'
+* '''0''': You can only book available working time. (Default)
+
+* '''1''': You can book off-hours as well.
+
+* '''2''': You can book working time, off-hours and vacation time.
 EOT
        )
 
@@ -365,9 +374,20 @@ EOT
     })
     doc('sloppy.booking', <<'EOT'
 Controls how strict TaskJuggler checks booking intervals for conflicts with
-vacation and other bookings. In case the error is suppressed the booking will
-not overwrite the existing bookings. It will avoid the already assigned
-intervals during booking.
+working periods and vacations. This attribute only affects the check for
+conflicts. No assignments will be made unless the [[overtime.booking|
+overtime]] attribute is set accordingly.
+EOT
+       )
+    arg(1, 'sloppyness', <<'EOT'
+* '''0''': Period may not contain any off-duty hours, vacation or other task
+assignments. (default)
+
+* '''1''': Period may contain off-duty hours, but no vacation time or other
+task assignments.
+
+* '''2''': Period may contain off-duty hours and vacation time, but no other
+task assignments.
 EOT
        )
   end
@@ -508,8 +528,8 @@ EOT
       @column = TableColumnDefinition.new(@val[0], title)
     })
     doc('columnid', <<'EOT'
-In addition to the listed IDs all user defined attributes can be used as
-column IDs.
+This is a comprehensive list of all pre-defined [[columns]]. In addition to
+the listed IDs all user defined attributes can be used as column IDs.
 EOT
        )
   end
@@ -531,7 +551,7 @@ provided for a column, the first matching one is taken for each cell.
 EOT
         )
     arg(1, 'text',
-        'Alterntive cell text specified as [[Rich_Text_Attributes Rich Text]]')
+        'Alterntive cell text specified as [[Rich_Text_Attributes|Rich Text]]')
 
     pattern(%w( _cellcolor !logicalExpression !color ), lambda {
       @column.cellColor.addPattern(
@@ -574,8 +594,8 @@ EOT
       @column.end = @val[1].end
     })
     doc('period.column', <<'EOT'
-This property is a shortcut for setting the [[start.column start]] and
-[[end.column end]] property at the same time.
+This property is a shortcut for setting the [[start.column|start]] and
+[[end.column|end]] property at the same time.
 EOT
        )
 
@@ -621,7 +641,7 @@ column, the first matching one is taken for each cell.
 EOT
        )
     arg(2, 'text', <<'EOT'
-The content of the tooltip. The text is interpreted as [[Rich_Text_Attributes
+The content of the tooltip. The text is interpreted as [[Rich_Text_Attributes|
 Rich Text]].
 EOT
        )
@@ -688,10 +708,16 @@ EOT
 
   def rule_details
     pattern(%w( _details $STRING ), lambda {
+      return if @val[1].empty?
+
       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 )
+      if @val[1] == "Some more details\n"
+        error('ts_default_details',
+              "'Some more details' is not a valid value")
+      end
       @journalEntry.details = newRichText(@val[1], rtTokenSetMore)
     })
     doc('details', <<'EOT'
@@ -700,7 +726,7 @@ can be several paragraphs long.
 EOT
        )
     arg(1, 'text', <<'EOT'
-The text will be interpreted as [[Rich_Text_Attributes Rich Text]]. Only a
+The text will be interpreted as [[Rich_Text_Attributes|Rich Text]]. Only a
 subset of the markup is supported for this attribute. You can use word
 formatting, paragraphs, hyperlinks, lists, section and subsection
 headers.
@@ -728,8 +754,24 @@ EOT
     descr('years')
   end
 
+  def rule_durationUnitOrPercent
+    pattern(%w( _% ), lambda { -1 })
+    descr('percentage of reported period')
+
+    pattern(%w( _min ), lambda { 0 })
+    descr('minutes')
+
+    pattern(%w( _h ), lambda { 1 })
+    descr('hours')
+
+    pattern(%w( _d ), lambda { 2 })
+    descr('days')
+  end
+
   def rule_export
-    pattern(%w( !exportHeader !exportBody ))
+    pattern(%w( !exportHeader !exportBody ), lambda {
+      @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,
@@ -754,22 +796,8 @@ EOT
   end
 
   def rule_exportHeader
-    pattern(%w( _export $STRING ), lambda {
-      if @val[1] != '.'
-        suffix = @val[1][-4, 4]
-        if suffix != '.tjp' && suffix != '.tji'
-          error('export_bad_extn',
-              'Export report files must have a .tjp or .tji extension.')
-        end
-        # File name without extension.
-        name = @val[1][0..-5]
-      end
-
-      if @project.reports[@val[1]]
-        error('report_redefinition',
-              "A report with the name #{name} has already been defined.")
-      end
-      newReport(@val[1], :export, sourceFileInfo)
+    pattern(%w( _export !optionalID $STRING ), lambda {
+      newReport(@val[1], @val[2], :export, sourceFileInfo)
     })
     arg(1, 'file name', <<'EOT'
 The name of the report file to generate. It must end with a .tjp or .tji
@@ -786,11 +814,14 @@ EOT
       @property.set('definitions', @val[1])
     })
     doc('definitions', <<"EOT"
-This attributes controls what definitions will be contained in the report. By default, '.tjp' reports have all definitions included and '.tji' reports have no definitions included.
+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.
 EOT
        )
     allOrNothingListRule('exportDefinitions',
                          { 'flags' => 'Include flag definitions',
+                           'project' => 'Include project header',
                            'projecids' => 'Include project IDs',
                            'tasks' => 'Include task definitions',
                            'resources' => 'Include resource definitions' })
@@ -966,6 +997,19 @@ EOT
     singlePattern('_resource')
   end
 
+  def rule_fail
+    pattern(%w( _fail !logicalExpression ), lambda {
+      @property['fail', @scenarioIdx] = @val[1]
+    })
+    doc('fail', <<'EOT'
+The fail attribute adds a logical expression to the property. The condition
+described by the logical expression is checked after the scheduling and an
+error is raised if the condition evaluates to true. This attribute is
+primarily intended for testing purpuses.
+EOT
+       )
+  end
+
   def rule_flag
     pattern(%w( $ID ), lambda {
       unless @project['flags'].include?(@val[0])
@@ -990,6 +1034,22 @@ EOT
     listRule('moreFlagList', '!flag')
   end
 
+  def rule_formats
+    pattern(%w( _formats !outputFormats ), lambda {
+      @property.set('formats', @val[1])
+    })
+    doc('formats', <<'EOT'
+This attribute defines for which output formats the report should be
+generated. By default, this list is empty. Unless a formats attribute was
+added to a report definition, no output will be generated for this report.
+
+As reports are composable, a report may include other report definitions. A
+format definition is only needed for the outermost report that includes the
+others.
+EOT
+       )
+  end
+
   def rule_functions
     # This rule is not used by the parser. It's only for the documentation.
     pattern(%w( !functionsBody ))
@@ -1098,6 +1158,21 @@ EOT
        )
   end
 
+  def rule_headline
+    pattern(%w( _headline $STRING ), lambda {
+      @property.set('headline', newRichText(@val[1]))
+    })
+    doc('headline', <<'EOT'
+Specifies the headline for a report.
+EOT
+       )
+    arg(1, 'text', <<'EOT'
+The text used for the headline. It is interpreted as
+[[Rich_Text_Attributes|Rich Text]].
+EOT
+       )
+  end
+
   def rule_hideresource
     pattern(%w( _hideresource !logicalExpression ), lambda {
       @property.set('hideResource', @val[1])
@@ -1245,6 +1320,10 @@ EOT
       mode = @val[1][0]
       endSpec = @val[1][1]
       if mode == 0
+        unless @val[0] < endSpec
+          error('start_before_end', "The end date (#{endSpec}) must be after " +
+                "the start date (#{@val[0]}).")
+        end
         Interval.new(@val[0], endSpec)
       else
         Interval.new(@val[0], @val[0] + endSpec)
@@ -1272,12 +1351,15 @@ EOT
                       60 * 60 * 24 * 30.4167, # months
                       60 * 60 * 24 * 365 # years
                      ]
+      if @val[0] == 0.0
+        error('zero_duration', "The interval duration may not be 0.")
+      end
       duration = @val[0] * convFactors[@val[1]]
       resolution = @project.nil? ? 60 * 60 : @project['scheduleGranularity']
       # Make sure the interval aligns with the timing resolution.
       (duration / resolution).to_i * resolution
     })
-    arg(0, 'duration', 'The duration of the interval')
+    arg(0, 'duration', 'The duration of the interval. May not be 0.')
   end
 
   def rule_intervalEnd
@@ -1357,13 +1439,9 @@ EOT
 
     pattern(%w( !author ))
 
-    pattern(%w( !summary ), lambda {
-      @journalEntry.summary = @val[0]
-    })
+    pattern(%w( !summary ))
 
-    pattern(%w( !details ), lambda {
-      @journalEntry.details = @val[0]
-    })
+    pattern(%w( !details ))
   end
 
   def rule_journalEntryBody
@@ -1377,7 +1455,7 @@ EOT
     })
     arg(2, 'headline', <<'EOT'
 The headline of the journal entry. It will be interpreted as
-[[Rich_Text_Attributes Rich Text]].
+[[Rich_Text_Attributes|Rich Text]].
 EOT
        )
   end
@@ -1404,7 +1482,7 @@ EOT
     pattern(%w( _end !valDate ), lambda {
       @limitInterval.end = @val[1]
     })
-    doc('limit.end', <<'EOT'
+    doc('end.limit', <<'EOT'
 The end date of the limit interval. It must be within the project time frame.
 EOT
     )
@@ -1412,7 +1490,7 @@ EOT
     pattern(%w( _period !valInterval ), lambda {
       @limitInterval = @val[1]
     })
-    doc('limit.period', <<'EOT'
+    doc('period.limit', <<'EOT'
 This property is a shortcut for setting the start and end dates of the limit
 interval. Both dates must be within the project time frame.
 EOT
@@ -1421,19 +1499,20 @@ EOT
     pattern(%w( _resources !resourceLeafList ), lambda {
       @limitResources = @val[1]
     })
-    doc('limit.resources', <<'EOT'
+    doc('resources.limit', <<'EOT'
 When [[limits]] are used in a [[task]] context, the limits can be restricted
 to a list of resources that are allocated to the task. In that case each
-resource will not be allocated more than the specified upper limit.  Lower
-limits have no impact on the scheduler but do generate a warning when not met.
-All specified resources must be leaf resources.
+listed resource will not be allocated more than the specified upper limit.
+Lower limits have no impact on the scheduler but do generate a warning when
+not met.  All specified resources must be leaf resources.
 EOT
        )
+    example('Limits-1', '5')
 
     pattern(%w( _start !valDate ), lambda {
       @limitInterval.start = @val[1]
     })
-    doc('limit.start', <<'EOT'
+    doc('start.limit', <<'EOT'
 The start date of the limit interval. It must be within the project time frame.
 EOT
     )
@@ -1611,9 +1690,17 @@ attributes like [[hidetask]] or [[hideresource]] the logical expression
 evaluates to true for a certain property, this property is hidden or rolled-up
 in the report.
 
-Operands can be declared flags, built-in [[functions]], property attributes
-(specified as scenario.attribute) or another logical expression. The latter
-should be enclosed in brackets to avoid ambiguities. An operand can also be just a number. 0 evaluates to false, all other numbers to true.
+Operands can be previously declared flags, built-in [[functions]], property
+attributes (specified as scenario.attribute) or another logical expression.
+When you combine logical operations to a more complex expression, the
+operators are evaluated from left to right. '''a | b & c''' is identical to
+'''(a | b) & c'''. It's highly recommended that you always use brackets to
+control the evaluation sequence. Currently, TaskJuggler does not support the
+concept of operator precedence or right-left associativity. This may change in
+the future.
+
+An operand can also be just a number. 0 evaluates to false, all other numbers
+to true.
 EOT
        )
     also(%w( functions ))
@@ -1708,10 +1795,6 @@ EOT
     commaListRule('$ID')
   end
 
-  def rule_moreResources
-    commaListRule('!resourceList')
-  end
-
   def rule_morePredTasks
     commaListRule('!taskPredList')
   end
@@ -1763,6 +1846,53 @@ EOT
     })
   end
 
+  def rule_nikuReportAttributes
+    optional
+    repeatable
+
+    pattern(%w( !formats ))
+    pattern(%w( !headline ))
+    pattern(%w( !hideresource ))
+    pattern(%w( !hidetask ))
+    pattern(%w( !reportEnd ))
+    pattern(%w( !reportPeriod ))
+    pattern(%w( !reportStart ))
+    pattern(%w( !reportTitle ))
+  end
+
+  def rule_nikuReportBody
+    pattern(%w( _{ !nikuReportAttributes _} ), lambda {
+
+    })
+  end
+
+  def rule_nikuReportHeader
+    pattern(%w( _nikureport !optionalID $STRING ), lambda {
+      newReport(@val[1], @val[2], :niku, sourceFileInfo)
+    })
+    arg(1, 'file name', <<'EOT'
+The name of the time sheet report file to generate. It must end with a .tji
+extension, or use . to use the standard output channel.
+EOT
+       )
+  end
+
+  def rule_nikuReport
+    pattern(%w( !nikuReportHeader !nikuReportBody ), lambda {
+      @property = nil
+    })
+    doc('nikureport', <<'EOT'
+This report generates an XML file to be imported into the enterprise resource
+management software Clarity(R) from Computer Associates(R). The files contains
+allocation curves for the specified resources. All tasks with identical user
+defined attributes ''''ClarityPID'''' and ''''ClarityPNAME'''' are bundled
+into a Clarity project. The resulting XML file can be imported into Clarity
+with the xog-in tool.
+EOT
+       )
+    example('Niku')
+  end
+
   def rule_number
     singlePattern('$INTEGER')
     singlePattern('$FLOAT')
@@ -1834,7 +1964,7 @@ EOT
       operation
     })
     arg(0, 'operand', <<'EOT'
-An operand can consist of a date, a text string, a [[functions function]], a
+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
@@ -1942,6 +2072,11 @@ EOT
       :html
     })
     descr('Generate a web page (HTML file)')
+
+    pattern(%w( _niku ), lambda {
+      :niku
+    })
+    descr('Generate a XOG XML file to be used with Clarity.')
   end
 
   def rule_outputFormats
@@ -2222,6 +2357,8 @@ where they are defined in.
 
 The included files may only contain content that may be present in a project
 header section.
+
+If the include statement is the last statement in the file it must have the option block. The option block can be empty, but the curly braces must be present.
 EOT
        )
   end
@@ -2266,7 +2403,6 @@ EOT
     })
 
     pattern(%w( !export ))
-    pattern(%w( !timeSheetReport ))
 
     pattern(%w( _flags !declareFlagList ), lambda {
       unless @project['flags'].include?(@val[1])
@@ -2292,6 +2428,8 @@ EOT
 
     pattern(%w( !macro ))
 
+    pattern(%w( !nikuReport ))
+
     pattern(%w( !navigator ))
 
     pattern(%w( _projectid $ID ), lambda {
@@ -2328,6 +2466,7 @@ EOT
     pattern(%w( !resource ))
     pattern(%w( !shift ))
     pattern(%w( !statusSheet ))
+    pattern(%w( !statusSheetReport ))
 
     pattern(%w( _supplement !supplement ))
     doc('supplement', <<'EOT'
@@ -2344,6 +2483,7 @@ EOT
 
     pattern(%w( !task ))
     pattern(%w( !timeSheet ))
+    pattern(%w( !timeSheetReport ))
     pattern(%w( _vacation !vacationName !intervals ), lambda {
       @project['vacations'] = @project['vacations'] + @val[2]
     })
@@ -2364,7 +2504,7 @@ Specifies which scenario should be used for time sheet reports. By default,
 the top-level scenario will be used.
 EOT
        )
-
+    example('TimeSheet1', '2')
   end
 
   def rule_propertiesInclude
@@ -2534,8 +2674,8 @@ EOT
     singlePattern('_daily')
     descr('A group of columns with one column for each day')
 
-    singlePattern('_depends')
-    descr('A comma separated list of tasks that have to precede this task.')
+    singlePattern('_directreports')
+    descr('The resources that have this resource assigned as manager.')
 
     singlePattern('_duration')
     descr('The duration of a task')
@@ -2564,6 +2704,19 @@ EOT
     singlePattern('_flags')
     descr('List of attached flags')
 
+    singlePattern('_followers')
+    descr(<<'EOT'
+A list of tasks that depend on the current task. The list contains the names,
+the IDs, the date and the type of dependency. For the type the following
+symbols are used
+
+* '''<nowiki>]->[</nowiki>''': End-to-Start dependency
+* '''<nowiki>[->[</nowiki>''': Start-to-Start dependency
+* '''<nowiki>]->]</nowiki>''': End-to-End dependency
+* '''<nowiki>[->]</nowiki>''': Start-to-End dependency
+EOT
+         )
+
     singlePattern('_freetime')
     descr(<<'EOT'
 The amount of unallocated work time of a resource during the reporting period.
@@ -2598,6 +2751,12 @@ EOT
     singlePattern('_index')
     descr('The index of the item based on the nesting hierachy')
 
+    singlePattern('_journal')
+    descr(<<'EOT'
+The journal entries for the task or resource for the reported interval.
+EOT
+         )
+
     singlePattern('_line')
     descr('The line number in the report')
 
@@ -2629,8 +2788,18 @@ EOT
     descr('The criticalness of the task with respect to all the paths that ' +
           'it is a part of.')
 
-    singlePattern('_precedes')
-    descr('A comma separated list of tasks that have to follow this task.')
+    singlePattern('_precursor')
+    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
+are used
+
+* '''<nowiki>]->[</nowiki>''': End-to-Start dependency
+* '''<nowiki>[->[</nowiki>''': Start-to-Start dependency
+* '''<nowiki>]->]</nowiki>''': End-to-End dependency
+* '''<nowiki>[->]</nowiki>''': Start-to-End dependency
+EOT
+         )
 
     singlePattern('_priority')
     descr('The priority of a task')
@@ -2641,6 +2810,12 @@ EOT
     singlePattern('_rate')
     descr('The daily cost of a resource.')
 
+    singlePattern('_reports')
+    descr(<<'EOT'
+All resources that have this resource assigned as a direct or indirect manager.
+EOT
+         )
+
     singlePattern('_resources')
     descr('A list of resources that are assigned to the task in the report ' +
           'time frame.')
@@ -2699,7 +2874,7 @@ EOT
     })
     doc('caption', <<'EOT'
 The caption will be embedded in the footer of the table or data segment. The
-text will be interpreted as [[Rich_Text_Attributes Rich Text]].
+text will be interpreted as [[Rich_Text_Attributes|Rich Text]].
 EOT
        )
     arg(1, 'text', 'The caption text.')
@@ -2710,7 +2885,7 @@ EOT
     })
     doc('center', <<'EOT'
 This attribute defines the center section of the [[textreport]]. The text will
-be interpreted as [[Rich_Text_Attributes Rich Text]].
+be interpreted as [[Rich_Text_Attributes|Rich Text]].
 EOT
        )
     arg(1, 'text', 'The text')
@@ -2735,7 +2910,7 @@ EOT
     })
     doc('epilog', <<'EOT'
 Define a text section that is printed right after the actual report data. The
-text will be interpreted as [[Rich_Text_Attributes Rich Text]].
+text will be interpreted as [[Rich_Text_Attributes|Rich Text]].
 EOT
        )
     also(%w( footer header prolog ))
@@ -2752,41 +2927,24 @@ EOT
     })
     doc('footer', <<'EOT'
 Define a text section that is put at the bottom of the report. The
-text will be interpreted as [[Rich_Text_Attributes Rich Text]].
+text will be interpreted as [[Rich_Text_Attributes|Rich Text]].
 EOT
        )
     also(%w( epilog header prolog ))
 
-    pattern(%w( _formats !outputFormats ), lambda {
-      @property.set('formats', @val[1])
-    })
-    doc('formats', <<'EOT'
-EOT
-       )
+    pattern(%w( !formats ))
 
     pattern(%w( _header $STRING ), lambda {
       @property.set('header', newRichText(@val[1]))
     })
     doc('header', <<'EOT'
 Define a text section that is put at the top of the report. The
-text will be interpreted as [[Rich_Text_Attributes Rich Text]].
+text will be interpreted as [[Rich_Text_Attributes|Rich Text]].
 EOT
        )
     also(%w( epilog footer prolog ))
 
-    pattern(%w( _headline $STRING ), lambda {
-      @property.set('headline', newRichText(@val[1]))
-    })
-    doc('headline', <<'EOT'
-Specifies the headline for a report.
-EOT
-       )
-    arg(1, 'text', <<'EOT'
-The text used for the headline. It is interpreted as
-[[Rich_Text_Attributes Rich Text]].
-EOT
-       )
-
+    pattern(%w( !headline ))
     pattern(%w( !hideresource ))
 
     pattern(%w( !hidetask ))
@@ -2796,7 +2954,7 @@ EOT
     })
     doc('left', <<'EOT'
 This attribute defines the left margin section of the [[textreport]]. The text
-will be interpreted as [[Rich_Text_Attributes Rich Text]]. The margin will not
+will be interpreted as [[Rich_Text_Attributes|Rich Text]]. The margin will not
 span the [[header]] or [[footer]] sections.
 EOT
        )
@@ -2816,29 +2974,11 @@ EOT
     })
     doc('prolog', <<'EOT'
 Define a text section that is printed right before the actual report data. The
-text will be interpreted as [[Rich_Text_Attributes Rich Text]].
+text will be interpreted as [[Rich_Text_Attributes|Rich Text]].
 EOT
        )
     also(%w( epilog footer header ))
 
-    pattern(%w( _rawhead $STRING ), lambda {
-      @property.set('rawHead', @val[1])
-    })
-    doc('rawhead', <<'EOT'
-Specifies a section of raw HTML code that will be inserted at the top of the
-report.
-EOT
-        )
-
-    pattern(%w( _rawtail $STRING ), lambda {
-      @property.set('rawTail', @val[1])
-    })
-    doc('rawtail', <<'EOT'
-Specifies a section of raw HTML code that will be inserted at the bottom of
-the report.
-EOT
-       )
-
     pattern(%w( !report ))
 
     pattern(%w( _right $STRING ), lambda {
@@ -2846,7 +2986,7 @@ EOT
     })
     doc('right', <<'EOT'
 This attribute defines the right margin section of the [[textreport]]. The text
-will be interpreted as [[Rich_Text_Attributes Rich Text]]. The margin will not
+will be interpreted as [[Rich_Text_Attributes|Rich Text]]. The margin will not
 span the [[header]] or [[footer]] sections.
 EOT
        )
@@ -2879,27 +3019,8 @@ used.
 EOT
        )
 
-    pattern(%w( _sortresources !sortCriteria ), lambda {
-      @property.set('sortResources', @val[1])
-    })
-    doc('sortresources', <<'EOT'
-Determines how the resources are sorted in the report. Multiple criteria can be
-specified as a comma separated list. If one criteria is not sufficient to sort
-a group of resources, the next criteria will be used to sort the resources in
-this group.
-EOT
-       )
-
-    pattern(%w( _sorttasks !sortCriteria ), lambda {
-      @property.set('sortTasks', @val[1])
-    })
-    doc('sorttasks', <<'EOT'
-Determines how the tasks are sorted in the report. Multiple criteria can be
-specified as comma separated list. If one criteria is not sufficient to sort a
-group of tasks, the next criteria will be used to sort the tasks within
-this group.
-EOT
-       )
+    pattern(%w( !sortResources ))
+    pattern(%w( !sortTasks ))
 
     pattern(%w( !reportStart ))
 
@@ -2918,14 +3039,7 @@ EOT
       @property.set('timeFormat', @val[0])
     })
 
-    pattern(%w( _title $STRING ), lambda {
-      @property.set('title', @val[1])
-    })
-    doc('title', <<'EOT'
-The title of the report will be used in external references to the report. It
-will not show up in the reports directly. It's used e. g. by [[navigator]].
-EOT
-       )
+    pattern(%w( !reportTitle ))
   end
 
   def rule_reportEnd
@@ -3082,6 +3196,19 @@ EOT
        )
   end
 
+  def rule_reportTitle
+    pattern(%w( _title $STRING ), lambda {
+      @property.set('title', @val[1])
+    })
+    doc('title', <<'EOT'
+The title of the report will be used in external references to the report. It
+will not show up in the reports directly. It's used e. g. by [[navigator]].
+EOT
+       )
+  end
+
+
+
   def rule_reportType
     singlePattern('_resourcereport')
     doc('resourcereport', <<'EOT'
@@ -3131,6 +3258,12 @@ EOT
   def rule_resourceAttributes
     repeatable
     optional
+    pattern(%w( _email $STRING ), lambda {
+      @property.set('email', @val[1])
+    })
+    doc('email',
+        'The email address of the resource.')
+
     pattern(%w( !journalEntry ))
     pattern(%w( !purge ))
     pattern(%w( !resource ))
@@ -3178,10 +3311,7 @@ EOT
 
   def rule_resourceId
     pattern(%w( $ID ), lambda {
-      id = @val[0]
-      id = @resourceprefix + '.' + id unless @resourceprefix.empty?
-      # In case we have a nested supplement, we need to prepend the parent ID.
-      id = @property.fullId + '.' + id if @property && @property.is_a?(Resource)
+      id = (@resourceprefix.empty? ? '' : @resourceprefix + '.') + @val[0]
       if (resource = @project.resource(id)).nil?
         error('resource_id_expected', "#{id} is not a defined resource.")
       end
@@ -3218,9 +3348,7 @@ EOT
   end
 
   def rule_resourceList
-    pattern(%w( !resourceId !moreResources ), lambda {
-      [ @val[0] ] + @val[1]
-    })
+    listRule('moreResources', '!resourceId')
   end
 
   def rule_resourceScenarioAttributes
@@ -3266,6 +3394,8 @@ EOT
     also(%w( scheduling ))
     example('Booking')
 
+    pattern(%w( !fail ))
+
     pattern(%w( !limits ), lambda {
       @property['limits', @scenarioIdx] = @val[0]
     })
@@ -3274,6 +3404,26 @@ Set per-interval usage limits for the resource.
 EOT
        )
 
+    pattern(%w( _managers !resourceList ), lambda {
+      @property['managers', @scenarioIdx] =
+        @property['managers', @scenarioIdx] + @val[1]
+    })
+    doc('managers', <<'EOT'
+Defines one or more resources to be the manager who is responsible for this
+resource. Managers must be leaf resources. This attribute does not impact the
+scheduling. It can only be used for documentation purposes.
+
+You must only specify direct managers here. Do not list higher level managers
+here. If necessary, use the [[purge]] attribute to clear
+inherited managers. For most use cases, there should be only one manager. But
+TaskJuggler is not limited to just one manager. Dotted reporting lines can be
+captured as well as long as the managers are not reporting to each other.
+EOT
+       )
+    also(%w( statussheet ))
+    example('Manager')
+
+
     pattern(%w( _rate !number ), lambda {
       @property['rate', @scenarioIdx] = @val[1]
     })
@@ -3284,8 +3434,8 @@ EOT
 
     pattern(%w( _shift !shiftAssignments ))
     doc('shift.resource', <<'EOT'
-This keyword has been deprecated. Please use [shifts.resource shifts
-(resource)] instead.
+This keyword has been deprecated. Please use [[shifts.resource|shifts
+(resource)]] instead.
 EOT
        )
 
@@ -3310,6 +3460,8 @@ to the 'Shift' property.
 EOT
        )
 
+    pattern(%w( !warn ))
+
     pattern(%w( !workinghoursResource ))
     # Other attributes will be added automatically.
   end
@@ -3417,6 +3569,7 @@ EOT
       if (@scenarioIdx = @project.scenarioIdx(@val[0])).nil?
         error('unknown_scenario_id', "Unknown scenario: #{@val[0]}")
       end
+      @scenarioIdx
     })
     arg(0, 'scenario', 'ID of a defined scenario')
   end
@@ -3546,6 +3699,11 @@ EOT
 Sets the time zone of the shift. The working hours of the shift are assumed to
 be within the specified time zone. The time zone does not effect the vaction
 interval. The latter is assumed to be within the project time zone.
+
+TaskJuggler stores all dates internally as UTC. Since all events must align
+with the [[timingresolution|timing resolution]] for time zones you may have to
+change the timing resolution appropriately. The time zone difference compared
+to UTC must be a multiple of the used timing resolution.
 EOT
         )
     arg(1, 'zone', <<'EOT'
@@ -3623,6 +3781,32 @@ EOT
          )
   end
 
+  def rule_sortResources
+    pattern(%w( _sortresources !sortCriteria ), lambda {
+      @property.set('sortResources', @val[1])
+    })
+    doc('sortresources', <<'EOT'
+Determines how the resources are sorted in the report. Multiple criteria can be
+specified as a comma separated list. If one criteria is not sufficient to sort
+a group of resources, the next criteria will be used to sort the resources in
+this group.
+EOT
+       )
+  end
+
+  def rule_sortTasks
+    pattern(%w( _sorttasks !sortCriteria ), lambda {
+      @property.set('sortTasks', @val[1])
+    })
+    doc('sorttasks', <<'EOT'
+Determines how the tasks are sorted in the report. Multiple criteria can be
+specified as comma separated list. If one criteria is not sufficient to sort a
+group of tasks, the next criteria will be used to sort the tasks within
+this group.
+EOT
+       )
+  end
+
   def rule_sortTree
     pattern(%w( $ID ), lambda {
       if @val[0] != 'tree'
@@ -3635,6 +3819,51 @@ EOT
     arg(0, 'tree',
         'Use \'tree\' as first criteria to keep the breakdown structure.')
   end
+  def rule_ssReportHeader
+    pattern(%w( _statussheetreport !optionalID $STRING ), lambda {
+      if (fileName = @val[2]) != '.'
+        if @project.reports[fileName]
+          error('report_redefinition',
+                "A report with the name '#{fileName}' has already been " +
+                "defined.")
+        end
+      else
+        fileName = "statusSheet#{@project.reports.length + 1}"
+      end
+      report = newReport(@val[1], fileName, :statusSheet, sourceFileInfo)
+      report.set('scenarios', [ 0 ])
+      # Show all tasks, sorted by id-up.
+      report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+      report.set('sortTasks', [ [ 'id', true, -1 ] ])
+      # Show all resources, sorted by seqno-up.
+      report.set('hideResource', LogicalExpression.new(LogicalOperation.new(0)))
+      report.set('sortResources', [ [ 'seqno', true, -1 ] ])
+      report.set('loadUnit', :hours)
+      report.set('definitions', [])
+    })
+    arg(1, 'file name', <<'EOT'
+The name of the status sheet report file to generate. It must end with a .tji
+extension, or use . to use the standard output channel.
+EOT
+       )
+  end
+
+  def rule_ssReportAttributes
+    optional
+    repeatable
+
+    pattern(%w( !hideresource ))
+    pattern(%w( !hidetask ))
+    pattern(%w( !reportEnd ))
+    pattern(%w( !reportPeriod ))
+    pattern(%w( !reportStart ))
+    pattern(%w( !sortResources ))
+    pattern(%w( !sortTasks ))
+  end
+
+  def rule_ssReportBody
+    optionsRule('ssReportAttributes')
+  end
 
   def rule_ssStatusAttributes
     optional
@@ -3671,7 +3900,9 @@ EOT
   end
 
   def rule_statusSheet
-    pattern(%w( !statusSheetHeader !statusSheetBody ))
+    pattern(%w( !statusSheetHeader !statusSheetBody ), lambda {
+      [ @sheetAuthor, @sheetStart, @sheetEnd ]
+    })
     doc('statussheet', <<'EOT'
 A status sheet can be used to capture the status of various tasks outside of
 the regular task tree definition. It is intended for use by managers that
@@ -3694,9 +3925,10 @@ EOT
   end
 
   def rule_statusSheetHeader
-    pattern(%w( _statussheet !resourceId !date ), lambda {
+    pattern(%w( _statussheet !resourceId !valIntervalOrDate ), lambda {
       @sheetAuthor = @val[1]
-      @sheetEnd = @val[2]
+      @sheetStart = @val[2].start
+      @sheetEnd = @val[2].end
     })
     arg(1, 'reporter', <<'EOT'
 The ID of a defined resource. This identifies the status reporter. Unless the
@@ -3706,6 +3938,20 @@ EOT
        )
   end
 
+  def rule_statusSheetReport
+    pattern(%w( !ssReportHeader !ssReportBody ), lambda {
+      @property = nil
+    })
+    doc('statussheetreport', <<'EOT'
+A status sheet report is a template for a status sheet. It collects all the
+status information of the top-level task that a resource is responsible for.
+This report is typically used by managers or team leads to review the time
+sheet status information and destill it down to a summary that can be
+forwarded to the next person in the reporting chain.
+EOT
+       )
+  end
+
   def rule_statusSheetTask
     pattern(%w( !statusSheetTaskHeader !statusSheetTaskBody), lambda {
       @property = @propertyStack.pop
@@ -3741,17 +3987,30 @@ EOT
   end
   def rule_summary
     pattern(%w( _summary $STRING ), lambda {
+      return if @val[1].empty?
+
+      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.")
+      end
+      if @val[1] == "A summary text\n"
+          error('ts_default_summary',
+                "'A summary text' is not a valid summary")
+      end
       rtTokenSetIntro =
         %w( LINEBREAK SPACE WORD BOLD ITALIC CODE BOLDITALIC HREF HREFEND )
       @journalEntry.summary = newRichText(@val[1], rtTokenSetIntro)
     })
     doc('summary', <<'EOT'
 This is the introductory part of the journal or status entry. It should
-summarize the full entry but should contain more details than the headline.
+only summarize the full entry but should contain more details than the
+headline. The text including formatting characters must be 240 characters long
+or less.
 EOT
        )
     arg(1, 'text', <<'EOT'
-The text will be interpreted as [[Rich_Text_Attributes Rich Text]]. Only a
+The text will be interpreted as [[Rich_Text_Attributes|Rich Text]]. Only a
 small subset of the markup is supported for this attribute. You can use word
 formatting, hyperlinks and paragraphs.
 EOT
@@ -4214,6 +4473,8 @@ properties from the reports.
 EOT
        )
 
+    pattern(%w( !fail ))
+
     pattern(%w( _length !workingDuration ), lambda {
       checkContainer('length')
       @property['length', @scenarioIdx] = @val[1]
@@ -4347,6 +4608,10 @@ resources. It does not mean that the task happens earlier, though that is
 usually the effect you will see. It also does not have any effect on tasks
 that don't have any resources assigned (e.g. milestones).
 
+For milestones it will raise or lower the chances that task leading up the
+milestone will get their resources over task with equal priority that compete
+for the same resources.
+
 This attribute is inherited by subtasks if specified prior to the definition
 of the subtask.
 EOT
@@ -4367,7 +4632,8 @@ EOT
        )
 
     pattern(%w( _responsible !resourceList ), lambda {
-      @property['responsible', @scenarioIdx] = @val[1]
+      @property['responsible', @scenarioIdx] =
+        @property['responsible', @scenarioIdx] + @val[1]
     })
     doc('responsible', <<'EOT'
 The ID of the resource that is responsible for this task. This value is for
@@ -4460,6 +4726,9 @@ will be inherited from the enclosing tasks or the project start date.
 EOT
        )
     also(%w( end period.task maxstart minstart scheduling ))
+
+    pattern(%w( !warn ))
+
     # Other attributes will be added automatically.
   end
 
@@ -4617,11 +4886,9 @@ EOT
 
   def rule_timeSheet
     pattern(%w( !timeSheetHeader !timeSheetBody ), lambda {
-
+      @timeSheet
     })
     doc('timesheet', <<'EOT'
-This feature is not yet functional!
-
 A time sheet record can be used to capture the current status of the tasks
 assigned to a specific resource and the achieved progress for a given period
 of time. The status is assumed to be for the end of this time period. There
@@ -4636,24 +4903,28 @@ The work is booked for the scenario specified by [[trackingscenario]].
 The intended use for time sheets is to have all resources report a time sheet
 every day, week or month. All time sheets can be added to the project plan.
 The status information is always used to determin the current status of the
-project. The [[work]], [[remaining]] and [[end.timesheet end]] attributes are
-ignored if there are also [[booking bookings]] for the resource in the time
+project. The [[work]], [[remaining]] and [[end.timesheet|end]] attributes are
+ignored if there are also [[booking|bookings]] for the resource in the time
 sheet period. The non-ignored attributes of the time sheets
 will be converted into [[booking]] statements internally. These bookings can
-then be [[export exported]] into a file which can then be added to the project
+then be [[export|exported]] into a file which can then be added to the project
 again. This way, you can use time sheets to incrementally record progress of
 your project. There is a possibility that time sheets conflict with other data
 in the plan. In case TaskJuggler cannot automatically resolve them, these
 conflicts have to be manually resolved by either changing the plan or the time
 sheet.
 
-The status messages are interpreted as [[journalentry journal entries]]. The
+The status messages are interpreted as [[journalentry|journal entries]]. The
 alert level will be evaluated and the current state of the project can be put
-into a dashboard using the ''''alert'''' and ''''alertmessage'''' [[columnid
+into a dashboard using the ''''alert'''' and ''''alertmessage'''' [[columnid|
 columns]].
+
+Currently, the provided effort values and dates are not yet used to
+automatically update the plan data. This feature will be added in future
+versions.
 EOT
        )
-    example('TimeSheet')
+    example('TimeSheet1', '1')
   end
 
   def rule_timeSheetAttributes
@@ -4668,6 +4939,7 @@ If the task exists already, an error is generated. The new task can be used
 immediately to report progress and status against it.
 EOT
        )
+    example('TimeSheet1', '3')
 
     pattern(%w( _shift !shiftId ), lambda {
 
@@ -4675,19 +4947,25 @@ EOT
     doc('shift.timesheet', <<'EOT'
 Specifies an alternative [[shift]] for the time sheet period. This shift will
 override any existing working hour definitions for the resource. It will not
-override already declared [[vacation vacations]] though.
+override already declared [[vacation|vacations]] though.
 
 The primary use of this feature is to let the resources report different total
 work time for the report period.
 EOT
        )
 
-    pattern(%w( !tsTaskHeader !tsTaskBody ))
+    pattern(%w( !tsStatus ))
+
+    pattern(%w( !tsTaskHeader !tsTaskBody ), lambda {
+      @property = nil
+      @timeSheetRecord = nil
+    })
     doc('task.timesheet', <<'EOT'
 Specifies an existing task that progress and status should be reported
 against.
 EOT
        )
+    example('TimeSheet1', '4')
   end
 
   def rule_timeSheetBody
@@ -4697,16 +4975,25 @@ EOT
   end
 
   def rule_timeSheetHeader
-    pattern(%w( _timesheet !resourceId !valIntervalOrDate ),
-            lambda {
-      @sheetAuthor = @val[1]
-      @sheetStart = @val[2].start
-      @sheetEnd = @val[2].end
+    pattern(%w( _timesheet !resourceId !valIntervalOrDate ), lambda {
+      sheetAuthor = @val[1]
+      @property = nil
+      unless sheetAuthor.leaf?
+        error('ts_group_author',
+              'A resource group cannot file a time sheet')
+      end
+      # Currently time sheets are hardcoded for scenario 0.
+      @timeSheet = TimeSheet.new(sheetAuthor, @val[2],
+                                 @project['trackingScenarioIdx'])
+      @timeSheet.sourceFileInfo = @scanner.sourceFileInfo
+      @project.timeSheets << @timeSheet
     })
   end
 
   def rule_timeSheetReport
-    pattern(%w( !tsReportHeader !tsReportBody ))
+    pattern(%w( !tsReportHeader !tsReportBody ), lambda {
+      @property = nil
+    })
     doc('timesheetreport', <<'EOT'
 For projects that flow mostly according to plan, TaskJuggler already knows
 much of the information that should be contained in the time sheets. With this
@@ -4749,28 +5036,25 @@ EOT
   end
 
   def rule_tsNewTaskHeader
-    pattern(%w( _newtask !taskIdUnverifd ), lambda {
-
+    pattern(%w( _newtask !taskIdUnverifd $STRING ), lambda {
+      @timeSheetRecord = TimeSheetRecord.new(@timeSheet, @val[1])
+      @timeSheetRecord.name = @val[2]
+      @timeSheetRecord.sourceFileInfo = @scanner.sourceFileInfo
     })
     arg(1, 'task', 'ID of the new task')
   end
   def rule_tsReportHeader
-    pattern(%w( _timesheetreport $STRING ), lambda {
-      if (fileName = @val[1]) != '.'
-        suffix = fileName[-4, 4]
-        if suffix != '.tji'
-          error('tsreport_bad_extn',
-              'time sheet report files must have a .tji extension.')
-        end
-
-        if @project.reports[fileName]
-          error('report_redefinition',
-                "A report with the name '#{fileName}' has already been defined.")
-        end
-      else
-        fileName = "timeSheet#{@project.reports.length + 1}"
-      end
-      newReport(fileName, :timeSheet, sourceFileInfo)
+    pattern(%w( _timesheetreport !optionalID $STRING ), lambda {
+      report = newReport(@val[1], @val[2], :timeSheet, sourceFileInfo)
+      report.set('scenarios', [ 0 ])
+      # Show all tasks, sorted by seqno-up.
+      report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+      report.set('sortTasks', [ [ 'seqno', true, -1 ] ])
+      # Show all resources, sorted by seqno-up.
+      report.set('hideResource', LogicalExpression.new(LogicalOperation.new(0)))
+      report.set('sortResources', [ [ 'seqno', true, -1 ] ])
+      report.set('loadUnit', :hours)
+      report.set('definitions', [])
     })
     arg(1, 'file name', <<'EOT'
 The name of the time sheet report file to generate. It must end with a .tji
@@ -4808,12 +5092,24 @@ EOT
 
   def rule_tsStatusHeader
     pattern(%w( _status !alertLevel $STRING ), lambda {
-      @journalEntry = JournalEntry.new(@project['journal'], @sheetEnd,
-                                       @val[2], @property,
+      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.")
+      end
+      if @val[2] == 'Your headline here!'
+        error('ts_no_headline',
+              "'Your headline here!' is not a valid headline")
+      end
+      @journalEntry = JournalEntry.new(@project['journal'],
+                                       @timeSheet.interval.end,
+                                       @val[2],
+                                       @property || @timeSheet.resource,
                                        @scanner.sourceFileInfo)
       @journalEntry.alertLevel = @val[1]
-      @journalEntry.author = @sheetAuthor
-
+      @journalEntry.timeSheetRecord = @timeSheetRecord
+      @journalEntry.author = @timeSheet.resource
+      @timeSheetRecord.status = @journalEntry if @timeSheetRecord
     })
   end
 
@@ -4824,6 +5120,11 @@ The status attribute can be used to describe the current status of the task or
 resource. The content of the status messages is added to the project journal.
 EOT
        )
+    arg(2, 'headline', <<'EOT'
+A short headline for the status. Must be 60 characters or shorter.
+EOT
+       )
+    example('TimeSheet1', '4')
   end
 
   def rule_tsTaskAttributes
@@ -4831,20 +5132,31 @@ EOT
     repeatable
 
     pattern(%w( _end !valDate ), lambda {
-
+      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.")
+      end
+      @timeSheetRecord.expectedEnd = @val[1]
     })
     doc('end.timesheet', <<'EOT'
 The expected end date for the task. This can only be used for duration based
 task. For effort based task [[remaining]] has to be used.
 EOT
        )
+    example('TimeSheet1', '5')
 
     pattern(%w( _priority $INTEGER ), lambda {
-
+      priority = @val[1]
+      if priority < 1 || priority > 1000
+        error('ts_bad_priority',
+              "Priority value #{priority} must be between 1 and 1000.")
+      end
+      @timeSheetRecord.priority = priority
     })
     doc('priority.timesheet', <<'EOT'
 The priority is a value between 1 and 1000. It is used to determine the
-sequence of task when converting [[work]] to [[booking bookings]]. Tasks that
+sequence of task when converting [[work]] to [[booking|bookings]]. Tasks that
 need to finish earlier in the period should have a high priority, tasks that
 end later in the period should have a low priority. For tasks that don't get
 finished in the reported period the priority should be set to 1.
@@ -4852,29 +5164,30 @@ EOT
        )
 
     pattern(%w( _remaining !workingDuration ), lambda {
-
+      @timeSheetRecord.remaining = @val[1]
     })
     doc('remaining', <<'EOT'
 The remaining effort for the task. This value is ignored if there are
-[[booking bookings]] for the resource that overlap with the time sheet period.
+[[booking|bookings]] for the resource that overlap with the time sheet period.
 If there are no bookings, the value is compared with the [[effort]]
 specification of the task. If there a mismatch between the accumulated effort
 specified with bookings, [[work]] and [[remaining]] on one side and the
 specified [[effort]] on the other, a warning is generated.
 
 This attribute can only be used with tasks that are effort based. Duration
-based tasks need to have an [[end.timesheet end]] attribute.
+based tasks need to have an [[end.timesheet|end]] attribute.
 EOT
        )
+    example('TimeSheet1', '6')
 
     pattern(%w( !tsStatus ))
 
-    pattern(%w( _work !workingDuration ), lambda {
-
+    pattern(%w( _work !workingDurationPercent ), lambda {
+      @timeSheetRecord.work = @val[1]
     })
     doc('work', <<'EOT'
 The amount of time that the resource has spend with the task during the
-reported period. This value is ignored when there are [[booking bookings]] for
+reported period. This value is ignored when there are [[booking|bookings]] for
 the resource overlapping with the time sheet period. If there are no bookings,
 TaskJuggler will try to convert the work specification into bookings
 internally before the actual scheduling is started.
@@ -4888,28 +5201,26 @@ regular 40 hour work week, exactly 40 hours total or 5 working days have to be
 reported.
 EOT
        )
+    example('TimeSheet1', '4')
   end
 
   def rule_tsTaskBody
-    pattern(%w( _{ !tsTaskAttributes _} ), lambda {
-      @property = nil
-    })
+    pattern(%w( _{ !tsTaskAttributes _} ))
   end
 
   def rule_tsTaskHeader
     pattern(%w( _task !taskId ), lambda {
       @property = @val[1]
-      # TODO: This is not too useful here. Needs to be done in postScheduling.
-      #scenarioIdx = @project['trackingScenarioIdx']
-      #taskStart = @property['start', scenarioIdx] || @project['start']
-      #taskEnd = @property['end', scenarioIdx] || @project['end']
-
-      #if !Interval.new(@sheetStart, @sheetEnd).
-      #    overlaps?(Interval.new(taskStart, taskEnd))
-      #  warning('ts_task_not_active',
-      #          "Task #{@property.fullId} is not active during the time sheet " +
-      #          "reporting period")
-      #end
+      unless @property.leaf?
+        error('ts_task_not_leaf',
+              'You cannot specify a task that has sub tasks here.')
+      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
     })
     arg(1, 'task', 'ID of an already existing task')
   end
@@ -4945,6 +5256,10 @@ EOT
         mode = @val[1][0]
         endSpec = @val[1][1]
         if mode == 0
+          unless @val[0] < endSpec
+            error('start_before_end', "The end date (#{endSpec}) must be " +
+                  "after the start date (#{@val[0]}).")
+          end
           iv = Interval.new(@val[0], endSpec)
         else
           iv = Interval.new(@val[0], @val[0] + endSpec)
@@ -5007,6 +5322,20 @@ EOT
     listRule('moreValIntervals', '!valIntervalOrDate')
   end
 
+  def rule_warn
+    pattern(%w( _warn !logicalExpression ), lambda {
+      @property['warn', @scenarioIdx] = @val[1]
+    })
+    doc('warn', <<'EOT'
+The warn attribute adds a logical expression to the property. The condition
+described by the logical expression is checked after the scheduling and an
+warning is generated if the condition evaluates to true. This attribute is
+primarily intended for testing purpuses.
+EOT
+       )
+  end
+
+
   def rule_weekday
     pattern(%w( _sun ), lambda { 0 })
     pattern(%w( _mon ), lambda { 1 })
@@ -5057,16 +5386,49 @@ EOT
                       60 * 60 * @project['dailyworkinghours'] *
                       @project['yearlyworkingdays'] # years
                     ]
+      # The result will always be in number of time slots.
       (@val[0] * convFactors[@val[1]] /
        @project['scheduleGranularity']).round.to_i
     })
     arg(0, 'value', 'A floating point or integer number')
   end
 
+  def rule_workingDurationPercent
+    pattern(%w( !number !durationUnitOrPercent ), lambda {
+      if @val[1] >= 0
+        # Absolute value in minutes, hours or days.
+        convFactors = [ 60, # minutes
+          60 * 60, # hours
+          60 * 60 * @project['dailyworkinghours'] # days
+        ]
+        # The result will always be in number of time slots.
+        (@val[0] * convFactors[@val[1]] /
+         @project['scheduleGranularity']).round.to_i
+      else
+        # Percentage values are always returned as Float in the rage of 0.0 to
+        # 1.0.
+        if @val[0] < 0.0 || @val[0] > 100.0
+          error('illegal_percentage',
+                "Percentage values must be between 0 and 100%.")
+        end
+        @val[0] / 100.0
+      end
+    })
+    arg(0, 'value', 'A floating point or integer number')
+  end
+
   def rule_workinghours
     pattern(%w( _workinghours !listOfDays !listOfTimes), lambda {
-      wh = @property.nil? ? @project['workinghours'] :
-           @property['workinghours', @scenarioIdx]
+      if @property.nil?
+        # We are changing global working hours.
+        wh = @project['workinghours']
+      else
+        unless (wh = @property['workinghours', @scenarioIdx])
+          # The property does not have it's own WorkingHours yet.
+          wh = WorkingHours.new(@project['workinghours'])
+          @property['workinghours', @scenarioIdx] = wh
+        end
+      end
       wh.timezone = @property.nil? ? @project['timezone'] :
                     @property['timezone', @scenarioIdx]
       7.times { |i| wh.setWorkingHours(i, @val[2]) if @val[1][i] }