From 349703205c1f87da589c9cb447070955d3aaf8bb Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Tue, 22 Aug 2017 16:46:49 +0200
Subject: [PATCH] simplify question conversion

---
 redakcja/xslt/wl2to1.xslt | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/redakcja/xslt/wl2to1.xslt b/redakcja/xslt/wl2to1.xslt
index 75eb00d0..e88412ac 100644
--- a/redakcja/xslt/wl2to1.xslt
+++ b/redakcja/xslt/wl2to1.xslt
@@ -131,6 +131,20 @@
                 <xsl:apply-templates />
             </xsl:element>
         </xsl:when>
+        <xsl:when test="@class = 'question'">
+            <pytanie>
+                <xsl:for-each select="div">
+                    <xsl:choose>
+                        <xsl:when test="@class = 'p'">
+                            <xsl:apply-templates />
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:apply-templates select="."/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:for-each>
+            </pytanie>
+        </xsl:when>
         <xsl:when test="@class = 'defined'">
             <xsl:choose>
                 <xsl:when test="count(ancestor::*) = 4 ">
@@ -152,23 +166,7 @@
         </xsl:when>
         <xsl:when test="@class = 'exercise.choice' or @class = 'exercise.choice.single'">
             <cwiczenie typ="wybor">
-                <opis><akap>[opis]</akap></opis>
-                <lista typ="num">
-                    <punkt>
-                        <pytanie>
-                            <xsl:for-each select="div">
-                                <xsl:choose>
-                                    <xsl:when test="@class = 'p'">
-                                        <xsl:apply-templates />
-                                    </xsl:when>
-                                    <xsl:otherwise>
-                                        <xsl:apply-templates select="."/>
-                                    </xsl:otherwise>
-                                </xsl:choose>
-                            </xsl:for-each>
-                        </pytanie>
-                    </punkt>
-                </lista>
+                <xsl:call-template name="cwiczenie"/>
             </cwiczenie>
         </xsl:when>
         <xsl:when test="@class = 'exercise.gap'">
-- 
2.20.1