Merge branch 'master' of github.com:uvaes/dotfiles

Conflicts:
	zshrc

1 files changed, 22 insertions, 15 deletions

diff --git a/vim/mySnippets/tex.snippets b/vim/mySnippets/tex.snippets
index fb061f0..884cc2d 100644
--- a/vim/mySnippets/tex.snippets
+++ b/vim/mySnippets/tex.snippets
@@ -15,7 +15,7 @@ snippet new "New command" b
 endsnippet
 
 snippet op "Operator style" i
-\op 
+\op
 endsnippet
 
 snippet pard "Partial derivative" i
@@ -27,7 +27,7 @@ snippet pardd "Double partial derivative" i
 endsnippet
 
 snippet herm "Hermite polynomials" i
-\hermite 
+\hermite
 endsnippet
 
 snippet red "Red text" i
@@ -39,35 +39,35 @@ snippet sumi "Sum over index set" i
 endsnippet
 
 snippet int "Integral" i
-\int_{$1} 
+\int_{$1}
 endsnippet
 
 snippet ip "Inner product" i
 \ip{$1}{$2}$0
 endsnippet
 
-snippet norm "Norm" i
-\norm{$1}$0
+snippet ipw "Inner product" i
+\wip{$1}{$2}{$3}$0
 endsnippet
 
-snippet test "Test functions" i
-\test{${1:\real^n}}$0
+snippet norm "Norm" i
+\norm{$1}$0
 endsnippet
 
-snippet lp "Flat Lp space" i
-\lp{${1:2}}{${2:\real^n}}$0
+snippet normw "Weighted norm" i
+\wnorm{$1}{${2:\gamma}}
 endsnippet
 
-snippet lpw "Weighted Lp space" i
-\wlp{${1:2}}{${2:\real^n}}{${3:\rho}}$0
+snippet test "Test functions" i
+\test{${1:\real^n}}$0
 endsnippet
 
-snippet sob "Flat Sobolev space" i
-\sobolev{${1:s}}{${2:\real^n}}$0
+snippet lp "Lp spaces" w
+\lp{${1:exponent}}{${2:domain}}${3/^.+$/[/}${3:weight}${3/^.+$/]/}$0
 endsnippet
 
-snippet sobw "Weighted Sobolev space" i
-\wsobolev{${1:s}}{${2:\real^n}}{${3:\rho}}$0
+snippet  sob "Sobolev spaces" w
+\sobolev{${1:exponent}}{${2:domain}}${3/^.+$/[/}${3:weight}${3/^.+$/]/}$0
 endsnippet
 
 snippet cont "Continuous function" i
@@ -101,3 +101,10 @@ endsnippet
 snippet ref "Clever reference" i
 \cref{$1}$0
 endsnippet
+
+snippet frame "My frame snippet" b
+\begin{frame}
+	\frametitle{$1}
+	$0
+\end{frame}
+endsnippet