\RequirePackage[normalem]{ulem}
\RequirePackage{xifthen}
\RequirePackage{environ} % environments with \BODY, for wyimek
-
+%\RequirePackage{indentfirst}
%\DeclareOption{13pt}{%
%\AtEndOfClass{%
% font size definitions, similar to ones in /usr/share/texmf-texlive/tex/latex/base/
\usepackage[MeX]{polski}
\usepackage{icomma}
\usepackage[xetex]{graphicx}
-\usepackage{fontspec}
+\usepackage[silent]{fontspec} % silent - no warnings, quiet - warn only to log
\usepackage{xunicode}
\usepackage{xltxtra}
%\usepackage{trimspaces} % imported by something else?
\usepackage[overload]{textcase}
\usepackage{scalefnt}
\usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=black,xetex,linktocpage]{hyperref}
+%\usepackage{hyperref}
\usepackage{fancyhdr}
-
+\usepackage{endnotes}
%\usepackage{fnpos}
\usepackage{printlen}
\usepackage{calc}
\counterwithout{footnote}{chapter}
\usepackage[explicit]{titlesec}
+\usepackage{microtype}
%% Wyimki - placing them on correct pages
\usepackage{changepage}
% bottom figure below footnotes
%\makeFNabove
+%%% Hyphenation opts:
+%\pretolerance=10000
+\tolerance=2600
+\emergencystretch=30pt
+
%%%%%%%%%%%%%%%%%%%%%%% Paper size
\setlength\baselineskip{7.14pt}
\setlength{\parskip}{0mm}
\renewcommand{\normalsize}{\fontsize{10.4}{14.28}\addfontfeature{LetterSpace=3.0}\selectfont}
-\renewcommand{\large}{\fontsize{14}{14.28}\addfontfeature{LetterSpace=3.0}\selectfont} % srodtytul
+\renewcommand{\large}{\fontsize{14}{14.28}\addfontfeature{LetterSpace=3.0,Letters=Uppercase}\selectfont} % srodtytul
\renewcommand{\small}{\fontsize{8}{14.28}\addfontfeature{LetterSpace=5.0}\selectfont} % paginy
\renewcommand{\Large}{\fontsize{15}{21.42}\addfontfeature{LetterSpace=0.0}\selectfont} % tytuł rozdziału
\renewcommand{\huge}{\fontsize{18}{28.56}\addfontfeature{LetterSpace=1.0}\selectfont} % wyimek
%%%%%%%%%% Nagłówek normalny
\cfoot{}
% this will go to \leftmark
-\renewcommand{\chaptermark}[1]{\markboth{\MakeUppercase{#1}}{}}
-\fancyhead[CE]{{\small\MakeUppercase{\@title}}}
+\renewcommand{\chaptermark}[1]{\markboth{\MakeTextUppercase{#1}}{}}
+\fancyhead[CE]{{\small\MakeTextUppercase{\@author, \@title}}}
\fancyhead[CO]{{\small\leftmark}}
\fancyhead[LE,RO]{{\small\intro\thepage}}
%%%%%%%%%% Nagłówek pierwszej strony rozdziału
%%%%%%%%%%%%%%%%%%%%%% Section title styles.
%% Chapters
+
+% No chapter numbers in TOC
+\renewcommand{\thechapter}{}
+
\titleformat{\chapter}[block]%
{\Large\intro\addfontfeature{LetterSpace=0.5,Kerning={Uppercase}}}%
{}{0pt}{\parbox{80mm}{\raggedright#1}}
\newlength{\chapterposcorrection}\newlength{\chapterspaceafter}
-\setlength{\chapterposcorrection}{-\headsep-2\baselineskip}
-\setlength{\chapterspaceafter}{14\baselineskip-14pt}%\f@size of large
+\setlength{\chapterposcorrection}{-\headsep-2\baselineskip-2.352mm} % 2.352 is a measured correction:
+\setlength{\chapterspaceafter}{14\baselineskip-14pt+2.352mm}%\f@size of large
\titlespacing*{\chapter}{0pt}{\chapterposcorrection}{\chapterspaceafter}
%% Sections
\titleformat{\section}%
{\addfontfeature{LetterSpace=0.3}\large}%
-{\thesection{}.}{.5em}{\MakeUppercase{#1}}
-
+{\thesection{}.}{.5em}{\MakeTextUppercase{#1}}
\renewcommand{\thesection}{\Roman{section}}
+\titlespacing*{\section}{0pt}{\baselineskip}{0em}
-\titleformat{\subsection}[runin]%
+\titleformat{\subsection}[block]%
{}%
-{\thesubsection{}.}{.5em}{\MakeUppercase{#1}.}[]
+{\thesubsection{}.}{.5em}{\MakeTextUppercase{#1}.}[]
\renewcommand{\thesubsection}{\Alph{subsection}}
-\titlespacing*{\subsection}{0pt}{0pt}{.5em}
+\titlespacing*{\subsection}{0pt}{\baselineskip}{0em}
\newcommand{\typosubsubsection}[1]{%
{\textsc{#1}}
%% XXX delete them
\newcommand{\typosubsection}[1]{%
-{\MakeUppercase{#1}}
+{\MakeTextUppercase{#1}}
}
\newcommand{\typosection}[1]{%
%%%%% Footnotes (works with footmisc) %%%%%%%%
\newlength{\footnoteindent}\newlength{\footnoteprespace}
-\setlength{\footnoteindent}{6mm}%{3.5mm}
+\setlength{\footnoteindent}{8mm}%{3.5mm}
\setlength{\footnoteprespace}{0em}
\makeatletter
%% % \parindent 1em\noindent \hb@xt@ 1.8em{\hss \@makefnmark \enskip}#1
%% }
+%%%%% Endnotes
+\newlength{\myendnoteprespace}\setlength{\myendnoteprespace}{.5em}
+\newlength{\myendnoteindent}\setlength{\myendnoteindent}{14mm+.5em}
+
+\renewcommand\theendnote{[\roman{endnote}]}
+\renewcommand\makeenmark{\hspace{\myendnoteprespace}\theenmark}
+\renewcommand{\notesname}{}
+\newcommand{\authornotes}{
+% \newpage
+ \cleardoublepage
+ \chapter{Przypisy autora}
+ \setlength{\parindent}{0pt}
+ \def\enotesize{\normalsize}
+ \theendnotes
+}
+%% \newcommand{\@makeentext}[1]{%
+%% \noindent\theenmark\hspace{\footnoteindent}#1
+%% }
+
+%% \def\enoteformat{\rightskip\z@ \parindent=0em
+%% \makebox[\myendnoteindent][l]{\makeenmark}} % 12.4mm - measured biggest endnote marker (in Moglen text [xxxviii])
+\def\enoteformat{\rightskip\z@ \setlength{\leftskip}{\myendnoteindent-\myendnoteprespace} \parindent=0em
+ \leavevmode\llap{\makebox[\myendnoteindent][l]{\makeenmark}}}
+
+
% make public
\def\trimspace#1{\trim@spaces{#1}}
\NewEnviron{wyimek}{%
\checkoddpage
\ifoddpage
- \PackageWarning{wlpub}{Wyimek on odd page, omitting it.}
+ \PackageWarning{wlpub}{Wyimek on odd page, omitting it ( \BODY )}
\else
\begin{figure}[tp]
\begin{center}
\BODY
}
+%% wyimek that doesn't leave text in text flow
+%% TODO: reduce code duplication
+\NewEnviron{wyimekextra}{%
+ \checkoddpage
+ \ifoddpage
+ \PackageWarning{wlpub}{Wyimek on odd page, omitting it ( \BODY )}
+ \else
+ \begin{figure}[tp]
+ \begin{center}
+ \begin{minipage}[t][\textheight][c]{70mm}
+ \huge\it\BODY
+ \end{minipage}
+ \end{center}
+ \end{figure}
+ \fi
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%
-\clubpenalty=100000
-\widowpenalty=100000
+\clubpenalty=700
+\widowpenalty=700
+\hyphenpenalty=3500
+\doublehyphendemerits=9000
+\finalhyphendemerits=6000
% see http://osdir.com/ml/tex.xetex/2005-10/msg00003.html
\thispagestyle{empty}
{
\setlength{\parindent}{0mm}
+ \small
\input{editorial}
}
}
\newcommand{\dramatwierszowanylp}[1]{#1}
\newcommand{\dramatwspolczesny}[1]{#1}
-\newcommand{\nota}[1]{%
-\begin{em}%
-\begin{flushleft}%
-\noindent #1%
-\end{flushleft}%
-\end{em}%
-}
\newcommand{\dedykacja}[1]{%
\begin{em}%
\newcommand{\dlugicytat}[1]{%
\begin{quotation}%
-#1%
+\noindent{}\ignorespaces#1%
\end{quotation}%
+\hspace{\parindent}
}
\newcommand{\poezjacyt}[1]{%
\newcommand{\theautorrozdzialu}{}
\newcommand{\autorrozdzialu}[1]{%
-\renewcommand{\theautorrozdzialu}{{\normalfont\normalsize\newline{}\newline{}\emph{#1}}}
+\renewcommand{\theautorrozdzialu}{{\normalfont\normalsize\newline{}\newline{}\parbox{\textwidth}{\normalsize\it #1}}}
}
}
\newcommand{\akap}[1]{%
-\par{#1}%
+#1
+
+% newline here needed, we don't use \par cause it ignores \noindent before
}
\newcommand{\akapdialog}[1]{%
\par{#1}%
}
\newcommand{\strofa}[1]{%
-\par{\noindent{\ignorespaces#1\vspace{1em}}}%
+#1\vspace{\baselineskip}%
}
\newcommand{\wers}[1]{#1}
}
\ifshowfootnotes
- \newcommand{\pa}[1]{\NoCaseChange{\footnote{#1 [przypis autorski]}}}
+ \newcommand{\pa}[1]{\NoCaseChange{\endnote{#1}}}
\newcommand{\pe}[1]{\NoCaseChange{\footnote{#1}}}
\newcommand{\pr}[1]{\NoCaseChange{\footnote{#1}}}
\newcommand{\pt}[1]{\NoCaseChange{\footnote{#1}}}
\newcommand{\slowoobce}[1]{%
\emph{#1}%
}
+\makeatletter
+
+\newif\ifinnota \innotafalse
+
\newcommand{\tytuldziela}[1]{%
-\emph{#1}%
+ \ifinnota
+ #1%
+ \else
+ \emph{#1}%
+ \fi
}
+\makeatother
+
\newcommand{\wyroznienie}[1]{%
\emph{#1}%
}
+\newcommand{\nota}[1]{%
+%\sekcjaasterysk{}
+\begin{em}%
+ \innotatrue
+%\begin{flushleft}%
+ \noindent{}\small{}#1%
+ \innotafalse
+%\end{flushleft}%
+\end{em}%
+}
+
+
\newcommand{\osoba}[1]{%
#1%
}
}
\newcommand{\sekcjaasterysk}{%
-\vspace{10pt}%
+\vspace{\baselineskip}%
\begin{center}%
\par{*}%
\end{center}%
\newcommand{\setilustrscale}[1]{\renewcomand{\ilustrscale}{#1}}
\newcommand{\ilustr}[3][]{
- \vspace{2\baselineskip}%
\begin{center}%
\ifthenelse{\isempty{#1}}%
{\par{\includegraphics{\trimspace{#2}}\\#3}}%
{\par{\includegraphics[#1]{\trimspace{#2}}\\#3}}%
\end{center}%
- \vspace{2\baselineskip}%
}
}
\newcommand{\lista}[1]{%
-\begin{compactitem}
-\setlength{\parskip}{\parindent}
+\begin{compactenum}
+%\setlength{\parskip}{\parindent}
#1
-\end{compactitem}
+\end{compactenum}
}
\newcommand{\punkt}[1]{%
}
\newcommand{\link}[2]{\href{#1}{\uline{#2}\footnote{#1}}}
-\newcommand{\www}[1]{{\normalfont\small\href{#1}{#1}}}
+\newcommand{\www}[1]{{\normalfont\href{#1}{#1}}}
fnp / librarian.git / blobdiff