taskjuggler 0.0.2 → 0.0.3

data/lib/TjpSyntaxRules.rb

@@ -28,6 +28,8 @@ be used to track turnover. When the cost of a task is split over multiple
 accounts they all must have the same top-level group account. Top-level
 accounts can be used for profit/loss calculations. The sub-account structure
 of a top-level account should be organized accordingly.
+
+Accounts have a global name space. All IDs must be unique within the accounts of the project.
 EOT
        )
     example('Account', '1')
@@ -49,11 +51,11 @@ EOT
   end
 
   def rule_accountHeader
-    pattern(%w( _account $ID $STRING ), lambda {
+    pattern(%w( _account !optionalID $STRING ), lambda {
       if @property.nil? && !@accountprefix.empty?
-        @property = @project.task(@accountprefix)
+        @property = @project.accout(@accountprefix)
       end
-      if @project.account(@val[1])
+      if @val[1] && @project.account(@val[1])
         error('account_exists', "Account #{@val[1]} has already been defined.")
       end
       @property = Account.new(@project, @val[1], @val[2], @property)
@@ -61,11 +63,6 @@ EOT
       @property.inheritAttributes
       @scenarioIdx = 0
     })
-    arg(1, 'id', <<'EOT'
-The ID of the account. Accounts have a global name space. The ID must be
-unique within the whole project.
-EOT
-       )
     arg(2, 'name', 'A name or short description of the account')
   end
 
@@ -450,7 +447,8 @@ EOT
 
   def rule_columnId
     pattern(%w( !reportableAttributes ), lambda {
-      title = @reportElement.defaultColumnTitle(@val[0])
+      title = TableReport.defaultColumnTitle(@val[0]) ||
+              @project.attributeName(@val[0])
       @column = TableColumnDefinition.new(@val[0], title)
     })
     doc('columnid', <<'EOT'
@@ -492,6 +490,15 @@ EOT
     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.
+EOT
+        )
+
+    pattern(%w( _hidecellurl !logicalExpression ), lambda {
+      @column.hideCellURL = @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.
 EOT
         )
 
@@ -524,71 +531,10 @@ EOT
        )
   end
 
-  def rule_csvFileName
-    pattern(%w( $STRING ), lambda {
-      # '.' means 'use $stdout'
-      if @val[0] == '.'
-        name = '.'
-      else
-        unless @val[0][-4,4] == '.csv'
-          error('no_csv_suffix',
-              "Report name must have .csv suffix: #{@val[0]}")
-        end
-        # Strip '.csv' suffix from file name
-        name = @val[0][0..-5]
-      end
-      if @project.reports[name]
-        error('report_redefinition',
-              "A report with the name #{name} has already been defined.")
-      end
-      name
-    })
-    arg(1, 'file name', <<'EOT'
-The name of the report file to generate. It should end with a .html extension.
-EOT
-       )
-  end
-
-  def rule_csvResourceReport
-    pattern(%w( !csvResourceReportHeader !reportBody ))
-    doc('csvresourcereport', <<'EOT'
-The report lists all resources and their respective values as colon-separated-value (CSV) file. Due to
-the very simple nature of the CSV format, only a small subset of features will
-be supported for CSV output. Including tasks or listing multiple scenarios
-will result in very difficult to read reports.
-EOT
-       )
-  end
-
-  def rule_csvResourceReportHeader
-    pattern(%w( _csvresourcereport !csvFileName ), lambda {
-      @report = Report.new(@project, @val[1], :csv, sourceFileInfo)
-      @reportElement = ResourceListRE.new(@report)
-    })
-  end
-
-  def rule_csvTaskReport
-    pattern(%w( !csvTaskReportHeader !reportBody ))
-    doc('csvtaskreport', <<'EOT'
-The report lists all tasks and their respective values as
-colon-separated-value (CSV) file. Due to the very simple nature of the CSV
-format, only a small subset of features will be supported for CSV output.
-Including resources or listing multiple scenarios will result in very
-difficult to read reports.
-EOT
-       )
-  end
-
-  def rule_csvTaskReportHeader
-    pattern(%w( _csvtaskreport !csvFileName ), lambda {
-      @report = Report.new(@project, @val[1], :csv, sourceFileInfo)
-      @reportElement = TaskListRE.new(@report)
-    })
-  end
-
   def rule_date
     pattern(%w( $DATE ), lambda {
-      resolution = @project.nil? ? 60 * 60 : @project['scheduleGranularity']
+      resolution = @project.nil? ? Project.maxScheduleGranularity :
+                                   @project['scheduleGranularity']
       if @val[0] % resolution != 0
         error('misaligned_date',
               "The date must be aligned to the timing resolution (" +
@@ -655,49 +601,11 @@ EOT
     example('Export')
   end
 
-  def rule_exportableResourceAttribute
-    singlePattern('_all')
-    singlePattern('_none')
-    singlePattern('_vacation')
-    singlePattern('_workinghours')
-  end
-
-  def rule_exportableResourceAttributes
-    listRule('moreExportableResourceAttributes', '!exportableResourceAttribute')
-  end
-
-  def rule_exportableTaskAttribute
-    singlePattern('_all')
-    singlePattern('_booking')
-    singlePattern('_complete')
-    singlePattern('_depends')
-    singlePattern('_flags')
-    singlePattern('_maxend')
-    singlePattern('_maxstart')
-    singlePattern('_minend')
-    singlePattern('_minstart')
-    singlePattern('_none')
-    singlePattern('_note')
-    singlePattern('_priority')
-    singlePattern('_responsible')
-  end
-
-  def rule_exportableTaskAttributes
-    listRule('moreExportableTaskAttributes', '!exportableTaskAttribute')
-  end
-
   def rule_exportHeader
     pattern(%w( _export $STRING ), lambda {
-      if @val[1] == '.'
-        mainFile = true
-        name = '.'
-      else
-        extension = @val[1][-4, 4]
-        if extension == '.tjp'
-          mainFile = true
-        elsif extension == '.tji'
-          mainFile = false
-        else
+      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
@@ -705,12 +613,11 @@ EOT
         name = @val[1][0..-5]
       end
 
-      if @project.reports[name]
+      if @project.reports[@val[1]]
         error('report_redefinition',
               "A report with the name #{name} has already been defined.")
       end
-      @report = Report.new(@project, name, :export, sourceFileInfo)
-      @reportElement = TjpExportRE.new(@report, mainFile)
+      newReport(@val[1], :export, sourceFileInfo)
     })
     arg(1, 'file name', <<'EOT'
 The name of the report file to generate. It must end with a .tjp or .tji
@@ -723,29 +630,54 @@ EOT
     optional
     repeatable
 
+    pattern(%w( _definitions !exportDefinitions ), lambda {
+      @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.
+EOT
+       )
+    allOrNothingListRule('exportDefinitions',
+                         { 'flags' => 'Include flag definitions',
+                           'projecids' => 'Include project IDs',
+                           'tasks' => 'Include task definitions',
+                           'resources' => 'Include resource definitions' })
     pattern(%w( !hideresource ))
     pattern(%w( !hidetask ))
     pattern(%w( !reportEnd ))
     pattern(%w( !reportPeriod ))
     pattern(%w( !reportStart ))
+
     pattern(%w( _resourceattributes !exportableResourceAttributes ), lambda {
-      @reportElement.resourceAttrs = @val[1].include?('none') ? [] : @val[1]
+      @property.set('resourceAttributes', @val[1])
     })
     doc('resourceattributes', <<"EOT"
-Define a list of resource attributes that should be included in the report. To
-include all supported attributes just use ''''all''''. When ''''none'''' is
-used, no optional resource attributes will be exported.
+Define a list of resource attributes that should be included in the report.
 EOT
-        )
+       )
+    allOrNothingListRule('exportableResourceAttributes',
+                         { 'vacation' => 'Include vacations',
+                           'workinghours' => 'Include working hours' })
+
     pattern(%w( _taskattributes !exportableTaskAttributes ), lambda {
-      @reportElement.taskAttrs = @val[1].include?('none') ? [] : @val[1]
+      @property.set('taskAttributes', @val[1])
     })
     doc('taskattributes', <<"EOT"
-Define a list of task attributes that should be included in the report. To
-include all supported attributes just use ''''all''''. When ''''none'''' is
-used, no optional task attributes will be exported.
+Define a list of task attributes that should be included in the report.
 EOT
-        )
+       )
+    allOrNothingListRule('exportableTaskAttributes',
+                         { 'booking' => 'Include bookings',
+                           'complete' => 'Include completion values',
+                           'depends' => 'Include dependencies',
+                           'flags' => 'Include flags',
+                           'maxend' => 'Include maximum end dates',
+                           'maxstart' => 'Include maximum start dates',
+                           'minend' =>  'Include minimum end dates',
+                           'minstart' => 'Include minimum start dates',
+                           'note' => 'Include notes',
+                           'priority' => 'Include priorities',
+                           'responsible' => 'Include responsible resource' })
   end
 
   def rule_exportBody
@@ -885,7 +817,7 @@ EOT
   def rule_flag
     pattern(%w( $ID ), lambda {
       unless @project['flags'].include?(@val[0])
-        error('undecl_flag', "Undeclared flag #{@val[0]}")
+        error('undecl_flag', "Undeclared flag '#{@val[0]}'")
       end
       @val[0]
     })
@@ -943,7 +875,7 @@ EOT
 
   def rule_hideresource
     pattern(%w( _hideresource !logicalExpression ), lambda {
-      @reportElement.hideResource = @val[1]
+      @property.set('hideResource', @val[1])
     })
     doc('hideresource', <<'EOT'
 Do not include resources that match the specified logical expression. If the
@@ -955,7 +887,7 @@ EOT
 
   def rule_hidetask
     pattern(%w( _hidetask !logicalExpression ), lambda {
-      @reportElement.hideTask = @val[1]
+      @property.set('hideTask', @val[1])
     })
     doc('hidetask', <<'EOT'
 Do not include tasks that match the specified logical expression. If the
@@ -965,58 +897,6 @@ EOT
        )
   end
 
-  def rule_htmlFileName
-    pattern(%w( $STRING ), lambda {
-      unless @val[0][-5,5] == '.html'
-        error('no_html_suffix',
-              "Report name must have .html suffix: #{@val[0]}")
-      end
-      # Strip '.html' suffix from file name
-      name = @val[0][0..-6]
-      if @project.reports[name]
-        error('report_redefinition',
-              "A report with the name #{name} has already been defined.")
-      end
-      name
-    })
-    arg(1, 'file name', <<'EOT'
-The name of the report file to generate. It should end with a .html extension.
-EOT
-       )
-  end
-
-  def rule_htmlResourceReport
-    pattern(%w( !htmlResourceReportHeader !reportBody ))
-    doc('htmlresourcereport', <<'EOT'
-The report lists all resources and their respective values as a HTML page. The
-task that are the resources are allocated to can be listed as well.
-EOT
-       )
-  end
-
-  def rule_htmlResourceReportHeader
-    pattern(%w( _htmlresourcereport !htmlFileName ), lambda {
-      @report = Report.new(@project, @val[1], :html, sourceFileInfo)
-      @reportElement = ResourceListRE.new(@report)
-    })
-  end
-
-  def rule_htmlTaskReport
-    pattern(%w( !htmlTaskReportHeader !reportBody ))
-    doc('htmltaskreport', <<'EOT'
-The report lists all tasks and their respective values as a HTML page. The
-resources that are allocated to each task can be listed as well.
-EOT
-       )
-  end
-
-  def rule_htmlTaskReportHeader
-    pattern(%w( _htmltaskreport !htmlFileName ), lambda {
-      @report = Report.new(@project, @val[1], :html, sourceFileInfo)
-      @reportElement = TaskListRE.new(@report)
-    })
-  end
-
   def rule_includeAttributes
     optionsRule('includeAttributesBody')
   end
@@ -1034,8 +914,20 @@ sub-account of the account specified by ID. The parent account must already be
 defined.
 EOT
     )
+    arg(1, 'account ID', 'The absolute ID of an already defined account')
+
+    pattern(%w( _reportprefix !taskId ), lambda {
+      @reportprefix = @val[1].fullId
+    })
+    doc('reportprefix', <<'EOT'
+This attribute can be used to insert the reports of the included file as
+sub-report of the report specified by ID. The parent report must already
+be defined.
+EOT
+    )
+    arg(1, 'report ID', 'The absolute ID of an already defined report.')
 
-    pattern(%w( _resourceprefix !taskId ), lambda {
+    pattern(%w( _resourceprefix !resourceId ), lambda {
       @resourceprefix = @val[1].fullId
     })
     doc('resourceprefix', <<'EOT'
@@ -1044,6 +936,7 @@ sub-resource of the resource specified by ID. The parent resource must already
 be defined.
 EOT
     )
+    arg(1, 'resource ID', 'The ID of an already defined resource')
 
     pattern(%w( _taskprefix !taskId ), lambda {
       @taskprefix = @val[1].fullId
@@ -1053,6 +946,7 @@ This attribute can be used to insert the tasks of the included file as
 sub-task of the task specified by ID. The parent task must already be defined.
 EOT
     )
+    arg(1, 'task ID', 'The absolute ID of an already defined task.')
   end
 
   def rule_includeFile
@@ -1178,11 +1072,67 @@ EOT
     singlePattern('!intervals')
   end
 
+  def rule_journalEntry
+    pattern(%w( !journalEntryHeader !journalEntryBody ), lambda {
+      @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.
+
+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.
+
+Depending on the context, journal entries are listed with headlines only, as headlines plus introduction or in full.
+EOT
+       )
+  end
+
+  def rule_journalEntryAttributes
+    optional
+    repeatable
+
+    pattern(%w( _intro $STRING ), lambda {
+      @journalEntry.intro = newRichText(@val[1])
+    })
+    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]].
+EOT
+       )
+
+    pattern(%w( _more $STRING ), lambda {
+      @journalEntry.more = newRichText(@val[1])
+    })
+    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
+    optionsRule('journalEntryAttributes')
+  end
+
+  def rule_journalEntryHeader
+    pattern(%w( _journalentry !valDate $STRING ), lambda {
+      @journalEntry = JournalEntry.new(@project['journal'], @val[1], @val[2],
+                                      @property)
+    })
+  end
   def rule_leafResourceId
     pattern(%w( !resourceId ), lambda {
       resource = @val[0]
       unless resource.leaf?
-        error('leaf_resource_id_expected', "#{resource.id} is not a leaf resource.")
+        error('leaf_resource_id_expected',
+              "#{resource.id} is not a leaf resource.")
       end
       resource
     })
@@ -1415,6 +1365,9 @@ EOT
 
   def rule_macro
     pattern(%w( _macro $ID $MACRO ), lambda {
+      if @scanner.macroDefined?(@val[1])
+        warning('marco_redefinition', "Redefining macro #{@val[1]}")
+      end
       @scanner.addMacro(Macro.new(@val[1], @val[2], @scanner.sourceFileInfo))
     })
     doc('macro', <<'EOT'
@@ -1481,6 +1434,10 @@ EOT
     commaListRule('!weekDayInterval')
   end
 
+  def rule_moreOutputFormats
+    commaListRule('!outputFormat')
+  end
+
   def rule_moreProjectIDs
     commaListRule('$ID')
   end
@@ -1501,6 +1458,45 @@ EOT
     commaListRule('!timeInterval')
   end
 
+  def rule_navigator
+    pattern(%w( !navigatorHeader !navigatorBody ), lambda {
+      @project['navigators'][@navigator.id] = @navigator
+    })
+    doc('navigator', <<'EOT'
+Defines a navigator object with the specified ID. This object can be used in
+reports to include a navigation bar with references to other reports.
+EOT
+          )
+  end
+
+  def rule_navigatorAttributes
+    optional
+    repeatable
+    pattern(%w( _hidereport !logicalExpression ), lambda {
+      @navigator.hideReport = @val[1]
+    })
+    doc('hidereport', <<'EOT'
+This attribute can be used to exclude the reports that match the specified
+expression from the navigation bar.
+EOT
+          )
+  end
+
+  def rule_navigatorBody
+    optional
+    pattern(%w( _{ !navigatorAttributes _} ))
+  end
+
+  def rule_navigatorHeader
+    pattern(%w( _navigator $ID ), lambda {
+      if @project['navigators'][@val[1]]
+        error('navigator_exists',
+              "The navigator #{@val[1]} has already been defined.")
+      end
+      @navigator = Navigator.new(@val[1], @project)
+    })
+  end
+
   def rule_number
     singlePattern('$INTEGER')
     singlePattern('$FLOAT')
@@ -1534,7 +1530,7 @@ EOT
     pattern(%w( $ID !argumentList ), lambda {
       if @val[1].nil?
         unless @project['flags'].include?(@val[0])
-          error('operand_unkn_flag', "Undeclared flag #{@val[0]}")
+          error('operand_unkn_flag', "Undeclared flag '#{@val[0]}'")
         end
         LogicalFlag.new(@val[0])
       else
@@ -1606,6 +1602,20 @@ EOT
     descr('The \'smaller-or-equal\' operator')
   end
 
+  def rule_optionalID
+    optional
+    pattern(%w( $ID ), lambda {
+      @val[0]
+    })
+    arg(0, 'id', <<"EOT"
+An optional ID. If you ever want to reference this property, you must specify
+your own unique ID. If no ID is specified one will be automatically generated.
+These IDs may become visible in reports, but may change at any time. You may
+never rely on automatically generated IDs.
+EOT
+       )
+  end
+
   def rule_optionalPercent
     optional
     pattern(%w( !number _% ), lambda {
@@ -1613,6 +1623,43 @@ EOT
     })
   end
 
+  def rule_optionalVersion
+    optional
+    pattern(%w( $STRING ), lambda {
+      @val[0]
+    })
+    arg(0, 'version', <<"EOT"
+An optional version ID. This can be something simple as "4.2" or an ID tag of
+a revision control system. If not specified, it defaults to "1.0".
+EOT
+       )
+  end
+
+  def rule_outputFormat
+    pattern(%w( _csv ), lambda {
+      :csv
+    })
+    descr(<<'EOT'
+The report lists the resources and their respective values as
+colon-separated-value (CSV) format. Due to the very simple nature of the CSV
+format, only a small subset of features will be supported for CSV output.
+Including tasks or listing multiple scenarios will result in very difficult to
+read reports.
+EOT
+         )
+
+    pattern(%w( _html ), lambda {
+      :html
+    })
+    descr('Generate a web page (HTML file)')
+  end
+
+  def rule_outputFormats
+    pattern(%w( !outputFormat !moreOutputFormats ), lambda {
+      [ @val[0] ] + @val[1]
+    })
+  end
+
   def rule_project
     pattern(%w( !projectProlog !projectDeclaration !properties ), lambda {
       @val[1]
@@ -1629,7 +1676,7 @@ EOT
 
     pattern(%w( _currencyformat $STRING $STRING $STRING $STRING $INTEGER ),
         lambda {
-      @project['currencyformat'] = RealFormat.new(@val.slice(1, 5))
+      @project['currencyFormat'] = RealFormat.new(@val.slice(1, 5))
     })
     doc('currencyformat',
         'These values specify the default format used for all currency ' +
@@ -1679,6 +1726,8 @@ EOT
 
     pattern(%w( !projectBodyInclude ))
 
+    pattern(%w( !journalEntry ))
+
     pattern(%w( _now !date ), lambda {
       @project['now'] = @val[1]
       @scanner.addMacro(Macro.new('now', @val[1].to_s,
@@ -1695,7 +1744,7 @@ EOT
 
     pattern(%w( _numberformat $STRING $STRING $STRING $STRING $INTEGER ),
         lambda {
-      @project['numberformat'] = RealFormat.new(@val.slice(1, 5))
+      @project['numberFormat'] = RealFormat.new(@val.slice(1, 5))
     })
     doc('numberformat',
         'These values specify the default format used for all numerical ' +
@@ -1708,7 +1757,7 @@ EOT
 
     pattern(%w( !scenario ))
     pattern(%w( _shorttimeformat $STRING ), lambda {
-      @project['shorttimeformat'] = @val[1]
+      @project['shortTimeFormat'] = @val[1]
     })
     doc('shorttimeformat',
         'Specifies time format for time short specifications. This is normal' +
@@ -1716,7 +1765,7 @@ EOT
     arg(1, 'format', 'strftime like format string')
 
     pattern(%w( !timeformat ), lambda {
-      @project['timeformat'] = @val[0]
+      @project['timeFormat'] = @val[0]
     })
 
     pattern(%w( !timezone ), lambda {
@@ -1729,6 +1778,11 @@ EOT
         error('bad_timing_res',
               "Timing resolution must be one of #{goodValues.join(', ')} min.")
       end
+      if @val[1] > (Project.maxScheduleGranularity / 60)
+        error('too_large_timing_res',
+              'The maximum allowed timing resolution for the timezone is ' +
+              "#{Project.maxScheduleGranularity / 60} minutes.")
+      end
       @project['scheduleGranularity'] = @val[1] * 60
     })
     doc('timingresolution', <<'EOT'
@@ -1746,14 +1800,14 @@ EOT
         )
 
     pattern(%w( _weekstartsmonday ), lambda {
-      @project['weekstartsmonday'] = true
+      @project['weekStartsMonday'] = true
     })
     doc('weekstartsmonday',
         'Specify that you want to base all week calculation on weeks ' +
         'starting on Monday. This is common in many European countries.')
 
     pattern(%w( _weekstartssunday ), lambda {
-      @project['weekstartsmonday'] = false
+      @project['weekStartsMonday'] = false
     })
     doc('weekstartssunday',
         'Specify that you want to base all week calculation on weeks ' +
@@ -1792,18 +1846,17 @@ EOT
   end
 
   def rule_projectHeader
-    pattern(%w( _project $ID $STRING $STRING !interval ), lambda {
+    pattern(%w( _project !optionalID $STRING !optionalVersion !interval ), lambda {
       @project = Project.new(@val[1], @val[2], @val[3],
                                           @messageHandler)
       @project['start'] = @val[4].start
       @project['end'] = @val[4].end
       setGlobalMacros
       @property = nil
+      @reportCounter = 0
       @project
     })
-    arg(1, 'id', 'The ID of the project')
     arg(2, 'name', 'The name of the project')
-    arg(3, 'version', 'The version of the project plan')
   end
 
   def rule_projectIDs
@@ -1849,7 +1902,7 @@ EOT
     # documentation.
     pattern(%w( !projectPropertiesBody ))
     doc('properties', <<'EOT'
-The project properties. Every project must consists of at least one task.
+The project properties. Every project must consists of at least one task. The other properties are optional. To save the scheduled data at least one output generating property should be used.
 EOT
        )
   end
@@ -1915,6 +1968,8 @@ EOT
       @project['revenueAccount'] = @val[0][1]
     })
 
+    pattern(%w( !export ))
+
     pattern(%w( _flags !declareFlagList ), lambda {
       unless @project['flags'].include?(@val[1])
         @project['flags'] += @val[1]
@@ -1939,6 +1994,8 @@ EOT
 
     pattern(%w( !macro ))
 
+    pattern(%w( !navigator ))
+
     pattern(%w( _projectid $ID ), lambda {
       @project['projectids'] << @val[1]
       @project['projectids'].uniq!
@@ -1969,7 +2026,7 @@ Set the default rate for all subsequently defined resources. The rate describes
 EOT
         )
 
-    pattern(%w( !reportDefinitions ))
+    pattern(%w( !report ))
     pattern(%w( !resource ))
     pattern(%w( !shift ))
 
@@ -2065,195 +2122,62 @@ EOT
     optionsRule('referenceAttributes')
   end
 
-  def rule_reportAttributes
-    optional
-    repeatable
-
-    pattern(%w( !balance ), lambda {
-      @reportElement.costAccount = @val[0][0]
-      @reportElement.revenueAccount = @val[0][1]
+  def rule_report
+    pattern(%w( !reportHeader !reportBody ), lambda {
+      @property = @property.parent
     })
+    doc('report', <<'EOT'
+Reports are used to store and vizualize the results of a scheduled project.
+The content, the output format and the appearance of a report can be adjusted
+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.
 
-    pattern(%w( _caption $STRING ), lambda {
-      @reportElement.caption = newRichText(@val[1])
-    })
-    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]].
+Reports have a local name space. All IDs must be unique within the reports
+that belong to the same enclosing report.
 EOT
        )
-    example('Caption', '1')
+  end
 
-    pattern(%w( _columns !columnDef !moreColumnDef ), lambda {
-      columns = [ @val[1] ]
-      columns += @val[2] if @val[2]
-      @reportElement.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 ''''$''''.
+  def rule_reportableAttributes
+    singlePattern('_chart')
+    descr(<<'EOT'
+A Gantt chart. This column type requires all lines to have the same fixed
+height. This does not work well with rich text columns in some browsers. Some
+show a scrollbar for the compressed table cells, others don't. It is
+recommended, that you don't use rich text columns in conjuction with the chart
+column.
 EOT
-       )
+         )
 
-    pattern(%w( _epilog $STRING ), lambda {
-      @reportElement.epilog = newRichText(@val[1])
+    singlePattern('_complete')
+    descr('The completion degree of a task')
+
+    pattern([ '_completed' ], lambda {
+      'complete'
     })
-    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]].
-EOT
-       )
+    descr('Deprecated alias for complete')
 
-    pattern(%w( !reportEnd ))
+    singlePattern('_criticalness')
+    descr('A measure for how much effort the resource is allocated for, or' +
+          'how strained the allocated resources of a task are')
 
-    pattern(%w( _headline $STRING ), lambda {
-      @reportElement.headline = @val[1]
-    })
-    doc('headline', <<'EOT'
-Specifies the headline for a report.
+    singlePattern('_cost')
+    descr(<<'EOT'
+The cost of the task or resource. The use of this column requires that a cost
+account has been set for the report using the [[balance]] attribute.
 EOT
-       )
+         )
 
-    pattern(%w( !hideresource ))
+    singlePattern('_daily')
+    descr('A group of columns with one column for each day')
 
-    pattern(%w( !hidetask ))
+    singlePattern('_depends')
+    descr('A comma separated list of tasks that have to precede this task.')
 
-    pattern(%w( _loadunit !loadunit ), lambda {
-      @reportElement.loadUnit = :"#{@val[1]}"
-    })
-    doc('loadunit', <<'EOT'
-Determines what unit should be used to display all load values in this report.
-EOT
-       )
-
-    pattern(%w( _prolog $STRING ), lambda {
-      @reportElement.prolog = newRichText(@val[1])
-    })
-    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]].
-EOT
-       )
-
-    pattern(%w( _rawhead $STRING ), lambda {
-      @reportElement.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 {
-      @reportElement.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( !reportPeriod ))
-
-    pattern(%w( _rolluptask !logicalExpression ), lambda {
-      @reportElement.rollupTask = @val[1]
-    })
-    doc('rolluptask', <<'EOT'
-Do not show sub-tasks of tasks that match the specified logical expression.
-EOT
-       )
-
-    pattern(%w( _scenarios !scenarioIdList ), lambda {
-      # Don't include disabled scenarios in the report
-      @val[1].delete_if { |sc| !@project.scenario(sc).get('enabled') }
-      @reportElement.scenarios = @val[1]
-    })
-    doc('scenrios', <<'EOT'
-List of scenarios that should be included in the report.
-EOT
-       )
-
-    pattern(%w( _sortresources !sortCriteria ), lambda {
-      @reportElement.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 {
-      @reportElement.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( !reportStart ))
-
-    pattern(%w( _taskroot !taskId), lambda {
-      @reportElement.taskRoot = @val[1]
-    })
-    doc('taskroot', <<'EOT'
-Only tasks below the specified root-level tasks are exported. The exported
-tasks will have the id of the root-level task stripped from their ID, so that
-the sub-tasks of the root-level task become top-level tasks in the exported
-file.
-EOT
-       )
-
-    pattern(%w( !timeformat ), lambda {
-      @reportElement.timeFormat = @val[0]
-    })
-  end
-
-  def rule_reportableAttributes
-    singlePattern('_chart')
-    descr(<<'EOT'
-A Gantt chart. This column type requires all lines to have the same fixed
-height. This does not work well with rich text columns in some browsers. Some
-show a scrollbar for the compressed table cells, others don't. It is
-recommended, that you don't use rich text columns in conjuction with the chart
-column.
-EOT
-         )
-
-    singlePattern('_complete')
-    descr('The completion degree of a task')
-
-    pattern([ '_completed' ], lambda {
-      'complete'
-    })
-    descr('Deprecated alias for complete')
-
-    singlePattern('_criticalness')
-    descr('A measure for how much effort the resource is allocated for, or' +
-          'how strained the allocated resources of a task are')
-
-    singlePattern('_cost')
-    descr(<<'EOT'
-The cost of the task or resource. The use of this column requires that a cost
-account has been set for the report using the [[balance]] attribute.
-EOT
-         )
-
-    singlePattern('_daily')
-    descr('A group of columns with one column for each day')
-
-    singlePattern('_duration')
-    descr('The duration of a task')
+    singlePattern('_duration')
+    descr('The duration of a task')
 
     singlePattern('_duties')
     descr('List of tasks that the resource is allocated to')
@@ -2312,7 +2236,7 @@ EOT
     descr('A group of columns with one column for each month')
 
     singlePattern('_no')
-    descr('The object line number in the report')
+    descr('The object line number in the report (Cannot be used for sorting!)')
 
     singlePattern('_name')
     descr('The name or description of the item')
@@ -2324,6 +2248,9 @@ 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('_priority')
     descr('The priority of a task')
 
@@ -2333,6 +2260,10 @@ EOT
     singlePattern('_rate')
     descr('The daily cost of a resource.')
 
+    singlePattern('_resources')
+    descr('A list of resources that are assigned to the task in the report ' +
+          'time frame.')
+
     singlePattern('_responsible')
     descr('The responsible people for this task')
 
@@ -2343,6 +2274,9 @@ revenue account has been set for the report using the [[balance]] attribute.
 EOT
          )
 
+    singlePattern('_scenario')
+    descr('The name of the scenario')
+
     singlePattern('_seqno')
     descr('The index of the item based on the declaration order')
 
@@ -2360,33 +2294,228 @@ EOT
 
   end
 
-  def rule_reportDefinitions
-    pattern(%w( !csvResourceReport ))
-    pattern(%w( !csvTaskReport ))
-    pattern(%w( !export ))
-    pattern(%w( !htmlResourceReport ))
-    pattern(%w( !htmlTaskReport ))
-    pattern(%w( !resourceReport ))
-    pattern(%w( !taskReport ))
-  end
+  def rule_reportAttributes
+    optional
+    repeatable
 
-  def rule_reportDefinitionsBody
-    # This rule is not defining actual syntax. It's only used for the
-    # documentation.
-    optionsRule('reportDefinitions')
-  end
+    pattern(%w( !balance ), lambda {
+      @property.set('costAccount', @val[0][0])
+      @property.set('revenueAccount', @val[0][1])
+    })
 
-  def rule_reportBody
-    optionsRule('reportAttributes')
+    pattern(%w( _caption $STRING ), lambda {
+      @property.set('caption', newRichText(@val[1]))
+    })
+    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]].
+EOT
+       )
+    arg(1, 'text', 'The caption text.')
+    example('Caption', '1')
+
+    pattern(%w( _center $STRING ), lambda {
+      @property.set('center', newRichText(@val[1]))
+    })
+    doc('center', <<'EOT'
+This attribute defines the center section of the [[textreport]]. The text will
+be interpreted as [[Rich_Text_Attributes Rich Text]].
+EOT
+       )
+    arg(1, 'text', 'The text')
+
+    pattern(%w( _columns !columnDef !moreColumnDef ), lambda {
+      columns = [ @val[1] ]
+      columns += @val[2] if @val[2]
+      @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 ''''$''''.
+EOT
+       )
+
+    pattern(%w( !reportEnd ))
+
+    pattern(%w( _epilog $STRING ), lambda {
+      @property.set('epilog', newRichText(@val[1]))
+    })
+    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]].
+EOT
+       )
+    also(%w( footer header prolog ))
+
+    pattern(%w( _footer $STRING ), lambda {
+      @property.set('footer', newRichText(@val[1]))
+    })
+    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]].
+EOT
+       )
+    also(%w( epilog header prolog ))
+
+    pattern(%w( _formats !outputFormats ), lambda {
+      @property.set('formats', @val[1])
+    })
+    doc('formats', <<'EOT'
+EOT
+       )
+
+    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]].
+EOT
+       )
+    also(%w( epilog footer prolog ))
+
+    pattern(%w( _headline $STRING ), lambda {
+      @property.set('headline', @val[1])
+    })
+    doc('headline', <<'EOT'
+Specifies the headline for a report.
+EOT
+       )
+
+    pattern(%w( !hideresource ))
+
+    pattern(%w( !hidetask ))
+
+    pattern(%w( _left $STRING ), lambda {
+      @property.set('left', newRichText(@val[1]))
+    })
+    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
+span the [[header]] or [[footer]] sections.
+EOT
+       )
+
+    pattern(%w( _loadunit !loadunit ), lambda {
+      @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( _prolog $STRING ), lambda {
+      @property.set('prolog', newRichText(@val[1]))
+    })
+    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]].
+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( !reportPeriod ))
+
+    pattern(%w( _right $STRING ), lambda {
+      @property.set('right', newRichText(@val[1]))
+    })
+    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
+span the [[header]] or [[footer]] sections.
+EOT
+       )
+
+    pattern(%w( _rolluptask !logicalExpression ), lambda {
+      @property.set('rollupTask', @val[1])
+    })
+    doc('rolluptask', <<'EOT'
+Do not show sub-tasks of tasks that match the specified logical expression.
+EOT
+       )
+
+    pattern(%w( _scenarios !scenarioIdList ), lambda {
+      # Don't include disabled scenarios in the report
+      @val[1].delete_if { |sc| !@project.scenario(sc).get('enabled') }
+      @property.set('scenarios', @val[1])
+    })
+    doc('scenarios', <<'EOT'
+List of scenarios that should be included in the report.
+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( !reportStart ))
+
+    pattern(%w( _taskroot !taskId), lambda {
+      @property.set('taskRoot', @val[1])
+    })
+    doc('taskroot', <<'EOT'
+Only tasks below the specified root-level tasks are exported. The exported
+tasks will have the id of the root-level task stripped from their ID, so that
+the sub-tasks of the root-level task become top-level tasks in the exported
+file.
+EOT
+       )
+
+    pattern(%w( !timeformat ), lambda {
+      @property.set('timeFormat', @val[0])
+    })
   end
 
   def rule_reportEnd
     pattern(%w( _end !date ), lambda {
-      if @val[1] < @reportElement.start
+      if @val[1] < @property.get('start')
         error('report_end',
-              "End date must be before start date #{@reportElement.start}")
+              "End date must be before start date #{@property.get('start')}")
       end
-      @reportElement.end = @val[1]
+      @property.set('end', @val[1])
     })
     doc('end.report', <<'EOT'
 Specifies the end date of the report. In task reports only tasks that start
@@ -2398,8 +2527,8 @@ EOT
 
   def rule_reportPeriod
     pattern(%w( _period !interval ), lambda {
-      @reportElement.start = @val[1].start
-      @reportElement.end = @val[1].end
+      @property.set('start', @val[1].start)
+      @property.set('end', @val[1].end)
     })
     doc('period.report', <<'EOT'
 This property is a shortcut for setting the start and end property at the
@@ -2410,11 +2539,11 @@ EOT
 
   def rule_reportStart
     pattern(%w( _start !date ), lambda {
-      if @val[1] > @reportElement.end
+      if @val[1] > @property.get('end')
         error('report_start',
-              "Start date must be before end date #{@reportElement.end}")
+              "Start date must be before end date #{@property.get('end')}")
       end
-      @reportElement.start = @val[1]
+      @property.set('start', @val[1])
     })
     doc('start.report', <<'EOT'
 Specifies the start date of the report. In task reports only tasks that end
@@ -2422,25 +2551,106 @@ after this end date are listed.
 EOT
        )
   end
-  def rule_reports
-    # This rule is not defining actual syntax. It's only used for the
-    # documentation.
-    pattern(%w( !reportDefinitionsBody ))
-    doc('reports', <<'EOT'
-The report definitions. In order to see the results of your scheduled project
-you need to define at least one report.
+
+  def rule_reportBody
+    optionsRule('reportAttributes')
+  end
+
+  def rule_reportHeader
+    pattern(%w( !reportType !optionalID $STRING ), lambda {
+      if @property.nil? && !@reportprefix.empty?
+        @property = @project.report(@reportprefix)
+      end
+      if @val[1]
+        id = (@property ? @property.fullId + '.' : '') + @val[1]
+        if @project.report(id)
+          error('report_exists', "report #{id} has already been defined.")
+        end
+      end
+      @property = Report.new(@project, @val[1], @val[2], @property)
+      @property.sourceFileInfo = @scanner.sourceFileInfo
+      @property.inheritAttributes
+      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))
+        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 ] ])
+        # Show no resources, but set sorting to id-up.
+        @property.set('hideResource',
+                      LogicalExpression.new(LogicalOperation.new(1)))
+        @property.set('sortResources', [ [ 'id', true, -1 ] ])
+      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))
+        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 ] ])
+        # 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 ] ])
+      when 'textreport'
+        @property.typeSpec = :textreport
+      else
+        raise "Unsupported report type #{@val[0]}"
+      end
+    })
+    arg(2, 'name', <<'EOT'
+The name of the report. This will be the base name for generated output files.
+The suffix will depend on the specified [[formats]].It will also be used in
+navigation bars.
 EOT
        )
   end
 
+  def rule_reportType
+    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.
+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.
+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.
+EOT
+       )
+  end
 
   def rule_resource
     pattern(%w( !resourceHeader !resourceBody ), lambda {
        @property = @property.parent
     })
     doc('resource', <<'EOT'
-Tasks that have an effort specification need to have resources assigned to do
-the work. Use this property to define resources and groups of resources.
+Tasks that have an effort specification need to have at least one resource
+assigned to do the work. Use this property to define resources or groups of
+resources.
+
+Resources have a global name space. All IDs must be unique within the resources
+of the project.
 EOT
        )
   end
@@ -2448,6 +2658,7 @@ EOT
   def rule_resourceAttributes
     repeatable
     optional
+    pattern(%w( !journalEntry ))
     pattern(%w( !purge ))
     pattern(%w( !resource ))
     pattern(%w( !resourceScenarioAttributes ))
@@ -2507,11 +2718,11 @@ EOT
   end
 
   def rule_resourceHeader
-    pattern(%w( _resource $ID $STRING ), lambda {
+    pattern(%w( _resource !optionalID $STRING ), lambda {
       if @property.nil? && !@resourceprefix.empty?
-        @property = @project.task(@resourceprefix)
+        @property = @project.resource(@resourceprefix)
       end
-      if @project.resource(@val[1])
+      if @val[1] && @project.resource(@val[1])
         error('resource_exists', "Resource #{@val[1]} has already been defined.")
       end
       @property = Resource.new(@project, @val[1], @val[2], @property)
@@ -2519,11 +2730,11 @@ EOT
       @property.inheritAttributes
       @scenarioIdx = 0
     })
-    arg(1, 'id', <<'EOT'
-The ID of the resource. Resources have a global name space. The ID must be
-unique within the whole project.
-EOT
-       )
+#    arg(1, 'id', <<'EOT'
+#The ID of the resource. Resources have a global name space. The ID must be
+#unique within the whole project.
+#EOT
+#       )
     arg(2, 'name', 'The name of the resource')
   end
 
@@ -2539,26 +2750,6 @@ EOT
     })
   end
 
-  def rule_resourceReport
-    pattern(%w( !resourceReportHeader !reportBody ))
-    doc('resourcereport', <<'EOT'
-The report lists all resources and their respective values in the GUI. The
-task that are the resources are allocated to can be listed as well. In the commandline version this report is ignored.
-EOT
-       )
-  end
-
-  def rule_resourceReportHeader
-    pattern(%w( _resourcereport $STRING ), lambda {
-      @report = Report.new(@project, @val[1], :gui, sourceFileInfo)
-      @reportElement = ResourceListRE.new(@report)
-    })
-    arg(1, 'file name', <<'EOT'
-The name of the report.
-EOT
-       )
-  end
-
   def rule_resourceScenarioAttributes
     pattern(%w( _efficiency !number ), lambda {
       @property['efficiency', @scenarioIdx] = @val[1]
@@ -2779,7 +2970,12 @@ EOT
       @property = @property.parent
     })
     doc('shift', <<'EOT'
-A shift combines several workhours related settings in a reusable entity. Besides the weekly working hours it can also hold information such as vacations and a timezone.
+A shift combines several workhours related settings in a reusable entity.
+Besides the weekly working hours it can also hold information such as
+vacations and a time zone.
+
+Shifts have a global name space. All IDs must be unique within the shifts of
+the project.
 EOT
        )
   end
@@ -2830,8 +3026,8 @@ EOT
   end
 
   def rule_shiftHeader
-    pattern(%w( _shift $ID $STRING ), lambda {
-      if @project.shift(@val[1])
+    pattern(%w( _shift !optionalID $STRING ), lambda {
+      if @val[1] && @project.shift(@val[1])
         error('shift_exists', "Shift #{@val[1]} has already been defined.")
       end
       @property = Shift.new(@project, @val[1], @val[2], @property)
@@ -2839,7 +3035,6 @@ EOT
       @property.inheritAttributes
       @scenarioIdx = 0
     })
-    arg(1, 'id', 'The ID of the shift')
     arg(2, 'name', 'The name of the shift')
   end
 
@@ -2862,17 +3057,20 @@ Use this attribute if the vacation definition for the shift should replace the v
 EOT
        )
 
-    pattern(%w( _timezone $STRING ), lambda {
+    pattern(%w( _timezone !validTimeZone ), lambda {
       @property['timezone', @scenarioIdx] = @val[1]
     })
     doc('timezone.shift', <<'EOT'
-Sets the timezone of the shift. The working hours of the shift are assumed to be within the specified time zone. The timezone does not effect the vaction interval. The latter is assumed to be within the project time zone.
+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.
 EOT
         )
     arg(1, 'zone', <<'EOT'
 Time zone to use. E. g. 'Europe/Berlin' or 'America/Denver'. Don't use the 3
-letter acronyms.  Linux systems have a command line utility called tzselect to
-lookup possible values.
+letter acronyms. See
+[http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones Wikipedia] for
+possible values.
 EOT
        )
 
@@ -2999,6 +3197,9 @@ various steps and phases of the project. Depending on the attributes of that
 task, a task can be a container task, a milestone or a regular leaf task. The
 latter may have resources assigned. By specifying dependencies the user can
 force a certain sequence of tasks.
+
+Tasks have a local name space. All IDs must be unique within the tasks
+that belong to the same enclosing task.
 EOT
        )
   end
@@ -3006,6 +3207,9 @@ EOT
   def rule_taskAttributes
     repeatable
     optional
+
+    pattern(%w( !journalEntry ))
+
     pattern(%w( _note $STRING ), lambda {
       @property.set('note', newRichText(@val[1]))
     })
@@ -3161,20 +3365,21 @@ EOT
   end
 
   def rule_taskHeader
-    pattern(%w( _task $ID $STRING ), lambda {
+    pattern(%w( _task !optionalID $STRING ), lambda {
       if @property.nil? && !@taskprefix.empty?
         @property = @project.task(@taskprefix)
       end
-      id = (@property ? @property.fullId + '.' : '') + @val[1]
-      if @project.task(id)
-        error('task_exists', "Task #{id} has already been defined.")
+      if @val[1]
+        id = (@property ? @property.fullId + '.' : '') + @val[1]
+        if @project.task(id)
+          error('task_exists', "Task #{id} has already been defined.")
+        end
       end
       @property = Task.new(@project, @val[1], @val[2], @property)
       @property.sourceFileInfo = @scanner.sourceFileInfo
       @property.inheritAttributes
       @scenarioIdx = 0
     })
-    arg(1, 'id', 'The ID of the task')
     arg(2, 'name', 'The name of the task')
   end
 
@@ -3226,27 +3431,6 @@ EOT
     })
   end
 
-  def rule_taskReport
-    pattern(%w( !taskReportHeader !reportBody ))
-    doc('taskreport', <<'EOT'
-The report lists all tasks and their respective values in the GUI. The
-resources that are allocated to each task can be listed as well. In the
-commandline version it is simply ignored.
-EOT
-       )
-  end
-
-  def rule_taskReportHeader
-    pattern(%w( _taskreport $STRING ), lambda {
-      @report = Report.new(@project, @val[1], :gui, sourceFileInfo)
-      @reportElement = TaskListRE.new(@report)
-    })
-    arg(1, 'file name', <<'EOT'
-The name of the report.
-EOT
-       )
-  end
-
   def rule_taskScenarioAttributes
 
     pattern(%w( _account $ID ), lambda {
@@ -3301,7 +3485,7 @@ duration of the task. The accounts to be charged are determined by the
 [[chargeset]] setting of the task.
 EOT
        )
-    arg(0, 'amount', 'The amount to charge')
+    arg(1, 'amount', 'The amount to charge')
 
     pattern(%w( !chargeset ))
 
@@ -3815,24 +3999,32 @@ EOT
   end
 
   def rule_timezone
-    pattern(%w( _timezone $STRING ), lambda{
-      # TODO
+    pattern(%w( _timezone !validTimeZone ), lambda{
+      ENV['TZ'] = @project['timezone'] = @val[1]
     })
     doc('timezone', <<'EOT'
-Sets the default timezone of the project. All times that have no time
-zones specified will be assumed to be in this timezone. The value must be a
+Sets the default time zone of the project. All times that have no time
+zones specified will be assumed to be in this time zone. The value must be a
 string just like those used for the TZ environment variable. Most
 Linux systems have a command line utility called tzselect to lookup
 possible values.
 
 The project start and end time are not affected by this setting. You
-have to explicitly state the timezone for those dates or the system
-defaults are assumed.
+have to explicitly state the time zone for those dates or the system defaults
+are assumed. Using the TZ environment variable is the recommended way to
+specify the time zone for your project. If you use this attribute within the
+project, it should be the very first thing you set. It must be set before you
+set the [[timingresolution]] or any attribute with a time or date.
+
+In case the specified time zone is not hour-aligned with UTC, the
+[[timingresolution]] will automatically be decreased.
 EOT
         )
     arg(1, 'zone', <<'EOT'
 Time zone to use. E. g. 'Europe/Berlin' or 'America/Denver'. Don't use the 3
-letter acronyms.
+letter acronyms. See
+[http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones Wikipedia] for
+possible values.
 EOT
        )
   end
@@ -3853,6 +4045,15 @@ EOT
     })
   end
 
+  def rule_validTimeZone
+    pattern(%w( $STRING ), lambda {
+      unless TjTime.checkTimeZone(@val[0])
+        error('bad_time_zone', "#{@val[0]} is not a known time zone")
+      end
+      @val[0]
+    })
+  end
+
   def rule_valIntervalOrDate
     pattern(%w( !date !intervalOptionalEnd ), lambda {
       if @val[1]