From c8bbc7444732dcab7d43856cc8cc88cc3485d179 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Mon, 4 May 2015 20:03:24 +0300
Subject: Have computer data inside divecomputer tag

This includes all the data computer related data within the divecomputer
tag. All the extra noise is just indentation (apart from moving the
divecomputer end tag).

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 xslt/MacDive.xslt | 314 +++++++++++++++++++++++++++---------------------------
 1 file changed, 157 insertions(+), 157 deletions(-)

diff --git a/xslt/MacDive.xslt b/xslt/MacDive.xslt
index 1f6b157d8..6353c176f 100644
--- a/xslt/MacDive.xslt
+++ b/xslt/MacDive.xslt
@@ -230,150 +230,113 @@
         <xsl:attribute name="model">
           <xsl:value-of select="computer"/>
         </xsl:attribute>
-      </divecomputer>
 
-      <xsl:choose>
-        <xsl:when test="maxdepth != ''">
-          <depth>
-            <xsl:attribute name="max">
-              <xsl:call-template name="depthConvert">
-                <xsl:with-param name="depth">
-                  <xsl:value-of select="maxdepth"/>
-                </xsl:with-param>
-                <xsl:with-param name="units" select="$units"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="mean">
-              <xsl:call-template name="depthConvert">
-                <xsl:with-param name="depth">
-                  <xsl:value-of select="avgdepth"/>
-                </xsl:with-param>
-                <xsl:with-param name="units" select="$units"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </depth>
-        </xsl:when>
-        <xsl:otherwise>
-          <depth>
-            <xsl:attribute name="max">
-              <xsl:call-template name="depthConvert">
-                <xsl:with-param name="depth">
-                  <xsl:value-of select="maxDepth"/>
-                </xsl:with-param>
-                <xsl:with-param name="units" select="$units"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="mean">
-              <xsl:call-template name="depthConvert">
-                <xsl:with-param name="depth">
-                  <xsl:value-of select="averageDepth"/>
-                </xsl:with-param>
-                <xsl:with-param name="units" select="$units"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </depth>
-        </xsl:otherwise>
-      </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="maxdepth != ''">
+            <depth>
+              <xsl:attribute name="max">
+                <xsl:call-template name="depthConvert">
+                  <xsl:with-param name="depth">
+                    <xsl:value-of select="maxdepth"/>
+                  </xsl:with-param>
+                  <xsl:with-param name="units" select="$units"/>
+                </xsl:call-template>
+              </xsl:attribute>
+              <xsl:attribute name="mean">
+                <xsl:call-template name="depthConvert">
+                  <xsl:with-param name="depth">
+                    <xsl:value-of select="avgdepth"/>
+                  </xsl:with-param>
+                  <xsl:with-param name="units" select="$units"/>
+                </xsl:call-template>
+              </xsl:attribute>
+            </depth>
+          </xsl:when>
+          <xsl:otherwise>
+            <depth>
+              <xsl:attribute name="max">
+                <xsl:call-template name="depthConvert">
+                  <xsl:with-param name="depth">
+                    <xsl:value-of select="maxDepth"/>
+                  </xsl:with-param>
+                  <xsl:with-param name="units" select="$units"/>
+                </xsl:call-template>
+              </xsl:attribute>
+              <xsl:attribute name="mean">
+                <xsl:call-template name="depthConvert">
+                  <xsl:with-param name="depth">
+                    <xsl:value-of select="averageDepth"/>
+                  </xsl:with-param>
+                  <xsl:with-param name="units" select="$units"/>
+                </xsl:call-template>
+              </xsl:attribute>
+            </depth>
+          </xsl:otherwise>
+        </xsl:choose>
 
-      <temperature>
+        <temperature>
 
-        <!-- If we have temperature reading and it is non-zero, we use
+          <!-- If we have temperature reading and it is non-zero, we use
              it. If the temperature is zero, we only use it if we have
              temperature samples from the dive. -->
-        <xsl:if test="tempAir != ''">
-          <xsl:variable name="air">
-            <xsl:call-template name="tempConvert">
-              <xsl:with-param name="temp" select="tempAir"/>
-              <xsl:with-param name="units" select="$units"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:if test="substring-before($air, ' ') != 0 or $temperatureSamples &gt; 0">
-            <xsl:attribute name="air">
-              <xsl:value-of select="$air"/>
-            </xsl:attribute>
+          <xsl:if test="tempAir != ''">
+            <xsl:variable name="air">
+              <xsl:call-template name="tempConvert">
+                <xsl:with-param name="temp" select="tempAir"/>
+                <xsl:with-param name="units" select="$units"/>
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:if test="substring-before($air, ' ') != 0 or $temperatureSamples &gt; 0">
+              <xsl:attribute name="air">
+                <xsl:value-of select="$air"/>
+              </xsl:attribute>
+            </xsl:if>
           </xsl:if>
-        </xsl:if>
 
-        <xsl:if test="tempLow != ''">
-          <xsl:variable name="water">
-            <xsl:call-template name="tempConvert">
-              <xsl:with-param name="temp" select="tempLow"/>
-              <xsl:with-param name="units" select="$units"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:if test="substring-before($water, ' ') != 0 or $temperatureSamples &gt; 0">
-            <xsl:attribute name="water">
-              <xsl:value-of select="$water"/>
-            </xsl:attribute>
+          <xsl:if test="tempLow != ''">
+            <xsl:variable name="water">
+              <xsl:call-template name="tempConvert">
+                <xsl:with-param name="temp" select="tempLow"/>
+                <xsl:with-param name="units" select="$units"/>
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:if test="substring-before($water, ' ') != 0 or $temperatureSamples &gt; 0">
+              <xsl:attribute name="water">
+                <xsl:value-of select="$water"/>
+              </xsl:attribute>
+            </xsl:if>
           </xsl:if>
-        </xsl:if>
 
-        <xsl:if test="tempair != ''">
-          <xsl:variable name="air">
-            <xsl:call-template name="tempConvert">
-              <xsl:with-param name="temp" select="tempair"/>
-              <xsl:with-param name="units" select="$units"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:if test="substring-before($air, ' ') != 0 or $temperatureSamples &gt; 0">
-            <xsl:attribute name="air">
-              <xsl:value-of select="$air"/>
-            </xsl:attribute>
-          </xsl:if>
-        </xsl:if>
-        <xsl:if test="templow != ''">
-          <xsl:variable name="water">
-            <xsl:call-template name="tempConvert">
-              <xsl:with-param name="temp" select="temlow"/>
-              <xsl:with-param name="units" select="$units"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:if test="substring-before($water, ' ') != 0 or $temperatureSamples &gt; 0">
-            <xsl:attribute name="water">
-              <xsl:value-of select="$water"/>
-            </xsl:attribute>
-          </xsl:if>
-        </xsl:if>
-      </temperature>
-
-      <xsl:for-each select="samples/sample">
-        <sample>
-          <xsl:attribute name="time">
-            <xsl:call-template name="timeConvert">
-              <xsl:with-param name="timeSec">
-                <xsl:value-of select="time"/>
-              </xsl:with-param>
-              <xsl:with-param name="units" select="$units"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="depth">
-            <xsl:call-template name="depthConvert">
-              <xsl:with-param name="depth">
-                <xsl:value-of select="depth"/>
-              </xsl:with-param>
-              <xsl:with-param name="units" select="$units"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:if test="pressure != '' and $pressureSamples &gt; 0">
-            <xsl:attribute name="pressure">
-              <xsl:call-template name="pressureConvert">
-                <xsl:with-param name="number" select="pressure"/>
+          <xsl:if test="tempair != ''">
+            <xsl:variable name="air">
+              <xsl:call-template name="tempConvert">
+                <xsl:with-param name="temp" select="tempair"/>
                 <xsl:with-param name="units" select="$units"/>
               </xsl:call-template>
-            </xsl:attribute>
+            </xsl:variable>
+            <xsl:if test="substring-before($air, ' ') != 0 or $temperatureSamples &gt; 0">
+              <xsl:attribute name="air">
+                <xsl:value-of select="$air"/>
+              </xsl:attribute>
+            </xsl:if>
           </xsl:if>
-          <xsl:if test="temperature != '' and $temperatureSamples &gt; 0">
-            <xsl:attribute name="temp">
+          <xsl:if test="templow != ''">
+            <xsl:variable name="water">
               <xsl:call-template name="tempConvert">
-                <xsl:with-param name="temp" select="temperature"/>
+                <xsl:with-param name="temp" select="temlow"/>
                 <xsl:with-param name="units" select="$units"/>
               </xsl:call-template>
-            </xsl:attribute>
+            </xsl:variable>
+            <xsl:if test="substring-before($water, ' ') != 0 or $temperatureSamples &gt; 0">
+              <xsl:attribute name="water">
+                <xsl:value-of select="$water"/>
+              </xsl:attribute>
+            </xsl:if>
           </xsl:if>
-        </sample>
+        </temperature>
 
-        <xsl:if test="alarm != ''">
-          <event>
+        <xsl:for-each select="samples/sample">
+          <sample>
             <xsl:attribute name="time">
               <xsl:call-template name="timeConvert">
                 <xsl:with-param name="timeSec">
@@ -382,37 +345,74 @@
                 <xsl:with-param name="units" select="$units"/>
               </xsl:call-template>
             </xsl:attribute>
-            <xsl:attribute name="name">
-              <xsl:choose>
-                <xsl:when test="alarm = 'attention'">
-                  <xsl:value-of select="'violation'"/>
-                </xsl:when>
-                <xsl:when test="alarm = 'ascent_rate'">
-                  <xsl:value-of select="'ascent'"/>
-                </xsl:when>
-                <xsl:when test="alarm = 'deep_stop'">
-                  <xsl:value-of select="'deepstop'"/>
-                </xsl:when>
-                <xsl:when test="alarm = 'deco'">
-                  <xsl:value-of select="'deco stop'"/>
-                </xsl:when>
-                <xsl:when test="alarm = 'po2_high'">
-                  <xsl:value-of select="'PO2'"/>
-                </xsl:when>
-                <xsl:when test="alarm = 'tissue_warning'">
-                  <xsl:value-of select="'tissue level warning'"/>
-                </xsl:when>
-                <xsl:when test="alarm = 'user_depth_alarm'">
-                  <xsl:value-of select="'maxdepth'"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="alarm"/>
-                </xsl:otherwise>
-              </xsl:choose>
+            <xsl:attribute name="depth">
+              <xsl:call-template name="depthConvert">
+                <xsl:with-param name="depth">
+                  <xsl:value-of select="depth"/>
+                </xsl:with-param>
+                <xsl:with-param name="units" select="$units"/>
+              </xsl:call-template>
             </xsl:attribute>
-          </event>
-        </xsl:if>
-      </xsl:for-each>
+            <xsl:if test="pressure != '' and $pressureSamples &gt; 0">
+              <xsl:attribute name="pressure">
+                <xsl:call-template name="pressureConvert">
+                  <xsl:with-param name="number" select="pressure"/>
+                  <xsl:with-param name="units" select="$units"/>
+                </xsl:call-template>
+              </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="temperature != '' and $temperatureSamples &gt; 0">
+              <xsl:attribute name="temp">
+                <xsl:call-template name="tempConvert">
+                  <xsl:with-param name="temp" select="temperature"/>
+                  <xsl:with-param name="units" select="$units"/>
+                </xsl:call-template>
+              </xsl:attribute>
+            </xsl:if>
+          </sample>
+
+          <xsl:if test="alarm != ''">
+            <event>
+              <xsl:attribute name="time">
+                <xsl:call-template name="timeConvert">
+                  <xsl:with-param name="timeSec">
+                    <xsl:value-of select="time"/>
+                  </xsl:with-param>
+                  <xsl:with-param name="units" select="$units"/>
+                </xsl:call-template>
+              </xsl:attribute>
+              <xsl:attribute name="name">
+                <xsl:choose>
+                  <xsl:when test="alarm = 'attention'">
+                    <xsl:value-of select="'violation'"/>
+                  </xsl:when>
+                  <xsl:when test="alarm = 'ascent_rate'">
+                    <xsl:value-of select="'ascent'"/>
+                  </xsl:when>
+                  <xsl:when test="alarm = 'deep_stop'">
+                    <xsl:value-of select="'deepstop'"/>
+                  </xsl:when>
+                  <xsl:when test="alarm = 'deco'">
+                    <xsl:value-of select="'deco stop'"/>
+                  </xsl:when>
+                  <xsl:when test="alarm = 'po2_high'">
+                    <xsl:value-of select="'PO2'"/>
+                  </xsl:when>
+                  <xsl:when test="alarm = 'tissue_warning'">
+                    <xsl:value-of select="'tissue level warning'"/>
+                  </xsl:when>
+                  <xsl:when test="alarm = 'user_depth_alarm'">
+                    <xsl:value-of select="'maxdepth'"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="alarm"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:attribute>
+            </event>
+          </xsl:if>
+        </xsl:for-each>
+      </divecomputer>
 
     </dive>
   </xsl:template>
-- 
cgit v1.2.3-70-g09d2