style

diff --git a/.gitignore b/.gitignore
index 4316963fbf6ecf3b5d4f0ccaf5ed9b8cbb8aeb4d..0d55668207e7b623cea18667d1f062d52c6797c1 100644 (file)
--- 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 3e6232076f1378e58601fc863d69f16f39682066..ce48d4e3bbedabab735b666b6f8671e895a42e15 100644 (file)
--- a/hdrmain.tex
+++ b/hdrmain.tex
@@ -1,34 +1,37 @@
-\documentclass[11pt,a4paper,twoside]{phdthesis}\r
+\documentclass[11pt,a4paper,twoside,titlepage,openbib]{phdthesis}\r
 \r
 \usepackage[utf8]{inputenc}\r
 \usepackage[T1]{fontenc}\r
 \usepackage{lmodern}\r
-\usepackage[french]{babel}\r
-\usepackage{hyperref}\r
+%\usepackage[french]{babel}\r
+%\usepackage{icomma}\r
 \usepackage{multirow}\r
 \usepackage{array}\r
-\usepackage{icomma}\r
 \usepackage{palatino}\r
 %\usepackage{caption}\r
 \usepackage{graphicx}\r
-\usepackage{pdfpages}\r
+%\usepackage{pdfpages}\r
 % \usepackage[super]{cite}\r
-\usepackage[resetlabels,labeled]{multibib}\r
 \r
 \usepackage{geometry}\r
 \geometry{ hmargin=2.5cm, vmargin=2.5cm }\r
 \r
-\usepackage{fancyhdr}\r
-\pagestyle{fancy}\r
-% \fancyhead{}\r
-\fancyhead[RO,LE]{}%\thepage}\r
-\fancyhead[LO]{}%\rightmark}\r
-\fancyhead[RE]{}%\leftmark}\r
-\fancyfoot[CO,CE]{\thepage}\r
+\usepackage{getcommit}\r
+\usepackage{xstring}\r
+\usepackage[ddmmyyyy,hhmmss]{datetime}\r
+\r
+% \usepackage{fancyhdr}\r
+% \pagestyle{fancy}\r
+% % \fancyhead{}\r
+% \fancyhead[RO,LE]{}%\thepage}\r
+% \fancyhead[LO]{}%\rightmark}\r
+% \fancyhead[RE]{}%\leftmark}\r
+% \fancyfoot[RO,LE]{}%\thepage}\r
+% \fancyfoot[CO,CE]{\thepage}\r
 % \fancyfoot{\thepage}\r
-\renewcommand\headrulewidth{0.4pt}\r
-\renewcommand\plainheadrulewidth{0pt}\r
-\renewcommand\plainfootrulewidth{0pt}\r
+% \renewcommand\headrulewidth{0.4pt}\r
+% \renewcommand\plainheadrulewidth{0pt}\r
+% \renewcommand\plainfootrulewidth{0pt}\r
 \r
 \title{HDR}\r
 \author{\Large Thomas Pietrzak}\r
@@ -44,8 +47,6 @@
 \clubpenalty=10000\r
 \widowpenalty=10000\r
 \r
-\usepackage{getcommit}\r
-\r
 \usepackage{xcolor}\r
 \definecolor{chaptercolor}{rgb}{0.01,0.0,0.5}\r
 \definecolor{sectioncolor}{rgb}{0.01,0.0,0.5}\r
@@ -79,6 +80,7 @@
 %\titlecontents{section}[2em]{\vspace{12pt}}{\normalfont\normalsize \contentslabel{2em}}{\hspace*{-2em} \MakeUppercase}{}{}\r
 %\titlecontents{subsection}[2em]{\vspace{12pt}}{\normalfont\normalsize \contentslabel{2em}}{\hspace*{-2em} \MakeUppercase}{}{}\r
 \r
+\usepackage{hyperref}\r
 \hypersetup{\r
   colorlinks = true,\r
   linkcolor=linkcolor,\r
@@ -90,29 +92,81 @@
   urlcolor=linkcolor\r
 }\r
 \r
+\newcommand*{\refname}{Bibliography}\r
+\r
+\usepackage{makeidx}\r
+\makeindex\r
+\r
 \begin{document}\r
 \r
+\thispagestyle{empty}\r
+\r
 \maketitle\r
 \r
-This revision: \texttt{\commit} on branch \texttt{\branch}.\r
+Revision: \texttt{\StrLeft{\commit}{7}} on branch \texttt{\branch}\\\r
+Compiled on \today\ at \currenttime\\\r
+\index{HDR}\r
+\r
+\tableofcontents\r
+\r
+\listoffigures\r
+\r
+\listoftables\r
 \r
 \frontmatter\r
 \r
 \mainmatter\r
 \r
-\chapter{Introduction}\r
+\input{tex/introduction}\r
+\r
+\input{tex/relatedwork}\r
+\r
+\chapter{Physical interaction}\r
+\r
+\section{Métamorphe}\r
+\cite{bailly13}\r
+\r
+\section{LivingDesktop}\r
+\cite{bailly16}\r
+\r
+\section{Flexstylus}\r
+\cite{fellion17}\r
+\r
+\r
+\chapter{Gestural interaction}\r
+\r
+\section{Finger identification}\r
+\cite{goguey14,goguey14a,goguey17}\r
+\r
+\section{Summon\&Select}\r
+\cite{gupta17}\r
+\r
+\section{RayCursor}\r
+\cite{baloup18,baloup19}\r
+\r
+\r
+\chapter{Haptics}\r
+\r
+\section{Activibe}\r
+\cite{cauchard16}\r
+\r
+Previous: \cite{pietrzak05,pietrzak06,pietrzak09}\r
+\r
+\section{Direct Manipulation}\r
+\cite{gupta16}\r
 \r
 \chapter{Something}\r
 \r
-\chapter{Conclusion}\r
+\section{Lagmeter}\r
+\cite{casiez17}\r
+\r
+\input{tex/conclusion}\r
 \r
 \backmatter\r
-  \bibliographystyle{unsrt-fr}%alpha-fr}\r
+  \bibliographystyle{plain}%alpha-fr}\r
   \interlinepenalty=10000\r
   \bibliography{biblio}\r
 \r
-%  \bibliographystyledeliverables{unsrt-fr}%alpha-fr}\r
-%  \bibliographydeliverables{biblio}\r
-\r
+\printindex\r
 \r
 \end{document}
\ No newline at end of file

diff --git a/phdthesis.cls b/phdthesis.cls
index f27bfc3c6b0ae213a3f374f7d2bbbcf7f683365d..d6a9f7d6105911641d09eed9f1364c2c7d90c957 100644 (file)
--- a/phdthesis.cls
+++ b/phdthesis.cls
@@ -342,12 +342,12 @@
 \newcounter {paragraph}[subsubsection]\r
 \newcounter {subparagraph}[paragraph]\r
 \renewcommand \thepart {\@Roman\c@part}\r
-%\renewcommand \thechapter {\@arabic\c@chapter}\r
-\renewcommand \thechapter {}\r
-%\renewcommand \thesection {\thechapter.\@arabic\c@section}\r
-\renewcommand \thesection{}\r
-%\renewcommand \thesubsection   {\thesection.\@arabic\c@subsection}\r
-\renewcommand \thesubsection{}\r
+\renewcommand \thechapter {\@arabic\c@chapter}\r
+%\renewcommand \thechapter {}\r
+\renewcommand \thesection {\thechapter.\@arabic\c@section}\r
+%\renewcommand \thesection{}\r
+\renewcommand \thesubsection   {\thesection.\@arabic\c@subsection}\r
+%\renewcommand \thesubsection{}\r
 \renewcommand \thesubsubsection{\thesubsection.\@arabic\c@subsubsection}\r
 % \renewcommand \thesubsubsubsection{\thesubsubsection.\@arabic\c@subsubsubsection}\r
 \renewcommand \theparagraph    {\thesubsubsection.\@arabic\c@paragraph}\r
@@ -880,7 +880,7 @@
 %       {\@latex@warning{Empty `thebibliography' environment}}%\r
 %      \endlist}\r
 \r
-\def\thebibliography#1{\section*{\refname\@mkboth\r
+\def\thebibliography#1{\onecolumn \chapter*{\refname\@mkboth\r
   {\uppercase{\refname}}{\uppercase{\refname}}}\list\r
   {\@biblabel{\arabic{enumiv}}}{\settowidth\labelwidth{\@biblabel{#1}}%\r
     \leftmargin\labelwidth\r
@@ -894,7 +894,7 @@
 \r
 \def\endthebibliography{%\r
   \def\@noitemerr{\@warning{Empty `thebibliography' environment}}%\r
-  \endlist}\r
+  \endlist\twocolumn}\r
 \r
 \r
 \newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em}\r

diff --git a/tex/conclusion.tex b/tex/conclusion.tex
new file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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