From 641bd82f3e6cb8847b7e0b99f50deae7663170b0 Mon Sep 17 00:00:00 2001 From: john stone Date: Tue, 21 May 2013 00:08:27 +0200 Subject: [PATCH] baubar --- content/example/article.tex | 4 ++-- main.tex | 19 +++++++++++++++---- openfm/commands.tex | 9 ++++++--- openfm/layout.tex | 22 ++++++++++++---------- openfm/packages.tex | 4 ++-- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/content/example/article.tex b/content/example/article.tex index 755d13e..82adae1 100644 --- a/content/example/article.tex +++ b/content/example/article.tex @@ -1,10 +1,10 @@ % License: GNU Free Documentation License (GFDL) http://www.gnu.org/copyleft/fdl.html -\begin{FMArticle}{Akamentorfahrt ins Zuseum}{CC-BY-ND Johannes Lötzsch}{Uni}{Bildungsstreik}{bildungsstreik} +\begin{FMArticle}{Akamentorfahrt ins Zuseum}{CC-BY-ND Johannes Lötzsch}{Uni}{Bildungsstreik}{example} Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. -\FMImage[1.0]{img/example.jpg}{This is an example picture!} +%\FMImage[1.0]{img/example.jpg}{This is an example picture!} Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. diff --git a/main.tex b/main.tex index 74008c3..53e0974 100644 --- a/main.tex +++ b/main.tex @@ -1,11 +1,21 @@ % License: GNU Free Documentation License (GFDL) http://www.gnu.org/copyleft/fdl.html -\documentclass[10pt,pdftex,a5paper]{scrreprt} +\documentclass[10pt, +pdftex, +a5paper, +BCOR=1cm, +DIV=15 +]{scrreprt} + +\input{./openfm/config.tex} \usepackage{import} -\import{openfm/}{packages} -\import{openfm/}{layout} -\import{openfm/}{commands} +\subimport{openfm/}{packages} +\subimport{openfm/}{layout} +\subimport{openfm/}{commands} +\usepackage{fmtcount} +\renewcommand*{\thepage}{\Hexadecimal{page}} + \begin{document} @@ -13,6 +23,7 @@ \vspace{4cm} \input{content/impressum} \newpage +\thispagestyle{plain} \FMTOC{General}{Table of contents!} \newpage \input{content/example/article} diff --git a/openfm/commands.tex b/openfm/commands.tex index 9c9e6d8..3a33e0f 100644 --- a/openfm/commands.tex +++ b/openfm/commands.tex @@ -93,7 +93,7 @@ \newcommand{\FMImage}[4][.95] {\begin{minipage}[t]{1\linewidth} \centering - \href{\currentArticle/#2}{\includegraphics[width=#1\textwidth]{content/#2}}\\ + \href{\currentArticle/#2}{\includegraphics[width=#1\textwidth]{content/\currentArticle/#2}}\\ \emph{#4}~\href{\currentArticle/#2}{} \end{minipage}} @@ -113,7 +113,10 @@ % Überschrift für jeden Abschnitt % Benutzung: \Headline{ÜBERSCHRIFT}{PDFMARKE} % Dies wird nur in der befehle.tex verwendet! -\newcommand{\FMHeadline}[2]{\resetcounter\pdfbookmark[2]{#1}{#2}\textcolor{darkgray}{\textbf{{\Large \hypertarget{#2}{#1}\label{#2}}}}\\[-6px] \FMLine} +\newcommand{\FMHeadline}[2]{% + \resetcounter\pdfbookmark[2]{#1}{#2} + \textcolor{darkgray} + {\textbf{{\Large \hypertarget{#2}{#1}\label{#2}}}}\\[-6px] \FMLine} % Headline für Artikel % Benutzung: \FMArticleHeadline{TITEL}{AUTOR}{PDFMARKE} @@ -154,7 +157,7 @@ \end{textblock} \begin{textblock}{60}(0,0) \vspace{10px} -\includegraphics[width=\textwidth,height=36px]{img/titellinie-oben.png} +\includegraphics[width=\textwidth,height=36px]{\FMbasepath img/titellinie-oben.png} \end{textblock} } } diff --git a/openfm/layout.tex b/openfm/layout.tex index c920390..aeb73d9 100644 --- a/openfm/layout.tex +++ b/openfm/layout.tex @@ -1,13 +1,14 @@ % License: GNU Free Documentation License (GFDL) http://www.gnu.org/copyleft/fdl.html + % Seitenränder -\setlength{\hoffset}{-1.5cm} -\setlength{\voffset}{-0.4cm} -\setlength{\textwidth}{13cm} -\setlength{\textheight}{16cm} -\setlength{\footskip}{1.4cm} -\setlength{\headheight}{1.2cm} -\setlength{\headsep}{0.6cm} +%\setlength{\hoffset}{-1.5cm} +%\setlength{\voffset}{-0.4cm} +%\setlength{\textwidth}{13cm} +%\setlength{\textheight}{16cm} +%\setlength{\footskip}{1.4cm} +%\setlength{\headheight}{1.2cm} +%\setlength{\headsep}{0.6cm} \renewcommand{\headrulewidth}{0pt} % Grid einstellen @@ -19,10 +20,11 @@ \lfoot{ \begin{textblock}{60}(0,40) \vspace{3px} -\includegraphics[width=\textwidth,height=36px]{img/titellinie-unten.png} +\includegraphics[width=\textwidth,height=36px]{\FMbasepath/img/titellinie-unten.png} \end{textblock} -} -\cfoot{\sf{\textcolor{darkgray}{0x\ifthenelse{\value{page}>15}{}{0}\Hexadecimal{page}}}} +} +%\cfoot{\sf{\textcolor{darkgray}{0x\ifthenelse{\value{page}>15}{}{0}\Hexadecimal{page}}} + % Ueberschriften \titlespacing{\section}{0mm}{0mm}{-3mm} diff --git a/openfm/packages.tex b/openfm/packages.tex index 69fbff8..6701757 100644 --- a/openfm/packages.tex +++ b/openfm/packages.tex @@ -16,8 +16,8 @@ \usepackage{ngerman} \usepackage{amssymb} % math symbols \usepackage{amsmath} % math commands -\usepackage[math]{iwona} % math font -\usepackage{bbm} % "blackboard-style" cm fonts. +%\usepackage[math]{iwona} % math font +%\usepackage{bbm} % "blackboard-style" cm fonts. \usepackage{textcomp} \usepackage{graphicx} \usepackage{eurosym}