Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
risolti conflitti
Luca Bonato8ff0903ea0ff
diff --cc relazioni/ipermediali/relazione.texindex 134c30e,3248858..ef37ca0--- a/relazioni/ipermediali/relazione.tex+++ b/relazioni/ipermediali/relazione.tex@@@ -21,7 -21,8 +21,11 @@@\newpage\input{image.tex}+ \newpage+ \input{microphone.tex}++\newpage+\input{segnalazioni.tex}++\end{document}diff --cc relazioni/ipermediali/template.texindex d8191b4,e8cc16e..dfee232--- a/relazioni/ipermediali/template.tex+++ b/relazioni/ipermediali/template.tex@@@ -16,44 -16,10 +16,45 @@@\usepackage{chngpage}\usepackage{booktabs}\usepackage{tikz}+\usetikzlibrary{arrows}\usepackage[hang,centerlast]{subfigure}+\usepackage{color}+\usepackage{caption}+\definecolor{dkgreen}{rgb}{0,0.6,0}+\definecolor{gray}{rgb}{0.5,0.5,0.5}+\definecolor{mauve}{rgb}{0.58,0,0.82}+\DeclareCaptionFont{white}{\color{white}}+\DeclareCaptionFormat{listing}{\colorbox{gray}{\parbox{\linewidth}{#1#2#3}}}+\captionsetup[lstlisting]{format=listing,labelfont=white,textfont=white}+\usepackage{listings}+\lstset{ %+ basicstyle=\footnotesize, % the size of the fonts that are used for the code+ numbers=left, % where to put the line-numbers+ numberstyle=\tiny\color{gray}, % the style that is used for the line-numbers+ stepnumber=1, % the step between two line-numbers. If it's 1, each line+ % will be numbered+ numbersep=5pt, % how far the line-numbers are from the code+ backgroundcolor=\color{white}, % choose the background color. You must add \usepackage{color}+ showspaces=false, % show spaces adding particular underscores+ showstringspaces=false, % underline spaces within strings+ showtabs=false, % show tabs within strings adding particular underscores+ %frame=single, % adds a frame around the code+ rulecolor=\color{black}, % if not set, the frame-color may be changed on line-breaks within not-black text (e.g. commens (green here))+ tabsize=2, % sets default tabsize to 2 spaces+ captionpos=t, % sets the caption-position to bottom+ breaklines=true, % sets automatic line breaking+ breakatwhitespace=false, % sets if automatic breaks should only happen at whitespace+ title=\lstname, % show the filename of files included with \lstinputlisting;+ % also try caption instead of title+ keywordstyle=\color{blue}, % keyword style+ commentstyle=\color{dkgreen}, % comment style+ stringstyle=\color{mauve}, % string literal style+ escapeinside={\%*}{*)}, % if you want to add a comment within your code+ morekeywords={*,...} % if you want to add more keywords to the set+}+\newcommand{\makeTitlePage} {\begin{titlepage}\begin{center}