[Libreoffice-commits] core.git: officecfg/util

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Sat May 9 08:04:18 UTC 2020


 officecfg/util/schema_trim.xsl |  253 ++++++++++++++++++++---------------------
 1 file changed, 124 insertions(+), 129 deletions(-)

New commits:
commit 0bbfe8aaebc5ca6e0ae7f72d69345eee05931fae
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri May 8 14:05:10 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Sat May 9 10:03:44 2020 +0200

    Re-indent sanely
    
    Change-Id: I68e2ae23bdba5c47a9156d1fa8d2078b364c1061
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93750
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/officecfg/util/schema_trim.xsl b/officecfg/util/schema_trim.xsl
index f67d89194a51..41c25990719d 100644
--- a/officecfg/util/schema_trim.xsl
+++ b/officecfg/util/schema_trim.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- -*- indent-tabs-mode: nil -*- -->
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,133 +18,128 @@
  -->
 
 <xsl:transform  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-        xmlns:oor="http://openoffice.org/2001/registry"
-        version="1.0">
-
-        <xsl:param name="LIBO_SHARE_FOLDER"/>
-        <xsl:param name="LIBO_SHARE_HELP_FOLDER"/>
-
-<!-- Get the correct format -->
-    <xsl:output method="xml" indent="yes"/>
-    <xsl:namespace-alias stylesheet-prefix="xs" result-prefix="xs"></xsl:namespace-alias>
-
-
-<!-- Remove all comments from the schema files -->
-    <xsl:template match="*|@*">
-      <xsl:copy>
-        <xsl:apply-templates select="*|@*"/>
-      </xsl:copy>
-    </xsl:template>
-
-<!-- suppress the location of the schema -->
-    <xsl:template match = "@xsi:schemaLocation"/>
-
-<!-- suppress the constraints of the schema
-    <xsl:template match = "constraints"/>  -->
-
-<!-- suppress all documentation items
-    <xsl:template match = "info"/> -->
-
-<!-- suppress constraints for deprecated items -->
-    <xsl:template match = "constraints[../info/deprecated]"/>
-
-<!-- suppress all documentation for deprecated items -->
-    <xsl:template match = "desc[../deprecated]"/>
-    <xsl:template match = "label[../deprecated]"/>
-
-<!-- copy all other documentation with content -->
-    <xsl:template match="desc|label">
-        <xsl:copy>
-            <xsl:apply-templates select="@*"/>
-            <xsl:value-of select="."/>
-        </xsl:copy>
-    </xsl:template>
-
-<!-- suppress all author items -->
-    <xsl:template match = "author"/>
-
-<!-- suppress values, which are marked as nil -->
-    <xsl:template match="value[@xsi:nil='true']" />
-
-<!-- copy all other values with content -->
-    <xsl:template match="value">
-        <xsl:copy>
-            <xsl:apply-templates select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-        <xsl:template match ="it|unicode">
-          <xsl:copy>
-            <xsl:apply-templates select = "@*|node()"/>
-          </xsl:copy>
-        </xsl:template>
-
-        <xsl:template match="text()">
-          <xsl:call-template name="replacetwo">
-            <xsl:with-param name="input" select="current()"/>
-            <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/>
-            <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/>
-            <xsl:with-param name="pattern2" select="'@LIBO_SHARE_HELP_FOLDER@'"/>
-            <xsl:with-param name="replace2" select="$LIBO_SHARE_HELP_FOLDER"/>
-          </xsl:call-template>
-        </xsl:template>
-
-        <xsl:template name="replace">
-          <xsl:param name="input"/>
-          <xsl:param name="pattern"/>
-          <xsl:param name="replace"/>
-          <xsl:choose>
-            <xsl:when test="contains($input, $pattern)">
-              <xsl:value-of select="substring-before($input, $pattern)"/>
-              <xsl:value-of select="$replace"/>
-              <xsl:call-template name="replace">
-                <xsl:with-param
-                    name="input" select="substring-after($input, $pattern)"/>
-                <xsl:with-param name="pattern" select="$pattern"/>
-                <xsl:with-param name="replace" select="$replace"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$input"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-        <xsl:template name="replacetwo">
-          <xsl:param name="input"/>
-          <xsl:param name="pattern1"/>
-          <xsl:param name="replace1"/>
-          <xsl:param name="pattern2"/>
-          <xsl:param name="replace2"/>
-          <xsl:choose>
-            <xsl:when test="contains($input, $pattern1)">
-          <xsl:call-template name="replace">
-        <xsl:with-param
-            name="input" select="substring-before($input, $pattern1)"/>
-        <xsl:with-param name="pattern" select="$pattern2"/>
-        <xsl:with-param name="replace" select="$replace2"/>
-          </xsl:call-template>
-              <xsl:value-of select="$replace1"/>
-              <xsl:call-template name="replacetwo">
-                <xsl:with-param
-                    name="input" select="substring-after($input, $pattern1)"/>
-                <xsl:with-param name="pattern1" select="$pattern1"/>
-                <xsl:with-param name="replace1" select="$replace1"/>
-                <xsl:with-param name="pattern2" select="$pattern2"/>
-                <xsl:with-param name="replace2" select="$replace2"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-          <xsl:call-template name="replace">
-        <xsl:with-param
-            name="input" select="$input"/>
-        <xsl:with-param name="pattern" select="$pattern2"/>
-        <xsl:with-param name="replace" select="$replace2"/>
-          </xsl:call-template>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:oor="http://openoffice.org/2001/registry"
+                version="1.0">
+
+  <xsl:param name="LIBO_SHARE_FOLDER"/>
+  <xsl:param name="LIBO_SHARE_HELP_FOLDER"/>
+
+  <!-- Get the correct format -->
+  <xsl:output method="xml" indent="yes"/>
+  <xsl:namespace-alias stylesheet-prefix="xs" result-prefix="xs"></xsl:namespace-alias>
+
+  <!-- Remove all comments from the schema files -->
+  <xsl:template match="*|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="*|@*"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- suppress the location of the schema -->
+  <xsl:template match = "@xsi:schemaLocation"/>
+
+  <!-- suppress the constraints of the schema
+  <xsl:template match = "constraints"/>  -->
+
+  <!-- suppress all documentation items
+  <xsl:template match = "info"/> -->
+
+  <!-- suppress constraints for deprecated items -->
+  <xsl:template match = "constraints[../info/deprecated]"/>
+
+  <!-- suppress all documentation for deprecated items -->
+  <xsl:template match = "desc[../deprecated]"/>
+  <xsl:template match = "label[../deprecated]"/>
+
+  <!-- copy all other documentation with content -->
+  <xsl:template match="desc|label">
+    <xsl:copy>
+      <xsl:apply-templates select="@*"/>
+      <xsl:value-of select="."/>
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- suppress all author items -->
+  <xsl:template match = "author"/>
+
+  <!-- suppress values, which are marked as nil -->
+  <xsl:template match="value[@xsi:nil='true']" />
+
+  <!-- copy all other values with content -->
+  <xsl:template match="value">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match ="it|unicode">
+    <xsl:copy>
+      <xsl:apply-templates select = "@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="text()">
+    <xsl:call-template name="replacetwo">
+      <xsl:with-param name="input" select="current()"/>
+      <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/>
+      <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/>
+      <xsl:with-param name="pattern2" select="'@LIBO_SHARE_HELP_FOLDER@'"/>
+      <xsl:with-param name="replace2" select="$LIBO_SHARE_HELP_FOLDER"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="replace">
+    <xsl:param name="input"/>
+    <xsl:param name="pattern"/>
+    <xsl:param name="replace"/>
+    <xsl:choose>
+      <xsl:when test="contains($input, $pattern)">
+        <xsl:value-of select="substring-before($input, $pattern)"/>
+        <xsl:value-of select="$replace"/>
+        <xsl:call-template name="replace">
+          <xsl:with-param name="input" select="substring-after($input, $pattern)"/>
+          <xsl:with-param name="pattern" select="$pattern"/>
+          <xsl:with-param name="replace" select="$replace"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$input"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="replacetwo">
+    <xsl:param name="input"/>
+    <xsl:param name="pattern1"/>
+    <xsl:param name="replace1"/>
+    <xsl:param name="pattern2"/>
+    <xsl:param name="replace2"/>
+    <xsl:choose>
+      <xsl:when test="contains($input, $pattern1)">
+        <xsl:call-template name="replace">
+          <xsl:with-param name="input" select="substring-before($input, $pattern1)"/>
+          <xsl:with-param name="pattern" select="$pattern2"/>
+          <xsl:with-param name="replace" select="$replace2"/>
+        </xsl:call-template>
+        <xsl:value-of select="$replace1"/>
+        <xsl:call-template name="replacetwo">
+          <xsl:with-param name="input" select="substring-after($input, $pattern1)"/>
+          <xsl:with-param name="pattern1" select="$pattern1"/>
+          <xsl:with-param name="replace1" select="$replace1"/>
+          <xsl:with-param name="pattern2" select="$pattern2"/>
+          <xsl:with-param name="replace2" select="$replace2"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="replace">
+          <xsl:with-param name="input" select="$input"/>
+          <xsl:with-param name="pattern" select="$pattern2"/>
+          <xsl:with-param name="replace" select="$replace2"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 
 </xsl:transform>


More information about the Libreoffice-commits mailing list