From c4afb5bafa9c499b7edad63b65b103f984a9400f Mon Sep 17 00:00:00 2001
From: Nicolas Pavie <pavie.nicolas@gmail.com>
Date: Thu, 14 Dec 2023 15:52:19 +0100
Subject: [PATCH] fix(#35): updated treatment of bidirectionnal text

Refactored the conversion of bidirectionnal text:
- Treating bdo element as inline other inline tag
- Checking for w:bidi or w:rtl informations in text runner properties to add bdo elements

Also:
- Changed default plugin settings for more optimal default notes positionning in result
- Starting to remove document name and path in exception report
---
 Common/DaisyConverterLib/Converter.cs         |  12 +-
 Common/DaisyConverterLib/ConverterSettings.cs |  34 ++--
 .../DaisyConverterLib.csproj                  |   2 +
 .../resources/xslts/Common.xsl                | 170 ++++++++----------
 .../resources/xslts/Common3.xsl               | 138 ++++----------
 .../resources/xslts/oox2Daisy.xsl             |  57 ------
 6 files changed, 132 insertions(+), 281 deletions(-)

diff --git a/Common/DaisyConverterLib/Converter.cs b/Common/DaisyConverterLib/Converter.cs
index bf3b87e..c41ea4f 100644
--- a/Common/DaisyConverterLib/Converter.cs
+++ b/Common/DaisyConverterLib/Converter.cs
@@ -323,14 +323,14 @@ public ConversionResult Convert(DocumentParameters document, bool applyPostProce
                 }
                 catch (Exception e)
                 {
-                    string message = "An error occured while converting " + document.InputPath + " to dtbook XML :\r\n" + e.Message;
+                    string message = "An error occured while converting a single docx to dtbook XML";
                     while (e.InnerException != null)
                     {
                         message += "\r\n - " + e.InnerException.Message;
                         e = e.InnerException;
                     }
 
-                    Exception fault = new Exception("An error occured while converting " + document.InputPath + " to dtbook XML :\r\n" + e.Message, e);
+                    Exception fault = new Exception("Conversion of single docx to dtbook XML: task crashed", e);
                     this.EventsHandler.OnConversionError(
                         fault
                     );
@@ -349,7 +349,7 @@ public ConversionResult Convert(DocumentParameters document, bool applyPostProce
                         e = e.InnerException;
                     }
 
-                    Exception fault = new Exception("An error occured while converting " + document.InputPath + " to dtbook XML :\r\n" + e.Message, e);
+                    Exception fault = new Exception("Conversion of single docx to dtbook XML: task ended in fault", e);
                     this.EventsHandler.OnConversionError(
                         fault
                     );
@@ -383,7 +383,7 @@ public ConversionResult Convert(DocumentParameters document, bool applyPostProce
                 catch (Exception e)
                 {
                     CurrentStatus = ConversionStatus.Error;
-                    Exception fault = new Exception("Error while converting with DAISY Pipeline 2:\r\n" + e.Message, e);
+                    Exception fault = new Exception("Error while converting with DAISY Pipeline 2", e);
                     this.EventsHandler.onPostProcessingError(
                         fault
                     );
@@ -466,7 +466,7 @@ public ConversionResult Convert(List<DocumentParameters> documentLists, bool app
                         }
                         catch (Exception e)
                         {
-                            Exception fault = new Exception("Error while converting " + document.InputPath + " to dtbook XML:\r\n" + e.Message, e);
+                            Exception fault = new Exception("Conversion of list of docx to dtbook XML: task crashed", e);
                             // TODO try to see if exception is raised by cancellation
                             this.EventsHandler.OnConversionError(fault);
                             throw fault;
@@ -475,7 +475,7 @@ public ConversionResult Convert(List<DocumentParameters> documentLists, bool app
 
                         if (conversionTask.IsFaulted)
                         {
-                            Exception fault = new Exception("Error while converting " + document.InputPath + " to dtbook XML:\r\n" + conversionTask.Exception.Message, conversionTask.Exception);
+                            Exception fault = new Exception("Conversion of list of docx to dtbook XML: task ended in fault", conversionTask.Exception);
                             this.EventsHandler.OnConversionError(
                                 fault
                             );
diff --git a/Common/DaisyConverterLib/ConverterSettings.cs b/Common/DaisyConverterLib/ConverterSettings.cs
index 58dc969..5e3d734 100644
--- a/Common/DaisyConverterLib/ConverterSettings.cs
+++ b/Common/DaisyConverterLib/ConverterSettings.cs
@@ -143,12 +143,12 @@ public enum Enum
         private string resampleValue = "96";
         private string characterStyle = "False";
         private string pagenumStyle = "Custom";
-        private string footnotesLevel = "0"; // 0 mean current paragraphe, < 0 means parent level going upward, > 1 means absolute dtbook level
-        private string footnotesPosition = "page"; // Should be inline, end, or page
-        private string footnotesNumbering = "number"; // should be number, none, or word (to reuse word 
+        private string footnotesLevel = "0"; // 0 mean current paragraphe level, < 0 means parent level going upward, > 1 means absolute dtbook level
+        private string footnotesPosition = "end"; // Should be inline, end, or page
+        private string footnotesNumbering = "none"; // should be number, none, or word
         private string footnotesStartValue = "1"; // number to be used
         private string footnotesNumberingPrefix = ""; // prefix to be added before the numbering
-        private string footnotesNumberingSuffix = " "; // suffix to be added between the number and the text (default to a space to reproduce the plugin original behaviour)
+        private string footnotesNumberingSuffix = ""; // suffix to be added between the number and the text
         private string azureSpeechRegion = ""; // region defined in the Azure console for the speech service
         private string azureSpeechKey = ""; // one of the two keys provided to connect to to Azure speech synthesis service
         private string ttsConfigFile = ""; // A tts config file to use for speech synthesis with pipeline 2
@@ -156,19 +156,19 @@ private string SettingsXml
         {
             get =>
                 $"<Settings>" +
-                    $"<PageNumbers  value=\"{pagenumStyle}\" />" +
-                    $"<CharacterStyles value=\"{characterStyle}\" />" +
-                    $"<ImageSizes value=\"{imgoption}\" samplingvalue=\"{resampleValue}\" />" +
-                    $"<Footnotes level=\"{footnotesLevel}\" " +
-                        $"position=\"{footnotesPosition}\" " +
-                        $"numbering=\"{footnotesNumbering}\" " +
-                        $"startValue=\"{footnotesStartValue}\" " +
-                        $"numberPrefix=\"{footnotesNumberingPrefix}\" " +
-                        $"numberSuffix=\"{footnotesNumberingSuffix}\" />" +
-                    $"<Azure region=\"{azureSpeechRegion}\" " +
-                            $"key=\"{azureSpeechKey}\" />" +
-                    $"<TTSConfig file=\"{ttsConfigFile}\" />" +
-                $"</Settings>";
+                $"\r\n\t<PageNumbers  value=\"{pagenumStyle}\" />" +
+                $"\r\n\t<CharacterStyles value=\"{characterStyle}\" />" +
+                $"\r\n\t<ImageSizes value=\"{imgoption}\" samplingvalue=\"{resampleValue}\" />" +
+                $"\r\n\t<Footnotes level=\"{footnotesLevel}\" " +
+                $"\r\n\t\tposition=\"{footnotesPosition}\" " +
+                $"\r\n\t\tnumbering=\"{footnotesNumbering}\" " +
+                $"\r\n\t\tstartValue=\"{footnotesStartValue}\" " +
+                $"\r\n\t\tnumberPrefix=\"{footnotesNumberingPrefix}\" " +
+                $"\r\n\t\tnumberSuffix=\"{footnotesNumberingSuffix}\" />" +
+                $"\r\n\t<Azure region=\"{azureSpeechRegion}\" " +
+                $"\r\n\t\tkey=\"{azureSpeechKey}\" />" +
+                $"\r\n\t<TTSConfig file=\"{ttsConfigFile}\" />" +
+                $"\r\n</Settings>";
 
         }
 
diff --git a/Common/DaisyConverterLib/DaisyConverterLib.csproj b/Common/DaisyConverterLib/DaisyConverterLib.csproj
index ba6e677..0706f3a 100755
--- a/Common/DaisyConverterLib/DaisyConverterLib.csproj
+++ b/Common/DaisyConverterLib/DaisyConverterLib.csproj
@@ -291,9 +291,11 @@
     </EmbeddedResource>
     <EmbeddedResource Include="resources\xslts\Common2.xsl">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="resources\xslts\Common3.xsl">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="resources\xslts\OOML2MML.xsl">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/Common/DaisyConverterLib/resources/xslts/Common.xsl b/Common/DaisyConverterLib/resources/xslts/Common.xsl
index 4a77b3f..9817b9d 100644
--- a/Common/DaisyConverterLib/resources/xslts/Common.xsl
+++ b/Common/DaisyConverterLib/resources/xslts/Common.xsl
@@ -252,7 +252,7 @@
                 <xsl:call-template name="SetCurrentMatterType" />
             </xsl:if>
             <xsl:if test="myObj:GetCurrentMatterType()=$matterType">
-				<xsl:message terminate="no">progress:Converting element <xsl:value-of select="position()"/> / <xsl:value-of select="$ElementCountToConvert"/></xsl:message>
+				<xsl:message terminate="no">progress:Converting element <xsl:value-of select="name()"/> - <xsl:value-of select="position()"/> / <xsl:value-of select="$ElementCountToConvert"/></xsl:message>
                 <xsl:choose>
                     <!--Checking for Praragraph element-->
                     <xsl:when test="name()='w:p'
@@ -722,30 +722,18 @@
             </xsl:if>
             <!--Checking condition for MathEquations in Word2007-->
             <xsl:if test="m:oMath">
-                <xsl:choose>
-                    <!--Checking for BDO Element in MathEquation-->
-                    <xsl:when test="../w:pPr/w:bidi">
-                        <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','bdo ','dir= ',$quote,'rtl',$quote,'&gt;')"/>
-                        <!--Calling Mathml Template for Math Equations-->
-                        <xsl:call-template name="ooml2mml">
-                            <xsl:with-param name="sOperators" select="$sOperators"/>
-                            <xsl:with-param name="sMinuses" select="$sMinuses"/>
-                            <xsl:with-param name="sNumbers" select="$sNumbers"/>
-                            <xsl:with-param name="sZeros" select="$sZeros"/>
-                        </xsl:call-template>
-                        <!--Closing bdo Tag-->
-                        <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','/bdo','&gt;')"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <!--Calling Mathml Template for Math Equations-->
-                        <xsl:call-template name="ooml2mml">
-                            <xsl:with-param name="sOperators" select="$sOperators"/>
-                            <xsl:with-param name="sMinuses" select="$sMinuses"/>
-                            <xsl:with-param name="sNumbers" select="$sNumbers"/>
-                            <xsl:with-param name="sZeros" select="$sZeros"/>
-                        </xsl:call-template>
-                    </xsl:otherwise>
-                </xsl:choose>
+				<xsl:if test="../w:pPr/w:bidi">
+					<xsl:value-of disable-output-escaping="yes" select="concat('&lt;','bdo ','dir= ',$quote,'rtl',$quote,'&gt;')"/>
+				</xsl:if>
+				<xsl:call-template name="ooml2mml">
+					<xsl:with-param name="sOperators" select="$sOperators"/>
+					<xsl:with-param name="sMinuses" select="$sMinuses"/>
+					<xsl:with-param name="sNumbers" select="$sNumbers"/>
+					<xsl:with-param name="sZeros" select="$sZeros"/>
+				</xsl:call-template>
+				<xsl:if test="../w:pPr/w:bidi">
+					<xsl:value-of disable-output-escaping="yes" select="concat('&lt;','/bdo','&gt;')"/>
+				</xsl:if>
             </xsl:if>
             <!--Checking condition for MathEquations in Word2007-->
             <xsl:if test="../m:oMath">
@@ -1119,13 +1107,6 @@
                 </xsl:if>
             </xsl:if>
         </xsl:for-each>
-        <!--checking    condition to close bdo Tag -->
-        <xsl:if test="myObj:SetbdoFlag()&gt;=2">
-            <!--Closing BDO tag-->
-            <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','/bdo','&gt;')"/>
-        </xsl:if>
-        <!--reseting bdo flag-->
-        <xsl:variable name="bdoflag" select="myObj:reSetbdoFlag()"/>
         <xsl:variable name="assingBookmark" select="myObj:AssingBookmark()"/>
         <!--closing paragraph tag-->
         <xsl:if test="not($flag='0') and not(myObj:AbbrAcrFlag()='1') and not($flagNote='hyper')">
@@ -1615,47 +1596,7 @@
                 </xsl:choose>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:choose>
-                    <!--Checking for BDO Element-->
-                    <xsl:when test="(../w:pPr/w:bidi) and (w:rPr/w:rtl)">
-                        <xsl:variable name="Bd">
-                            <xsl:call-template name="BdoRtlLanguages"/>
-                        </xsl:variable>
-                        <xsl:variable name="bdoflag" select="myObj:SetbdoFlag()"/>
-                        <!--opening bdo Tag-->
-                        <xsl:if test="$bdoflag=1">
-                            <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','bdo ','dir= ',$quote,'rtl',$quote,' xml:lang=',$quote,$Bd,$quote,'&gt;')"/>
-                        </xsl:if>
-                    </xsl:when>
-                    <!--Checking for BDO Element-->
-                    <xsl:when test="(../w:pPr/w:bidi)">
-                        <xsl:variable name="Bd">
-                            <!--Calling template for Bdo language-->
-                            <xsl:call-template name="BdoRtlLanguages"/>
-                        </xsl:variable>
-                        <!--Setting flag for bdo-->
-                        <xsl:variable name="bdoflag" select="myObj:SetbdoFlag()"/>
-                        <!--checking condition for opening p tag-->
-                        <!--opening bdo Tag-->
-                        <xsl:if test="$bdoflag=1">
-                            <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','bdo ','dir= ',$quote,'rtl',$quote,' xml:lang=',$quote,$Bd,$quote,'&gt;')"/>
-                        </xsl:if>
-                    </xsl:when>
-                    <!--Checking for BDO Element-->
-                    <xsl:when test="w:rPr/w:rtl">
-                        <xsl:variable name="Bd">
-                            <!--Calling template for Bdo language-->
-                            <xsl:call-template name="BdoRtlLanguages"/>
-                        </xsl:variable>
-                        <!--Setting flag for bdo-->
-                        <xsl:variable name="bdoflag" select="myObj:SetbdoFlag()"/>
-                        <!--opening bdo Tag-->
-                        <xsl:if test="$bdoflag=1">
-                            <!--If flag value is 1 opening bdo element-->
-                            <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','bdo ','dir= ',$quote,'rtl',$quote,' xml:lang=',$quote,$Bd,$quote,'&gt;')"/>
-                        </xsl:if>
-                    </xsl:when>
-                </xsl:choose>
+                
                 <!--Calling Custom styles template if not caption-->
                 <xsl:if test="not((((../w:pPr/w:pStyle/@w:val='Table-CaptionDAISY')
                         or (../w:pPr/w:pStyle/@w:val='Caption'))
@@ -2136,11 +2077,11 @@
                     <!--Opening page number tag-->
                     <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','pagenum ','page=',$aquote,$page,$aquote,' id=',$aquote,concat('page',myObj:GeneratePageId()),$aquote,'&gt;')"/>
                 </xsl:if>
-                <!--Calling template for page number text-->
-                <xsl:call-template name="CustomCharStyle">
-                    <xsl:with-param name="characterStyle" select="$customcharStyle"/>
-                    <xsl:with-param name="txt" select="$txt"/>
-                </xsl:call-template>
+				<!-- pagenum only accept text-->
+				<xsl:if test="not($txt='')">
+					<xsl:value-of select="$txt"/>
+				</xsl:if>
+				<xsl:value-of select="normalize-space(w:t)"/>
                 <xsl:if test="count(following-sibling::node()[1]/w:rPr/w:rStyle[@w:val='PageNumberDAISY'])=0">
                     <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','/pagenum','&gt;')"/>
                 </xsl:if>
@@ -2167,15 +2108,6 @@
                     </xsl:when>
                     <xsl:when test="(myObj:Getlinenumflag()='1')">
                         <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','/p','&gt;')"/>
-                        <!--<xsl:call-template name="CloseLevel">
-                            <xsl:with-param name="CurrentLevel" select="-1"/>
-                            <xsl:with-param name="verfoot" select="$VERSION"/>
-                            <xsl:with-param name="characterStyle" select="$charparahandlerStyle"/>
-                            <xsl:with-param name="sOperators" select="$sOperators"/>
-                            <xsl:with-param name="sMinuses" select="$sMinuses"/>
-                            <xsl:with-param name="sNumbers" select="$sNumbers"/>
-                            <xsl:with-param name="sZeros" select="$sZeros"/>
-                        </xsl:call-template>-->
                         <line>
                             <linenum>
                                 <xsl:call-template name="CustomCharStyle">
@@ -2210,7 +2142,7 @@
         <xsl:if test="not(myObj:HasCharacterStyle($styleTag))">
             <xsl:if test="myObj:PushCharacterStyle($styleTag)" />
             <xsl:value-of disable-output-escaping="yes"
-						  select="concat('&lt;', $styleTag, ' ', $attributes, '&gt;')"/>
+						  select="concat('&lt;', $styleTag, ' ', normalize-space($attributes), '&gt;')"/>
         </xsl:if>
     </xsl:template>
     <!-- template to close a style tag (and its children if needed recursively) -->
@@ -2234,14 +2166,38 @@
             <xsl:call-template name="CloseAllStyleTag" />
         </xsl:if>
     </xsl:template>
-    <!--Template for different inbuilt character styles applied on a block of letter (w:r)
-    Change to be made : 
-     - Merge emphasis/strong block : use a flag system to create start and closing tag for text decoration -->
+    
+	<!--Template for different inbuilt character styles applied on a block of letter (w:r) -->
     <xsl:template name="CustomCharStyle">
         <xsl:param name="characterStyle"/>
 		<xsl:param name="attributes" select="''" /> <!-- To handle hyperlinks --> 
         <xsl:param name="txt"/>
-        <!-- Compute character group status -->
+		<!-- Group of Bidirectionnal text -->
+		<xsl:variable name="isBidirectionnal" select="(../w:pPr/w:bidi) or w:rPr/w:rtl or (w:rPr/w:lang/@w:bidi)"/>
+		<xsl:variable name="bdoLang">
+			<xsl:call-template name="GetBdoLanguages">
+				<xsl:with-param name="runner" select="."/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="langChanged">
+			<xsl:choose>
+				<xsl:when test="preceding-sibling::w:r[1]">
+					<xsl:variable name="previousBdo">
+						<xsl:call-template name="GetBdoLanguages">
+							<xsl:with-param name="runner" select="preceding-sibling::w:r[1]"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<xsl:value-of select="$previousBdo = $bdoLang"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="false()"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<!-- Check if bidirectionnal language has changed, and close previous bdo if so  -->
+		
+
+		<!-- Compute character group status -->
         <!-- Group of bold = strong characters -->
         <xsl:variable name="isStrong" select="w:rPr/w:b or w:rPr/w:bCs or w:rPr/w:rStyle[@w:val='Strong']"/>
         <!-- Group of italic = em characters -->
@@ -2285,10 +2241,22 @@
                 <xsl:with-param name="styleTag" select="'sub'"/>
             </xsl:call-template>
         </xsl:if>
+		<!-- Close BDO element if not bidirectionnal anymore or lang has changed-->
+		<xsl:if test="not($isBidirectionnal) or $langChanged">
+			<xsl:call-template name="CloseStyleTag">
+				<xsl:with-param name="styleTag" select="'bdo'"/>
+			</xsl:call-template>
+		</xsl:if>
         <xsl:choose>
-            <!-- If group is not a notereference and has one of strong|em|sub|sup status -->
-            <xsl:when test="$isStrong or $isEmp or $isSuperscript or $isSubscript and not($isNote)">
+            <!-- If group is not a notereference and has one of strong|em|sub|sup|a|bdo status -->
+            <xsl:when test="$isBidirectionnal or $isHyperlink or $isStrong or $isEmp or $isSuperscript or $isSubscript and not($isNote)">
                 <!-- if not already in the style stack, Open new style tag and add it to the stack -->
+				<xsl:if test="$isBidirectionnal">
+					<xsl:call-template name="OpenStyleTagIfNotOpened">
+						<xsl:with-param name="styleTag" select="'bdo'"/>
+						<xsl:with-param name="attributes">dir="rtl" xml:lang="<xsl:value-of select="$bdoLang"/>"</xsl:with-param>
+					</xsl:call-template>
+				</xsl:if>
                 <xsl:if test="$isSubscript">
                     <xsl:call-template name="OpenStyleTagIfNotOpened">
                         <xsl:with-param name="styleTag" select="'sub'"/>
@@ -2321,6 +2289,9 @@
                 </xsl:call-template>
                 <!-- Close style tag if no run with text is found afterward in the paragraph tag -->
                 <xsl:if test="not(following-sibling::w:r/w:t)">
+					<xsl:call-template name="CloseStyleTag">
+						<xsl:with-param name="styleTag" select="'a'"/>
+					</xsl:call-template>
                     <xsl:call-template name="CloseStyleTag">
                         <xsl:with-param name="styleTag" select="'em'"/>
                     </xsl:call-template>
@@ -2333,6 +2304,9 @@
                     <xsl:call-template name="CloseStyleTag">
                         <xsl:with-param name="styleTag" select="'sub'"/>
                     </xsl:call-template>
+					<xsl:call-template name="CloseStyleTag">
+						<xsl:with-param name="styleTag" select="'bdo'"/>
+					</xsl:call-template>
                 </xsl:if>
             </xsl:when>
             <!--Checking for WordDAISY custom character style-->
@@ -3595,7 +3569,9 @@
                         <xsl:if test="(w:pPr/w:bidi) or (w:r/w:rPr/w:rtl)">
                             <!--Variable holds the value which indicates that the image is bidirectionally oriented-->
                             <xsl:variable name="definitionlistBd">
-                                <xsl:call-template name="BdoRtlLanguages"/>
+								<xsl:call-template name="GetBdoLanguages">
+									<xsl:with-param name="runner" select="."/>
+								</xsl:call-template>
                             </xsl:variable>
                             <xsl:variable name="quote">"</xsl:variable>
                             <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','bdo ','dir= ',$quote,'rtl',$quote,' xml:lang=',$quote,$definitionlistBd,$quote,'&gt;')"/>
@@ -3745,7 +3721,9 @@
                         <xsl:if test="(w:pPr/w:bidi) or (w:r/w:rPr/w:rtl)">
                             <!--Variable holds the value which indicates that the image is bidirectionally oriented-->
                             <xsl:variable name="definitionlistBd">
-                                <xsl:call-template name="BdoRtlLanguages"/>
+								<xsl:call-template name="GetBdoLanguages">
+									<xsl:with-param name="runner" select="."/>
+								</xsl:call-template>
                             </xsl:variable>
                             <xsl:variable name="quote">"</xsl:variable>
                             <xsl:value-of disable-output-escaping="yes" select="concat('&lt;','bdo ','dir= ',$quote,'rtl',$quote,' xml:lang=',$quote,$definitionlistBd,$quote,'&gt;')"/>
diff --git a/Common/DaisyConverterLib/resources/xslts/Common3.xsl b/Common/DaisyConverterLib/resources/xslts/Common3.xsl
index ab84caa..86bbfdf 100644
--- a/Common/DaisyConverterLib/resources/xslts/Common3.xsl
+++ b/Common/DaisyConverterLib/resources/xslts/Common3.xsl
@@ -2605,130 +2605,58 @@
             </xsl:when>
         </xsl:choose>
     </xsl:template>
-    <!--Template for taking language for bdo Tag-->
-    <xsl:template name="BdoLanguages">
-        <xsl:message terminate="no">debug in BdoLanguages</xsl:message>
-        <xsl:variable name="quote">"</xsl:variable>
-        <xsl:variable name="count_lang">
-            <xsl:for-each select="../../w:r[1]/w:rPr/w:lang">
-                <xsl:value-of select="count(@*)"/>
-            </xsl:for-each>
-        </xsl:variable>
+	
+	<xsl:template name="GetBdoLanguages">
+		<xsl:param name="runner"/>
+        <xsl:message terminate="no">debug in GetBdoLanguages</xsl:message>
         <xsl:choose>
-            <xsl:when test="../../w:r/w:rPr/w:rFonts/@w:hint='cs'">
+			<!-- Complex Script Font -->
+            <xsl:when test="$runner/w:rPr/w:rFonts/@w:hint='cs'">
                 <xsl:choose>
-                    <xsl:when test="../../w:r/w:rPr/w:lang/@w:bidi">
-                        <xsl:value-of select="../../w:r/w:rPr/w:lang/@w:bidi"/>
+                    <xsl:when test="$runner/w:rPr/w:lang/@w:bidi">
+                        <xsl:value-of select="$runner/w:rPr/w:lang/@w:bidi"/>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:value-of select="$doclangbidi"/>
                     </xsl:otherwise>
                 </xsl:choose>
             </xsl:when>
-            <xsl:when test="../../w:r/w:rPr/w:rFonts/@w:hint='eastAsia'">
+			<!-- East Asia Font -->
+            <xsl:when test="$runner/w:rPr/w:rFonts/@w:hint='eastAsia'">
                 <xsl:choose>
-                    <xsl:when test="../../w:r/w:rPr/w:lang/@w:eastAsia">
-                        <xsl:value-of select="../../w:r/w:rPr/w:lang/@w:eastAsia"/>
+                    <xsl:when test="$runner/w:rPr/w:lang/@w:eastAsia">
+                        <xsl:value-of select="$runner/w:rPr/w:lang/@w:eastAsia"/>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:value-of select="$doclangeastAsia"/>
                     </xsl:otherwise>
                 </xsl:choose>
             </xsl:when>
+			<!-- Default Font -->
             <xsl:otherwise>
-                <xsl:choose>
-                    <xsl:when test="$count_lang&gt;1">
-                        <xsl:choose>
-                            <xsl:when test="../../w:r/w:rPr/w:lang/@w:val">
-                                <xsl:value-of select="../../w:r/w:rPr/w:lang/@w:val"/>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:value-of select="$doclang"/>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:when>
-                    <xsl:when test="$count_lang=1">
-                        <xsl:choose>
-                            <xsl:when test="../../w:r/w:rPr/w:lang/@w:val">
-                                <xsl:value-of select="../../w:r/w:rPr/w:lang/@w:val"/>
-                            </xsl:when>
-                            <xsl:when test="../../w:r/w:rPr/w:lang/@w:bidi">
-                                <xsl:value-of select="../../w:r/w:rPr/w:lang/@w:bidi"/>
-                            </xsl:when>
-                            <xsl:when test="../../w:r/w:rPr/w:lang/@w:eastAsia">
-                                <xsl:value-of select="../../w:r/w:rPr/w:lang/@w:eastAsia"/>
-                            </xsl:when>
-                        </xsl:choose>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="$doclang"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <!--Template for taking language for bdo Tag-->
-    <xsl:template name="BdoRtlLanguages">
-        <xsl:message terminate="no">debug in BdoRtlLanguages</xsl:message>
-        <xsl:variable name="quote">"</xsl:variable>
-        <xsl:variable name="count_lang">
-            <xsl:for-each select="../w:r[1]/w:rPr/w:lang">
-                <xsl:value-of select="count(@*)"/>
-            </xsl:for-each>
-        </xsl:variable>
-        <xsl:choose>
-            <xsl:when test="w:rPr/w:rFonts/@w:hint='cs'">
-                <xsl:choose>
-                    <xsl:when test="w:rPr/w:lang/@w:bidi">
-                        <xsl:value-of select="w:rPr/w:lang/@w:bidi"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="$doclangbidi"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </xsl:when>
-            <xsl:when test="w:rPr/w:rFonts/@w:hint='eastAsia'">
-                <xsl:choose>
-                    <xsl:when test="w:rPr/w:lang/@w:eastAsia">
-                        <xsl:value-of select="w:rPr/w:lang/@w:eastAsia"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="$doclangeastAsia"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:choose>
-                    <xsl:when test="$count_lang&gt;1">
-                        <xsl:choose>
-                            <xsl:when test="w:rPr/w:lang/@w:val">
-                                <xsl:value-of select="w:rPr/w:lang/@w:val"/>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:value-of select="$doclang"/>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:when>
-                    <xsl:when test="$count_lang=1">
-                        <xsl:choose>
-                            <xsl:when test="w:rPr/w:lang/@w:val">
-                                <xsl:value-of select="w:rPr/w:lang/@w:val"/>
-                            </xsl:when>
-                            <xsl:when test="w:rPr/w:lang/@w:bidi">
-                                <xsl:value-of select="w:rPr/w:lang/@w:bidi"/>
-                            </xsl:when>
-                            <xsl:when test="w:rPr/w:lang/@w:eastAsia">
-                                <xsl:value-of select="w:rPr/w:lang/@w:eastAsia"/>
-                            </xsl:when>
-                        </xsl:choose>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="$doclang"/>
-                    </xsl:otherwise>
-                </xsl:choose>
+				<xsl:choose>
+					<!-- A bidirectionnal lang is set -->
+					<xsl:when test="$runner/w:rPr/w:lang/@w:bidi">
+						<xsl:value-of select="$runner/w:rPr/w:lang/@w:bidi"/>
+					</xsl:when>
+					<!-- An east asia lang is set -->
+					<xsl:when test="$runner/w:rPr/w:lang/@w:eastAsia">
+						<xsl:value-of select="$runner/w:rPr/w:lang/@w:eastAsia"/>
+					</xsl:when>
+					<!-- An alternative lang (but no bidi or east asia) is set -->
+					<xsl:when test="$runner/w:rPr/w:lang/@w:val">
+						<xsl:value-of select="$runner/w:rPr/w:lang/@w:val"/>
+					</xsl:when>
+					<!-- No lang set, return default doc lang -->
+					<xsl:otherwise>
+						<xsl:value-of select="$doclang"/>
+					</xsl:otherwise>
+				</xsl:choose>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
+	
+   
     <xsl:template name="TempCharacterStyle">
         <xsl:param name="characterStyle"/>
         <xsl:message terminate="no">debug in TempCharacterStyle</xsl:message>
diff --git a/Common/DaisyConverterLib/resources/xslts/oox2Daisy.xsl b/Common/DaisyConverterLib/resources/xslts/oox2Daisy.xsl
index 0b922c0..daead21 100644
--- a/Common/DaisyConverterLib/resources/xslts/oox2Daisy.xsl
+++ b/Common/DaisyConverterLib/resources/xslts/oox2Daisy.xsl
@@ -315,63 +315,6 @@
                 <xsl:if test="not($MasterSub='Yes')">
                     <xsl:call-template name="CheckPageStyles" />
                 </xsl:if>
-                <!-- DB: when document contains any matter style then output xml should conain the same front, body and rear matter content
-                            otherwise front matter will contain only title and author attributes, all document content should be body of the output xml-->
-                <!--<xsl:choose>
-                    <xsl:when test="myObj:IsAnyPageStyleApplied()='true'">
-                        <frontmatter>
-                            <doctitle></doctitle>
-                            <xsl:call-template name ="Matter">
-                                <xsl:with-param name="prmTrack" select ="$prmTRACK"/>
-                                <xsl:with-param name="version" select ="$Version"/>
-                                <xsl:with-param name="custom" select="$Custom"/>
-                                <xsl:with-param name="masterSub" select="$MasterSub"/>
-                                <xsl:with-param name="sOperators" select="$sOperators"/>
-                                <xsl:with-param name="sMinuses" select="$sMinuses"/>
-                                <xsl:with-param name="sNumbers" select="$sNumbers"/>
-                                <xsl:with-param name="sZeros" select="$sZeros"/>
-                                <xsl:with-param name="imgOption" select="$ImageSizeOption"/>
-                                <xsl:with-param name="dpi" select="$DPI"/>
-                                <xsl:with-param name="charStyles" select="$CharacterStyles"/>
-                                <xsl:with-param name="matterType" select="'Frontmatter'" />
-                            </xsl:call-template>
-                        </frontmatter>
-                        <bodymatter id="bodymatter_0001">
-                            <xsl:call-template name ="Matter">
-                                <xsl:with-param name="prmTrack" select ="$prmTRACK"/>
-                                <xsl:with-param name="version" select ="$Version"/>
-                                <xsl:with-param name="custom" select="$Custom"/>
-                                <xsl:with-param name="masterSub" select="$MasterSub"/>
-                                <xsl:with-param name="sOperators" select="$sOperators"/>
-                                <xsl:with-param name="sMinuses" select="$sMinuses"/>
-                                <xsl:with-param name="sNumbers" select="$sNumbers"/>
-                                <xsl:with-param name="sZeros" select="$sZeros"/>
-                                <xsl:with-param name="imgOption" select="$ImageSizeOption"/>
-                                <xsl:with-param name="dpi" select="$DPI"/>
-                                <xsl:with-param name="charStyles" select="$CharacterStyles"/>
-                                <xsl:with-param name="matterType" select="'Bodymatter'" />
-                            </xsl:call-template>
-                        </bodymatter>
-                        <xsl:if test="myObj:IsRearmatterStyleApplied()='true'">
-                        <rearmatter>
-                            <xsl:call-template name ="Matter">
-                                <xsl:with-param name="prmTrack" select ="$prmTRACK"/>
-                                <xsl:with-param name="version" select ="$Version"/>
-                                <xsl:with-param name="custom" select="$Custom"/>
-                                <xsl:with-param name="masterSub" select="$MasterSub"/>
-                                <xsl:with-param name="sOperators" select="$sOperators"/>
-                                <xsl:with-param name="sMinuses" select="$sMinuses"/>
-                                <xsl:with-param name="sNumbers" select="$sNumbers"/>
-                                <xsl:with-param name="sZeros" select="$sZeros"/>
-                                <xsl:with-param name="imgOption" select="$ImageSizeOption"/>
-                                <xsl:with-param name="dpi" select="$DPI"/>
-                                <xsl:with-param name="charStyles" select="$CharacterStyles"/>
-                                <xsl:with-param name="matterType" select="'Rearmatter'" />
-                            </xsl:call-template>
-                        </rearmatter>
-                        </xsl:if>
-                    </xsl:when>
-                    <xsl:otherwise>-->
 				<xsl:message terminate="no">progress:Starting conversion of <xsl:value-of select="count(document('word/document.xml')//w:body/*)"/> elements</xsl:message>
                 <!-- Calling Frontmatter template and passing parameters Title and Creator for doctitle and docpublisher-->
                 <xsl:call-template name="FrontMatter">