taskjuggler 3.3.0 → 3.4.0

data/CHANGELOG

@@ -1,3 +1,38 @@
+= Release 3.4.0 (2012-12-17)
+
+== New Features
+
+  * 'auxdir' can be used to specify alterntive path to CSS and script files.
+  * Trace file reader can now deal with Open/LibreOffice generated files.
+  * Add timefomat1 and timeformat2 attributes to set calendar column headers.
+  * Add report columns 'scheduling' to show the scheduling mode of leaf tasks.
+  * Priority inversions now generate a warning.
+  * 'competitors' and 'competitorcount' columns added.
+  * Better documentation of the task scheduler in the user manual.
+  * Support raw HTML fragments inlined into rich text strings.
+  * Added 'rawhtmlhead' attribute to insert HTML fragments into the HTML head section.
+  * Major performance improvements for reports using targets and inputs.
+  * Adding --report and --reports option to tj3.
+
+== Bug Fixes
+
+  * Don't crash on files with bad file encodings.
+  * 'tagfile' cannot work without a file name.
+  * Report correct line number for errors at end of master file.
+  * Don't crash when adopting a top-level task.
+  * Don't put -bookings.tji file in -o directory.
+  * MS Project XML files respect the 'screnarios' setting now.
+  * Timesheet reports are now based on the 'trackingscenario' instead of the top-level.
+  * Make <-reportlink ...-> work with otherwise empty strings.
+  * Handle *prefix settings properly across nested include files.
+  * Properly export working hours that are not hour-aligned.
+  * Fix link to generated tutorial reports.
+  * Add requirement for >= Ruby 1.9.2 for non-ASCII users.
+  * Undefined macros ${?foo} now work with TJ3.
+  * Improving the heuristic to select a persistent resource from a set of alternatives.
+  * Ensure that resource load bars in Gantt charts have at least a 1px width
+
+
 = Release 3.3.0 (2012-07-22)
 
 == New Features

data/data/tjp.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     TaskJuggler
 " Maintainer:   TaskJuggler Developers <taskjuggler-devel@googlegroups.com>
-" Last Change:  2012-07-22 20:00:43 +0200
+" Last Change:  2012-12-17 14:49:02 +0100
 " This file was automatically generated by VimSyntax.rb
 
 if exists("b:current_syntax")
@@ -102,6 +102,10 @@ syn keyword tjp_columnid_chart chart
 hi def link tjp_columnid_chart Type
 syn keyword tjp_columnid_closedtasks closedtasks
 hi def link tjp_columnid_closedtasks Type
+syn keyword tjp_columnid_competitorcount competitorcount
+hi def link tjp_columnid_competitorcount Type
+syn keyword tjp_columnid_competitors competitors
+hi def link tjp_columnid_competitors Type
 syn keyword tjp_columnid_complete complete
 hi def link tjp_columnid_complete Type
 syn keyword tjp_columnid_completed completed
@@ -204,6 +208,8 @@ syn keyword tjp_columnid_revenue revenue
 hi def link tjp_columnid_revenue Type
 syn keyword tjp_columnid_scenario scenario
 hi def link tjp_columnid_scenario Type
+syn keyword tjp_columnid_scheduling scheduling
+hi def link tjp_columnid_scheduling Type
 syn keyword tjp_columnid_seqno seqno
 hi def link tjp_columnid_seqno Type
 syn keyword tjp_columnid_sickleave sickleave
@@ -244,6 +250,10 @@ syn keyword tjp_scale_column scale contained
 hi def link tjp_scale_column Type
 syn keyword tjp_start_column start contained
 hi def link tjp_start_column Type
+syn keyword tjp_timeformat1 timeformat1 contained
+hi def link tjp_timeformat1 Type
+syn keyword tjp_timeformat2 timeformat2 contained
+hi def link tjp_timeformat2 Type
 syn keyword tjp_title_column title contained
 hi def link tjp_title_column Type
 syn keyword tjp_tooltip_column tooltip contained
@@ -426,6 +436,8 @@ syn keyword tjp_purge purge contained
 hi def link tjp_purge Type
 syn keyword tjp_accountroot accountroot contained
 hi def link tjp_accountroot Type
+syn keyword tjp_auxdir auxdir contained
+hi def link tjp_auxdir Type
 syn keyword tjp_caption caption contained
 hi def link tjp_caption Type
 syn keyword tjp_center center contained
@@ -450,6 +462,8 @@ syn keyword tjp_opennodes opennodes contained
 hi def link tjp_opennodes Type
 syn keyword tjp_prolog prolog contained
 hi def link tjp_prolog Type
+syn keyword tjp_rawhtmlhead rawhtmlhead contained
+hi def link tjp_rawhtmlhead Type
 syn keyword tjp_right right contained
 hi def link tjp_right Type
 syn keyword tjp_scenarios scenarios contained
@@ -625,7 +639,7 @@ syn match tjptime /\s\d\{1,2}:\d\d\(:\d\d\)\?/
 
 syn cluster tjpcommon contains=tjpcomment,tjpdate,tjptime,tjpstring,tjpnumber
 syn region tjpblk_account start=/^\s*account\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_account,tjp_account,tjpblk_account,tjp_aggregate,tjp_credits,tjp_flags_account
-syn region tjpblk_accountreport start=/^\s*accountreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_accountreport,tjp_accountroot,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
+syn region tjpblk_accountreport start=/^\s*accountreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_accountreport,tjp_accountroot,tjp_auxdir,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_allocate start=/^\s*allocate\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_allocate,tjp_alternative,tjp_select,tjp_persistent,tjp_mandatory,tjp_shifts_allocate contained
 syn region tjpblk_export start=/^\s*export\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_export,tjp_definitions,tjp_formats_export,tjp_hideresource,tjp_hidetask,tjp_loadunit,tjp_purge,tjp_end_report,tjp_period_report,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_start_report,tjp_resourceattributes,tjp_rollupresource,tjp_rolluptask,tjp_scenarios_export,tjp_taskattributes,tjp_taskroot_export,tjp_timezone_export
 syn region tjpblk_date_extend start=/^\s*date\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_date_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
@@ -648,10 +662,10 @@ syn region tjpblk_extend start=/^\s*extend\s.*{\s*$/ end=/^\s*}\s*$/ transparent
 syn region tjpblk_project start=/^\s*project\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_project,tjp_alertlevels,tjp_currencyformat,tjp_currency,tjp_dailyworkinghours,tjp_extend,tjpblk_extend,tjp_include_project,tjp_journalentry,tjpblk_journalentry,tjp_now,tjp_numberformat,tjp_scenario,tjpblk_scenario,tjp_shorttimeformat,tjp_timeformat,tjp_timezone,tjp_timingresolution,tjp_trackingscenario,tjp_weekstartsmonday,tjp_weekstartssunday,tjp_workinghours_project,tjp_yearlyworkingdays
 syn region tjpblk_limits start=/^\s*limits\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_limits,tjp_dailymax,tjpblk_dailymax,tjp_dailymin,tjpblk_dailymin,tjp_maximum,tjpblk_maximum,tjp_minimum,tjpblk_minimum,tjp_monthlymax,tjpblk_monthlymax,tjp_monthlymin,tjpblk_monthlymin,tjp_weeklymax,tjpblk_weeklymax,tjp_weeklymin,tjpblk_weeklymin
 syn region tjpblk_include_properties start=/^\s*include\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_include_properties,tjp_accountprefix,tjp_reportprefix,tjp_resourceprefix,tjp_taskprefix
-syn region tjpblk_columns start=/^\s*columns\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_columns,tjp_celltext_column,tjp_cellcolor_column,tjp_end_column,tjp_fontcolor_column,tjp_halign_column,tjp_listitem_column,tjp_listtype_column,tjp_period_column,tjp_scale_column,tjp_start_column,tjp_title_column,tjp_tooltip_column,tjp_width_column contained
+syn region tjpblk_columns start=/^\s*columns\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_columns,tjp_celltext_column,tjp_cellcolor_column,tjp_end_column,tjp_fontcolor_column,tjp_halign_column,tjp_listitem_column,tjp_listtype_column,tjp_period_column,tjp_scale_column,tjp_start_column,tjp_timeformat1,tjp_timeformat2,tjp_title_column,tjp_tooltip_column,tjp_width_column contained
 syn region tjpblk_resource start=/^\s*resource\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_resource,tjp_email,tjp_journalentry,tjpblk_journalentry,tjp_purge,tjp_resource,tjpblk_resource,tjp_chargeset,tjp_efficiency,tjp_flags_resource,tjp_booking_resource,tjpblk_booking_resource,tjp_fail,tjp_leaveallowance,tjp_leaves,tjp_limits_resource,tjpblk_limits_resource,tjp_managers,tjp_rate_resource,tjp_shifts_resource,tjp_vacation_resource,tjp_warn,tjp_workinghours_resource,tjp_supplement_resource,tjpblk_supplement_resource
 syn region tjpblk_supplement_resource start=/^\s*supplement resource\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_supplement_resource,tjp_email,tjp_journalentry,tjpblk_journalentry,tjp_purge,tjp_resource,tjpblk_resource,tjp_chargeset,tjp_efficiency,tjp_flags_resource,tjp_booking_resource,tjpblk_booking_resource,tjp_fail,tjp_leaveallowance,tjp_leaves,tjp_limits_resource,tjpblk_limits_resource,tjp_managers,tjp_rate_resource,tjp_shifts_resource,tjp_vacation_resource,tjp_warn,tjp_workinghours_resource,tjp_supplement_resource,tjpblk_supplement_resource,tjp_supplement contained
-syn region tjpblk_resourcereport start=/^\s*resourcereport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_resourcereport,tjp_accountroot,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
+syn region tjpblk_resourcereport start=/^\s*resourcereport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_resourcereport,tjp_accountroot,tjp_auxdir,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_booking_resource start=/^\s*booking\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_booking_resource,tjp_overtime_booking,tjp_sloppy_booking contained
 syn region tjpblk_limits_resource start=/^\s*limits\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_limits_resource,tjp_dailymax,tjpblk_dailymax,tjp_dailymin,tjpblk_dailymin,tjp_maximum,tjpblk_maximum,tjp_minimum,tjpblk_minimum,tjp_monthlymax,tjpblk_monthlymax,tjp_monthlymin,tjpblk_monthlymin,tjp_weeklymax,tjpblk_weeklymax,tjp_weeklymin,tjpblk_weeklymin contained
 syn region tjpblk_scenario start=/^\s*scenario\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_scenario,tjp_active,tjp_scenario,tjpblk_scenario contained
@@ -663,17 +677,17 @@ syn region tjpblk_task_statussheet start=/^\s*task\s.*{\s*$/ end=/^\s*}\s*$/ tra
 syn region tjpblk_tagfile start=/^\s*tagfile\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_tagfile,tjp_hideresource,tjp_hidetask,tjp_rollupresource,tjp_rolluptask
 syn region tjpblk_task start=/^\s*task\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_task,tjp_adopt_task,tjp_journalentry,tjpblk_journalentry,tjp_note_task,tjp_purge,tjp_supplement_task,tjpblk_supplement_task,tjp_task,tjpblk_task,tjp_allocate,tjpblk_allocate,tjp_booking_task,tjpblk_booking_task,tjp_charge,tjp_chargeset,tjp_complete,tjp_depends,tjpblk_depends,tjp_duration,tjp_effort,tjp_end,tjp_flags_task,tjp_fail,tjp_length,tjp_limits_task,tjpblk_limits_task,tjp_maxend,tjp_maxstart,tjp_milestone,tjp_minend,tjp_minstart,tjp_period_task,tjp_precedes,tjpblk_precedes,tjp_priority,tjp_projectid_task,tjp_responsible,tjp_scheduled,tjp_scheduling,tjp_shifts_task,tjp_start,tjp_warn
 syn region tjpblk_supplement_task start=/^\s*supplement task\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_supplement_task,tjp_adopt_task,tjp_journalentry,tjpblk_journalentry,tjp_note_task,tjp_purge,tjp_supplement_task,tjpblk_supplement_task,tjp_task,tjpblk_task,tjp_allocate,tjpblk_allocate,tjp_booking_task,tjpblk_booking_task,tjp_charge,tjp_chargeset,tjp_complete,tjp_depends,tjpblk_depends,tjp_duration,tjp_effort,tjp_end,tjp_flags_task,tjp_fail,tjp_length,tjp_limits_task,tjpblk_limits_task,tjp_maxend,tjp_maxstart,tjp_milestone,tjp_minend,tjp_minstart,tjp_period_task,tjp_precedes,tjpblk_precedes,tjp_priority,tjp_projectid_task,tjp_responsible,tjp_scheduled,tjp_scheduling,tjp_shifts_task,tjp_start,tjp_warn,tjp_supplement contained
-syn region tjpblk_taskreport start=/^\s*taskreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_taskreport,tjp_accountroot,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
+syn region tjpblk_taskreport start=/^\s*taskreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_taskreport,tjp_accountroot,tjp_auxdir,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_booking_task start=/^\s*booking\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_booking_task,tjp_overtime_booking,tjp_sloppy_booking contained
 syn region tjpblk_depends start=/^\s*depends\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_depends,tjp_gapduration,tjp_gaplength,tjp_onend,tjp_onstart contained
 syn region tjpblk_limits_task start=/^\s*limits\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_limits_task,tjp_dailymax,tjpblk_dailymax,tjp_dailymin,tjpblk_dailymin,tjp_maximum,tjpblk_maximum,tjp_minimum,tjpblk_minimum,tjp_monthlymax,tjpblk_monthlymax,tjp_monthlymin,tjpblk_monthlymin,tjp_weeklymax,tjpblk_weeklymax,tjp_weeklymin,tjpblk_weeklymin contained
 syn region tjpblk_precedes start=/^\s*precedes\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_precedes,tjp_gapduration,tjp_gaplength,tjp_onend,tjp_onstart contained
-syn region tjpblk_textreport start=/^\s*textreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_textreport,tjp_accountroot,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
+syn region tjpblk_textreport start=/^\s*textreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_textreport,tjp_accountroot,tjp_auxdir,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_timesheet start=/^\s*timesheet\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_timesheet,tjp_newtask,tjpblk_newtask,tjp_shift_timesheet,tjp_status_timesheet,tjpblk_status_timesheet,tjp_task_timesheet,tjpblk_task_timesheet
 syn region tjpblk_newtask start=/^\s*newtask\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_newtask,tjp_end_timesheet,tjp_priority_timesheet,tjp_remaining,tjp_status_timesheet,tjpblk_status_timesheet,tjp_work contained
 syn region tjpblk_task_timesheet start=/^\s*task\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_task_timesheet,tjp_end_timesheet,tjp_priority_timesheet,tjp_remaining,tjp_status_timesheet,tjpblk_status_timesheet,tjp_work contained
 syn region tjpblk_timesheetreport start=/^\s*timesheetreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_timesheetreport,tjp_hideresource,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_sortresources,tjp_sorttasks
-syn region tjpblk_tracereport start=/^\s*tracereport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_tracereport,tjp_accountroot,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
+syn region tjpblk_tracereport start=/^\s*tracereport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_tracereport,tjp_accountroot,tjp_auxdir,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_status_timesheet start=/^\s*status\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_status_timesheet,tjp_details,tjp_flags_timesheet,tjp_summary contained
 syn region tjpblk_macro start=/macro\s\+\h\w*\s*\[/ end=/\]$/ transparent fold contains=ALL
 syn region tjpstring start=/"/ skip=/\\"/ end=/"/

data/lib/taskjuggler/Allocation.rb

@@ -24,12 +24,12 @@ class TaskJuggler
   class Allocation
 
     attr_reader :selectionMode
-    attr_accessor :persistent, :mandatory, :shifts, :lockedResource
+    attr_accessor :atomic, :persistent, :mandatory, :shifts, :lockedResource
 
     # Create an Allocation object. The _candidates_ list must at least contain
     # one Resource reference.
     def initialize(candidates, selectionMode = 1, persistent = false,
-                   mandatory = false)
+                   mandatory = false, atomic = false)
       @candidates = candidates
       # The selection mode determines how the candidate is selected from the
       # list of candidates.
@@ -42,9 +42,11 @@ class TaskJuggler
       #                      load
       # 4 : 'random'       : select a random candidate
       @selectionMode = selectionMode
+      @atomic = atomic
       @persistent = persistent
       @mandatory = mandatory
       @shifts = nil
+      @staticCandidates = nil
     end
 
     # Set the selection mode identified by name specified in _str_. For
@@ -70,9 +72,14 @@ class TaskJuggler
 
     # Return the candidate list sorted according to the selectionMode.
     def candidates(scenarioIdx = nil)
+      # In case we have selection criteria that results in a static list, we
+      # can use the previously determined list.
+      return @staticCandidates if @staticCandidates
+
       if scenarioIdx.nil? || @selectionMode == 0 # declaration order
         return @candidates
       end
+
       if @selectionMode == 4 # random
         # For a random sorting we put the candidates in a hash with a random
         # number as key. Then we sort the hash according to the random keys an
@@ -88,7 +95,21 @@ class TaskJuggler
       list = @candidates.sort do |x, y|
         case @selectionMode
         when 1 # lowest alloc probability
-          x['criticalness', scenarioIdx] <=> y['criticalness', scenarioIdx]
+          if @persistent
+            # For persistent resources we use a more sophisticated heuristic
+            # than just the criticalness of the resource. Instead, we
+            # look at the already allocated slots of the resource. This will
+            # reduce the probability to pick a persistent resource that was
+            # already allocated for a higher priority or more critical task.
+            if (cmp = x.bookedEffort(scenarioIdx) <=>
+                      y.bookedEffort(scenarioIdx)) == 0
+              x['criticalness', scenarioIdx] <=> y['criticalness', scenarioIdx]
+            else
+              cmp
+            end
+          else
+            x['criticalness', scenarioIdx] <=> y['criticalness', scenarioIdx]
+          end
         when 2 # lowest allocated load
           x.bookedEffort(scenarioIdx) <=> y.bookedEffort(scenarioIdx)
         when 3 # hightes allocated load
@@ -97,6 +118,9 @@ class TaskJuggler
           raise "Unknown selection mode #{@selectionMode}"
         end
       end
+
+      @staticCandidates = list if @selectionMode == 1 && !@persistent
+
       list
     end
 

data/lib/taskjuggler/Attributes.rb

@@ -714,8 +714,9 @@ class TaskJuggler
             str += ', '
           end
           str += "#{iv[0] / 3600}:#{iv[0] % 3600 == 0 ?
-                                    '00' : iv[0] % 3600} - " +
-                 "#{iv[1] / 3600}:#{iv[1] % 3600 == 0 ? '00' : iv[1] % 3600}"
+                                    '00' : (iv[0] % 3600) / 60} - " +
+                 "#{iv[1] / 3600}:#{iv[1] % 3600 == 0 ?
+                                    '00' : (iv[1] % 3600) / 60}"
         end
         str += "\n" if day < 6
       end

data/lib/taskjuggler/HTMLDocument.rb

@@ -60,7 +60,7 @@ class TaskJuggler
     end
 
     # Generate the 'head' section of an HTML page.
-    def generateHead(title, metaTags = {})
+    def generateHead(title, metaTags = {}, blob = nil)
       @html << HEAD.new {
         e = [
           TITLE.new { title },
@@ -73,6 +73,8 @@ class TaskJuggler
         metaTags.each do |name, content|
           e << META.new({ 'name' => name, 'content' => content })
         end
+        # Add a raw HTML blob into the header if provided.
+        e << XMLBlob.new(blob) if blob
 
         e
       }

data/lib/taskjuggler/KateSyntax.rb

@@ -0,0 +1,213 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = KateSyntax.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+#               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
+# published by the Free Software Foundation.
+#
+
+require 'taskjuggler/SyntaxReference'
+
+class TaskJuggler
+
+  # This class is a generator for Kate (http://kate-editor.org/) TaskJuggler syntax
+  # highlighting files.
+  class KateSyntax
+
+    # Create a generator object.
+    def initialize
+      # Create a syntax reference for all current keywords.
+      @reference = SyntaxReference.new(nil, true)
+
+      @properties = []
+      @attributes = []
+
+      @reference.keywords.each_value do |kw|
+        if kw.isProperty?
+          @properties << kw
+        else
+          @attributes << kw
+        end
+      end
+
+      @file = nil
+    end
+
+    # Generate the Kate syntax file into _file_.
+    def generate(file)
+      @file = File.open(file, 'w')
+
+      header
+      keywords
+      contexts
+      highlights
+      footer
+
+      @file.close
+    end
+
+    private
+
+    def header
+      # Generate the header section. Mostly consists of comments and
+      # description attributes
+      @file.write <<"EOT"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language
+  name="TaskJuggler"
+  version="3.0" kateversion="2.1"
+  section="Scripts" extensions="*.tjp;*.tji"
+  author="TaskJuggler Developers &lt;taskjuggler-devel@googlegroups.com&gt;">
+<highlighting>
+<!-- This file was automatically generated by KateSyntax.rb -->
+
+EOT
+    end
+
+    def footer
+      # Generate the footer section. Mostly consists of closing tags.
+      @file.write <<"EOT"
+</highlighting>
+<general>
+  <comments>
+    <comment name="singleLine" start="#"/>
+    <comment name="singleLine" start="//"/>
+    <comment name="multiLine" start="/*" end="*/"/>
+  </comments>
+  <keywords casesensitive="0"/>
+</general>
+</language>
+EOT
+    end
+
+    def contexts
+      @file.write <<'EOT'
+<contexts>
+  <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+    <!-- Date(+Time) values -->
+    <RegExpr attribute="Date" String="\d{4}-\d{2}-\d{2}\S*"/>
+    <!-- Time values -->
+    <RegExpr attribute="Time" String="\d{1-2}:\d{2}(:\d{2}|)"/>
+    <!-- Duration specifications -->
+    <RegExpr attribute="Duration" String="\d(min|h|d|w|m|y)"/>
+    <!-- keywords and other builtins -->
+    <keyword attribute="Builtin Function" String="builtinfuncs" context="#stay"/>
+    <keyword attribute="Keyword" String="keywords" context="#stay"/>
+    <keyword attribute="Data Types" String="types" context="#stay"/>
+    <!-- Include -->
+    <RegExpr attribute="Include" String="include.*$"/>
+    <!-- Arguments -->
+    <RegExpr attribute="Arguments" String="\{.*}$"/>
+    <!-- region (brace) folding -->
+    <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace2"/>
+    <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace2"/>
+    <DetectChar attribute="Symbol" context="#stay" char="[" beginRegion="Brace1"/>
+    <DetectChar attribute="Symbol" context="#stay" char="]" endRegion="Brace1"/>
+    <!-- number hilighting -->
+    <Float attribute="Float" context="#stay">
+      <AnyChar String="fF" attribute="Float" context="#stay"/>
+    </Float>
+    <Int attribute="Decimal" context="#stay">
+      <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
+      <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
+      <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
+      <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
+      <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
+      <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
+      <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
+      <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+    </Int>
+    <!-- strings -->
+    <DetectChar attribute="String" context="String1" char="'"/>
+    <DetectChar attribute="String" context="String2" char='"'/>
+    <StringDetect attribute="String" context="String3" String="-8&lt;-"/>
+    <!-- comments -->
+    <DetectChar attribute="Comment" context="Comment1" char="#"/>
+    <Detect2Chars attribute="Comment" context="Comment2" char="/" char1="/"/>
+    <Detect2Chars attribute="Comment" context="Comment3" char="/" char1="*"/>
+  </context>
+  <context attribute="String" lineEndContext="#stay" name="String1">
+    <DetectChar attribute="String" context="#pop" char="'"/>
+  </context>
+  <context attribute="String" lineEndContext="#stay" name="String2">
+    <DetectChar attribute="String" context="#pop" char='"'/>
+  </context>
+  <context attribute="String" lineEndContext="#stay" name="String3">
+    <StringDetect attribute="String" context="#pop" String="-&gt;8-"/>
+  </context>
+  <context attribute="Comment" lineEndContext="#pop" name="Comment1">
+    <IncludeRules context="##Alerts"/>
+  </context>
+  <context attribute="Comment" lineEndContext="#pop" name="Comment2">
+    <IncludeRules context="##Alerts"/>
+  </context>
+  <context attribute="Comment" lineEndContext="#stay" name="Comment3">
+    <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/"/>
+  </context>
+</contexts>
+
+EOT
+#syn match tjparg contained /\${.*}/
+    end
+
+    def keywords
+      @file.puts "<list name=\"keywords\">"
+      %w( macro project supplement include supplement ).each do |kw|
+	@file.puts "<item> #{kw} </item>"
+      end
+      @file.puts "</list>"
+
+      # Property keywords
+      @file.puts "<list name=\"builtinfuncs\">"
+      @properties.each do |kw|
+        kw.names.each do |name|
+          # Ignore the 'supplement' entries. They are not real properties.
+          next if name == 'supplement'
+          @file.puts "<item> #{name} </item>"
+        end
+      end
+      @file.puts "</list>"
+
+      # Attribute keywords
+      @file.puts "<list name=\"types\">"
+      @attributes.each do |kw|
+        next if %w( resourcereport taskreport textreport ).include?(kw.keyword)
+        single = kw.names.length == 1
+        kw.names.each do |name|
+          break if [ '%', '(', '~', 'include', 'macro', 'project',
+                     'supplement' ].include?(name)
+          @file.puts "<item> #{name} </item>"
+        end
+      end
+      @file.puts "</list>"
+    end
+
+    def highlights
+      @file.write <<'EOT'
+<itemDatas>
+  <itemData name="Normal Text" defStyleNum="dsNormal"/>
+  <itemData name="Keyword" defStyleNum="dsKeyword"/>
+  <itemData name="Builtin Function" defStyleNum="dsFunction"/>
+  <itemData name="Data Types" defStyleNum="dsDataType"/>
+  <itemData name="Decimal" defStyleNum="dsDecVal"/>
+  <itemData name="Float" defStyleNum="dsDecVal"/>
+  <itemData name="Date" defStyleNum="dsBaseN"/>
+  <itemData name="Time" defStyleNum="dsBaseN"/>
+  <itemData name="String" defStyleNum="dsString"/>
+  <itemData name="String Char" defStyleNum="dsChar"/>
+  <itemData name="Comment" defStyleNum="dsComment"/>
+  <itemData name="Symbol" defStyleNum="dsNormal"/>
+</itemDatas>
+EOT
+    end
+
+  end
+
+end
+