From 52fdd3bbe4d99111a578731ca2f6bfb4d73eefcf Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:15:06 +0000 Subject: [PATCH 1/2] feat: Improve `Chen diagram` management According to `Chen` diagram and new PlantUML Keywords from: - #1718 Add `Chen` diagram on: - Syntax _(improve Language Descriptor (to follow plantuml/backlog#4))_ - Sub-diagram - Readme _(Similar to #1669)_ _[FYI @Benjamin-Davies]_ --- README.md | 4 +++- src/net/sourceforge/plantuml/EmbeddedDiagram.java | 3 +++ src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ed53dcb1e..d807a397c 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,9 @@ PlantUML is a component that allows you to create various UML diagrams through s - [MindMap diagram](http://plantuml.com/mindmap-diagram) - [WBS (Work Breakdown Structure)](http://plantuml.com/wbs-diagram) - [Mathematical Notations (AsciiMath, JLaTeXMath)](http://plantuml.com/ascii-math) - - [IE/ER (Information Engineering/Entity Relationship)](http://plantuml.com/ie-diagram) + - Entity Relationship (ER) diagram + - [Information Engineering (IE) diagram](http://plantuml.com/ie-diagram) + - [Entity Relationship (ER) diagram (Chen's notation)](http://alphadoc.plantuml.com/doc/markdown/en/er-diagram) ### 📣 Additional Features diff --git a/src/net/sourceforge/plantuml/EmbeddedDiagram.java b/src/net/sourceforge/plantuml/EmbeddedDiagram.java index 6cdd7abed..94879967d 100644 --- a/src/net/sourceforge/plantuml/EmbeddedDiagram.java +++ b/src/net/sourceforge/plantuml/EmbeddedDiagram.java @@ -122,6 +122,9 @@ public class EmbeddedDiagram extends AbstractTextBlock implements Line, Atom { if (s.equals(EMBEDDED_START + "chronology")) return "chronology"; + if (s.equals(EMBEDDED_START + "chen")) + return "chen"; + return null; } diff --git a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java index 597b5b2e7..20eddeb11 100644 --- a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java +++ b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java @@ -95,6 +95,7 @@ public class LanguageDescriptor { type.add("json"); type.add("action"); type.add("process"); + type.add("relationship"); keyword.add("@startwire"); keyword.add("@startbpm"); @@ -124,6 +125,7 @@ public class LanguageDescriptor { keyword.add("@startregex"); keyword.add("@startfiles"); keyword.add("@startchronology"); + keyword.add("@startchen"); keyword.add("@endwire"); keyword.add("@endbpm"); keyword.add("@enduml"); @@ -152,6 +154,7 @@ public class LanguageDescriptor { keyword.add("@endregex"); keyword.add("@endfiles"); keyword.add("@endchronology"); + keyword.add("@endchen"); keyword.add("as"); keyword.add("also"); keyword.add("autonumber"); From 6802c2b578e9cd2b427783de32d30ba70a6e3365 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:25:15 +0000 Subject: [PATCH 2/2] fix: rename `%splitstrregex` builtin function to `%splitstr_regex` According to: - https://forum.plantuml.net/18827/%25splitstr-please-add-regex-support-as-second-argument?show=18838#c18838 --- src/net/sourceforge/plantuml/tim/stdlib/SplitStrRegex.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SplitStrRegex.java b/src/net/sourceforge/plantuml/tim/stdlib/SplitStrRegex.java index 16bdfa5c9..6c15e7b1a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SplitStrRegex.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SplitStrRegex.java @@ -49,7 +49,7 @@ import net.sourceforge.plantuml.tim.expression.TValue; public class SplitStrRegex extends SimpleReturnFunction { public TFunctionSignature getSignature() { - return new TFunctionSignature("%splitstrregex", 2); + return new TFunctionSignature("%splitstr_regex", 2); } @Override