diff --git a/cupAndlex/pom.xml b/cupAndlex/pom.xml
index e0e02fae..426f4a6e 100644
--- a/cupAndlex/pom.xml
+++ b/cupAndlex/pom.xml
@@ -6,7 +6,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
cupAndlex
diff --git a/cupruntime/pom.xml b/cupruntime/pom.xml
index d99b4e36..f988ccbb 100644
--- a/cupruntime/pom.xml
+++ b/cupruntime/pom.xml
@@ -5,7 +5,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
cupruntime
jar
diff --git a/jhotdrawfw/pom.xml b/jhotdrawfw/pom.xml
index 325c8758..4fd03865 100644
--- a/jhotdrawfw/pom.xml
+++ b/jhotdrawfw/pom.xml
@@ -4,7 +4,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
jhotdrawfw
jar
diff --git a/jsesh-installer/pom.xml b/jsesh-installer/pom.xml
index e51b7af5..5478f564 100644
--- a/jsesh-installer/pom.xml
+++ b/jsesh-installer/pom.xml
@@ -5,7 +5,7 @@
JSesh-all
org.qenherkhopeshef.jsesh
- 7.5.4
+ 7.5.5
New JSesh installer builder.
diff --git a/jsesh/pom.xml b/jsesh/pom.xml
index dd9fa26f..7ff76d89 100644
--- a/jsesh/pom.xml
+++ b/jsesh/pom.xml
@@ -5,7 +5,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
jsesh
jar
diff --git a/jsesh/src/main/java/jsesh/mdcDisplayer/drawingElements/CartoucheDrawerHelper.java b/jsesh/src/main/java/jsesh/mdcDisplayer/drawingElements/CartoucheDrawerHelper.java
index 3cb625da..2b79d35b 100644
--- a/jsesh/src/main/java/jsesh/mdcDisplayer/drawingElements/CartoucheDrawerHelper.java
+++ b/jsesh/src/main/java/jsesh/mdcDisplayer/drawingElements/CartoucheDrawerHelper.java
@@ -99,6 +99,7 @@ private AbstractCartoucheDrawer buildDelegate(Cartouche c) {
AbstractCartoucheDrawer delegate = null;
switch (c.getType()) {
case 'f':
+ case 'F':
delegate = new EnclosureDrawer(drawingSpecifications, currentTextDirection, currentTextOrientation, currentView, g);
break;
case 's':
diff --git a/jsesh/src/main/java/jsesh/mdcDisplayer/preferences/CartoucheSizeHelper.java b/jsesh/src/main/java/jsesh/mdcDisplayer/preferences/CartoucheSizeHelper.java
index 0a3b46bf..72d0b74c 100644
--- a/jsesh/src/main/java/jsesh/mdcDisplayer/preferences/CartoucheSizeHelper.java
+++ b/jsesh/src/main/java/jsesh/mdcDisplayer/preferences/CartoucheSizeHelper.java
@@ -7,7 +7,7 @@ public class CartoucheSizeHelper {
* axis. Use the basic sizes values declared in this class.
* @param drawingSpecification the corresponding {@link DrawingSpecification}
* @param type
- * the type of cartouche ('c', 's', 'h', 'f')
+ * the type of cartouche ('c', 's', 'h', 'f' or 'F')
* @param element :
* 0,1,2,3, depending on the type of cartouche.
* @return a size.
@@ -62,6 +62,7 @@ public static float computeCartouchePartLength(DrawingSpecification drawingSpeci
throw new RuntimeException("bad value for element " + element);
}
break;
+ case 'F':
case 'f':
if (element != 0) {
result = drawingSpecification.getHwtSmallMargin()
@@ -89,6 +90,7 @@ public static float computeCartoucheSecondaryLength(DrawingSpecification drawing
case 'h':
result = drawingSpecification.getCartoucheMargin() + drawingSpecification.getCartoucheLineWidth();
break;
+ case 'F':
case 'f':
result = drawingSpecification.getCartoucheMargin() + drawingSpecification.getCartoucheLineWidth()
+ drawingSpecification.getEnclosureBastionDepth();
diff --git a/jseshAppli/pom.xml b/jseshAppli/pom.xml
index 8c6a90c8..454709f8 100644
--- a/jseshAppli/pom.xml
+++ b/jseshAppli/pom.xml
@@ -5,7 +5,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
jseshAppli
jar
diff --git a/jseshDemos/pom.xml b/jseshDemos/pom.xml
index 760c2003..026943ab 100644
--- a/jseshDemos/pom.xml
+++ b/jseshDemos/pom.xml
@@ -7,7 +7,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
jseshDemos
jar
diff --git a/jseshGlyphs/pom.xml b/jseshGlyphs/pom.xml
index 73b11649..904cc048 100644
--- a/jseshGlyphs/pom.xml
+++ b/jseshGlyphs/pom.xml
@@ -4,7 +4,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
jseshGlyphs
jar
diff --git a/jseshLabels/pom.xml b/jseshLabels/pom.xml
index b1ff2506..a56eeb54 100644
--- a/jseshLabels/pom.xml
+++ b/jseshLabels/pom.xml
@@ -4,7 +4,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
Generic i18n texts, usable by all JSesh components.
diff --git a/jseshSearch/pom.xml b/jseshSearch/pom.xml
index 617734eb..6ed05d10 100644
--- a/jseshSearch/pom.xml
+++ b/jseshSearch/pom.xml
@@ -5,7 +5,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
jseshSearch
jar
diff --git a/pom.xml b/pom.xml
index 541a07dd..0432e320 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
pom
JSesh complete distribution
diff --git a/prepareJSeshRelease/pom.xml b/prepareJSeshRelease/pom.xml
index 1ce7b7af..8d4b99ec 100644
--- a/prepareJSeshRelease/pom.xml
+++ b/prepareJSeshRelease/pom.xml
@@ -5,7 +5,7 @@
JSesh-all
org.qenherkhopeshef.jsesh
- 7.5.4
+ 7.5.5
prepareJSeshRelease
diff --git a/qenherkhopeshefUtils/pom.xml b/qenherkhopeshefUtils/pom.xml
index 0a069a6d..2c6cae69 100644
--- a/qenherkhopeshefUtils/pom.xml
+++ b/qenherkhopeshefUtils/pom.xml
@@ -4,7 +4,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
qenherkhopeshefUtils
jar
diff --git a/signInfoAppli/pom.xml b/signInfoAppli/pom.xml
index f742bfcf..09287220 100644
--- a/signInfoAppli/pom.xml
+++ b/signInfoAppli/pom.xml
@@ -5,7 +5,7 @@
org.qenherkhopeshef.jsesh
JSesh-all
- 7.5.4
+ 7.5.5
signInfoAppli
jar