taskjuggler 3.2.0 → 3.3.0

data/CHANGELOG

@@ -1,3 +1,33 @@
+= Release 3.3.0 (2012-07-22)
+
+== New Features
+
+  * Support 'purge' in export report definitions.
+  * Allow 'export' to be used as nested report.
+  * Export scheduled project as Microsoft Project XML format.
+  * Some speed improvements of the TJP parser.
+  * Support nested macro definitions.
+  * Improved scheduling performance.
+  * 'effortleft' and 'effortdone' columns now work for resources as well.
+  * Adding 'status_dep' and 'alerts_dep' journalmode options.
+
+== Bug Fixes
+
+  * Don't crash when 'complete' is reported for container w/o real sub-tasks.
+  * Fix 'celltext' documentation.
+  * Properly compute cost from tasks when reported in a resource context.
+  * Ensure that there are no duplicated (by adoption) tasks in a report.
+  * Clarify start/end slot clipping for tasks with 'allocate'.
+  * Don't miss certain tasks in 'inputs' and 'targets' list.
+  * Don't crash when gantt report interval is outside of tasks.
+  * Allow macro definitions at end of file.
+  * Don't silently force interval durations to align with timing resolution.
+  * Make @none work for logical expressions.
+  * Support 'purge' for a specific scenario.
+  * Properly escape " in plain text strings in export reports.
+  * Make nested 'supplement' work with absolute IDs.
+
+
 = Release 3.2.0 (2012-04-30)
 
 == New Features

data/README.rdoc

@@ -74,6 +74,7 @@ browser is all you need for your work.
 * Powerful project description language with macro support
 * Scales well on multi-core or multi-CPU systems
 * Support for project management teams and revision control systems
+* Data export to Microsoft Project and Computer Associates Clarity
 
 == Web Publishing and Groupware Functions
 

data/data/tjp.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     TaskJuggler
 " Maintainer:   TaskJuggler Developers <taskjuggler-devel@googlegroups.com>
-" Last Change:  2012-04-30 14:20:23 +0200
+" Last Change:  2012-07-22 20:00:43 +0200
 " This file was automatically generated by VimSyntax.rb
 
 if exists("b:current_syntax")
@@ -256,12 +256,16 @@ syn keyword tjp_details details contained
 hi def link tjp_details Type
 syn keyword tjp_definitions definitions contained
 hi def link tjp_definitions Type
+syn keyword tjp_formats_export formats contained
+hi def link tjp_formats_export Type
 syn keyword tjp_resourceattributes resourceattributes contained
 hi def link tjp_resourceattributes Type
 syn keyword tjp_scenarios_export scenarios contained
 hi def link tjp_scenarios_export Type
 syn keyword tjp_taskattributes taskattributes contained
 hi def link tjp_taskattributes Type
+syn keyword tjp_taskroot_export taskroot contained
+hi def link tjp_taskroot_export Type
 syn keyword tjp_timezone_export timezone contained
 hi def link tjp_timezone_export Type
 syn keyword tjp_date_extend date contained
@@ -370,6 +374,8 @@ syn keyword tjp_weeklymax weeklymax contained
 hi def link tjp_weeklymax Type
 syn keyword tjp_weeklymin weeklymin contained
 hi def link tjp_weeklymin Type
+syn keyword tjp_loadunit loadunit contained
+hi def link tjp_loadunit Type
 syn keyword tjp_logicalexpression @
 hi def link tjp_logicalexpression Type
 syn keyword tjp_navigator navigator contained
@@ -440,8 +446,6 @@ syn keyword tjp_journalmode journalmode contained
 hi def link tjp_journalmode Type
 syn keyword tjp_left left contained
 hi def link tjp_left Type
-syn keyword tjp_loadunit loadunit contained
-hi def link tjp_loadunit Type
 syn keyword tjp_opennodes opennodes contained
 hi def link tjp_opennodes Type
 syn keyword tjp_prolog prolog contained
@@ -621,9 +625,9 @@ 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_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_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_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_hideresource,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_resourceattributes,tjp_rollupresource,tjp_rolluptask,tjp_scenarios_export,tjp_taskattributes,tjp_timezone_export
+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
 syn region tjpblk_reference_extend start=/^\s*reference\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_reference_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
 syn region tjpblk_richtext_extend start=/^\s*richtext\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_richtext_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
@@ -647,7 +651,7 @@ syn region tjpblk_include_properties start=/^\s*include\s.*{\s*$/ end=/^\s*}\s*$
 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_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_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_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_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
@@ -659,17 +663,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_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_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_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_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_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_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_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_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_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

@@ -90,9 +90,9 @@ class TaskJuggler
         when 1 # lowest alloc probability
           x['criticalness', scenarioIdx] <=> y['criticalness', scenarioIdx]
         when 2 # lowest allocated load
-          x['effort', scenarioIdx] <=> y['effort', scenarioIdx]
+          x.bookedEffort(scenarioIdx) <=> y.bookedEffort(scenarioIdx)
         when 3 # hightes allocated load
-          y['effort', scenarioIdx] <=> x['effort', scenarioIdx]
+          y.bookedEffort(scenarioIdx) <=> x.bookedEffort(scenarioIdx)
         else
           raise "Unknown selection mode #{@selectionMode}"
         end

data/lib/taskjuggler/AttributeBase.rb

@@ -154,6 +154,16 @@ class TaskJuggler
       @type.id + " " + get.to_s
     end
 
+    private
+
+    def quotedString(str)
+      if str.include?("\n")
+        "-8<-\n#{str}\n->8-"
+      else
+        "\"#{str.gsub("\"", '\"')}\""
+      end
+    end
+
   end
 
   # The ListAttributeBase is a specialized form of AttributeBase for a list of

data/lib/taskjuggler/Attributes.rb

@@ -543,13 +543,7 @@ class TaskJuggler
     end
 
     def to_tjp
-      inputText = get.richText.inputText
-      if inputText[-1] == ?\n
-        "#{@type.id} -8<-\n#{inputText}\n->8-"
-      else
-        escaped = inputText.gsub("\"", '\"')
-        "#{@type.id} \"#{escaped}\""
-      end
+      "#{@type.id} #{quotedString(get.richText.inputText)}"
     end
 
   end
@@ -623,7 +617,7 @@ class TaskJuggler
     end
 
     def to_tjp
-      "#{@type.id} \"#{get}\""
+      "#{@type.id} #{quotedString(get)}"
     end
 
   end

data/lib/taskjuggler/Journal.rb

@@ -433,7 +433,7 @@ class TaskJuggler
             entries.uniq!
           end
         end
-      when :status_down
+      when :status_down, :status_dep
         # In this mode only the last entries before the query end date for
         # each task (incl. sub tasks) are included.
         if query.property
@@ -451,7 +451,7 @@ class TaskJuggler
             entries.uniq!
           end
         end
-      when :alerts_down
+      when :alerts_down, :alerts_dep
         # In this mode only the last entries before the query end date for
         # each task (incl. sub tasks) and only the ones with the highest alert
         # level are included.
@@ -687,27 +687,28 @@ class TaskJuggler
             latestDate = e.date if latestDate.nil? || e.date > latestDate
             # Find the highest alert level.
             maxAlertLevel = e.alertLevel if e.alertLevel > maxAlertLevel
-            cEntries << e
+            cEntries << e unless cEntries.include?(e)
           end
         end
 
         # Only Task properties have dependencies.
-        #if property.is_a?(Task)
-        #  # Now gather all current entries of the dependency properties and find
-        #  # the date that is closest to and right before the given _date_.
-        #  property['startpreds', query.scenarioIdx].each do |p, onEnd|
-        #    # We only follow end->start dependencies.
-        #    next unless onEnd
-
-        #    currentEntriesR(date, p, minLevel, minDate, query).each do |e|
-        #      # Find the date of the most recent entry.
-        #      latestDate = e.date if latestDate.nil? || e.date > latestDate
-        #      # Find the highest alert level.
-        #      maxAlertLevel = e.alertLevel if e.alertLevel > maxAlertLevel
-        #      cEntries << e
-        #    end
-        #  end
-        #end
+        if (query.journalMode == :status_dep ||
+            query.journalMode == :alerts_dep) && property.is_a?(Task)
+          # Now gather all current entries of the dependency properties and find
+          # the date that is closest to and right before the given _date_.
+          property['startpreds', query.scenarioIdx].each do |p, onEnd|
+            # We only follow end->start dependencies.
+            next unless onEnd
+
+            currentEntriesR(date, p, minLevel, minDate, query).each do |e|
+              # Find the date of the most recent entry.
+              latestDate = e.date if latestDate.nil? || e.date > latestDate
+              # Find the highest alert level.
+              maxAlertLevel = e.alertLevel if e.alertLevel > maxAlertLevel
+              cEntries << e unless cEntries.include?(e)
+            end
+          end
+        end
 
         if !pEntries.empty? && (maxPAlertLevel > maxAlertLevel ||
                                 latestDate.nil? ||

data/lib/taskjuggler/PTNProxy.rb

@@ -25,13 +25,26 @@ class TaskJuggler
 
     def initialize(ptn, parent)
       @ptn = ptn
-      raise "Adopted classes must have a parent" unless parent
+      raise "Adopted properties must have a parent" unless parent
       @parent = parent
       @indext =  nil
       @tree = nil
       @level = -1
     end
 
+    # Return the logical ID of this node respesting adoptions. For PropertySet
+    # objects with a flat namespace, this is just the ID. Otherwise, the
+    # logical ID is composed of all IDs from the root node to this node,
+    # separating the IDs by a dot. In contrast to PropertyTreeNode::fullId()
+    # the logicalId takes the aption path into account.
+    def logicalId
+      if @ptn.propertySet.flatNamespace
+        @ptn.id
+      else
+        @parent.logicalId + '.' + @ptn.id[(@ptn.id.rindex('.') + 1).. -1]
+      end
+    end
+
     def set(attribute, val)
       if attribute == 'index'
         @index = val

data/lib/taskjuggler/ProjectFileParser.rb

@@ -60,6 +60,9 @@ class TaskJuggler
       @property = nil
       @scenarioIdx = 0
       initFileStack
+      # Stack for property IDs. Needed to handle nested 'supplement'
+      # statements.
+      @idStack = []
     end
 
     # Call this function to cleanup the parser structures after the file

data/lib/taskjuggler/ProjectFileScanner.rb

@@ -22,26 +22,26 @@ class TaskJuggler
     def initialize(masterFile)
       tokenPatterns = [
         # Any white spaces
-        [ nil, /\s+/, :tjp, method('newPos') ],
+        [ nil, '\s+', /\s+/, :tjp, method('newPos') ],
 
         # Single line comments starting with #
-        [ nil, /#.*\n?/, :tjp, method('newPos') ],
+        [ nil, '#.*\n?', /#.*\n?/, :tjp, method('newPos') ],
 
         # C++ style single line comments starting with //
-        [ nil, /\/\/.*\n?/, :tjp, method('newPos') ],
+        [ nil, '//.*\n?', /\/\/.*\n?/, :tjp, method('newPos') ],
 
         # C style single line comment /* .. */.
-        [ nil, /\/\*.*\*\//, :tjp, method('newPos') ],
+        [ nil, '/\*.*\*/', /\/\*.*\*\//, :tjp, method('newPos') ],
 
         # C style multi line comment: We need three patterns here. The first
         # one is for the start of the string. It switches the scanner mode to
         # the :cppComment mode.
-        [ nil, /\/\*([^*]*[^\/]|.*)\n/, :tjp, method('startComment') ],
+        [ nil, '/\*([^*]*[^/]|.*)\n', /\/\*([^*]*[^\/]|.*)\n/, :tjp, method('startComment') ],
         # This is the string end pattern. It switches back to tjp mode.
-        [ nil, /.*\*\//, :cppComment, method('endComment') ],
+        [ nil, '.*\*/', /.*\*\//, :cppComment, method('endComment') ],
         # This pattern matches string lines that contain neither the start,
         # nor the end of the string.
-        [ nil, /^.*\n/, :cppComment ],
+        [ nil, '^.*\n', /^.*\n/, :cppComment ],
 
         # Macro Call: This case is more complicated because we want to replace
         # macro calls inside of numbers, strings and identifiers. For this to
@@ -54,100 +54,102 @@ class TaskJuggler
         # with neither start nor end. Macro calls inside of strings need a
         # special start pattern that is active in the string modes. Both
         # patterns switch the scanner to macroCall mode.
-        [ nil, /([-a-zA-Z_0-9>:.+]*|"(\\"|[^"])*?|'(\\'|[^'])*?)?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
+        [ nil, '([-a-zA-Z_0-9>:.+]*|"(\\\\"|[^"])*?|\'(\\\\\'|[^\'])*?)?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\\\"|[^"])*")*', /([-a-zA-Z_0-9>:.+]*|"(\\"|[^"])*?|'(\\'|[^'])*?)?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
           :tjp, method('startMacroCall') ],
         # This pattern is similar to the previous one, but is active inside of
         # multi-line strings. The corresponding rule for sizzors strings
         # can be found below.
-        [ nil, /(\\"|[^"])*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
+        [ nil, '(\\\\"|[^"])*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\\\"|[^"])*")*',
+/(\\"|[^"])*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
           :dqString, method('startMacroCall') ],
-        [ nil, /(\\'|[^'])*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
+        [ nil, '(\\\\\'|[^\'])*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\\\"|[^"])*")*',
+/(\\'|[^'])*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
           :sqString, method('startMacroCall') ],
         # This pattern matches the end of a macro call. It injects the prefix
         # and the expanded macro into the scanner again. The mode is restored
         # to the previous mode.
-        [ nil, /(\s*"(\\"|[^"])*")*\s*\}/, :macroCall, method('endMacroCall') ],
+        [ nil, '(\s*"(\\\\"|[^"])*")*\s*\}', /(\s*"(\\"|[^"])*")*\s*\}/, :macroCall, method('endMacroCall') ],
         # This pattern collects macro call arguments in lines that contain
         # neither the start nor the end of the macro.
-        [ nil, /.*\n/, :macroCall, method('midMacroCall') ],
+        [ nil, '.*\n', /.*\n/, :macroCall, method('midMacroCall') ],
 
         # Environment variable reference. This is similar to the macro call,
         # but the it can only extend within the starting line.
-        [ nil, /([-a-zA-Z_0-9>:.+]*|"(\\"|[^"])*?|'(\\'|[^'])*?)?\$\([A-Z_][A-Z_0-9]*\)/,
+        [ nil, '([-a-zA-Z_0-9>:.+]*|"(\\\\"|[^"])*?|\'(\\\\\'|[^\'])*?)?\$\([A-Z_][A-Z_0-9]*\)', /([-a-zA-Z_0-9>:.+]*|"(\\"|[^"])*?|'(\\'|[^'])*?)?\$\([A-Z_][A-Z_0-9]*\)/,
           :tjp, method('environmentVariable') ],
         # An ID with a colon suffix: foo:
-        [ :ID_WITH_COLON, /[a-zA-Z_]\w*:/, :tjp, method('chop') ],
+        [ :ID_WITH_COLON, '[a-zA-Z_]\w*:', /[a-zA-Z_]\w*:/, :tjp, method('chop') ],
 
         # An absolute ID: a.b.c
-        [ :ABSOLUTE_ID, /[a-zA-Z_]\w*(\.[a-zA-Z_]\w*)+/ ],
+        [ :ABSOLUTE_ID, '[a-zA-Z_]\w*(\.[a-zA-Z_]\w*)+', /[a-zA-Z_]\w*(\.[a-zA-Z_]\w*)+/ ],
 
         # A normal ID: bar
-        [ :ID, /[a-zA-Z_]\w*/ ],
+        [ :ID, '[a-zA-Z_]\w*', /[a-zA-Z_]\w*/ ],
 
         # A date
-        [ :DATE, /\d{4}-\d{1,2}-\d{1,2}(-\d{1,2}:\d{1,2}(:\d{1,2})?(-[-+]?\d{4})?)?/, :tjp, method('to_date') ],
+        [ :DATE, '\d{4}-\d{1,2}-\d{1,2}(-\d{1,2}:\d{1,2}(:\d{1,2})?(-[-+]?\d{4})?)?', /\d{4}-\d{1,2}-\d{1,2}(-\d{1,2}:\d{1,2}(:\d{1,2})?(-[-+]?\d{4})?)?/, :tjp, method('to_date') ],
 
         # A time of day
-        [ :TIME, /\d{1,2}:\d{2}/, :tjp, method('to_time') ],
+        [ :TIME, '\d{1,2}:\d{2}', /\d{1,2}:\d{2}/, :tjp, method('to_time') ],
 
         # A floating point number (e. g. 3.143)
-        [ :FLOAT, /\d*\.\d+/, :tjp, method('to_f') ],
+        [ :FLOAT, '\d*\.\d+', /\d*\.\d+/, :tjp, method('to_f') ],
 
         # An integer number
-        [ :INTEGER, /\d+/, :tjp, method('to_i') ],
+        [ :INTEGER, '\d+', /\d+/, :tjp, method('to_i') ],
 
         # Multi line string enclosed with double quotes. The string may
         # contain double quotes prefixed by a backslash. The first rule
         # switches the scanner to dqString mode.
-        [ 'nil', /"(\\"|[^"])*/, :tjp, method('startStringDQ') ],
+        [ 'nil', '"(\\\\"|[^"])*', /"(\\"|[^"])*/, :tjp, method('startStringDQ') ],
         # Any line not containing the start or end.
-        [ 'nil', /^(\\"|[^"])*\n/, :dqString, method('midStringDQ') ],
+        [ 'nil', '^(\\\\"|[^"])*\n', /^(\\"|[^"])*\n/, :dqString, method('midStringDQ') ],
         # The end of the string.
-        [ :STRING, /(\\"|[^"])*"/, :dqString, method('endStringDQ') ],
+        [ :STRING, '(\\\\"|[^"])*"', /(\\"|[^"])*"/, :dqString, method('endStringDQ') ],
 
         # Multi line string enclosed with single quotes.
-        [ 'nil', /'(\\'|[^'])*/, :tjp, method('startStringSQ') ],
+        [ 'nil', '\'(\\\\\'|[^\'])*', /'(\\'|[^'])*/, :tjp, method('startStringSQ') ],
         # Any line not containing the start or end.
-        [ 'nil', /^(\\'|[^'])*\n/, :sqString, method('midStringSQ') ],
+        [ 'nil', '^(\\\\\'|[^\'])*\n', /^(\\'|[^'])*\n/, :sqString, method('midStringSQ') ],
         # The end of the string.
-        [ :STRING, /(\\'|[^'])*'/, :sqString, method('endStringSQ') ],
+        [ :STRING, '(\\\\\'|[^\'])*\'', /(\\'|[^'])*'/, :sqString, method('endStringSQ') ],
 
         # Scizzors marked string -8<- ... ->8-: The opening mark must be the
         # last thing in the line. The indentation of the first line after the
         # opening mark determines the indentation for all following lines. So,
         # we first switch the scanner to szrString1 mode.
-        [ 'nil', /-8<-.*\n/, :tjp, method('startStringSZR') ],
+        [ 'nil', '-8<-.*\n', /-8<-.*\n/, :tjp, method('startStringSZR') ],
         # Since the first line can be the last line (empty string case), we
         # need to detect the end in szrString1 and szrString mode. The
         # patterns switch the scanner back to tjp mode.
-        [ :STRING, /\s*->8-/, :szrString1, method('endStringSZR') ],
-        [ :STRING, /\s*->8-/, :szrString, method('endStringSZR') ],
+        [ :STRING, '\s*->8-', /\s*->8-/, :szrString1, method('endStringSZR') ],
+        [ :STRING, '\s*->8-', /\s*->8-/, :szrString, method('endStringSZR') ],
         # This rule handles macros inside of sizzors strings.
-        [ nil, /.*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
+        [ nil, '.*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\\\"|[^"])*")*', /.*?\$\{\s*([a-zA-Z_]\w*)(\s*"(\\"|[^"])*")*/,
           [ :szrString, :szrString1 ], method('startMacroCall') ],
         # Any line not containing the start or end.
-        [ 'nil', /.*\n/, :szrString1, method('firstStringSZR') ],
-        [ 'nil', /.*\n/, :szrString, method('midStringSZR') ],
+        [ 'nil', '.*\n', /.*\n/, :szrString1, method('firstStringSZR') ],
+        [ 'nil', '.*\n', /.*\n/, :szrString, method('midStringSZR') ],
 
         # Single line macro definition
-        [ :MACRO, /\[.*\]\n/, :tjp, method('chop2nl') ],
+        [ :MACRO, '\[.*\](\n|$)', /\[.*\]\n/, :tjp, method('chop2nl') ],
 
         # Multi line macro definition: The pattern switches the scanner into
         # macroDef mode.
-        [ nil, /\[.*\n/, :tjp, method('startMacroDef') ],
+        [ nil, '\[.*\n', /\[.*\n/, :tjp, method('startMacroDef') ],
         # The end of the macro is marked by a ']' that is immediately followed
         # by a line break. It switches the scanner back to tjp mode.
-        [ :MACRO, /.*\]\n/, :macroDef, method('endMacroDef') ],
+        [ :MACRO, '.*\](\n|$)', /.*\]\n/, :macroDef, method('endMacroDef') ],
         # Any line not containing the start or end.
-        [ nil, /.*\n/, :macroDef, method('midMacroDef') ],
+        [ nil, '.*\n', /.*\n/, :macroDef, method('midMacroDef') ],
 
         # Some multi-char literals.
-        [ :LITERAL, /<=?/ ],
-        [ :LITERAL, />=?/ ],
-        [ :LITERAL, /!=?/ ],
+        [ :LITERAL, '<=?', /<=?/ ],
+        [ :LITERAL, '>=?', />=?/ ],
+        [ :LITERAL, '!=?', /!=?/ ],
 
         # Everything else is returned as a single-char literal.
-        [ :LITERAL, /./ ]
+        [ :LITERAL, '.', /./ ]
       ]
 
       super(masterFile, Log, tokenPatterns, :tjp)
@@ -203,8 +205,12 @@ class TaskJuggler
     end
 
     def chop2nl(type, match)
-      # remove first and last 2 characters.
-      [ type, match[1..-3] ]
+      # remove first and last \n (if it exists) and the last character.
+      if match[-1] == ?\n
+        [ type, match[1..-3] ]
+      else
+        [ type, match[1..-2] ]
+      end
     end
 
     def startComment(type, match)
@@ -332,8 +338,12 @@ class TaskJuggler
 
     def endMacroDef(type, match)
       self.mode = :tjp
-      # Remove "]\n"
-      @macroDef += match[0..-3]
+      # Remove "](\n|$)"
+      if match[-1] == ?\n
+        @macroDef += match[0..-3]
+      else
+        @macroDef += match[0..-2]
+      end
       [ :MACRO, @macroDef ]
     end