nicer tables

Conflicts:

	librarian/pdf/wl.cls

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index 247116c..e0721d9 100644 (file)
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -67,14 +67,16 @@
 
 
 \usepackage{trace}
 
 
 \usepackage{trace}

-
-%\usepackage[MeX]{polski}
-
+\usepackage{caption}
+\usepackage{tabularx}
+\usepackage[MeX]{polski}
+\usepackage{icomma}

 \usepackage[xetex]{graphicx}
 \usepackage{fontspec}
 \usepackage{xunicode}
 \usepackage{xltxtra}
 
 \usepackage[xetex]{graphicx}
 \usepackage{fontspec}
 \usepackage{xunicode}
 \usepackage{xltxtra}
 

+

 \usepackage[overload]{textcase}
 \usepackage{scalefnt}
 \usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=black,xetex]{hyperref}
 \usepackage[overload]{textcase}
 \usepackage{scalefnt}
 \usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=black,xetex]{hyperref}


@@ -152,11 +154,20 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}

+<<<<<<< HEAD

 %\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}}
 \cfoot{}
 %\rfoot{{\footnotesize \thepage}}
 \fancyfoot[LO,RE]{{\footnotesize \textsc{\@author} \emph{\@title}}}
 \fancyfoot[LE,RO]{{\footnotesize \thepage}}
 %\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}}
 \cfoot{}
 %\rfoot{{\footnotesize \thepage}}
 \fancyfoot[LO,RE]{{\footnotesize \textsc{\@author} \emph{\@title}}}
 \fancyfoot[LE,RO]{{\footnotesize \thepage}}

+=======
+%\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}} %1
+\cfoot{}
+%\rfoot{{\footnotesize \thepage}}  %1
+\fancyfoot[LO,RE]{{\footnotesize \textsc{\@author} \emph{\@title}}}
+\fancyfoot[LE,RO]{{\footnotesize \thepage}}
+
+>>>>>>> 4531d8a... nicer tables

 
 \clubpenalty=100000
 \widowpenalty=100000
 
 \clubpenalty=100000
 \widowpenalty=100000


@@ -174,9 +185,14 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \raisebox{0pt}[0pt][0pt]{\makebox[0pt][r]{\usebox{\xglyphbox}}}}
 
 \newcommand{\makecover}[2]{
 \raisebox{0pt}[0pt][0pt]{\makebox[0pt][r]{\usebox{\xglyphbox}}}}
 
 \newcommand{\makecover}[2]{

+<<<<<<< HEAD

 
         %\pdfpagewidth=#1
         %\pdfpageheight=#2
 
         %\pdfpagewidth=#1
         %\pdfpageheight=#2

+=======
+%        \pdfpagewidth=#1
+%        \pdfpageheight=#2
+>>>>>>> 4531d8a... nicer tables

 
         \thispagestyle{empty}
         \newlength{\PictHOffset}
 
         \thispagestyle{empty}
         \newlength{\PictHOffset}


@@ -191,12 +207,21 @@ Letters={SmallCaps,UppercaseSmallCaps}
         \addtolength{\PictVOffset}{\headheight}
         \addtolength{\PictVOffset}{\headsep}
         \addtolength{\PictVOffset}{\topskip}
         \addtolength{\PictVOffset}{\headheight}
         \addtolength{\PictVOffset}{\headsep}
         \addtolength{\PictVOffset}{\topskip}

+<<<<<<< HEAD

         \addtolength{\PictVOffset}{-#2}
 
         \noindent\hspace*{-\PictHOffset}%
         \raisebox{\PictVOffset}[0pt][0pt]{\makebox[0pt][l]{%
             \includegraphics[height=#2,width=#1]{cover.jpg}}}
         %\clearpage
         \addtolength{\PictVOffset}{-#2}
 
         \noindent\hspace*{-\PictHOffset}%
         \raisebox{\PictVOffset}[0pt][0pt]{\makebox[0pt][l]{%
             \includegraphics[height=#2,width=#1]{cover.jpg}}}
         %\clearpage

+=======
+        \addtolength{\PictVOffset}{-#2} %1 \pdfpageheight}
+
+        \noindent\hspace*{-\PictHOffset}%
+        \raisebox{\PictVOffset}[0pt][0pt]{\makebox[0pt][l]{%
+            \includegraphics[height=#2,width=#1]{cover.png}}}
+%        \clearpage
+>>>>>>> 4531d8a... nicer tables

         \vspace{#2}
 
         \hspace{-36mm}\parbox{16cm}{
         \vspace{#2}
 
         \hspace{-36mm}\parbox{16cm}{


@@ -209,6 +234,7 @@ Letters={SmallCaps,UppercaseSmallCaps}
             A collection of texts from a crowd-funded contest.
         }}
 
             A collection of texts from a crowd-funded contest.
         }}
 

+<<<<<<< HEAD

 
         \vspace{8em}
 
 
         \vspace{8em}
 


@@ -219,6 +245,18 @@ Letters={SmallCaps,UppercaseSmallCaps}
 
         %\setlength{\pdfpagewidth}{210mm}
         %\setlength{\pdfpageheight}{297mm}
 
         %\setlength{\pdfpagewidth}{210mm}
         %\setlength{\pdfpageheight}{297mm}

+=======
+
+        \vspace{8em}
+
+\emph{\thankyou}\\
+\indent\emph{You made this book possible.}
+        }
+
+
+%        \setlength{\pdfpagewidth}{210mm}
+%        \setlength{\pdfpageheight}{297mm}
+>>>>>>> 4531d8a... nicer tables

 }
 
 
 }
 
 


@@ -251,6 +289,13 @@ Letters={SmallCaps,UppercaseSmallCaps}
     }
 }
 
     }
 }
 

+<<<<<<< HEAD
+=======
+
+
+
+
+>>>>>>> 4531d8a... nicer tables

 \usepackage{printlen}
 
 \newcommand{\editorialsection}{
 \usepackage{printlen}
 
 \newcommand{\editorialsection}{


@@ -295,9 +340,12 @@ Modern Poland Foundation Team
 
 \href{http://nowoczesnapolska.org.pl/}{http://nowoczesnapolska.org.pl/}
 
 
 \href{http://nowoczesnapolska.org.pl/}{http://nowoczesnapolska.org.pl/}
 

+<<<<<<< HEAD

 %\vspace{4em}
 %\box{\tableofcontents}
 
 %\vspace{4em}
 %\box{\tableofcontents}
 

+=======
+>>>>>>> 4531d8a... nicer tables

   \begin{figure}[b!]
   {
     \footnotesize
   \begin{figure}[b!]
   {
     \footnotesize

diff --git a/librarian/pdf/wl2tex.xslt b/librarian/pdf/wl2tex.xslt
index ebd6a6b..0f1d51f 100644 (file)
--- a/librarian/pdf/wl2tex.xslt
+++ b/librarian/pdf/wl2tex.xslt
@@ -392,11 +392,26 @@
   </math>
 </xsl:template>
 
   </math>
 </xsl:template>
 

+<xsl:template match="tablewrap">
+  <cmd name="begin"><parm>table</parm><opt>h!</opt></cmd>
+  <xsl:apply-templates select="table"/>
+
+  <cmd name="caption*"><parm>
+    <xsl:apply-templates select="akap"/>
+  </parm></cmd>
+  <cmd name="end"><parm>table</parm></cmd>
+</xsl:template>
+

 <xsl:template match="table">
 <xsl:template match="table">

-    <xsl:if test="@caption">
-        <group><cmd name="Large"/><xsl:value-of select="@caption"/></group><cmd name="newline"/>
+  <xsl:if test="@caption">
+
+      <cmd name="caption*"><parm>
+
+       <cmd name="Large"/><xsl:value-of select="@caption"/>
+      </parm></cmd>

     </xsl:if>
     </xsl:if>

-    <env name="tabular">
+    <env name="tabularx">
+      <parm><cmd name="textwidth"/></parm>

         <parm><xsl:value-of select="@spec"/></parm>
         <xsl:apply-templates />
     </env>
         <parm><xsl:value-of select="@spec"/></parm>
         <xsl:apply-templates />
     </env>


@@ -404,10 +419,10 @@
 
 <xsl:template match="r">
     <xsl:apply-templates />
 
 <xsl:template match="r">
     <xsl:apply-templates />

-    <spec cat="esc"/>
-    <spec cat="esc"/>
+    <spec cat="esc"/><spec cat="esc"/>

 </xsl:template>
 <xsl:template match="c">
 </xsl:template>
 <xsl:template match="c">

+    <cmd name="footnotesize"/>

     <xsl:apply-templates mode="inline"/>
     <xsl:if test="position() &lt; last()-1">
     <spec cat="align"/>
     <xsl:apply-templates mode="inline"/>
     <xsl:if test="position() &lt; last()-1">
     <spec cat="align"/>