taskjuggler 0.0.3 → 0.0.4

data/lib/TjpExample.rb

@@ -3,7 +3,7 @@
 #
 # = TjpExample.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/TjpSyntaxRules.rb

@@ -3,7 +3,7 @@
 #
 # = TjpSyntaxRules.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -40,7 +40,7 @@ EOT
     optional
     pattern(%w( !account))
     pattern(%w( !accountScenarioAttributes ))
-    pattern(%w( !scenarioId !accountScenarioAttributes ), lambda {
+    pattern(%w( !scenarioIdCol !accountScenarioAttributes ), lambda {
       @scenarioIdx = 0
     })
     # Other attributes will be added automatically.
@@ -91,9 +91,39 @@ EOT
     example('Account', '1')
     arg(2, 'description', 'Short description of the transaction')
     arg(3, 'amount', 'Amount to be booked.')
+
+    pattern(%w( !flags ))
+    doc('flags.account', <<'EOT'
+Attach a set of flags. The flags can be used in logical expressions to filter
+properties from the reports.
+EOT
+       )
+
     # Other attributes will be added automatically.
   end
 
+  def rule_alertLevel
+    pattern(%w( $ID ), lambda {
+      level = @project.alertLevelIndex(@val[0])
+      unless level
+        error('bad_alert', "Unknown alert level #{@val[1]}. Must be " +
+              'green, yellow or red')
+      end
+      level
+    })
+    doc('alert level', <<'EOT'
+Specify the alert level for this entry. Supported values are green, yellow and
+red. The default value is green. This attribute is inteded to be used for
+status reporting. When used for a journal entry that is associated with a
+property, the value can be reported in the alert column. When multiple entries
+have been specified for the property, the entry with the date closest to the
+report end date will be used. Container properties will inherit the highest
+alert level of all its sub properties unless it has an own journal entry dated
+closer to the report end than all of its sub properties.
+EOT
+       )
+  end
+
   def rule_allocate
     pattern(%w( _allocate !allocations ), lambda {
       checkContainer('allocate')
@@ -146,7 +176,7 @@ EOT
          end
       end
     })
-    doc('allocate.limits', 'This keyword is deprecated. Don\'t use it anymore!')
+    doc('limits.allocate', 'This keyword is deprecated. Don\'t use it anymore!')
 
     pattern(%w( _select !allocationSelectionMode ), lambda {
       @allocate.setSelectionMode(@val[1])
@@ -247,12 +277,11 @@ EOT
   end
 
   def rule_argument
-    pattern(%w( $ID ), lambda {
-      @val[0]
-    })
-    pattern(%w( $DATE ), lambda {
-      @val[0]
-    })
+    singlePattern('$ABSOLUTE_ID')
+    singlePattern('!date')
+    singlePattern('$ID')
+    singlePattern('$INTEGER')
+    singlePattern('$FLOAT')
   end
 
   def rule_argumentList
@@ -269,6 +298,17 @@ EOT
     })
   end
 
+  def rule_author
+    pattern(%w( _author !resourceId ), lambda {
+      @journalEntry.author = @val[1]
+    })
+    doc('author', <<'EOT'
+This attribute can be used to capture the authorship or source of the
+information.
+EOT
+       )
+  end
+
   def rule_balance
     pattern(%w( _balance !accountId !accountId ), lambda {
       if @val[1].parent
@@ -434,6 +474,22 @@ EOT
     descr('Set chart resolution to 1 year.')
   end
 
+  def rule_color
+    pattern(%w( $STRING ), lambda {
+      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")
+      end
+      col
+    })
+    arg(0, 'color', <<'EOT'
+The RGB color values of the color. The following formats are supported: #RGB
+and #RRGGBB. Where R, G, B are hexadecimal values. See
+[http://en.wikipedia.org/wiki/Web_colors Wikipedia] for more details.
+EOT
+       )
+  end
 
   def rule_columnBody
     optionsRule('columnOptions')
@@ -462,51 +518,84 @@ EOT
     optional
     repeatable
 
-    pattern(%w( _celltext $STRING ), lambda {
-      @column.cellText = @val[1]
+    pattern(%w( _celltext !logicalExpression $STRING ), lambda {
+      @column.cellText.addPattern(
+        CellSettingPattern.new(newRichText(@val[2]), @val[1]))
     })
     doc('celltext.column', <<'EOT'
 Specifies an alternative content that is used for the cells of the column.
-Usually such a text contains a runtime macro, otherwise all cells of the
-column will have the same fixed value.
+Usually such a text contains a query function. Otherwise all cells of the
+column will have the same fixed value. The logical expression specifies for
+which cells the text should be used. If multiple celltext patterns are
+provided for a column, the first matching one is taken for each cell.
 EOT
         )
-    arg(1, 'text', 'Alterntive cell text')
+    arg(1, 'text',
+        'Alterntive cell text specified as [[Rich_Text_Attributes Rich Text]]')
 
-    pattern(%w( _cellurl $STRING ), lambda {
-      @column.cellURL = @val[1]
+    pattern(%w( _cellcolor !logicalExpression !color ), lambda {
+      @column.cellColor.addPattern(
+        CellSettingPattern.new(@val[2], @val[1]))
     })
-    doc('cellurl.column', <<'EOT'
-Specifies a URL that is associated with the content of the cell.
-Usually such a URL contains a runtime macro, otherwise all cells of the
-column will have the same fixed URL.
+    doc('cellcolor.column', <<'EOT'
+Specifies an alternative background color for the cells of this column. The
+logical expression specifies for which cells the color should be used. If
+multiple cellcolor patterns are provided for a column, the first
+matching one is used for each cell.
 EOT
-        )
-    arg(1, 'text', 'Hyperlink address (e.g. http://www.taskjuggler.org)')
+       )
 
-    pattern(%w( _hidecelltext !logicalExpression ), lambda {
-      @column.hideCellText = @val[1]
+    pattern(%w( _end !date ), lambda {
+      @column.end = @val[1]
     })
-    doc('hidecelltext', <<'EOT'
-This logical expression is evaluated during report generation for each report
-cell. If it evaluates to true, the cell will have no content.
+    doc('end.column', <<'EOT'
+Normally, columns with calculated values take the specified report period into
+account when calculating their values. With this attribute, the user can
+specify an end date for the period that should be used when calculating the
+values of this column. It does not have an impact on column with time
+invariant values.
 EOT
-        )
+       )
 
-    pattern(%w( _hidecellurl !logicalExpression ), lambda {
-      @column.hideCellURL = @val[1]
+    pattern(%w( _fontcolor !logicalExpression !color ), lambda {
+      @column.fontColor.addPattern(
+        CellSettingPattern.new(@val[2], @val[1]))
     })
-    doc('hidecellurl', <<'EOT'
-This logical expression is evaluated during report generation for each report
-cell. If it evaluates to true, the cell will have no URL attached.
+    doc('fontcolor.column', <<'EOT'
+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( _period !interval ), lambda {
+      @column.start = @val[1].start
+      @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.
+EOT
+       )
 
     pattern(%w( _scale !chartScale ), lambda {
       @column.scale = @val[1]
     })
     doc('scale.column', <<'EOT'
 Specifies the scale that should be used for a chart column. This value is ignored for all other columns.
+EOT
+       )
+
+    pattern(%w( _start !date ), lambda {
+      @column.start = @val[1]
+    })
+    doc('start.column', <<'EOT'
+Normally, columns with calculated values take the specified report period into
+account when calculating their values. With this attribute, the user can
+specify a start date for the period that should be used when calculating the
+values of this column. It does not have an impact on column with time
+invariant values.
 EOT
        )
 
@@ -519,20 +608,39 @@ EOT
        )
     arg(1, 'text', 'The new column title.')
 
+    pattern(%w( _tooltip !logicalExpression $STRING ), lambda {
+      @column.tooltip.addPattern(
+        CellSettingPattern.new(newRichText(@val[2]), @val[1]))
+    })
+    doc('tooltip.column', <<'EOT'
+Specifies an alternative content for the tooltip. This will replace the
+original content of the tooltip that would be available for columns with text
+that does not fit the column with.  The logical expression specifies for which
+cells the text should be used. If multiple tooltip patterns are provided for a
+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
+Rich Text]].
+EOT
+       )
+
     pattern(%w( _width !number ), lambda {
       @column.width = @val[1]
     })
     doc('width.column', <<'EOT'
 Specifies the width of the column in screen pixels. If the content of the
 column does not fit into this width, it will be cut off. In some cases a
-scrollbar is added or a popup window is shown when the mouse is moved over the
-column. The latter is only supported in interactive output formats.
+scrollbar is added or a tooltip window with the complete content is shown when
+the mouse is moved over the column. The latter is only supported in
+interactive output formats.
 EOT
        )
   end
 
   def rule_date
-    pattern(%w( $DATE ), lambda {
+    pattern(%w( !dateCalcedOrNot ), lambda {
       resolution = @project.nil? ? Project.maxScheduleGranularity :
                                    @project['scheduleGranularity']
       if @val[0] % resolution != 0
@@ -547,15 +655,59 @@ A DATE is an ISO-compliant date in the format
 ''''<nowiki>YYYY-MM-DD[-hh:mm[:ss]][-TIMEZONE]</nowiki>''''. Hour, minutes,
 seconds, and the ''''TIMEZONE'''' are optional. If not specified, the values
 are set to 0.  ''''TIMEZONE'''' must be an offset to GMT or UTC, specified as
-''''+HHMM'''' or ''''-HHMM''''. Dates must always be aligned with the [[timingresolution]].
+''''+HHMM'''' or ''''-HHMM''''. Dates must always be aligned with the
+[[timingresolution]].
+
+TaskJuggler also supports simple date calculations. You can add or substract a
+given interval from a fixed date.
+
+ %{2009-11-01 + 8m}
+
+This will result in an actual date of around 2009-07-01. Keep in mind that due to the varying lengths of months TaskJuggler cannot add exactly 8 calendar months. The date calculation functionality makes most sense when used with macros.
+
+ %{${now} - 2w}
+
+This is result in a date 2 weeks earlier than the current (or specified) date.
+See [[duration]] for a complete list of supported time intervals. Don't forget
+to put at least one space character after the date to prevent TaskJuggler from
+interpreting the interval as an hour.
 EOT
        )
   end
 
+  def rule_dateCalcedOrNot
+    singlePattern('$DATE')
+    pattern(%w( _% _{ $DATE !plusOrMinus !intervalDuration _} ), lambda {
+      @val[2] + ((@val[3] == '+' ? 1 : -1) * @val[4])
+    })
+  end
+
   def rule_declareFlagList
     listRule('moreDeclareFlagList', '$ID')
   end
 
+  def rule_details
+    pattern(%w( _details $STRING ), lambda {
+      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 )
+      @journalEntry.details = newRichText(@val[1], rtTokenSetMore)
+    })
+    doc('details', <<'EOT'
+This is a continuation of the [[summary]] of the journal or status entry. It
+can be several paragraphs long.
+EOT
+       )
+    arg(1, 'text', <<'EOT'
+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.
+EOT
+       )
+  end
+
   def rule_durationUnit
     pattern(%w( _min ), lambda { 0 })
     descr('minutes')
@@ -844,15 +996,38 @@ EOT
     doc('functions', <<'EOT'
 The following functions are supported in logical expressions. These functions
 are evaluated in logical conditions such as hidetask or rollupresource. For
-the evaluation, implicit and explicit parameters are used. All functions may
-operate on the current property and the scope property. The scope property is
-the enclosing property in reports with nested properties. E. g. in a task
-report with nested resources, the task is the scope property and the the
-resource is the property the the function is called for the resource line. The
-explicit parameters are passed in the function call. These arguments may vary
-from function to function.
+the evaluation, implicit and explicit parameters are used.
+
+All functions may operate on the current property and the scope property. The
+scope property is the enclosing property in reports with nested properties.
+Imagine e. g a task report with nested resources. When the function is called
+for a task line, the task is the property and we don't have a scope property.
+When the function is called for a resource line, the resource is the property
+and the enclosing task is the scope property.
+
+These number of arguments that are passed in brackets to the function depends
+on the specific function. See the reference for details on each function.
+
+All functions can be suffixed with an underscore character. In that case, the
+function is operating on the scope property as if it were the property. The
+original property is ignored in that case. In our task report example from
+above, calling a function with an appended dash would mean that a task
+line would be evaluated for the enclosing resource.
+
+In the example below you can see how this can be used. To generate a task
+report that lists all assigned leaf resources for leaf task lines only we use
+the expression
+
+ hideresource ~(isleaf() & isleaf_())
+
+The tilde in front of the bracketed expression means not that expression. In
+other words: show resources that are leaf resources and show them for leaf
+tasks only. The regular form isleaf() (without the appended underscore)
+operates on the resource. The isleaf_() variant operates on the
+enclosing task.
 EOT
        )
+    example('LogicalFunction', '1')
   end
 
   def rule_functionsBody
@@ -862,15 +1037,65 @@ EOT
 
   def rule_functionPatterns
     # This rule is not used by the parser. It's only for the documentation.
+    pattern(%w( _hasalert _( $INTEGER _, !date _) ))
+    doc('hasalert', <<'EOT'
+Will evaluate to true if the current property has a current alert message within the report time frame and with at least the provided alert level.
+EOT
+       )
+    arg(2, 'Level', 'The minimum required alert level to be considered.')
+
+    pattern(%w( _isactive _( $ID _) ))
+    doc('isactive', <<'EOT'
+Will evaluate to true for tasks and resources if they have bookings in
+the scenario during the report time frame.
+EOT
+       )
+    arg(2, 'ID', 'A scenario ID')
+
+    pattern(%w( _isdependencyof _( $ID _, $ID _, $INTEGER _) ))
+    doc('isdependencyof', <<'EOT'
+Will evaluate to true for tasks that depend on the specified task in
+the specified scenario and are no more than distance tasks away. If
+distance is 0, all dependencies are considered independent of their
+distance.
+EOT
+       )
+    arg(2, 'Task ID', 'The ID of a defined task')
+    arg(4, 'Scenario ID', 'A scenario ID')
+    arg(6, 'Distance', 'The maximum task distance to be considered')
+
+    pattern(%w( _isdutyof _( $ID _, $ID _) ))
+    doc('isdutyof', <<'EOT'
+Will evaluate to true for tasks that have the specified resource
+assigned to it in the specified scenario.
+EOT
+       )
+    arg(2, 'Resource ID', 'The ID of a defined resource')
+    arg(4, 'Scenario ID', 'A scenario ID')
+
     pattern(['_isleaf', '_(', '_)' ])
     doc('isleaf', 'The result is true if the property is not a container.')
 
-    pattern(['_isresource', '_(', '$ID', '_)' ])
-    doc('isresource', <<'EOT'
-The result is true if the property is a resource with the specified ID.
+    pattern(%w( _isongoing _( $ID _) ))
+    doc('isongoing', <<'EOT'
+Will evaluate to true for tasks that overlap with the report period in given
+scenario.
+EOT
+       )
+    arg(2, 'ID', 'A scenario ID')
+
+    pattern(['_isresource', '_(', '_)' ])
+    doc('isresource', 'The result is true if the property is a resource.')
+
+    pattern(['_istask', '_(', '_)' ])
+    doc('istask', 'The result is true if the property is a task.')
+
+    pattern(%w( _treelevel _( _) ))
+    doc('treelevel', <<'EOT'
+Returns the nesting level of a property in the property tree.
+Top level properties have a level of 1, their children 2 and so on.
 EOT
        )
-    arg(2, 'ID', 'A resource ID')
   end
 
   def rule_hideresource
@@ -897,6 +1122,11 @@ EOT
        )
   end
 
+  def rule_idOrAbsoluteId
+    singlePattern('$ID')
+    singlePattern('$ABSOLUTE_ID')
+  end
+
   def rule_includeAttributes
     optionsRule('includeAttributesBody')
   end
@@ -950,24 +1180,32 @@ EOT
   end
 
   def rule_includeFile
-    pattern(%w( $STRING ), lambda {
+    pattern(%w( !includeFileName ), lambda {
       @scanner.include(@val[0])
     })
+  end
+
+  def rule_includeFileName
+    pattern(%w( $STRING ), lambda {
+      unless @val[0][-4, 4] == '.tji'
+        error('bad_include_suffix', "Included files must have a '.tji'" +
+                                    "extension: '#{@val[0]}'")
+      end
+      @val[0]
+    })
     arg(0, 'filename', <<'EOT'
-Name of the file to include. This must have a ''''.tji'''' extension. The name may have an absolute or relative path. You need to use ''''/'''' characters to separate directories.
+Name of the file to include. This must have a ''''.tji'''' extension. The name
+may have an absolute or relative path. You need to use ''''/'''' characters to
+separate directories.
 EOT
        )
   end
 
   def rule_includeProperties
-    pattern(%w( $STRING !includeAttributes ), lambda {
+    pattern(%w( !includeFileName !includeAttributes ), lambda {
       pushFileStack
       @scanner.include(@val[0])
     })
-    arg(0, 'filename', <<'EOT'
-Name of the file to include. This must have a ''''.tji'''' extension. The name may have an absolute or relative path. You need to use ''''/'''' characters to separate directories.
-EOT
-       )
   end
 
   def rule_intervalOrDate
@@ -1077,11 +1315,18 @@ EOT
       @val[0]
     })
     doc('journalentry', <<'EOT'
-This attribute adds an entry to the journal of the project. A journal can be used to record events, decisions or news that happened at a particular moment during the project. Depending on the context, a journal entry may or may not be associated with a specific property.
+This attribute adds an entry to the journal of the project. A journal can be
+used to record events, decisions or news that happened at a particular moment
+during the project. Depending on the context, a journal entry may or may not
+be associated with a specific property or author.
 
-A journal entry consists of three parts. The headline is mandatory and should be only 5 to 10 words long. The introduction is optional and should be only one or two sentences long. All other details should be put into the third part.
+A journal entry can consists of up to three parts. The headline is mandatory
+and should be only 5 to 10 words long. The introduction is optional and should
+be only one or two sentences long. All other details should be put into the
+third part.
 
-Depending on the context, journal entries are listed with headlines only, as headlines plus introduction or in full.
+Depending on the context, journal entries are listed with headlines only, as
+headlines plus introduction or in full.
 EOT
        )
   end
@@ -1090,31 +1335,35 @@ EOT
     optional
     repeatable
 
-    pattern(%w( _intro $STRING ), lambda {
-      @journalEntry.intro = newRichText(@val[1])
+    pattern(%w( _alert $ID ), lambda {
+      level = @project.alertLevelIndex(@val[1])
+      unless level
+        error('bad_alert', "Unknown alert level #{@val[1]}. Must be " +
+              'green, yellow or red')
+      end
+      @journalEntry.alertLevel = level
     })
-    doc('intro', <<'EOT'
-This is the introductory part of the journal entry. It should summarize the
-full entry but should contain more details than the headline.
-EOT
-       )
-    arg(1, 'text', <<'EOT'
-The text will be interpreted as [[Rich_Text_Attributes Rich Text]].
+    doc('alert', <<'EOT'
+Specify the alert level for this entry. Supported values are green, yellow and
+red. The default value is green. This attribute is inteded to be used for
+status reporting. When used for a journal entry that is associated with a
+property, the value can be reported in the alert column. When multiple entries
+have been specified for the property, the entry with the date closest to the
+report end date will be used. Container properties will inherit the highest
+alert level of all its sub properties unless it has an own journal entry dated
+closer to the report end than all of its sub properties.
 EOT
        )
 
-    pattern(%w( _more $STRING ), lambda {
-      @journalEntry.more = newRichText(@val[1])
+    pattern(%w( !author ))
+
+    pattern(%w( !summary ), lambda {
+      @journalEntry.summary = @val[0]
+    })
+
+    pattern(%w( !details ), lambda {
+      @journalEntry.details = @val[0]
     })
-    doc('more', <<'EOT'
-This is a continuation of the [[intro introduction]] of the journal entry. It
-is usually several paragraphs long.
-EOT
-       )
-    arg(1, 'text', <<'EOT'
-The text will be interpreted as [[Rich_Text_Attributes Rich Text]].
-EOT
-       )
   end
 
   def rule_journalEntryBody
@@ -1124,8 +1373,13 @@ EOT
   def rule_journalEntryHeader
     pattern(%w( _journalentry !valDate $STRING ), lambda {
       @journalEntry = JournalEntry.new(@project['journal'], @val[1], @val[2],
-                                      @property)
+                                       @property, @scanner.sourceFileInfo)
     })
+    arg(2, 'headline', <<'EOT'
+The headline of the journal entry. It will be interpreted as
+[[Rich_Text_Attributes Rich Text]].
+EOT
+       )
   end
   def rule_leafResourceId
     pattern(%w( !resourceId ), lambda {
@@ -1311,36 +1565,36 @@ EOT
   end
 
   def rule_loadunit
-    singlePattern('_days')
+    pattern([ '_days' ], lambda { :days })
     descr('Display all load and duration values as days.')
 
-    singlePattern('_hours')
+    pattern([ '_hours' ], lambda { :hours })
     descr('Display all load and duration values as hours.')
 
-    singlePattern('_longauto')
+    pattern([ '_longauto'] , lambda { :longauto })
     descr(<<'EOT'
 Automatically select the unit that produces the shortest and most readable
 value. The unit name will not be abbreviated.
 EOT
          )
 
-    singlePattern('_minutes')
+    pattern([ '_minutes' ], lambda { :minutes })
     descr('Display all load and duration values as minutes.')
 
-    singlePattern('_months')
+    pattern([ '_months' ], lambda { :months })
     descr('Display all load and duration values as monts.')
 
-    singlePattern('_shortauto')
+    pattern([ '_shortauto' ], lambda { :shortauto })
     descr(<<'EOT'
 Automatically select the unit that produces the shortest and most readable
 value. The unit name will be abbreviated.
 EOT
          )
 
-    singlePattern('_weeks')
+    pattern([ '_weeks' ], lambda { :weeks })
     descr('Display all load and duration values as weeks.')
 
-    singlePattern('_years')
+    pattern([ '_years' ], lambda { :years })
     descr('Display all load and duration values as years.')
   end
 
@@ -1351,13 +1605,15 @@ EOT
     doc('logicalexpression', <<'EOT'
 A logical expression is a combination of operands and mathematical operations.
 The final result of a logical expression is always true or false. Logical
-expressions are used the reduce the properties in a report to a certain
-subset. If the logical expression evaluates to true for a certain property,
-this property is hidden or rolled-up in the report.
+expressions are used the reduce the properties in a report to a certain subset
+or to select alternatives for the cell content of a table. When used with
+attributes like [[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
+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.
+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.
 EOT
        )
     also(%w( functions ))
@@ -1392,6 +1648,10 @@ Macros may call other macros.
 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>''''.
+
 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
 the undefined macro would be flagged with an error message.
@@ -1406,6 +1666,12 @@ EOT
     example('Macro-1')
   end
 
+  def rule_moreBangs
+    optional
+    repeatable
+    singlePattern('_!')
+  end
+
   def rule_moreAlternatives
     commaListRule('!resourceId')
   end
@@ -1551,23 +1817,44 @@ EOT
   end
 
   def rule_operation
-    pattern(%w( !operand !operatorAndOperand ), lambda {
+    pattern(%w( !operand !operatorAndOperand !operationChain ), lambda {
       operation = LogicalOperation.new(@val[0])
       unless @val[1].nil?
         operation.operator = @val[1][0]
         operation.operand2 = @val[1][1]
       end
+      if @val[2]
+        # Further operators/operands create an operation tree.
+        @val[2].each do |ops|
+          operation = LogicalOperation.new(operation)
+          operation.operator = ops[0]
+          operation.operand2 = ops[1]
+        end
+      end
       operation
     })
     arg(0, 'operand', <<'EOT'
-An operand can consist of a date, a text string or a numerical value. It can
-also be the name of a declared flag. Finally, an operand can be a negated
-operand by prefixing a ~ charater or it can be another logical expression
-enclosed in braces.
+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.
+
+An operand can be a negated operand by prefixing a ~ charater or it can be
+another logical expression enclosed in braces.
 EOT
         )
   end
 
+  def rule_operationChain
+    optional
+    repeatable
+    pattern(%w( !operatorAndOperand), lambda {
+      @val[0]
+    })
+  end
+
   def rule_operatorAndOperand
     optional
     pattern(%w( !operator !operand), lambda{
@@ -1600,6 +1887,9 @@ EOT
 
     singlePattern('_<=')
     descr('The \'smaller-or-equal\' operator')
+
+    singlePattern('_!=')
+    descr('The \'not-equal\' operator')
   end
 
   def rule_optionalID
@@ -1660,6 +1950,11 @@ EOT
     })
   end
 
+  def rule_plusOrMinus
+    singlePattern('_+')
+    singlePattern('_ - ')
+  end
+
   def rule_project
     pattern(%w( !projectProlog !projectDeclaration !properties ), lambda {
       @val[1]
@@ -1732,6 +2027,8 @@ EOT
       @project['now'] = @val[1]
       @scanner.addMacro(Macro.new('now', @val[1].to_s,
                                   @scanner.sourceFileInfo))
+      @scanner.addMacro(Macro.new('today', @val[1].to_s(@project['timeFormat']),
+                                  @scanner.sourceFileInfo))
     })
     doc('now', <<'EOT'
 Specify the date that TaskJuggler uses for calculation as current
@@ -1969,6 +2266,7 @@ EOT
     })
 
     pattern(%w( !export ))
+    pattern(%w( !timeSheetReport ))
 
     pattern(%w( _flags !declareFlagList ), lambda {
       unless @project['flags'].include?(@val[1])
@@ -2029,6 +2327,7 @@ EOT
     pattern(%w( !report ))
     pattern(%w( !resource ))
     pattern(%w( !shift ))
+    pattern(%w( !statusSheet ))
 
     pattern(%w( _supplement !supplement ))
     doc('supplement', <<'EOT'
@@ -2044,6 +2343,7 @@ EOT
        )
 
     pattern(%w( !task ))
+    pattern(%w( !timeSheet ))
     pattern(%w( _vacation !vacationName !intervals ), lambda {
       @project['vacations'] = @project['vacations'] + @val[2]
     })
@@ -2055,6 +2355,16 @@ part-time, or vice versa, please refer to the 'Shift' property.
 EOT
        )
     arg(1, 'name', 'Name or purpose of the vacation')
+
+    pattern(%w( _trackingscenario !scenarioId ), lambda {
+      @project['trackingScenarioIdx'] = @val[1]
+    })
+    doc('trackingscenario', <<'EOT'
+Specifies which scenario should be used for time sheet reports. By default,
+the top-level scenario will be used.
+EOT
+       )
+
   end
 
   def rule_propertiesInclude
@@ -2122,6 +2432,15 @@ EOT
     optionsRule('referenceAttributes')
   end
 
+  def rule_relativeId
+    pattern(%w( _! !moreBangs !idOrAbsoluteId ), lambda {
+      str = '!'
+      @val[1].each { |bang| str += bang }
+      str += @val[2]
+      str
+    })
+  end
+
   def rule_report
     pattern(%w( !reportHeader !reportBody ), lambda {
       @property = @property.parent
@@ -2133,14 +2452,56 @@ with report attributes. Reports can be nested to create structured document
 trees. As with other properties, the resource attributes can be inherited from
 the enclosing report or the project.
 
+By default, report definitions do not generate any files. With more complex
+projects, most report definitions will be used to describe elements of
+composed reports. If you want to generate a file from this report, you must
+specify the list of [[formats]] that you want to generate. The report name
+will then be used as a base name to create the file. The suffix will be
+appended based on the generated format.
+
 Reports have a local name space. All IDs must be unique within the reports
-that belong to the same enclosing report.
+that belong to the same enclosing report. To reference a report for inclusion
+into another report, you need to specify the full report ID. This is composed
+of the report ID, prefixed by a dot-separated list of all parent report IDs.
 EOT
        )
+    also(%w( resourcereport taskreport textreport ))
   end
 
 
   def rule_reportableAttributes
+    singlePattern('_alert')
+    descr(<<'EOT'
+The alert level of the property that was reported with the date closest to the
+end date of the report. Container properties that don't have their own alert
+level reported with a date equal or newer than the alert levels of all their
+sub properties will get the highest alert level of their direct sub
+properties.
+EOT
+         )
+
+    singlePattern('_alertmessage')
+    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('_alertsummary')
+    descr(<<'EOT'
+The headlines and the summary message from the journal entries that caused the
+current alert level for this task.
+EOT
+         )
+
+    singlePattern('_alerttrend')
+    descr(<<'EOT'
+Shows how the alert level at the end of the report period compares to the
+alert level at the begining of the report period. Possible values are up, down
+or flat.
+EOT
+         )
+
     singlePattern('_chart')
     descr(<<'EOT'
 A Gantt chart. This column type requires all lines to have the same fixed
@@ -2186,7 +2547,13 @@ EOT
     descr('Measure for how efficient a resource can perform tasks')
 
     singlePattern('_effort')
-    descr('The total allocated effort')
+    descr('The allocated effort during the reporting period')
+
+    singlePattern('_effortdone')
+    descr('The already completed effort as of now')
+
+    singlePattern('_effortleft')
+    descr('The remaining allocated effort as of now')
 
     singlePattern('_email')
     descr('The email address of a resource')
@@ -2197,6 +2564,20 @@ EOT
     singlePattern('_flags')
     descr('List of attached flags')
 
+    singlePattern('_freetime')
+    descr(<<'EOT'
+The amount of unallocated work time of a resource during the reporting period.
+EOT
+         )
+
+    singlePattern('_freework')
+    descr(<<'EOT'
+The amount of unallocated work capacity of a resource during the reporting
+period. This is the product of unallocated work time times the efficiency of
+the resource.
+EOT
+         )
+
     singlePattern('_fte')
     descr('The Full-Time-Equivalent of a resource or group')
 
@@ -2283,6 +2664,16 @@ EOT
     singlePattern('_start')
     descr('The start date of the task')
 
+    singlePattern('_status')
+    descr(<<'EOT'
+The status of a task. It is determined based on the current date or the date
+specified by [[now]].
+EOT
+         )
+
+    singlePattern('_targets')
+    descr('A list of tasks that depend in the current task.')
+
     singlePattern('_wbs')
     descr('The hierarchical or work breakdown structure index')
 
@@ -2330,14 +2721,10 @@ EOT
       @property.set('columns', columns)
     })
     doc('columns', <<'EOT'
-Specifies which columns shall be included in a report.
-
-All columns support macro expansion. Contrary to the normal macro expansion,
-these macros are expanded during the report generation. So the value of the
-macro is being changed after each table cell or table line. Consequently only
-build in macros can be used. To protect the macro calls against expansion
-during the initial file processing, the report macros must be prefixed with an
-additional ''''$''''.
+Specifies which columns shall be included in a report. Some columns show
+values that are constant over the course of the project. Other columns show
+calculated values that depend on the time period that was chosen for the
+report.
 EOT
        )
 
@@ -2353,6 +2740,13 @@ EOT
        )
     also(%w( footer header prolog ))
 
+    pattern(%w( !flags ))
+    doc('flags.report', <<'EOT'
+Attach a set of flags. The flags can be used in logical expressions to filter
+properties from the reports.
+EOT
+       )
+
     pattern(%w( _footer $STRING ), lambda {
       @property.set('footer', newRichText(@val[1]))
     })
@@ -2381,10 +2775,15 @@ EOT
     also(%w( epilog footer prolog ))
 
     pattern(%w( _headline $STRING ), lambda {
-      @property.set('headline', @val[1])
+      @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
        )
 
@@ -2403,13 +2802,15 @@ EOT
        )
 
     pattern(%w( _loadunit !loadunit ), lambda {
-      @property.set('loadUnit', "#{@val[1]}")
+      @property.set('loadUnit', @val[1])
     })
     doc('loadunit', <<'EOT'
 Determines what unit should be used to display all load values in this report.
 EOT
        )
 
+    pattern(%w( !reportPeriod ))
+
     pattern(%w( _prolog $STRING ), lambda {
       @property.set('prolog', newRichText(@val[1]))
     })
@@ -2439,7 +2840,6 @@ EOT
        )
 
     pattern(%w( !report ))
-    pattern(%w( !reportPeriod ))
 
     pattern(%w( _right $STRING ), lambda {
       @property.set('right', newRichText(@val[1]))
@@ -2466,6 +2866,16 @@ EOT
     })
     doc('scenarios', <<'EOT'
 List of scenarios that should be included in the report.
+EOT
+       )
+
+    pattern(%w( _selfcontained !yesNo ), lambda {
+      @property.set('selfcontained', @val[1])
+    })
+    doc('selfcontained', <<'EOT'
+Try to generate selfcontained output files when the format supports this. E.
+g. for HTML reports, the style sheet will be included and no icons will be
+used.
 EOT
        )
 
@@ -2507,6 +2917,15 @@ EOT
     pattern(%w( !timeformat ), lambda {
       @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
+       )
   end
 
   def rule_reportEnd
@@ -2524,6 +2943,27 @@ EOT
        )
     example('Export', '2')
   end
+  def rule_reportId
+    pattern(%w( !reportIdUnverifd ), lambda {
+      id = @val[0]
+      if @property && @property.is_a?(Report)
+        id = @property.fullId + '.' + id
+      else
+        id = @reportprefix + '.' + id unless @reportprefix.empty?
+      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.")
+      end
+      report
+    })
+    arg(0, 'report', 'The ID of a defined report')
+  end
+
+  def rule_reportIdUnverifd
+    singlePattern('$ABSOLUTE_ID')
+    singlePattern('$ID')
+  end
 
   def rule_reportPeriod
     pattern(%w( _period !interval ), lambda {
@@ -2573,39 +3013,61 @@ EOT
       case @val[0]
       when 'taskreport'
         @property.typeSpec = :taskreport
-        # Set the default columns for this report.
-        %w( wbs name start end effort chart ).each do |col|
-          @property.get('columns') <<
-          TableColumnDefinition.new(col, columnTitle(col))
+        unless @property.modified?('columns')
+          # Set the default columns for this report.
+          %w( wbs name start end effort chart ).each do |col|
+            @property.get('columns') <<
+            TableColumnDefinition.new(col, columnTitle(col))
+          end
         end
         # Show all tasks, sorted by tree, start-up, seqno-up.
-        @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-        @property.set('sortTasks',
-                    [ [ 'tree', true, -1 ],
-                      [ 'start', true, 0 ],
-                      [ 'seqno', true, -1 ] ])
+        unless @property.modified?('hideTask')
+          @property.set('hideTask',
+                        LogicalExpression.new(LogicalOperation.new(0)))
+        end
+        unless @property.modified?('softTask')
+          @property.set('sortTasks',
+                        [ [ 'tree', true, -1 ],
+                          [ 'start', true, 0 ],
+                          [ 'seqno', true, -1 ] ])
+        end
         # Show no resources, but set sorting to id-up.
-        @property.set('hideResource',
-                      LogicalExpression.new(LogicalOperation.new(1)))
-        @property.set('sortResources', [ [ 'id', true, -1 ] ])
+        unless @property.modified?('hideResource')
+          @property.set('hideResource',
+                        LogicalExpression.new(LogicalOperation.new(1)))
+        end
+        unless @property.modified?('sortResources')
+          @property.set('sortResources', [ [ 'id', true, -1 ] ])
+        end
       when 'resourcereport'
         @property.typeSpec = :resourcereport
-        # Set the default columns for this report.
-        %w( no name ).each do |col|
-          @property.get('columns') <<
-          TableColumnDefinition.new(col, columnTitle(col))
+        if @property.modified?('columns')
+          # Set the default columns for this report.
+          %w( no name ).each do |col|
+            @property.get('columns') <<
+            TableColumnDefinition.new(col, columnTitle(col))
+          end
         end
         # Show all resources, sorted by tree and id-up.
-        @property.set('hideResource',
-                      LogicalExpression.new(LogicalOperation.new(0)))
-        @property.set('sortResources', [ [ 'tree', true, -1 ],
-                    [ 'id', true, -1 ] ])
+        unless @property.modified?('hideResource')
+          @property.set('hideResource',
+                        LogicalExpression.new(LogicalOperation.new(0)))
+        end
+        unless @property.modified?('sortResources')
+          @property.set('sortResources', [ [ 'tree', true, -1 ],
+                        [ 'id', true, -1 ] ])
+        end
         # Hide all resources, but set sorting to tree, start-up, seqno-up.
-        @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(1)))
-        @property.set('sortTasks',
-                    [ [ 'tree', true, -1 ],
-                      [ 'start', true, 0 ],
-                      [ 'seqno', true, -1 ] ])
+        unless @property.modified?('hideTask')
+          @property.set('hideTask',
+                        LogicalExpression.new(LogicalOperation.new(1)))
+        end
+        unless @property.modified?('sortTasks')
+          @property.set('sortTasks',
+                        [ [ 'tree', true, -1 ],
+                          [ 'start', true, 0 ],
+                          [ 'seqno', true, -1 ] ])
+        end
       when 'textreport'
         @property.typeSpec = :textreport
       else
@@ -2624,18 +3086,29 @@ EOT
     singlePattern('_resourcereport')
     doc('resourcereport', <<'EOT'
 The report lists resources and their respective values in a table. The task
-that are the resources are allocated to can be listed as well.
+that are the resources are allocated to can be listed as well. See [[report]]
+for further details.
 EOT
        )
     singlePattern('_taskreport')
     doc('taskreport', <<'EOT'
-The report lists tasks and their respective values in a table. The
-resources that are allocated to each task can be listed as well.
+The report lists tasks and their respective values in a table. To reduce the
+list of included tasks, you can use the [[hidetask]], [[rolluptask]] or
+[[taskroot]] attributes. The order of the task can be controlled with
+[[sorttasks]]. If the first sorting criteria is tree sorting, the parent tasks
+will unconditionally be included to form the tree. Tree sorting is the
+default. You need to change it if you do not want certain parent tasks to be
+included in the report.
+
+The resources that are allocated to each task can be listed as well. See
+[[report]] for further details.
 EOT
        )
     singlePattern('_textreport')
     doc('textreport', <<'EOT'
-This report consists of 5 RichText sections, a header, a center section with a left and right margin and a footer. The sections may contain the output of other defined reports.
+This report consists of 5 RichText sections, a header, a center section with a
+left and right margin and a footer. The sections may contain the output of
+other defined reports. See [[report]] for further details.
 EOT
        )
   end
@@ -2662,7 +3135,7 @@ EOT
     pattern(%w( !purge ))
     pattern(%w( !resource ))
     pattern(%w( !resourceScenarioAttributes ))
-    pattern(%w( !scenarioId !resourceScenarioAttributes ), lambda {
+    pattern(%w( !scenarioIdCol !resourceScenarioAttributes ), lambda {
       @scenarioIdx = 0
     })
 
@@ -2940,6 +3413,15 @@ EOT
   end
 
   def rule_scenarioId
+    pattern(%w( $ID ), lambda {
+      if (@scenarioIdx = @project.scenarioIdx(@val[0])).nil?
+        error('unknown_scenario_id', "Unknown scenario: #{@val[0]}")
+      end
+    })
+    arg(0, 'scenario', 'ID of a defined scenario')
+  end
+
+  def rule_scenarioIdCol
     pattern(%w( $ID_WITH_COLON ), lambda {
       if (@scenarioIdx = @project.scenarioIdx(@val[0])).nil?
         error('unknown_scenario_id', "Unknown scenario: @val[0]")
@@ -3016,7 +3498,7 @@ EOT
 
     pattern(%w( !shift ))
     pattern(%w( !shiftScenarioAttributes ))
-    pattern(%w( !scenarioId !shiftScenarioAttributes ), lambda {
+    pattern(%w( !scenarioIdCol !shiftScenarioAttributes ), lambda {
       @scenarioIdx = 0
     })
   end
@@ -3154,10 +3636,135 @@ EOT
         'Use \'tree\' as first criteria to keep the breakdown structure.')
   end
 
+  def rule_ssStatusAttributes
+    optional
+    repeatable
+
+    pattern(%w( !author ))
+    pattern(%w( !details ))
+    pattern(%w( !summary ))
+  end
+
+  def rule_ssStatusBody
+    optional
+    pattern(%w( _{ !ssStatusAttributes _} ))
+  end
+
+  def rule_ssStatusHeader
+    pattern(%w( _status !alertLevel $STRING ), lambda {
+      @journalEntry = JournalEntry.new(@project['journal'], @sheetEnd,
+                                       @val[2], @property,
+                                       @scanner.sourceFileInfo)
+      @journalEntry.alertLevel = @val[1]
+      @journalEntry.author = @sheetAuthor
+
+    })
+  end
+
+  def rule_ssStatus
+    pattern(%w( !ssStatusHeader !ssStatusBody ))
+    doc('status.statussheet', <<'EOT'
+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
+       )
+  end
+
+  def rule_statusSheet
+    pattern(%w( !statusSheetHeader !statusSheetBody ))
+    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
+don't directly work with the full project plan, but need to report the current
+status of each task or task-tree that they are responsible for.
+EOT
+       )
+    example('StatusSheet')
+  end
+
+  def rule_statusSheetAttributes
+    optional
+    repeatable
+
+    pattern(%w( !statusSheetTask ))
+  end
+
+  def rule_statusSheetBody
+    optionsRule('statusSheetAttributes')
+  end
+
+  def rule_statusSheetHeader
+    pattern(%w( _statussheet !resourceId !date ), lambda {
+      @sheetAuthor = @val[1]
+      @sheetEnd = @val[2]
+    })
+    arg(1, 'reporter', <<'EOT'
+The ID of a defined resource. This identifies the status reporter. Unless the
+status entries provide a different author, the sheet author will be used as
+status entry author.
+EOT
+       )
+  end
+
+  def rule_statusSheetTask
+    pattern(%w( !statusSheetTaskHeader !statusSheetTaskBody), lambda {
+      @property = @propertyStack.pop
+    })
+    doc('task.statussheet', <<'EOT'
+Opens the task with the specified ID to add a status report. Child task can be
+opened inside this context by specifying their relative ID to this parent.
+EOT
+       )
+  end
+
+  def rule_statusSheetTaskAttributes
+    optional
+    repeatable
+    pattern(%w( !ssStatus ))
+    pattern(%w( !statusSheetTask ), lambda {
+    })
+  end
+
+  def rule_statusSheetTaskBody
+    optionsRule('statusSheetTaskAttributes')
+  end
+
+  def rule_statusSheetTaskHeader
+    pattern(%w( _task !taskId ), lambda {
+      if @property
+        @propertyStack.push(@property)
+      else
+        @propertyStack = []
+      end
+      @property = @val[1]
+    })
+  end
+  def rule_summary
+    pattern(%w( _summary $STRING ), lambda {
+      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.
+EOT
+       )
+    arg(1, 'text', <<'EOT'
+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
+       )
+  end
+
   def rule_supplement
     pattern(%w( !supplementAccount !accountBody ), lambda {
       @property = nil
     })
+    pattern(%w( !supplementReport !reportBody ), lambda {
+      @property = nil
+    })
     pattern(%w( !supplementResource !resourceBody ), lambda {
       @property = nil
     })
@@ -3173,6 +3780,13 @@ EOT
     arg(1, 'account ID', 'The ID of an already defined account.')
   end
 
+  def rule_supplementReport
+    pattern(%w( _report !reportId ), lambda {
+      @property = @val[1]
+    })
+    arg(1, 'report ID', 'The ID of an already defined report.')
+  end
+
   def rule_supplementResource
     pattern(%w( _resource !resourceId ), lambda {
       @property = @val[1]
@@ -3237,7 +3851,7 @@ EOT
 
     pattern(%w( !task ))
     pattern(%w( !taskScenarioAttributes ))
-    pattern(%w( !scenarioId !taskScenarioAttributes ), lambda {
+    pattern(%w( !scenarioIdCol !taskScenarioAttributes ), lambda {
       @scenarioIdx = 0
     })
     # Other attributes will be added automatically.
@@ -3323,7 +3937,7 @@ EOT
 
   def rule_taskDepId
     singlePattern('$ABSOLUTE_ID')
-    descr(<<'EOT'
+    arg(0, 'ABSOLUTE ID', <<'EOT'
 A reference using the full qualified ID of a task. The IDs of all enclosing
 parent tasks must be prepended to the task ID and separated with a dot, e.g.
 ''''proj.plan.doc''''.
@@ -3331,9 +3945,9 @@ EOT
          )
 
     singlePattern('$ID')
-    descr('Just the ID of the task without and parent IDs.')
+    arg(0, 'ID', 'Just the ID of the task without and parent IDs.')
 
-    pattern(%w( $RELATIVE_ID ), lambda {
+    pattern(%w( !relativeId ), lambda {
       task = @property
       id = @val[0]
       while task && id[0] == ?!
@@ -3349,7 +3963,7 @@ EOT
         id
       end
     })
-    descr(<<'EOT'
+    arg(0, 'RELATIVE ID', <<'EOT'
 A relative task ID always starts with one or more exclamation marks and is
 followed by a task ID. Each exclamation mark lifts the scope where the ID is
 looked for to the enclosing task. The ID may contain some of the parent IDs
@@ -3386,9 +4000,12 @@ EOT
   def rule_taskId
     pattern(%w( !taskIdUnverifd ), lambda {
       id = @val[0]
-      id = @taskprefix + '.' + id unless @taskprefix.empty?
-      # In case we have a nested supplement, we need to prepend the parent ID.
-      id = @property.fullId + '.' + id if @property && @property.is_a?(Task)
+      if @property && @property.is_a?(Task)
+        # In case we have a nested supplement, we need to prepend the parent ID.
+        id = @property.fullId + '.' + id
+      else
+        id = @taskprefix + '.' + id unless @taskprefix.empty?
+      end
       if (task = @project.task(id)).nil?
         error('unknown_task', "Unknown task #{id}")
       end
@@ -3998,6 +4615,108 @@ EOT
     })
   end
 
+  def rule_timeSheet
+    pattern(%w( !timeSheetHeader !timeSheetBody ), lambda {
+
+    })
+    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
+must be a separate time sheet record for each resource per period. Different
+resources can use different reporting periods and reports for the same
+resource may have different reporting periods as long as they don't overlap.
+For the time after the last time sheet, TaskJuggler will project the result
+based on the plan data. For periods without a time sheet record prior to the
+last record for this resource, TaskJuggler assumes that no work has been done.
+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
+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
+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
+alert level will be evaluated and the current state of the project can be put
+into a dashboard using the ''''alert'''' and ''''alertmessage'''' [[columnid
+columns]].
+EOT
+       )
+    example('TimeSheet')
+  end
+
+  def rule_timeSheetAttributes
+    optional
+    repeatable
+
+    pattern(%w( !tsNewTaskHeader !tsTaskBody ))
+    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.
+If the task exists already, an error is generated. The new task can be used
+immediately to report progress and status against it.
+EOT
+       )
+
+    pattern(%w( _shift !shiftId ), lambda {
+
+    })
+    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.
+
+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 ))
+    doc('task.timesheet', <<'EOT'
+Specifies an existing task that progress and status should be reported
+against.
+EOT
+       )
+  end
+
+  def rule_timeSheetBody
+    pattern(%w( _{ !timeSheetAttributes _} ), lambda {
+
+    })
+  end
+
+  def rule_timeSheetHeader
+    pattern(%w( _timesheet !resourceId !valIntervalOrDate ),
+            lambda {
+      @sheetAuthor = @val[1]
+      @sheetStart = @val[2].start
+      @sheetEnd = @val[2].end
+    })
+  end
+
+  def rule_timeSheetReport
+    pattern(%w( !tsReportHeader !tsReportBody ))
+    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
+property, you can generate a report that contains drafts of the time sheets
+for one or more resources. The time sheet drafts will be for the
+specified report period.
+EOT
+       )
+  end
+
   def rule_timezone
     pattern(%w( _timezone !validTimeZone ), lambda{
       ENV['TZ'] = @project['timezone'] = @val[1]
@@ -4029,6 +4748,172 @@ EOT
        )
   end
 
+  def rule_tsNewTaskHeader
+    pattern(%w( _newtask !taskIdUnverifd ), lambda {
+
+    })
+    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)
+    })
+    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_tsReportAttributes
+    optional
+    repeatable
+
+    pattern(%w( !hideresource ))
+    pattern(%w( !reportEnd ))
+    pattern(%w( !reportPeriod ))
+    pattern(%w( !reportStart ))
+  end
+
+  def rule_tsReportBody
+    optionsRule('tsReportAttributes')
+  end
+
+  def rule_tsStatusAttributes
+    optional
+    repeatable
+
+    pattern(%w( !details ))
+    pattern(%w( !summary ))
+  end
+
+  def rule_tsStatusBody
+    optional
+    pattern(%w( _{ !tsStatusAttributes _} ))
+  end
+
+  def rule_tsStatusHeader
+    pattern(%w( _status !alertLevel $STRING ), lambda {
+      @journalEntry = JournalEntry.new(@project['journal'], @sheetEnd,
+                                       @val[2], @property,
+                                       @scanner.sourceFileInfo)
+      @journalEntry.alertLevel = @val[1]
+      @journalEntry.author = @sheetAuthor
+
+    })
+  end
+
+  def rule_tsStatus
+    pattern(%w( !tsStatusHeader !tsStatusBody ))
+    doc('status.timesheet', <<'EOT'
+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
+       )
+  end
+
+  def rule_tsTaskAttributes
+    optional
+    repeatable
+
+    pattern(%w( _end !valDate ), lambda {
+
+    })
+    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
+       )
+
+    pattern(%w( _priority $INTEGER ), lambda {
+
+    })
+    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
+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.
+EOT
+       )
+
+    pattern(%w( _remaining !workingDuration ), lambda {
+
+    })
+    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.
+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.
+EOT
+       )
+
+    pattern(%w( !tsStatus ))
+
+    pattern(%w( _work !workingDuration ), lambda {
+
+    })
+    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
+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.
+
+Every task listed in the time sheet needs to have a work attribute. The total
+accumulated work time that is reported must match exactly the total working
+hours for the resource for that period.
+
+If a resource has no vacation during the week that is reported and it has a
+regular 40 hour work week, exactly 40 hours total or 5 working days have to be
+reported.
+EOT
+       )
+  end
+
+  def rule_tsTaskBody
+    pattern(%w( _{ !tsTaskAttributes _} ), lambda {
+      @property = nil
+    })
+  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
+    })
+    arg(1, 'task', 'ID of an already existing task')
+  end
+
   def rule_vacationName
     optional
     pattern(%w( $STRING )) # We just throw the name away
@@ -4217,6 +5102,15 @@ EOT
        )
   end
 
+  def rule_yesNo
+    pattern(%w( _yes ), lambda {
+      true
+    })
+    pattern(%w( _no ), lambda {
+      false
+    })
+  end
+
 end
 
 end