From 4f7cbbb0a28f2f9354634c1fae426a3fbc85829b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 27 Nov 2014 10:43:19 +0100
Subject: [PATCH] legi2pdf: fix section code rendering of BQR

---
 legi2pdf/xsl/section.xsl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/legi2pdf/xsl/section.xsl b/legi2pdf/xsl/section.xsl
index 8bf424a..ebd106c 100644
--- a/legi2pdf/xsl/section.xsl
+++ b/legi2pdf/xsl/section.xsl
@@ -199,6 +199,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <xsl:value-of select="$level"/>
     <xsl:text>)&#10;</xsl:text>
     <!--<xsl:if test="$appendix"><xsl:text>\tocless</xsl:text></xsl:if>-->
+    <xsl:if test="$section-tag = 'bqrsection' and not($parchemin)">
+      <xsl:text>\end{multicols}&#10;</xsl:text>
+    </xsl:if>
+    <xsl:if test="$section-tag = 'bqrsection' and (preceding-sibling::section)">
+      <xsl:text>\newpage&#10;</xsl:text>
+    </xsl:if>
     <xsl:text>\</xsl:text>
     <xsl:value-of select="$section-tag"/>
     <xsl:if test="$appendix"><xsl:text>*</xsl:text></xsl:if>
@@ -219,6 +225,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <xsl:text>% level 1&#10;</xsl:text>
         <xsl:text>\begin{multicols}{2}&#10;</xsl:text>
     </xsl:if>
+    <xsl:if test="$section-tag = 'bqrsection' and not($parchemin)">
+        <xsl:text>\begin{multicols}{2}&#10;</xsl:text>
+    </xsl:if>
     
     <xsl:call-template name="content-templates"/>
 
@@ -310,7 +319,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <xsl:text>\setcounter{section}{0}&#10;</xsl:text>
     <xsl:choose>
         <xsl:when test='$bqr'>
-            <xsl:text>\onecolumn</xsl:text>
             <xsl:text>\bqrpart{</xsl:text>
             <xsl:value-of select="$title-toc"/>
             <xsl:text>}{</xsl:text>
@@ -325,6 +333,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             <xsl:text>}\hypertarget{</xsl:text>
             <xsl:value-of select="$id"/>
             <xsl:text>}{}%&#10;</xsl:text>
+            <xsl:if test="not($parchemin)">
+              <xsl:text>\begin{multicols}{2}</xsl:text>
+            </xsl:if>
         </xsl:when>
         <xsl:otherwise>
             <xsl:text>\newpage&#10;</xsl:text>