From eeb700b19a06d94b4cef047ebb1dd25de92787ac Mon Sep 17 00:00:00 2001
From: aperdria <amelieperdriaud@MacBook-Air-de-Amelie.local>
Date: Sun, 20 Dec 2015 21:18:19 +0100
Subject: [PATCH] Correction on the transformation of introduction and
 conclusion ; Addition of information about the rules in the README ;

---
 hdoc_to_opale/xsl/transformation2.xsl | 33 ++++++++++++++++++++-------
 mindmapping_to_hdoc/input/sample.mm   |  2 +-
 mindmapping_to_opale/.gitignore       |  3 +++
 mindmapping_to_opale/README.md        | 13 +++++++++++
 4 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 mindmapping_to_opale/.gitignore

diff --git a/hdoc_to_opale/xsl/transformation2.xsl b/hdoc_to_opale/xsl/transformation2.xsl
index d71b753..4591151 100644
--- a/hdoc_to_opale/xsl/transformation2.xsl
+++ b/hdoc_to_opale/xsl/transformation2.xsl
@@ -111,10 +111,16 @@
 
   <!-- Body related templates. -->
     <xsl:template match="h:body">
-      <xsl:if test="./h:section[@data-hdoc-type = 'introduction']/h:div/*">
+      <xsl:if test="./h:section/h:div[@data-hdoc-type = 'introduction']/*">
         <sp:intro>
           <op:res>
-            <xsl:apply-templates select="./h:section[@data-hdoc-type = 'introduction']/h:div/*" />
+            <sp:txt>
+              <op:txt>
+                <sc:para>
+                  <xsl:apply-templates select="./h:section/h:div[@data-hdoc-type = 'introduction']/*" />
+                </sc:para>
+              </op:txt>
+            </sp:txt>
           </op:res>
         </sp:intro>
       </xsl:if>
@@ -141,18 +147,29 @@
     <xsl:template match="h:div[@data-hdoc-type='introduction']">
       <sp:intro>
         <op:res>
-          <xsl:apply-templates select="./h:p" />
+          <sp:txt>
+            <op:txt>
+            <sc:para>
+              <xsl:apply-templates select="./text()" /></sc:para>
+            </op:txt>
+          </sp:txt>
         </op:res>
       </sp:intro>
     </xsl:template>
 
     <!-- Conclusion <section> -->
-    <xsl:template match="h:div[@data-hdoc-type='conclusion']">
+    <xsl:template match="h:footer/h:div[@data-hdoc-type='conclusion']">
       <sp:conclu>
         <op:res>
-          <!-- Going straight to the content -->
-          <!-- For the conclusion, we ignore <header> and <footer> -->
-          <xsl:apply-templates select="./h:p" />
+          <sp:txt>
+            <op:txt>
+              <sc:para>
+                <!-- Going straight to the content -->
+                <!-- For the conclusion, we ignore <header> and <footer> -->
+                <xsl:apply-templates select="./text()" />
+              </sc:para>
+            </op:txt>
+          </sp:txt>
         </op:res>
       </sp:conclu>
     </xsl:template>
@@ -258,7 +275,7 @@
           <xsl:apply-templates select="./h:section[not(@data-hdoc-type = 'introduction' or @data-hdoc-type = 'conclusion')]"/>
 
           <!-- Conclusion for a division -->
-          <xsl:apply-templates select="./h:header/h:div[@data-hdoc-type='conclusion']" />
+          <xsl:apply-templates select="./h:footer/h:div[@data-hdoc-type='conclusion']" />
 
         </op:ueDiv>
       </sp:div>
diff --git a/mindmapping_to_hdoc/input/sample.mm b/mindmapping_to_hdoc/input/sample.mm
index 9b3f311..644a547 100644
--- a/mindmapping_to_hdoc/input/sample.mm
+++ b/mindmapping_to_hdoc/input/sample.mm
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><map version="0.8.1"><node CREATED="1450312359766" ID="2nngtspni6hi1484pfec44c8lk" MODIFIED="1450312359766" TEXT="MindMapping"><node CREATED="1450312359766" ID="00lp6bpfm6jibhcjrpdonrhoqb" MODIFIED="1450312359766" POSITION="right" TEXT="#1 MindMapping to Hdoc"><node CREATED="1450312359766" ID="3qm1jgu7dfgs328jthlek5fd4e" MODIFIED="1450312359766" TEXT="Prendre en main le projet existant"/><node CREATED="1450312359766" ID="0u38ectmhqqp4p08p5guvgij71" MODIFIED="1450312359766" TEXT="Corriger les bugs existants"/><node CREATED="1450312359766" ID="3b1t9o2te6enh59j4iv48f4mdi" MODIFIED="1450312359766" TEXT="Restructurer le ant"/></node><node CREATED="1450312359766" ID="6lohsep5crh5g3ngj8ld8loei6" MODIFIED="1450312359766" POSITION="right" TEXT="#2 MindMapping to Opale"><node CREATED="1450312359766" ID="5pl3210hq6if3nv7r2chtjstmo" MODIFIED="1450312359766" TEXT="Faire la connexion avec le transformateur Hdoc to Opale"/><node CREATED="1450312359766" ID="3haa2fgohe9j4n04ilddco84uh" MODIFIED="1450312359766" TEXT="Permettre la personnalisation de l'organisation du module"/><node CREATED="1450312359766" ID="11k2hbkcu415e1mgk5c5ucr48k" MODIFIED="1450312359766" TEXT="Permettre la personnalisation dy type de noeud (Intro, conclusion etc.)"/><node CREATED="1450312359766" ID="4npf8jpvak3lffn9c1rsogi0sq" MODIFIED="1450312359766" TEXT="Permettre la personnalisation grâce aux couleurs/icônes"/></node><node CREATED="1450312359766" ID="3n8v43p8qb005puq3qiv7aiubc" MODIFIED="1450312359766" POSITION="right" TEXT="#3 MindMapping to Optim"><node CREATED="1450312359766" ID="2bn1la3apnjf1fi8qqfqde226t" MODIFIED="1450312359766" TEXT="Faire la connexion avec le transformateur Hdoc to Optim"/></node><node CREATED="1450312359766" ID="3s00si3hquol4pldg7lo9opjd6" MODIFIED="1450312359766" POSITION="right" TEXT="#4 MindMapping to Lexique"><node CREATED="1450312359766" ID="37jlfl25iuaoe6f2cpiv30qksd" MODIFIED="1450312359766" TEXT="Faire la connexion avec le transformateur Hdoc to Lexique"/></node><node CREATED="1450312359767" ID="27gnl6pgottjfiukpa3ulfdjrj" MODIFIED="1450312359767" POSITION="left" TEXT="#5 Prendre d'autres outils de carte mentales en entrée"/><node CREATED="1450312359767" ID="24d41nnnnvvu7fv5m8m4vegu0g" MODIFIED="1450312359767" POSITION="left" TEXT="#intro This converter aims at convert a given MindMapping file into a Hdoc file which then will be imported in Opale (advanced only)."/><node CREATED="1450312359767" ID="6a7pr2b5vvmq6na5964dhf9e13" MODIFIED="1450312359767" POSITION="left" TEXT="#conclu Ma conclusion"/></node></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><map version="0.8.1"><node CREATED="1450641851216" ID="2nngtspni6hi1484pfec44c8lk" MODIFIED="1450641851216" TEXT="MindMapping"><node CREATED="1450641851217" ID="00lp6bpfm6jibhcjrpdonrhoqb" MODIFIED="1450641851217" POSITION="right" TEXT="#1 MindMapping to Hdoc"><node CREATED="1450641851217" ID="3qm1jgu7dfgs328jthlek5fd4e" MODIFIED="1450641851217" TEXT="Prendre en main le projet existant"/><node CREATED="1450641851217" ID="0u38ectmhqqp4p08p5guvgij71" MODIFIED="1450641851217" TEXT="Corriger les bugs existants"/><node CREATED="1450641851217" ID="3b1t9o2te6enh59j4iv48f4mdi" MODIFIED="1450641851217" TEXT="Restructurer le ant"/></node><node CREATED="1450641851217" ID="6lohsep5crh5g3ngj8ld8loei6" MODIFIED="1450641851217" POSITION="right" TEXT="#2 MindMapping to Opale"><node CREATED="1450641851217" ID="5pl3210hq6if3nv7r2chtjstmo" MODIFIED="1450641851217" TEXT="Faire la connexion avec le transformateur Hdoc to Opale"/><node CREATED="1450641851217" ID="3haa2fgohe9j4n04ilddco84uh" MODIFIED="1450641851217" TEXT="Permettre la personnalisation de l'organisation du module"><node CREATED="1450641851217" ID="4ie264076qt3tnlu0pqpp1dh1p" MODIFIED="1450641851217" TEXT="A l'aide de hashtag"/><node CREATED="1450641851217" ID="23mafrh60fmdmkjsp1jdg6c58g" MODIFIED="1450641851217" TEXT="A l'aide d'attributs"/></node><node CREATED="1450641851217" ID="11k2hbkcu415e1mgk5c5ucr48k" MODIFIED="1450641851217" TEXT="Permettre la personnalisation dy type de noeud (Intro, conclusion etc.)"><node CREATED="1450641851217" ID="5pf0idbv9nln725d14rs1c1p0a" MODIFIED="1450641851217" TEXT="A l'aide d'attributs"/><node CREATED="1450641851217" ID="48799q1i5c6rns3smpa8vnekfb" MODIFIED="1450641851217" TEXT="A l'aide de hashtag"/></node><node CREATED="1450641851217" ID="4npf8jpvak3lffn9c1rsogi0sq" MODIFIED="1450641851217" TEXT="Permettre la personnalisation grâce aux couleurs/icônes"/></node><node CREATED="1450641851217" ID="3n8v43p8qb005puq3qiv7aiubc" MODIFIED="1450641851217" POSITION="right" TEXT="#3 MindMapping to Optim"><node CREATED="1450641851217" ID="2bn1la3apnjf1fi8qqfqde226t" MODIFIED="1450641851217" TEXT="Faire la connexion avec le transformateur Hdoc to Optim"/></node><node CREATED="1450641851217" ID="3s00si3hquol4pldg7lo9opjd6" MODIFIED="1450641851217" POSITION="right" TEXT="#4 MindMapping to Lexique"><node CREATED="1450641851217" ID="37jlfl25iuaoe6f2cpiv30qksd" MODIFIED="1450641851217" TEXT="Faire la connexion avec le transformateur Hdoc to Lexique"/></node><node CREATED="1450641851217" ID="27gnl6pgottjfiukpa3ulfdjrj" MODIFIED="1450641851217" POSITION="left" TEXT="#5 Prendre d'autres outils de carte mentales en entrée"/><node CREATED="1450641851217" ID="24d41nnnnvvu7fv5m8m4vegu0g" MODIFIED="1450641851217" POSITION="left" TEXT="#intro This converter aims at convert a given MindMapping file into a Hdoc file which then will be imported in Opale (advanced only)."/><node CREATED="1450641851217" ID="6a7pr2b5vvmq6na5964dhf9e13" MODIFIED="1450641851217" POSITION="left" TEXT="#conclu DONE : MindMapping to Hdoc, MindMapping to Opale TODO : MindMapping to Optim, MindMapping to Lexique"/></node></map>
\ No newline at end of file
diff --git a/mindmapping_to_opale/.gitignore b/mindmapping_to_opale/.gitignore
new file mode 100644
index 0000000..ec1b57f
--- /dev/null
+++ b/mindmapping_to_opale/.gitignore
@@ -0,0 +1,3 @@
+.ant-targets-mindMapping2Hdoc.ant
+result/**
+temp/**
diff --git a/mindmapping_to_opale/README.md b/mindmapping_to_opale/README.md
index e0dc5ac..7b06973 100644
--- a/mindmapping_to_opale/README.md
+++ b/mindmapping_to_opale/README.md
@@ -21,3 +21,16 @@ Use a terminal and go to the root of the folder (mindmapping_to_opale).
 
 You will find the result in the folder mindmapping_to_opale/result
 
+
+IMPORTANT
+=========
+
+You can use special rules in Freemind to personnalize your Scenari Module :
+
+- By default, a "Division" is created with the name of the main node of your MindMap
+- Then :
+	A node without children is transformed in grain content
+	A node with children is transformed in division
+- You can add introduction and conclusion using the hashtag #intro and #conclu on all the node that has no child
+- You can arrange the order of the node usine the hashtag #1, #2, #3 etc.
+
-- 
2.24.1