diff --git a/Doc/Sd1/arrays.xml b/Doc/Sd1/arrays.xml
index e5e334b7b5565bbdfb20b7ea3a469f5da8c2f97b..bab2039355c78060bbc74da11e7f7b9f4eee1aba 100644
--- a/Doc/Sd1/arrays.xml
+++ b/Doc/Sd1/arrays.xml
@@ -1968,11 +1968,11 @@ Parameter 3: -13</screen>
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="407,98,521,139"
+ <area units="calspair" coords="407,98,521,139"
linkends="sd1_array_fig_ideaRunConfig-1"
xml:id="__area-ypcokm"/>
- <area coords="410,161,526,202"
+ <area units="calspair" coords="410,161,526,202"
linkends="sd1_array_fig_ideaRunConfig-2"
xml:id="__area-qny3zv"/>
</areaspec>
diff --git a/Doc/Sd1/gettingStarted.xml b/Doc/Sd1/gettingStarted.xml
index 3bb5945c9ef3d3b411b8c8d87ef0bac02b2a8d18..35efb03fcd7579965e3076d8129dc6c8381f373c 100644
--- a/Doc/Sd1/gettingStarted.xml
+++ b/Doc/Sd1/gettingStarted.xml
@@ -446,15 +446,15 @@
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="120,39,502,184"
+ <area units="calspair" coords="120,39,502,184"
linkends="sd1_callout_usingExercises-1"
xml:id="sd1_callout_usingExercises-1-co"/>
- <area coords="120,196,349,237"
+ <area units="calspair" coords="120,196,349,237"
linkends="sd1_callout_usingExercises-2"
xml:id="sd1_callout_usingExercises-2-co"/>
- <area coords="101,246,225,282"
+ <area units="calspair" coords="101,246,225,282"
linkends="sd1_callout_usingExercises-3"
xml:id="sd1_callout_usingExercises-3-co"/>
</areaspec>
@@ -837,11 +837,11 @@
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="206,202,327,275"
+ <area units="calspair" coords="206,202,327,275"
linkends="sd1_fig_imageco_editJava-1.2"
xml:id="sd1_fig_imageco_editJava-1-co"/>
- <area coords="143,4,425,72"
+ <area units="calspair" coords="143,4,425,72"
linkends="sd1_fig_imageco_editJava-2.2"
xml:id="sd1_fig_imageco_editJava-2.2-co"/>
</areaspec>
@@ -980,15 +980,15 @@ public class HelloWorld <co
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="112,72,263,108"
+ <area units="calspair" coords="112,72,263,108"
linkends="sd1_fig_imageco_compileJava-1.2"
xml:id="sd1_fig_imageco_compileJava-1-co"/>
- <area coords="335,127,400,155"
+ <area units="calspair" coords="335,127,400,155"
linkends="sd1_fig_imageco_compileJava-2"
xml:id="sd1_fig_imageco_compileJava-2-co"/>
- <area coords="484,86,640,150"
+ <area units="calspair" coords="484,86,640,150"
linkends="sd1_fig_imageco_compileJava-3"
xml:id="sd1_fig_imageco_compileJava-3-co"/>
</areaspec>
@@ -1112,15 +1112,15 @@ ls: cannot access '<emphasis role="red">HelloWorld.class</emphasis>': No such fi
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="244,4,499,101"
+ <area units="calspair" coords="244,4,499,101"
linkends="sd1_fig_imageco_executeJava-1"
xml:id="__area-5fxifu"/>
- <area coords="57,113,295,272"
+ <area units="calspair" coords="57,113,295,272"
linkends="sd1_fig_imageco_executeJava-2"
xml:id="__area-6imq1s"/>
- <area coords="306,110,501,278"
+ <area units="calspair" coords="306,110,501,278"
linkends="sd1_fig_imageco_executeJava-3"
xml:id="__area-ni0p8r"/>
</areaspec>
@@ -2865,7 +2865,7 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="56,119,524,156"
+ <area units="calspair" coords="56,119,524,156"
linkends="sd1_fig_mavenIdeaMiArchetypeRepo-1"
xml:id="sd1_fig_mavenIdeaMiArchetypeRepo_co_10"/>
</areaspec>
@@ -2903,19 +2903,19 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="2,297,100,335"
+ <area units="calspair" coords="2,297,100,335"
linkends="sd1_fig_mavenIdeaDefineProjectMetadata-1.2"
xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-1-co"/>
- <area coords="202,84,410,123"
+ <area units="calspair" coords="202,84,410,123"
linkends="sd1_fig_mavenIdeaDefineProjectMetadata-2.2"
xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-2-co"/>
- <area coords="228,278,621,297"
+ <area units="calspair" coords="228,278,621,297"
linkends="sd1_fig_mavenIdeaDefineProjectMetadata-3.2"
xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-3-co"/>
- <area coords="262,303,519,326"
+ <area units="calspair" coords="262,303,519,326"
linkends="sd1_fig_mavenIdeaDefineProjectMetadata-4"
xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-4-co"/>
</areaspec>
@@ -2985,15 +2985,15 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="80,34,330,63"
+ <area units="calspair" coords="80,34,330,63"
linkends="sd1_fig_mavenIdeaDefineProjectMetadata-1"
xml:id="__area-tzqxp6"/>
- <area coords="79,67,194,94"
+ <area units="calspair" coords="79,67,194,94"
linkends="sd1_fig_mavenIdeaDefineProjectMetadata-2"
xml:id="__area-kleqi6"/>
- <area coords="78,97,200,130"
+ <area units="calspair" coords="78,97,200,130"
linkends="sd1_fig_mavenIdeaDefineProjectMetadata-3"
xml:id="__area-3qsv1b"/>
</areaspec>
@@ -3047,11 +3047,11 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="113,30,238,66"
+ <area units="calspair" coords="113,30,238,66"
linkends="sd1_fig_mavenIdeaProjectRoot-1"
xml:id="__area-t5ostd"/>
- <area coords="120,65,425,95"
+ <area units="calspair" coords="120,65,425,95"
linkends="sd1_fig_mavenIdeaProjectRoot-2"
xml:id="__area-53fksd"/>
</areaspec>
diff --git a/Doc/Sd1/objectsClasses.xml b/Doc/Sd1/objectsClasses.xml
index 296abcd2185cccb829a22be3538e4f5c69bb4bcd..a3d2439e48735d4e108e25c392e1623827123791 100644
--- a/Doc/Sd1/objectsClasses.xml
+++ b/Doc/Sd1/objectsClasses.xml
@@ -490,11 +490,11 @@ public class Q {
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="538,111,577,147"
+ <area units="calspair" coords="538,111,577,147"
linkends="sd1_imagemap_package2directory-2.2"
xml:id="sd1_imagemap_package2directory-2-co"/>
- <area coords="230,232,376,269"
+ <area units="calspair" coords="230,232,376,269"
linkends="sd1_imagemap_package2directory-1.2"
xml:id="sd1_imagemap_package2directory-1-co"/>
</areaspec>
@@ -528,23 +528,23 @@ public class Q {
<td valign="top"><mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="197,46,309,88"
+ <area units="calspair" coords="197,46,309,88"
linkends="sd1_fig_package2directorySourceView_area-1-1"
xml:id="sd1_fig_package2directorySourceView_area-1-1-co"/>
- <area coords="214,93,311,137"
+ <area units="calspair" coords="214,93,311,137"
linkends="sd1_fig_package2directorySourceView_area-1-2"
xml:id="sd1_fig_package2directorySourceView_area-1-2-co"/>
- <area coords="231,143,326,178"
+ <area units="calspair" coords="231,143,326,178"
linkends="sd1_fig_package2directorySourceView_area-1-3"
xml:id="sd1_fig_package2directorySourceView_area-1-3-co"/>
- <area coords="247,186,396,223"
+ <area units="calspair" coords="247,186,396,223"
linkends="sd1_fig_package2directorySourceView_area-1-4"
xml:id="sd1_fig_package2directorySourceView_area-1-4-co"/>
- <area coords="283,227,391,263"
+ <area units="calspair" coords="283,227,391,263"
linkends="sd1_fig_package2directorySourceView_area-1-5"
xml:id="sd1_fig_package2directorySourceView_area-1-5-co"/>
</areaspec>
@@ -10245,11 +10245,11 @@ java.lang.AssertionError
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="86,97,218,118"
+ <area units="calspair" coords="86,97,218,118"
linkends="sd1_fig_testSkeletonImplementation-1"
xml:id="sd1_fig_testSkeletonImplementation-1-co"/>
- <area coords="90,118,199,139"
+ <area units="calspair" coords="90,118,199,139"
linkends="sd1_fig_testSkeletonImplementation-2"
xml:id="sd1_fig_testSkeletonImplementation-2-co"/>
</areaspec>
@@ -11888,11 +11888,11 @@ After call: <emphasis role="red">6</emphasis></screen></td>
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="24,330,343,405"
+ <area units="calspair" coords="24,330,343,405"
linkends="sd1_fig_callStackCircleAreaIdea-1"
xml:id="sd1_fig_callStackCircleAreaIdea-1-co"/>
- <area coords="374,276,659,408"
+ <area units="calspair" coords="374,276,659,408"
linkends="sd1_fig_callStackCircleAreaIdea-2"
xml:id="sd1_fig_callStackCircleAreaIdea-2-co"/>
</areaspec>
@@ -13180,15 +13180,15 @@ Switched to branch 'master'</screen>
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="277,69,435,153"
+ <area units="calspair" coords="277,69,435,153"
linkends="sd1_fig_gitCreateRemote-1"
xml:id="__area-uyyqr5"/>
- <area coords="280,371,708,550"
+ <area units="calspair" coords="280,371,708,550"
linkends="sd1_fig_gitCreateRemote-2"
xml:id="__area-1pnoxn"/>
- <area coords="290,560,1017,618"
+ <area units="calspair" coords="290,560,1017,618"
linkends="sd1_fig_gitCreateRemote-3"
xml:id="__area-nchcrx"/>
</areaspec>
@@ -13225,11 +13225,11 @@ Switched to branch 'master'</screen>
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="-3,339,452,425"
+ <area units="calspair" coords="-3,339,452,425"
linkends="sd1_fig_gitRetrieveRemoteRepoUrl-1"
xml:id="__area-ndnnc"/>
- <area coords="571,55,913,253"
+ <area units="calspair" coords="571,55,913,253"
linkends="sd1_fig_gitRetrieveRemoteRepoUrl-2"
xml:id="__area-6bj4o0"/>
</areaspec>
diff --git a/Doc/Sda1/jpaintro.xml b/Doc/Sda1/jpaintro.xml
index 52ecd04375b10b1b510663df6dd8c9b4692b50f2..dee1d9fce7d06c956f0bcc01c8f440a7368a4916 100644
--- a/Doc/Sda1/jpaintro.xml
+++ b/Doc/Sda1/jpaintro.xml
@@ -292,15 +292,15 @@
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="873,218,1051,264"
+ <area units="calspair" coords="873,218,1051,264"
linkends="sda1_jpaintro_fig_ideaConfigAnnotationProcessing-1.2"
xml:id="targetMetamodelGeneratedClasses"/>
- <area coords="600,367,1049,398"
+ <area units="calspair" coords="600,367,1049,398"
linkends="sda1_jpaintro_fig_ideaConfigAnnotationProcessing-1"
xml:id="configAnnotateProcessCriteria"/>
- <area coords="605,398,1004,427"
+ <area units="calspair" coords="605,398,1004,427"
linkends="sda1_jpaintro_fig_ideaConfigAnnotationProcessing-2"
xml:id="configAnnotateProcessQuerydsl"/>
</areaspec>
diff --git a/Doc/Sda1/prerequisites.xml b/Doc/Sda1/prerequisites.xml
index d231a001b8ca0866c4a4dec8294c84bd1af6cf05..9f9ce4cb10d3b1c0f1e8aaab9f7be73c0ad9dead 100644
--- a/Doc/Sda1/prerequisites.xml
+++ b/Doc/Sda1/prerequisites.xml
@@ -512,27 +512,27 @@ PGPASSWORD=XYZ psql -h localhost --username=hdmuser -d hdm <co
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="187,90,241,106"
+ <area units="calspair" coords="187,90,241,106"
linkends="sda1_fig_postgresqlConfigDemo-1.2"
xml:id="sda1_fig_postgresqlConfigDemo-1-co"/>
- <area coords="184,129,242,143"
+ <area units="calspair" coords="184,129,242,143"
linkends="sda1_fig_postgresqlConfigDemo-2.2"
xml:id="sda1_fig_postgresqlConfigDemo-2-co"/>
- <area coords="185,147,257,161"
+ <area units="calspair" coords="185,147,257,161"
linkends="sda1_fig_postgresqlConfigDemo-3.2"
xml:id="sda1_fig_postgresqlConfigDemo-3-co"/>
- <area coords="185,168,225,182"
+ <area units="calspair" coords="185,168,225,182"
linkends="sda1_fig_postgresqlConfigDemo-4.2"
xml:id="sda1_fig_postgresqlConfigDemo-4-co"/>
- <area coords="183,215,271,230"
+ <area units="calspair" coords="183,215,271,230"
linkends="sda1_fig_postgresqlConfigDemo-5.2"
xml:id="sda1_fig_postgresqlConfigDemo-5-co"/>
- <area coords="59,16,86,32"
+ <area units="calspair" coords="59,16,86,32"
linkends="sda1_fig_postgresqlConfigDemo-6"
xml:id="sda1_fig_postgresqlConfigDemo-6-co"/>
</areaspec>
diff --git a/Doc/Sda1/xmlschema.xml b/Doc/Sda1/xmlschema.xml
index 30f98e9b2efedff65042cc3df9ddda0fd9f80d79..2bdcfd4e83dd68f9c1b37b8bfe765296a4fb22db 100644
--- a/Doc/Sda1/xmlschema.xml
+++ b/Doc/Sda1/xmlschema.xml
@@ -790,27 +790,27 @@ String s1 = new String(), s2 = new String();</programlisting>
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="49,28,147,75"
+ <area units="calspair" coords="49,28,147,75"
linkends="sda1_xmlschema_fig_organizerDiagram-1"
xml:id="__area-bm5g4r"/>
- <area coords="168,35,212,79"
+ <area units="calspair" coords="168,35,212,79"
linkends="sda1_xmlschema_fig_organizerDiagram-2"
xml:id="__area-i0vw11"/>
- <area coords="233,27,275,60"
+ <area units="calspair" coords="233,27,275,60"
linkends="sda1_xmlschema_fig_organizerDiagram-3"
xml:id="__area-356sqi"/>
- <area coords="278,34,363,78"
+ <area units="calspair" coords="278,34,363,78"
linkends="sda1_xmlschema_fig_organizerDiagram-4"
xml:id="__area-ib44bh"/>
- <area coords="379,34,427,76"
+ <area units="calspair" coords="379,34,427,76"
linkends="sda1_xmlschema_fig_organizerDiagram-5"
xml:id="__area-45izdf"/>
- <area coords="443,3,555,112"
+ <area units="calspair" coords="443,3,555,112"
linkends="sda1_xmlschema_fig_organizerDiagram-6"
xml:id="__area-zetad6"/>
</areaspec>
diff --git a/Doc/Tdoc/general.xml b/Doc/Tdoc/general.xml
index fdc13d301807a5e6c3ebba1681b7fdd01bf36f61..ecb7ba76a038673de033ca003413714632f2dcc9 100644
--- a/Doc/Tdoc/general.xml
+++ b/Doc/Tdoc/general.xml
@@ -1989,19 +1989,19 @@ See remark at page 1.</literallayout></td>
<td valign="top"><para>.</para><mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="83,16,340,187"
+ <area coords="83,16,340,187" units="calspair"
linkends="fig_imagemapCallout_calloutSeat"
xml:id="fig_imagemapCallout_seat">
<alt>Seat</alt>
</area>
- <area coords="112,335,151,370"
+ <area units="calspair" coords="112,335,151,370"
linkends="fig_imagemapCallout_calloutValve"
xml:id="fig_imagemapCallout_valveBack">
<alt>Valve</alt>
</area>
- <area coords="511,345,550,380"
+ <area units="calspair" coords="511,345,550,380"
linkends="fig_imagemapCallout_calloutValve"
xml:id="fig_imagemapCallout_valveFront">
<alt>Valve</alt>
@@ -2489,15 +2489,15 @@ See <xref linkend="intro"/> ...</programlisting>
<mediaobject>
<imageobjectco>
<areaspec otherunits="imagemap" units="other">
- <area coords="357,43,453,90"
+ <area units="calspair" coords="357,43,453,90"
linkends="xmlc_callout_permalink-id01"
xml:id="xmlc_area_permalink-id01"/>
- <area coords="422,92,575,128"
+ <area units="calspair" coords="422,92,575,128"
linkends="xmlc_callout_permalink-id02"
xml:id="xmlc_area_permalink-id02"/>
- <area coords="467,170,588,214"
+ <area units="calspair" coords="467,170,588,214"
linkends="xmlc_callout_permalink-id03"
xml:id="xmlc_area_permalink-id03"/>
</areaspec>