Support for <wers>.

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index c90865e..00f7f0a 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -8,7 +8,7 @@ oauth2
 httplib2 # oauth2 dependency
 python-slugify
 
 httplib2 # oauth2 dependency
 python-slugify
 

-librarian==1.7.6
+librarian==1.8.1

 
 ## Django
 Django==2.2.6
 
 ## Django
 Django==2.2.6

diff --git a/src/redakcja/static/js/wiki/xslt.js b/src/redakcja/static/js/wiki/xslt.js
index 43db29b..1c69352 100644 (file)
--- a/src/redakcja/static/js/wiki/xslt.js
+++ b/src/redakcja/static/js/wiki/xslt.js
@@ -17,7 +17,7 @@ function withStylesheets(code_block, onError)
     if (!xml2htmlStylesheet) {
        $.blockUI({message: 'Ładowanie arkuszy stylów...'});
        $.ajax({
     if (!xml2htmlStylesheet) {
        $.blockUI({message: 'Ładowanie arkuszy stylów...'});
        $.ajax({

-               url: STATIC_URL + 'xsl/wl2html_client.xsl?20171106',
+               url: STATIC_URL + 'xsl/wl2html_client.xsl?2019121801',

                dataType: 'xml',
                timeout: 10000,
                success: function(data) {
                dataType: 'xml',
                timeout: 10000,
                success: function(data) {


@@ -157,7 +157,7 @@ HTMLSerializer.prototype._verseBefore = function(node) {
 }
 
 HTMLSerializer.prototype._nodeIgnored = function(node) {
 }
 
 HTMLSerializer.prototype._nodeIgnored = function(node) {

-    return node.getAttribute('x-node') == 'wers';
+    return node.getAttribute('x-auto-node') == 'true';

 }
 
 HTMLSerializer.prototype._ignoredWithWhitespace = function(node) {
 }
 
 HTMLSerializer.prototype._ignoredWithWhitespace = function(node) {

diff --git a/src/redakcja/static/xsl/wl2html_client.xsl b/src/redakcja/static/xsl/wl2html_client.xsl
index 784acb7..f5a442b 100644 (file)
--- a/src/redakcja/static/xsl/wl2html_client.xsl
+++ b/src/redakcja/static/xsl/wl2html_client.xsl
@@ -586,8 +586,8 @@
         <!-- Possible variants: -->
         <xsl:choose>
             <!-- Simple verse == not wers_ tags anywhere until the ending br -->
         <!-- Possible variants: -->
         <xsl:choose>
             <!-- Simple verse == not wers_ tags anywhere until the ending br -->

-            <xsl:when test="not($verse-content[starts-with(name(), 'wers_')])">
-                <p class="wers" x-node="wers" x-verse="true">
+            <xsl:when test="not($verse-content[starts-with(name(), 'wers')])">
+                <p class="wers" x-node="wers" x-verse="true" x-auto-node="true">

                 <xsl:apply-templates select="$verse-content[local-name(.) != 'br']">
                     <xsl:with-param name="mixed" select="true()" />
                 </xsl:apply-templates>
                 <xsl:apply-templates select="$verse-content[local-name(.) != 'br']">
                     <xsl:with-param name="mixed" select="true()" />
                 </xsl:apply-templates>


@@ -602,7 +602,7 @@
         </xsl:choose>
     </xsl:template>
 
         </xsl:choose>
     </xsl:template>
 

-    <xsl:template match="wers_cd|wers_akap|wers_wciety|wers_do_prawej">
+    <xsl:template match="wers_cd|wers_akap|wers_wciety|wers_do_prawej|wers">

         <xsl:param name="mixed" />
                <!-- <xsl:choose>
                <xsl:when test="ancestor::*[0]/self::strofa"> -->
         <xsl:param name="mixed" />
                <!-- <xsl:choose>
                <xsl:when test="ancestor::*[0]/self::strofa"> -->