taskjuggler 0.0.8 → 0.0.9

data/lib/TextFormatter.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextElement.rb -- The TaskJuggler III Project Management Software
+# = TextFormatter.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TextParser.rb

@@ -3,7 +3,8 @@
 #
 # = TextParser.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -383,7 +384,11 @@ class TaskJuggler
         @val = stackEntry.val
         @sourceFileInfo = stackEntry.sourceFileInfo
         # Now call the pattern action to compute the value of the pattern.
-        result = state.pattern.function.call
+        begin
+          result = state.pattern.function.call
+        rescue AttributeOverwrite
+          @scanner.warning('attr_overwrite', $!.to_s)
+        end
       end
 
       # We use the SourceFileInfo of the first token of the pattern to store

data/lib/TextParser/Pattern.rb

@@ -3,7 +3,8 @@
 #
 # = Pattern.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TextParser/Rule.rb

@@ -3,7 +3,8 @@
 #
 # = Rule.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TextParser/StackElement.rb

@@ -3,7 +3,8 @@
 #
 # = StackElement.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TextParser/State.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = Rule.rb -- The TaskJuggler III Project Management Software
+# = State.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TextParser/TokenDoc.rb

@@ -3,7 +3,8 @@
 #
 # = TokenDoc.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TextScanner.rb

@@ -3,7 +3,8 @@
 #
 # = TextScanner.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -262,10 +263,10 @@ class TaskJuggler
     def open(fileNameIsBuffer = false)
       @fileNameIsBuffer = fileNameIsBuffer
       if fileNameIsBuffer
-        @fileStack = [ [ @cf = BufferStreamHandle.new(@masterFile), nil ] ]
+        @fileStack = [ [ @cf = BufferStreamHandle.new(@masterFile), nil, nil ] ]
       else
         begin
-          @fileStack = [ [ @cf = FileStreamHandle.new(@masterFile), nil ] ]
+          @fileStack = [ [ @cf = FileStreamHandle.new(@masterFile), nil, nil ] ]
         rescue StandardError
           error('open_file', "Cannot open file #{@masterFile}")
         end
@@ -288,7 +289,7 @@ class TaskJuggler
     # this file is finished, we will continue in the old file after the
     # location where we started with the new file. The method returns the full
     # qualified name of the included file.
-    def include(includeFileName, sfi)
+    def include(includeFileName, sfi, &block)
       if includeFileName[0] != '/'
         pathOfCallingFile = @fileStack.last[0].dirname
         path = pathOfCallingFile.empty? ? '' : pathOfCallingFile + '/'
@@ -313,7 +314,8 @@ class TaskJuggler
 
       # Open the new file and push the handle on the @fileStack.
       begin
-        @fileStack << [ (@cf = FileStreamHandle.new(includeFileName)), nil, ]
+        @fileStack << [ (@cf = FileStreamHandle.new(includeFileName)),
+                        nil, block ]
         Log << "Parsing file #{includeFileName}"
       rescue StandardError
         error('bad_include', "Cannot open include file #{includeFileName}", sfi)
@@ -364,6 +366,11 @@ class TaskJuggler
         # @fileStack.
         @finishLastFile = false
         #Log << "Completed file #{@cf.fileName}"
+
+        # If we have a block to be executed on EOF, we call it now.
+        onEof = @fileStack.last[2]
+        onEof.call if onEof
+
         @cf.close if @cf
         @fileStack.pop
 

data/lib/TimeSheetReceiver.rb

@@ -3,7 +3,8 @@
 #
 # = TimeSheetReceiver.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TimeSheetSender.rb

@@ -3,7 +3,8 @@
 #
 # = TimeSheetSender.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TimeSheetSummary.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = TimeSheetSender.rb -- The TaskJuggler III Project Management Software
+# = TimeSheetSummary.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TimeSheets.rb

@@ -3,7 +3,8 @@
 #
 # = TimeSheets.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/Tj3AppBase.rb

@@ -3,7 +3,8 @@
 #
 # = Tj3AppBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -39,8 +40,8 @@ class TaskJuggler
 
       @opts.banner = "#{AppConfig.softwareName} v#{AppConfig.version} - " +
                      "#{AppConfig.packageInfo}\n\n" +
-                     "Copyright (c) #{AppConfig.copyright.join(', ')}" +
-                     " by #{AppConfig.authors.join(', ')}\n\n" +
+                     "Copyright (c) #{AppConfig.copyright.join(', ')}\n" +
+                     "              by #{AppConfig.authors.join(', ')}\n\n" +
                      "#{AppConfig.license}\n" +
                      "For more info about #{AppConfig.softwareName} see " +
                      "#{AppConfig.contact}\n\n" +
@@ -98,8 +99,8 @@ class TaskJuggler
       unless @silent
         puts "#{AppConfig.softwareName} v#{AppConfig.version} - " +
              "#{AppConfig.packageInfo}\n\n" +
-             "Copyright (c) #{AppConfig.copyright.join(', ')}" +
-             " by #{AppConfig.authors.join(', ')}\n\n" +
+             "Copyright (c) #{AppConfig.copyright.join(', ')}\n" +
+             "              by #{AppConfig.authors.join(', ')}\n\n" +
              "#{AppConfig.license}\n"
       end
 

data/lib/Tj3Config.rb

@@ -3,7 +3,8 @@
 #
 # = Tj3Config.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -13,12 +14,12 @@
 require 'UTF8String'
 require 'AppConfig'
 
-AppConfig.version = '0.0.8'
+AppConfig.version = '0.0.9'
 AppConfig.packageName = 'taskjuggler'
 AppConfig.softwareName = 'TaskJuggler III'
 AppConfig.packageInfo = 'A Project Management Software'
-AppConfig.copyright = [ (2006..2010).to_a ]
-AppConfig.authors = [ 'Chris Schlaeger <cs(a)kde.org>' ]
+AppConfig.copyright = [ (2006..2011).to_a ]
+AppConfig.authors = [ 'Chris Schlaeger <chris@linux.com>' ]
 AppConfig.contact = 'http://www.taskjuggler.org'
 AppConfig.license = <<'EOT'
 This program is free software; you can redistribute it and/or modify it under

data/lib/Tj3SheetAppBase.rb

@@ -3,7 +3,8 @@
 #
 # = Tj3SheetAppBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TjException.rb

@@ -3,7 +3,8 @@
 #
 # = TjException.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TjTime.rb

@@ -3,7 +3,8 @@
 #
 # = TjTime.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/TjpExample.rb

@@ -3,7 +3,8 @@
 #
 # = TjpExample.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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,8 @@
 #
 # = TjpSyntaxRules.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -129,8 +130,12 @@ EOT
     pattern(%w( _allocate !allocations ), lambda {
       checkContainer('allocate')
       # Don't use << operator here so the 'provided' flag gets set properly.
-      @property['allocate', @scenarioIdx] =
-        @property['allocate', @scenarioIdx] + @val[1]
+      begin
+        @property['allocate', @scenarioIdx] =
+          @property['allocate', @scenarioIdx] + @val[1]
+      rescue AttributeOverwrite
+        # Adding multiple allocates for a task is a pretty common idiom.
+      end
     })
     doc('allocate', <<'EOT'
 Specify which resources should be allocated to the task. The
@@ -617,6 +622,27 @@ Specifies the horizontal alignment of the cell content. The logical expression
 specifies for which cells the alignment setting should be used. If multiple
 halign patterns are provided for a column, the first matching one is used for
 each cell.
+EOT
+       )
+
+    pattern(%w( _listmode $INTEGER ), lambda {
+      @column.listMode = @val[1]
+    })
+    also(%w( listtype.column ))
+    doc('listmode.column', <<'EOT'
+Specifies how the list items look like. The result of this setting depends on
+the actual column. Please refer to the [columnid|documentation for the
+specific column] to learn more about the effect that this setting has.
+EOT
+       )
+
+    pattern(%w( _listtype !listType ), lambda {
+      @column.listType = @val[1]
+    })
+    also(%w( listmode.column ))
+    doc('listtype.column', <<'EOT'
+Specifies what type of list should be used. This attribute only affects
+columns that contain a list of items.
 EOT
        )
 
@@ -1035,7 +1061,11 @@ EOT
 
   def rule_fail
     pattern(%w( _fail !logicalExpression ), lambda {
-      @property['fail', @scenarioIdx] = @val[1]
+      begin
+        @property['fail', @scenarioIdx] =
+          @property['fail', @scenarioIdx] + [ @val[1] ]
+      rescue AttributeOverwrite
+      end
     })
     doc('fail', <<'EOT'
 The fail attribute adds a logical expression to the property. The condition
@@ -1326,7 +1356,9 @@ EOT
               "You must declare the project header before you include other " +
               "files.")
       end
-      @project.inputFiles << @scanner.include(@val[0], @sourceFileInfo[0])
+      @project.inputFiles << @scanner.include(@val[0], @sourceFileInfo[0]) do
+        popFileStack
+      end
     })
   end
 
@@ -1350,8 +1382,9 @@ EOT
 
   def rule_includeProperties
     pattern(%w( !includeFileName !includeAttributes ), lambda {
-      popFileStack
-      @project.inputFiles << @scanner.include(@val[0], @sourceFileInfo[0])
+      @project.inputFiles << @scanner.include(@val[0], @sourceFileInfo[0]) do
+        popFileStack
+      end
     })
   end
 
@@ -1716,6 +1749,17 @@ EOT
     })
   end
 
+  def rule_listType
+    pattern([ '_bullets' ], lambda { :bullets })
+    descr('List items as bullet list')
+
+    pattern([ '_comma' ], lambda { :comma })
+    descr('List items as comma separated list')
+
+    pattern([ '_numbered' ], lambda { :numbered })
+    descr('List items as numbered list')
+  end
+
   def rule_loadunit
     pattern([ '_days' ], lambda { :days })
     descr('Display all load and duration values as days.')
@@ -1935,6 +1979,16 @@ EOT
     pattern(%w( !reportPeriod ))
     pattern(%w( !reportStart ))
     pattern(%w( !reportTitle ))
+    pattern(%w( _timeoff $STRING $STRING ), lambda {
+      @property.set('timeOffId', @val[1])
+      @property.set('timeOffName', @val[2])
+    })
+    doc('timeoff.nikureport', <<EOF
+Set the Clarity project ID and name that the vacation time will be reported to.
+EOF
+       )
+    arg(1, 'ID', 'The Clarity project ID')
+    arg(2, 'Name', 'The Clarity project name')
   end
 
   def rule_nikuReportBody
@@ -2063,6 +2117,9 @@ EOT
     pattern(%w( $INTEGER ), lambda {
       LogicalOperation.new(@val[0])
     })
+    pattern(%w( $FLOAT ), lambda {
+      LogicalOperation.new(@val[0])
+    })
     pattern(%w( $STRING ), lambda {
       LogicalOperation.new(@val[0])
     })
@@ -2469,9 +2526,7 @@ EOT
   end
 
   def rule_projectBodyInclude
-    pattern(%w( _include !includeFile !projectBodyAttributes . ), lambda {
-      popFileStack
-    })
+    pattern(%w( _include !includeFile !projectBodyAttributes . ))
     lastSyntaxToken(1)
     doc('include.project', <<'EOT'
 Includes the specified file name as if its contents would be written
@@ -2489,9 +2544,7 @@ EOT
   end
 
   def rule_prologInclude
-    pattern(%w( _include !includeFile !projectProlog . ), lambda {
-      popFileStack
-    })
+    pattern(%w( _include !includeFile !projectProlog . ))
     lastSyntaxToken(1)
     doc('include.macro', <<'EOT'
 Includes the specified file name as if its contents would be written
@@ -2607,16 +2660,20 @@ task or resource is split over several files. E. g. the vacation dates for the
 resources may be in a separate file that was generated by some other tool.
 EOT
        )
+    example('Supplement')
 
     pattern(%w( !task ))
     pattern(%w( !timeSheet ))
     pattern(%w( !timeSheetReport ))
     pattern(%w( _vacation !vacationName !intervals ), lambda {
-      @project['vacations'] = @project['vacations'] + @val[2]
+      begin
+        @project['vacations'] = @project['vacations'] + @val[2]
+      rescue AttributeOverwrite
+      end
     })
     doc('vacation', <<'EOT'
 Specify a global vacation period for all subsequently defined resources. A
-vacation can also be used to block out the time before a resource joint or
+vacation can also be used to block out the time before a resource joined or
 after it left. For employees changing their work schedule from full-time to
 part-time, or vice versa, please refer to the 'Shift' property.
 EOT
@@ -2674,11 +2731,7 @@ EOT
               "#{@val[1]} is not a list attribute. Only those can be purged.",
               @sourceFileInfo[1])
       end
-      if attributeDefinition.scenarioSpecific
-        @property[@val[1], @scenarioIdx] = attributeDefinition.default.dup
-      else
-        @property.set(@val[1], attributeDefinition.default.dup)
-      end
+      @property.getAttr(@val[1], @scenarioIdx).reset
     })
     doc('purge', <<'EOT'
 List attributes, like regular attributes, can inherit their values from the
@@ -2810,7 +2863,18 @@ EOT
     descr('A group of columns with one column for each day')
 
     singlePattern('_directreports')
-    descr('The resources that have this resource assigned as manager.')
+    descr(<<'EOT'
+The resources that have this resource assigned as manager.
+
+The list can be customized by the [listmode.column listmode] attribute. The
+following modes are supported:
+
+# ID
+# Name ''(This is the default)''
+# Name (ID)
+# ID: Name
+EOT
+         )
 
     singlePattern('_duration')
     descr('The duration of a task')
@@ -2843,12 +2907,28 @@ EOT
     descr(<<'EOT'
 A list of tasks that depend on the current task. The list contains the names,
 the IDs, the date and the type of dependency. For the type the following
-symbols are used
+symbols are used for <nowiki><dep></nowiki>.
 
 * '''<nowiki>]->[</nowiki>''': End-to-Start dependency
 * '''<nowiki>[->[</nowiki>''': Start-to-Start dependency
 * '''<nowiki>]->]</nowiki>''': End-to-End dependency
 * '''<nowiki>[->]</nowiki>''': Start-to-End dependency
+
+The list can be customized by the [listmode.column listmode] attribute. The
+following modes are supported:
+
+# ID <nowiki><dep></nowiki> Date
+# Name <nowiki><dep></nowiki> Date
+# Name (ID) <nowiki><dep></nowiki> Date
+# ID: Name <nowiki><dep></nowiki> Date
+# ID <nowiki><dep></nowiki>
+# Name <nowiki><dep></nowiki>
+# Name (ID) <nowiki><dep></nowiki>
+# ID: Name <nowiki><dep></nowiki>
+# ID
+# Name
+# Name (ID)
+# ID: Name
 EOT
          )
 
@@ -2916,6 +2996,20 @@ EOT
     singlePattern('_line')
     descr('The line number in the report')
 
+    singlePattern('_managers')
+    descr(<<'EOT'
+A list of managers that the resource reports to.
+
+The list can be customized by the [listmode.column listmode] attribute. The
+following modes are supported:
+
+# ID
+# Name ''(This is the default)''
+# Name (ID)
+# ID: Name
+EOT
+        )
+
     singlePattern('_maxend')
     descr('The latest allowed end of a task')
 
@@ -2945,7 +3039,7 @@ EOT
           'it is a part of.')
 
     singlePattern('_precursors')
-    descr(<<EOT
+    descr(<<'EOT'
 A list of tasks the current task depends on. The list contains the names, the
 IDs, the date and the type of dependency. For the type the following symbols
 are used
@@ -2954,6 +3048,22 @@ are used
 * '''<nowiki>[->[</nowiki>''': Start-to-Start dependency
 * '''<nowiki>]->]</nowiki>''': End-to-End dependency
 * '''<nowiki>[->]</nowiki>''': Start-to-End dependency
+
+The list can be customized by the [listmode.column listmode] attribute. The
+following modes are supported:
+
+# ID <nowiki><dep></nowiki> Date
+# Name <nowiki><dep></nowiki> Date
+# Name (ID) <nowiki><dep></nowiki> Date
+# ID: Name <nowiki><dep></nowiki> Date
+# ID <nowiki><dep></nowiki>
+# Name <nowiki><dep></nowiki>
+# Name (ID) <nowiki><dep></nowiki>
+# ID: Name <nowiki><dep></nowiki>
+# ID
+# Name
+# Name (ID)
+# ID: Name
 EOT
          )
 
@@ -2969,15 +3079,44 @@ EOT
     singlePattern('_reports')
     descr(<<'EOT'
 All resources that have this resource assigned as a direct or indirect manager.
+
+The list can be customized by the [listmode.column listmode] attribute. The
+following modes are supported:
+
+# ID
+# Name ''(This is the default)''
+# Name (ID)
+# ID: Name
 EOT
          )
 
     singlePattern('_resources')
-    descr('A list of resources that are assigned to the task in the report ' +
-          'time frame.')
+    descr(<<'EOT'
+A list of resources that are assigned to the task in the report time frame.
+
+The list can be customized by the [listmode.column listmode] attribute. The
+following modes are supported:
+
+# ID
+# Name ''(This is the default)''
+# Name (ID)
+# ID: Name
+EOT
+         )
 
     singlePattern('_responsible')
-    descr('The responsible people for this task')
+    descr(<<'EOT'
+The responsible people for this task.
+
+The list can be customized by the [listmode.column listmode] attribute. The
+following modes are supported:
+
+# ID
+# Name ''(This is the default)''
+# Name (ID)
+# ID: Name
+EOT
+         )
 
     singlePattern('_revenue')
     descr(<<'EOT'
@@ -3005,8 +3144,19 @@ EOT
     singlePattern('_targets')
     descr(<<'EOT'
 A list of milestones that depend on the current task. For container tasks it
-will also include the targets of the child tasks.  Usually the task name, the
-task ID and the start date will be listed.
+will also include the targets of the child tasks.
+
+The list can be customized by the [listmode.column listmode] attribute. The
+following modes are supported:
+
+# ID
+# Name
+# Name (ID)
+# ID: Name
+# ID (Date)
+# Name (Date) ''(This is the default)''
+# Name (ID) Date
+# ID: Name Date
 EOT
          )
 
@@ -3486,6 +3636,7 @@ resource is split over several files. E. g. the vacation dates for the
 resources may be in a separate file that was generated by some other tool.
 EOT
        )
+    example('Supplement', 'resource')
 
     # Other attributes will be added automatically.
   end
@@ -3583,9 +3734,9 @@ EOT
     doc('booking', <<'EOT'
 The booking attribute can be used to report completed work. This can be part
 of the necessary effort or the whole effort. When the scenario is scheduled in
-projection mode, TaskJuggler assumes that only the work reported with bookings
-has been done up to now. It then schedules a plan for the still missing
-effort. All task with bookings must be scheduled in ''''asap'''' mode.
+[[projection]] mode, TaskJuggler assumes that only the work reported with
+bookings has been done up to now. It then schedules a plan for the still
+missing effort. All task with bookings must be scheduled in ''''asap'''' mode.
 
 This attribute is also used within export reports to describe the details of a
 scheduled project.
@@ -3594,7 +3745,7 @@ The sloppy attribute can be used when you want to skip non-working time or
 other allocations automatically. If it's not given, all bookings must only
 cover working time for the resource.
 
-The booking attributes is intended to capture the exact amount of completed
+The booking attributes is designed to capture the exact amount of completed
 work. This attribute is not really intended to specify completed effort by
 hand. Usually, booking statements are generated by [[export]] reports. The
 [[sloppy.booking|sloppy]] and [[overtime.booking|overtime]] attributes are
@@ -3613,6 +3764,7 @@ EOT
 Set per-interval usage limits for the resource.
 EOT
        )
+    example('Limits-1', '6')
 
     pattern(%w( _managers !resourceList ), lambda {
       @property['managers', @scenarioIdx] =
@@ -3659,12 +3811,15 @@ EOT
         )
 
     pattern(%w( _vacation !vacationName !intervals ), lambda {
-      @property['vacations', @scenarioIdx] =
-        @property['vacations', @scenarioIdx ] + @val[2]
+      begin
+        @property['vacations', @scenarioIdx] =
+          @property['vacations', @scenarioIdx ] + @val[2]
+      rescue AttributeOverwrite
+      end
     })
     doc('vacation.resource', <<'EOT'
 Specify a vacation period for the resource. It can also be used to block out
-the time before a resource joint or after it left. For employees changing
+the time before a resource joined or after it left. For employees changing
 their work schedule from full-time to part-time, or vice versa, please refer
 to the 'Shift' property.
 EOT
@@ -3681,18 +3836,23 @@ EOT
       @property = @property.parent
     })
     doc('scenario', <<'EOT'
-Specifies the different project scenarios. A scenario that is nested into
-another one inherits all inheritable values from the enclosing scenario. There
-can only be one top-level scenario. It is usually called plan scenario. By
-default this scenario is pre-defined but can be overwritten with any other
-scenario. In this documenation each attribute is listed as scenario specific
-or not. A scenario specific attribute can be overwritten in a child scenario
-thereby creating a new, slightly different variant of the parent scenario.
-This can be helpful to do plan/actual comparisons if what-if-anlysises.
+Defines a new project scenario. By default, the project has only one scenario
+called ''''plan''''. To do plan vs. actual comparisons or to do a
+what-if-analysis, you can define a set of scenarios. There can only be one
+top-level scenario. Additional scenarios are either derived from this
+top-level scenario or other scenarios.
+
+Each nested scenario is a variation of the enclosing scenario. All scenarios
+share the same set of properties (task, resources, etc.) but the attributes
+that are listed as scenario specific may differ between the various
+scenarios. A nested scenario uses all attributes from the enclosing scenario
+unless the user has specified a different value for this attribute.
 
-By using bookings and enabling the projection mode you can capture the
-progress of your project and constantly get updated project plans for the
-future work.
+By default, the scheduler assigns resources to task beginning with the project
+start date. If the scenario is switched to projection mode, no assignments
+will be made prior to the current date or the date specified by [[now]]. In
+this case, TaskJuggler assumes, that all assignements prior to the
+current date have been provided by [[booking]] statements.
 EOT
        )
   end
@@ -3834,10 +3994,8 @@ EOT
   def rule_shiftAssignment
     pattern(%w( !shiftId !intervalsOptional ), lambda {
       # Make sure we have a ShiftAssignment for the property.
-      if @property['shifts', @scenarioIdx].nil?
-        @property['shifts', @scenarioIdx] = ShiftAssignments.new
-        @property['shifts', @scenarioIdx].project = @project
-      end
+      sa = @property['shifts', @scenarioIdx] || ShiftAssignments.new
+      sa.project = @project
 
       if @val[1].nil?
         intervals = [ Interval.new(@project['start'], @project['end']) ]
@@ -3845,16 +4003,20 @@ EOT
         intervals = @val[1]
       end
       intervals.each do |interval|
-        if !@property['shifts', @scenarioIdx].
-          addAssignment(ShiftAssignment.new(@val[0].scenario(@scenarioIdx),
-                                            interval))
+        if !sa.addAssignment(ShiftAssignment.new(@val[0].scenario(@scenarioIdx),
+                                                 interval))
           error('shift_assignment_overlap',
                 'Shifts may not overlap each other.',
                 @sourceFileInfo[0], @property)
         end
       end
       # Set same value again to set the 'provided' state for the attribute.
-      @property['shifts', @scenarioIdx] = @property['shifts', @scenarioIdx]
+      begin
+        @property['shifts', @scenarioIdx] = sa
+      rescue AttributeOverwrite
+        # Multiple shift assignments are a common idiom, so don't warn about
+        # them.
+      end
     })
   end
 
@@ -4351,6 +4513,7 @@ task is split over several files. E. g. the vacation dates for the
 resources may be in a separate file that was generated by some other tool.
 EOT
        )
+    example('Supplement', 'task')
 
     pattern(%w( !task ))
     pattern(%w( !taskScenarioAttributes ))
@@ -4635,7 +4798,10 @@ EOT
       checkContainer('depends')
       @property['depends', @scenarioIdx] =
         @property['depends', @scenarioIdx] + @val[1]
-      @property['forward', @scenarioIdx] = true
+      begin
+        @property['forward', @scenarioIdx] = true
+      rescue AttributeOverwrite
+      end
     })
     doc('depends', <<'EOT'
 Specifies that the task cannot start before the specified tasks have been
@@ -4649,6 +4815,8 @@ EOT
     pattern(%w( _duration !calendarDuration ), lambda {
       checkContainer('duration')
       @property['duration', @scenarioIdx] = @val[1]
+      @property['effort', @scenarioIdx] = 0
+      @property['length', @scenarioIdx] = 0
     })
     doc('duration', <<'EOT'
 Specifies the time the task should last. This is calendar time, not working
@@ -4656,7 +4824,8 @@ time. 7d means one week. If resources are specified they are allocated when
 available. Availability of resources has no impact on the duration of the
 task. It will always be the specified duration.
 
-Tasks may not have subtasks if this attribute is used.
+Tasks may not have subtasks if this attribute is used. Setting this attribute
+will reset the [[effort]] and [[length]] attributes.
 EOT
        )
     example('Durations')
@@ -4669,6 +4838,8 @@ EOT
               @sourceFileInfo[1], @property)
       end
       @property['effort', @scenarioIdx] = @val[1]
+      @property['duration', @scenarioIdx] = 0
+      @property['length', @scenarioIdx] = 0
     })
     doc('effort', <<'EOT'
 Specifies the effort needed to complete the task. An effort of 4d can be done
@@ -4681,7 +4852,8 @@ and resources. This is only true if the task can be partitioned without adding
 any overhead. For more information about this read ''The Mythical Man-Month'' by
 Frederick P. Brooks, Jr.
 
-Tasks may not have subtasks if this attribute is used.
+Tasks may not have subtasks if this attribute is used. Setting this attribute
+will reset the [[duration]] and [[length]] attributes.
 EOT
        )
     example('Durations')
@@ -4689,7 +4861,10 @@ EOT
 
     pattern(%w( _end !valDate ), lambda {
       @property['end', @scenarioIdx] = @val[1]
-      @property['forward', @scenarioIdx] = false
+      begin
+        @property['forward', @scenarioIdx] = false
+      rescue AttributeOverwrite
+      end
     })
     doc('end', <<'EOT'
 The end date of the task. When specified for the top-level (default) scenario
@@ -4726,6 +4901,8 @@ EOT
     pattern(%w( _length !workingDuration ), lambda {
       checkContainer('length')
       @property['length', @scenarioIdx] = @val[1]
+      @property['duration', @scenarioIdx] = 0
+      @property['effort', @scenarioIdx] = 0
     })
     doc('length', <<'EOT'
 Specifies the time the task occupies the resources. This is working time, not
@@ -4737,7 +4914,8 @@ has no impact on the duration of the task. A day where none of the specified
 resources is available is still considered a working day, if there is no
 global vacation or global working time defined.
 
-Tasks may not have subtasks if this attribute is used.
+Tasks may not have subtasks if this attribute is used. Setting this attribute
+will reset the [[duration]] and [[effort]] attributes.
 EOT
        )
     also(%w( duration effort ))
@@ -4750,6 +4928,7 @@ EOT
 Set per-interval allocation limits for the task. This setting affects all allocations for this task.
 EOT
        )
+    example('Limits-1', '2')
 
     pattern(%w( _maxend !valDate ), lambda {
       @property['maxend', @scenarioIdx] = @val[1]
@@ -4825,7 +5004,10 @@ EOT
       checkContainer('precedes')
       @property['precedes', @scenarioIdx] =
         @property['precedes', @scenarioIdx] + @val[1]
-      @property['forward', @scenarioIdx] = false
+      begin
+        @property['forward', @scenarioIdx] = false
+      rescue AttributeOverwrite
+      end
     })
     doc('precedes', <<'EOT'
 Specifies that the tasks with the specified IDs cannot start before the task
@@ -4871,7 +5053,11 @@ EOT
         error('unknown_projectid', "Unknown project ID #{@val[1]}",
               @sourceFileInfo[1])
       end
-      @property['projectid', @scenarioIdx] = @val[1]
+      begin
+        @property['projectid', @scenarioIdx] = @val[1]
+      rescue AttributeOverwrite
+        # This attribute always overwrites the implicitely provided ID.
+      end
     })
     doc('projectid.task', <<'EOT'
 In larger projects it may be desireable to work with different project IDs for
@@ -4912,9 +5098,15 @@ EOT
 
     pattern(%w( _scheduling !schedulingDirection ), lambda {
       if @val[1] == 'alap'
-        @property['forward', @scenarioIdx] = false
+        begin
+          @property['forward', @scenarioIdx] = false
+        rescue AttributeOverwrite
+        end
       elsif @val[1] == 'asap'
-        @property['forward', @scenarioIdx] = true
+        begin
+          @property['forward', @scenarioIdx] = true
+        rescue AttributeOverwrite
+        end
       end
     })
     doc('scheduling', <<'EOT'
@@ -4974,7 +5166,10 @@ EOT
 
     pattern(%w( _start !valDate), lambda {
       @property['start', @scenarioIdx] = @val[1]
-      @property['forward', @scenarioIdx] = true
+      begin
+        @property['forward', @scenarioIdx] = true
+      rescue AttributeOverwrite
+      end
     })
     doc('start', <<'EOT'
 The start date of the task. When specified for the top-level (default)
@@ -5603,7 +5798,11 @@ EOT
 
   def rule_warn
     pattern(%w( _warn !logicalExpression ), lambda {
-      @property['warn', @scenarioIdx] = @val[1]
+      begin
+        @property['warn', @scenarioIdx] =
+          @property['warn', @scenarioIdx] + [ @val[1] ]
+      rescue AttributeOverwrite
+      end
     })
     doc('warn', <<'EOT'
 The warn attribute adds a logical expression to the property. The condition