octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-16 18:25:11 +00:00
Code Issues Releases Wiki Activity
1,197 Commits 10 Branches 89 Tags 50 MiB
26874fe610
Commit Graph

650 Commits

Author SHA1 Message Date
Arnaud Roques
2efa343e38 Decouple StringBounderDebug from any OS 2021-03-22 14:20:24 +01:00
Arnaud Roques
aad084e5a1 Try to turn around some rounding issues 2021-03-22 10:54:54 +01:00
Arnaud Roques
0d6a17a27e Fix SimpleSequenceDiagramTest by using the appropriate StringBounderDebug 2021-03-22 09:45:48 +01:00
Arnaud Roques
bdc0eb9709 Add a first test using Debug format output 2021-03-21 13:52:20 +01:00
matthew16550
720d9f5203 Tweak Smetana Y offset to avoid clipping at top 2021-03-21 19:07:28 +11:00
matthew16550
9f576036df Fix top & left margin problems with CucaDiagrams (#497) 2021-03-21 00:37:59 +11:00
Arnaud Roques
ad2e9d5fb3 Remove unused files 2021-03-19 18:27:32 +01:00
Arnaud Roques
e6437ce908 Refactor Gantt and clean TitledDiagram 2021-03-19 17:58:09 +01:00
matthew16550
848a75216f Fix previous regression a different way that fixes a use case the previous fix missed. 2021-03-20 02:51:26 +11:00
matthew16550
3c87ae4671 Fix regression for Activity, Class, Description & State Diagram default margins. 2021-03-19 23:06:57 +11:00
matthew16550
c20fe8d58f Fix regression for Sequence Diagram default margins when using Puma. 2021-03-19 22:20:29 +11:00
arnaudroques
4a1a8787d0
Merge pull request #493 from matthew16550/scale 
Handle Scale & DPI more consistently for all diagram types.
 2021-03-18 22:38:24 +01:00
Arnaud Roques
756225dee0 Add Gantt bugfix 2021-03-18 22:38:00 +01:00
matthew16550
270fec579a Simplify GitDiagram code for consistency with other diagrams. Margin / scale / background color etc will not take effect until those commands are enabled for this diagram type. 2021-03-19 06:00:55 +11:00
matthew16550
2da2146f21 Handle Scale & DPI more consistently for all diagram types. 2021-03-19 05:14:42 +11:00
arnaudroques
69645c8e1e
Merge pull request #492 from matthew16550/test-2 
Tweaks to enable "Test Playground" in plantuml-test repo
 2021-03-18 14:38:48 +01:00
Arnaud Roques
266e8b6497 Add new affectation 2021-03-18 14:38:17 +01:00
matthew16550
7d7fdaddf2 Tweak visibility in PSystemError to help with tests. 2021-03-19 00:12:00 +11:00
Arnaud Roques
82c57e1b54 fix typo in comment 2021-03-15 17:14:41 +01:00
Kir Ax
8b99027a83 Add empty line between code blocks 2021-03-14 23:40:04 +07:00
Kir Ax
869143866f Make interactive SVG for Object diagrams 2021-03-14 23:37:50 +07:00
Kir Ax
e27667b683 Make interactive SVG for Class diagrams 2021-03-14 18:56:57 +07:00
Arnaud Roques
28f253d992 Bug fixes 2021-03-12 19:16:16 +01:00
Arnaud Roques
1fb75b1b0e Delete unused files 2021-03-10 18:34:49 +01:00
matthew16550
4b4562ec35 Move UmlDiagram.animation to parent class (TitledDiagram). 2021-03-10 05:41:49 +11:00
matthew16550
568c2e3106 Move diagram.getAnimation() & diagram.getWarningOrError() into ImageParameter class. 2021-03-10 05:31:38 +11:00
Arnaud Roques
bedbe1036b Fix background color for MinMapDiagram 2021-03-09 19:02:38 +01:00
matthew16550
fbbb8a2756 Refactor duplicated logic to ImageParameter class. This will provide consistent support for Diagram Border, Handwritten, Background Color, Metadata (and possibly more) in many diagram types than previously did not support them. 2021-03-09 16:13:14 +11:00
matthew16550
2d50dd9c59 Move diagram margin logic to ImageParameter.calculateDiagramMargin(). This will allow CSS control of margins in many diagrams that previously did not allow it. 2021-03-09 05:32:41 +11:00
Arnaud Roques
eea48055d3 Import version 1.2021.2 2021-03-07 13:23:24 +01:00
Arnaud Roques
66520f0a35 Add interactive functionality for Usecase diagrams exported to SVG 2021-03-04 19:11:16 +01:00
arnaudroques
74ff89f4ba
Merge pull request #475 from ioplker/master 
Add interactive functionality for Usecase diagrams exported to SVG
 2021-03-03 14:39:52 +01:00
arnaudroques
0f034043df
Merge pull request #348 from matschaffer/remove-license-message-on-empty-diagram 
Move license message below getting started
 2021-03-02 18:00:55 +01:00
Kir Ax
ae3f858c81 Add check for elem existance to interactive SVG; reindent JS-code 2021-03-02 21:25:46 +07:00
Kir Ax
f3e7e97fe8 Add interactive functionality for Usecase diagrams exported to SVG 2021-02-28 20:44:02 +07:00
matthew16550
40e7e762e4 Add support for wave underlined text in SVG. 2021-02-21 13:51:54 +11:00
matthew16550
a4553adeb2 Add "POST /render" endpoint to picoweb server. 
It expects a JSON body like
  { "source": PLANTUML_SOURCE_STRING, "options": ARRAY_OF_STRINGS }

And returns the rendered diagram with suitable Content-Type header (all output formats are supported).
 2021-02-13 01:09:28 +11:00
matthew16550
f850b5f400 * Allow specifying the bind address that picoweb will listen on (e.g. -picoweb:8000:localhost). 
* Change picoweb server to print the actual port being listened on when port 0 was specified.
 2021-02-12 17:19:03 +11:00
Arnaud Roques
0dc13cccf2 Import version 1.2021.1 2021-02-02 11:12:15 +01:00
matthew16550
6c5a53b0bf Change Activity Diagram "Stop" and "End" symbols to fill using the diagram background color instead of always using white. 2021-01-21 12:44:35 +11:00
matthew16550
12211946f4 Change link decorators to fill using the diagram background color instead of always using white. 2021-01-21 00:33:07 +11:00
Arnaud Roques
5ec1037202 Import version 1.2021.0 2021-01-10 21:52:19 +01:00
arnaudroques
3a7e935cec
Merge pull request #440 from Nordes/feature/432-gantt_color_DaysOfWeek 
[GANTT] Implement "[day] are colored in #AAAAFF"
 2021-01-08 18:35:24 +01:00
Nordes Menard-Lamarre
443be15d3e 432-Implement "[day] are colored in #AAAAFF" 2021-01-07 22:16:04 -05:00
Nordes Menard-Lamarre
b6a5270b9c #437-Implement arrow style color 2021-01-07 20:56:09 -05:00
Arnaud Roques
099843c830 Import version 1.2020.26 2020-12-21 20:05:24 +01:00
Arnaud Roques
11a9317042 Missing files 2020-12-20 13:59:51 +01:00
Arnaud Roques
5dab086ba1 Import version 1.2020.24 2020-12-19 22:21:54 +01:00
Arnaud Roques
56cd2269dd Import version 1.2020.23 2020-12-14 19:31:06 +01:00
Arnaud Roques
7e81ef289b Import version 1.2020.22 2020-12-06 22:43:09 +01:00
Arnaud Roques
9b708081fc Import version 1.2020.21 2020-12-01 22:39:27 +01:00
Arnaud Roques
2404fb605b Import version 1.2020.20 2020-11-21 18:33:24 +01:00
arnaudroques
b3e4b7f8f2
Merge pull request #396 from vprcic/master 
New actor style - Hollow
 2020-10-30 17:25:29 +01:00
vprcic
a9813ad99d New actor style - Hollow 
A new actor style named Hollow that changes the actor appearance, similar to the already existing Awesome actor style
 2020-10-29 11:51:40 +01:00
Cédrik LIME
de02412c79 Update OpenIconic from 1.1.0 to 1.1.1 2020-10-27 20:47:53 +01:00
Arnaud Roques
c670872511 Import version 1.2020.19 2020-10-12 22:56:58 +02:00
Arnaud Roques
58936dc235 Import version 1.2020.18 2020-09-30 22:57:58 +02:00
Arnaud Roques
b27fa50b50 Import version 1.2020.17 2020-09-19 17:43:24 +02:00
Arnaud Roques
55d1d81055 Import version 1.2020.16 2020-08-25 19:24:17 +02:00
Beat Christen
be5564f5b2 ignore trailing ws when reading diagrams from pipes 
fixes #349
 2020-07-13 15:46:55 +02:00
Mat Schaffer
68bb4dae02
Move license message below getting started 2020-07-06 10:52:54 +09:00
Arnaud Roques
55ca84b7c1 Import version 1.2020.15 2020-06-28 14:40:33 +02:00
Arnaud Roques
a38685d3ba Import version 1.2020.14 2020-06-21 22:31:45 +02:00
Matt Crouch
c04cbf14e1
Correct minor typo 
Sprits -> Sprites
 2020-06-17 13:48:55 +01:00
Arnaud Roques
37a6f82e35 version 1.2020.13 2020-06-14 22:35:42 +02:00
Arnaud Roques
301fd18b2f version 1.2020.12 2020-06-07 12:03:18 +02:00
Arnaud Roques
3192fa218c version 1.2020.11 2020-05-30 17:20:23 +02:00
Serge Wenger
0dc09da9a8 Sate deep history first implementation 2020-05-18 22:01:37 +02:00
Arnaud Roques
bb94634fd4 version 1.2020.10 2020-05-17 23:15:50 +02:00
Jason Harper
ed9fdb02c2 Added better documentation to the angle conversion function 2020-05-12 11:12:59 -04:00
Jason Harper
114e14457b Fixed arc orientation for lollipop connections 2020-05-12 11:09:03 -04:00
Arnaud Roques
5bd20214e2 version 1.2020.9 2020-05-10 16:19:20 +02:00
Arnaud Roques
e9fb57cbbe Adding contribution from Hisashi Miyashita for SysML v2 support 2020-05-07 16:12:08 +02:00
Thomas Weißschuh
ec246f16a0 dot: be less restrictive in digraph header 
The space between the digraph title and the following brace is not required by
"dot".
 2020-05-05 13:48:56 +02:00
Arnaud Roques
138cfb900a version 1.2020.8 2020-04-26 20:31:41 +02:00
Arnaud Roques
9077d971d7 version 1.2020.7 2020-04-19 18:04:39 +02:00
boessu
b2f33306ca
Update Colors according to Archiate off. Specs 
This is mainly a proposal.
The colors at the moment are sometimes quite "loud" and on some it's a bit hard to read the (black) text on it. The colors from the Archimate Specifications (https://pubs.opengroup.org/architecture/archimate3-doc/chap03.html#_Toc10045294) are more subtle and you can better read text on it. It is not necessary to change the colors of the sprites too. But that's just my opinion.
 2020-04-10 14:29:24 +02:00
Arnaud Roques
85ad30b381 version 1.2020.6 2020-04-05 17:13:04 +02:00
Arnaud Roques
ce8d9045b5 version 1.2020.4 2020-03-19 14:06:15 +01:00
Arnaud Roques
03b30b1007 version 1.2020.3 2020-03-18 11:50:02 +01:00
Arnaud Roques
7a5b515bf6 version 1.2020.2 2020-03-03 23:29:34 +01:00
Alfred Porter
d95ff13351 Added %upper/%lower to built-in macro functions 2020-02-28 16:32:17 +01:00
Arnaud Roques
4cad5546ac version 1.2020.1 2020-02-18 22:24:31 +01:00
Arnaud Roques
19b9eb3534 version 1.2020.0 2020-01-12 23:13:17 +01:00
Arnaud Roques
275cde19a8 version 1.2019.13 2019-12-10 22:45:49 +01:00
Arnaud Roques
36c461dabe version 1.2019.12 2019-11-03 18:40:03 +01:00
arnaudroques
82b570d0f0
Merge pull request #220 from cosminpolifronie/master 
fix FileFormatOption constructor not using withMetadata parameter
 2019-10-10 16:18:02 +02:00
Arnaud Roques
fd2c1f2bd6 Fix readme 2019-10-04 17:57:27 +02:00
arnaudroques
ff66cc3e8e
Merge pull request #10 from mikeando/mikeando-overview-md 
Created README.md in src directory
 2019-10-04 17:53:25 +02:00
Arnaud Roques
c4397fac97 version 1.2019.11 2019-09-22 19:20:16 +02:00
Arnaud Roques
90372b993c version 1.2019.10 2019-09-14 20:12:04 +02:00
Arnaud Roques
d0fdb2433b version 1.2019.9 2019-08-26 19:07:21 +02:00
wb-slc596115
5ac89402b0 fix: note split problem 2019-08-19 10:34:45 +08:00
Arnaud Roques
18b688210f version 1.2019.8 2019-07-14 22:09:26 +02:00
albert-github
d43296c82e Documentation corrections 
Some "obvious" code documentation corrections.
 2019-07-04 13:52:30 +02:00
Cosmin Polifronie
ac64f9fa11 fix FileFormatOption constructor not using withMetadata parameter 2019-07-01 18:52:38 +03:00
Arnaud Roques
fb108ebb5a version 1.2019.7 2019-06-26 21:24:49 +02:00
Konstantin V. Borisov
f3a41f3c7c Fixed some archimate icons 2019-05-25 22:22:52 +07:00
Arnaud Roques
99041c5ccb version 1.2019.6 2019-05-24 21:59:31 +02:00
szpio
f97efa4c91 Store mindmap source in PNG images 
This change will store mindmap source diagram as metadata in PNG images or as
comment in SVG images. It is very useful when only image, not source, is
available and the change to mindmap is required.

This functionality was/is already available for other types of diagrams
but was not working for mindmap.

As described in `help` to retrieve mindmap sources use:

```
java -jar plantuml.jar -metadata <mindmap-image>.png
```
To get the sources from SVG image simply open SVG file in text editor
and copy sources from `comment element` at the end of the file.
 2019-04-30 22:40:17 +01:00
Arnaud Roques
73b507c1df version 1.2019.5 2019-04-21 22:40:01 +02:00
Arnaud Roques
857ec10b8b version 1.2019.4 2019-03-29 23:14:07 +01:00
Arnaud Roques
120fb859b2 version 1.2019.2 2019-03-01 23:16:29 +01:00
Arnaud Roques
d7535d8027 version 1.2019.1 2019-02-09 22:56:24 +01:00
qwazer
269c2828c0 Add ability to use any shape from USymbol in nwdiag elements. 
Example:
@startuml
nwdiag {
  network inet {
	  web01 [shape = cloud]
  }
}
@enduml
 2019-02-06 17:41:01 +03:00
robert
c9c46b00e3 Avoid passing too many arguments to String.format 2019-01-23 15:15:02 +00:00
robert
ec0611d7cf Fix SuggestEngineResult.sameString for two non-null strings 2019-01-23 15:06:56 +00:00
robert
1ec667cc0b Fix type mismatch on container access 2019-01-23 14:56:26 +00:00
Arnaud Roques
2c655a6b74 version 1.2019.0 2019-01-16 19:34:41 +01:00
Arnaud Roques
3ecadf6bd5 version 1.2018.14 2018-12-22 12:11:40 +01:00
Arnaud Roques
3736d048b3 version 1.2018.13 2018-11-26 19:46:50 +01:00
Arnaud Roques
03e61673a7 version 1.2018.13 2018-11-26 19:46:22 +01:00
Steffen Dettmer
2d2086d88f Allow "hide footbox" in timing diagrams (ignoring it). 
http://forum.plantuml.net/8089/hide-footbox-not-recognized-in-timing-diagrams:

  When placing "hide footbox" at the beginning of a timing diagram, a
  syntax error is reported.

  This "hide footbox" is common to all our diagrams (plantuml.cfg file).

  ------

  We have a similar problem with 'hide footbox' in the global config
  file; the syntax error is not related to the config file though, you can
  place 'hide footbox' directly in the diagram and will get the syntax
  error
 2018-11-22 09:54:40 +01:00
Arnaud Roques
54ace4f309 version 1.2018.12 2018-10-21 21:44:14 +02:00
Arnaud Roques
414f51d257 version 1.2018.11 2018-09-23 14:15:14 +02:00
Arnaud Roques
4758fa1d66 version 1.2018.10 2018-08-26 14:09:50 +02:00
Arnaud Roques
1a8e4feb6a version 1.2018.9 2018-07-27 23:59:19 +02:00
Arnaud Roques
87ee4898b1 version 1.2018.9 2018-07-27 23:56:46 +02:00
Arnaud Roques
a363246176 version 1.2018.8 2018-06-25 21:05:58 +02:00
Arnaud Roques
84e117e287 version 1.2018.7 2018-06-12 22:50:45 +02:00
Arnaud Roques
55390ef1d1 Start to add Problem Diagrams 2018-05-21 21:24:25 +02:00
Arnaud Roques
1aec937bbe Start to add Problem Diagrams 2018-05-21 21:15:19 +02:00
Arnaud Roques
d7ecae5722 version 1.2018.6 2018-05-21 15:07:09 +02:00
Arnaud Roques
14e1e6671c version 1.2018.5 2018-05-06 21:59:19 +02:00
Arnaud Roques
cfacbc1f97 version 1.2018.4 2018-05-01 19:26:04 +02:00
Arnaud Roques
e3bdf19745 version 1.2018.3 2018-04-06 22:36:30 +02:00
Arnaud Roques
86c9c6d603 version 1.2018.2 2018-03-09 22:37:34 +01:00
Arnaud Roques
557e8c94b9 version 1.2018.1 2018-01-28 23:08:15 +01:00
Arnaud Roques
0be8ee2e6f version 1.2018.0 2018-01-04 23:32:45 +01:00
Arnaud Roques
c17f4a1254 version 1.2017.20 2017-12-11 22:02:10 +01:00
Arnaud Roques
a628cfdb76 version 1.2017.19 2017-11-20 17:10:36 +01:00
Arnaud Roques
a5701fb84b version 1.2017.18 2017-10-07 11:46:53 +02:00
Arnaud Roques
ce99e6f260 version 1.2017.17 2017-09-03 18:59:24 +02:00
Arnaud Roques
1a5ca5cf48 version 1.2017.15 2017-07-03 19:59:53 +02:00
Arnaud Roques
f9bf7c08e5 version 1.2017.14 2017-06-05 13:27:21 +02:00
Arnaud Roques
2202502f2f version 1.2017.13 2017-05-10 21:51:15 +02:00
Arnaud Roques
dc9d5327b7 version 1.2017.12 2017-04-26 19:48:37 +02:00
Arnaud Roques
5c62d2c083 version 2017.11 2017-04-19 20:30:16 +02:00
Arnaud Roques
e3a5d8f744 version 2017.09 2017-04-05 19:37:42 +02:00
Arnaud Roques
091a95bd82 version 2017.08 2017-03-21 22:37:59 +01:00
Arnaud Roques
69ea262d5d version 8059 2017-03-15 20:13:31 +01:00
Arnaud Roques
cb762a8f11 version 8058 2017-03-12 18:22:02 +01:00
Arnaud Roques
73307b6df5 version 8057 2017-02-26 17:26:11 +01:00
Arnaud Roques
c7252cdf63 version 8056 2017-02-15 22:34:36 +01:00
Arnaud Roques
a2cbfb5712 version 8055 2017-02-01 19:55:51 +01:00
Arnaud Roques
69c25ec749 version 8054 2017-01-21 23:25:28 +01:00
Arnaud Roques
ae4cf31832 version 8053 2016-12-21 23:10:29 +01:00
Arnaud Roques
3100d49b54 version 8052 2016-12-14 22:01:03 +01:00
Arnaud Roques
23f63f7ae2 version 8051 2016-12-01 21:29:25 +01:00
Arnaud Roques
c2f885ffb5 version 8050 2016-11-18 22:12:09 +01:00
Arnaud Roques
9f28832b09 version 8049 2016-11-04 22:39:29 +01:00
Arnaud Roques
6e2c2c32c9 version 8048 2016-09-29 21:51:18 +02:00
Arnaud Roques
b165be16e3 version 8047 2016-08-25 22:45:37 +02:00
Arnaud Roques
4638f93975 version 8046 2016-07-25 21:25:28 +02:00
Arnaud Roques
dccc859954 version 8045 2016-07-04 21:06:50 +02:00
Arnaud Roques
446f3d9a18 version 8043 2016-06-19 16:16:41 +02:00
Arnaud Roques
fd538b5fe8 version 8042 2016-05-31 21:41:55 +02:00
Arnaud Roques
c1f657b42e version 8041 2016-05-19 20:41:37 +02:00
Arnaud Roques
d2bb8f328c version 8040 2016-05-11 23:31:47 +02:00
Arnaud Roques
092b0a79bd version 8039 2016-04-22 22:36:08 +02:00
Mike Anderson
66650b8b7a Created README.md in src directory 
Primarily so that it shows up in github when viewing the src directory
 2016-04-05 10:21:59 +08:00
Arnaud Roques
de562c2660 version 8038 2016-04-04 21:05:10 +02:00
Arnaud Roques
8232bdbf06 version 8037 2016-03-06 17:47:34 +01:00
Arnaud Roques
274a1fa43e version 8036 2016-02-07 22:13:01 +01:00
Arnaud Roques
94542f7760 version 8035 2016-01-30 13:20:07 +01:00
Arnaud Roques
703a77ee1c version 8034 2016-01-09 13:15:40 +01:00
Arnaud Roques
83478c0403 version 8032 2015-11-01 19:37:20 +01:00
Arnaud Roques
902ab3e908 version 8031 2015-09-28 22:42:17 +02:00
Arnaud Roques
9ca0fe659d version 8030 2015-09-06 19:28:59 +02:00
Arnaud Roques
c5043d5fe3 version 8029 2015-08-05 22:17:01 +02:00
Arnaud Roques
e7251d394d version 8028 2015-07-11 11:32:49 +02:00
Arnaud Roques
1c21c4ddaf version 8027 2015-06-20 12:54:49 +02:00
Arnaud Roques
dd45415e20 version 8026 2015-06-07 12:23:10 +02:00
Arnaud Roques
f35a3a00df version 8025 2015-05-31 20:56:03 +02:00
Arnaud Roques
136819ca48 version 8024 2015-05-03 17:36:36 +02:00
Arnaud Roques
36ce60c4c1 version 8023 2015-04-20 21:54:30 +02:00
Arnaud Roques
f2872e630b version 8023 2015-04-20 21:48:18 +02:00
Arnaud Roques
4fff158089 version 8023 2015-04-20 21:45:13 +02:00
Arnaud Roques
3e922a6f3c version 8022 2015-04-07 20:26:58 +02:00
Arnaud Roques
b6ea839fa1 version 8022 2015-04-07 20:18:37 +02:00
Arnaud
8909624dee Compilation travis 2013-12-11 19:06:45 +01:00
Arnaud
94216e527e File remove 2013-12-10 22:36:19 +01:00
Arnaud
cace20326f Version 7988 2013-12-10 20:36:50 +01:00
Arnaud Roques
4af6019e04 Version 7232 2011-09-08 12:42:27 +02:00
Arnaud Roques
7cee7b4601 Version 7177 2011-09-07 22:41:58 +02:00
Arnaud Roques
df0e7faa11 Version 6939 2011-08-08 19:48:29 +02:00
Arnaud Roques
fe6831d641 Version 6487 2011-04-19 18:50:40 +02:00
Arnaud Roques
7347fc27af Version 6242 2011-03-26 13:37:27 +01:00
Arnaud Roques
a53403952e Version 6210 2011-03-20 22:40:07 +01:00
Arnaud Roques
573aac6a1c Version 6141 2011-02-23 22:14:39 +01:00
Arnaud Roques
2ce0511e80 Version 6121 2011-02-14 12:56:34 +01:00
Arnaud Roques
27af4f85f3 Version 6085 2011-01-29 16:09:35 +01:00
Arnaud Roques
5ddc03f92d Version 6035 2011-01-23 20:36:52 +01:00
Arnaud Roques
581798f94d Version 5974 2011-01-13 22:52:37 +01:00
Arnaud Roques
6ace15b789 Version 5994 2011-01-12 20:06:53 +01:00
Arnaud Roques
a80a3daf68 Version 5930 2011-01-11 08:42:49 +01:00
Arnaud Roques
a8bf09d279 Version 5911 2011-01-09 20:00:05 +01:00
Arnaud Roques
9005abef50 Commit of version 5878 2011-01-05 19:23:06 +01:00
Arnaud Roques
543e0271f4 Version 5658 2010-11-25 22:12:39 +01:00
Arnaud Roques
042fad1353 Import from version 5538 2010-11-15 21:35:36 +01:00