gitolite
/
datenschleuder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge ../test1/ 

Conflicts:
	main.tex
	openfm/commands.tex
	openfm/layout.tex
master
john stone 2013-05-21 00:14:05 +02:00
parent c646d470de 641bd82f3e
commit 01a15ee971
5 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/example/article.tex
View File

@ -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.

14
main.tex
View File

@ -1,18 +1,30 @@
% 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}
\subimport{openfm/}{packages}
\subimport{openfm/}{layout}
\subimport{openfm/}{commands}
\usepackage{fmtcount}
\renewcommand*{\thepage}{\Hexadecimal{page}}
\begin{document}
\input{content/editorial}
\vspace{4cm}
\input{content/impressum}
\newpage
\thispagestyle{plain}
\FMTOC{General}{Table of contents!}
\newpage
\input{content/example/article}

9
openfm/commands.tex
View File

@ -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]{openfm/img/line-top.png}
\includegraphics[width=\textwidth,height=36px]{\FMbasepath img/line-top.png}
\end{textblock}
}
}

22
openfm/layout.tex
View File

@ -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]{openfm/img/line-bottom.png}
\includegraphics[width=\textwidth,height=36px]{\FMbasepath/img/line-bottom.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}

4
openfm/packages.tex
View File

@ -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}