moglen work in progress

diff --git a/librarian/functions.py b/librarian/functions.py
index e8758f0..59d6530 100644 (file)
--- a/librarian/functions.py
+++ b/librarian/functions.py
@@ -19,8 +19,8 @@ def reg_substitute_entities():
         (u'---', u'—'),
         (u'--', u'–'),
         (u'...', u'…'),
         (u'---', u'—'),
         (u'--', u'–'),
         (u'...', u'…'),

-        #(u',,', u'„'),
-        (u',,', u'“'),
+        (u',,', u'„'),
+        #(u',,', u'“'),

         (u'"', u'”'),
     ]
 
         (u'"', u'”'),
     ]
 

diff --git a/librarian/pdf.py b/librarian/pdf.py
index 793c9b8..eb3f942 100644 (file)
--- a/librarian/pdf.py
+++ b/librarian/pdf.py
@@ -276,6 +276,7 @@ def transform(wldoc, verbose=False, save_tex=None, save_texml=None, morefloats=N
         shutil.copy(get_resource('pdf/wl.cls'), temp)
         shutil.copy(get_resource('pdf/wlpub.cls'), temp)
         shutil.copy(get_resource('res/wl-logo.png'), temp)
         shutil.copy(get_resource('pdf/wl.cls'), temp)
         shutil.copy(get_resource('pdf/wlpub.cls'), temp)
         shutil.copy(get_resource('res/wl-logo.png'), temp)

+        shutil.copy(get_resource('res/cover.jpg'), temp)

         if resources:
             copy_tree(resources, temp)
 
         if resources:
             copy_tree(resources, temp)
 

diff --git a/librarian/pdf/wl2tex.xslt b/librarian/pdf/wl2tex.xslt
index a6e8c10..8fdeab4 100644 (file)
--- a/librarian/pdf/wl2tex.xslt
+++ b/librarian/pdf/wl2tex.xslt
@@ -33,7 +33,8 @@
         </xsl:for-each>
         </TeXML>
 
         </xsl:for-each>
         </TeXML>
 

-        <xsl:choose>
+<!-- WHAT. THE. FUCK. -->
+<!--        <xsl:choose>

             <xsl:when test="@morefloats = 'new'">
                 <TeXML escape="0">
                     \usepackage[maxfloats=64]{morefloats}
             <xsl:when test="@morefloats = 'new'">
                 <TeXML escape="0">
                     \usepackage[maxfloats=64]{morefloats}


@@ -52,7 +53,7 @@
                     }{}
                 </TeXML>
             </xsl:otherwise>
                     }{}
                 </TeXML>
             </xsl:otherwise>

-        </xsl:choose>
+        </xsl:choose>-->

 
         <xsl:apply-templates select="rdf:RDF" mode="titlepage" />
         <xsl:apply-templates select="powiesc|opowiadanie|liryka_l|liryka_lp|dramat_wierszowany_l|dramat_wierszowany_lp|dramat_wspolczesny" mode='titlepage' />
 
         <xsl:apply-templates select="rdf:RDF" mode="titlepage" />
         <xsl:apply-templates select="powiesc|opowiadanie|liryka_l|liryka_lp|dramat_wierszowany_l|dramat_wierszowany_lp|dramat_wspolczesny" mode='titlepage' />


@@ -340,6 +341,17 @@
     </cmd>
 </xsl:template>
 
     </cmd>
 </xsl:template>
 

+<xsl:template mode="inline"
+    match="wyimek">
+    <env>
+        <xsl:attribute name="name">
+            <xsl:value-of select="wl:texcommand(name())" />
+        </xsl:attribute>
+        <xsl:apply-templates mode="inline"/>
+    </env>
+</xsl:template>
+
+

 
 
 <xsl:template match="tytul_dziela" mode="inline">
 
 
 <xsl:template match="tytul_dziela" mode="inline">


@@ -397,12 +409,23 @@
   </math>
 </xsl:template>
 
   </math>
 </xsl:template>
 

+<xsl:template match="latex">
+  <TeXML escape="0">
+    <xsl:for-each select="text()">
+      <xsl:value-of select="normalize-space(.)"/>
+    </xsl:for-each>
+  </TeXML>
+</xsl:template>
+

 <xsl:template match="latex" mode="inline">
   <TeXML escape="0">
 <xsl:template match="latex" mode="inline">
   <TeXML escape="0">

-    <xsl:apply-templates select="@*|node()" mode="identity"/>
+    <xsl:for-each select="text()">
+      <xsl:value-of select="normalize-space(.)"/>
+    </xsl:for-each>

   </TeXML>
 </xsl:template>
 
   </TeXML>
 </xsl:template>
 

+

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

diff --git a/librarian/pdf/wlpub.cls b/librarian/pdf/wlpub.cls
index f2d3b36..7ace19d 100644 (file)
--- a/librarian/pdf/wlpub.cls
+++ b/librarian/pdf/wlpub.cls
@@ -21,6 +21,7 @@
 \RequirePackage{paralist}
 \RequirePackage[normalem]{ulem}
 \RequirePackage{xifthen}
 \RequirePackage{paralist}
 \RequirePackage[normalem]{ulem}
 \RequirePackage{xifthen}

+\RequirePackage{environ} % environments with \BODY, for wyimek

 
 %\DeclareOption{13pt}{%
 %\AtEndOfClass{%
 
 %\DeclareOption{13pt}{%
 %\AtEndOfClass{%


@@ -88,7 +89,7 @@
 \usepackage{fontspec}
 \usepackage{xunicode}
 \usepackage{xltxtra}
 \usepackage{fontspec}
 \usepackage{xunicode}
 \usepackage{xltxtra}

-\usepackage{trimspaces}
+%\usepackage{trimspaces} % imported by something else?

 \usepackage{color}
 \usepackage[overload]{textcase}
 \usepackage{scalefnt}
 \usepackage{color}
 \usepackage[overload]{textcase}
 \usepackage{scalefnt}


@@ -100,6 +101,11 @@
 \usepackage{calc}
 \usepackage[stable]{footmisc}
 
 \usepackage{calc}
 \usepackage[stable]{footmisc}
 

+%% Wyimki - placing them on correct pages
+\usepackage{changepage}
+%\usepackage{fltpage}
+\usepackage{float}
+

 \pagestyle{plain}
 % bottom figure below footnotes
 %\makeFNabove
 \pagestyle{plain}
 % bottom figure below footnotes
 %\makeFNabove


@@ -162,7 +168,7 @@ Mapping=tex-text
 \renewcommand{\large}{\fontsize{14}{14.28}\addfontfeature{LetterSpace=0.3}\selectfont} % srodtytul
 \renewcommand{\small}{\fontsize{8}{14.28}\addfontfeature{LetterSpace=0.5}\selectfont} % paginy
 \renewcommand{\Large}{\fontsize{15}{21.42}\addfontfeature{LetterSpace=0.1}\selectfont} % tytuł rozdziału
 \renewcommand{\large}{\fontsize{14}{14.28}\addfontfeature{LetterSpace=0.3}\selectfont} % srodtytul
 \renewcommand{\small}{\fontsize{8}{14.28}\addfontfeature{LetterSpace=0.5}\selectfont} % paginy
 \renewcommand{\Large}{\fontsize{15}{21.42}\addfontfeature{LetterSpace=0.1}\selectfont} % tytuł rozdziału

-\renewcommand{\huge}{\fontsize{18}{21.6}\addfontfeature{LetterSpace=0.1}\selectfont} % wyimek
+\renewcommand{\huge}{\fontsize{18}{28.56}\addfontfeature{LetterSpace=0.1}\selectfont} % wyimek

 \renewcommand{\Huge}{\fontsize{24}{40}\selectfont} % cover
 \renewcommand{\footnotesize}{\fontsize{9}{10.74}\selectfont}
 
 \renewcommand{\Huge}{\fontsize{24}{40}\selectfont} % cover
 \renewcommand{\footnotesize}{\fontsize{9}{10.74}\selectfont}
 


@@ -257,10 +263,38 @@ Mapping=tex-text
 %% %  \parindent 1em\noindent \hb@xt@ 1.8em{\hss \@makefnmark \enskip}#1
 %% }
 
 %% %  \parindent 1em\noindent \hb@xt@ 1.8em{\hss \@makefnmark \enskip}#1
 %% }
 

+% make public

 \def\trimspace#1{\trim@spaces{#1}}
 
 \makeatother
 
 \def\trimspace#1{\trim@spaces{#1}}
 
 \makeatother
 

+%%%%%%%%%%%%%%%%%%%%%% Wyimki
+%% \floatstyle{plain}
+%% \newfloat{wyimekbox}{p}{wmk}
+%% \floatname{wyimekbox}{Wyimek}
+
+\NewEnviron{wyimek}{%
+  \checkoddpage
+  \ifoddpage
+    \PackageWarning{wlpub}{Wyimek on odd page, omitting it.}
+  \else
+    \begin{figure}[tp]
+      \begin{center}
+        \begin{minipage}[t][\textheight][c]{70mm}
+          \huge\it\BODY
+        \end{minipage}
+      \end{center}
+    \end{figure}
+  \fi
+  \BODY
+}
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+

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


@@ -270,7 +304,7 @@ Mapping=tex-text
 \newsavebox{\ximagebox}\newlength{\ximageheight}
 \newsavebox{\xglyphbox}\newlength{\xglyphheight}
 \newcommand{\xbox}[1]
 \newsavebox{\ximagebox}\newlength{\ximageheight}
 \newsavebox{\xglyphbox}\newlength{\xglyphheight}
 \newcommand{\xbox}[1]

-{\savebox{\ximagebox}{#1}\settoheight{\ximageheight}{\usebox {\ximagebox}}%
+{\savebox{\ximagebox}{#1}\settoheight{\ximageheight}{\usebox {\ximapgebox}}%

 \savebox{\xglyphbox}{\char32}\settoheight{\xglyphheight}{\usebox {\xglyphbox}}%
 \raisebox{\ximageheight}[0pt][0pt]{%\raisebox{-\xglyphheight}[0pt] [0pt]{%
 \makebox[0pt][l]{\usebox{\xglyphbox}}}%}%
 \savebox{\xglyphbox}{\char32}\settoheight{\xglyphheight}{\usebox {\xglyphbox}}%
 \raisebox{\ximageheight}[0pt][0pt]{%\raisebox{-\xglyphheight}[0pt] [0pt]{%
 \makebox[0pt][l]{\usebox{\xglyphbox}}}%}%