Key shortcuts in source editor work as expected, but only with "Alt" key. Support...

[redakcja.git] / platforma / static / xsl / wl2html_client.xsl

diff --git a/platforma/static/xsl/wl2html_client.xsl b/platforma/static/xsl/wl2html_client.xsl
old mode 100755 (executable)
new mode 100644 (file)
index 7a7da8c..a5db5a1
--- a/platforma/static/xsl/wl2html_client.xsl
+++ b/platforma/static/xsl/wl2html_client.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>

 <xsl:stylesheet version="1.0"    
     xmlns="http://www.w3.org/1999/xhtml"    
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:stylesheet version="1.0"    
     xmlns="http://www.w3.org/1999/xhtml"    
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">


@@ -5,11 +6,7 @@
     <!--
         Dokument ten opisuje jednoznaczne przekształcenie WLML 0.1 -> XHTML.
     -->        
     <!--
         Dokument ten opisuje jednoznaczne przekształcenie WLML 0.1 -> XHTML.
     -->        

-    <xsl:output method="html" encoding="utf-8" indent="yes" />
-
-    <xsl:template match="/">
-        <xsl:apply-templates select="chunk|utwor" />
-    </xsl:template>
+    <xsl:output method="html" omit-xml-declaration="yes" encoding="utf-8" indent="no" />

 
     <!--
         Base tag for rendering a fragment of text
 
     <!--
         Base tag for rendering a fragment of text


@@ -25,9 +22,12 @@
     -->
 
     <xsl:template match="utwor">
     -->
 
     <xsl:template match="utwor">

-        <xsl:apply-templates select="child::*[name() = local-name()]">
-            <xsl:with-param name="mixed" select="false()" />
-        </xsl:apply-templates>
+        <div>
+            <xsl:call-template name="standard-attributes" />
+            <xsl:apply-templates select="child::node()">
+                <xsl:with-param name="mixed" select="false()" />
+            </xsl:apply-templates>
+        </div>

     </xsl:template>    
     
     <!-- 
     </xsl:template>    
     
     <!-- 


@@ -42,7 +42,8 @@
 
     <xsl:template match="opowiadanie|powiesc">
         <xsl:param name="mixed" />
 
     <xsl:template match="opowiadanie|powiesc">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -51,7 +52,8 @@
 
     <xsl:template match="liryka_l|liryka_lp">
         <xsl:param name="mixed" />
 
     <xsl:template match="liryka_l|liryka_lp">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -60,7 +62,8 @@
 
     <xsl:template match="dramat_wierszowany_l|dramat_wierszowany_lp|dramat_wspolczesny">
         <xsl:param name="mixed" />
 
     <xsl:template match="dramat_wierszowany_l|dramat_wierszowany_lp|dramat_wspolczesny">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -69,7 +72,8 @@
 
     <xsl:template match="wywiad">
         <xsl:param name="mixed" />
 
     <xsl:template match="wywiad">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -92,7 +96,8 @@
     -->
     <xsl:template match="autor_utworu">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="autor_utworu">
         <xsl:param name="mixed" />

-        <h2 class="{name()}" x-editable="true" x-node="{name()}">
+        <h2 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -110,7 +115,8 @@
     -->
     <xsl:template match="nazwa_utworu">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="nazwa_utworu">
         <xsl:param name="mixed" />

-        <h1 class="{name()}" x-editable="true" x-node="{name()}">
+        <h1 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -133,7 +139,8 @@
     -->
     <xsl:template match="dzielo_nadrzedne">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="dzielo_nadrzedne">
         <xsl:param name="mixed" />

-        <h2 class="{name()}" x-editable="true" x-node="{name()}">
+        <h2 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -157,7 +164,8 @@
     -->
     <xsl:template match="podtytul">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="podtytul">
         <xsl:param name="mixed" />

-        <h3 class="{name()}" x-editable="true" x-node="{name()}">
+        <h3 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -173,7 +181,8 @@
 
     <xsl:template match="nota">
         <xsl:param name="mixed" />
 
     <xsl:template match="nota">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -186,7 +195,8 @@
     -->
     <xsl:template match="dedykacja">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="dedykacja">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -199,16 +209,18 @@
     -->
     <xsl:template match="motto">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="motto">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
             <xsl:apply-templates select="child::node()">

-                <xsl:with-param name="mixed" select="false()" />
+                <xsl:with-param name="mixed" select="true()" />

             </xsl:apply-templates>
         </div>
     </xsl:template>
 
     <xsl:template match="motto_podpis">
         <xsl:param name="mixed" />
             </xsl:apply-templates>
         </div>
     </xsl:template>
 
     <xsl:template match="motto_podpis">
         <xsl:param name="mixed" />

-        <p class="{name()}" x-editable="true" x-node="{name()}">
+        <p x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -224,7 +236,8 @@
     -->
     <xsl:template match="lista_osob">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="lista_osob">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -233,7 +246,8 @@
 
     <xsl:template match="naglowek_listy">
         <xsl:param name="mixed" />
 
     <xsl:template match="naglowek_listy">
         <xsl:param name="mixed" />

-        <p class="{name()}" x-editable="true" x-node="{name()}">
+        <p x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -243,7 +257,24 @@
 
     <xsl:template match="lista_osoba">
         <xsl:param name="mixed" />
 
     <xsl:template match="lista_osoba">
         <xsl:param name="mixed" />

-        <p class="{name()}" x-editable="true" x-node="{name()}">
+        <p x-editable="true">
+            <xsl:call-template name="standard-attributes" />
+            <xsl:call-template name="context-menu" />
+            <xsl:apply-templates select="child::node()">
+                <xsl:with-param name="mixed" select="true()" />
+            </xsl:apply-templates>
+        </p>
+    </xsl:template>
+
+    <!--  Tagi obejmujące inne komentarze wprowadzające
+        przed tekstem dramatu (składane razem z listą osób):
+
+        <miejsce_czas> komentarze-wprowadzające </miejsce_czas>
+    -->
+    <xsl:template match="miejsce_czas">
+        <xsl:param name="mixed" />
+        <p x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -264,7 +295,8 @@
     -->
     <xsl:template match="naglowek_czesc">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="naglowek_czesc">
         <xsl:param name="mixed" />

-        <h2 class="{name()}" x-editable="true" x-node="{name()}">
+        <h2 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -278,7 +310,8 @@
     -->
     <xsl:template match="naglowek_rozdzial">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="naglowek_rozdzial">
         <xsl:param name="mixed" />

-        <h3 class="{name()}" x-editable="true" x-node="{name()}">
+        <h3 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -292,7 +325,8 @@
     -->
     <xsl:template match="naglowek_podrozdzial">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="naglowek_podrozdzial">
         <xsl:param name="mixed" />

-        <h4 class="{name()}" x-editable="true" x-node="{name()}">
+        <h4 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -310,7 +344,8 @@
 
     <xsl:template match="srodtytul">
         <xsl:param name="mixed" />
 
     <xsl:template match="srodtytul">
         <xsl:param name="mixed" />

-        <h2 class="{name()}" x-editable="true" x-node="{name()}">
+        <h2 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -320,7 +355,8 @@
 
     <xsl:template match="naglowek_akt">
         <xsl:param name="mixed" />
 
     <xsl:template match="naglowek_akt">
         <xsl:param name="mixed" />

-        <h2 class="{name()}" x-editable="true" x-node="{name()}">
+        <h2 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -335,7 +371,8 @@
 
     <xsl:template match="naglowek_scena">
         <xsl:param name="mixed" />
 
     <xsl:template match="naglowek_scena">
         <xsl:param name="mixed" />

-        <h3 class="{name()}" x-editable="true" x-node="{name()}">
+        <h3 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -345,7 +382,8 @@
     
     <xsl:template match="naglowek_osoba">
         <xsl:param name="mixed" />
     
     <xsl:template match="naglowek_osoba">
         <xsl:param name="mixed" />

-        <h4 class="{name()}" x-editable="true" x-node="{name()}">
+        <h4 x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -361,7 +399,8 @@
     
     <xsl:template match="dlugi_cytat">
         <xsl:param name="mixed" />
     
     <xsl:template match="dlugi_cytat">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -370,7 +409,8 @@
     
     <xsl:template match="poezja_cyt">
         <xsl:param name="mixed" />
     
     <xsl:template match="poezja_cyt">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -379,7 +419,8 @@
 
     <xsl:template match="kwestia">
         <xsl:param name="mixed" />
 
     <xsl:template match="kwestia">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -388,16 +429,18 @@
 
     <xsl:template match="didaskalia">
         <xsl:param name="mixed" />
 
     <xsl:template match="didaskalia">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
             <xsl:apply-templates select="child::node()">

-                <xsl:with-param name="mixed" select="false()" />
+                <xsl:with-param name="mixed" select="true()" />

             </xsl:apply-templates>
         </div>
     </xsl:template>
 
     <xsl:template match="wywiad_pyt">
         <xsl:param name="mixed" />
             </xsl:apply-templates>
         </div>
     </xsl:template>
 
     <xsl:template match="wywiad_pyt">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -406,7 +449,8 @@
 
     <xsl:template match="wywiad_odp">
         <xsl:param name="mixed" />
 
     <xsl:template match="wywiad_odp">
         <xsl:param name="mixed" />

-        <div class="{name()}" x-node="{name()}">
+        <div>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>


@@ -421,7 +465,8 @@
 
     <xsl:template match="akap">
         <xsl:param name="mixed" />
 
     <xsl:template match="akap">
         <xsl:param name="mixed" />

-        <p class="{name()}" x-editable="true" x-node="{name()}">
+        <p x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -431,7 +476,8 @@
 
     <xsl:template match="akap_cd">
         <xsl:param name="mixed" />
 
     <xsl:template match="akap_cd">
         <xsl:param name="mixed" />

-        <p class="{name()}" x-editable="true" x-node="{name()}">
+        <p x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -441,7 +487,8 @@
 
     <xsl:template match="akap_dialog">
         <xsl:param name="mixed" />
 
     <xsl:template match="akap_dialog">
         <xsl:param name="mixed" />

-        <p class="{name()}" x-editable="true" x-node="{name()}">
+        <p x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             <xsl:call-template name="context-menu" />
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />


@@ -455,8 +502,10 @@
         ********
     -->
     <xsl:template match="strofa">
         ********
     -->
     <xsl:template match="strofa">

-        <div class="{name()}" x-editable="true" x-node="{name()}">
+        <div x-editable="true">
+            <xsl:call-template name="standard-attributes" />

             <xsl:call-template name="context-menu" />
             <xsl:call-template name="context-menu" />

+         

             <xsl:choose>
                 <xsl:when test="count(br) > 0">
                     <xsl:variable name="first-verse" select="br[1]/preceding-sibling::node()" />                    
             <xsl:choose>
                 <xsl:when test="count(br) > 0">
                     <xsl:variable name="first-verse" select="br[1]/preceding-sibling::node()" />                    


@@ -485,42 +534,45 @@
     <xsl:template name="verse">
         <!-- the verse contents including the last br (if any) -->
         <xsl:param name="verse-content" />
     <xsl:template name="verse">
         <!-- the verse contents including the last br (if any) -->
         <xsl:param name="verse-content" />

-        

         <xsl:variable name="first-tag-name" select="name($verse-content/self::*)" />
         <!-- name of text nodes is '' == false -->
 
         <xsl:variable name="first-tag-name" select="name($verse-content/self::*)" />
         <!-- name of text nodes is '' == false -->
 

+        <!-- THIS IS A HORROR!!! -->
+        <!-- Possible variants: -->

         <xsl:choose>
         <xsl:choose>

-            <xsl:when test="starts-with($first-tag-name, 'wers')">
-                <p class="{$first-tag-name}" x-node="{$first-tag-name}">
-                <xsl:for-each select="$verse-content[name(.) != 'br']">
-                <xsl:apply-templates select=".">
+            <!-- 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:apply-templates select="$verse-content[local-name(.) != 'br']">

                     <xsl:with-param name="mixed" select="true()" />
                 </xsl:apply-templates>
                     <xsl:with-param name="mixed" select="true()" />
                 </xsl:apply-templates>

-                </xsl:for-each>

                 </p>
             </xsl:when>
 
             <xsl:otherwise>
                 </p>
             </xsl:when>
 
             <xsl:otherwise>

-                <p class="wers" x-node="wers">
-                <xsl:for-each select="$verse-content[name(.) != 'br']">
-                    <xsl:apply-templates select=".">
-                    <xsl:with-param name="mixed" select="true()" />
-                    </xsl:apply-templates>
-                </xsl:for-each>
-                </p>                
-            </xsl:otherwise>          
-            
-        </xsl:choose>       
+            <xsl:apply-templates select="$verse-content[local-name(.) != 'br']">
+                <xsl:with-param name="mixed" select="false()" />
+            </xsl:apply-templates>
+            </xsl:otherwise>
+        </xsl:choose>

     </xsl:template>
 
     <xsl:template match="wers_cd|wers_akap|wers_wciety">
         <xsl:param name="mixed" />
     </xsl:template>
 
     <xsl:template match="wers_cd|wers_akap|wers_wciety">
         <xsl:param name="mixed" />

-        <xsl:call-template name="copy-attributes" />
-        <xsl:apply-templates select="child::node()">
-                <xsl:with-param name="mixed" select="true()" />
-            </xsl:apply-templates>
+               <!-- <xsl:choose>
+               <xsl:when test="ancestor::*[0]/self::strofa"> -->
+               <p x-verse="true">
+               <xsl:call-template name="standard-attributes" />
+               <xsl:apply-templates select="child::node()">
+                       <xsl:with-param name="mixed" select="true()" />
+               </xsl:apply-templates>
+               </p>
+               <!-- </xsl:when> 
+               <xsl:choose> -->

     </xsl:template>
     </xsl:template>

-    
+
+    <xsl:template match="br"><xsl:text>/</xsl:text></xsl:template>
+

 
     <!--
         *************
 
     <!--
         *************


@@ -536,7 +588,8 @@
     -->
     <xsl:template match="tytul_dziela">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="tytul_dziela">
         <xsl:param name="mixed" />

-        <em class="{name()}" x-node="{name()}">
+        <em>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             </xsl:apply-templates>


@@ -545,7 +598,8 @@
 
     <xsl:template match="wyroznienie|slowo_obce|mat|didask_tekst|osoba|wyp_osoba|www">
         <xsl:param name="mixed" />
 
     <xsl:template match="wyroznienie|slowo_obce|mat|didask_tekst|osoba|wyp_osoba|www">
         <xsl:param name="mixed" />

-        <em class="{name()}" x-node="{name()}">
+        <em>
+            <xsl:call-template name="standard-attributes" />

             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             </xsl:apply-templates>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             </xsl:apply-templates>


@@ -559,22 +613,22 @@
     -->
     <xsl:template match="sekcja_swiatlo">
         <xsl:param name="mixed" />
     -->
     <xsl:template match="sekcja_swiatlo">
         <xsl:param name="mixed" />

-        <br class="{name()}" x-node="{name()}" />
+        <br><xsl:call-template name="standard-attributes" /></br>

     </xsl:template>
 
     <xsl:template match="sekcja_asterysk">
         <xsl:param name="mixed" />
     </xsl:template>
 
     <xsl:template match="sekcja_asterysk">
         <xsl:param name="mixed" />

-        <hr class="{name()}" x-node="{name()}" />
+        <hr><xsl:call-template name="standard-attributes" /></hr>

     </xsl:template>
 
     <xsl:template match="separator_linia">
         <xsl:param name="mixed" />
     </xsl:template>
 
     <xsl:template match="separator_linia">
         <xsl:param name="mixed" />

-        <hr class="{name()}" x-node="{name()}" />
+        <hr><xsl:call-template name="standard-attributes" /></hr>

     </xsl:template>
 
     <xsl:template match="zastepnik_wersu">
         <xsl:param name="mixed" />
     </xsl:template>
 
     <xsl:template match="zastepnik_wersu">
         <xsl:param name="mixed" />

-        <hr class="{name()}" x-node="{name()}" />
+        <hr><xsl:call-template name="standard-attributes" /></hr>

     </xsl:template>
 
     <!--
     </xsl:template>
 
     <!--


@@ -587,12 +641,15 @@
         Przypisy i motywy
     -->
     <xsl:template match="pr|pa|pe|pt">       
         Przypisy i motywy
     -->
     <xsl:template match="pr|pa|pe|pt">       

-        <span class="annotation-inline-box" x-node="{name()}" x-editable="true">
+        <span x-editable="true" x-common="common">
+            <xsl:call-template name="standard-attributes">
+                <xsl:with-param name="extra-class" select="'annotation-inline-box'" />
+            </xsl:call-template>

             <a name="anchor-{generate-id(.)}" />
             <!-- the link to the non-inline version -->
             <a href="#annotation-{generate-id(.)}" class="annotation"></a>
             <!-- inline contents -->
             <a name="anchor-{generate-id(.)}" />
             <!-- the link to the non-inline version -->
             <a href="#annotation-{generate-id(.)}" class="annotation"></a>
             <!-- inline contents -->

-            <span x-annotation-box="true">
+            <span x-annotation-box="true" x-pass-thru="true">

                 <xsl:call-template name="context-menu" />
                 <xsl:apply-templates select="node()">
                     <xsl:with-param name="mixed" select="true()" />
                 <xsl:call-template name="context-menu" />
                 <xsl:apply-templates select="node()">
                     <xsl:with-param name="mixed" select="true()" />


@@ -602,21 +659,40 @@
     </xsl:template>
 
     <xsl:template match="begin">        
     </xsl:template>
 
     <xsl:template match="begin">        

-        <span class="theme-begin" x-node="begin">
-            <xsl:call-template name="copy-attributes" />
+        <span>
+            <xsl:call-template name="standard-attributes" />
+            <xsl:attribute name="theme-class">
+                <xsl:value-of select="substring-after(@id, 'b')" />
+            </xsl:attribute>
+        </span>
+    </xsl:template>
+
+    <xsl:template match="extra|uwaga">
+        <span x-common="common">
+            <xsl:call-template name="standard-attributes" />
+            <xsl:apply-templates select="child::node()">
+                <xsl:with-param name="mixed" select="true()" />
+            </xsl:apply-templates>

         </span>
     </xsl:template>
 
     <xsl:template match="motyw">
         </span>
     </xsl:template>
 
     <xsl:template match="motyw">

-        <span class="theme-ref" x-node="motyw">
-            <xsl:call-template name="copy-attributes" />
-            <xsl:value-of select="." />
+        <span x-editable="true" x-common="common">
+            <xsl:call-template name="standard-attributes" />
+            <xsl:attribute name="theme-class">
+                <xsl:value-of select="substring-after(@id, 'm')" />
+            </xsl:attribute>
+            <xsl:call-template name="context-menu" />
+            <span x-pass-thru="true" class="theme-text-list"><xsl:value-of select=".|node()" /></span>

         </span>
     </xsl:template>
 
     <xsl:template match="end">
         </span>
     </xsl:template>
 
     <xsl:template match="end">

-        <span class="theme-end" x-node="end">
-            <xsl:call-template name="copy-attributes" />
+        <span>
+            <xsl:call-template name="standard-attributes" />
+            <xsl:attribute name="theme-class">
+                <xsl:value-of select="substring-after(@id, 'e')" />
+            </xsl:attribute>

         </span>
     </xsl:template>
 
         </span>
     </xsl:template>
 


@@ -628,36 +704,85 @@
     -->
 
     <xsl:template match="text()">
     -->
 
     <xsl:template match="text()">

+        <!-- <xsl:value-of select="." /> -->

         <xsl:param name="mixed" />
         <xsl:choose>
             <xsl:when test="normalize-space(.) = ''" />
             <xsl:when test="not($mixed)">
         <xsl:param name="mixed" />
         <xsl:choose>
             <xsl:when test="normalize-space(.) = ''" />
             <xsl:when test="not($mixed)">

-                <span x-node="text" class="out-of-flow-text"
-                    x-content="{normalize-space(.)}"></span>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="." />
-            </xsl:otherwise>
+               <span x-node="out-of-flow-text" class="out-of-flow-text" x-editable="true">
+                       <xsl:value-of select="." />
+                               </span>
+                       </xsl:when>
+            <xsl:otherwise><xsl:value-of select="." /></xsl:otherwise>

         </xsl:choose>
     </xsl:template>
 
         </xsl:choose>
     </xsl:template>
 

-    <xsl:template match="*">
-        <div x-node="error" x-content="{name()}" />
+    <xsl:template match="comment()">
+        <xsl:comment><xsl:value-of select="." /></xsl:comment>

     </xsl:template>
 
     </xsl:template>
 

-    <xsl:template name="context-menu">
-        <span class="default-menu context-menu">
-            <span class="edit-button">Edit</span>
+    <xsl:template match="*[name() != local-name()]">
+        <span>
+            <xsl:call-template name="standard-attributes" />
+            <xsl:apply-templates select="child::node()">
+                <xsl:with-param name="mixed" select="true()" />
+            </xsl:apply-templates>

         </span>
         </span>

-        <span class="edit-menu context-menu">
-            <span class="accept-button">OK</span>
-            <span class="reject-button">Cancel</span>
+    </xsl:template>
+       
+       <!-- 
+               Earlier versions of html2wl introduced a BUG, that 'causes "out-of-flow-text" tag to appear.
+               Instead of marking it as "unknown", just pass thru it
+       -->
+       <xsl:template match="out-of-flow-text">
+               <xsl:param name="mixed" />
+               <xsl:apply-templates select="child::node()">
+                <xsl:with-param name="mixed" select="$mixed" />
+            </xsl:apply-templates>
+       </xsl:template> 
+
+    <xsl:template match="*">
+        <span class="unknown-tag" x-node="{name()}">
+            <xsl:apply-templates select="child::node()">
+                <xsl:with-param name="mixed" select="true()" />
+            </xsl:apply-templates>        

         </span>
     </xsl:template>
 
         </span>
     </xsl:template>
 

-    <xsl:template name="copy-attributes">
+    <xsl:template name="context-menu">
+        <!-- <span class="default-menu context-menu"> -->
+        <!-- <button class="edit-button">Edytuj</button> -->
+            <!-- <span class="delete-button">Delete</span> -->
+        <!-- </span> -->
+        <!-- <span class="edit-menu context-menu">
+            <span class="accept-button">Accept</span>
+            <span class="reject-button">Close</span>
+        </span> -->
+    </xsl:template>
+
+    <xsl:template name="standard-attributes">
+        <xsl:param name="extra-class" />
+        <xsl:attribute name="class"><xsl:value-of select="local-name()" /><xsl:text>&#x0020;</xsl:text><xsl:value-of select="$extra-class" /></xsl:attribute>
+
+        <xsl:attribute name="x-node"><xsl:value-of select="local-name()" /></xsl:attribute>
+
+        <xsl:if test="local-name() != name()">
+            <xsl:attribute name="x-ns"><xsl:value-of select="namespace-uri()" /></xsl:attribute>
+        </xsl:if>
+

         <xsl:for-each select="@*">
         <xsl:for-each select="@*">

-            <xsl:attribute name="x-attrib-{name(.)}"><xsl:value-of select="."/></xsl:attribute>
+            <xsl:variable name="id" select="generate-id()" />
+            <xsl:attribute name="x-attr-value-{$id}"><xsl:value-of select="."/></xsl:attribute>
+            <xsl:attribute name="x-attr-name-{$id}"><xsl:value-of select="local-name()"/></xsl:attribute>
+            <xsl:choose>
+               <xsl:when test="namespace-uri()">
+                <xsl:attribute name="x-attr-ns-{$id}"><xsl:value-of select="namespace-uri()"/></xsl:attribute>
+                               </xsl:when>
+                               <!-- if the element belongs to default namespace and attribut has no namespace -->
+               <xsl:when test="not(namespace-uri(.))">
+                               <xsl:attribute name="data-wlf-{local-name()}"><xsl:value-of select="."/></xsl:attribute>
+                               </xsl:when>
+                       </xsl:choose>               

         </xsl:for-each>
     </xsl:template>
     
         </xsl:for-each>
     </xsl:template>