taskjuggler 3.8.1 → 3.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (526) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +1 -0
  3. data/data/tjp.vim +1 -1
  4. data/lib/taskjuggler/Account.rb +1 -0
  5. data/lib/taskjuggler/AccountCredit.rb +1 -0
  6. data/lib/taskjuggler/AccountScenario.rb +1 -0
  7. data/lib/taskjuggler/AlertLevelDefinitions.rb +1 -0
  8. data/lib/taskjuggler/AlgorithmDiff.rb +3 -2
  9. data/lib/taskjuggler/Allocation.rb +1 -0
  10. data/lib/taskjuggler/AppConfig.rb +1 -0
  11. data/lib/taskjuggler/AttributeBase.rb +1 -0
  12. data/lib/taskjuggler/AttributeDefinition.rb +1 -0
  13. data/lib/taskjuggler/Attributes.rb +3 -2
  14. data/lib/taskjuggler/BatchProcessor.rb +3 -2
  15. data/lib/taskjuggler/Booking.rb +1 -0
  16. data/lib/taskjuggler/Charge.rb +1 -0
  17. data/lib/taskjuggler/ChargeSet.rb +1 -0
  18. data/lib/taskjuggler/DataCache.rb +1 -0
  19. data/lib/taskjuggler/FileList.rb +1 -0
  20. data/lib/taskjuggler/HTMLDocument.rb +1 -0
  21. data/lib/taskjuggler/HTMLElements.rb +1 -0
  22. data/lib/taskjuggler/ICalendar.rb +3 -2
  23. data/lib/taskjuggler/Interval.rb +1 -0
  24. data/lib/taskjuggler/IntervalList.rb +1 -0
  25. data/lib/taskjuggler/Journal.rb +5 -4
  26. data/lib/taskjuggler/KateSyntax.rb +1 -0
  27. data/lib/taskjuggler/KeywordArray.rb +1 -0
  28. data/lib/taskjuggler/KeywordDocumentation.rb +6 -5
  29. data/lib/taskjuggler/LeaveList.rb +1 -0
  30. data/lib/taskjuggler/Limits.rb +1 -0
  31. data/lib/taskjuggler/Log.rb +2 -1
  32. data/lib/taskjuggler/LogicalExpression.rb +1 -0
  33. data/lib/taskjuggler/LogicalFunction.rb +1 -0
  34. data/lib/taskjuggler/LogicalOperation.rb +1 -0
  35. data/lib/taskjuggler/MessageHandler.rb +2 -1
  36. data/lib/taskjuggler/PTNProxy.rb +1 -0
  37. data/lib/taskjuggler/Painter/BasicShapes.rb +1 -0
  38. data/lib/taskjuggler/Painter/Color.rb +1 -0
  39. data/lib/taskjuggler/Painter/Element.rb +1 -0
  40. data/lib/taskjuggler/Painter/FontData.rb +1 -0
  41. data/lib/taskjuggler/Painter/FontMetrics.rb +1 -0
  42. data/lib/taskjuggler/Painter/FontMetricsData.rb +1 -0
  43. data/lib/taskjuggler/Painter/Group.rb +1 -0
  44. data/lib/taskjuggler/Painter/Points.rb +2 -1
  45. data/lib/taskjuggler/Painter/Primitives.rb +1 -0
  46. data/lib/taskjuggler/Painter/SVGSupport.rb +1 -0
  47. data/lib/taskjuggler/Painter/Text.rb +1 -0
  48. data/lib/taskjuggler/Painter.rb +1 -0
  49. data/lib/taskjuggler/Project.rb +3 -2
  50. data/lib/taskjuggler/ProjectFileParser.rb +2 -1
  51. data/lib/taskjuggler/ProjectFileScanner.rb +4 -3
  52. data/lib/taskjuggler/PropertyList.rb +2 -1
  53. data/lib/taskjuggler/PropertySet.rb +1 -0
  54. data/lib/taskjuggler/PropertyTreeNode.rb +2 -1
  55. data/lib/taskjuggler/Query.rb +2 -1
  56. data/lib/taskjuggler/RealFormat.rb +2 -1
  57. data/lib/taskjuggler/Resource.rb +2 -1
  58. data/lib/taskjuggler/ResourceScenario.rb +9 -1
  59. data/lib/taskjuggler/RichText/Document.rb +1 -0
  60. data/lib/taskjuggler/RichText/Element.rb +6 -5
  61. data/lib/taskjuggler/RichText/FunctionExample.rb +1 -0
  62. data/lib/taskjuggler/RichText/FunctionHandler.rb +1 -0
  63. data/lib/taskjuggler/RichText/Parser.rb +1 -0
  64. data/lib/taskjuggler/RichText/RTFHandlers.rb +1 -0
  65. data/lib/taskjuggler/RichText/RTFNavigator.rb +1 -0
  66. data/lib/taskjuggler/RichText/RTFQuery.rb +1 -0
  67. data/lib/taskjuggler/RichText/RTFReport.rb +1 -0
  68. data/lib/taskjuggler/RichText/RTFReportLink.rb +1 -0
  69. data/lib/taskjuggler/RichText/RTFWithQuerySupport.rb +1 -0
  70. data/lib/taskjuggler/RichText/Scanner.rb +1 -0
  71. data/lib/taskjuggler/RichText/Snip.rb +2 -1
  72. data/lib/taskjuggler/RichText/SyntaxRules.rb +1 -0
  73. data/lib/taskjuggler/RichText/TOCEntry.rb +1 -0
  74. data/lib/taskjuggler/RichText/TableOfContents.rb +1 -0
  75. data/lib/taskjuggler/RichText.rb +1 -0
  76. data/lib/taskjuggler/RuntimeConfig.rb +1 -0
  77. data/lib/taskjuggler/Scenario.rb +1 -0
  78. data/lib/taskjuggler/ScenarioData.rb +1 -0
  79. data/lib/taskjuggler/Scoreboard.rb +2 -1
  80. data/lib/taskjuggler/SheetHandlerBase.rb +2 -1
  81. data/lib/taskjuggler/SheetReceiver.rb +1 -0
  82. data/lib/taskjuggler/SheetSender.rb +3 -2
  83. data/lib/taskjuggler/Shift.rb +1 -0
  84. data/lib/taskjuggler/ShiftAssignments.rb +1 -0
  85. data/lib/taskjuggler/ShiftScenario.rb +1 -0
  86. data/lib/taskjuggler/SimpleQueryExpander.rb +1 -0
  87. data/lib/taskjuggler/StatusSheetReceiver.rb +1 -0
  88. data/lib/taskjuggler/StatusSheetSender.rb +1 -0
  89. data/lib/taskjuggler/StdIoWrapper.rb +1 -0
  90. data/lib/taskjuggler/SyntaxReference.rb +2 -1
  91. data/lib/taskjuggler/TableColumnDefinition.rb +1 -0
  92. data/lib/taskjuggler/TableColumnSorter.rb +1 -0
  93. data/lib/taskjuggler/Task.rb +2 -1
  94. data/lib/taskjuggler/TaskDependency.rb +1 -0
  95. data/lib/taskjuggler/TaskJuggler.rb +1 -0
  96. data/lib/taskjuggler/TaskScenario.rb +3 -2
  97. data/lib/taskjuggler/TernarySearchTree.rb +5 -4
  98. data/lib/taskjuggler/TextFormatter.rb +5 -4
  99. data/lib/taskjuggler/TextParser/MacroTable.rb +1 -0
  100. data/lib/taskjuggler/TextParser/Pattern.rb +2 -1
  101. data/lib/taskjuggler/TextParser/Rule.rb +3 -2
  102. data/lib/taskjuggler/TextParser/Scanner.rb +1 -0
  103. data/lib/taskjuggler/TextParser/SourceFileInfo.rb +1 -0
  104. data/lib/taskjuggler/TextParser/StackElement.rb +1 -0
  105. data/lib/taskjuggler/TextParser/State.rb +1 -0
  106. data/lib/taskjuggler/TextParser/TokenDoc.rb +1 -0
  107. data/lib/taskjuggler/TextParser.rb +1 -0
  108. data/lib/taskjuggler/TimeSheetReceiver.rb +1 -0
  109. data/lib/taskjuggler/TimeSheetSender.rb +1 -0
  110. data/lib/taskjuggler/TimeSheetSummary.rb +3 -2
  111. data/lib/taskjuggler/TimeSheets.rb +1 -0
  112. data/lib/taskjuggler/Tj3AppBase.rb +2 -1
  113. data/lib/taskjuggler/Tj3Config.rb +1 -0
  114. data/lib/taskjuggler/Tj3SheetAppBase.rb +1 -0
  115. data/lib/taskjuggler/TjException.rb +1 -0
  116. data/lib/taskjuggler/TjTime.rb +1 -0
  117. data/lib/taskjuggler/TjpExample.rb +2 -1
  118. data/lib/taskjuggler/TjpSyntaxRules.rb +1 -0
  119. data/lib/taskjuggler/URLParameter.rb +1 -0
  120. data/lib/taskjuggler/UTF8String.rb +4 -3
  121. data/lib/taskjuggler/UserManual.rb +1 -0
  122. data/lib/taskjuggler/VimSyntax.rb +1 -0
  123. data/lib/taskjuggler/WorkingHours.rb +2 -1
  124. data/lib/taskjuggler/XMLDocument.rb +2 -1
  125. data/lib/taskjuggler/XMLElement.rb +6 -5
  126. data/lib/taskjuggler/apps/Tj3.rb +1 -0
  127. data/lib/taskjuggler/apps/Tj3Client.rb +1 -0
  128. data/lib/taskjuggler/apps/Tj3Daemon.rb +1 -0
  129. data/lib/taskjuggler/apps/Tj3Man.rb +1 -0
  130. data/lib/taskjuggler/apps/Tj3SsReceiver.rb +1 -0
  131. data/lib/taskjuggler/apps/Tj3SsSender.rb +1 -0
  132. data/lib/taskjuggler/apps/Tj3TsReceiver.rb +1 -0
  133. data/lib/taskjuggler/apps/Tj3TsSender.rb +1 -0
  134. data/lib/taskjuggler/apps/Tj3TsSummary.rb +1 -0
  135. data/lib/taskjuggler/apps/Tj3WebD.rb +1 -0
  136. data/lib/taskjuggler/daemon/Daemon.rb +2 -1
  137. data/lib/taskjuggler/daemon/DaemonConnector.rb +1 -0
  138. data/lib/taskjuggler/daemon/ProcessIntercom.rb +1 -0
  139. data/lib/taskjuggler/daemon/ProjectBroker.rb +1 -0
  140. data/lib/taskjuggler/daemon/ProjectServer.rb +1 -0
  141. data/lib/taskjuggler/daemon/ReportServer.rb +1 -0
  142. data/lib/taskjuggler/daemon/ReportServlet.rb +1 -0
  143. data/lib/taskjuggler/daemon/WebServer.rb +1 -0
  144. data/lib/taskjuggler/daemon/WelcomePage.rb +1 -0
  145. data/lib/taskjuggler/deep_copy.rb +1 -0
  146. data/lib/taskjuggler/reports/AccountListRE.rb +1 -0
  147. data/lib/taskjuggler/reports/CSVFile.rb +3 -2
  148. data/lib/taskjuggler/reports/ChartPlotter.rb +1 -0
  149. data/lib/taskjuggler/reports/CollisionDetector.rb +1 -0
  150. data/lib/taskjuggler/reports/ColumnTable.rb +1 -0
  151. data/lib/taskjuggler/reports/ExportRE.rb +1 -0
  152. data/lib/taskjuggler/reports/GanttChart.rb +1 -0
  153. data/lib/taskjuggler/reports/GanttContainer.rb +1 -0
  154. data/lib/taskjuggler/reports/GanttHeader.rb +1 -0
  155. data/lib/taskjuggler/reports/GanttHeaderScaleItem.rb +1 -0
  156. data/lib/taskjuggler/reports/GanttLine.rb +2 -1
  157. data/lib/taskjuggler/reports/GanttLoadStack.rb +1 -0
  158. data/lib/taskjuggler/reports/GanttMilestone.rb +1 -0
  159. data/lib/taskjuggler/reports/GanttRouter.rb +1 -0
  160. data/lib/taskjuggler/reports/GanttTaskBar.rb +1 -0
  161. data/lib/taskjuggler/reports/HTMLGraphics.rb +1 -0
  162. data/lib/taskjuggler/reports/ICalReport.rb +1 -0
  163. data/lib/taskjuggler/reports/MspXmlRE.rb +1 -0
  164. data/lib/taskjuggler/reports/Navigator.rb +1 -0
  165. data/lib/taskjuggler/reports/NikuReport.rb +2 -1
  166. data/lib/taskjuggler/reports/Report.rb +1 -0
  167. data/lib/taskjuggler/reports/ReportBase.rb +1 -0
  168. data/lib/taskjuggler/reports/ReportContext.rb +1 -0
  169. data/lib/taskjuggler/reports/ReportTable.rb +2 -1
  170. data/lib/taskjuggler/reports/ReportTableCell.rb +7 -6
  171. data/lib/taskjuggler/reports/ReportTableColumn.rb +1 -0
  172. data/lib/taskjuggler/reports/ReportTableLegend.rb +1 -0
  173. data/lib/taskjuggler/reports/ReportTableLine.rb +1 -0
  174. data/lib/taskjuggler/reports/ResourceListRE.rb +1 -0
  175. data/lib/taskjuggler/reports/StatusSheetReport.rb +4 -3
  176. data/lib/taskjuggler/reports/TableReport.rb +2 -1
  177. data/lib/taskjuggler/reports/TableReportColumn.rb +1 -0
  178. data/lib/taskjuggler/reports/TagFile.rb +1 -0
  179. data/lib/taskjuggler/reports/TaskListRE.rb +1 -0
  180. data/lib/taskjuggler/reports/TextReport.rb +2 -1
  181. data/lib/taskjuggler/reports/TimeSheetReport.rb +3 -2
  182. data/lib/taskjuggler/reports/TjpExportRE.rb +4 -3
  183. data/lib/taskjuggler/reports/TraceReport.rb +2 -1
  184. data/lib/taskjuggler/version.rb +1 -1
  185. data/lib/tj3.rb +1 -0
  186. data/man/tj3.1 +130 -0
  187. data/man/tj3client.1 +145 -0
  188. data/man/tj3d.1 +93 -0
  189. data/man/tj3man.1 +76 -0
  190. data/man/tj3ss_receiver.1 +86 -0
  191. data/man/tj3ss_sender.1 +100 -0
  192. data/man/tj3ts_receiver.1 +86 -0
  193. data/man/tj3ts_sender.1 +92 -0
  194. data/man/tj3ts_summary.1 +104 -0
  195. data/man/tj3webd.1 +86 -0
  196. data/spec/Color_spec.rb +1 -0
  197. data/spec/ICalendar_spec.rb +1 -0
  198. data/spec/IntervalList_spec.rb +1 -0
  199. data/spec/ProjectBroker_spec.rb +1 -0
  200. data/spec/StatusSheets_spec.rb +1 -0
  201. data/spec/TableColumnSorter_spec.rb +1 -0
  202. data/spec/TernarySearchTree_spec.rb +1 -0
  203. data/spec/TimeSheets_spec.rb +1 -0
  204. data/spec/Tj3Daemon_spec.rb +1 -0
  205. data/spec/Tj3_spec.rb +1 -0
  206. data/spec/TraceReport_spec.rb +1 -0
  207. data/taskjuggler.gemspec +3 -2
  208. data/test/MessageChecker.rb +1 -0
  209. data/test/ReferenceGenerator.rb +1 -0
  210. data/test/TjpGen.rb +1 -0
  211. data/test/all.rb +1 -0
  212. data/test/test_AlgorithmDiff.rb +3 -2
  213. data/test/test_BatchProcessor.rb +1 -0
  214. data/test/test_CSV-Reports.rb +1 -0
  215. data/test/test_CSVFile.rb +1 -0
  216. data/test/test_CollisionDetector.rb +1 -0
  217. data/test/test_Export-Reports.rb +1 -0
  218. data/test/test_Journal.rb +1 -0
  219. data/test/test_Limits.rb +1 -0
  220. data/test/test_LogicalExpression.rb +1 -0
  221. data/test/test_MacroTable.rb +1 -0
  222. data/test/test_Project.rb +1 -0
  223. data/test/test_ProjectFileScanner.rb +1 -0
  224. data/test/test_PropertySet.rb +1 -0
  225. data/test/test_Query.rb +1 -0
  226. data/test/test_RealFormat.rb +1 -0
  227. data/test/test_ReportGenerator.rb +1 -0
  228. data/test/test_RichText.rb +1 -0
  229. data/test/test_Scheduler.rb +1 -0
  230. data/test/test_ShiftAssignments.rb +1 -0
  231. data/test/test_SimpleQueryExpander.rb +1 -0
  232. data/test/test_Syntax.rb +1 -0
  233. data/test/test_TextFormatter.rb +1 -0
  234. data/test/test_TjTime.rb +1 -0
  235. data/test/test_TjpExample.rb +1 -0
  236. data/test/test_URLParameter.rb +1 -0
  237. data/test/test_UTF8String.rb +5 -4
  238. data/test/test_WorkingHours.rb +1 -0
  239. data/test/test_deep_copy.rb +2 -1
  240. metadata +33 -289
  241. data/manual/html/Day_To_Day_Juggling.html +0 -365
  242. data/manual/html/Getting_Started.html +0 -64
  243. data/manual/html/How_To_Contribute.html +0 -95
  244. data/manual/html/Installation.html +0 -205
  245. data/manual/html/Intro.html +0 -104
  246. data/manual/html/List_Attributes.html +0 -76
  247. data/manual/html/Reporting_Bugs.html +0 -49
  248. data/manual/html/Rich_Text_Attributes.html +0 -179
  249. data/manual/html/Software.html +0 -151
  250. data/manual/html/TaskJuggler_2x_Migration.html +0 -71
  251. data/manual/html/TaskJuggler_Internals.html +0 -63
  252. data/manual/html/The_TaskJuggler_Syntax.html +0 -92
  253. data/manual/html/Tutorial.html +0 -511
  254. data/manual/html/account.html +0 -163
  255. data/manual/html/account.task.html +0 -47
  256. data/manual/html/accountprefix.html +0 -69
  257. data/manual/html/accountreport.html +0 -488
  258. data/manual/html/accountroot.html +0 -144
  259. data/manual/html/active.html +0 -68
  260. data/manual/html/adopt.task.html +0 -74
  261. data/manual/html/aggregate.html +0 -147
  262. data/manual/html/alert.html +0 -69
  263. data/manual/html/alertlevels.html +0 -104
  264. data/manual/html/allocate.html +0 -98
  265. data/manual/html/alphabet.html +0 -40
  266. data/manual/html/alternative.html +0 -79
  267. data/manual/html/author.html +0 -71
  268. data/manual/html/auxdir.html +0 -69
  269. data/manual/html/auxdir.report.html +0 -71
  270. data/manual/html/balance.html +0 -148
  271. data/manual/html/booking.resource.html +0 -124
  272. data/manual/html/booking.task.html +0 -123
  273. data/manual/html/caption.html +0 -100
  274. data/manual/html/cellcolor.column.html +0 -108
  275. data/manual/html/celltext.column.html +0 -109
  276. data/manual/html/center.html +0 -93
  277. data/manual/html/charge.html +0 -92
  278. data/manual/html/chargeset.html +0 -76
  279. data/manual/html/columnid.html +0 -433
  280. data/manual/html/columns.html +0 -78
  281. data/manual/html/complete.html +0 -88
  282. data/manual/html/copyright.html +0 -99
  283. data/manual/html/credits.html +0 -123
  284. data/manual/html/css/tjmanual.css +0 -85
  285. data/manual/html/css/tjreport.css +0 -493
  286. data/manual/html/currency.html +0 -135
  287. data/manual/html/currencyformat.html +0 -101
  288. data/manual/html/dailymax.html +0 -146
  289. data/manual/html/dailymin.html +0 -134
  290. data/manual/html/dailyworkinghours.html +0 -92
  291. data/manual/html/date.extend.html +0 -79
  292. data/manual/html/date.html +0 -103
  293. data/manual/html/definitions.html +0 -96
  294. data/manual/html/depends.html +0 -113
  295. data/manual/html/details.html +0 -71
  296. data/manual/html/disabled.html +0 -93
  297. data/manual/html/duration.html +0 -135
  298. data/manual/html/efficiency.html +0 -95
  299. data/manual/html/effort.html +0 -136
  300. data/manual/html/effortdone.html +0 -105
  301. data/manual/html/effortleft.html +0 -105
  302. data/manual/html/email.html +0 -70
  303. data/manual/html/enabled.html +0 -77
  304. data/manual/html/end.column.html +0 -69
  305. data/manual/html/end.html +0 -89
  306. data/manual/html/end.limit.html +0 -71
  307. data/manual/html/end.report.html +0 -107
  308. data/manual/html/end.timesheet.html +0 -96
  309. data/manual/html/endcredit.html +0 -121
  310. data/manual/html/epilog.html +0 -76
  311. data/manual/html/export.html +0 -271
  312. data/manual/html/extend.html +0 -134
  313. data/manual/html/fail.html +0 -107
  314. data/manual/html/fdl.html +0 -430
  315. data/manual/html/flags.account.html +0 -69
  316. data/manual/html/flags.html +0 -68
  317. data/manual/html/flags.journalentry.html +0 -68
  318. data/manual/html/flags.report.html +0 -71
  319. data/manual/html/flags.resource.html +0 -71
  320. data/manual/html/flags.statussheet.html +0 -68
  321. data/manual/html/flags.task.html +0 -71
  322. data/manual/html/flags.timesheet.html +0 -68
  323. data/manual/html/fontcolor.column.html +0 -108
  324. data/manual/html/footer.html +0 -98
  325. data/manual/html/formats.export.html +0 -74
  326. data/manual/html/formats.html +0 -83
  327. data/manual/html/functions.html +0 -80
  328. data/manual/html/gapduration.html +0 -95
  329. data/manual/html/gaplength.html +0 -95
  330. data/manual/html/halign.center.html +0 -68
  331. data/manual/html/halign.column.html +0 -104
  332. data/manual/html/halign.left.html +0 -68
  333. data/manual/html/halign.right.html +0 -68
  334. data/manual/html/hasalert.html +0 -73
  335. data/manual/html/header.html +0 -98
  336. data/manual/html/headline.html +0 -71
  337. data/manual/html/height.html +0 -74
  338. data/manual/html/hideaccount.html +0 -111
  339. data/manual/html/hidejournalentry.html +0 -71
  340. data/manual/html/hidereport.html +0 -104
  341. data/manual/html/hideresource.html +0 -111
  342. data/manual/html/hidetask.html +0 -111
  343. data/manual/html/icalreport.html +0 -145
  344. data/manual/html/include.macro.html +0 -72
  345. data/manual/html/include.project.html +0 -72
  346. data/manual/html/include.properties.html +0 -78
  347. data/manual/html/index.html +0 -19
  348. data/manual/html/inherit.extend.html +0 -70
  349. data/manual/html/interval1.html +0 -101
  350. data/manual/html/interval2.html +0 -100
  351. data/manual/html/interval3.html +0 -101
  352. data/manual/html/interval4.html +0 -102
  353. data/manual/html/isactive.html +0 -69
  354. data/manual/html/ischildof.html +0 -69
  355. data/manual/html/isdependencyof.html +0 -77
  356. data/manual/html/isdutyof.html +0 -73
  357. data/manual/html/isfeatureof.html +0 -73
  358. data/manual/html/isleaf.html +0 -68
  359. data/manual/html/ismilestone.html +0 -69
  360. data/manual/html/isongoing.html +0 -69
  361. data/manual/html/isresource.html +0 -68
  362. data/manual/html/isresponsibilityof.html +0 -73
  363. data/manual/html/istask.html +0 -68
  364. data/manual/html/isvalid.html +0 -68
  365. data/manual/html/journalattributes.html +0 -115
  366. data/manual/html/journalentry.html +0 -85
  367. data/manual/html/journalmode.html +0 -95
  368. data/manual/html/leaveallowance.html +0 -141
  369. data/manual/html/leaves.html +0 -146
  370. data/manual/html/left.html +0 -92
  371. data/manual/html/length.html +0 -106
  372. data/manual/html/limits.allocate.html +0 -47
  373. data/manual/html/limits.html +0 -74
  374. data/manual/html/limits.resource.html +0 -82
  375. data/manual/html/limits.task.html +0 -115
  376. data/manual/html/listitem.column.html +0 -68
  377. data/manual/html/listtype.column.html +0 -81
  378. data/manual/html/loadunit.html +0 -103
  379. data/manual/html/logicalexpression.html +0 -86
  380. data/manual/html/logicalflagexpression.html +0 -84
  381. data/manual/html/macro.html +0 -105
  382. data/manual/html/managers.html +0 -112
  383. data/manual/html/mandatory.html +0 -68
  384. data/manual/html/markdate.html +0 -69
  385. data/manual/html/maxend.html +0 -71
  386. data/manual/html/maximum.html +0 -101
  387. data/manual/html/maxstart.html +0 -71
  388. data/manual/html/milestone.html +0 -73
  389. data/manual/html/minend.html +0 -71
  390. data/manual/html/minimum.html +0 -101
  391. data/manual/html/minstart.html +0 -71
  392. data/manual/html/monthlymax.html +0 -101
  393. data/manual/html/monthlymin.html +0 -101
  394. data/manual/html/navbar.html +0 -567
  395. data/manual/html/navigator.html +0 -103
  396. data/manual/html/newtask.html +0 -85
  397. data/manual/html/nikureport.html +0 -218
  398. data/manual/html/note.task.html +0 -70
  399. data/manual/html/novevents.html +0 -68
  400. data/manual/html/now.html +0 -69
  401. data/manual/html/number.extend.html +0 -79
  402. data/manual/html/numberformat.html +0 -87
  403. data/manual/html/onend.html +0 -70
  404. data/manual/html/onstart.html +0 -70
  405. data/manual/html/opennodes.html +0 -70
  406. data/manual/html/outputdir.html +0 -69
  407. data/manual/html/overtime.booking.html +0 -78
  408. data/manual/html/period.column.html +0 -69
  409. data/manual/html/period.limit.html +0 -71
  410. data/manual/html/period.report.html +0 -71
  411. data/manual/html/period.task.html +0 -71
  412. data/manual/html/persistent.html +0 -68
  413. data/manual/html/precedes.html +0 -89
  414. data/manual/html/priority.html +0 -116
  415. data/manual/html/priority.timesheet.html +0 -70
  416. data/manual/html/project.html +0 -90
  417. data/manual/html/projectid.html +0 -68
  418. data/manual/html/projectid.task.html +0 -70
  419. data/manual/html/projectids.html +0 -68
  420. data/manual/html/projection.html +0 -81
  421. data/manual/html/prolog.html +0 -76
  422. data/manual/html/properties.html +0 -262
  423. data/manual/html/purge.html +0 -74
  424. data/manual/html/rate.html +0 -68
  425. data/manual/html/rate.resource.html +0 -70
  426. data/manual/html/rawhtmlhead.html +0 -70
  427. data/manual/html/reference.extend.html +0 -79
  428. data/manual/html/remaining.html +0 -119
  429. data/manual/html/replace.html +0 -71
  430. data/manual/html/reportprefix.html +0 -69
  431. data/manual/html/resource.html +0 -208
  432. data/manual/html/resourceattributes.html +0 -85
  433. data/manual/html/resourceprefix.html +0 -69
  434. data/manual/html/resourcereport.html +0 -410
  435. data/manual/html/resourceroot.html +0 -94
  436. data/manual/html/resources.limit.html +0 -84
  437. data/manual/html/responsible.html +0 -72
  438. data/manual/html/richtext.extend.html +0 -80
  439. data/manual/html/right.html +0 -92
  440. data/manual/html/rollupaccount.html +0 -106
  441. data/manual/html/rollupresource.html +0 -129
  442. data/manual/html/rolluptask.html +0 -106
  443. data/manual/html/scale.column.html +0 -89
  444. data/manual/html/scenario.html +0 -107
  445. data/manual/html/scenario.ical.html +0 -69
  446. data/manual/html/scenarios.export.html +0 -68
  447. data/manual/html/scenarios.html +0 -71
  448. data/manual/html/scenariospecific.extend.html +0 -70
  449. data/manual/html/scheduled.html +0 -70
  450. data/manual/html/scheduling.html +0 -77
  451. data/manual/html/schedulingmode.html +0 -74
  452. data/manual/html/select.html +0 -88
  453. data/manual/html/selfcontained.html +0 -70
  454. data/manual/html/shift.allocate.html +0 -79
  455. data/manual/html/shift.html +0 -136
  456. data/manual/html/shift.resource.html +0 -82
  457. data/manual/html/shift.task.html +0 -82
  458. data/manual/html/shift.timesheet.html +0 -72
  459. data/manual/html/shifts.allocate.html +0 -73
  460. data/manual/html/shifts.resource.html +0 -75
  461. data/manual/html/shifts.task.html +0 -75
  462. data/manual/html/shorttimeformat.html +0 -69
  463. data/manual/html/sloppy.booking.html +0 -79
  464. data/manual/html/sloppy.projection.html +0 -74
  465. data/manual/html/sortaccounts.html +0 -75
  466. data/manual/html/sortjournalentries.html +0 -85
  467. data/manual/html/sortresources.html +0 -75
  468. data/manual/html/sorttasks.html +0 -75
  469. data/manual/html/start.column.html +0 -69
  470. data/manual/html/start.html +0 -80
  471. data/manual/html/start.limit.html +0 -71
  472. data/manual/html/start.report.html +0 -71
  473. data/manual/html/startcredit.html +0 -76
  474. data/manual/html/status.statussheet.html +0 -75
  475. data/manual/html/status.timesheet.html +0 -93
  476. data/manual/html/statussheet.html +0 -126
  477. data/manual/html/statussheetreport.html +0 -131
  478. data/manual/html/strict.projection.html +0 -74
  479. data/manual/html/summary.html +0 -71
  480. data/manual/html/supplement.html +0 -110
  481. data/manual/html/supplement.resource.html +0 -209
  482. data/manual/html/supplement.task.html +0 -325
  483. data/manual/html/tagfile.html +0 -79
  484. data/manual/html/task.html +0 -316
  485. data/manual/html/task.statussheet.html +0 -76
  486. data/manual/html/task.timesheet.html +0 -91
  487. data/manual/html/taskattributes.html +0 -117
  488. data/manual/html/taskprefix.html +0 -69
  489. data/manual/html/taskreport.html +0 -446
  490. data/manual/html/taskroot.export.html +0 -106
  491. data/manual/html/taskroot.html +0 -107
  492. data/manual/html/text.extend.html +0 -79
  493. data/manual/html/textreport.html +0 -429
  494. data/manual/html/timeformat.html +0 -162
  495. data/manual/html/timeformat1.html +0 -69
  496. data/manual/html/timeformat2.html +0 -69
  497. data/manual/html/timeoff.nikureport.html +0 -73
  498. data/manual/html/timesheet.html +0 -131
  499. data/manual/html/timesheetreport.html +0 -131
  500. data/manual/html/timezone.export.html +0 -68
  501. data/manual/html/timezone.html +0 -74
  502. data/manual/html/timezone.report.html +0 -70
  503. data/manual/html/timezone.shift.html +0 -72
  504. data/manual/html/timingresolution.html +0 -73
  505. data/manual/html/title.column.html +0 -69
  506. data/manual/html/title.html +0 -70
  507. data/manual/html/toc.html +0 -2521
  508. data/manual/html/tooltip.column.html +0 -109
  509. data/manual/html/tracereport.html +0 -426
  510. data/manual/html/trackingscenario.html +0 -82
  511. data/manual/html/treelevel.html +0 -68
  512. data/manual/html/vacation.html +0 -73
  513. data/manual/html/vacation.resource.html +0 -75
  514. data/manual/html/vacation.shift.html +0 -73
  515. data/manual/html/warn.html +0 -107
  516. data/manual/html/weeklymax.html +0 -101
  517. data/manual/html/weeklymin.html +0 -101
  518. data/manual/html/weekstartsmonday.html +0 -68
  519. data/manual/html/weekstartssunday.html +0 -68
  520. data/manual/html/width.column.html +0 -68
  521. data/manual/html/width.html +0 -74
  522. data/manual/html/work.html +0 -107
  523. data/manual/html/workinghours.project.html +0 -104
  524. data/manual/html/workinghours.resource.html +0 -81
  525. data/manual/html/workinghours.shift.html +0 -83
  526. data/manual/html/yearlyworkingdays.html +0 -72
data/manual/html/complete.html DELETED
@@ -1,88 +0,0 @@
1
- <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.8.0 -->
3
- <html lang="en" xml:lang="en">
4
- <head>
5
- <title>complete</title>
6
- <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
7
- <meta content="IE=9" http-equiv="X-UA-Compatible"/>
8
- <meta content="The TaskJuggler Manual" name="description"/>
9
- <meta content="taskjuggler, project, management" name="keywords"/>
10
- </head>
11
- <link href="css/tjmanual.css" rel="stylesheet" type="text/css"></link>
12
- <body>
13
- <div align="center">
14
- <h3 align="center">The TaskJuggler User Manual</h3>
15
- <em align="center">Project Management beyond Gantt Chart Drawing</em>
16
- </div>
17
- <br/>
18
- <hr/>
19
- <table style="width:90%; margin-left:5%; margin-right:5%"><tr>
20
- <td style="text-align:left; width:35%;">&lt;&lt; <a href="columns.html">columns</a> &lt;&lt;</td>
21
- <td style="text-align:center; width:30%;"><a href="toc.html">Table Of Contents</a></td>
22
- <td style="text-align:right; width:35%;">&gt;&gt; <a href="copyright.html">copyright</a> &gt;&gt;</td>
23
- </tr></table>
24
- <hr/>
25
- <br/>
26
- <div style="margin-left:5%; margin-right:5%">
27
- <p><table align="center" class="table"><tr align="left">
28
- <td class="tag" style="width:16%">Keyword</td>
29
- <td class="descr" style="width:84%">
30
- <b>complete</b>
31
- </td>
32
- </tr></table></p>
33
- <p><table align="center" class="table">
34
- <colgroup>
35
- <col width="16%"></col>
36
- <col width="24%"></col>
37
- <col width="60%"></col>
38
- </colgroup>
39
- <tr align="left">
40
- <td class="tag">Purpose</td>
41
- <td class="descr" colspan="2"><div>
42
- <p>Specifies what percentage of the task is already completed. This can be useful for simple progress tracking like in a TODO list. The provided completion degree is used for the <code>complete</code> and <code>gauge</code> columns in reports. Reports with calendar elements may show the completed part of the task in a different color.</p>
43
- <p>The completion percentage has no impact on the scheduler. It's meant for documentation purposes only.</p>
44
- </div></td>
45
- </tr>
46
- <tr align="left">
47
- <td class="tag">Syntax</td>
48
- <td class="descr" colspan="2"><code>complete &lt;percent&gt;</code></td>
49
- </tr>
50
- <tr align="left">
51
- <td class="tag" rowspan="1">Arguments</td>
52
- <td class="descr">percent</td>
53
- <td class="descr"><div>The percent value. It must be between 0 and 100.</div></td>
54
- </tr>
55
- <tr align="left">
56
- <td class="tag">Context</td>
57
- <td class="descr" colspan="2">
58
- <a href="task.html">task</a>, <a href="supplement.task.html">supplement (task)</a>
59
- </td>
60
- </tr>
61
- </table></p>
62
- <div class="codeframe"><pre class="code">
63
- task "Build house" {
64
- start 2007-01-06
65
- duration 30d
66
- # This task should have been completed on Jan 15, but only
67
- # 20% of the task have been completed so far.
68
- complete 20
69
- }
70
-
71
- taskreport "Complete" {
72
- formats html
73
- columns name, end { title "Due date" }, complete, gauge, chart
74
- }
75
- </pre></div>
76
- </div>
77
- <br/>
78
- <hr/>
79
- <table style="width:90%; margin-left:5%; margin-right:5%"><tr>
80
- <td style="text-align:left; width:35%;">&lt;&lt; <a href="columns.html">columns</a> &lt;&lt;</td>
81
- <td style="text-align:center; width:30%;"><a href="toc.html">Table Of Contents</a></td>
82
- <td style="text-align:right; width:35%;">&gt;&gt; <a href="copyright.html">copyright</a> &gt;&gt;</td>
83
- </tr></table>
84
- <hr/>
85
- <br/>
86
- <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 by Chris Schlaeger &lt;cs@taskjuggler.org&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
87
- </body>
88
- </html>
data/manual/html/copyright.html DELETED
@@ -1,99 +0,0 @@
1
- <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.8.0 -->
3
- <html lang="en" xml:lang="en">
4
- <head>
5
- <title>copyright</title>
6
- <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
7
- <meta content="IE=9" http-equiv="X-UA-Compatible"/>
8
- <meta content="The TaskJuggler Manual" name="description"/>
9
- <meta content="taskjuggler, project, management" name="keywords"/>
10
- </head>
11
- <link href="css/tjmanual.css" rel="stylesheet" type="text/css"></link>
12
- <body>
13
- <div align="center">
14
- <h3 align="center">The TaskJuggler User Manual</h3>
15
- <em align="center">Project Management beyond Gantt Chart Drawing</em>
16
- </div>
17
- <br/>
18
- <hr/>
19
- <table style="width:90%; margin-left:5%; margin-right:5%"><tr>
20
- <td style="text-align:left; width:35%;">&lt;&lt; <a href="complete.html">complete</a> &lt;&lt;</td>
21
- <td style="text-align:center; width:30%;"><a href="toc.html">Table Of Contents</a></td>
22
- <td style="text-align:right; width:35%;">&gt;&gt; <a href="credits.html">credits</a> &gt;&gt;</td>
23
- </tr></table>
24
- <hr/>
25
- <br/>
26
- <div style="margin-left:5%; margin-right:5%">
27
- <p><table align="center" class="table"><tr align="left">
28
- <td class="tag" style="width:16%">Keyword</td>
29
- <td class="descr" style="width:84%">
30
- <b>copyright</b>
31
- </td>
32
- </tr></table></p>
33
- <p><table align="center" class="table">
34
- <colgroup>
35
- <col width="16%"></col>
36
- <col width="24%"></col>
37
- <col width="60%"></col>
38
- </colgroup>
39
- <tr align="left">
40
- <td class="tag">Purpose</td>
41
- <td class="descr" colspan="2"><div>Set a copyright notice for the project file and its content. This copyright notice will be added to all reports that can support it.</div></td>
42
- </tr>
43
- <tr align="left">
44
- <td class="tag">Syntax</td>
45
- <td class="descr" colspan="2"><code>copyright &lt;STRING&gt;</code></td>
46
- </tr>
47
- <tr align="left">
48
- <td class="tag">Arguments</td>
49
- <td class="descr" colspan="2">none</td>
50
- </tr>
51
- <tr align="left">
52
- <td class="tag">Context</td>
53
- <td class="descr" colspan="2"><a href="properties.html">properties</a></td>
54
- </tr>
55
- </table></p>
56
- <div class="codeframe"><pre class="code">copyright "Tux Inc."
57
-
58
-
59
- resource r1 "Resource 1"
60
-
61
- task plant "How to plant a tree" {
62
- start 2007-01-01
63
- # All sub-tasks inherit this allocation of r1
64
- allocate r1
65
- task plan "Choose the planting site" {
66
- effort 2d
67
- }
68
- task buy "Get a tree" {
69
- effort 1d
70
- depends !plan
71
- }
72
- task action "Plant the tree" {
73
- effort 0.5d
74
- depends !buy
75
- }
76
- }
77
-
78
- taskreport planttree "PlantTree.html" {
79
- formats html
80
- caption "This project shows how to plant a tree easily"
81
- headline "How to plant a tree"
82
- columns name, start, end, daily
83
- # Don't hide any resource, thus show them all.
84
- hideresource 0
85
- }
86
- </pre></div>
87
- </div>
88
- <br/>
89
- <hr/>
90
- <table style="width:90%; margin-left:5%; margin-right:5%"><tr>
91
- <td style="text-align:left; width:35%;">&lt;&lt; <a href="complete.html">complete</a> &lt;&lt;</td>
92
- <td style="text-align:center; width:30%;"><a href="toc.html">Table Of Contents</a></td>
93
- <td style="text-align:right; width:35%;">&gt;&gt; <a href="credits.html">credits</a> &gt;&gt;</td>
94
- </tr></table>
95
- <hr/>
96
- <br/>
97
- <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 by Chris Schlaeger &lt;cs@taskjuggler.org&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
98
- </body>
99
- </html>
data/manual/html/credits.html DELETED
@@ -1,123 +0,0 @@
1
- <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.8.0 -->
3
- <html lang="en" xml:lang="en">
4
- <head>
5
- <title>credits</title>
6
- <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
7
- <meta content="IE=9" http-equiv="X-UA-Compatible"/>
8
- <meta content="The TaskJuggler Manual" name="description"/>
9
- <meta content="taskjuggler, project, management" name="keywords"/>
10
- </head>
11
- <link href="css/tjmanual.css" rel="stylesheet" type="text/css"></link>
12
- <body>
13
- <div align="center">
14
- <h3 align="center">The TaskJuggler User Manual</h3>
15
- <em align="center">Project Management beyond Gantt Chart Drawing</em>
16
- </div>
17
- <br/>
18
- <hr/>
19
- <table style="width:90%; margin-left:5%; margin-right:5%"><tr>
20
- <td style="text-align:left; width:35%;">&lt;&lt; <a href="copyright.html">copyright</a> &lt;&lt;</td>
21
- <td style="text-align:center; width:30%;"><a href="toc.html">Table Of Contents</a></td>
22
- <td style="text-align:right; width:35%;">&gt;&gt; <a href="currency.html">currency</a> &gt;&gt;</td>
23
- </tr></table>
24
- <hr/>
25
- <br/>
26
- <div style="margin-left:5%; margin-right:5%">
27
- <p><table align="center" class="table"><tr align="left">
28
- <td class="tag" style="width:16%">Keyword</td>
29
- <td class="descr" style="width:84%">
30
- <b>credits</b>
31
- <a href="List_Attributes.html">List Attribute</a>
32
- </td>
33
- </tr></table></p>
34
- <p><table align="center" class="table">
35
- <colgroup>
36
- <col width="16%"></col>
37
- <col width="24%"></col>
38
- <col width="60%"></col>
39
- </colgroup>
40
- <tr align="left">
41
- <td class="tag">Purpose</td>
42
- <td class="descr" colspan="2"><div>Book the specified amounts to the account at the specified date. The desciptions are just used for documentary purposes.</div></td>
43
- </tr>
44
- <tr align="left">
45
- <td class="tag">Syntax</td>
46
- <td class="descr" colspan="2"><code>credits &lt;date&gt; &lt;description&gt; &lt;amount&gt; [, &lt;date&gt; &lt;description&gt; &lt;amount&gt;...]</code></td>
47
- </tr>
48
- <tr align="left">
49
- <td class="tag" rowspan="3">Arguments</td>
50
- <td class="descr">date</td>
51
- <td class="descr"><div>See <a href="date.html">date</a> for details.</div></td>
52
- </tr>
53
- <tr align="left">
54
- <td class="descr">description [<a href="The_TaskJuggler_Syntax.html#STRING">STRING</a>]</td>
55
- <td class="descr"><div>Short description of the transaction</div></td>
56
- </tr>
57
- <tr align="left">
58
- <td class="descr">amount</td>
59
- <td class="descr"><div>Amount to be booked.</div></td>
60
- </tr>
61
- <tr align="left">
62
- <td class="tag">Context</td>
63
- <td class="descr" colspan="2"><a href="account.html">account</a></td>
64
- </tr>
65
- </table></p>
66
- <div class="codeframe"><pre class="code">account project_cost "Project Costs"
67
- account payments "Customer Payments"{
68
- credits 2007-01-01 "Customer down payment" 500.0,
69
- 2007-01-14 "1st rate" 2000.0
70
- }
71
-
72
- balance project_cost payments
73
-
74
- resource tux "Tux" {
75
- rate 300
76
- }
77
- resource konqui "Konqui" {
78
- rate 200
79
- }
80
-
81
- task items "Room decoration" {
82
- start 2007-01-06
83
- # The default account for all tasks
84
- chargeset project_cost
85
-
86
- task plan "Plan work and buy material" {
87
- # Upfront material cost
88
- charge 500.0 onstart
89
- length 2d
90
- }
91
- task remove "Remove old inventory" {
92
- allocate tux
93
- allocate konqui
94
- effort 1d
95
- depends !plan
96
- }
97
- task implement "Arrange new decoration" {
98
- effort 5d
99
- allocate tux, konqui
100
- depends !remove
101
- }
102
- task acceptance "Presentation and customer acceptance" {
103
- duration 5d
104
- depends !implement
105
- chargeset payments
106
- # Customer pays at end of acceptance
107
- charge 2000.0 onend
108
- }
109
- }
110
- </pre></div>
111
- </div>
112
- <br/>
113
- <hr/>
114
- <table style="width:90%; margin-left:5%; margin-right:5%"><tr>
115
- <td style="text-align:left; width:35%;">&lt;&lt; <a href="copyright.html">copyright</a> &lt;&lt;</td>
116
- <td style="text-align:center; width:30%;"><a href="toc.html">Table Of Contents</a></td>
117
- <td style="text-align:right; width:35%;">&gt;&gt; <a href="currency.html">currency</a> &gt;&gt;</td>
118
- </tr></table>
119
- <hr/>
120
- <br/>
121
- <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 by Chris Schlaeger &lt;cs@taskjuggler.org&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
122
- </body>
123
- </html>
data/manual/html/css/tjmanual.css DELETED
@@ -1,85 +0,0 @@
1
- pre {
2
- font-size:16px;
3
- font-family: Courier;
4
- padding-left:8px;
5
- padding-right:8px;
6
- padding-top:0px;
7
- padding-bottom:0px;
8
- }
9
- p {
10
- margin-top:8px;
11
- margin-bottom:8px;
12
- }
13
- code {
14
- font-size:16px;
15
- font-family: Courier;
16
- }
17
- .table {
18
- background-color:#ABABAB;
19
- width:100%;
20
- }
21
- .tag {
22
- background-color:#E0E0F0;
23
- font-size:16px;
24
- font-weight:bold;
25
- padding-left:8px;
26
- padding-right:8px;
27
- padding-top:5px;
28
- padding-bottom:5px;
29
- }
30
- .descr {
31
- background-color:#F0F0F0;
32
- font-size:16px;
33
- padding-left:8px;
34
- padding-right:8px;
35
- padding-top:5px;
36
- padding-bottom:5px;
37
- }
38
- .attrtable {
39
- background-color:#ABABAB;
40
- }
41
- .attrtag {
42
- background-color:#F0F0F0;
43
- font-family: Courier;
44
- padding-left:6px;
45
- padding-right:6px;
46
- padding-top:3px;
47
- padding-bottom:3px;
48
- }
49
- .attrdescr {
50
- background-color:#F0F0F0;
51
- padding-left:6px;
52
- padding-right:6px;
53
- padding-top:3px;
54
- padding-bottom:3px;
55
- width:100%;
56
- }
57
- .codeframe{
58
- border-width:2px;
59
- border-color:#ABABAB;
60
- border-style:solid;
61
- background-color:#F0F0F0;
62
- margin-top:8px;
63
- margin-bottom:8px;
64
- }
65
- .code {
66
- padding-left:15px;
67
- padding-right:15px;
68
- padding-top:0px;
69
- padding-bottom:0px;
70
- }
71
- div[codesection] {
72
- border-width:2px;
73
- border-color:#ABABAB;
74
- border-style:solid;
75
- background-color:#F0F0F0;
76
- margin-top:8px;
77
- margin-bottom:8px;
78
- }
79
- pre[codesection] {
80
- padding-left:15px;
81
- padding-right:15px;
82
- padding-top:0px;
83
- padding-bottom:0px;
84
- }
85
-