Merge remote-tracking branch 'upstream/master'

diff --git a/data/origsize.xsl b/data/origsize.xsl
index 738b2a5fe52f8358e42c68eebcb86c2f1fb8d57a..f82c1d35c07f3b0ffe98397a8b5e79e59488c0c5 100644 (file)
--- a/data/origsize.xsl
+++ b/data/origsize.xsl
@@ -14,7 +14,16 @@
 <xsl:param name="page.margin.outer">0.71in</xsl:param>
 <xsl:param name="body.start.indent">0pt</xsl:param>
 
-<xsl:param name="latex.class.options">pagesize=pdftex,headinclude=on,footinclude=on,twoside</xsl:param>
+<xsl:param name="latex.class.options">pagesize=pdftex,headinclude=on,footinclude=on,twoside,openright</xsl:param>
+
+<!-- FIXME: To move in lulu.xsl -->
+<xsl:param name="latex.enddocument">
+  <xsl:text>\pagebreak
+\thispagestyle{empty}
+~
+\end{document}
+  </xsl:text>
+</xsl:param>
 
 <!-- from http://cygwin.com/ml/docbook-apps/2004-q2/msg00107.html -->
 <!-- ~~~~~~~~~~~~~~~~ -->

diff --git a/myclass.cls b/myclass.cls
index 0e7f721d5be65bb9dd96e0c7c9b5a29a28092bec..413530deead202d34bb0661cf15a7e9f9e0e2ba0 100644 (file)
--- a/myclass.cls
+++ b/myclass.cls
@@ -5,6 +5,22 @@
 \LoadClassWithOptions{report}
 % report, book, memoir, scrreprt or scrbook ?
 
+% Fix the page number reset done by abstract by redefining it
+\def\nocount#1#2{}
+\let\stdsetcounter\setcounter
+\let\stdabstract=\abstract
+\let\endstdabstract=\endabstract
+\renewenvironment{abstract}{%
+  \let\setcounter\nocount%
+  \begin{stdabstract}%
+  \noindent%
+  \setlength\parskip{\medskipamount}%
+  \setlength\parindent{0pt}%
+}{
+  \end{stdabstract}
+  \let\setcounter\stdsetcounter
+}
+
 % Put the index in the TOC
 \makeatletter
 \let\stdindex=\theindex