taskjuggler 3.1.0 → 3.2.0

data/lib/taskjuggler/TextParser/Scanner.rb

@@ -51,8 +51,9 @@ class TaskJuggler::TextParser
 
       attr_reader :fileName, :macroStack
 
-      def initialize(log)
+      def initialize(log, textScanner)
         @log = log
+        @textScanner = textScanner
         @fileName = nil
         @stream = nil
         @line = nil
@@ -63,6 +64,10 @@ class TaskJuggler::TextParser
         @nextMacroEnd = nil
       end
 
+      def error(id, message)
+        @textScanner.error(id, message)
+      end
+
       def close
         @stream = nil
       end
@@ -160,8 +165,8 @@ class TaskJuggler::TextParser
 
       attr_reader :fileName
 
-      def initialize(fileName, log)
-        super(log)
+      def initialize(fileName, log, textScanner)
+        super(log, textScanner)
         @fileName = fileName.dup.untaint
         data = (fileName == '.' ? $stdin : File.new(@fileName, 'r')).read
         begin
@@ -183,8 +188,8 @@ class TaskJuggler::TextParser
     # Specialized version of StreamHandle for operations on Strings.
     class BufferStreamHandle < StreamHandle
 
-      def initialize(buffer, log)
-        super(log)
+      def initialize(buffer, log, textScanner)
+        super(log, textScanner)
         begin
           @stream = StringIO.new(buffer.forceUTF8Encoding)
         rescue
@@ -199,9 +204,9 @@ class TaskJuggler::TextParser
     # either contains the name of the file to start with or the text itself.
     # _messageHandler_ is a MessageHandler that is used for error messages.
     # _log_ is a Log to report progress and status.
-    def initialize(masterFile, messageHandler, log, tokenPatterns, defaultMode)
+    def initialize(masterFile, log, tokenPatterns, defaultMode)
       @masterFile = masterFile
-      @messageHandler = messageHandler
+      @messageHandler = TaskJuggler::MessageHandlerInstance.instance
       @log = log
       # This table contains all macros that may be expanded when found in the
       # text.
@@ -279,11 +284,11 @@ class TaskJuggler::TextParser
     def open(fileNameIsBuffer = false)
       @fileNameIsBuffer = fileNameIsBuffer
       if fileNameIsBuffer
-        @fileStack = [ [ @cf = BufferStreamHandle.new(@masterFile, @log),
+        @fileStack = [ [ @cf = BufferStreamHandle.new(@masterFile, @log, self),
                          nil, nil ] ]
       else
         begin
-          @fileStack = [ [ @cf = FileStreamHandle.new(@masterFile, @log),
+          @fileStack = [ [ @cf = FileStreamHandle.new(@masterFile, @log, self),
                            nil, nil ] ]
         rescue IOError, SystemCallError
           error('open_file', "Cannot open file #{@masterFile}: #{$!}")
@@ -332,8 +337,8 @@ class TaskJuggler::TextParser
 
       # Open the new file and push the handle on the @fileStack.
       begin
-        @fileStack << [ (@cf = FileStreamHandle.new(includeFileName, @log)),
-                        nil, block ]
+        @fileStack << [ (@cf = FileStreamHandle.new(includeFileName, @log,
+                                                    self)), nil, block ]
         @log.msg { "Parsing file #{includeFileName}" }
       rescue StandardError
         error('bad_include', "Cannot open include file #{includeFileName}", sfi)

data/lib/taskjuggler/TextParser/SourceFileInfo.rb

@@ -11,25 +11,30 @@
 # published by the Free Software Foundation.
 #
 
-class TaskJuggler::TextParser
+class TaskJuggler
 
-  # Simple class that holds the info about a source file reference.
-  class SourceFileInfo
+  class TextParser
 
-    attr_reader :fileName, :lineNo, :columnNo
+    # Simple class that holds the info about a source file reference.
+    class SourceFileInfo
 
-    # Create a new SourceFileInfo object. _file_ is the name of the file. _line_
-    # is the line in this file, _col_ is the column number in the line.
-    def initialize(file, line, col)
-      @fileName = file
-      @lineNo = line
-      @columnNo = col
-    end
+      attr_reader :fileName, :lineNo, :columnNo
+
+      # Create a new SourceFileInfo object. _file_ is the name of the file.
+      # _line_ is the line in this file, _col_ is the column number in the
+      # line.
+      def initialize(file, line, col)
+        @fileName = file
+        @lineNo = line
+        @columnNo = col
+      end
+
+      # Return the info in the common "filename:line:" format.
+      def to_s
+        # The column is not reported for now.
+        "#{@fileName}:#{@lineNo}:"
+      end
 
-    # Return the info in the common "filename:line:" format.
-    def to_s
-      # The column is not reported for now.
-      "#{@fileName}:#{@lineNo}:"
     end
 
   end

data/lib/taskjuggler/TimeSheets.rb

@@ -20,6 +20,8 @@ class TaskJuggler
   # work during the reporting time frame.
   class TimeSheetRecord
 
+    include MessageHandler
+
     attr_reader :task, :work
     attr_accessor :sourceFileInfo, :remaining, :expectedEnd, :status,
                    :priority, :name
@@ -233,14 +235,6 @@ class TaskJuggler
 
     private
 
-    def error(id, text)
-      @timeSheet.error(id, text, @sourceFileInfo)
-    end
-
-    def warning(id, text)
-      @timeSheet.warning(id, text, @sourceFileInfo)
-    end
-
   end
 
   # The TimeSheet class stores the work related bits of a time sheet. For each
@@ -264,6 +258,7 @@ class TaskJuggler
       @percentageUsed = false
       # The TimeSheetRecord list.
       @records = []
+      @messageHandler = MessageHandlerInstance.instance
     end
 
     # Add a new TimeSheetRecord to the list.
@@ -368,13 +363,12 @@ class TaskJuggler
     end
 
     def error(id, text, sourceFileInfo = nil)
-      @resource.project.messageHandler.error(
-        id, text, sourceFileInfo || @sourceFileInfo, nil, @resource)
+      @messageHandler.error(id, text, sourceFileInfo || @sourceFileInfo,
+                            nil, @resource)
     end
 
     def warning(id, text, sourceFileInfo = nil)
-      @resource.project.messageHandler.warning(id, text, sourceFileInfo, nil,
-                                               @resource)
+      @messageHandler.warning(id, text, sourceFileInfo, nil, @resource)
     end
 
     private

data/lib/taskjuggler/Tj3AppBase.rb

@@ -18,15 +18,15 @@ require 'taskjuggler/Tj3Config'
 require 'taskjuggler/RuntimeConfig'
 require 'taskjuggler/TjTime'
 require 'taskjuggler/TextFormatter'
+require 'taskjuggler/MessageHandler'
 require 'taskjuggler/Log'
 
 class TaskJuggler
 
-  class TjRuntimeError < RuntimeError
-  end
-
   class Tj3AppBase
 
+    include MessageHandler
+
     def initialize
       # Indent and width of options. The deriving class may has to change
       # this.
@@ -42,6 +42,9 @@ class TaskJuggler
       # the terminal output. Additionally, we have the --no-color option to
       # force colors off in case this does not work properly.
       Term::ANSIColor.coloring = STDOUT.tty?
+
+      # Make sure the MessageHandler is set to default values.
+      MessageHandlerInstance.instance.reset
     end
 
     def processArguments(argv)
@@ -66,6 +69,7 @@ class TaskJuggler
       @opts.on('--silent',
                format("Don't show program and progress information")) do
         @silent = true
+        MessageHandlerInstance.instance.outputLevel = :warning
         TaskJuggler::Log.silent = true
       end
       @opts.on('--no-color',
@@ -97,7 +101,7 @@ EOT
         files = @opts.parse(argv)
       rescue OptionParser::ParseError => msg
         puts @opts.to_s + "\n"
-        error(msg.message, 2)
+        error('tj3app_bad_cmd_options', msg.message)
       end
 
       files
@@ -106,15 +110,21 @@ EOT
     def main(argv = ARGV)
       if Gem::Version.new(RUBY_VERSION.dup) <
          Gem::Version.new(@mininumRubyVersion)
-        error('This program requires at least Ruby version ' +
+        error('tj3app_ruby_version',
+              'This program requires at least Ruby version ' +
               "#{@mininumRubyVersion}!")
       end
 
       # Install signal handler to exit gracefully on CTRL-C.
       intHandler = Kernel.trap('INT') do
-        error("Aborting on user request!")
+        begin
+          fatal('tj3app_user_abort', "Aborting on user request!")
+        rescue RuntimeError
+          exit 1
+        end
       end
 
+      retVal = 0
       begin
         args = processArguments(argv)
 
@@ -132,19 +142,33 @@ EOT
 
         @rc = RuntimeConfig.new(AppConfig.packageName, @configFile)
 
-        appMain(args)
+        begin
+          MessageHandlerInstance.instance.trapSetup = true
+          retVal = appMain(args)
+          MessageHandlerInstance.instance.trapSetup = false
+        rescue TjRuntimeError
+          # We have hit a sitatuation that we can't recover from. A message
+          # was severed via the MessageHandler to inform the user and we now
+          # abort the program.
+          return 1
+        end
+
       rescue Exception => e
         if e.is_a?(SystemExit) || e.is_a?(Interrupt)
           # Don't show backtrace on user interrupt unless we are in debug mode.
           $stderr.puts e.backtrace.join("\n") if $DEBUG
           1
         else
-          error("Ups, you have triggered a bug in #{AppConfig.softwareName}!\n" +
-                "#{e}\n" +
-                e.backtrace.join("\n") +
-                "Please see the user manual on how to get this bug fixed!")
+          fatal('crash_trap', "#{e}\n#{e.backtrace.join("\n")}\n\n" +
+                "#{'*' * 79}\nYou have triggered a bug in " +
+                "#{AppConfig.softwareName} version #{AppConfig.version}!\n" +
+                "Please see the user manual on how to get this bug fixed!\n" +
+                "#{'*' * 79}\n")
         end
       end
+
+      # Exit value in case everything was fine.
+      retVal
     end
 
     private
@@ -153,11 +177,6 @@ EOT
       exit 0
     end
 
-    def error(message, exitVal = 1)
-      $stderr.puts "\nERROR: #{message}"
-      exit exitVal
-    end
-
     def format(str, indent = nil)
       indent = @optsSummaryWidth + @optsSummaryIndent + 1 unless indent
       TextFormatter.new(79, indent).format(str)[indent..-1]

data/lib/taskjuggler/Tj3Config.rb

@@ -14,7 +14,7 @@
 require 'taskjuggler/UTF8String'
 require 'taskjuggler/AppConfig'
 
-AppConfig.version = '3.1.0'
+AppConfig.version = '3.2.0'
 AppConfig.packageName = 'taskjuggler'
 AppConfig.softwareName = 'TaskJuggler'
 AppConfig.packageInfo = 'A Project Management Software'

data/lib/taskjuggler/TjpSyntaxRules.rb

@@ -109,7 +109,8 @@ EOT
     })
     level(:beta)
     doc('accountreport', <<'EOT'
-The report lists accounts and their respective values in a table. The report can operate in two modes:
+The report lists accounts and their respective values in a table. The report
+can operate in two modes:
 
 # Balance mode: If a [[balance]] has been set, the report will include the
 defined cost and revenue accounts as well as all their sub accounts. To reduce
@@ -416,6 +417,15 @@ EOT
     })
   end
 
+  def rule_allOrNone
+    pattern(%w( _all ), lambda {
+      1
+    })
+    pattern(%w( _none ), lambda {
+      0
+    })
+  end
+
   def rule_argument
     singlePattern('$ABSOLUTE_ID')
     singlePattern('!date')
@@ -695,9 +705,7 @@ EOT
 
   def rule_columnId
     pattern(%w( !reportableAttributes ), lambda {
-      title = TableReport.defaultColumnTitle(@val[0]) ||
-              @project.attributeName(@val[0])
-      @column = TableColumnDefinition.new(@val[0], title)
+      @column = TableColumnDefinition.new(@val[0], columnTitle(@val[0]))
     })
     doc('columnid', <<'EOT'
 This is a comprehensive list of all pre-defined [[columns]]. In addition to
@@ -896,7 +904,9 @@ EOT
       @val[0]
     })
     doc('date', <<'EOT'
-A DATE is an ISO-compliant date in the format
+A DATE is date and time specification similar to the ISO 8601 date format.
+Instead of the hard to read ISO notation with a ''''T'''' between the date and
+time sections, we simply use the more intuitive and easier to read dash:
 ''''<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
@@ -908,7 +918,10 @@ 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.
+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}
 
@@ -1952,7 +1965,8 @@ the journal report.
 EOT
        )
     allOrNothingListRule('journalReportAttributesList',
-                         { 'author' => 'Include the author if known',
+                         { 'alert' => 'Include the alert status',
+                           'author' => 'Include the author if known',
                            'date' => 'Include the date',
                            'details' => 'Include the details',
                            'flags' => 'Include the flags',
@@ -2187,7 +2201,6 @@ periods that are partially outside of the project period only the part inside
 the project period will be considered.
 EOT
        )
-    level(:beta)
     example('Leave')
   end
 
@@ -2441,6 +2454,9 @@ EOT
     pattern(%w( !operation ), lambda {
       LogicalExpression.new(@val[0], sourceFileInfo)
     })
+    pattern(%w( _@ !allOrNone ), lambda {
+      LogicalOperation.new(@val[1])
+    })
     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
@@ -2460,7 +2476,7 @@ concept of operator precedence or right-left associativity. This may change in
 the future.
 
 An operand can also be just a number. 0 evaluates to false, all other numbers
-to true.
+to true. The logical expression can also be the special constants ''''@all'''' or ''''@none''''. The first always evaluates to true, the latter to false.
 EOT
        )
     also(%w( functions ))
@@ -2809,10 +2825,12 @@ EOT
     arg(0, 'operand', <<'EOT'
 An operand can consist of a date, a text string, a [[functions|function]], a
 property attribute or a numerical value. It can also be the name of a declared
-flag. Use the ''''scenario_id.attribute'''' notation to use an attribute of the
-currently evaluated property. The scenario ID always has to be specified, also
-for non-scenario specific attributes. This is necessary to distinguish them
-from flags.
+flag.  Use the ''''scenario_id.attribute'''' notation to use an attribute of
+the currently evaluated property. The scenario ID always has to be specified,
+also for non-scenario specific attributes. This is necessary to distinguish
+them from flags. See [[columnid]] for a list of available attributes. The use
+of list attributes is not recommended. User defined attributes are available
+as well.
 
 An operand can be a negated operand by prefixing a ~ charater or it can be
 another logical expression enclosed in braces.
@@ -3188,7 +3206,7 @@ EOT
 
   def rule_projectHeader
     pattern(%w( _project !optionalID $STRING !optionalVersion !interval ), lambda {
-      @project = Project.new(@val[1], @val[2], @val[3], @messageHandler)
+      @project = Project.new(@val[1], @val[2], @val[3])
       @project['start'] = @val[4].start
       @project['end'] = @val[4].end
       @projectId = @val[1]
@@ -3302,8 +3320,8 @@ EOT
     example('Caption', '2')
 
     pattern(%w( !balance ), lambda {
-      @project['costAccount'] = @val[0][0]
-      @project['revenueAccount'] = @val[0][1]
+      @project['costaccount'] = @val[0][0]
+      @project['revenueaccount'] = @val[0][1]
     })
 
     pattern(%w( _flags !declareFlagList ), lambda {
@@ -3390,11 +3408,8 @@ EOT
     pattern(%w( !task ))
     pattern(%w( !timeSheet ))
     pattern(%w( _vacation !vacationName !intervals ), lambda {
-      begin
-        @val[2].each do |interval|
-          @project['leaves'] << Leave.new(:holiday, interval)
-        end
-      rescue AttributeOverwrite
+      @val[2].each do |interval|
+        @project['leaves'] << Leave.new(:holiday, interval)
       end
     })
     doc('vacation', <<'EOT'
@@ -3494,9 +3509,18 @@ EOT
     pattern(%w( !resourceReport ))
     pattern(%w( !taskReport ))
     pattern(%w( !textReport ))
+    pattern(%w( !traceReport ))
   end
 
   def rule_reportableAttributes
+    singlePattern('_activetasks')
+    descr(<<'EOT'
+The number of sub-tasks (including the current task) that are active in the
+reported time period. Active means that they are ongoing at the current time
+or [[now]] date.
+EOT
+         )
+
     singlePattern('_annualleave')
     descr(<<'EOT'
 The number of annual leave units within the reported time period. The unit
@@ -3552,6 +3576,14 @@ 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('_closedtasks')
+    descr(<<'EOT'
+The number of sub-tasks (including the current task) that have been closed
+during the reported time period.  Closed means that they have and end date
+before the current time or [[now]] date.
 EOT
          )
 
@@ -3594,7 +3626,7 @@ EOT
     descr(<<'EOT'
 The resources that have this resource assigned as manager.
 
-The list can be customized by the [listitem.column listitem] attribute.
+The list can be customized by the [[listitem.column|listitem]] attribute.
 EOT
          )
 
@@ -3636,7 +3668,7 @@ symbols are used for <nowiki><dep></nowiki>.
 * '''<nowiki>]->]</nowiki>''': End-to-End dependency
 * '''<nowiki>[->]</nowiki>''': Start-to-End dependency
 
-The list can be customized by the [listitem.column listitem] attribute.
+The list can be customized by the [[listitem.column|listitem]] attribute.
 The dependency symbol can be generated via the ''''dependency'''' attribute
 inthe query, the target date via the ''''date'''' attribute.
 EOT
@@ -3706,7 +3738,7 @@ A list of milestones that are a prerequiste for the current task. For
 container tasks it will also include the inputs of the child tasks. Inputs may
 not have any predecessors.
 
-The list can be customized by the [listitem.column listitem] attribute.
+The list can be customized by the [[listitem.column|listitem]] attribute.
 EOT
          )
 
@@ -3742,7 +3774,7 @@ EOT
     descr(<<'EOT'
 A list of managers that the resource reports to.
 
-The list can be customized by the [listitem.column listitem] attribute.
+The list can be customized by the [[listitem.column|listitem]] attribute.
 EOT
         )
 
@@ -3770,6 +3802,14 @@ EOT
     singlePattern('_note')
     descr('The note attached to a task')
 
+    singlePattern('_opentasks')
+    descr(<<'EOT'
+The number of sub-tasks (including the current task) that have not yet been
+closed during the reported time period. Closed means that they have and end
+date before the current time or [[now]] date.
+EOT
+         )
+
     singlePattern('_pathcriticalness')
     descr('The criticalness of the task with respect to all the paths that ' +
           'it is a part of.')
@@ -3785,7 +3825,7 @@ are used
 * '''<nowiki>]->]</nowiki>''': End-to-End dependency
 * '''<nowiki>[->]</nowiki>''': Start-to-End dependency
 
-The list can be customized by the [listitem.column listitem] attribute.
+The list can be customized by the [[listitem.column|listitem]] attribute.
 The dependency symbol can be generated via the ''''dependency'''' attribute
 inthe query, the target date via the ''''date'''' attribute.
 EOT
@@ -3804,7 +3844,7 @@ EOT
     descr(<<'EOT'
 All resources that have this resource assigned as a direct or indirect manager.
 
-The list can be customized by the [listitem.column listitem] attribute.
+The list can be customized by the [[listitem.column|listitem]] attribute.
 EOT
          )
 
@@ -3812,7 +3852,7 @@ EOT
     descr(<<'EOT'
 A list of resources that are assigned to the task in the report time frame.
 
-The list can be customized by the [listitem.column listitem] attribute.
+The list can be customized by the [[listitem.column|listitem]] attribute.
 EOT
          )
 
@@ -3820,7 +3860,7 @@ EOT
     descr(<<'EOT'
 The responsible people for this task.
 
-The list can be customized by the [listitem.column listitem] attribute.
+The list can be customized by the [[listitem.column|listitem]] attribute.
 EOT
          )
 
@@ -3867,7 +3907,7 @@ A list of milestones that depend on the current task. For container tasks it
 will also include the targets of the child tasks. Targets may not have any
 follower tasks.
 
-The list can be customized by the [listitem.column listitem] attribute.
+The list can be customized by the [[listitem.column|listitem]] attribute.
 EOT
          )
 
@@ -3903,7 +3943,7 @@ EOT
               "#{@val[1].fullId} is not a container account",
               @sourceFileInfo[1])
       end
-      @property.set('accountRoot', @val[1])
+      @property.set('accountroot', @val[1])
     })
     doc('accountroot', <<'EOT'
 Only accounts below the specified root-level accounts are exported. The exported
@@ -3915,8 +3955,8 @@ EOT
     example('AccountReport')
 
     pattern(%w( !balance ), lambda {
-      @property.set('costAccount', @val[0][0])
-      @property.set('revenueAccount', @val[0][1])
+      @property.set('costaccount', @val[0][0])
+      @property.set('revenueaccount', @val[0][1])
     })
 
     pattern(%w( _caption $STRING ), lambda {
@@ -4006,6 +4046,24 @@ EOT
     pattern(%w( !hideaccount ))
     pattern(%w( !hideresource ))
     pattern(%w( !hidetask ))
+
+    pattern(%w( _height $INTEGER ), lambda {
+      if @val[1] < 200
+        error('min_report_height',
+              "The report must have a minimum height of 200 pixels.")
+      end
+      @property.set('height', @val[1])
+    })
+    doc('height', <<'EOT'
+Set the height of the report in pixels. This attribute is only used for
+reports that cannot determine the height based on the content. Such report can
+be freely resized to fit in. The vast majority of reports can determine their
+height based on the provided content. These reports will simply ignore this
+setting.
+EOT
+       )
+    also('width')
+
     pattern(%w( !journalReportAttributes ))
     pattern(%w( _journalmode !journalReportMode ), lambda {
       @property.set('journalMode', @val[1])
@@ -4110,7 +4168,7 @@ EOT
               "#{@val[1].fullId} is not a group resource",
               @sourceFileInfo[1])
       end
-      @property.set('resourceRoot', @val[1])
+      @property.set('resourceroot', @val[1])
     })
     doc('resourceroot', <<'EOT'
 Only resources below the specified root-level resources are exported. The
@@ -4127,7 +4185,7 @@ EOT
               "#{@val[1].fullId} is not a container task",
               @sourceFileInfo[1])
       end
-      @property.set('taskRoot', @val[1])
+      @property.set('taskroot', @val[1])
     })
     doc('taskroot', <<'EOT'
 Only tasks below the specified root-level tasks are exported. The exported
@@ -4154,6 +4212,23 @@ EOT
        )
 
     pattern(%w( !reportTitle ))
+
+    pattern(%w( _width $INTEGER ), lambda {
+      if @val[1] < 400
+        error('min_report_width',
+              "The report must have a minimum width of 400 pixels.")
+      end
+      @property.set('width', @val[1])
+    })
+    doc('width', <<'EOT'
+Set the width of the report in pixels. This attribute is only used for
+reports that cannot determine the width based on the content. Such report can
+be freely resized to fit in. The vast majority of reports can determine their
+width based on the provided content. These reports will simply ignore this
+setting.
+EOT
+       )
+    also('height')
   end
 
   def rule_reportEnd
@@ -4418,8 +4493,9 @@ sorting, the parent resources will always be included to form the tree.
 Tree sorting is the default. You need to change it if you do not want certain
 parent resources to be included in the report.
 
-The tasks that the resources are allocated to can be included as well. Use the
-[[hidetask]] attribute for this.
+By default, all the tasks that the resources are allocated to are hidden, but
+they can be listed as well. Use the [[hidetask]] attribute to select which
+tasks should be included.
 EOT
        )
   end
@@ -4428,7 +4504,7 @@ EOT
     pattern(%w( _resourcereport !optionalID !reportName ), lambda {
       newReport(@val[1], @val[2], :resourcereport, @sourceFileInfo[0])
 
-      if @property.modified?('columns')
+      unless @property.modified?('columns')
         # Set the default columns for this report.
         %w( no name ).each do |col|
           @property.get('columns') <<
@@ -4603,12 +4679,12 @@ EOT
         )
 
     pattern(%w( _vacation !vacationName !intervals ), lambda {
-      begin
-        @val[2].each do |interval|
+      @val[2].each do |interval|
+        begin
           # We map the old 'vacation' attribute to public holidays.
-          @property['leaves', @scenarioIdx] << Leave.new(:holiday, interval)
+          @property['leaves', @scenarioIdx] += [ Leave.new(:holiday, interval) ]
+        rescue AttributeOverwrite
         end
-      rescue AttributeOverwrite
       end
     })
     doc('vacation.resource', <<'EOT'
@@ -4943,12 +5019,12 @@ EOT
        )
 
     pattern(%w( _vacation !vacationName !intervalsOptional ), lambda {
-      begin
-        @val[2].each do |interval|
+      @val[2].each do |interval|
+        begin
           # We map the old 'vacation' attribute to public holidays.
-          @property['leaves', @scenarioIdx] << Leave.new(:holiday, interval)
+          @property['leaves', @scenarioIdx] += [ Leave.new(:holiday, interval) ]
+        rescue AttributeOverwrite
         end
-      rescue AttributeOverwrite
       end
     })
     doc('vacation.shift', <<'EOT'
@@ -5719,8 +5795,9 @@ will always 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. Use the
-[[hideresource]] attribute for this.
+By default, all the resources that are allocated to each task are hidden, but
+they can be listed as well. Use the [[hideresource]] attribute to select which
+resources should be included.
 EOT
        )
     example('HtmlTaskReport')
@@ -6632,6 +6709,107 @@ EOT
        )
   end
 
+  def rule_traceReport
+    pattern(%w( !traceReportHeader !reportBody ), lambda {
+      @property = @property.parent
+    })
+    doc('tracereport', <<'EOT'
+The trace report works noticeably different than all other TaskJuggler
+reports. It uses a CSV file to track the values of the selected attributes.
+Each time ''''tj3'''' is run with the ''''--add-trace'''' option, a new set of
+values is appended to the CSV file. The first column of the CSV file holds the
+date when the snapshot was taken. This is either the current date or the
+''''now'''' date if provided. There is no need to specify CSV as output format
+for the report. You can either use these tracked values directly by specifying other report formats or by importing the CSV file into another program.
+
+The first column always contains the current date when that
+table row was added. All subsequent columns can be defined by the user with
+the [[columns]] attribute. This column set is then repeated for all properties
+that are not hidden by [[hideaccount]], [[hideresource]] and [[hidetask]]. By
+default, all properties are excluded. You must provide at least one of the
+''''hide...'''' attributes to select the properties you want to have included
+in the report. Please be aware that total number of columns is the product of
+attributes defined with [[columns]] times the number of included properties.
+Select you values carefully or you will end up with very large reports.
+
+The column headers can be customized by using the [[title.column|title]]
+attribute.  When you include multiple properties, these headers are not unique
+unless you include mini-queries to modify them based on the property they
+colum is represeting.  You can use the queries
+''''<nowiki><-id-></nowiki>'''', ''''<nowiki><-name-></nowiki>'''',
+''''<nowiki><-scenario-></nowiki>'''' and
+''''<nowiki><-attribute-></nowiki>''''. ''''<nowiki><-id-></nowiki>'''' is
+replaced with the ID of the property, ''''<nowiki><-name-></nowiki>'''' with
+the name and so on.
+
+You can change the set of tracked values over time. Old values will be
+preserved and the corresponding columns will be the last ones in the CSV file.
+
+When other formats are requested, the CSV file is read in and a report that
+shows the tracked values over time will be generated. The CSV file may contain
+all kinds of values that are being tracked. Report formats that don't support
+a mix of different values will just show the values of the second column.
+
+The HTML version generates SVG graphs that are embedded in the HTML page.
+These graphs are only visble if the web browser supports HTML5. This is true
+for the latest generation of browsers, but older browsers may not support this
+format.
+EOT
+       )
+    example('TraceReport')
+  end
+
+  def rule_traceReportHeader
+    pattern(%w( _tracereport !optionalID !reportName ), lambda {
+      newReport(@val[1], @val[2], :tracereport, @sourceFileInfo[0])
+
+      # The top-level always inherits the global timeFormat setting. This is
+      # not desireable in this case, so we ignore this.
+      if (@property.level == 0 && !@property.provided('timeFormat')) ||
+         (@property.level > 0 && !@property.modified?('timeFormat'))
+        # CSV readers such of Libre-/OpenOffice can't deal with time zones. We
+        # probably also don't need seconds.
+        @property.set('timeFormat', '%Y-%m-%d-%H:%M')
+      end
+      unless @property.modified?('columns')
+        # Set the default columns for this report.
+        %w( end ).each do |col|
+          @property.get('columns') <<
+          TableColumnDefinition.new(col, columnTitle(col))
+        end
+      end
+      # Hide all accounts.
+      unless @property.modified?('hideAccount')
+        @property.set('hideAccount',
+                      LogicalExpression.new(LogicalOperation.new(1)))
+      end
+      unless @property.modified?('sortAccounts')
+        @property.set('sortAccounts',
+                      [ [ 'tree', true, -1 ],
+                        [ 'seqno', true, -1 ] ])
+      end
+      # Show all tasks, sorted by tree, start-up, seqno-up.
+      unless @property.modified?('hideTask')
+        @property.set('hideTask',
+                      LogicalExpression.new(LogicalOperation.new(0)))
+      end
+      unless @property.modified?('sortTasks')
+        @property.set('sortTasks',
+                      [ [ 'tree', true, -1 ],
+                        [ 'start', true, 0 ],
+                        [ 'seqno', true, -1 ] ])
+      end
+      # Show no resources, but set sorting to id-up.
+      unless @property.modified?('hideResource')
+        @property.set('hideResource',
+                      LogicalExpression.new(LogicalOperation.new(1)))
+      end
+      unless @property.modified?('sortResources')
+        @property.set('sortResources', [ [ 'id', true, -1 ] ])
+      end
+    })
+  end
+
   def rule_tsNewTaskHeader
     pattern(%w( _newtask !taskIdUnverifd $STRING ), lambda {
       @timeSheetRecord = TimeSheetRecord.new(@timeSheet, @val[1])
@@ -6670,9 +6848,12 @@ EOT
     repeatable
 
     pattern(%w( !hideresource ))
+    pattern(%w( !hidetask ))
     pattern(%w( !reportEnd ))
     pattern(%w( !reportPeriod ))
     pattern(%w( !reportStart ))
+    pattern(%w( !sortResources ))
+    pattern(%w( !sortTasks ))
   end
 
   def rule_tsReportBody
@@ -7053,7 +7234,6 @@ EOT
         unless (wh = @property['workinghours', @scenarioIdx])
           # The property does not have it's own WorkingHours yet.
           wh = WorkingHours.new(@project['workinghours'])
-          @property['workinghours', @scenarioIdx] = wh
         end
       end
       wh.timezone = @project['timezone']
@@ -7062,6 +7242,16 @@ EOT
       rescue
         error('bad_workinghours', $!.message)
       end
+
+      if @property
+        # Make sure we actually assign something so the attribute is marked as
+        # set by the user.
+        begin
+          @property['workinghours', @scenarioIdx] = wh
+        rescue AttributeOverwrite
+          # Working hours can be set multiple times.
+        end
+      end
     })
   end