taskjuggler 3.7.2 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac8d1b5b2a3a8a3de01a39de2ef9533e1c86ade627b4a27ccf83427dac988093
-  data.tar.gz: 7dea4a421b72b1a6645b0699bfb4076eaa4fc46fcd1274066503dc2c36d7a343
+  metadata.gz: 857d5bd99ca52e5b863d6968e48c2f34b3cbb81cbfa59b04697b1531419e8edf
+  data.tar.gz: df0d0a625d6cea59246c9ffb7fcd2f0600529503b52700edb82d0174b909573b
 SHA512:
-  metadata.gz: a07a210795fb27f09a3a8cc09fcef2ceb21c0f08d47cedb8655b3cc1df8201b7f309278dd1464961a5c9e06164d12ae85f979435a3007701428fe852801ffccc
-  data.tar.gz: dd87f1321f59cbd9399a2b25ab7d5f3d16a01952579f3b54abfb7e2794a0f322c047e4bfb93434569eaea9cf1fd98a7ca6737ed20bea9e5c00816c6ab0f64bc4
+  metadata.gz: 26af18badf0d016ae993e68d60738c9b80b226db67417411a2a6d9ba86bdd7fbab1dcc3cd9c2b3be98cd5bf890e03c56951af1bce01a512e0c87052ec0fe86e3
+  data.tar.gz: 43487b02812036a2216870b5066e360ba82da979574c68f329d99aa1bd31efdbc6378da3b5424496436e242153fdbe68668c3818583a70c792b110ce6c297be8

data/CHANGELOG

@@ -1,3 +1,11 @@
+= Next Release (Some Day)
+
+== Bug Fixes
+
+  * Properly handle time values past UTC+1200.
+  * Use double quotes for BSI column in CSV reports
+
+
 = Release 3.7.2 (2023-02-25)
 
 == New Features

data/data/tjp.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     TaskJuggler
 " Maintainer:   TaskJuggler Developers <taskjuggler-devel@googlegroups.com>
-" Last Change:  2023-02-25 11:11:12 +0100
+" Last Change:  2024-12-17 13:16:41 +0100
 " This file was automatically generated by VimSyntax.rb
 
 if exists("b:current_syntax")
@@ -21,12 +21,6 @@ syn keyword tjp_macro macro contained
 syn keyword tjp_project project contained
 syn keyword tjp_supplement supplement contained
 
-syn keyword tjp_account account contained
-hi def link tjp_account Function
-syn keyword tjp_accountreport accountreport contained
-hi def link tjp_accountreport Function
-syn keyword tjp_export export contained
-hi def link tjp_export Function
 syn keyword tjp_nikureport nikureport contained
 hi def link tjp_nikureport Function
 syn keyword tjp_resource resource contained
@@ -51,299 +45,13 @@ syn keyword tjp_timesheetreport timesheetreport contained
 hi def link tjp_timesheetreport Function
 syn keyword tjp_tracereport tracereport contained
 hi def link tjp_tracereport Function
+syn keyword tjp_account account contained
+hi def link tjp_account Function
+syn keyword tjp_accountreport accountreport contained
+hi def link tjp_accountreport Function
+syn keyword tjp_export export contained
+hi def link tjp_export Function
 
-syn keyword tjp_aggregate aggregate contained
-hi def link tjp_aggregate Type
-syn keyword tjp_credits credits contained
-hi def link tjp_credits Type
-syn keyword tjp_flags_account flags contained
-hi def link tjp_flags_account Type
-syn keyword tjp_allocate allocate contained
-hi def link tjp_allocate Type
-syn keyword tjp_alternative alternative contained
-hi def link tjp_alternative Type
-syn keyword tjp_select select contained
-hi def link tjp_select Type
-syn keyword tjp_persistent persistent contained
-hi def link tjp_persistent Type
-syn keyword tjp_mandatory mandatory contained
-hi def link tjp_mandatory Type
-syn keyword tjp_shifts_allocate shifts contained
-hi def link tjp_shifts_allocate Type
-syn keyword tjp_author author contained
-hi def link tjp_author Type
-syn keyword tjp_balance balance
-hi def link tjp_balance Type
-syn keyword tjp_overtime_booking overtime contained
-hi def link tjp_overtime_booking Type
-syn keyword tjp_sloppy_booking sloppy contained
-hi def link tjp_sloppy_booking Type
-syn keyword tjp_chargeset chargeset contained
-hi def link tjp_chargeset Type
-syn keyword tjp_columnid_activetasks activetasks
-hi def link tjp_columnid_activetasks Type
-syn keyword tjp_columnid_annualleave annualleave
-hi def link tjp_columnid_annualleave Type
-syn keyword tjp_columnid_annualleavebalance annualleavebalance
-hi def link tjp_columnid_annualleavebalance Type
-syn keyword tjp_columnid_annualleavelist annualleavelist
-hi def link tjp_columnid_annualleavelist Type
-syn keyword tjp_columnid_alert alert
-hi def link tjp_columnid_alert Type
-syn keyword tjp_columnid_alertmessages alertmessages
-hi def link tjp_columnid_alertmessages Type
-syn keyword tjp_columnid_alertsummaries alertsummaries
-hi def link tjp_columnid_alertsummaries Type
-syn keyword tjp_columnid_alerttrend alerttrend
-hi def link tjp_columnid_alerttrend Type
-syn keyword tjp_columnid_balance balance
-hi def link tjp_columnid_balance Type
-syn keyword tjp_columnid_bsi bsi
-hi def link tjp_columnid_bsi Type
-syn keyword tjp_columnid_chart chart
-hi def link tjp_columnid_chart Type
-syn keyword tjp_columnid_children children
-hi def link tjp_columnid_children 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
-hi def link tjp_columnid_completed Type
-syn keyword tjp_columnid_criticalness criticalness
-hi def link tjp_columnid_criticalness Type
-syn keyword tjp_columnid_cost cost
-hi def link tjp_columnid_cost Type
-syn keyword tjp_columnid_daily daily
-hi def link tjp_columnid_daily Type
-syn keyword tjp_columnid_directreports directreports
-hi def link tjp_columnid_directreports Type
-syn keyword tjp_columnid_duration duration
-hi def link tjp_columnid_duration Type
-syn keyword tjp_columnid_duties duties
-hi def link tjp_columnid_duties Type
-syn keyword tjp_columnid_efficiency efficiency
-hi def link tjp_columnid_efficiency Type
-syn keyword tjp_columnid_effort effort
-hi def link tjp_columnid_effort Type
-syn keyword tjp_columnid_effortdone effortdone
-hi def link tjp_columnid_effortdone Type
-syn keyword tjp_columnid_effortleft effortleft
-hi def link tjp_columnid_effortleft Type
-syn keyword tjp_columnid_email email
-hi def link tjp_columnid_email Type
-syn keyword tjp_columnid_end end
-hi def link tjp_columnid_end Type
-syn keyword tjp_columnid_flags flags
-hi def link tjp_columnid_flags Type
-syn keyword tjp_columnid_followers followers
-hi def link tjp_columnid_followers Type
-syn keyword tjp_columnid_freetime freetime
-hi def link tjp_columnid_freetime Type
-syn keyword tjp_columnid_freework freework
-hi def link tjp_columnid_freework Type
-syn keyword tjp_columnid_fte fte
-hi def link tjp_columnid_fte Type
-syn keyword tjp_columnid_gauge gauge
-hi def link tjp_columnid_gauge Type
-syn keyword tjp_columnid_headcount headcount
-hi def link tjp_columnid_headcount Type
-syn keyword tjp_columnid_hierarchindex hierarchindex
-hi def link tjp_columnid_hierarchindex Type
-syn keyword tjp_columnid_hourly hourly
-hi def link tjp_columnid_hourly Type
-syn keyword tjp_columnid_id id
-hi def link tjp_columnid_id Type
-syn keyword tjp_columnid_index index
-hi def link tjp_columnid_index Type
-syn keyword tjp_columnid_inputs inputs
-hi def link tjp_columnid_inputs Type
-syn keyword tjp_columnid_journal journal
-hi def link tjp_columnid_journal Type
-syn keyword tjp_columnid_journal_sub journal_sub
-hi def link tjp_columnid_journal_sub Type
-syn keyword tjp_columnid_journalmessages journalmessages
-hi def link tjp_columnid_journalmessages Type
-syn keyword tjp_columnid_journalsummaries journalsummaries
-hi def link tjp_columnid_journalsummaries Type
-syn keyword tjp_columnid_line line
-hi def link tjp_columnid_line Type
-syn keyword tjp_columnid_managers managers
-hi def link tjp_columnid_managers Type
-syn keyword tjp_columnid_maxend maxend
-hi def link tjp_columnid_maxend Type
-syn keyword tjp_columnid_maxstart maxstart
-hi def link tjp_columnid_maxstart Type
-syn keyword tjp_columnid_minend minend
-hi def link tjp_columnid_minend Type
-syn keyword tjp_columnid_minstart minstart
-hi def link tjp_columnid_minstart Type
-syn keyword tjp_columnid_monthly monthly
-hi def link tjp_columnid_monthly Type
-syn keyword tjp_columnid_no no
-hi def link tjp_columnid_no Type
-syn keyword tjp_columnid_name name
-hi def link tjp_columnid_name Type
-syn keyword tjp_columnid_note note
-hi def link tjp_columnid_note Type
-syn keyword tjp_columnid_opentasks opentasks
-hi def link tjp_columnid_opentasks Type
-syn keyword tjp_columnid_pathcriticalness pathcriticalness
-hi def link tjp_columnid_pathcriticalness Type
-syn keyword tjp_columnid_precursors precursors
-hi def link tjp_columnid_precursors Type
-syn keyword tjp_columnid_priority priority
-hi def link tjp_columnid_priority Type
-syn keyword tjp_columnid_quarterly quarterly
-hi def link tjp_columnid_quarterly Type
-syn keyword tjp_columnid_rate rate
-hi def link tjp_columnid_rate Type
-syn keyword tjp_columnid_reports reports
-hi def link tjp_columnid_reports Type
-syn keyword tjp_columnid_resources resources
-hi def link tjp_columnid_resources Type
-syn keyword tjp_columnid_responsible responsible
-hi def link tjp_columnid_responsible Type
-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
-hi def link tjp_columnid_sickleave Type
-syn keyword tjp_columnid_specialleave specialleave
-hi def link tjp_columnid_specialleave Type
-syn keyword tjp_columnid_start start
-hi def link tjp_columnid_start Type
-syn keyword tjp_columnid_status status
-hi def link tjp_columnid_status Type
-syn keyword tjp_columnid_targets targets
-hi def link tjp_columnid_targets Type
-syn keyword tjp_columnid_turnover turnover
-hi def link tjp_columnid_turnover Type
-syn keyword tjp_columnid_wbs wbs
-hi def link tjp_columnid_wbs Type
-syn keyword tjp_columnid_unpaidleave unpaidleave
-hi def link tjp_columnid_unpaidleave Type
-syn keyword tjp_columnid_weekly weekly
-hi def link tjp_columnid_weekly Type
-syn keyword tjp_columnid_yearly yearly
-hi def link tjp_columnid_yearly Type
-syn keyword tjp_celltext_column celltext contained
-hi def link tjp_celltext_column Type
-syn keyword tjp_cellcolor_column cellcolor contained
-hi def link tjp_cellcolor_column Type
-syn keyword tjp_end_column end contained
-hi def link tjp_end_column Type
-syn keyword tjp_fontcolor_column fontcolor contained
-hi def link tjp_fontcolor_column Type
-syn keyword tjp_halign_column halign contained
-hi def link tjp_halign_column Type
-syn keyword tjp_listitem_column listitem contained
-hi def link tjp_listitem_column Type
-syn keyword tjp_listtype_column listtype contained
-hi def link tjp_listtype_column Type
-syn keyword tjp_period_column period contained
-hi def link tjp_period_column Type
-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
-hi def link tjp_tooltip_column Type
-syn keyword tjp_width_column width contained
-hi def link tjp_width_column Type
-syn keyword tjp_currencyformat currencyformat contained
-hi def link tjp_currencyformat Type
-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
-hi def link tjp_date_extend Type
-syn keyword tjp_number_extend number contained
-hi def link tjp_number_extend Type
-syn keyword tjp_reference_extend reference contained
-hi def link tjp_reference_extend Type
-syn keyword tjp_richtext_extend richtext contained
-hi def link tjp_richtext_extend Type
-syn keyword tjp_text_extend text contained
-hi def link tjp_text_extend Type
-syn keyword tjp_inherit_extend inherit contained
-hi def link tjp_inherit_extend Type
-syn keyword tjp_scenariospecific_extend scenariospecific contained
-hi def link tjp_scenariospecific_extend Type
-syn keyword tjp_fail fail contained
-hi def link tjp_fail Type
-syn keyword tjp_formats formats contained
-hi def link tjp_formats Type
-syn keyword tjp_hasalert hasalert contained
-hi def link tjp_hasalert Type
-syn keyword tjp_isactive isactive contained
-hi def link tjp_isactive Type
-syn keyword tjp_ischildof ischildof contained
-hi def link tjp_ischildof Type
-syn keyword tjp_isdependencyof isdependencyof contained
-hi def link tjp_isdependencyof Type
-syn keyword tjp_isdutyof isdutyof contained
-hi def link tjp_isdutyof Type
-syn keyword tjp_isfeatureof isfeatureof contained
-hi def link tjp_isfeatureof Type
-syn keyword tjp_isleaf isleaf contained
-hi def link tjp_isleaf Type
-syn keyword tjp_ismilestone ismilestone contained
-hi def link tjp_ismilestone Type
-syn keyword tjp_isongoing isongoing contained
-hi def link tjp_isongoing Type
-syn keyword tjp_isresource isresource contained
-hi def link tjp_isresource Type
-syn keyword tjp_isresponsibilityof isresponsibilityof contained
-hi def link tjp_isresponsibilityof Type
-syn keyword tjp_istask istask contained
-hi def link tjp_istask Type
-syn keyword tjp_isvalid isvalid contained
-hi def link tjp_isvalid Type
-syn keyword tjp_treelevel treelevel contained
-hi def link tjp_treelevel Type
-syn keyword tjp_halign_center center
-hi def link tjp_halign_center Type
-syn keyword tjp_halign_left left
-hi def link tjp_halign_left Type
-syn keyword tjp_halign_right right
-hi def link tjp_halign_right Type
-syn keyword tjp_headline headline contained
-hi def link tjp_headline Type
-syn keyword tjp_hideaccount hideaccount contained
-hi def link tjp_hideaccount Type
-syn keyword tjp_hidejournalentry hidejournalentry contained
-hi def link tjp_hidejournalentry Type
-syn keyword tjp_hideresource hideresource contained
-hi def link tjp_hideresource Type
 syn keyword tjp_hidetask hidetask contained
 hi def link tjp_hidetask Type
 syn keyword tjp_icalreport icalreport contained
@@ -652,6 +360,298 @@ syn keyword tjp_workinghours_resource workinghours contained
 hi def link tjp_workinghours_resource Type
 syn keyword tjp_workinghours_shift workinghours contained
 hi def link tjp_workinghours_shift Type
+syn keyword tjp_aggregate aggregate contained
+hi def link tjp_aggregate Type
+syn keyword tjp_credits credits contained
+hi def link tjp_credits Type
+syn keyword tjp_flags_account flags contained
+hi def link tjp_flags_account Type
+syn keyword tjp_allocate allocate contained
+hi def link tjp_allocate Type
+syn keyword tjp_alternative alternative contained
+hi def link tjp_alternative Type
+syn keyword tjp_select select contained
+hi def link tjp_select Type
+syn keyword tjp_persistent persistent contained
+hi def link tjp_persistent Type
+syn keyword tjp_mandatory mandatory contained
+hi def link tjp_mandatory Type
+syn keyword tjp_shifts_allocate shifts contained
+hi def link tjp_shifts_allocate Type
+syn keyword tjp_author author contained
+hi def link tjp_author Type
+syn keyword tjp_balance balance
+hi def link tjp_balance Type
+syn keyword tjp_overtime_booking overtime contained
+hi def link tjp_overtime_booking Type
+syn keyword tjp_sloppy_booking sloppy contained
+hi def link tjp_sloppy_booking Type
+syn keyword tjp_chargeset chargeset contained
+hi def link tjp_chargeset Type
+syn keyword tjp_columnid_activetasks activetasks
+hi def link tjp_columnid_activetasks Type
+syn keyword tjp_columnid_annualleave annualleave
+hi def link tjp_columnid_annualleave Type
+syn keyword tjp_columnid_annualleavebalance annualleavebalance
+hi def link tjp_columnid_annualleavebalance Type
+syn keyword tjp_columnid_annualleavelist annualleavelist
+hi def link tjp_columnid_annualleavelist Type
+syn keyword tjp_columnid_alert alert
+hi def link tjp_columnid_alert Type
+syn keyword tjp_columnid_alertmessages alertmessages
+hi def link tjp_columnid_alertmessages Type
+syn keyword tjp_columnid_alertsummaries alertsummaries
+hi def link tjp_columnid_alertsummaries Type
+syn keyword tjp_columnid_alerttrend alerttrend
+hi def link tjp_columnid_alerttrend Type
+syn keyword tjp_columnid_balance balance
+hi def link tjp_columnid_balance Type
+syn keyword tjp_columnid_bsi bsi
+hi def link tjp_columnid_bsi Type
+syn keyword tjp_columnid_chart chart
+hi def link tjp_columnid_chart Type
+syn keyword tjp_columnid_children children
+hi def link tjp_columnid_children 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
+hi def link tjp_columnid_completed Type
+syn keyword tjp_columnid_criticalness criticalness
+hi def link tjp_columnid_criticalness Type
+syn keyword tjp_columnid_cost cost
+hi def link tjp_columnid_cost Type
+syn keyword tjp_columnid_daily daily
+hi def link tjp_columnid_daily Type
+syn keyword tjp_columnid_directreports directreports
+hi def link tjp_columnid_directreports Type
+syn keyword tjp_columnid_duration duration
+hi def link tjp_columnid_duration Type
+syn keyword tjp_columnid_duties duties
+hi def link tjp_columnid_duties Type
+syn keyword tjp_columnid_efficiency efficiency
+hi def link tjp_columnid_efficiency Type
+syn keyword tjp_columnid_effort effort
+hi def link tjp_columnid_effort Type
+syn keyword tjp_columnid_effortdone effortdone
+hi def link tjp_columnid_effortdone Type
+syn keyword tjp_columnid_effortleft effortleft
+hi def link tjp_columnid_effortleft Type
+syn keyword tjp_columnid_email email
+hi def link tjp_columnid_email Type
+syn keyword tjp_columnid_end end
+hi def link tjp_columnid_end Type
+syn keyword tjp_columnid_flags flags
+hi def link tjp_columnid_flags Type
+syn keyword tjp_columnid_followers followers
+hi def link tjp_columnid_followers Type
+syn keyword tjp_columnid_freetime freetime
+hi def link tjp_columnid_freetime Type
+syn keyword tjp_columnid_freework freework
+hi def link tjp_columnid_freework Type
+syn keyword tjp_columnid_fte fte
+hi def link tjp_columnid_fte Type
+syn keyword tjp_columnid_gauge gauge
+hi def link tjp_columnid_gauge Type
+syn keyword tjp_columnid_headcount headcount
+hi def link tjp_columnid_headcount Type
+syn keyword tjp_columnid_hierarchindex hierarchindex
+hi def link tjp_columnid_hierarchindex Type
+syn keyword tjp_columnid_hourly hourly
+hi def link tjp_columnid_hourly Type
+syn keyword tjp_columnid_id id
+hi def link tjp_columnid_id Type
+syn keyword tjp_columnid_index index
+hi def link tjp_columnid_index Type
+syn keyword tjp_columnid_inputs inputs
+hi def link tjp_columnid_inputs Type
+syn keyword tjp_columnid_journal journal
+hi def link tjp_columnid_journal Type
+syn keyword tjp_columnid_journal_sub journal_sub
+hi def link tjp_columnid_journal_sub Type
+syn keyword tjp_columnid_journalmessages journalmessages
+hi def link tjp_columnid_journalmessages Type
+syn keyword tjp_columnid_journalsummaries journalsummaries
+hi def link tjp_columnid_journalsummaries Type
+syn keyword tjp_columnid_line line
+hi def link tjp_columnid_line Type
+syn keyword tjp_columnid_managers managers
+hi def link tjp_columnid_managers Type
+syn keyword tjp_columnid_maxend maxend
+hi def link tjp_columnid_maxend Type
+syn keyword tjp_columnid_maxstart maxstart
+hi def link tjp_columnid_maxstart Type
+syn keyword tjp_columnid_minend minend
+hi def link tjp_columnid_minend Type
+syn keyword tjp_columnid_minstart minstart
+hi def link tjp_columnid_minstart Type
+syn keyword tjp_columnid_monthly monthly
+hi def link tjp_columnid_monthly Type
+syn keyword tjp_columnid_no no
+hi def link tjp_columnid_no Type
+syn keyword tjp_columnid_name name
+hi def link tjp_columnid_name Type
+syn keyword tjp_columnid_note note
+hi def link tjp_columnid_note Type
+syn keyword tjp_columnid_opentasks opentasks
+hi def link tjp_columnid_opentasks Type
+syn keyword tjp_columnid_pathcriticalness pathcriticalness
+hi def link tjp_columnid_pathcriticalness Type
+syn keyword tjp_columnid_precursors precursors
+hi def link tjp_columnid_precursors Type
+syn keyword tjp_columnid_priority priority
+hi def link tjp_columnid_priority Type
+syn keyword tjp_columnid_quarterly quarterly
+hi def link tjp_columnid_quarterly Type
+syn keyword tjp_columnid_rate rate
+hi def link tjp_columnid_rate Type
+syn keyword tjp_columnid_reports reports
+hi def link tjp_columnid_reports Type
+syn keyword tjp_columnid_resources resources
+hi def link tjp_columnid_resources Type
+syn keyword tjp_columnid_responsible responsible
+hi def link tjp_columnid_responsible Type
+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
+hi def link tjp_columnid_sickleave Type
+syn keyword tjp_columnid_specialleave specialleave
+hi def link tjp_columnid_specialleave Type
+syn keyword tjp_columnid_start start
+hi def link tjp_columnid_start Type
+syn keyword tjp_columnid_status status
+hi def link tjp_columnid_status Type
+syn keyword tjp_columnid_targets targets
+hi def link tjp_columnid_targets Type
+syn keyword tjp_columnid_turnover turnover
+hi def link tjp_columnid_turnover Type
+syn keyword tjp_columnid_wbs wbs
+hi def link tjp_columnid_wbs Type
+syn keyword tjp_columnid_unpaidleave unpaidleave
+hi def link tjp_columnid_unpaidleave Type
+syn keyword tjp_columnid_weekly weekly
+hi def link tjp_columnid_weekly Type
+syn keyword tjp_columnid_yearly yearly
+hi def link tjp_columnid_yearly Type
+syn keyword tjp_celltext_column celltext contained
+hi def link tjp_celltext_column Type
+syn keyword tjp_cellcolor_column cellcolor contained
+hi def link tjp_cellcolor_column Type
+syn keyword tjp_end_column end contained
+hi def link tjp_end_column Type
+syn keyword tjp_fontcolor_column fontcolor contained
+hi def link tjp_fontcolor_column Type
+syn keyword tjp_halign_column halign contained
+hi def link tjp_halign_column Type
+syn keyword tjp_listitem_column listitem contained
+hi def link tjp_listitem_column Type
+syn keyword tjp_listtype_column listtype contained
+hi def link tjp_listtype_column Type
+syn keyword tjp_period_column period contained
+hi def link tjp_period_column Type
+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
+hi def link tjp_tooltip_column Type
+syn keyword tjp_width_column width contained
+hi def link tjp_width_column Type
+syn keyword tjp_currencyformat currencyformat contained
+hi def link tjp_currencyformat Type
+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
+hi def link tjp_date_extend Type
+syn keyword tjp_number_extend number contained
+hi def link tjp_number_extend Type
+syn keyword tjp_reference_extend reference contained
+hi def link tjp_reference_extend Type
+syn keyword tjp_richtext_extend richtext contained
+hi def link tjp_richtext_extend Type
+syn keyword tjp_text_extend text contained
+hi def link tjp_text_extend Type
+syn keyword tjp_inherit_extend inherit contained
+hi def link tjp_inherit_extend Type
+syn keyword tjp_scenariospecific_extend scenariospecific contained
+hi def link tjp_scenariospecific_extend Type
+syn keyword tjp_fail fail contained
+hi def link tjp_fail Type
+syn keyword tjp_formats formats contained
+hi def link tjp_formats Type
+syn keyword tjp_hasalert hasalert contained
+hi def link tjp_hasalert Type
+syn keyword tjp_isactive isactive contained
+hi def link tjp_isactive Type
+syn keyword tjp_ischildof ischildof contained
+hi def link tjp_ischildof Type
+syn keyword tjp_isdependencyof isdependencyof contained
+hi def link tjp_isdependencyof Type
+syn keyword tjp_isdutyof isdutyof contained
+hi def link tjp_isdutyof Type
+syn keyword tjp_isfeatureof isfeatureof contained
+hi def link tjp_isfeatureof Type
+syn keyword tjp_isleaf isleaf contained
+hi def link tjp_isleaf Type
+syn keyword tjp_ismilestone ismilestone contained
+hi def link tjp_ismilestone Type
+syn keyword tjp_isongoing isongoing contained
+hi def link tjp_isongoing Type
+syn keyword tjp_isresource isresource contained
+hi def link tjp_isresource Type
+syn keyword tjp_isresponsibilityof isresponsibilityof contained
+hi def link tjp_isresponsibilityof Type
+syn keyword tjp_istask istask contained
+hi def link tjp_istask Type
+syn keyword tjp_isvalid isvalid contained
+hi def link tjp_isvalid Type
+syn keyword tjp_treelevel treelevel contained
+hi def link tjp_treelevel Type
+syn keyword tjp_halign_center center
+hi def link tjp_halign_center Type
+syn keyword tjp_halign_left left
+hi def link tjp_halign_left Type
+syn keyword tjp_halign_right right
+hi def link tjp_halign_right Type
+syn keyword tjp_headline headline contained
+hi def link tjp_headline Type
+syn keyword tjp_hideaccount hideaccount contained
+hi def link tjp_hideaccount Type
+syn keyword tjp_hidejournalentry hidejournalentry contained
+hi def link tjp_hidejournalentry Type
+syn keyword tjp_hideresource hideresource contained
+hi def link tjp_hideresource Type
 
 syn match tjparg contained /\${.*}/
 syn match tjpcomment /#.*$/
@@ -662,15 +662,6 @@ syn match tjpdate /\s\d\{4}-\d\{1,2}-\d\{1,2}\(-\d\{1,2}:\d\{1,2}\(:\d\{1,2}\)\?
 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_auxdir_report,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
-syn region tjpblk_number_extend start=/^\s*number\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_number_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
-syn region tjpblk_text_extend start=/^\s*text\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_text_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
 syn region tjpblk_icalreport start=/^\s*icalreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_icalreport,tjp_hideresource,tjp_hidejournalentry,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_rollupresource,tjp_rolluptask,tjp_novevents,tjp_scenario_ical
 syn region tjpblk_journalentry start=/^\s*journalentry\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_journalentry,tjp_alert,tjp_author,tjp_flags_journalentry,tjp_summary,tjp_details contained
 syn region tjpblk_dailymax start=/^\s*dailymax\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_dailymax,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
@@ -714,6 +705,15 @@ syn region tjpblk_task_timesheet start=/^\s*task\s.*{\s*$/ end=/^\s*}\s*$/ trans
 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_auxdir_report,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_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_auxdir_report,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
+syn region tjpblk_number_extend start=/^\s*number\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_number_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
+syn region tjpblk_text_extend start=/^\s*text\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_text_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
 syn region tjpblk_macro start=/macro\s\+\h\w*\s*\[/ end=/\]$/ transparent fold contains=ALL
 syn region tjpstring start=/"/ skip=/\\"/ end=/"/
 syn region tjpstring start=/'/ skip=/\\'/ end=/'/