pdf catalogue fixes: use longtable

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index ba70f7b..323edda 100644 (file)
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -144,7 +144,7 @@ def book_tree(book_list, books_by_parent):
 def book_tree_texml(book_list, books_by_parent, depth=0):
     return "".join("""
             <cmd name='hspace'><parm>%(depth)dem</parm></cmd>%(title)s
 def book_tree_texml(book_list, books_by_parent, depth=0):
     return "".join("""
             <cmd name='hspace'><parm>%(depth)dem</parm></cmd>%(title)s

-            <spec cat='align' />%(audiobook)s
+            <spec cat='align' /><cmd name="note"><parm>%(audiobook)s</parm></cmd>

             <ctrl ch='\\' />
             %(children)s
             """ % {
             <ctrl ch='\\' />
             %(children)s
             """ % {

diff --git a/apps/reporting/templates/reporting/catalogue.texml b/apps/reporting/templates/reporting/catalogue.texml
index 78e6551..93a13d0 100755 (executable)
--- a/apps/reporting/templates/reporting/catalogue.texml
+++ b/apps/reporting/templates/reporting/catalogue.texml
@@ -12,6 +12,8 @@
 \usepackage{scalefnt}
 \usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=black,xetex]{hyperref}
 
 \usepackage{scalefnt}
 \usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=black,xetex]{hyperref}
 

+\usepackage{longtable}
+

 \setmainfont [
 %ExternalLocation,
 UprightFont = JunicodeWL-Regular,
 \setmainfont [
 %ExternalLocation,
 UprightFont = JunicodeWL-Regular,


@@ -31,7 +33,7 @@ LetterSpace=-1.0
 \makeatletter
 
 \usepackage{color}
 \makeatletter
 
 \usepackage{color}

-\definecolor{theme}{gray}{.3}
+\definecolor{note}{gray}{.3}

 
 \setlength{\hoffset}{-1cm}
 \setlength{\oddsidemargin}{0pt}
 
 \setlength{\hoffset}{-1cm}
 \setlength{\oddsidemargin}{0pt}


@@ -45,7 +47,7 @@ LetterSpace=-1.0
 \setlength{\leftmargin}{0em}
 \setlength{\rightmargin}{0em}
 \setlength{\textheight}{24cm}
 \setlength{\leftmargin}{0em}
 \setlength{\rightmargin}{0em}
 \setlength{\textheight}{24cm}

-\setlength{\textwidth}{18cm}
+\setlength{\textwidth}{17cm}

 
 
 \pagestyle{fancy}
 
 
 \pagestyle{fancy}


@@ -73,31 +75,31 @@ LetterSpace=-1.0
 
 
 \newcommand{\name}[1]{%
 
 
 \newcommand{\name}[1]{%

-\vspace{.5em}\Large{#1}%
+\\
+\Large{#1}%
+}
+
+\newcommand{\note}[1]{%
+\small{\color{note}{#1}}%

 }
 
 
 }
 
 

-    \begin{document}
+\begin{document}

 
     \noindent \begin{minipage}[t]{.35\textwidth}\vspace{0pt}
         \href{http://www.wolnelektury.pl}{\xbox{\includegraphics[width=\textwidth]{wl-logo.png}}}
 
     \noindent \begin{minipage}[t]{.35\textwidth}\vspace{0pt}
         \href{http://www.wolnelektury.pl}{\xbox{\includegraphics[width=\textwidth]{wl-logo.png}}}

-        \vspace{1em}

     \end{minipage}
 
     \begin{minipage}[t]{.65\textwidth}\vspace{0pt}
     \end{minipage}
 
     \begin{minipage}[t]{.65\textwidth}\vspace{0pt}

-
-    \begin{flushright}
-    
-    \section*{Katalog biblioteki internetowej \href{http://www.wolnelektury.pl/}{WolneLektury.pl}.}
-    stan na \today
-
-    \end{flushright}
-
+        \begin{flushright}
+            \section*{Katalog biblioteki internetowej 
+                \href{http://www.wolnelektury.pl/}{WolneLektury.pl}.}
+            stan na \today
+        \end{flushright}

     \end{minipage}
 
     \end{minipage}
 

+    \begin{longtable}{p{15cm} p{2cm}}

 
 

-    \begin{tabular}{p{12cm} p{2cm}}
-    

         <TeXML escape="1">
             {% book_tree_texml orphans books_by_parent %}
             {% for author, group in books_by_author.items %}
         <TeXML escape="1">
             {% book_tree_texml orphans books_by_parent %}
             {% for author, group in books_by_author.items %}


@@ -110,7 +112,7 @@ LetterSpace=-1.0
             {% endfor %}
         </TeXML>
 
             {% endfor %}
         </TeXML>
 

-    \end{tabular}
+    \end{longtable}

     \end{document}
     </TeXML>
 </TeXML>
\ No newline at end of file
     \end{document}
     </TeXML>
 </TeXML>
\ No newline at end of file