From 09b1cc969362949bb85e55e8484dc2d6f3e2b362 Mon Sep 17 00:00:00 2001 From: Thomas Pietrzak Date: Wed, 23 Jan 2019 15:29:46 +0100 Subject: [PATCH] style --- .gitignore | 4 +- hdrmain.tex | 104 ++++++++++++++++++++++++++++++++---------- phdthesis.cls | 16 +++---- tex/conclusion.tex | 3 ++ tex/introduction.tex | 3 ++ tex/relatedwork.tex | 3 ++ tex/remerciements.tex | 3 ++ 7 files changed, 101 insertions(+), 35 deletions(-) create mode 100644 tex/conclusion.tex create mode 100644 tex/introduction.tex create mode 100644 tex/relatedwork.tex create mode 100644 tex/remerciements.tex diff --git a/.gitignore b/.gitignore index 4316963..0d55668 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ # these rules might exclude image files for figures etc. # *.ps # *.eps -# *.pdf +*.pdf ## Generated if empty string is given at "Please type another file name for output:" .pdf @@ -367,4 +367,4 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk -# End of https://www.gitignore.io/api/linux,macos,latex,windows,sublimetext \ No newline at end of file +# End of https://www.gitignore.io/api/linux,macos,latex,windows,sublimetext diff --git a/hdrmain.tex b/hdrmain.tex index 3e62320..ce48d4e 100644 --- a/hdrmain.tex +++ b/hdrmain.tex @@ -1,34 +1,37 @@ -\documentclass[11pt,a4paper,twoside]{phdthesis} +\documentclass[11pt,a4paper,twoside,titlepage,openbib]{phdthesis} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} \usepackage{lmodern} -\usepackage[french]{babel} -\usepackage{hyperref} +%\usepackage[french]{babel} +%\usepackage{icomma} \usepackage{multirow} \usepackage{array} -\usepackage{icomma} \usepackage{palatino} %\usepackage{caption} \usepackage{graphicx} -\usepackage{pdfpages} +%\usepackage{pdfpages} % \usepackage[super]{cite} -\usepackage[resetlabels,labeled]{multibib} \usepackage{geometry} \geometry{ hmargin=2.5cm, vmargin=2.5cm } -\usepackage{fancyhdr} -\pagestyle{fancy} -% \fancyhead{} -\fancyhead[RO,LE]{}%\thepage} -\fancyhead[LO]{}%\rightmark} -\fancyhead[RE]{}%\leftmark} -\fancyfoot[CO,CE]{\thepage} +\usepackage{getcommit} +\usepackage{xstring} +\usepackage[ddmmyyyy,hhmmss]{datetime} + +% \usepackage{fancyhdr} +% \pagestyle{fancy} +% % \fancyhead{} +% \fancyhead[RO,LE]{}%\thepage} +% \fancyhead[LO]{}%\rightmark} +% \fancyhead[RE]{}%\leftmark} +% \fancyfoot[RO,LE]{}%\thepage} +% \fancyfoot[CO,CE]{\thepage} % \fancyfoot{\thepage} -\renewcommand\headrulewidth{0.4pt} -\renewcommand\plainheadrulewidth{0pt} -\renewcommand\plainfootrulewidth{0pt} +% \renewcommand\headrulewidth{0.4pt} +% \renewcommand\plainheadrulewidth{0pt} +% \renewcommand\plainfootrulewidth{0pt} \title{HDR} \author{\Large Thomas Pietrzak} @@ -44,8 +47,6 @@ \clubpenalty=10000 \widowpenalty=10000 -\usepackage{getcommit} - \usepackage{xcolor} \definecolor{chaptercolor}{rgb}{0.01,0.0,0.5} \definecolor{sectioncolor}{rgb}{0.01,0.0,0.5} @@ -79,6 +80,7 @@ %\titlecontents{section}[2em]{\vspace{12pt}}{\normalfont\normalsize \contentslabel{2em}}{\hspace*{-2em} \MakeUppercase}{}{} %\titlecontents{subsection}[2em]{\vspace{12pt}}{\normalfont\normalsize \contentslabel{2em}}{\hspace*{-2em} \MakeUppercase}{}{} +\usepackage{hyperref} \hypersetup{ colorlinks = true, linkcolor=linkcolor, @@ -90,29 +92,81 @@ urlcolor=linkcolor } +\newcommand*{\refname}{Bibliography} + +\usepackage{makeidx} +\makeindex + \begin{document} +\thispagestyle{empty} + \maketitle -This revision: \texttt{\commit} on branch \texttt{\branch}. +Revision: \texttt{\StrLeft{\commit}{7}} on branch \texttt{\branch}\\ +Compiled on \today\ at \currenttime\\ +\index{HDR} + +\tableofcontents + +\listoffigures + +\listoftables \frontmatter \mainmatter -\chapter{Introduction} +\input{tex/introduction} + +\input{tex/relatedwork} + +\chapter{Physical interaction} + +\section{Métamorphe} +\cite{bailly13} + +\section{LivingDesktop} +\cite{bailly16} + +\section{Flexstylus} +\cite{fellion17} + + +\chapter{Gestural interaction} + +\section{Finger identification} +\cite{goguey14,goguey14a,goguey17} + +\section{Summon\&Select} +\cite{gupta17} + +\section{RayCursor} +\cite{baloup18,baloup19} + + +\chapter{Haptics} + +\section{Activibe} +\cite{cauchard16} + +Previous: \cite{pietrzak05,pietrzak06,pietrzak09} + +\section{Direct Manipulation} +\cite{gupta16} \chapter{Something} -\chapter{Conclusion} +\section{Lagmeter} +\cite{casiez17} + +\input{tex/conclusion} \backmatter - \bibliographystyle{unsrt-fr}%alpha-fr} + \bibliographystyle{plain}%alpha-fr} \interlinepenalty=10000 \bibliography{biblio} -% \bibliographystyledeliverables{unsrt-fr}%alpha-fr} -% \bibliographydeliverables{biblio} - +\printindex \end{document} \ No newline at end of file diff --git a/phdthesis.cls b/phdthesis.cls index f27bfc3..d6a9f7d 100644 --- a/phdthesis.cls +++ b/phdthesis.cls @@ -342,12 +342,12 @@ \newcounter {paragraph}[subsubsection] \newcounter {subparagraph}[paragraph] \renewcommand \thepart {\@Roman\c@part} -%\renewcommand \thechapter {\@arabic\c@chapter} -\renewcommand \thechapter {} -%\renewcommand \thesection {\thechapter.\@arabic\c@section} -\renewcommand \thesection{} -%\renewcommand \thesubsection {\thesection.\@arabic\c@subsection} -\renewcommand \thesubsection{} +\renewcommand \thechapter {\@arabic\c@chapter} +%\renewcommand \thechapter {} +\renewcommand \thesection {\thechapter.\@arabic\c@section} +%\renewcommand \thesection{} +\renewcommand \thesubsection {\thesection.\@arabic\c@subsection} +%\renewcommand \thesubsection{} \renewcommand \thesubsubsection{\thesubsection.\@arabic\c@subsubsection} % \renewcommand \thesubsubsubsection{\thesubsubsection.\@arabic\c@subsubsubsection} \renewcommand \theparagraph {\thesubsubsection.\@arabic\c@paragraph} @@ -880,7 +880,7 @@ % {\@latex@warning{Empty `thebibliography' environment}}% % \endlist} -\def\thebibliography#1{\section*{\refname\@mkboth +\def\thebibliography#1{\onecolumn \chapter*{\refname\@mkboth {\uppercase{\refname}}{\uppercase{\refname}}}\list {\@biblabel{\arabic{enumiv}}}{\settowidth\labelwidth{\@biblabel{#1}}% \leftmargin\labelwidth @@ -894,7 +894,7 @@ \def\endthebibliography{% \def\@noitemerr{\@warning{Empty `thebibliography' environment}}% - \endlist} + \endlist\twocolumn} \newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em} diff --git a/tex/conclusion.tex b/tex/conclusion.tex new file mode 100644 index 0000000..b3831c6 --- /dev/null +++ b/tex/conclusion.tex @@ -0,0 +1,3 @@ +%!TEX root = ../hdrmain.tex + +\chapter{Conclusion} \ No newline at end of file diff --git a/tex/introduction.tex b/tex/introduction.tex new file mode 100644 index 0000000..2c74d40 --- /dev/null +++ b/tex/introduction.tex @@ -0,0 +1,3 @@ +%!TEX root = ../hdrmain.tex + +\chapter*{Introduction} \ No newline at end of file diff --git a/tex/relatedwork.tex b/tex/relatedwork.tex new file mode 100644 index 0000000..45511e0 --- /dev/null +++ b/tex/relatedwork.tex @@ -0,0 +1,3 @@ +%!TEX root = ../hdrmain.tex + +\chapter{Related Work} \ No newline at end of file diff --git a/tex/remerciements.tex b/tex/remerciements.tex new file mode 100644 index 0000000..28090e9 --- /dev/null +++ b/tex/remerciements.tex @@ -0,0 +1,3 @@ +%!TEX root = ../hdrmain.tex + +\chapter{Remerciements} \ No newline at end of file -- 2.30.2