avv2word 1.1.26 → 1.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e3a0aa19367cc3c9cbce2081163654b514b08f1dc786386f051fcafad14b55f
-  data.tar.gz: 5d0a2a153783790f67f2944b06a6c2ff64be1b914705e0b86dcde98a5248d1af
+  metadata.gz: d7b613947419d3537c2d70ce72cb83aef9cb9c7c8f09c3666d3e1896d1d734b3
+  data.tar.gz: 0b04120d00edef64f94cd3b6cbb590394ba63f66107feef9856aa34c96763e3a
 SHA512:
-  metadata.gz: df0fe7da1feb17e5fe224dd4549a8257f3a7fc5b4b71d45186575ed7e635c7200903fb9545691e47dbd9b078e98935167b2322173ea146dce2f77943c09ca5d6
-  data.tar.gz: 9ffa5342ce2e963a595a62a56e187990ba06f05cb6a88628c58d0d92344aa2ef490e66d53bbaf3dd92460e306f55303bd44d1cfbc343e88e45a452d59d5a860d
+  metadata.gz: 38513ba5652d1415d3dd32774e0a1bd18fc4d0ececbcf17cf7eeb926110ddd5b980839df245fb3d7809092f10a4c74327750b815f2fa39ee996cbf3d3f8c9a2c
+  data.tar.gz: d2422bbc430d545e1f21f8bedceb2697ac1d761ea4838dd9070f6a3c0cd38ab2e281ec07b3e8eca327b3e5dae7d723776ed9d5d9b6112e61c9d711a72d63b882

data/lib/avv2word/version.rb

@@ -1,3 +1,3 @@
 module Avv2word
-  VERSION = '1.1.26'
+  VERSION = '1.1.27'
 end

data/lib/avv2word/xslt/base.xslt

@@ -416,8 +416,9 @@
     <xsl:param name="line-height" select="@line-height" />
     <xsl:param name="margin-bottom" select="@margin-bottom" />
     <xsl:param name="margin-top" select="@margin-top" />
-    <xsl:param name="text-indent" select="@text-indent" />
-    <xsl:param name="text-hanging" select="@text-hanging" />
+    <xsl:param name="text-indent" select="@data-avv-padding-left" />
+    <xsl:param name="text-hanging" select="@data-avv-hanging" />
+    <xsl:param name="text-first" select="@data-avv-first" />
     <xsl:variable name="alignment">
       <xsl:choose>
         <xsl:when test="contains(concat(' ', $class, ' '), ' center ') or contains(translate(normalize-space($style),' ',''), 'text-align:center')">center</xsl:when>
@@ -435,8 +436,13 @@
     </xsl:variable>
     <xsl:variable name="hanging">
       <xsl:choose>
-        <xsl:when test="string-length(normalize-space($indent)) > 0 and string-length(normalize-space($text-hanging)) > 0"><xsl:value-of select="$text-hanging"/></xsl:when>
-        <xsl:when test="string-length(normalize-space($indent)) > 0">0</xsl:when>
+        <xsl:when test="$text-hanging &gt; 0"><xsl:value-of select="$text-hanging"/></xsl:when>
+        <xsl:otherwise></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="first">
+      <xsl:choose>
+        <xsl:when test="$text-first &gt; 0"><xsl:value-of select="$text-first"/></xsl:when>
         <xsl:otherwise></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
@@ -461,13 +467,41 @@
       <w:pPr>
         <w:spacing w:lineRule="atLeast" w:line="{$height}" w:before="{$top}" w:after="{$bottom}"/>
     <xsl:choose>
-      <xsl:when test="string-length(normalize-space($alignment)) > 0 and string-length(normalize-space($indent)) > 0">
+      <xsl:when test="string-length(normalize-space($alignment)) > 0 and string-length(normalize-space($indent)) > 0 and string-length(normalize-space($hanging)) > 0">
         <w:ind w:left="{$indent}" w:hanging="{$hanging}"/>
         <w:jc w:val="{$alignment}"/>
       </xsl:when>
-      <xsl:when test="string-length(normalize-space($indent)) > 0">
+      <xsl:when test="string-length(normalize-space($alignment)) > 0 and string-length(normalize-space($indent)) > 0 and string-length(normalize-space($first)) > 0">
+        <w:ind w:left="{$indent}" w:firstLine="{$first}"/>
+        <w:jc w:val="{$alignment}"/>
+      </xsl:when>
+      <xsl:when test="string-length(normalize-space($indent)) > 0 and string-length(normalize-space($hanging)) > 0">
         <w:ind w:left="{$indent}" w:hanging="{$hanging}"/>
       </xsl:when>
+      <xsl:when test="string-length(normalize-space($indent)) > 0 and string-length(normalize-space($first)) > 0">
+        <w:ind w:left="{$indent}" w:firstLine="{$first}"/>
+      </xsl:when>
+      <xsl:when test="string-length(normalize-space($indent)) > 0 and string-length(normalize-space($alignment)) > 0">
+        <w:ind w:left="{$indent}" w:firstLine="0"/>
+        <w:jc w:val="{$alignment}"/>
+      </xsl:when>
+      <xsl:when test="string-length(normalize-space($hanging)) > 0 and string-length(normalize-space($alignment)) > 0">
+        <w:ind w:left="0" w:hanging="{$hanging}"/>
+        <w:jc w:val="{$alignment}"/>
+      </xsl:when>
+      <xsl:when test="string-length(normalize-space($first)) > 0 and string-length(normalize-space($alignment)) > 0">
+        <w:ind w:left="0" w:firstLine="{$first}"/>
+        <w:jc w:val="{$alignment}"/>
+      </xsl:when>
+      <xsl:when test="string-length(normalize-space($indent)) > 0">
+        <w:ind w:left="{$indent}" w:firstLine="0"/>
+      </xsl:when>
+      <xsl:when test="string-length(normalize-space($hanging)) > 0">
+        <w:ind w:left="0" w:hanging="{$hanging}"/>
+      </xsl:when>
+      <xsl:when test="string-length(normalize-space($first)) > 0">
+        <w:ind w:left="0" w:firstLine="{$first}"/>
+      </xsl:when>
       <xsl:when test="string-length(normalize-space($alignment)) > 0">
         <w:jc w:val="{$alignment}"/>
       </xsl:when>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avv2word
 version: !ruby/object:Gem::Version
-  version: 1.1.26
+  version: 1.1.27
 platform: ruby
 authors:
 - Marián Bilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack