OpenModelica · AtiyahElsheikh · Apr 17, 2021 · Jul 1, 2020 · Jul 2, 2020 · Mar 28, 2021
diff --git a/BioChem/Icons/Base.mo b/BioChem/Icons/Base.mo
@@ -0,0 +1,9 @@
+within BioChem.Icons;
+
+partial model Base
+  annotation(Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})), 
+    Documentation(info = "<html><head></head><body><font size=\"5\">A base icon relevant for many components carrying the same annotations. Older annotations had the following attribute:</font><div><br></div><div>
+<pre style=\"margin-top: 0px; margin-bottom: 0px;\"><!--StartFragment--><span style=\" font-family:'Courier New'; font-size:12pt; color:#0000ff;\">Diagram</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">(</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#0000ff;\">coordinateSystem</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">(extent={{-</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">100.0</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">,-</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">100.0</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">},{</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">100.0</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">,</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">100.0</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">}}, preserveAspectRatio=</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b0000;\">true</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">, grid={</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">10</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">,</span><span style=\" font-family:'Courier New'; font-size:12pt; color:#8b008b;\">10</span><span style=\"font-family: 'Courier New'; font-size: 12pt;\">}))</span><!--EndFragment--></pre><pre style=\"margin-top: 0px; margin-bottom: 0px;\"><span style=\"font-family: 'Courier New'; font-size: 12pt;\"><br></span></pre><p><span style=\"font-size: 12pt;\"><font face=\"Arial\">Since this produces empty diagram, it is not clear why is it there. So it is there for now.&nbsp;</font></span></p><p><span style=\"font-size: 12pt;\"><font face=\"Arial\">This Icon will also replace Icons.IconBase, which does not seem to be used throughout the library.&nbsp;</font></span></p><pre style=\"margin-top: 0px; margin-bottom: 0px;\"><br></pre></div></body></html>"));
+
+
+end Base;
diff --git a/BioChem/Icons/Example.mo b/BioChem/Icons/Example.mo
@@ -3,5 +3,6 @@ within BioChem.Icons;
 partial package Example "Icon for an example model"
   annotation(
     Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Rectangle(fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-100, -100}, {80, 50}}), Polygon(fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, points = {{-100, 50}, {-80, 70}, {100, 70}, {80, 50}, {-100, 50}}), Polygon(fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, points = {{100, 70}, {100, -80}, {80, -100}, {80, 50}, {100, 70}}), Text(fillColor = {0, 0, 255}, fillPattern = FillPattern.Solid, extent = {{-85, -85}, {65, 35}}, textString = "Example", fontName = "Arial"), Text(fillColor = {255, 0, 0}, extent = {{-120, 73}, {120, 132}}, textString = "%name", fontName = "Arial")}),
-    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})));
+    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})),
+  Documentation(info = "<html><head></head><body><font size=\"5\">The implementation of this Icon looks nicer than the implementation of Modelica.Icoms.Example</font></body></html>"));
 end Example;
diff --git a/BioChem/Icons/IconBase.mo b/BioChem/Icons/IconBase.mo
@@ -1,7 +1,9 @@
 within BioChem.Icons;
 
 model IconBase
+  extends Modelica.Icons.ObsoleteModel;
   annotation(
     Diagram(coordinateSystem(extent = {{-100.0, -100.0}, {100.0, 100.0}}, preserveAspectRatio = true, grid = {10, 10})),
-    Icon(coordinateSystem(extent = {{-100.0, -100.0}, {100.0, 100.0}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Text(origin = {0.0, -127.1933}, fillPattern = FillPattern.Solid, extent = {{-100.0, -27.1933}, {100.0, 27.1933}}, textString = "%name", fontName = "Arial")}));
+    Icon(coordinateSystem(extent = {{-100.0, -100.0}, {100.0, 100.0}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Text(origin = {0.0, -127.1933}, fillPattern = FillPattern.Solid, extent = {{-100.0, -27.1933}, {100.0, 27.1933}}, textString = "%name", fontName = "Arial")}),
+  Documentation(info = "<html><head></head><body><font size=\"5\">This Icon does not seem to be used throughout the library and is going to be replace by Icons.Base in future versions. The Diagram annotation does not seem to play any rule as it produces only an empty diagram.</font></body></html>"));
 end IconBase;
diff --git a/BioChem/Icons/Library.mo b/BioChem/Icons/Library.mo
@@ -3,5 +3,6 @@ within BioChem.Icons;
 partial package Library
   annotation(
     Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Rectangle(fillColor = {235, 235, 235}, fillPattern = FillPattern.Solid, extent = {{-100, -100}, {80, 50}}), Polygon(fillColor = {210, 210, 210}, fillPattern = FillPattern.Solid, points = {{-100, 50}, {-80, 70}, {100, 70}, {80, 50}, {-100, 50}}), Polygon(fillColor = {210, 210, 210}, fillPattern = FillPattern.Solid, points = {{100, 70}, {100, -80}, {80, -100}, {80, 50}, {100, 70}})}),
-    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})));
+    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})),
+  Documentation(info = "<html><head></head><body><font size=\"5\">This package is somehow equivalent to Modelica.Icons.Package. However, the graphics is nicer and therefore I am leaving it.</font></body></html>"));
 end Library;
diff --git a/BioChem/Icons/Substances/Package/package.mo → ...m/Icons/Substances/PackageIcon/package.mo b/BioChem/Icons/Substances/Package/package.mo → ...m/Icons/Substances/PackageIcon/package.mo
@@ -1,8 +1,9 @@
 within BioChem.Icons.Substances;
 
-partial package Package
+partial package PackageIcon "An icon for a package of substances"
   extends BioChem.Icons.Library; 
 annotation(
     Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Ellipse(origin = {-10, -50}, lineColor = {0, 56, 0}, fillColor = {0, 85, 0}, fillPattern = FillPattern.Sphere, extent = {{-60, -20}, {-20, 20}}), Ellipse(origin = {38, -10}, lineColor = {100, 100, 0}, fillColor = {255, 255, 0}, fillPattern = FillPattern.Sphere, extent = {{-28, -60}, {12, -20}}), Ellipse(origin = {-30.0032, -2.75056}, lineColor = {0, 0, 71}, fillColor = {0, 0, 127}, fillPattern = FillPattern.Sphere, extent = {{0.0032, -13.4697}, {40, 26.5303}})}),
-    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})));
-end Package;
+    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})),
+  Documentation(info = "<html><head></head><body><div><font size=\"5\">This Icon replaces Biocehm.Icon.Package in Biocehm version 1.0.3 and thus it is not backword compatible</font></div></body></html>"));
+end PackageIcon;
diff --git a/...em/Icons/Substances/Package/package.order → ...cons/Substances/PackageIcon/package.order b/...em/Icons/Substances/Package/package.order → ...cons/Substances/PackageIcon/package.order
diff --git a/BioChem/Icons/Substances/package.mo b/BioChem/Icons/Substances/package.mo
@@ -2,4 +2,7 @@ within BioChem.Icons;
 
 partial package Substances
   extends BioChem.Icons;
+
+  annotation(
+    Documentation(info = "<html><head></head><body><span style=\"font-family: 'MS Shell Dlg 2'; font-size: x-large;\">Within this package, the PackageIcon component replaces Biocehm.Icon.Package from Biocehm version 1.0.3 and thus it is not backword compatible.</span></body></html>"));
 end Substances;
diff --git a/BioChem/Icons/Substances/package.order b/BioChem/Icons/Substances/package.order
@@ -1 +1 @@
-Package
+PackageIcon
diff --git a/BioChem/Icons/Units/PackageIcon/package.mo b/BioChem/Icons/Units/PackageIcon/package.mo
@@ -0,0 +1,8 @@
+within BioChem.Icons.Units;
+
+partial package PackageIcon "Icon for the Units Package"
+  extends Icons.Library;
+  extends Icons.Base;
+  annotation(
+    Icon(graphics = {Text(origin = {0, -13.3333}, fillPattern = FillPattern.Solid, extent = {{-100, -86.6667}, {73.34, 43.3333}}, textString = "C", fontName = "Arial"), Text(origin = {0, -10}, fillPattern = FillPattern.Solid, extent = {{6.51, 6.81}, {50, 53.19}}, textString = "o", fontName = "Arial")}));
+end PackageIcon;
diff --git a/BioChem/Icons/Units/PackageIcon/package.order b/BioChem/Icons/Units/PackageIcon/package.order
diff --git a/BioChem/Icons/Units/TypeBase.mo b/BioChem/Icons/Units/TypeBase.mo
@@ -0,0 +1,5 @@
+within BioChem.Icons.Units;
+
+type TypeBase
+  extends Icons.Base;
+end TypeBase;
diff --git a/BioChem/Icons/Units/TypeIntegerBase.mo b/BioChem/Icons/Units/TypeIntegerBase.mo
@@ -0,0 +1,7 @@
+within BioChem.Icons.Units;
+
+type TypeIntegerBase 
+  extends Modelica.Icons.TypeInteger; 
+  extends TypeBase;
+  annotation(Documentation(info = "<html><head></head><body>This model is used for physical units<div><ul><li>making use of Modelica.Icons.TypeReal which largely resemble the existing annotation&nbsp;</li><li>keeping the same additional or different existing annotation &nbsp;&nbsp;</li></ul></div></body></html>"));
+end TypeIntegerBase;
diff --git a/BioChem/Icons/Units/TypeRealBase.mo b/BioChem/Icons/Units/TypeRealBase.mo
@@ -0,0 +1,7 @@
+within BioChem.Icons.Units;
+
+type TypeRealBase 
+  extends Modelica.Icons.TypeReal; 
+  extends TypeBase;
+  annotation(Documentation(info = "<html><head></head><body>This model is used for physical units<div><ul><li>making use of Modelica.Icons.TypeReal which largely resemble the existing annotation&nbsp;</li><li>keeping the same additional or different existing annotation &nbsp;&nbsp;</li></ul></div></body></html>"));
+end TypeRealBase;
diff --git a/BioChem/Icons/Units/package.mo b/BioChem/Icons/Units/package.mo
@@ -0,0 +1,5 @@
+within BioChem.Icons;
+
+partial package Units "Icon for the Units Package"
+
+end Units;
diff --git a/BioChem/Icons/Units/package.order b/BioChem/Icons/Units/package.order
@@ -0,0 +1,4 @@
+TypeBase
+TypeIntegerBase
+TypeRealBase
+PackageIcon
diff --git a/BioChem/Icons/UnitsPackage.mo b/BioChem/Icons/UnitsPackage.mo
diff --git a/BioChem/Icons/package.mo b/BioChem/Icons/package.mo
@@ -2,23 +2,7 @@ within BioChem;
 
 package Icons "Icons"
   extends Modelica.Icons.IconsPackage;
-  partial package Library
-    annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Rectangle(fillColor={235,235,235}, fillPattern=FillPattern.Solid, extent={{-100,-100},{80,50}}),Polygon(fillColor={210,210,210}, fillPattern=FillPattern.Solid, points={{-100,50},{-80,70},{100,70},{80,50},{-100,50}}),Polygon(fillColor={210,210,210}, fillPattern=FillPattern.Solid, points={{100,70},{100,-80},{80,-100},{80,50},{100,70}})}), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})),
-      Documentation(info = "<html><head></head><body><b>Remark </b>This package is somehow equivalent to Modelica.Icons.Package. However, the graphics is nicer and therefore I am leaving it.</body></html>"));
-  end Library;
-
-  model IconBase
-    annotation(Diagram(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, grid={10,10})), Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}, preserveAspectRatio=true, grid={10,10}), graphics={Text(origin={0.0,-127.1933}, fillPattern=FillPattern.Solid, extent={{-100.0,-27.1933},{100.0,27.1933}}, textString="%name", fontName="Arial")}));
-  end IconBase;
-
-  partial package Example "Icon for an example model"
-    annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Rectangle(fillColor={255,255,255}, fillPattern=FillPattern.Solid, extent={{-100,-100},{80,50}}),Polygon(fillColor={255,255,255}, fillPattern=FillPattern.Solid, points={{-100,50},{-80,70},{100,70},{80,50},{-100,50}}),Polygon(fillColor={255,255,255}, fillPattern=FillPattern.Solid, points={{100,70},{100,-80},{80,-100},{80,50},{100,70}}),Text(fillColor={0,0,255}, fillPattern=FillPattern.Solid, extent={{-85,-85},{65,35}}, textString="Example", fontName="Arial"),Text(fillColor={255,0,0}, extent={{-120,73},{120,132}}, textString="%name", fontName="Arial")}), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})),
-      Documentation(info = "<html><head></head><body>The implementation of this Icon looks nicer than the implementation of Modelica.Icoms.Example.</body></html>"));
-  end Example;
-
-
-
-
+
   annotation(Documentation(info="<html>
 <h1>Icons</h1>
 This package contains icons that are used in the library.

diff --git a/BioChem/Icons/package.order b/BioChem/Icons/package.order
@@ -1,5 +1,6 @@
 Library
 IconBase
 Example
-UnitsPackage
 Substances
+Units
+Base
diff --git a/BioChem/Substances/package.mo b/BioChem/Substances/package.mo
@@ -1,7 +1,7 @@
 within BioChem;
 
 package Substances "Reaction nodes"
-  extends BioChem.Icons.Substances.Package;
+  extends BioChem.Icons.Substances.PackageIcon;
 
     annotation(
     Documentation(info = "<html>

diff --git a/BioChem/Substances/package.order b/BioChem/Substances/package.order
@@ -1,4 +1,4 @@
 Substance
 BoundarySubstance
 AmbientSubstance
-SignalSubstance
+SignalSubstance
diff --git a/BioChem/Units/package.mo b/BioChem/Units/package.mo
@@ -1,30 +1,47 @@
 within BioChem;
+
 package Units "Units used in BioChem"
-  extends BioChem.Icons.UnitsPackage;
- annotation(Documentation(info="<html>
+  extends BioChem.Icons.Units.PackageIcon;
+  type VolumetricReactionRate =
+     Icons.Units.TypeRealBase(final quantity="Volumetric reaction rate",final unit = "mol/(s.l)")
+     "Volumetric reaction rate [mol/(l.s)}" ;
+  type VolumeChangeConstant = Icons.Units.TypeRealBase(quantity = "Volume change constant", unit = "l/s") "Volume change constant [1/s]" ;
+  type Volume "Volume [l]"
+    extends Modelica.Units.NonSI.Volume_litre;
+    extends Icons.Units.TypeBase;
+  end Volume;
+  type StoichiometricCoefficient = Icons.Units.TypeRealBase(quantity = "Stoichiometric coefficient", unit = "1") "Stoichiometric coefficient";
+  type ReactionRate = Icons.Units.TypeRealBase(quantity = "Reaction rate", unit = "mol/s") "Reaction rate [mos/s]";
+  type ReactionCoefficient = Icons.Units.TypeRealBase(quantity = "Reaction coefficient", unit = "1") "Reaction coefficient" ;
+  type Pressure 
+    extends Modelica.Units.SI.Pressure;
+    extends Icons.Units.TypeBase;
+  end Pressure;
+  type MolarFlowRate = Icons.Units.TypeRealBase(quantity = "Molar flow rate", unit = "mol/s") "Molar flow rate [mol/s]" ;
+  type IonicCharge = Icons.Units.TypeIntegerBase(quantity = "Ionic charge", unit = "1") "Ionic charge";
+  type DilutionRate = Icons.Units.TypeRealBase(quantity = "Dilution rate", unit = "/s") "Dilution rate [?]" ;
+  type Concentration = Icons.Units.TypeRealBase(quantity = "Concentration", unit = "mol/l", min = 0) "Concentration [mol/l]" ;
+  type Celcius 
+    extends Modelica.Units.NonSI.Temperature_degC ;
+    extends Icons.Units.TypeBase;
+  end Celcius;
+  type AmountOfSubstance = Icons.Units.TypeRealBase(quantity = "AmountOfSubstance", unit = "mol", min = 0) "Amount of substance [mol]" ;
+  type EquilibriumCoefficient = Icons.Units.TypeRealBase(quantity = "Equilibrium coefficient", unit = "1") "";
+
+  annotation(
+    Documentation(info = "<html>
 <h1>Units</h1>
  <p>
  This pace contains definitions of units that are common in biochemical models.
  </p>
- </html>", revisions=""));
-  type VolumetricReactionRate= Real(quantity="Volumetric reaction rate", unit="mol/(s.l)") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type VolumeChangeConstant= Real(quantity="Volume change constant", unit="l/s") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type Volume= Modelica.Units.NonSI.Volume_litre annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type StoichiometricCoefficient= Real(quantity="Stoichiometric coefficient", unit="1") "" annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type ReactionRate= Real(quantity="Reaction rate", unit="mol/s") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type ReactionCoefficient= Real(quantity="Reaction coefficient", unit="1") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type Pressure= Modelica.Units.SI.Pressure annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type MolarFlowRate= Real(quantity="Molar flow rate", unit="mol/s") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type IonicCharge= Integer(quantity="Ionic charge", unit="1") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type DilutionRate= Real(quantity="Dilution rate", unit="/s") annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type Concentration= Real(quantity="Concentration", unit="mol/l", min=0) annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type Celcius= Modelica.Units.NonSI.Temperature_degC annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type AmountOfSubstance= Real(quantity="AmountOfSubstance", unit="mol", min=0) annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  type EquilibriumCoefficient= Real(quantity="Equilibrium coefficient", unit="1") "" annotation(Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
-  annotation(Documentation(info="<html>
+ </html>", revisions = ""),
+    Icon(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10}), graphics = {Text(origin = {0, -13.3333}, fillPattern = FillPattern.Solid, extent = {{-100, -86.6667}, {73.34, 43.3333}}, textString = "C", fontName = "Arial"), Text(origin = {0, -10}, fillPattern = FillPattern.Solid, extent = {{6.51, 6.81}, {50, 53.19}}, textString = "o", fontName = "Arial")}),
+    Diagram(coordinateSystem(extent = {{-100, 100}, {100, -100}}, preserveAspectRatio = true, grid = {10, 10})));
+  annotation(
+    Documentation(info = "<html>
 <h1>Units</h1>
  <p>
  This pace contains definitions of units that are common in biochemical models.
  </p>
- </html>", revisions=""), Icon(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10}), graphics={Text(origin={0,-13.3333}, fillPattern=FillPattern.Solid, extent={{-100,-86.6667},{73.34,43.3333}}, textString="C", fontName="Arial"),Text(origin={0,-10}, fillPattern=FillPattern.Solid, extent={{6.51,6.81},{50,53.19}}, textString="o", fontName="Arial")}), Diagram(coordinateSystem(extent={{-100,100},{100,-100}}, preserveAspectRatio=true, grid={10,10})));
+ </html>", revisions = ""));
 end Units;
diff --git a/BioChem/package.order b/BioChem/package.order
@@ -1,3 +1,4 @@
+UsersGuide
 Math
 Units
 Substances
@@ -7,4 +8,3 @@ Constants
 Compartments
 Icons
 Examples
-UsersGuide