Resolving conflicts

7 files changed, 167 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index a923e12..01086ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
-# Plugins managed by Vundle
+mutt/cache/headers
+mutt/mailboxes
 vim/bundle/
 vifm/Trash/
 mutt/mutt-colors-solarized/
 mutt/temp/
 passwords
-mutt/cache/
-mutt/cache/headers
+mutt/cache/*
diff --git a/header.tex b/header.tex
new file mode 100644
index 0000000..0c654ab
--- /dev/null
+++ b/header.tex
@@ -0,0 +1,27 @@
+% Macros
+\definecolor{darkred}{rgb}{.7,0,0}
+\newcommand{\real}[0]{\mathbf R} 
+\newcommand{\nat}[0]{\mathbf N} 
+\newcommand{\op}[0]{\mathcal} 
+\newcommand{\grad}[0]{\nabla}
+\newcommand{\dive}[0] {\,\nabla\,\cdot\,} 
+\newcommand{\ip}[2]{\left \langle #1,#2 \right\rangle} 
+\newcommand{\norm}[1]{\left\| #1 \right\|} 
+\newcommand{\pard}[2]{\partial_{#2} #1} 
+\newcommand{\pardl}[2]{\frac{\partial #1}{\partial #2}} 
+\newcommand{\pardd}[2]{\partial_{#2}^2 #1} 
+\newcommand{\parddl}[2]{\frac{\partial^2 #1}{\partial #2^2}} 
+\newcommand{\dd}[0]{\,\mathrm d}
+\newcommand{\hermite}[0]{\mathcal}
+\newcommand{\gaussian}[1]{g_{#1}} 
+\newcommand{\stdgaussian}[0]{g} 
+\newcommand{\test}[1]{C^\infty_c(#1)} 
+\newcommand{\flp}[2]{L^{#1}(#2)}
+\newcommand{\wlp}[3]{L^{#1}(#2,#3)}
+\newcommand{\sobolev}[2]{H^{#1}(#2)}
+\newcommand{\wsobolev}[3]{H^{#1}(#2, #3)}
+\newcommand{\red}[1]{\textcolor{darkred}{#1}}
+\newcommand{\HRule}{\rule{\linewidth}{0.5mm}}
+\newcommand{\smooth}[1]{C^\infty(#1)}
+\newcommand{\cont}[2]{C^{#1}(#2)}
+\newcommand{\Space}[0]{\mathscr} 
diff --git a/mutt/mailboxes b/mutt/mailboxes
index 9e64508..d259b41 100644
--- a/mutt/mailboxes
+++ b/mutt/mailboxes
@@ -1 +1 @@
-mailboxes "+Hotmail/Hotmail" "+Main/Drafts" "+Main/Main" "+Main/Sent" "+Gmail/Gmail" "+Imperial/Imperial"
+mailboxes "+Gmail/Gmail" "+Hotmail/Hotmail" "+Imperial/Imperial" "+Main/Drafts" "+Main/Main" "+Main/Sent"
diff --git a/tex/report_default.tex b/tex/report_default.tex
new file mode 100644
index 0000000..e9eb94f
--- /dev/null
+++ b/tex/report_default.tex
@@ -0,0 +1,121 @@
+\documentclass[10pt,twoside]{report} 
+
+% Files to include
+\includeonly{
+    preamble/title,
+    preamble/authorship,
+    preamble/abstract,
+    preamble/acknowledgements,
+    chapters/introduction,
+    chapters/chap1,
+    chapters/chap2,
+    chapters/chap3,
+    chapters/conclusion,
+}
+
+% Boolean variables
+\newif \ifcontents \contentsfalse
+\newif \ifbib \bibtrue
+\newif \iflong \longtrue
+
+% Packages
+\usepackage[utf8]{inputenx} 
+\usepackage[english]{babel}
+\usepackage{microtype}
+\usepackage{fancyhdr}
+\usepackage{listings}
+\usepackage{appendix}
+\usepackage{vmargin}
+\usepackage{setspace}
+\usepackage{mathenv}
+\usepackage{amsmath}
+\usepackage{amsfonts}
+\usepackage{amssymb}
+\usepackage{amscd}
+\usepackage{amsthm}
+\usepackage{hyperref}
+\usepackage{cleveref}
+\usepackage{graphicx}
+\usepackage{epstopdf}
+\usepackage{subfigure}
+\usepackage{color}
+
+% Packages with options
+\usepackage[labelfont=sc]{caption}
+\usepackage[square, numbers, comma, sort&compress]{natbib}
+
+% Layout options
+\setlength{\parskip}{6pt}
+
+% Compilation options
+\synctex=1
+
+% Setting for the table of contents
+\setcounter{secnumdepth}{3}
+\setcounter{tocdepth}{3}
+
+% Macros
+\definecolor{darkred}{rgb}{.7,0,0}
+\newcommand{\real}[0]{\mathbf R} 
+\newcommand{\nat}[0]{\mathbf N} 
+\newcommand{\op}[0]{\mathcal} 
+\newcommand{\grad}[0]{\,\nabla\,}
+\newcommand{\dive}[0] {\,\nabla\,\cdot\,} 
+\newcommand{\ip}[2]{\left \langle #1,#2 \right\rangle} 
+\newcommand{\norm}[1]{\,\| #1 \|\,} 
+\newcommand{\pard}[2]{\partial_{#2} #1} 
+\newcommand{\pardl}[2]{\frac{\partial #1}{\partial #2}} 
+\newcommand{\pardd}[2]{\partial_{#2}^2 #1} 
+\newcommand{\parddl}[2]{\frac{\partial^2 #1}{\partial #2^2}} 
+\newcommand{\dx}[0]{\mathrm d}
+\newcommand{\hermite}[0]{\mathcal}
+\newcommand{\gaussian}[1]{g_{#1}} 
+\newcommand{\stdgaussian}[0]{g} 
+\newcommand{\test}[1]{C^\infty_c(#1)} 
+\newcommand{\flp}[2]{L^{#1}(#2)}
+\newcommand{\wlp}[3]{L^{#1}(#2, #3)}
+\newcommand{\sobolev}[2]{H^{#1}(#2)}
+\newcommand{\wsobolev}[3]{H^{#1}(#2, #3)}
+\newcommand{\red}[1]{\textcolor{darkred}{#1}}
+\newcommand{\HRule}{\rule{\linewidth}{0.5mm}}
+
+% Theorems
+\theoremstyle{plain}
+\newtheorem{assumption}{Assumption}[section]
+\newtheorem{example}{Example}[section]
+\newtheorem{theorem}{Theorem}[section]
+\newtheorem{corollary}[theorem]{Corollary}
+\newtheorem{lemma}[theorem]{Lemma}
+\newtheorem{proposition}[theorem]{Proposition}
+\newtheorem{axiom}[theorem]{Axiom}
+\theoremstyle{definition}
+\newtheorem{definition}[theorem]{Definition}
+\theoremstyle{remark}
+\newtheorem{remark}[theorem]{Remark}
+
+\begin{document}
+
+\pagestyle{empty}
+
+\setstretch{1.3} 
+\include{preamble/title} \cleardoublepage
+\include{preamble/authorship} \cleardoublepage
+\include{preamble/abstract} \cleardoublepage
+\include{preamble/acknowledgements} \cleardoublepage
+\ifcontents \tableofcontents \fi
+
+\pagestyle{plain}
+
+
+\include{chapters/introduction} \cleardoublepage
+\include{chapters/chap1} \cleardoublepage
+\include{chapters/chap2} \cleardoublepage
+\include{chapters/chap3} \cleardoublepage
+\include{chapters/conclusion} \cleardoublepage
+
+\nocite*
+\bibliographystyle{unsrtnat} 
+\bibliography{Bibliography} 
+
+\end{document}
+
diff --git a/vim/mySnippets/tex.snippets b/vim/mySnippets/tex.snippets
index ac0fd05..0fba4e8 100644
--- a/vim/mySnippets/tex.snippets
+++ b/vim/mySnippets/tex.snippets
@@ -19,11 +19,11 @@ snippet op "Operator style" i
 endsnippet
 
 snippet pard "Partial derivative" i
-\pard{$1}{$2}$0
+\pardl{$1}{$2}$0
 endsnippet
 
 snippet pardd "Double partial derivative" i
-\pardd{$1}{$2}$0
+\parddl{$1}{$2}$0
 endsnippet
 
 snippet herm "Hermite polynomials" i
@@ -38,6 +38,10 @@ snippet sumi "Sum over index set" i
 \sum_{${1:i} \in ${2:I}}$0
 endsnippet
 
+snippet int "Integral" i
+\int_{$1} 
+endsnippet
+
 snippet ip "Inner product" i
 \ip{$1}{$2}$0
 endsnippet
@@ -85,3 +89,11 @@ endsnippet
 snippet sum "Sum" i
 \sum_{${1:i=1}}^{${2:n}}
 endsnippet
+
+snippet smooth "Smooth function" i
+\smooth{${1:\real^n}} $0
+endsnippet
+
+snippet cont "Continuous function" i
+\cont{$1}{$2} $0
+endsnippet
diff --git a/vim/vimrc b/vim/vimrc
index 1ef49d4..bef1eb2 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -215,7 +215,6 @@ vnoremap g^ ^
 ""  Latex  
 nmap <buffer> <F2> <Plug>LatexChangeEnv
 let g:tex_fast=""
-
 autocmd Filetype tex call SetTexOptions()
 
 function! SetTexOptions()
diff --git a/zshrc b/zshrc
index ffdb380..7a3f4b6 100644
--- a/zshrc
+++ b/zshrc
@@ -43,6 +43,7 @@ alias ul='cd ~/Dropbox/phd/literature'
 alias ur='cd ~/Dropbox/phd/reports'
 alias up='cd ~/Dropbox/phd/presentations'
 alias papers='cd ~/Dropbox/phd/papers'
+alias books='cd ~/Dropbox/phd/books'
 alias cdd='cd ~/dotfiles'
 
 # Commands