taskjuggler 0.0.3 → 0.0.4

data/lib/UTF8String.rb

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby -w
+# encoding: UTF-8
 #
 # = UTF8String.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/UserManual.rb

@@ -3,18 +3,19 @@
 #
 # = UserManual.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 
+require 'fileutils'
 require 'Tj3Config'
 require 'RichTextDocument'
 require 'SyntaxReference'
 require 'TjTime'
-require 'RichTextProtocolExample'
+require 'RichTextFunctionExample'
 
 class TaskJuggler
 
@@ -28,7 +29,8 @@ class TaskJuggler
       super
       # Don't confuse this with RichTextDocument#references
       @reference = SyntaxReference.new(self)
-      registerProtocolHandler(RichTextProtocolExample.new)
+      registerFunctionHandler(RichTextFunctionExample.new)
+      @linkTarget = '_top'
     end
 
     def generate(directory)
@@ -41,13 +43,14 @@ class TaskJuggler
       # A list of all source files. The order is important.
       %w(
         Intro
-          TaskJuggler_2x_Migration
-          How_To_Contribute
-          Reporting_Bugs
-          Installation
+        TaskJuggler_2x_Migration
+        Reporting_Bugs
+        Installation
+        How_To_Contribute
         Getting_Started
-          Rich_Text_Attributes
         Tutorial
+        The_TaskJuggler_Syntax
+        Rich_Text_Attributes
         Day_To_Day_Juggling
         fdl
       ).each do |file|
@@ -58,6 +61,7 @@ class TaskJuggler
       # Generate the HTML files.
       generateHTML(destDir)
       checkInternalReferences
+      FileUtils.cp_r(AppConfig.dataDirs('data/css')[0], destDir)
     end
 
     # Generate the manual in HTML format. _directory_ specifies a directory
@@ -75,64 +79,8 @@ class TaskJuggler
     # Callback function used by the RichTextDocument and KeywordDocumentation
     # classes to generate the HTML style sheet for the manual pages.
     def generateStyleSheet
-      html = []
-      html << (style = XMLElement.new('style', 'type' => 'text/css'))
-      style << XMLBlob.new(<<'EOT'
-pre {
-  font-size:16px;
-  font-family: Courier;
-  padding-left:8px;
-  padding-right:8px;
-  padding-top:0px;
-  padding-bottom:0px;
-}
-p {
-  margin-top:8px;
-  margin-bottom:8px;
-}
-code {
-  font-size:16px;
-  font-family: Courier;
-}
-.table {
-  background-color:#ABABAB;
-  width:100%;
-}
-.tag {
-  background-color:#E0E0F0;
-  font-size:16px;
-  font-weight:bold;
-  padding-left:8px;
-  padding-right:8px;
-  padding-top:5px;
-  padding-bottom:5px;
-}
-.descr {
-  background-color:#F0F0F0;
-  font-size:16px;
-  padding-left:8px;
-  padding-right:8px;
-  padding-top:5px;
-  padding-bottom:5px;
-}
-.codeframe{
-  border-width:2px;
-  border-color:#ABABAB;
-  border-style:solid;
-  background-color:#F0F0F0;
-  margin-top:8px;
-  margin-bottom:8px;
-}
-.code {
-  padding-left:15px;
-  padding-right:15px;
-  padding-top:0px;
-  padding-bottom:0px;
-}
-EOT
-                 )
-
-      html
+      XMLElement.new('link', 'rel' => 'stylesheet', 'type' => 'text/css',
+                             'href' => 'css/tjmanual.css')
     end
 
     # Callback function used by the RichTextDocument class to generate the cover
@@ -141,7 +89,7 @@ EOT
       html = []
       html << (div = XMLElement.new('div', 'align' => 'center',
         'style' => 'margin-top:40px; margin-botton:40px'))
-      div << XMLNamedText.new("The #{AppConfig.packageName} User Manual",
+      div << XMLNamedText.new("The #{AppConfig.softwareName} User Manual",
                               'h1')
       div << XMLNamedText.new('Project Management beyond Gantt Chart drawing',
                               'em')
@@ -152,7 +100,7 @@ EOT
       div << XMLElement.new('br')
       div << XMLText.new("Generated on #{TjTime.now.strftime('%Y-%m-%d')}")
       div << XMLElement.new('br')
-      div << XMLNamedText.new("This manual covers #{AppConfig.packageName} " +
+      div << XMLNamedText.new("This manual covers #{AppConfig.softwareName} " +
                               "version #{AppConfig.version}.", 'h3')
       html << XMLElement.new('br')
       html << XMLElement.new('hr')
@@ -167,7 +115,7 @@ EOT
       html = []
       html << (headline = XMLElement.new('div', 'align' => 'center'))
       headline << XMLNamedText.new(
-        "The #{AppConfig.packageName} User Manual", 'h3',
+        "The #{AppConfig.softwareName} User Manual", 'h3',
         'align' => 'center')
       headline << XMLNamedText.new(
         'Project Management beyond Gantt Chart Drawing', 'em',
@@ -236,7 +184,7 @@ EOT
     def generateHTMLindex(directory)
       html = HTMLDocument.new(:frameset)
       html << (head = XMLElement.new('head'))
-      head << (e = XMLNamedText.new("The #{AppConfig.packageName} User Manual",
+      head << (e = XMLNamedText.new("The #{AppConfig.softwareName} User Manual",
                                     'title'))
       head << XMLElement.new('meta', 'http-equiv' => 'Content-Type',
                              'content' => 'text/html; charset=utf-8')

data/lib/WorkingHours.rb

@@ -3,7 +3,7 @@
 #
 # = WorkingHours.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -149,7 +149,7 @@ class TaskJuggler
         7.times do |day|
           hours = []
           wh.days[day].each do |hrs|
-            hours << hrs.clone
+            hours << hrs.dup
           end
           setWorkingHours(day, hours)
         end
@@ -306,7 +306,7 @@ class TaskJuggler
         ENV['tz'] = @timezone
       end
 
-      localDate = date.clone
+      localDate = date.dup
       localDate.localtime
 
       # Restore environment

data/lib/XMLDocument.rb

@@ -3,7 +3,7 @@
 #
 # = XMLDocument.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -42,10 +42,11 @@ class TaskJuggler
 
     # Write the XMLDocument to the specified file.
     def write(filename)
-      f = File.new(filename, 'w')
+      f = File.new(filename.untaint, 'w')
       @elements.each do |element|
         f.puts element.to_s(0)
       end
+      f.close
     end
 
   end

data/lib/XMLElement.rb

@@ -3,7 +3,7 @@
 #
 # = XMLElement.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -62,6 +62,11 @@ class TaskJuggler
       self
     end
 
+    # Add or change _attribute_ to _value_.
+    def []=(attribute, value)
+      @attributes[attribute] = value
+    end
+
     # Return the element and all sub elements as properly formatted XML.
     def to_s(indent = 0)
       out = '<' + @name

data/lib/deep_copy.rb

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

data/lib/reports/CSVFile.rb

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

data/lib/reports/ColumnTable.rb

@@ -3,7 +3,7 @@
 #
 # = ColumnTable.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -19,12 +19,13 @@ class TaskJuggler
   # ReportTables must have the same number of lines.
   class ColumnTable < ReportTable
 
-    attr_writer :maxWidth
+    attr_writer :viewWidth
 
     # Create a new ColumnTable object.
     def initialize
       super
-      @maxWidth = nil
+      # The user requested width of the column (chart)
+      @viewWidth = nil
       # The header will have 2 lines. So, use a smaller font. This should match
       # the font size used for the GanttChart header.
       @headerFontSize = 10
@@ -45,19 +46,18 @@ class TaskJuggler
       # height that fits all lines but has a maximum width. In case the embedded
       # table is larger, a scrollbar will appear. We assume that the scrollbar
       # has a height of SCROLLBARHEIGHT pixels or less.
-      # Due to Firefoxes broken table rendering we have to specify a minimum
-      # width. It may not excede the maxWidth value.
-      mWidth = minWidth
-      mWidth = @maxWidth if mWidth > @maxWidth
+      # If there is a user specified with, use it. Otherwise use the
+      # calculated minimum with.
+      width = @viewWidth ? @viewWidth : minWidth
       td << (scrollDiv = XMLElement.new('div', 'class' => 'tabback',
         'style' => 'position:relative; overflow:auto; ' +
-                   "width:#{mWidth}px; " +
+                   "width:#{width}px; " +
                    'margin-top:-1px; margin-bottom:-1px; ' +
                    "height:#{height + SCROLLBARHEIGHT + 2}px;"))
 
       scrollDiv << (contentDiv = XMLElement.new('div',
         'style' => 'margin: 0px; padding: 0px; position: absolute; top: 0px;' +
-                   "left: 0px; width: #{@maxWidth}px; height: #{height}px; "))
+                   "left: 0px; width: #{@viewWidth}px; height: #{height}px; "))
       contentDiv << super
       td
     end

data/lib/reports/GanttChart.rb

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

data/lib/reports/GanttContainer.rb

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

data/lib/reports/GanttHeader.rb

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

data/lib/reports/GanttHeaderScaleItem.rb

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

data/lib/reports/GanttLine.rb

@@ -3,7 +3,7 @@
 #
 # = GanttLine.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -257,49 +257,49 @@ class TaskJuggler
         end
       end
 
+      endDate = nil
       @chart.header.cellStartDates.each do |date|
-        if x.nil?
-          x = @chart.dateToX(endDate = date).to_i
-        else
-          xNew = @chart.dateToX(date).to_i
-          w = xNew - x
-          startDate = endDate
+        if endDate.nil?
           endDate = date
-          if @scopeProperty
-            # If we have a scope limiting task, we only want to generate load
-            # stacks that overlap with the task interval.
-            next if endDate <= taskStart || taskEnd <= startDate
-            if startDate < taskStart && endDate > taskStart
-              # Make sure the left edge of the first stack aligns with the
-              # start of the scope task.
-              startDate = taskStart
-              x = @chart.dateToX(startDate)
-              w = xNew - x + 1
-            elsif startDate < taskEnd && endDate > taskEnd
-              # Make sure the right edge of the last stack aligns with the end
-              # of the scope task.
-              endDate = taskEnd
-              w = @chart.dateToX(endDate) - x
-            end
-            taskWork = @property.getEffectiveWork(@scenarioIdx,
-                                                  startDate, endDate,
-                                                  @scopeProperty)
-            overallWork = @property.getEffectiveWork(@scenarioIdx,
-                                                     startDate, endDate)
-            freeWork = @property.getEffectiveFreeWork(@scenarioIdx,
-                                                     startDate, endDate)
-            values = [ taskWork, overallWork - taskWork, freeWork ]
-          else
-            values = []
-            values << @property.getEffectiveWork(@scenarioIdx,
-                                                 startDate, endDate)
-            values << @property.getEffectiveFreeWork(@scenarioIdx,
-                                                     startDate, endDate)
-          end
-          @content << GanttLoadStack.new(self, x + 1, w - 2, values, categories)
+          next
+        end
 
-          x = xNew
+        startDate = endDate
+        endDate = date
+
+        if @scopeProperty
+          # If we have a scope limiting task, we only want to generate load
+          # stacks that overlap with the task interval.
+          next if endDate <= taskStart || taskEnd <= startDate
+          if startDate < taskStart
+            # Make sure the left edge of the first stack aligns with the
+            # start of the scope task.
+            startDate = taskStart
+          end
+          if endDate > taskEnd
+            # Make sure the right edge of the last stack aligns with the end
+            # of the scope task.
+            endDate = taskEnd
+          end
+          taskWork = @property.getEffectiveWork(@scenarioIdx,
+                                                startDate, endDate,
+                                                @scopeProperty)
+          overallWork = @property.getEffectiveWork(@scenarioIdx,
+                                                   startDate, endDate)
+          freeWork = @property.getEffectiveFreeWork(@scenarioIdx,
+                                                    startDate, endDate)
+          values = [ taskWork, overallWork - taskWork, freeWork ]
+        else
+          values = []
+          values << @property.getEffectiveWork(@scenarioIdx,
+                                               startDate, endDate)
+          values << @property.getEffectiveFreeWork(@scenarioIdx,
+                                                   startDate, endDate)
         end
+
+        x = @chart.dateToX(startDate)
+        w = @chart.dateToX(endDate) - x + 1
+        @content << GanttLoadStack.new(self, x + 1, w - 2, values, categories)
       end
 
     end