Merge remote-tracking branch 'upstream/master'

diff --git a/data/dblatex-endnotes.xsl b/data/dblatex-endnotes.xsl
index 7c03465c1b642e828aa94882c11540978c870977..cf3bbe9dbfe06015e1309071697d550b24bc8705 100644 (file)
--- a/data/dblatex-endnotes.xsl
+++ b/data/dblatex-endnotes.xsl
@@ -7,37 +7,22 @@ outside xetex font values.  As it is missing, reuse the
 latex.begindocument value (aka \begin{document} to get a code fragment
 in front of it.
 -->
+  <xsl:param name="footnote.as.endnote" select="1"/>
+
+  <xsl:attribute-set name="endnotes.properties"
+                     use-attribute-sets="endnotes.properties.default">
+    <xsl:attribute name="font-size">\footnotesize</xsl:attribute>
+  </xsl:attribute-set>
 
   <xsl:param name="latex.begindocument">
     <xsl:text>
-\usepackage{endnotes}
-\let\footnote=\endnote
-\def\enoteheading{\mbox{}\par\vskip-0.2\baselineskip }
-
-% More pretty looking note
-\def\enoteformat{\rightskip=0pt \leftskip=21pt \parindent=-13pt
-\leavevmode\llap{\makeenmark}\hspace*{11pt}}
-
-% Increase footnote/endnote size to be more than 6 pts, to avoid
-% complaint from Lulu about the font being too small to be printed
-% clearly.  Needed at least for pocket size books.
-% Probably wise to use the same size as the colophon page (see myclass.cls)
-
-% Use one of these (adjust numbers, x, x*1.2), 6>= 6
-\def\enotesize{\normalsize}
-%\def\enotesize{\fontsize{10}{12}\selectfont}
-
 % Trick to avoid many words sticking out of the right margin of the text.
 % Need to add it here with the end notes, as only one
 % latex.begindocument can be active.
 \sloppy
 
-% Hack to get correct chapter numbering with dblatex, as chapter
-% labels are ignored.  No longer needed with dblatex 0.3.7.
-%\setcounter{chapter}{-1}
-
 \begin{document}
     </xsl:text>
-
   </xsl:param>
+
 </xsl:stylesheet>

diff --git a/freeculture.xml b/freeculture.xml
index f5adda02769be44ada7157fb24fc977f61726e73..9029da4b656a101db5b43d07c66ed54619742c64 100644 (file)
--- a/freeculture.xml
+++ b/freeculture.xml
@@ -15549,8 +15549,7 @@ the material.
 </para>
 
 <!-- insert endnotes here -->
-<?latex \theendnotes
-?>
+<index type="endnotes"/>
 
 <!--PAGE BREAK 336-->