Removes superfluous dummy annotations and trailing white spaces.

All changes were checked against `literalinclude` in rst files.

Author: dietmarw

ModelicaByExample/Architectures/SensorComparison/Examples/SystemArchitecture_WithDefaults.mo

@@ -51,5 +51,4 @@ equation
       color={0,0,127},
       pattern=LinePattern.None,
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
 end SystemArchitecture_WithDefaults;

ModelicaByExample/Architectures/SensorComparison/Implementation/SampleHoldSensor.mo

@@ -21,7 +21,7 @@ equation
       color={0,0,0},
       pattern=LinePattern.None,
       smooth=Smooth.None));
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},

ModelicaByExample/Architectures/ThermalControl/Architectures/ExpandableArchitecture.mo

@@ -27,5 +27,4 @@ equation
       points={{50,0},{60,0},{60,28},{0,28},{0,50}},
       color={0,0,0},
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
 end ExpandableArchitecture;

ModelicaByExample/Architectures/ThermalControl/Bogus/Actuator_WithBus.mo

@@ -7,5 +7,4 @@ partial model Actuator_WithBus "Actuator subsystem interface with bus"
   ModelicaByExample.Architectures.ThermalControl.Bogus.PlantBus
     basicBus
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
-  annotation (Diagram(graphics));
 end Actuator_WithBus;

ModelicaByExample/Architectures/ThermalControl/Bogus/BusActuator.mo

@@ -54,5 +54,5 @@ equation
               {30,-20},{50,-30},{30,-40},{40,-50},{40,-60}},
           color={255,0,0},
           smooth=Smooth.None,
-          thickness=0.5)}), Diagram(graphics));
+          thickness=0.5)}));
 end BusActuator;

ModelicaByExample/Architectures/ThermalControl/Bogus/BusBasedArchitecture.mo

@@ -29,5 +29,4 @@ equation
       points={{50,0},{60,0},{60,28},{0,28},{0,50}},
       color={0,0,0},
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
 end BusBasedArchitecture;

ModelicaByExample/Architectures/ThermalControl/Bogus/BusPIControl.mo

@@ -43,5 +43,5 @@ equation
           extent={{-100,60},{100,-60}},
           lineColor={0,0,0},
           fillPattern=FillPattern.Solid,
-          textString="PI")}), Diagram(graphics));
+          textString="PI")}));
 end BusPIControl;

ModelicaByExample/Architectures/ThermalControl/Bogus/BusSensor.mo

@@ -44,5 +44,5 @@ equation
         Text(
           extent={{94,-28},{52,-78}},
           lineColor={0,0,0},
-          textString="K")}), Diagram(graphics));
+          textString="K")}));
 end BusSensor;

ModelicaByExample/Architectures/ThermalControl/Bogus/ControlSystem_WithBus.mo

@@ -3,5 +3,4 @@ partial model ControlSystem_WithBus
   "Control system interface using a bus connector"
   ModelicaByExample.Architectures.ThermalControl.Bogus.ControllerBus basicBus
     annotation (Placement(transformation(extent={{-10,-110},{10,-90}})));
-  annotation (Diagram(graphics));
 end ControlSystem_WithBus;

ModelicaByExample/Architectures/ThermalControl/Bogus/Sensor_WithBus.mo

@@ -6,5 +6,4 @@ partial model Sensor_WithBus "Sensor subsystem interface using a bus"
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   ModelicaByExample.Architectures.ThermalControl.Bogus.PlantBus
     basicBus annotation (Placement(transformation(extent={{90,-10},{110,10}})));
-  annotation (Diagram(graphics));
 end Sensor_WithBus;

ModelicaByExample/Architectures/ThermalControl/Examples/package.mo

@@ -1,3 +1,3 @@
 within ModelicaByExample.Architectures.ThermalControl;
-package Examples 
+package Examples
 end Examples;

ModelicaByExample/Architectures/ThermalControl/Implementations/ContinuousActuator.mo

@@ -56,5 +56,5 @@ equation
               {30,-20},{50,-30},{30,-40},{40,-50},{40,-60}},
           color={255,0,0},
           smooth=Smooth.None,
-          thickness=0.5)}), Diagram(graphics));
+          thickness=0.5)}));
 end ContinuousActuator;

ModelicaByExample/Architectures/ThermalControl/Implementations/ConventionalPIControl.mo

@@ -32,7 +32,7 @@ equation
       points={{-51,0},{-110,0}},
       color={0,0,127},
       smooth=Smooth.None));
-  annotation (Diagram(graphics), Icon(graphics={Rectangle(
+  annotation ( Icon(graphics={Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
           fillColor={215,215,215},

ModelicaByExample/Architectures/ThermalControl/Implementations/ConventionalSensor.mo

@@ -11,7 +11,7 @@ equation
   connect(sensor.port, room) annotation (Line(
       points={{-10,0},{-100,0}},
       color={191,0,0}, smooth=Smooth.None));
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Ellipse(
           extent={{-8,-98},{32,-60}},
           lineColor={0,0,0},

ModelicaByExample/Architectures/ThermalControl/Implementations/TemperatureSensor.mo

@@ -44,5 +44,5 @@ equation
         Text(
           extent={{94,-28},{52,-78}},
           lineColor={0,0,0},
-          textString="K")}), Diagram(graphics));
+          textString="K")}));
 end TemperatureSensor;

ModelicaByExample/Architectures/ThermalControl/Implementations/ThreeZonePlantModel.mo

@@ -108,7 +108,7 @@ equation
       points={{28,50},{30,50},{30,-20},{48,-20},{48,-40},{60,-40}},
       color={191,0,0},
       smooth=Smooth.None));
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Rectangle(extent={{-100,100},{100,-100}}, lineColor={0,0,0}),
         Ellipse(
           extent={{-80,20},{-40,-20}},

ModelicaByExample/Architectures/ThermalControl/Interfaces/ControlSystem.mo

@@ -10,5 +10,4 @@ partial model ControlSystem "Control system interface"
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={-110,0})));
-  annotation (Diagram(graphics));
 end ControlSystem;

ModelicaByExample/Architectures/ThermalControl/Interfaces/ControlSystem_WithExpandableBus.mo

@@ -3,5 +3,4 @@ partial model ControlSystem_WithExpandableBus
   "Control system interface using an expandable bus connector"
   ExpandableBus bus annotation (Placement(transformation(extent={{-10,-110},{10,
             -90}}), iconTransformation(extent={{-10,-110},{10,-90}})));
-  annotation (Diagram(graphics), Icon(graphics));
 end ControlSystem_WithExpandableBus;

ModelicaByExample/Architectures/ThermalControl/Interfaces/PlantModel.mo

@@ -5,5 +5,4 @@ partial model PlantModel "Plant subsystem interface model"
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b furnace
     "Connection point for the furnace"
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
-  annotation (Diagram(graphics));
 end PlantModel;

ModelicaByExample/Architectures/ThermalControl/Interfaces/Sensor.mo

@@ -8,5 +8,4 @@ partial model Sensor "Sensor subsystem interface"
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={110,0})));
-  annotation (Diagram(graphics));
 end Sensor;

ModelicaByExample/ArrayEquations/StateSpace/Examples/package.mo

@@ -1,3 +1,3 @@
 within ModelicaByExample.ArrayEquations.StateSpace;
-package Examples 
+package Examples
 end Examples;

ModelicaByExample/BasicEquations/CoolingExample/package.mo

@@ -1,3 +1,3 @@
 within ModelicaByExample.BasicEquations;
-package CoolingExample 
+package CoolingExample
 end CoolingExample;

ModelicaByExample/BasicEquations/RotationalSMD/SecondOrderSystem.mo

@@ -27,4 +27,4 @@ equation
   // Equations for inertia 2
   omega2 = der(phi2);
   J2*der(omega2) = k1*(phi1-phi2)+d1*der(phi1-phi2)-k2*phi2-d2*der(phi2);
-end SecondOrderSystem;
+end SecondOrderSystem;

ModelicaByExample/BasicEquations/SimpleExample/package.mo

@@ -1,3 +1,3 @@
 within ModelicaByExample.BasicEquations;
-package SimpleExample 
+package SimpleExample
 end SimpleExample;

ModelicaByExample/BasicEquations/package.mo

@@ -1,3 +1,3 @@
 within ModelicaByExample;
-package BasicEquations 
+package BasicEquations
 end BasicEquations;

ModelicaByExample/Components/BlockDiagrams/Components/Constant.mo

@@ -5,7 +5,7 @@ block Constant "A constant source"
   extends Interfaces.SO;
 equation
   y = k;
-  annotation (Diagram(graphics), Icon(graphics={Line(
+  annotation ( Icon(graphics={Line(
           points={{-80,20},{80,20}},
           color={0,128,255},
           smooth=Smooth.None), Text(

ModelicaByExample/Components/BlockDiagrams/Components/Feedback.mo

@@ -10,7 +10,7 @@ block Feedback "A block to compute feedback terms"
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 equation
   y = u1-u2;
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Ellipse(
           extent={{-20,20},{20,-20}},
           lineColor={0,0,0},

ModelicaByExample/Components/BlockDiagrams/Components/HeatSource.mo

@@ -6,7 +6,7 @@ model HeatSource "Apply heating (or cooling) to a thermal system"
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 equation
   node.Q_flow = -u;
-  annotation (Diagram(graphics), Icon(graphics={Polygon(
+  annotation ( Icon(graphics={Polygon(
           points={{-100,20},{-100,-20},{40,-20},{40,-40},{90,0},{40,40},{40,20},
               {-100,20}},
           pattern=LinePattern.None,

ModelicaByExample/Components/BlockDiagrams/Components/IdealTemperatureSensor.mo

@@ -56,5 +56,5 @@ equation
         Line(
           points={{22,0},{100,0}},
           color={0,0,255},
-          smooth=Smooth.None)}), Diagram(graphics));
+          smooth=Smooth.None)}));
 end IdealTemperatureSensor;

ModelicaByExample/Components/BlockDiagrams/Examples/ControlledCooling.mo

@@ -66,5 +66,4 @@ equation
       points={{71,30},{80,30},{80,60},{-80,60},{-80,0.5},{-71,0.5}},
       color={0,0,255},
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
 end ControlledCooling;

ModelicaByExample/Components/BlockDiagrams/Icons/Axes.mo

@@ -1,7 +1,7 @@
 within ModelicaByExample.Components.BlockDiagrams.Icons;
 block Axes "Introduces graphics for independent and dependent axes"
 
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Rectangle(extent={{-100,100},{100,-100}}, lineColor={0,0,0},
           fillPattern=FillPattern.Solid,
           fillColor={255,255,255}),

ModelicaByExample/Components/BlockDiagrams/Icons/package.mo

@@ -1,3 +1,3 @@
 within ModelicaByExample.Components.BlockDiagrams;
-package Icons 
+package Icons
 end Icons;

ModelicaByExample/Components/BlockDiagrams/Interfaces/DISO.mo

@@ -6,5 +6,4 @@ partial block DISO "A double input, single output (DISO) partial model"
   RealInput u2 "Input signal 2" annotation (Placement(transformation(extent={{-120,
             -70},{-100,-50}}),
                              iconTransformation(extent={{-120,-70},{-100,-50}})));
-  annotation (Diagram(graphics), Icon(graphics));
 end DISO;

ModelicaByExample/Components/BlockDiagrams/Interfaces/SI.mo

@@ -2,5 +2,4 @@ within ModelicaByExample.Components.BlockDiagrams.Interfaces;
 partial block SI "A single input (SI) partial model"
   RealInput u "Input signal"
     annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
-  annotation (Diagram(graphics), Icon(graphics));
 end SI;

ModelicaByExample/Components/BlockDiagrams/Interfaces/SISO.mo

@@ -2,5 +2,4 @@ within ModelicaByExample.Components.BlockDiagrams.Interfaces;
 partial block SISO "A single input, single output (SISO) partial model"
   extends SI;
   extends SO;
-  annotation (Diagram(graphics), Icon(graphics));
 end SISO;

ModelicaByExample/Components/BlockDiagrams/Interfaces/SO.mo

@@ -3,7 +3,7 @@ partial block SO "A single output (SO) partial model"
 
   RealOutput y "Output signal" annotation (Placement(transformation(extent={{90,
             -10},{110,10}}), iconTransformation(extent={{100,-10},{120,10}})));
-  annotation (Diagram(graphics), Icon(graphics={Text(
+  annotation ( Icon(graphics={Text(
           extent={{-100,-104},{100,-144}},
           lineColor={0,0,0},
           textString="%name")}));

ModelicaByExample/Components/BlockDiagrams/Interfaces/package.mo

@@ -1,4 +1,3 @@
 within ModelicaByExample.Components.BlockDiagrams;
 package Interfaces "Connectors and partial models for block diagrams"
-annotation (Icon(graphics));
 end Interfaces;

ModelicaByExample/Components/Electrical/DryApproach/Ground.mo

@@ -4,7 +4,7 @@ model Ground "Electrical ground"
     annotation (Placement(transformation(extent={{-10,70},{10,90}})));
 equation
   ground.v = 0;
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Rectangle(
           extent={{-62,42},{62,38}},
           lineColor={0,0,255},

ModelicaByExample/Components/Electrical/Examples/package.mo

@@ -1,3 +1,3 @@
 within ModelicaByExample.Components.Electrical;
-package Examples 
+package Examples
 end Examples;

ModelicaByExample/Components/Electrical/VerboseApproach/Capacitor.mo

@@ -10,7 +10,7 @@ protected
 equation
   p.i + n.i = 0 "Conservation of charge";
   C*der(v) = p.i;
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Text(
           extent={{-100,-40},{100,-80}},
           lineColor={0,0,0},

ModelicaByExample/Components/Electrical/VerboseApproach/Inductor.mo

@@ -10,7 +10,7 @@ protected
 equation
   p.i + n.i = 0 "Conservation of charge";
   L*der(p.i) = p.v;
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Text(
           extent={{-100,-40},{100,-80}},
           lineColor={0,0,0},

ModelicaByExample/Components/Electrical/VerboseApproach/Resistor.mo

@@ -10,7 +10,7 @@ protected
 equation
   p.i + n.i = 0 "Conservation of charge";
   v = p.i*R "Ohm's law";
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
           Rectangle(extent={{-70,30},{70,-30}}, lineColor={0,0,255},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),

ModelicaByExample/Components/HeatTransfer/AmbientCondition.mo

@@ -24,5 +24,5 @@ equation
           lineColor={0,0,0},
           fillColor={255,170,170},
           fillPattern=FillPattern.Solid,
-          textString="T_amb=%T_amb")}), Diagram(graphics));
+          textString="T_amb=%T_amb")}));
 end AmbientCondition;

ModelicaByExample/Components/HeatTransfer/Convection.mo

@@ -9,7 +9,7 @@ model Convection "Modeling convection between port_a and port_b"
 equation
   port_a.Q_flow + port_b.Q_flow = 0 "Conservation of energy";
   port_a.Q_flow = h*A*(port_a.T-port_b.T) "Heat transfer equation";
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Rectangle(
           extent={{-100,100},{-40,-100}},
           lineColor={135,135,135},

ModelicaByExample/Components/HeatTransfer/ConvectionToAmbient.mo

@@ -7,7 +7,7 @@ model ConvectionToAmbient "An overly specialized model of convection"
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
 equation
   port_a.Q_flow = h*A*(port_a.T-T_amb) "Heat transfer equation";
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Rectangle(
           extent={{-100,100},{-40,-100}},
           lineColor={135,135,135},

ModelicaByExample/Components/HeatTransfer/Examples/ComplexNetwork.mo

@@ -60,5 +60,4 @@ equation
       points={{-50,0},{-80,0}},
       color={191,0,0},
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
 end ComplexNetwork;

ModelicaByExample/Components/HeatTransfer/Examples/package.mo

@@ -1,3 +1,3 @@
 within ModelicaByExample.Components.HeatTransfer;
-package Examples 
+package Examples
 end Examples;

ModelicaByExample/Components/HodgkinHuxley/Components/package.mo

@@ -1,3 +1,3 @@
 within ModelicaByExample.Components.HodgkinHuxley;
-package Components 
+package Components
 end Components;

ModelicaByExample/Components/LotkaVolterra/Components/Reproduction.mo

@@ -4,7 +4,7 @@ model Reproduction "Model of reproduction"
   parameter Real alpha "Birth rate proportionality constant";
 equation
   growth = alpha*species.population "Growth is proporational to population";
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},

ModelicaByExample/Components/LotkaVolterra/Interfaces/SinkOrSource.mo

@@ -14,5 +14,5 @@ equation
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
-          textString="%name")}), Diagram(graphics));
+          textString="%name")}));
 end SinkOrSource;

ModelicaByExample/Components/LotkaVolterra/Interfaces/Species.mo

@@ -18,5 +18,5 @@ connector Species "Used to represent the population of a specific species"
           lineColor={0,127,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
-          textString="%name")}), Diagram(graphics));
+          textString="%name")}));
 end Species;

ModelicaByExample/Components/Rotational/Components/ConfigurableGear.mo

@@ -62,5 +62,5 @@ equation
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
-          textString="%name")}), Diagram(graphics));
+          textString="%name")}));
 end ConfigurableGear;

ModelicaByExample/Components/Rotational/Components/Inertia.mo

@@ -12,7 +12,7 @@ equation
   phi_rel = 0 "inertia is rigid";
   J*der(w) = flange_a.tau + flange_b.tau
     "Conservation of angular momentum with storage";
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Rectangle(
           extent={{-100,10},{-50,-10}},
           lineColor={0,0,0},

ModelicaByExample/Components/Rotational/Components/Inertia2.mo

@@ -14,7 +14,7 @@ equation
   phi_rel = 0 "inertia is rigid";
   J*der(w) = flange_a.tau + flange_b.tau
     "Conservation of angular momentum with storage";
-  annotation (Diagram(graphics), Icon(graphics={
+  annotation ( Icon(graphics={
         Rectangle(
           extent={{-100,10},{-50,-10}},
           lineColor={0,0,0},

ModelicaByExample/Components/Rotational/Examples/SMD_ConfigurableGear.mo

@@ -90,5 +90,4 @@ equation
       points={{-30,-40},{-20,-40},{-20,-40},{-10,-40}},
       color={0,0,0},
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
 end SMD_ConfigurableGear;

ModelicaByExample/Components/Rotational/Examples/SMD_GearComparison.mo

@@ -158,5 +158,4 @@ equation
       points={{-80,40},{-76,40},{-76,30},{-70,30}},
       color={0,0,0},
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
 end SMD_GearComparison;

ModelicaByExample/Components/Rotational/Examples/SMD_WithBacklash.mo

@@ -12,5 +12,4 @@ equation
       points={{-30,0},{-10,0}},
       color={0,0,0},
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
 end SMD_WithBacklash;