taskjuggler 3.0.0 → 3.1.0

data/CHANGELOG

@@ -1,3 +1,64 @@
+= Release 3.1.0 (2012-01-11)
+
+== New Features
+
+  * Added a new report column 'balance' for account reports.
+  * Making the tj3man output more readable with colors.
+  * New attribute 'leaveallowance'
+  * New report columns to report leaves for report period
+  * Replaced 'vacation' with more flexible 'leaves' attribute.
+  * Adding colorized terminal output.
+  * The <fcol:...> rich text token now supports RGB values.
+  * 'headcount' is now also supported for tasks.
+  * Adding examples for textreport and attributes to manual.
+  * Make TaskJuggler usable as a ToDo list manager.
+  * Supported alert levels can now be freely defined.
+  * Added new logical function 'isresponsibilityof'.
+  * Support '-' argument for 'balance' to clear a set balance.
+  * Gantt charts now use normal task bars for rolled-up tasks.
+  * Adding support for new account attribute 'credits'.
+  * Added a project template to the examples directory.
+  * Adding query attribute 'turnover' for account reports.
+  * Adopted tasks are now included in the reports.
+  * Don't include deprecated keywords in vim syntax file.
+  * RichText now also supports colored text.
+  * Added error message for no longer supported keywords.
+  * Clearly mark deprecated and removed keywords in syntax manual.
+  * 'accountreports' are back again.
+
+== Bug Fixes
+
+  * Abort tj3 if error occurs during --freeze operation.
+  * Fix vim :make command to not be confused by tj3 output.
+  * Make the fraction seperator of the 'numberformat' option work.
+  * Prevent years in calendar column headers from being chopped-off.
+  * Make tj3man work with Ruby 1.8 again.
+  * Fixing a crash on bad syntax in a query for 'resources'.
+  * Add gem dependencies to from-git install section in the manual.
+  * Prevent crash when reports only have disabled scenarios.
+  * Properly report syntax errors with open context at file end.
+  * Don't crash when no tasks fit but reports are forced.
+  * Colorize alert tags in standalone mode.
+  * Make timesheets work with custom yearlyworkinghours.
+  * fte and headcount column now have a proper header
+  * Don't show any progress information when --silent is set.
+  * 'headcount' column now shows proper values.
+  * Fix the 'complete' value of container tasks.
+  * Don't crash when HTML files cannot be written.
+  * Fixed a locking bug in the batch processor.
+  * Eliminate duplicate entries in status sheet confirmation.
+  * Show correct documentation of alert levels in the manual.
+  * Rich text enumerations many have a blank lines in between.
+  * Custom alignment, font and cell color now also work in calendar cells.
+  * Respect limits for all requested resources of that limit.
+  * Properly position the Gantt chart container for very small bars.
+  * Clarify the use of 'purge' in the user manual.
+  * Don't crash when generating certail iCal reports.
+  * Correct syntax of 'export' in reference manual.
+  * Allocate now also supports 'shifts' instead of the deprecated 'shift'.
+  * Make 'tj3client report' work with additional report files.
+
+
 = Release 3.0.0 (2011-11-01)
 
 == New Features

data/README.rdoc

@@ -1,4 +1,4 @@
-= About {TaskJuggler III}[http://www.taskjuggler.org]
+= About {TaskJuggler}[http://www.taskjuggler.org]
 
 TaskJuggler is a modern and powerful, Free and Open Source Software project
 management tool. Its new approach to project planing and tracking is more
@@ -33,40 +33,55 @@ sound surprising at first, but this software does not need a graphical user
 interface. A command shell, a plain text editor (no word processor!) and a web
 browser is all you need for your work.
 
-TaskJuggler has not yet been released as a stable version. The primary
-reason is that we don't want to freeze the syntax before it has been used by a
-larger audience. By now, changes should be small, but we cannot yet rule out
-minor compatibility issues when upgrading to a newer version. We also have a
-fairly small test suite. It's quite possible, that you will run into a bug or
-two. Please report it into our {issue
-tracker}[https://github.com/taskjuggler/TaskJuggler/issues].
-
 = Features and Highlights
 
+== Basic Properties
+
 * Manages tasks, resources and accounts of your project
+* Powerful to-do list management
+* Detailed reference manual
+* Simple installation
+* Runs on all Linux, Unix, Windows, MacOS and several other operating systems
+* Full integration with Vim text editor
+
+== Advanced Scheduling
+
 * Automatic resource leveling and tasks conflict resolution
-* Comprehensive and flexible reports so you can find the information you need when you need it
-* Project tracking and status reporting with dashboard support
-* Time and status sheet reporting infrastructure
 * Unlimited number of scenarios (baselines) of the same project for what-if analysis
-* Projects can be combined to larger projects
-* Multiple project managers can work on the same project
-* Flexible working hours and vacation handling
+* Flexible working hours and leave management
 * Support for shift working
 * Multiple time zone support
+
+== Accounting
+
 * Tasks may have initial costs, finishing costs
-* Resources may have running costs
+* Resources may have usage based costs
+* Task and/or resource base cost models
 * Support for profit/loss analysis
-* HTML reports for Web publishing
-* CSV data export for data exchange productivity suites
-* iCalendar export for data exchange with calendar applications
-* Built-in web server for dynamic and interactive reports
-* Powerful project description syntax with macro support
+
+== Reporting
+
+* Comprehensive and flexible reports so you can find the information you need when you need it
+* Powerful filtering functions to provide the right amount of detail to the right audience
+* Time and status sheet reporting infrastructure
+* Project tracking and status reporting with dashboard support
+
+== Scaling and Enterprise Features
+
+* Projects can be combined to larger projects
 * Support for central resource allocation database
+* Manages roles and complex reporting lines
+* Powerful project description language with macro support
 * Scales well on multi-core or multi-CPU systems
-* Full integration with Vim text editor
-* Runs on all Linux, Unix, Windows, MacOS and several other operating systems
-* Simple installation
+* Support for project management teams and revision control systems
+
+== Web Publishing and Groupware Functions
+
+* HTML reports for web publishing
+* CSV data export for exchange with popular office software
+* iCalendar export for data exchange with calendar and productivity applications
+* Built-in web server for dynamic and interactive reports
+* Server based time sheet system for status and actual work reporting
 
 = Installation
 
@@ -78,14 +93,15 @@ To learn more about how to use TaskJuggler please see the {user
 manual}[http://www.taskjuggler.org/tj3/manual/index.html]. It also contains a
 {tutorial}[http://www.taskjuggler.org/tj3/manual/Tutorial.html#The_Tutorial_Your_first_Project]
 to get you started. It will tell you how to generate HTML reports
-like {these}[http://www.taskjuggler.org/tj3/examples/Overview.html]
+like
+{these}[http://www.taskjuggler.org/tj3/examples/Tutorial/Overview.html]
 from such a {project
-description}[http://www.taskjuggler.org/tj3/examples/tutorial.tjp].
+description}[http://www.taskjuggler.org/tj3/examples/Tutorial/tutorial.tjp].
 
 = Getting Help and reporting Bugs
 
 There are several mailing list for TaskJuggler users and developers.
-Please see {this page}[http://www.taskjuggler.org/forum.php] for
+Please see {this page}[http://www.taskjuggler.org/contact.html] for
 details. If you have a question about TaskJuggler usage, the user
 list is the best place to go. Please remain subscribed and help other
 users when you get more proficient in TaskJuggler.

data/data/css/tjreport.css

@@ -297,6 +297,36 @@ p.tj_journal {
   overflow:hidden;
   padding:0px;
 }
+.costaccountcell1 {
+  background-color:#fff2eb;
+  white-space:nowrap;
+  padding:0px;
+}
+.costaccountcell2 {
+  background-color:#ebdfd9;
+  white-space:nowrap;
+  padding:0px;
+}
+.revenueaccountcell1 {
+  background-color:#cbffcc;
+  white-space:nowrap;
+  padding:0px;
+}
+.revenueaccountcell2 {
+  background-color:#a6d0a6;
+  white-space:nowrap;
+  padding:0px;
+}
+.accountcell1 {
+  background-color:#ebf2ff;
+  white-space:nowrap;
+  padding:0px;
+}
+.accountcell2 {
+  background-color:#d9dfeb;
+  white-space:nowrap;
+  padding:0px;
+}
 .taskcell1 {
   background-color:#ebf2ff;
   white-space:nowrap;

data/data/tjp.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     TaskJuggler
 " Maintainer:   TaskJuggler Developers <taskjuggler-devel@googlegroups.com>
-" Last Change:  2011-11-01 11:35:00 +0100
+" Last Change:  2012-01-11 21:58:17 +0100
 " This file was automatically generated by VimSyntax.rb
 
 if exists("b:current_syntax")
@@ -12,8 +12,8 @@ setlocal softtabstop=2
 setlocal cindent shiftwidth=2
 setlocal tabstop=2
 setlocal expandtab
-setlocal cinoptions=g0,t0,+0,(0,c0,C1
-setlocal cinwords=account,allocate,booking,columns,dailymax,dailymin,date,depends,export,extend,icalreport,include,journalentry,limits,maximum,minimum,monthlymax,monthlymin,navigator,newtask,nikureport,precedes,project,projection,reference,resource,resourcereport,richtext,scenario,shift,status,statussheet,statussheetreport,supplement,tagfile,task,taskreport,text,textreport,timesheet,timesheetreport,weeklymax,weeklymin
+setlocal cinoptions=g0,t0,+0,(0,c0,C1,n-2
+setlocal cinwords=account,accountreport,allocate,booking,columns,dailymax,dailymin,date,depends,export,extend,icalreport,include,journalentry,limits,maximum,minimum,monthlymax,monthlymin,navigator,newtask,nikureport,precedes,project,reference,resource,resourcereport,richtext,scenario,shift,status,statussheet,statussheetreport,supplement,tagfile,task,taskreport,text,textreport,timesheet,timesheetreport,weeklymax,weeklymin
 setlocal cinkeys=0{,0},!^F,o,O
 setlocal cindent
 
@@ -23,18 +23,16 @@ 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_report_resourcereport resourcereport contained
-hi def link tjp_report_resourcereport Function
-syn keyword tjp_report_taskreport taskreport contained
-hi def link tjp_report_taskreport Function
-syn keyword tjp_report_textreport textreport contained
-hi def link tjp_report_textreport Function
 syn keyword tjp_resource resource contained
 hi def link tjp_resource Function
+syn keyword tjp_resourcereport resourcereport contained
+hi def link tjp_resourcereport Function
 syn keyword tjp_scenario scenario contained
 hi def link tjp_scenario Function
 syn keyword tjp_shift shift contained
@@ -45,26 +43,30 @@ syn keyword tjp_task_statussheet task contained
 hi def link tjp_task_statussheet Function
 syn keyword tjp_task task contained
 hi def link tjp_task Function
+syn keyword tjp_taskreport taskreport contained
+hi def link tjp_taskreport Function
+syn keyword tjp_textreport textreport contained
+hi def link tjp_textreport Function
 syn keyword tjp_timesheetreport timesheetreport contained
 hi def link tjp_timesheetreport Function
 
-syn keyword tjp_credit credit contained
-hi def link tjp_credit 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_limits_allocate limits contained
-hi def link tjp_limits_allocate 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 shift contained
+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
@@ -76,6 +78,10 @@ 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_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_alert alert
 hi def link tjp_columnid_alert Type
 syn keyword tjp_columnid_alertmessages alertmessages
@@ -84,6 +90,10 @@ 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_complete complete
@@ -124,6 +134,8 @@ 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
@@ -186,6 +198,10 @@ syn keyword tjp_columnid_scenario scenario
 hi def link tjp_columnid_scenario 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
@@ -194,8 +210,8 @@ syn keyword tjp_columnid_targets targets
 hi def link tjp_columnid_targets Type
 syn keyword tjp_columnid_wbs wbs
 hi def link tjp_columnid_wbs Type
-syn keyword tjp_columnid_bsi bsi
-hi def link tjp_columnid_bsi 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
@@ -276,6 +292,8 @@ 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_treelevel treelevel contained
@@ -288,6 +306,8 @@ 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
@@ -314,6 +334,10 @@ syn keyword tjp_alert alert contained
 hi def link tjp_alert Type
 syn keyword tjp_flags_journalentry flags contained
 hi def link tjp_flags_journalentry Type
+syn keyword tjp_leaveallowance leaveallowances contained
+hi def link tjp_leaveallowance Type
+syn keyword tjp_leaves leaves
+hi def link tjp_leaves Type
 syn keyword tjp_end_limit end contained
 hi def link tjp_end_limit Type
 syn keyword tjp_period_limit period contained
@@ -346,6 +370,8 @@ syn keyword tjp_timeoff_nikureport timeoff contained
 hi def link tjp_timeoff_nikureport Type
 syn keyword tjp_numberformat numberformat contained
 hi def link tjp_numberformat Type
+syn keyword tjp_alertlevels alertlevels contained
+hi def link tjp_alertlevels Type
 syn keyword tjp_currency currency contained
 hi def link tjp_currency Type
 syn keyword tjp_dailyworkinghours dailyworkinghours contained
@@ -366,10 +392,6 @@ syn keyword tjp_weekstartssunday weekstartssunday contained
 hi def link tjp_weekstartssunday Type
 syn keyword tjp_yearlyworkingdays yearlyworkingdays contained
 hi def link tjp_yearlyworkingdays Type
-syn keyword tjp_sloppy_projection sloppy contained
-hi def link tjp_sloppy_projection Type
-syn keyword tjp_strict_projection strict contained
-hi def link tjp_strict_projection Type
 syn keyword tjp_copyright copyright
 hi def link tjp_copyright Type
 syn keyword tjp_flags flags
@@ -386,6 +408,8 @@ syn keyword tjp_vacation vacation
 hi def link tjp_vacation Type
 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_caption caption contained
 hi def link tjp_caption Type
 syn keyword tjp_center center contained
@@ -444,24 +468,18 @@ syn keyword tjp_managers managers contained
 hi def link tjp_managers Type
 syn keyword tjp_rate_resource rate contained
 hi def link tjp_rate_resource Type
-syn keyword tjp_shift_resource shift contained
-hi def link tjp_shift_resource Type
 syn keyword tjp_shifts_resource shifts contained
 hi def link tjp_shifts_resource Type
 syn keyword tjp_vacation_resource vacation contained
 hi def link tjp_vacation_resource Type
+syn keyword tjp_rollupaccount rollupaccount contained
+hi def link tjp_rollupaccount Type
 syn keyword tjp_rollupresource rollupresource contained
 hi def link tjp_rollupresource Type
 syn keyword tjp_rolluptask rolluptask contained
 hi def link tjp_rolluptask Type
 syn keyword tjp_active active contained
 hi def link tjp_active Type
-syn keyword tjp_disabled disabled contained
-hi def link tjp_disabled Type
-syn keyword tjp_enabled enabled contained
-hi def link tjp_enabled Type
-syn keyword tjp_projection projection contained
-hi def link tjp_projection Type
 syn keyword tjp_replace replace contained
 hi def link tjp_replace Type
 syn keyword tjp_timezone_shift timezone contained
@@ -470,6 +488,8 @@ syn keyword tjp_vacation_shift vacation contained
 hi def link tjp_vacation_shift Type
 syn keyword tjp_sortjournalentries sortjournalentries contained
 hi def link tjp_sortjournalentries Type
+syn keyword tjp_sortaccounts sortaccounts contained
+hi def link tjp_sortaccounts Type
 syn keyword tjp_sortresources sortresources contained
 hi def link tjp_sortresources Type
 syn keyword tjp_sorttasks sorttasks contained
@@ -498,8 +518,6 @@ syn keyword tjp_onstart onstart contained
 hi def link tjp_onstart Type
 syn keyword tjp_period_task period contained
 hi def link tjp_period_task Type
-syn keyword tjp_account_task account contained
-hi def link tjp_account_task Type
 syn keyword tjp_booking_task booking contained
 hi def link tjp_booking_task Type
 syn keyword tjp_charge charge contained
@@ -514,8 +532,6 @@ syn keyword tjp_effort effort contained
 hi def link tjp_effort Type
 syn keyword tjp_end end contained
 hi def link tjp_end Type
-syn keyword tjp_endcredit endcredit contained
-hi def link tjp_endcredit Type
 syn keyword tjp_flags_task flags contained
 hi def link tjp_flags_task Type
 syn keyword tjp_length length contained
@@ -532,8 +548,6 @@ syn keyword tjp_minend minend contained
 hi def link tjp_minend Type
 syn keyword tjp_minstart minstart contained
 hi def link tjp_minstart Type
-syn keyword tjp_startcredit startcredit contained
-hi def link tjp_startcredit Type
 syn keyword tjp_precedes precedes contained
 hi def link tjp_precedes Type
 syn keyword tjp_priority priority contained
@@ -546,8 +560,6 @@ syn keyword tjp_scheduled scheduled contained
 hi def link tjp_scheduled Type
 syn keyword tjp_scheduling scheduling contained
 hi def link tjp_scheduling Type
-syn keyword tjp_shift_task shift contained
-hi def link tjp_shift_task Type
 syn keyword tjp_shifts_task shifts contained
 hi def link tjp_shifts_task Type
 syn keyword tjp_start start contained
@@ -594,61 +606,60 @@ 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.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_account,tjp_account,tjpblk_account,tjp_credit,tjp_flags_account
-syn region tjpblk_allocate start=/^\s*allocate\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_allocate,tjp_alternative,tjp_limits_allocate,tjpblk_limits_allocate,tjp_select,tjp_persistent,tjp_mandatory,tjp_shifts_allocate contained
-syn region tjpblk_limits_allocate start=/^\s*limits\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_limits_allocate,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_export start=/^\s*export\s.*{/ end=/^\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_date_extend start=/^\s*date\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_date_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
-syn region tjpblk_reference_extend start=/^\s*reference\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_reference_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
-syn region tjpblk_richtext_extend start=/^\s*richtext\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_richtext_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
-syn region tjpblk_text_extend start=/^\s*text\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_text_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
-syn region tjpblk_icalreport start=/^\s*icalreport\s.*{/ end=/^\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_scenario_ical
-syn region tjpblk_journalentry start=/^\s*journalentry\s.*{/ end=/^\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.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_dailymax,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
-syn region tjpblk_dailymin start=/^\s*dailymin\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_dailymin,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
-syn region tjpblk_maximum start=/^\s*maximum\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_maximum,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
-syn region tjpblk_minimum start=/^\s*minimum\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_minimum,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
-syn region tjpblk_monthlymax start=/^\s*monthlymax\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_monthlymax,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
-syn region tjpblk_monthlymin start=/^\s*monthlymin\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_monthlymin,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
-syn region tjpblk_weeklymax start=/^\s*weeklymax\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_weeklymax,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
-syn region tjpblk_weeklymin start=/^\s*weeklymin\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_weeklymin,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
-syn region tjpblk_navigator start=/^\s*navigator\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_navigator,tjp_hidereport
-syn region tjpblk_nikureport start=/^\s*nikureport\s.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_nikureport,tjp_formats,tjp_headline,tjp_hideresource,tjp_hidetask,tjp_numberformat,tjp_end_report,tjp_period_report,tjp_start_report,tjp_title,tjp_timeoff_nikureport
-syn region tjpblk_extend start=/^\s*extend\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_extend,tjp_date_extend,tjpblk_date_extend,tjp_reference_extend,tjpblk_reference_extend,tjp_richtext_extend,tjpblk_richtext_extend,tjp_text_extend,tjpblk_text_extend contained
-syn region tjpblk_project start=/^\s*project\s.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_project,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.*{/ end=/^\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.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_include_properties,tjp_accountprefix,tjp_reportprefix,tjp_resourceprefix,tjp_taskprefix
-syn region tjpblk_report_resourcereport start=/^\s*resourcereport\s.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_report_resourcereport,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_hideresource,tjp_hidetask,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_report,tjpblk_report,tjp_right,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title
-syn region tjpblk_report_taskreport start=/^\s*taskreport\s.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_report_taskreport,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_hideresource,tjp_hidetask,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_report,tjpblk_report,tjp_right,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title
-syn region tjpblk_report_textreport start=/^\s*textreport\s.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_report_textreport,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_hideresource,tjp_hidetask,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_report,tjpblk_report,tjp_right,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title
-syn region tjpblk_columns start=/^\s*columns\s.*{/ end=/^\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.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_resource,tjp_email,tjp_journalentry,tjpblk_journalentry,tjp_purge,tjp_resource,tjpblk_resource,tjp_efficiency,tjp_flags_resource,tjp_booking_resource,tjpblk_booking_resource,tjp_fail,tjp_limits_resource,tjpblk_limits_resource,tjp_managers,tjp_rate_resource,tjp_shift_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.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_supplement_resource,tjp_email,tjp_journalentry,tjpblk_journalentry,tjp_purge,tjp_resource,tjpblk_resource,tjp_efficiency,tjp_flags_resource,tjp_booking_resource,tjpblk_booking_resource,tjp_fail,tjp_limits_resource,tjpblk_limits_resource,tjp_managers,tjp_rate_resource,tjp_shift_resource,tjp_shifts_resource,tjp_vacation_resource,tjp_warn,tjp_workinghours_resource,tjp_supplement_resource,tjpblk_supplement_resource,tjp_supplement contained
-syn region tjpblk_booking_resource start=/^\s*booking\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_booking_resource,tjp_overtime_booking,tjp_sloppy_booking contained
-syn region tjpblk_limits_resource start=/^\s*limits\s.*{/ end=/^\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.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_scenario,tjp_active,tjp_disabled,tjp_enabled,tjp_projection,tjpblk_projection,tjp_scenario,tjpblk_scenario contained
-syn region tjpblk_projection start=/^\s*projection\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_projection,tjp_sloppy_projection,tjp_strict_projection contained
-syn region tjpblk_shift start=/^\s*shift\s.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_shift,tjp_shift,tjpblk_shift,tjp_replace,tjp_timezone_shift,tjp_vacation_shift,tjp_workinghours_shift
-syn region tjpblk_status_statussheet start=/^\s*status\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_status_statussheet,tjp_author,tjp_details,tjp_flags_statussheet,tjp_summary contained
-syn region tjpblk_statussheet start=/^\s*statussheet\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_statussheet,tjp_task_statussheet,tjpblk_task_statussheet
-syn region tjpblk_statussheetreport start=/^\s*statussheetreport\s.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_statussheetreport,tjp_hideresource,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_sortresources,tjp_sorttasks
-syn region tjpblk_task_statussheet start=/^\s*task\s.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_task_statussheet,tjp_status_statussheet,tjpblk_status_statussheet,tjp_task_statussheet,tjpblk_task_statussheet contained
-syn region tjpblk_tagfile start=/^\s*tagfile\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_tagfile,tjp_hideresource,tjp_hidetask,tjp_rollupresource,tjp_rolluptask
-syn region tjpblk_task start=/^\s*task\s.*{/ end=/^\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_account_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_endcredit,tjp_flags_task,tjp_fail,tjp_length,tjp_limits_task,tjpblk_limits_task,tjp_maxend,tjp_maxstart,tjp_milestone,tjp_minend,tjp_minstart,tjp_startcredit,tjp_period_task,tjp_precedes,tjpblk_precedes,tjp_priority,tjp_projectid_task,tjp_responsible,tjp_scheduled,tjp_scheduling,tjp_shift_task,tjp_shifts_task,tjp_start,tjp_warn
-syn region tjpblk_supplement_task start=/^\s*supplement task\s.*{/ end=/^\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_account_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_endcredit,tjp_flags_task,tjp_fail,tjp_length,tjp_limits_task,tjpblk_limits_task,tjp_maxend,tjp_maxstart,tjp_milestone,tjp_minend,tjp_minstart,tjp_startcredit,tjp_period_task,tjp_precedes,tjpblk_precedes,tjp_priority,tjp_projectid_task,tjp_responsible,tjp_scheduled,tjp_scheduling,tjp_shift_task,tjp_shifts_task,tjp_start,tjp_warn,tjp_supplement contained
-syn region tjpblk_booking_task start=/^\s*booking\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_booking_task,tjp_overtime_booking,tjp_sloppy_booking contained
-syn region tjpblk_depends start=/^\s*depends\s.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_depends,tjp_gapduration,tjp_gaplength,tjp_onend,tjp_onstart contained
-syn region tjpblk_limits_task start=/^\s*limits\s.*{/ end=/^\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.*{/ end=/^\s*}/ transparent contains=@tjpcommon,tjp_precedes,tjp_gapduration,tjp_gaplength,tjp_onend,tjp_onstart contained
-syn region tjpblk_timesheet start=/^\s*timesheet\s.*{/ end=/^\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.*{/ end=/^\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.*{/ end=/^\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.*{/ end=/^\s*}/ transparent fold contains=@tjpcommon,tjp_timesheetreport,tjp_hideresource,tjp_end_report,tjp_period_report,tjp_start_report
-syn region tjpblk_status_timesheet start=/^\s*status\s.*{/ end=/^\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_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_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_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
+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_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
+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_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
+syn region tjpblk_dailymin start=/^\s*dailymin\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_dailymin,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
+syn region tjpblk_maximum start=/^\s*maximum\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_maximum,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
+syn region tjpblk_minimum start=/^\s*minimum\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_minimum,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
+syn region tjpblk_monthlymax start=/^\s*monthlymax\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_monthlymax,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
+syn region tjpblk_monthlymin start=/^\s*monthlymin\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_monthlymin,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
+syn region tjpblk_weeklymax start=/^\s*weeklymax\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_weeklymax,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
+syn region tjpblk_weeklymin start=/^\s*weeklymin\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_weeklymin,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
+syn region tjpblk_navigator start=/^\s*navigator\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_navigator,tjp_hidereport
+syn region tjpblk_nikureport start=/^\s*nikureport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_nikureport,tjp_formats,tjp_headline,tjp_hideresource,tjp_hidetask,tjp_numberformat,tjp_end_report,tjp_period_report,tjp_start_report,tjp_title,tjp_timeoff_nikureport
+syn region tjpblk_extend start=/^\s*extend\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_extend,tjp_date_extend,tjpblk_date_extend,tjp_reference_extend,tjpblk_reference_extend,tjp_richtext_extend,tjpblk_richtext_extend,tjp_text_extend,tjpblk_text_extend contained
+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_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_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_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
+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
+syn region tjpblk_shift start=/^\s*shift\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_shift,tjp_shift,tjpblk_shift,tjp_leaves,tjp_replace,tjp_timezone_shift,tjp_vacation_shift,tjp_workinghours_shift
+syn region tjpblk_status_statussheet start=/^\s*status\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_status_statussheet,tjp_author,tjp_details,tjp_flags_statussheet,tjp_summary contained
+syn region tjpblk_statussheet start=/^\s*statussheet\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_statussheet,tjp_task_statussheet,tjpblk_task_statussheet
+syn region tjpblk_statussheetreport start=/^\s*statussheetreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_statussheetreport,tjp_hideresource,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_sortresources,tjp_sorttasks
+syn region tjpblk_task_statussheet start=/^\s*task\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_task_statussheet,tjp_status_statussheet,tjpblk_status_statussheet,tjp_task_statussheet,tjpblk_task_statussheet contained
+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_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_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
+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_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_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
+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_end_report,tjp_period_report,tjp_start_report
+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=/"/
 syn region tjpstring start=/'/ skip=/\\'/ end=/'/
-syn region tjpstring start=/\s-8<-$/ end=/^\s*->8-/
+syn region tjpstring start=/\s-8<-$/ end=/^\s*->8-/ fold
 syn region tjpmlcomment start=+/\*+ end=+\*/+
 
 syn sync fromstart
@@ -672,7 +683,7 @@ let b:current_syntax = "tjp"
 
 " Support running tj3 from within vim. Just type ':make your_project.tjp' to
 " activate it.
-set makeprg=tj3
+set makeprg=tj3\ --silent
 
 " Support browsing the man page by typing Shift-k while having the cursor over
 " any syntax keyword