diff --git a/Clean-Thesis.pdf b/Clean-Thesis.pdf
deleted file mode 100644
index 6e69722..0000000
Binary files a/Clean-Thesis.pdf and /dev/null differ
diff --git a/README b/README
index f164ea4..fff7a4f 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
Clean Thesis
-- A LaTeX Style for Thesis Documents --
-Copyright (C) 2011 Ricardo Langner
+Copyright (C) 2011-2012 Ricardo Langner
Readme:
diff --git a/cleanthesis.pdf b/cleanthesis.pdf
new file mode 100644
index 0000000..d1ec596
Binary files /dev/null and b/cleanthesis.pdf differ
diff --git a/cleanthesis.sty b/cleanthesis.sty
index 8aabcd4..050974a 100644
--- a/cleanthesis.sty
+++ b/cleanthesis.sty
@@ -2,7 +2,7 @@
% Clean Thesis
% -- A LaTeX Style for Thesis Documents --
%
-% Copyright (C) 2011 Ricardo Langner
+% Copyright (C) 2011-2012 Ricardo Langner
% **************************************************
%
% Readme:
@@ -53,114 +53,166 @@
% along with this program. If not, see .
% **************************************************
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cleanthesis}[2011/05/27 v0.1b Clean-looking thesis style inspired by Apple's user guide documents]
-
-%\RequirePackage{xkvview}
-
-%\RequirePackage{xkeyval}
-
-% OPTIONS and VALUES
-% sansserif = true|false
-% colormode = full|reduced|bw
-% figurecaptionhang = true|false
-% sectionhang = true|false
-% subsectionhang = true|false
-% figuresep = none|colon|period|space|quad|newline|endash
-
-
-% \define@choicekey*[ct]{warning}{errorlevel}{info,warning,error}[info]{}
-% \setkeys{warning}{errorlevel=info}
-% \DeclareOptionX*{
- % \PackageWarning{cleanthesis}{Unknown option ‘\CurrentOption’}%
-% }
-%\ProcessOptionsX
-
-
-
-\RequirePackage{ifthen}
- \newboolean{@sansserif}
- \newboolean{@colorbw}
- \newboolean{@colorreduced}
- \newboolean{@figurecaptionoutside}
- \newboolean{@sectionlabeloutside}
- \newboolean{@subsectionlabeloutside}
-
+\ProvidesPackage{cleanthesis}[2012/02/01 v0.2 Clean-looking thesis style inspired by Apple's user guide documents]
+%
% **************************************************
-% Style Options
+% Package options
% **************************************************
-\DeclareOption{sansserif}{\setboolean{@sansserif}{true}}
-\DeclareOption{colorbw}{\setboolean{@colorbw}{true}}
-\DeclareOption{colorreduced}{\setboolean{@colorreduced}{true}}
-\DeclareOption{figurecaptionoutside}{\setboolean{@figurecaptionoutside}{true}}
-\DeclareOption{sectionlabeloutside}{\setboolean{@sectionlabeloutside}{true}}
-\DeclareOption{subsectionlabeloutside}{\setboolean{@subsectionlabeloutside}{true}}
-\DeclareOption*{%
+%
+% -- process all available package options
+%
+%
+% The xkeyval package enables us to handle for example key-value pairs
+% in an easy way
+\RequirePackage{xkeyval}
+
+% OPTION sansserif
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{sansserif}[true]{}
+\setkeys[ct]{cthesis}{sansserif=false}
+
+% OPTION hangfigurecaption
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{hangfigurecaption}[true]{}
+\setkeys[ct]{cthesis}{hangfigurecaption=false}
+
+% OPTION hangsection
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{hangsection}[true]{}
+\setkeys[ct]{cthesis}{hangsection=true}
+
+% OPTION hangsubsection
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{hangsubsection}[true]{}
+\setkeys[ct]{cthesis}{hangsubsection=true}
+
+% OPTION figuresep
+% --> values = none|colon|period|space|quad|endash
+\define@choicekey*[ct]{cthesis}{figuresep}{none,colon,period,space,quad,newline,endash}[endash]{\def\cthesis@figuresep{#1}}
+\setkeys[ct]{cthesis}{figuresep=endash}
+
+% OPTION colorize
+% --> values = full|reduced|bw
+\define@choicekey*[ct]{cthesis}{colorize}[\val\colorizenr]{full,reduced,bw}[full]{\def\cthesis@colorize{\colorizenr}}
+\setkeys[ct]{cthesis}{colorize=full}
+
+% OPTION colortheme
+% --> values = bluemagenta|bluegreen
+\define@choicekey*[ct]{cthesis}{colortheme}[\val\themenr]{bluemagenta,bluegreen}[bluemagenta]{\def\cthesis@colortheme{\themenr}}
+\setkeys[ct]{cthesis}{colortheme=bluemagenta}
+
+\DeclareOptionX*{
\PackageWarning{cleanthesis}{Unknown option ‘\CurrentOption’}%
}
-\ProcessOptions\relax % executes the code for each option
+
+\ProcessOptionsX[ct]
% **************************************************
% Color Definitions
% **************************************************
+%
+% -- defines color themes and color commands
+%
+%
+% The xcolor package enables us to create/handle/name different colors
\RequirePackage[dvipsnames]{xcolor}
-% general clean thesis colors
-\definecolor{cthesisblack}{gray}{.05}
-\definecolor{cthesisgraylight}{gray}{.8}
-\definecolor{cthesismaincolor}{cmyk}{1, .50, .10, .01}
-\definecolor{cthesisaccessorycolor}{cmyk}{.18, .98, .18, 0}
+% updates all colors regarding the defined main and accessory
+% color, as well as the defined colorize mode (full, reduced, bw)
+\long\def\ct@cthesis@updatecolors{%
+ % sets all colors (like colorize == full)
+ % -- footer colors
+ \colorlet{ctcolorfooterpage}{ctcolorblack}
+ \colorlet{ctcolorfooterline}{ctcolormain}
+ \colorlet{ctcolorfootermark}{ctcolorblack}
+ \colorlet{ctcolorfootertitle}{ctcolormain}
+ % -- sectioning colors
+ \colorlet{ctcolorpartnum}{ctcolormain}
+ \colorlet{ctcolorpartline}{ctcolorblack}
+ \colorlet{ctcolorparttext}{ctcolorblack}
+ \colorlet{ctcolorchapternum}{ctcolormain}
+ \colorlet{ctcolorchapterline}{ctcolormain}
+ \colorlet{ctcolorsection}{ctcolormain}
+ \colorlet{ctcolorsubsection}{ctcolormain}
+ \colorlet{ctcolorparagraph}{ctcolorblack}
+ % --> text colors
+ \colorlet{ctcolorfloatlabel}{ctcoloraccessory}
+ \colorlet{ctcolorlistlabel}{ctcolormain}
+
+ \ifcase\cthesis@colorize
+ % case = 0 (colorize == full)
+ % do nothing
+ \or
+ % case = 1 (colorize == reduced)
+ % --> footer colors
+ \colorlet{ctcolorfooterline}{ctcolorgray}
+ \colorlet{ctcolorfootertitle}{ctcolorgray}
+ % --> sectioning colors
+ \colorlet{ctcolorsubsection}{ctcolorblack}
+ \colorlet{ctcolorpartnum}{ctcolorblack}
+ % --> text colors
+ \colorlet{ctcolorlistlabel}{ctcolorblack}
+ \or
+ % case = 2 (colorize == bw)
+ % --> footer colors
+ \colorlet{ctcolorfooterline}{ctcolorgray}
+ \colorlet{ctcolorfootertitle}{ctcolorgray}
+ % --> sectioning colors
+ \colorlet{ctcolorpartnum}{ctcolorblack}
+ \colorlet{ctcolorchapternum}{ctcolorblack}
+ \colorlet{ctcolorchapterline}{ctcolorblack}
+ \colorlet{ctcolorsection}{ctcolorblack}
+ \colorlet{ctcolorsubsection}{ctcolorblack}
+ % --> text colors
+ \colorlet{ctcolorfloatlabel}{ctcolorblack}
+ \colorlet{ctcolorlistlabel}{ctcolorblack}
+ \else
+ \fi
+}
-% footer colors
-\colorlet{cthesiscolorfooterpage}{cthesisblack}
-\colorlet{cthesiscolorfooterline}{cthesismaincolor}
-\colorlet{cthesiscolorfootermark}{cthesisblack}
-\colorlet{cthesiscolorfootertitle}{cthesismaincolor}
+% sets the main and accessory color for the document
+\def\cthesissetcolor#1#2#3{%
+ \definecolor{ctcolormain}{#1}{#2}%
+ \definecolor{ctcoloraccessory}{#1}{#3}%
+ \ct@cthesis@updatecolors%
+}
-% part colors
-\colorlet{cthesiscolorpartnum}{cthesismaincolor}
-\colorlet{cthesiscolorpartline}{cthesisblack}
-\colorlet{cthesiscolorparttext}{cthesisblack}
+% sets the blue-magenta color theme (blue/magenta)
+\def\cthesissetcolorbluemagenta{%
+ \cthesissetcolor{cmyk}{1, .50, .10, .01}{.18, .98, .18, 0}%
+}
-% chapter colors
-\colorlet{cthesiscolorchapternum}{cthesismaincolor}
-\colorlet{cthesiscolorchapterline}{cthesismaincolor}
+% sets the blue-green color theme (blue/green)
+\def\cthesissetcolorbluegreen{%
+ \cthesissetcolor{cmyk}{.61, .47, .03, 0}{.48, .05, .91, 0}%
+}
-% text colors
-\colorlet{cthesiscolorsection}{cthesismaincolor}
-\colorlet{cthesiscolorsubsection}{cthesismaincolor}
-\colorlet{cthesiscolorfloatlabel}{cthesisaccessorycolor}
-\colorlet{cthesiscolorlistlabel}{cthesismaincolor}
-\colorlet{cthesiscolorparagraph}{cthesisblack}
+% defines general colors
+\definecolor{ctcolorblack}{gray}{0}
+\definecolor{ctcolorgray}{gray}{.5}
+\definecolor{ctcolorgraylight}{gray}{.8}
+
+% sets the color theme regarding the given package option colortheme
+\ifcase\cthesis@colortheme
+ % case 0 (colortheme == bluemagenta)
+ \cthesissetcolorbluemagenta
+\or
+ % case 1 (colortheme == bluegreen)
+ \cthesissetcolorbluegreen
+\else
+ % all other cases
+ \cthesissetcolorbluemagenta
+\fi
-\ifthenelse{\boolean{@colorbw}}%
- {%
- \setboolean{@colorreduced}{true}%
- %
- \colorlet{cthesiscolorchapternum}{cthesisblack}%
- \colorlet{cthesiscolorchapterline}{cthesisblack}%
- %
- \colorlet{cthesiscolorsection}{cthesisblack}%
- \colorlet{cthesiscolorfloatlabel}{cthesisblack}%
- %
- \colorlet{cthesiscolorpartnum}{cthesisblack}
- }{}
-\ifthenelse{\boolean{@colorreduced}}%
- {%
- \colorlet{cthesiscolorfooterline}{cthesisblack}
- \colorlet{cthesiscolorfootertitle}{cthesisblack}
- \colorlet{cthesiscolorsubsection}{cthesisblack}
- \colorlet{cthesiscolorlistlabel}{cthesisblack}
- %
- \colorlet{cthesiscolorpartnum}{cthesisblack}
- }{}
% **************************************************
% Font Definitions (see http://www.tug.dk/FontCatalogue/)
% **************************************************
\RequirePackage[T1]{fontenc} % font types and character verification
-\ifthenelse{\boolean{@sansserif}}%
- {%
+%\ifthenelse{\boolean{@sansserif}}%
+\ifct@cthesis@sansserif
+% {%
% Using sans-serif fonts
%
%\RequirePackage{helvet} % Font: Helvetica
@@ -169,13 +221,15 @@
%\RequirePackage{libertine} % Font: Biolinum, the standard sans serif typeface with the Libertine package
%\RequirePackage[scaled]{berasans} % Font: Bera Sans, a a version of Bitstream Vera Sans slightly enhanced
\renewcommand*\familydefault{\sfdefault}%
- }{%
+% }{%
+\else
% Using serif fonts
%
\RequirePackage{lmodern} % font set: Latin Modern
\RequirePackage{charter} % font set: Charter
%\RequirePackage{fourier} % font set: (basically improved utopia)
- }
+% }
+\fi
% **************************************************
% Load Packages
@@ -193,15 +247,17 @@
%
\RequirePackage[ % modify figure and table captions
font={small}, % - small font size
- labelfont={bf,sf,color=cthesiscolorfloatlabel},% - label in bold, sans-serif and magenta
- labelsep=endash, % - separator: none, colon, period, space, quad, newline, endash
+ labelfont={bf,sf,color=ctcolorfloatlabel},% - label in bold, sans-serif and magenta
+ labelsep=\cthesis@figuresep, % - separator: none, colon, period, space, quad, newline, endash
singlelinecheck=false % - no centered single-lined captions
]{caption}[2008/08/24]
-\ifthenelse{\boolean{@figurecaptionoutside}}%
- {%
+%\ifthenelse{\boolean{@figurecaptionoutside}}%
+\ifct@cthesis@hangfigurecaption
+% {%
\DeclareCaptionFormat{llap}{\llap{#1#2}#3\par}%
\captionsetup{format=llap,labelsep=quad,singlelinecheck=false}%
- }{}
+% }{}
+\fi
%
\RequirePackage[ % page layout modifications
paper=a4paper, % - use A4 paper size
@@ -288,7 +344,7 @@
\renewcommand{\descriptionlabel}[1]{%
\hspace*{\labelsep}%
- \color{cthesiscolorlistlabel}%
+ \color{ctcolorlistlabel}%
\tgherosfont\textbf{#1}%
}
\newenvironment{my_list_desc}
@@ -309,17 +365,17 @@
\renewcommand{\chaptermark}[1]{%
\markboth{%
\footnotesize%
- {\color{cthesiscolorfootermark}\textbf{\chaptername\ \thechapter}}%
+ {\color{ctcolorfootermark}\textbf{\chaptername\ \thechapter}}%
\quad%
- {\color{cthesiscolorfootertitle}#1}%
+ {\color{ctcolorfootertitle}#1}%
}{}%
}
\renewcommand{\sectionmark}[1]{%
\markright{%
\footnotesize%
- {\color{cthesiscolorfootermark}\textbf{\thesection}}%
+ {\color{ctcolorfootermark}\textbf{\thesection}}%
\quad%
- {\color{cthesiscolorfootertitle}#1}%
+ {\color{ctcolorfootertitle}#1}%
}%
}
%
@@ -328,18 +384,18 @@
\fancyfootoffset[OR]{1.85cm}
\fancyfoot[OR]{%
{\ }\tgherosfont%
- {\color{cthesiscolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
+ {\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
\hspace*{10pt}\begin{minipage}[b]{1.5cm}%
- \color{cthesiscolorfooterpage}\normalsize\textbf{\thepage}%
+ \color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
\end{minipage}%
}
\fancyfootoffset[EL]{1.85cm}
\fancyfoot[EL]{%
\tgherosfont%
\begin{minipage}[b]{1.5cm}%
- \raggedleft\color{cthesiscolorfooterpage}\normalsize\textbf{\thepage}%
+ \raggedleft\color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
\end{minipage}%
- \hspace*{10pt}{\color{cthesiscolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
+ \hspace*{10pt}{\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
}
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}
@@ -352,19 +408,19 @@
\fancyfoot[OR]{%
{\ }\tgherosfont\footnotesize%
\rightmark%
- \hspace*{0.75cm}{\color{cthesiscolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
+ \hspace*{0.75cm}{\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
\hspace*{10pt}\begin{minipage}[b]{1.5cm}%
- \color{cthesiscolorfooterpage}\normalsize\textbf{\thepage}%
+ \color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
\end{minipage}%
}
\fancyfootoffset[EL]{1.85cm}
\fancyfoot[EL]{%
\tgherosfont\footnotesize%
\begin{minipage}[b]{1.5cm}%
- \raggedleft\color{cthesiscolorfooterpage}\normalsize\textbf{\thepage}%
+ \raggedleft\color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
\end{minipage}%
\footnotesize%
- \hspace*{10pt}{\color{cthesiscolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
+ \hspace*{10pt}{\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
\hspace*{0.75cm}\leftmark%
}
}
@@ -435,13 +491,13 @@
\newcommand{\book}{\fontfamily{pbk}\fontseries{m}\fontsize{11}{13}\selectfont}
\newcommand{\tgherosfont}{\fontfamily{qhv}\selectfont}
-\newcommand{\thesispartlabelfont}{\color{cthesiscolorpartnum}\book\fontsize{60}{60}\selectfont}
-\newcommand{\thesispartfont}{\color{cthesiscolorparttext}\huge \tgherosfont\selectfont}
-\newcommand{\thesischapterfont}{\color{cthesisblack}\huge \fontfamily{phv}\selectfont}
-%\newcommand{\thesissectionfont}{\color{cthesismaincolor}\LARGE\bfseries \tgherosfont}
-\newcommand{\thesissectionfont}{\color{cthesiscolorsection}\LARGE \tgherosfont}
-\newcommand{\thesissubsectionfont}{\color{cthesiscolorsubsection}\Large \tgherosfont}
-\newcommand{\thesisparagraphfont}{\color{cthesiscolorparagraph}\tgherosfont\small\bfseries}
+\newcommand{\thesispartlabelfont}{\color{ctcolorpartnum}\book\fontsize{60}{60}\selectfont}
+\newcommand{\thesispartfont}{\color{ctcolorparttext}\huge \tgherosfont\selectfont}
+\newcommand{\thesischapterfont}{\color{ctcolorblack}\huge \fontfamily{phv}\selectfont}
+%\newcommand{\thesissectionfont}{\color{ctcolormain}\LARGE\bfseries \tgherosfont}
+\newcommand{\thesissectionfont}{\color{ctcolorsection}\LARGE \tgherosfont}
+\newcommand{\thesissubsectionfont}{\color{ctcolorsubsection}\Large \tgherosfont}
+\newcommand{\thesisparagraphfont}{\color{ctcolorparagraph}\tgherosfont\small\bfseries}
%
% headings
\setkomafont{part}{\thesispartfont} % for chapter entries
@@ -482,7 +538,7 @@
{\raggedleft{%
{\thesispartlabelfont%
\partname\ \thepart\quad}%
- {\color{cthesiscolorpartline}%
+ {\color{ctcolorpartline}%
\hspace*{-225pt}\rule[20pt]{600pt}{2pt}}
}%
}%
@@ -494,9 +550,9 @@
\titleformat{\chapter}[display]%
{\usekomafont{chapter}}%
{\vspace{-8em}\raggedleft{%
- {\color{cthesiscolorchapterline}%
+ {\color{ctcolorchapterline}%
\rule[-5pt]{2pt}{5cm}}\quad%
- {\color{cthesiscolorchapternum}
+ {\color{ctcolorchapternum}
\fontsize{60}{60}\selectfont\thechapter}%
}%
}%
@@ -506,41 +562,47 @@
%
% > formats: \section
\titlespacing{\section}{0em}{.75em}{.2em}%[0pt]
-\ifthenelse{\boolean{@sectionlabeloutside}}%
- {%
+%\ifthenelse{\boolean{@sectionlabeloutside}}%
+\ifct@cthesis@hangsection
+% {%
\titleformat{\section}[hang]%
{\usekomafont{section}}%
- {\color{cthesisblack}\thesection\hspace*{10pt}}%
+ {\color{ctcolorblack}\thesection\hspace*{10pt}}%
{0pt}%
{\raggedright}%
[\phantomsection]
- }{%
+% }{%
+\else
\titleformat{\section}[block]%
{\usekomafont{section}}%
- {\color{cthesisblack}\thesection\hspace*{10pt}}%
+ {\color{ctcolorblack}\thesection\hspace*{10pt}}%
{0pt}%
{\raggedright}%
[\phantomsection]
- }
+% }
+\fi
%
% > formats: \subsection
\titlespacing{\subsection}{0em}{.5em}{0em}%[0pt]
-\ifthenelse{\boolean{@subsectionlabeloutside}}%
- {%
+%\ifthenelse{\boolean{@subsectionlabeloutside}}%
+\ifct@cthesis@hangsubsection
+% {%
\titleformat{\subsection}[hang]%
{\usekomafont{subsection}}%
- {\color{cthesisblack}\thesubsection\hspace*{10pt}}%
+ {\color{ctcolorblack}\thesubsection\hspace*{10pt}}%
{0pt}%
{\raggedright}%
[\phantomsection]
- }{%
+% }{%
+\else
\titleformat{\subsection}[block]%
{\usekomafont{subsection}}%
- {\color{cthesisblack}\thesubsection\hspace*{10pt}}%
+ {\color{ctcolorblack}\thesubsection\hspace*{10pt}}%
{0pt}%
{\raggedright}%
[\phantomsection]
- }
+% }
+\fi
%
% > formats: \paragraph
\titlespacing{\paragraph}{0pt}{\parsep}{1em}%[0pt]
@@ -579,7 +641,7 @@
% Clean chapter quotations
\newcommand{\hugequote}{%
{\book\fontsize{75}{80}\selectfont%
- \hspace*{-.475em}\color{cthesisgraylight}%
+ \hspace*{-.475em}\color{ctcolorgraylight}%
\textit{\glqq}%
\vskip -.26em}%
}
@@ -615,3 +677,6 @@
%
% Clean signs around word origins in definitions
%\newcommand{\cthesisorigin}[1]{\textsf{\textlangle}#1\textsf{\textrangle}}
+
+
+
diff --git a/cleanthesis.tex b/cleanthesis.tex
new file mode 100644
index 0000000..d8969a9
--- /dev/null
+++ b/cleanthesis.tex
@@ -0,0 +1,116 @@
+\documentclass{ltxdockit}
+\usepackage{btxdockit}
+\usepackage[utf8]{inputenc}
+\usepackage[american]{babel}
+\usepackage[strict]{csquotes}
+\usepackage{tabularx}
+\usepackage{longtable}
+\usepackage{booktabs}
+\usepackage{shortvrb}
+\usepackage{pifont}
+
+\rcsid{$Id: cleanthesis.tex,v 0.2 2012/02/01 12:30:00 rlangner stable $}
+
+\newcommand*{\cleanthesis}{CleanThesis\xspace}
+\newcommand*{\cthesishome}{http://cleanthesis.der-ric.de/}
+%\newcommand*{\cthesisctan}{http://www.ctan.org/tex-archive/macros/latex/contrib/../}
+
+\titlepage{%
+ title={The \sty{cleanthesis} Package},
+ subtitle={A LaTeX Style for Thesis Documents},
+ url={\cthesishome},
+ author={Ricardo Langner},
+ email={info@cleanthesis.der-ric.de},
+ revision={\rcsrevision},
+ date={\rcstoday}}
+
+\hypersetup{%
+ pdftitle={The \cleanthesis Package},
+ pdfsubject={A LaTeX Style for Thesis Documents},
+ pdfauthor={Ricardo Langner},
+ pdfkeywords={tex, latex, thesis, style}}
+
+
+%\setcounter{secnumdepth}{4}
+
+\begin{document}
+
+\printtitlepage
+\tableofcontents
+\listoftables
+
+\section{Introduction}
+\label{sec:intro}
+
+\subsection[About]{About \sty{cleanthesis}}
+\label{sec:intro:about}
+
+\subsection{License}
+\label{sec:intro:license}
+
+Copyright \textcopyright\ 2011--2012 Ricardo Langner.
+\cleanthesis is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+\cleanthesis is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program.
+If not, see .
+
+\subsection{Feedback}
+\label{sec:intro:feedback}
+
+\subsection{Acknowledgments}
+\label{sec:intro:ack}
+
+\subsection{Prerequisites}
+\label{sec:intro:pre}
+
+The follwing section gives an overview of all resources required by this package.
+
+\subsubsection{Requirements}
+\label{sec:intro:req}
+
+\section{User Guide}
+\label{sec:userguide}
+
+\subsection{Package Options}
+\label{sec:userguide:pkgopt}
+
+All package options are given in \keyval notation.
+The value \texttt{true} can be omitted for all boolean keys, \eg \opt{sansserif} without a value is equivalent to \kvopt{sansserif}{true}.
+
+All of the following options must be used as \sty{cthesis} is loaded, \ie in the optional argument to \cmd{usepackage}.
+
+\begin{optionlist}
+
+\boolitem[false]{sansserif}
+
+Sets whether to use a sans serif font or not.
+
+\boolitem[false]{hangfigurecaption}
+
+\boolitem[true]{hangsection}
+
+\boolitem[true]{hangsubsection}
+
+\optitem[endash]{figuresep}{\opt{none},\opt{colon},\opt{period},\opt{space},\opt{quad},\opt{endash}}
+
+This option can be used to define a different label separator for cations of figures. The following value are allowed:
+
+\begin{valuelist}
+\item[none] Inserts no character in between.
+\item[colon] Inserts a colon (\textbf{:}) in between.
+\item[period] Inserts a period (\textbf{.}) in between.
+\item[space] Inserts a single space character in between.
+\item[quad] Inserts a \cmd{\\quad} in between.
+\item[endash] Inserts an en dash (\textbf{--}) in between.
+\end{valuelist}
+
+\optitem[full]{colorize}{\opt{full},\opt{reduced},\opt{bw}}
+
+\optitem[bluemagenta]{colortheme}{\opt{bluemagenta},\opt{bluegreen}}
+
+\end{optionlist}
+
+\end{document}
diff --git a/content/titlepages.tex b/content/titlepages.tex
index 0165dc8..d80a37e 100644
--- a/content/titlepages.tex
+++ b/content/titlepages.tex
@@ -29,7 +29,7 @@
\vfill
{\large \thesisSubject} \\[5mm]
- {\LARGE \color{cthesismaincolor}\textbf{\thesisTitle} \\[10mm]}
+ {\LARGE \color{ctcolormain}\textbf{\thesisTitle} \\[10mm]}
{\Large \thesisName} \\
\vfill
diff --git a/thesis-example.pdf b/thesis-example.pdf
new file mode 100644
index 0000000..9f2663a
Binary files /dev/null and b/thesis-example.pdf differ
diff --git a/Clean-Thesis.tex b/thesis-example.tex
similarity index 65%
rename from Clean-Thesis.tex
rename to thesis-example.tex
index 25b4831..b480832 100644
--- a/Clean-Thesis.tex
+++ b/thesis-example.tex
@@ -1,8 +1,8 @@
% **************************************************
% Clean Thesis
% -- A LaTeX Style for Thesis Documents --
-%
-% Copyright (C) 2011 Ricardo Langner
+%
+% Copyright (C) 2011-2012 Ricardo Langner
% **************************************************
%
% Readme:
@@ -10,23 +10,23 @@
% *** Clean, Simple, Elegant ***
% "Clean Thesis" is a LaTeX style for thesis documents, developed
% for my diplom thesis (Diplomarbeit). The style can be understood
-% as my personal compromise  a typical clean looking scientific
+% as my personal compromise - a typical clean looking scientific
% document combined and polished with minor beautifications.
-%
+%
% The design of this "Clean Thesis" style is inspired
% by user guide documents from Apple Inc.
-%
+%
% Note: If you are looking for an exact and correct style regarding
% typographic rules, please have a look at the "Classic Thesis Style"
% (see http://www.miede.de/index.php?page=classicthesis).
-%
+%
% *** Donation = Postcard ***
% Based on the idea of Andr\'e Miede: If you like the "Clean Thesis"
% style I would be very pleased about a donation in the form of a
% POSTCARD. You can find my address at http://cleanthesis.der-ric.de/
% as well as in the file Clean-Thesis.pdf. I am going to collect all
% postcards and exhibit them at the website I mentioned.
-%
+%
% *** Idea and Inspiration ***
% The idea of providing my customized style for thesis documents
% passed through my mind while writing my own thesis. Motivated and
@@ -35,22 +35,22 @@
% (thanks to Andr\'e for doing a great job) I decided to collect all
% design and style related functionality in a separate LaTeX style and
% provide this style to other thesis writers.
-%
-%
+%
+%
% License Information:
% ----------------------------------------
% "Clean Thesis" is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
% the Free Software Foundation, either version 3 of the License, or
% (at your option) any later version.
-%
+%
% "Clean Thesis" is distributed in the hope that it will be useful,
% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
% GNU General Public License for more details.
-%
+%
% You should have received a copy of the GNU General Public License
-% along with this program. If not, see .
+% along with this program. If not, see .
% **************************************************
@@ -70,7 +70,7 @@
titlepage=on, % own page for each title page
captions=tableabove, % display table captions above the float env
draft=false, % value for draft version
-]{scrbook}% scrreprt
+]{scrreprt}%
% **************************************************
% Debug LaTeX Information
@@ -80,15 +80,11 @@
% **************************************************
% Information and Commands for Reuse
% **************************************************
-\newcommand{\thesisTitle}{Novel Interaction and Visualization Techniques
-for Node-Link Diagram Editing and Exploration}
-\newcommand{\thesisName}{Mathias Frisch}
-\newcommand{\thesisSubject}{Dissertation}
-\newcommand{\thesisDate}{January, 2012}
-\newcommand{\thesisVersion}{0.1b}
-
-\newcommand{\thesisFirstSupervisor}{Prof. Dr. Raimund Dachselt}
-\newcommand{\thesisSecondSupervisor}{}
+\newcommand{\thesisTitle}{The Clean Thesis Style}
+\newcommand{\thesisName}{Ricardo Langner}
+\newcommand{\thesisSubject}{Documentation}
+\newcommand{\thesisDate}{February 1, 2012}
+\newcommand{\thesisVersion}{0.2}
\newcommand{\thesisFirstReviewer}{Jane Doe}
\newcommand{\thesisFirstReviewerUniversity}{\protect{Clean Thesis Style University}}
@@ -98,44 +94,37 @@ for Node-Link Diagram Editing and Exploration}
\newcommand{\thesisSecondReviewerUniversity}{\protect{Clean Thesis Style University}}
\newcommand{\thesisSecondReviewerDepartment}{Department of Clean Thesis Style}
+\newcommand{\thesisFirstSupervisor}{Jane Doe}
+\newcommand{\thesisSecondSupervisor}{John Smith}
-
-\newcommand{\thesisUniversity}{\protect{Otto-von-Guericke-University Magdeburg}}
-\newcommand{\thesisUniversityDepartment}{Department of Computer Science}
-\newcommand{\thesisUniversityInstitute}{Institute for Simulation and Computer Graphics}
-\newcommand{\thesisUniversityGroup}{User Interface \& Software Engineering Group}
-\newcommand{\thesisUniversityCity}{Magdeburg}
-\newcommand{\thesisUniversityStreetAddress}{Universit\"atsplatz 2}
-\newcommand{\thesisUniversityPostalCode}{39104}
-
-%% figure references
-\newcommand{\F}[1]{Figure~\ref{#1}}
-\newcommand{\f}[2][]{Figure~\ref{#2} #1}
-\newcommand{\Fb}[2][]{Figure~\ref{#2} (#1)}
-\newcommand{\s}[2][]{Section~\ref{#2}#1}
-%\newcommand{\cha}[2][]{Chapter~\ref{#2}#1}
-\newcommand{\tecterm}[2][]{\textit{#2}#1}
-
-
+\newcommand{\thesisUniversity}{\protect{Clean Thesis Style University}}
+\newcommand{\thesisUniversityDepartment}{Department of Clean Thesis Style}
+\newcommand{\thesisUniversityInstitute}{Institut for Clean Thesis Dev}
+\newcommand{\thesisUniversityGroup}{Clean Thesis Group (CTG)}
+\newcommand{\thesisUniversityCity}{City}
+\newcommand{\thesisUniversityStreetAddress}{Street address}
+\newcommand{\thesisUniversityPostalCode}{Postal Code}
% **************************************************
% Load and Configure Packages
% **************************************************
-%\usepackage[utf8]{inputenc} % defines file's character encoding
+\usepackage[utf8]{inputenc} % defines file's character encoding
\usepackage[english]{babel} % babel system, adjust the language of the content
\usepackage[ % clean thesis style
- %sansserif, % -use sans serif font family
- %colorreduced, % - controls the use of colors; use colorreduced or colorbw
- %figurecaptionoutside, % - puts the label of figures into the margin
- sectionlabeloutside, % - puts the label of sections into the margin
- %subsectionlabeloutside, % - puts the label of subsections into the margin
+ figuresep=colon,%
+ sansserif=false,%
+ hangfigurecaption=false,%
+ hangsection=true,%
+ hangsubsection=true,%
+ colorize=full,%
+ colortheme=bluemagenta,%
]{cleanthesis}
\hypersetup{ % setup the hyperref-package options
pdftitle={\thesisTitle}, % - title (PDF meta)
pdfsubject={\thesisSubject},% - subject (PDF meta)
pdfauthor={\thesisName}, % - author (PDF meta)
- plainpages=false, % -
+ plainpages=false, % -
colorlinks=false, % - colorize links?
pdfborder={0 0 0}, % -
breaklinks=true, % - allow line break inside links
@@ -143,23 +132,6 @@ for Node-Link Diagram Editing and Exploration}
bookmarksopen=true %
}
-\usepackage{pdfpages}
-\usepackage{xcolor}
-\usepackage{soul}
-
-%% yellow marked text
-\definecolor{yellow_highlight}{rgb}{1,1,0}
-\newcommand{\Y}[1]{\hl{#1}}
-
-
-
-\makeatletter
-\newcommand{\labitem}[2]{%
-\def\@itemlabel{\textbf{#1}}
-\item
-\def\@currentlabel{#1}\label{#2}}
-\makeatother
-
% **************************************************
% Document CONTENT
% **************************************************
@@ -199,53 +171,24 @@ for Node-Link Diagram Editing and Exploration}
\setcounter{page}{1} % set page counter
\pagestyle{maincontentstyle} % fancy header and footer
-
-%\input{content/chapter-introduction} % INCLUDE: introduction
-\input{content/chapter1-motivation}
-
-\part{Research Background}
-\label{part:background}
-
-\input{content/chapter2-researchBackground}
-\input{content/chapter3-devicesTechnologies}
-\input{content/chapter4-requirements}
-
-%\end{part}
-\begin{part}{Creating and Editing \\Node-Link Diagrams}
-\input{content/chapter5-relatedWork}
-\input{content/chapter6-diagramEditing}
-\input{content/chapter7-diagramLayouts}
-\input{content/chapter8-pensPaper}
-\end{part}
-\begin{part}{Exploring and Analyzing \\Node-Link Diagrams}
-\input{content/chapter9-relatedWork}
-\input{content/chapter10-offscreen}
-\input{content/chapter11-offscreentouch}
-\end{part}
-\begin{part}{Conclusions \& Outlook}
-\input{content/chapter12-contributions}
-%\input{content/chapter13-discussion}
-\input{content/chapter14-outlook}
-\end{part}
+\input{content/chapter-introduction} % INCLUDE: introduction
+\input{content/chapter-related-work} % INCLUDE: related work
+\input{content/chapter-system} % INCLUDE: system
+\input{content/chapter-concepts} % INCLUDE: concepts
+\input{content/chapter-conclusion} % INCLUDE: conclusion
\cleardoublepage
% --------------------------
% Back matter
% --------------------------
-
-
-%\printbibheading
-\cleardoublepage
-
-
{%
\setstretch{1.1}
\renewcommand{\bibfont}{\normalfont\small}
\setlength{\biblabelsep}{0pt}
\setlength{\bibitemsep}{0.5\baselineskip plus 0.5\baselineskip}
-%\nocite{*}
+\nocite{*}
\printbibliography[nottype=online]
-\printbibliography[heading=subbibliography,title={Websites},type=online,prefixnumbers={@}]
+\printbibliography[heading=subbibliography,title={Webseiten},type=online,prefixnumbers={@}]
}
\cleardoublepage
@@ -255,13 +198,7 @@ for Node-Link Diagram Editing and Exploration}
\listoftables
\cleardoublepage
-\begin{appendix}
-\input{content/appendixA}
-\input{content/appendixB}
-\input{content/appendixC}
-\end{appendix}
-
-%\input{content/colophon}
+\input{content/colophon}
\cleardoublepage
\input{content/declaration}