First commit
This commit is contained in:
commit
41a5b15905
22
.gitignore
vendored
Normal file
22
.gitignore
vendored
Normal file
@ -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/
|
BIN
cola/Cola.pdf
Normal file
BIN
cola/Cola.pdf
Normal file
Binary file not shown.
16
cola/Cola.tex
Normal file
16
cola/Cola.tex
Normal file
@ -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}
|
20
cola/Tabella.tex
Normal file
20
cola/Tabella.tex
Normal file
@ -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}
|
BIN
cola/img/coca.pdf
Normal file
BIN
cola/img/coca.pdf
Normal file
Binary file not shown.
BIN
cola/img/coop.pdf
Normal file
BIN
cola/img/coop.pdf
Normal file
Binary file not shown.
BIN
cola/img/originali/CocaCola.png
Normal file
BIN
cola/img/originali/CocaCola.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 75 KiB |
BIN
cola/img/originali/Pepsi.jpg
Normal file
BIN
cola/img/originali/Pepsi.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 70 KiB |
BIN
cola/img/originali/Zero.png
Normal file
BIN
cola/img/originali/Zero.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 128 KiB |
BIN
cola/img/originali/coop.png
Normal file
BIN
cola/img/originali/coop.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 37 KiB |
BIN
cola/img/pepsi.pdf
Normal file
BIN
cola/img/pepsi.pdf
Normal file
Binary file not shown.
BIN
cola/img/zero.pdf
Normal file
BIN
cola/img/zero.pdf
Normal file
Binary file not shown.
6
merge_and_push.sh
Normal file
6
merge_and_push.sh
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
git checkout master;
|
||||||
|
git merge develop;
|
||||||
|
git checkout develop;
|
||||||
|
git push origin master develop;
|
Loading…
x
Reference in New Issue
Block a user