From 2bf81e2b70b8521a14644483c59a12d15d58ac6c Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Mon, 6 May 2024 21:01:18 +0200
Subject: [PATCH] format

---
 tortue.xsl | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/tortue.xsl b/tortue.xsl
index 20d494f..5c77734 100644
--- a/tortue.xsl
+++ b/tortue.xsl
@@ -5,7 +5,15 @@
    <xsl:param name="nom" />
    <xsl:param name="n" />
 
-   <!-- Pour le Lsystem -->
+   <!-- On récupère le Lsystem qui nous intéresse -->
+   <xsl:template match="/">
+      <xsl:processing-instruction name="xml-model">href="tortue.xsd"</xsl:processing-instruction>
+
+      <xsl:apply-templates
+         select="lsystems/lsystem[name=$nom]" />
+   </xsl:template>
+
+   <!-- Appel de la substitution -->
    <xsl:template match="lsystem">
       <tortue>
          <xsl:call-template name="substitution">
@@ -19,6 +27,7 @@
    <xsl:template name="substitution">
       <xsl:param name="actuel" />
       <xsl:param name="n" />
+
       <!-- Si on doit encore substituer -->
       <xsl:choose>
          <xsl:when test="$n > 0">
@@ -36,6 +45,7 @@
                <xsl:with-param name="n" select="$n - 1" />
             </xsl:call-template>
          </xsl:when>
+
          <xsl:otherwise>
             <!-- Interprétation -->
             <xsl:call-template name="Interpretation">
@@ -48,7 +58,9 @@
    <!-- Applique la substitution -->
    <xsl:template name="Application">
       <xsl:param name="data" />
+
       <xsl:variable name="substitution" select="substitutions/substitution" />
+
       <xsl:analyze-string
          select="$data" regex=".">
          <xsl:matching-substring>
@@ -60,35 +72,36 @@
    <!-- Interprète la séquence -->
    <xsl:template name="Interpretation">
       <xsl:param name="data" />
+
       <xsl:variable name="interpretation"
          select="interpretations/interpretation" />
-      <xsl:analyze-string
-         select="$data" regex=".">
+
+      <xsl:analyze-string select="$data" regex=".">
          <xsl:matching-substring>
             <xsl:variable name="action"
                select="$interpretation[@member = current()]" />
             <xsl:choose>
                <!-- Ecrire -->
                <!-- TODO: Si plusieurs <line /> se suivent on pourrait les additionner -->
-               <xsl:when test="matches($action, '^LINE \d+$')">
+               <xsl:when test="starts-with($action, 'LINE')">
                   <line>
-                     <xsl:value-of select="substring-after($action, 'LINE ')" />
+                     <xsl:value-of select="substring-after($action, ' ')" />
                   </line>
                </xsl:when>
 
                <!-- Déplacer -->
                <!-- TODO: Si plusieurs <move /> se suivent on pourrait les additionner -->
-               <xsl:when test="matches($action, '^MOVE \d+$')">
+               <xsl:when test="starts-with($action, 'MOVE')">
                   <move>
-                     <xsl:value-of select="substring-after($action, 'MOVE ')" />
+                     <xsl:value-of select="substring-after($action, ' ')" />
                   </move>
                </xsl:when>
 
                <!-- Tourner -->
                <!-- TODO: Si plusieurs <turn /> se suivent on pourrait les additionner -->
-               <xsl:when test="matches($action, '^TURN -?\d+$')">
+               <xsl:when test="starts-with($action, 'TURN')">
                   <turn>
-                     <xsl:value-of select="substring-after($action, 'TURN ')" />
+                     <xsl:value-of select="substring-after($action, ' ')" />
                   </turn>
                </xsl:when>
 
@@ -112,12 +125,4 @@
          </xsl:matching-substring>
       </xsl:analyze-string>
    </xsl:template>
-
-
-   <!-- On récupère le Lsystem qui nous intéresse -->
-   <xsl:template match="/">
-      <xsl:processing-instruction name="xml-model">href="tortue.xsd"</xsl:processing-instruction>
-      <xsl:apply-templates
-         select="lsystems/lsystem[name=$nom]" />
-   </xsl:template>
 </xsl:transform>