commit 41a5b1590535f3ea9538ff5d2f1b1a0f39a5ecd9 Author: Davte Date: Mon Mar 11 18:00:59 2019 +0100 First commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..275533a --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +# Core (pdf)latex auxiliary files: +*.aux +*.lof +*.log +*.lot +*.fls +*.out +*.toc +*.fmt +*.fot +*.cb +*.cb2 +.*.lb + +# SyncTex files +*.synctex.gz + +# Latex maker files +*.fdb_latexmk + +# Temp folder +cola/temp/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..af7f651 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# Sondaggio cola diff --git a/cola/Cola.pdf b/cola/Cola.pdf new file mode 100644 index 0000000..5a1e2a0 Binary files /dev/null and b/cola/Cola.pdf differ diff --git a/cola/Cola.tex b/cola/Cola.tex new file mode 100644 index 0000000..98ef749 --- /dev/null +++ b/cola/Cola.tex @@ -0,0 +1,16 @@ +\documentclass{article} +\usepackage[a4paper]{geometry} +\usepackage{graphbox} +\usepackage{graphicx} +\usepackage{multicol} + +\begin{document} + \thispagestyle{empty} + \twocolumn + \input{Tabella.tex} + \input{Tabella.tex} + \input{Tabella.tex} + \input{Tabella.tex} + \input{Tabella.tex} + \input{Tabella.tex} +\end{document} diff --git a/cola/Tabella.tex b/cola/Tabella.tex new file mode 100644 index 0000000..e888171 --- /dev/null +++ b/cola/Tabella.tex @@ -0,0 +1,20 @@ +\begin{table} + \centering + \resizebox{0.45\textwidth}{!}{ + \begin{tabular}{| c | c | c|} + \hline + Prodotto & Bicchiere & Valutazione \\ + \hline + \includegraphics[align=c, width=2cm, height=2cm, keepaspectratio]{img/coop.pdf} & \dots & \dots /10\\ + \hline + \includegraphics[align=c, width=2cm, height=2cm, keepaspectratio]{img/coca.pdf} & \dots & \dots /10 \\ + \hline + \includegraphics[align=c, width=2cm, height=2cm, keepaspectratio]{img/pepsi.pdf} & \dots & \dots /10 \\ + \hline + \includegraphics[align=c, width=2cm, height=2cm, keepaspectratio]{img/zero.pdf} & \dots & \dots /10 \\ + \hline + \multicolumn{3}{c}{Indica il bicchiere (o i bicchieri!) in cui pensi}\\ + \multicolumn{3}{c}{si trovi ogni bevanda, e valuta ognuna da 1 a 10.} + \end{tabular} + } +\end{table} diff --git a/cola/img/coca.pdf b/cola/img/coca.pdf new file mode 100644 index 0000000..3ba5e9c Binary files /dev/null and b/cola/img/coca.pdf differ diff --git a/cola/img/coop.pdf b/cola/img/coop.pdf new file mode 100644 index 0000000..82069ed Binary files /dev/null and b/cola/img/coop.pdf differ diff --git a/cola/img/originali/CocaCola.png b/cola/img/originali/CocaCola.png new file mode 100644 index 0000000..5e93b7c Binary files /dev/null and b/cola/img/originali/CocaCola.png differ diff --git a/cola/img/originali/Pepsi.jpg b/cola/img/originali/Pepsi.jpg new file mode 100644 index 0000000..c7b7759 Binary files /dev/null and b/cola/img/originali/Pepsi.jpg differ diff --git a/cola/img/originali/Zero.png b/cola/img/originali/Zero.png new file mode 100644 index 0000000..01fe122 Binary files /dev/null and b/cola/img/originali/Zero.png differ diff --git a/cola/img/originali/coop.png b/cola/img/originali/coop.png new file mode 100644 index 0000000..63c20d0 Binary files /dev/null and b/cola/img/originali/coop.png differ diff --git a/cola/img/pepsi.pdf b/cola/img/pepsi.pdf new file mode 100644 index 0000000..78e7511 Binary files /dev/null and b/cola/img/pepsi.pdf differ diff --git a/cola/img/zero.pdf b/cola/img/zero.pdf new file mode 100644 index 0000000..16a7f95 Binary files /dev/null and b/cola/img/zero.pdf differ diff --git a/merge_and_push.sh b/merge_and_push.sh new file mode 100644 index 0000000..c9d73aa --- /dev/null +++ b/merge_and_push.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +git checkout master; +git merge develop; +git checkout develop; +git push origin master develop;