M document.tex => document.tex +1 -0
@@ 18,5 18,6 @@
\input{./tex/licencia.tex}
\input{./tex/la_cupula.tex}
\input{./tex/google_es_malo.tex}
+\input{./tex/alternativas.tex}
\end{document}
M img/download.sh => img/download.sh +8 -6
@@ 2,18 2,20 @@
# No olvidar ir añadiendo las imágenes a la máquina del tiempo (web.archive.org)
-curl -Lo google_owns_you-1.png http://78.media.tumblr.com/53ab7261f0e6760ad5fd3c21c2051577/tumblr_ofectsvqJJ1s667kio1_1280.png # https://web.archive.org/web/20171126192457/http://78.media.tumblr.com/53ab7261f0e6760ad5fd3c21c2051577/tumblr_ofectsvqJJ1s667kio1_1280.png
-curl -Lo google_owns_you-2.png http://78.media.tumblr.com/b5ab41fd32ff569fccd45f13644037c6/tumblr_ofectsvqJJ1s667kio3_1280.png # https://web.archive.org/web/20171126192347/http://78.media.tumblr.com/b5ab41fd32ff569fccd45f13644037c6/tumblr_ofectsvqJJ1s667kio3_1280.png
-curl -Lo google_owns_you-3.png http://78.media.tumblr.com/fe904486f20668af95a11d8158a06584/tumblr_ofectsvqJJ1s667kio4_1280.png # https://web.archive.org/web/20171126191534/http://78.media.tumblr.com/fe904486f20668af95a11d8158a06584/tumblr_ofectsvqJJ1s667kio4_1280.png
+curl -Lo charla_anti-Google.zip https://my.owndrive.com/index.php/s/sQa8OECzEdIYdsa/download
+unzip -j charla_anti-Google.zip
+rm charla_anti-Google.zip
curl -Lo cc_by-sa.eps https://mirrors.creativecommons.org/presskit/buttons/88x31/eps/by-sa.eps # https://web.archive.org/web/20171113040246/https://mirrors.creativecommons.org/presskit/buttons/88x31/eps/by-sa.eps
epstopdf cc_by-sa.eps
curl -Lo cupula_truman.jpg http://4.bp.blogspot.com/-klE9QIb-T8c/T-IDIPIXTSI/AAAAAAAAAls/0cwR0Wcwf4E/s1600/Truman+Show.jpg # https://web.archive.org/web/20170410175136/http://4.bp.blogspot.com/-klE9QIb-T8c/T-IDIPIXTSI/AAAAAAAAAls/0cwR0Wcwf4E/s1600/Truman+Show.jpg
+curl -Lo google_owns_you-1.png http://78.media.tumblr.com/53ab7261f0e6760ad5fd3c21c2051577/tumblr_ofectsvqJJ1s667kio1_1280.png # https://web.archive.org/web/20171126192457/http://78.media.tumblr.com/53ab7261f0e6760ad5fd3c21c2051577/tumblr_ofectsvqJJ1s667kio1_1280.png
+curl -Lo google_owns_you-2.png http://78.media.tumblr.com/b5ab41fd32ff569fccd45f13644037c6/tumblr_ofectsvqJJ1s667kio3_1280.png # https://web.archive.org/web/20171126192347/http://78.media.tumblr.com/b5ab41fd32ff569fccd45f13644037c6/tumblr_ofectsvqJJ1s667kio3_1280.png
+curl -Lo google_owns_you-3.png http://78.media.tumblr.com/fe904486f20668af95a11d8158a06584/tumblr_ofectsvqJJ1s667kio4_1280.png # https://web.archive.org/web/20171126191534/http://78.media.tumblr.com/fe904486f20668af95a11d8158a06584/tumblr_ofectsvqJJ1s667kio4_1280.png
+
curl -Lo demonio_facebook.jpg https://i.imgur.com/q6s3cOCh.jpg # https://web.archive.org/web/20171127204857/https://i.imgur.com/q6s3cOC.jpg
curl -Lo manzana.jpg https://upload.wikimedia.org/wikipedia/commons/b/bd/McIntosh_with_sticker_by_Lars_Zapf_2006-03-30_cropped.jpg # https://web.archive.org/web/20180411164506/https://upload.wikimedia.org/wikipedia/commons/b/bd/McIntosh_with_sticker_by_Lars_Zapf_2006-03-30_cropped.jpg
-curl -Lo charla_anti-Google.zip https://my.owndrive.com/index.php/s/sQa8OECzEdIYdsa/download
-unzip -j charla_anti-Google.zip
-rm charla_anti-Google.zip
+curl -Lo retarded.jpg https://i.pinimg.com/originals/e8/b7/fe/e8b7fe0b399adff1d94f534851ac53cf.jpg # https://web.archive.org/web/20180411213206/https://i.pinimg.com/originals/e8/b7/fe/e8b7fe0b399adff1d94f534851ac53cf.jpg
M img/insignias.svg => img/insignias.svg +23 -5
@@ 18,7 18,7 @@ GNU General Public License.
viewBox="0 0 62.446709 62.446362"
version="1.1"
id="svg8"
- inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+ inkscape:version="0.92.2 2405546, 2018-03-11"
sodipodi:docname="insignias.svg">
<defs
id="defs2" />
@@ 30,10 30,10 @@ GNU General Public License.
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
- inkscape:cx="96.719562"
- inkscape:cy="114.25836"
+ inkscape:cx="74.920892"
+ inkscape:cy="97.344112"
inkscape:document-units="mm"
- inkscape:current-layer="layer1"
+ inkscape:current-layer="g848"
showgrid="false"
inkscape:snap-bbox="false"
inkscape:bbox-paths="true"
@@ 44,7 44,7 @@ GNU General Public License.
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
- inkscape:snap-global="true"
+ inkscape:snap-global="false"
inkscape:object-paths="true"
fit-margin-top="0"
fit-margin-left="0"
@@ 224,6 224,24 @@ GNU General Public License.
</g>
</g>
<g
+ transform="translate(-116.67766,-17.046511)"
+ style="display:inline"
+ inkscape:label="interrogación"
+ id="g848"
+ inkscape:groupmode="layer">
+ <circle
+ r="29.419674"
+ cy="48.269691"
+ cx="147.90118"
+ id="circle846"
+ style="fill:#fefefe;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.60701346;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:5.4492197"
+ d="m 159.11577,36.519812 c 0,-4.00177 -2.38404,-9.195558 -11.40931,-9.195558 -3.57605,0 -6.81152,1.021729 -9.96185,3.15033 l 1.3623,3.746339 c 1.44745,-1.277161 4.34235,-3.320618 8.59955,-3.320618 2.80976,0 6.72638,0.510864 6.72638,5.534363 0,2.72461 -1.27716,3.831483 -2.04345,4.512635 -6.81153,5.789796 -6.81153,13.452761 -6.81153,16.007083 v 1.873169 h 4.00177 v -3.235474 c 0,-4.086915 2.04346,-8.514406 6.13037,-11.920168 1.10688,-0.936584 3.40577,-2.894898 3.40577,-7.152101 z M 150.0905,69.21513 v -4.938355 h -4.93836 v 4.938355 z m 0,0"
+ id="path842"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="círculo"
A tex/alternativas.tex => tex/alternativas.tex +23 -0
@@ 0,0 1,23 @@
+% This file is subject to the terms and conditions of the GNU General Public License.
+%
+\begin{frame}{Alternativas}{Clasificación}
+ \begin{center}
+ \begin{tabular}{cc}
+ \includegraphics[width=.4\textwidth]{./img/insignia_sol.pdf} & \pause \includegraphics[width=.4\textwidth]{./img/insignia_circulo.pdf}
+ \end{tabular}
+ \end{center}
+\end{frame}
+
+\begin{frame}{Alternativas}{Clasificación}
+ \begin{center}
+ \includegraphics[height=.7\textheight]{./img/retarded.jpg}
+ \end{center}
+\end{frame}
+
+\begin{frame}{Alternativas}{Clasificación}
+ \begin{center}
+ \begin{tabular}{cc}
+ \includegraphics[width=.4\textwidth]{./img/insignia_oh_no.pdf} & \pause \includegraphics[width=.4\textwidth]{./img/insignia_interrogacion.pdf}
+ \end{tabular}
+ \end{center}
+\end{frame}
M tex/google_es_malo.tex => tex/google_es_malo.tex +1 -1
@@ 11,7 11,7 @@
\begin{frame}{Hay opciones peores}
\begin{center}
\begin{tabular}{cc}
- \raisebox{-.5\height}{\includegraphics[width=.4\textwidth]{./img/demonio_facebook.jpg}} & \pause \raisebox{-.5\height}{\includegraphics[width=.4\textwidth]{./img/manzana.jpg}}
+ \pause \raisebox{-.5\height}{\includegraphics[width=.4\textwidth]{./img/demonio_facebook.jpg}} & \pause \raisebox{-.5\height}{\includegraphics[width=.4\textwidth]{./img/manzana.jpg}}
\end{tabular}
\end{center}
\end{frame}
