summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rwxr-xr-xec-defs.tex (renamed from defs.tex)2
-rw-r--r--front/bg.png (renamed from portada/portada.png)bin22317 -> 22317 bytes
-rw-r--r--front/fic.png (renamed from portada/fic.png)bin241098 -> 241098 bytes
-rw-r--r--front/front-body.tex (renamed from portada/portada.tex)6
-rw-r--r--front/front-init.tex (renamed from portada/defs.tex)4
-rw-r--r--front/upmc.png (renamed from portada/upmc.png)bin15449 -> 15449 bytes
-rw-r--r--img/browser-post.pngbin32568 -> 0 bytes
-rw-r--r--img/browser-pre.pngbin27742 -> 0 bytes
-rw-r--r--img/editor.pngbin68100 -> 0 bytes
-rw-r--r--img/index.pngbin84982 -> 0 bytes
-rw-r--r--img/login.pngbin80835 -> 0 bytes
-rw-r--r--img/register.pngbin84886 -> 0 bytes
-rw-r--r--img/results.pngbin44197 -> 0 bytes
-rw-r--r--img/web-finished.pngbin180461 -> 0 bytes
-rw-r--r--img/web-prototype.pngbin23456 -> 0 bytes
-rw-r--r--tfm.pdf (renamed from memoria.pdf)bin305752 -> 305752 bytes
-rwxr-xr-xtfm.tex (renamed from memoria.tex)6
18 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index b17eeaf..7faec7d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
all:
- latexmk -pvc -lualatex memoria.tex
+ latexmk -pvc -lualatex tfm.tex
once:
- lualatex memoria.tex
+ lualatex tfm.tex
force:
- latexmk -pvc -lualatex -interaction=nonstopmode memoria.tex
+ latexmk -pvc -lualatex -interaction=nonstopmode tfm.tex
re: clean all
diff --git a/defs.tex b/ec-defs.tex
index 3cc5e4c..7878eb9 100755
--- a/defs.tex
+++ b/ec-defs.tex
@@ -232,5 +232,5 @@
%%% Local Variables:
%%% mode: latex
-%%% TeX-master: "memoria"
+%%% TeX-master: "tfm"
%%% End: \ No newline at end of file
diff --git a/portada/portada.png b/front/bg.png
index c558fa4..c558fa4 100644
--- a/portada/portada.png
+++ b/front/bg.png
Binary files differ
diff --git a/portada/fic.png b/front/fic.png
index 2a36204..2a36204 100644
--- a/portada/fic.png
+++ b/front/fic.png
Binary files differ
diff --git a/portada/portada.tex b/front/front-body.tex
index aede6ba..d9c7d43 100644
--- a/portada/portada.tex
+++ b/front/front-body.tex
@@ -8,12 +8,12 @@
\begin{figure}
\begin{minipage}{.5\linewidth}
\begin{flushleft}
- \includegraphics[scale=0.8]{portada/upmc.png}
+ \includegraphics[scale=0.8]{front/upmc.png}
\end{flushleft}
\end{minipage}
\begin{minipage}{.49\linewidth}
\begin{flushright}
- \includegraphics[scale=0.21]{portada/fic.png}
+ \includegraphics[scale=0.21]{front/fic.png}
\end{flushright}
\end{minipage}
\end{figure}
@@ -49,5 +49,5 @@
%%% Local Variables:
%%% mode: latex
-%%% TeX-master: "../memoria"
+%%% TeX-master: "../tfm"
%%% End: \ No newline at end of file
diff --git a/portada/defs.tex b/front/front-init.tex
index 228d9a7..e2f4f66 100644
--- a/portada/defs.tex
+++ b/front/front-init.tex
@@ -8,7 +8,7 @@
\parbox[b][\paperheight]{\paperwidth}{
\vfill
\centering
- \includegraphics[width=\paperwidth,height=\paperheight]{portada/portada.png}
+ \includegraphics[width=\paperwidth,height=\paperheight]{front/bg.png}
\vfill
}
}
@@ -21,5 +21,5 @@
%%% Local Variables:
%%% mode: latex
-%%% TeX-master: "../memoria"
+%%% TeX-master: "../tfm"
%%% End: \ No newline at end of file
diff --git a/portada/upmc.png b/front/upmc.png
index 93ea544..93ea544 100644
--- a/portada/upmc.png
+++ b/front/upmc.png
Binary files differ
diff --git a/img/browser-post.png b/img/browser-post.png
deleted file mode 100644
index b45eab5..0000000
--- a/img/browser-post.png
+++ /dev/null
Binary files differ
diff --git a/img/browser-pre.png b/img/browser-pre.png
deleted file mode 100644
index f5849a6..0000000
--- a/img/browser-pre.png
+++ /dev/null
Binary files differ
diff --git a/img/editor.png b/img/editor.png
deleted file mode 100644
index 7bdfa46..0000000
--- a/img/editor.png
+++ /dev/null
Binary files differ
diff --git a/img/index.png b/img/index.png
deleted file mode 100644
index e47be96..0000000
--- a/img/index.png
+++ /dev/null
Binary files differ
diff --git a/img/login.png b/img/login.png
deleted file mode 100644
index 586d84f..0000000
--- a/img/login.png
+++ /dev/null
Binary files differ
diff --git a/img/register.png b/img/register.png
deleted file mode 100644
index 60a41ea..0000000
--- a/img/register.png
+++ /dev/null
Binary files differ
diff --git a/img/results.png b/img/results.png
deleted file mode 100644
index c28f0d0..0000000
--- a/img/results.png
+++ /dev/null
Binary files differ
diff --git a/img/web-finished.png b/img/web-finished.png
deleted file mode 100644
index 3eb0e5e..0000000
--- a/img/web-finished.png
+++ /dev/null
Binary files differ
diff --git a/img/web-prototype.png b/img/web-prototype.png
deleted file mode 100644
index f6a5538..0000000
--- a/img/web-prototype.png
+++ /dev/null
Binary files differ
diff --git a/memoria.pdf b/tfm.pdf
index 62ab0b3..62ab0b3 100644
--- a/memoria.pdf
+++ b/tfm.pdf
Binary files differ
diff --git a/memoria.tex b/tfm.tex
index 10c2b19..4840bdc 100755
--- a/memoria.tex
+++ b/tfm.tex
@@ -25,15 +25,15 @@
\hypersetup{pageanchor=false}
-\input{defs}
-\input{portada/defs}
+\input{ec-defs}
+\input{front/front-init}
\MakePerPage{footnote}
\def\emptypage{\newpage\thispagestyle{empty}\mbox{}}
\begin{document}
-\input{portada/portada}
+\input{front/front-body}
\pagenumbering{roman}