Skip to content

Commit

Permalink
Añadido lugar del tesoro. Make fast. Arreglado código Sage. Añadidos …
Browse files Browse the repository at this point in the history
…puntos hasta en la economía de fichas
  • Loading branch information
VicdeJuan committed May 24, 2017
1 parent 8bb8c3a commit 7c464e5
Show file tree
Hide file tree
Showing 13 changed files with 265 additions and 1,147 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ RetoSes1:
@$(MAKE) tex/RetoSes1/RetoSes1.tex > /dev/null
@mv RetoSes1.pdf pdf/RetoSes1.pdf


fast:
pdflatex TFM.tex

TFM.pdf: retos examen TFM.tex tex/* img/* src/* memoria.bib
@echo "Compilando TFM..."
Expand Down
72 changes: 71 additions & 1 deletion TFM.tex
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@
\settocdepth{section}


%\usepackage{longtable}
\usepackage{booktabs}
\usepackage{ltablex}



Expand Down Expand Up @@ -275,6 +278,7 @@




%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand Down Expand Up @@ -391,6 +395,12 @@
}
\makeatother

\titleformat{\paragraph}[hang]{\normalfont\normalsize\bfseries}{\theparagraph}{-0.6em}{}
%\titlespacing*{\paragraph}{0pt}{3.25ex plus 1ex minus .2ex}{0.5em}

\newif\ifinapp
\inapptrue


%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand All @@ -401,7 +411,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

\newcommand{\correcta}[1]{\textcolor{green}{#1}}
\usepackage{tikz}
\newcommand*\circled[1]{\tikz[baseline=(char.base)]{
\node[shape=circle,draw,inner sep=2pt] (char) {#1};}}

\newcommand{\correcta}[1]{\circled{#1}}
\newcounter{bloq}[section]
\renewcommand{\thebloq}{\arabic{section}.\alph{bloq}}
\newcounter{preg}[bloq]
Expand Down Expand Up @@ -504,6 +518,62 @@ \chapter{Introducción}
\input{tex/UD}

\cleardoublepage
\ifinapp

\chapter{Documentos adjuntos}

A continuación se presenta el apéndice de los documentos completos mencionados a lo largo del trabajo.
%
Esto es, los retos de las sesiones 1,2,3 (Introducción, multiplicación y división de polinomios respectivamente).
%
A continuación se encuentra el reto cooperativo final.
%
Por último, encontramos los documentos correspondientes al examen y la autoevaluación propuestos para esta Unidad Didáctica.


\cleardoublepage
\rhead{}
\lhead{}
\chead{Reto de la primera sesión (Introducción)}
\label{app:retoses1}
\includepdf[pages=-,pagecommand={},width=1.4\textwidth]{src/RetoSes1.pdf}

\cleardoublepage
\chead{Reto de la sesión 2 (Multiplicación de polinomios)}
\label{app:retomulti}
\includepdf[pages=-,pagecommand={},width=1.05\textheight,landscape=true,clip,trim=45mm 20mm 50mm 10mm]{src/RetoMulti.pdf}

\cleardoublepage
\chead{Reto de la sesión 3 (División de polinomios)}
\label{app:retodivi}
\includepdf[pages=-,pagecommand={},width=1.05\textheight,landscape=true]{src/RetoDivision.pdf}


\cleardoublepage
\chead{Reto de las sesiones 7 y 8 (Repaso general)}
\label{app:retocoop}
\includepdf[pages={1},pagecommand={},width=1.05\textheight,landscape=true]{src/RetoCoop.pdf}

\cleardoublepage
\chead{Examen propuesto para la Unidad Didáctica}
\label{app:examen}
\includepdf[pages=-,pagecommand={},width=1.22\textwidth]{pdf/Examen.pdf}

\cleardoublepage
\chead{Autoevaluación propuesta para la Unidad Didáctica}
\label{app:autoeval}
\includepdf[pages={120},pagecommand={},width=1.2\textwidth]{pdf/3ESOBCompletoLOMCE.pdf}

\chead{\centerhead}
\rhead{\righthead}
\lhead{\lefthead}

\fi

\chapter{Recursos adicionales}



\input{tex/sage}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand Down
Binary file added img/Muralla.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions memoria.bib
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,9 @@ @article{11s
@misc{VideoKahootSes1,
author = {Khan Academy},
year = {??},
url = {youtube.com}
author = {Rubén Sebastián},
year = {2015},
url = {https://www.youtube.com/watch?v=ItWlb2OZG14}
}
@misc{Klein,
Expand Down
Binary file removed pdf/RetoCoop.pdf
Binary file not shown.
Loading

0 comments on commit 7c464e5

Please sign in to comment.