Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trabalho com tema de Ammaia #145

Merged
merged 17 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**/*.png filter=lfs diff=lfs merge=lfs -text
**/*.jpg filter=lfs diff=lfs merge=lfs -text
**/*.eps filter=lfs diff=lfs merge=lfs -text
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.2.3
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
source "https://rubygems.org"
gem "jekyll", "4.2.2"
gem "minimal-mistakes-jekyll", "~> 4.24"
gem "csv"
gem "base64"
gem "bigdecimal"
gem "stringex"
gem "webrick"
group :jekyll_plugins do
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ serve : $(SLIDES)
clean :
-@rm -rf *.aux *.bbl *.bcf *.blg *.fdb_latexmk *.fls *.log *.run.xml \
tau0005-*.tex
# vim: set foldmethod=marker shiftwidth=2 tabstop=2 :
# vim: set foldmethod=marker shiftwidth=2 tabstop=2 expandtab :
11 changes: 10 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ incremental: false

# Markdown Processing
kramdown:
input: GFM
input: kramdown
hard_wrap: false
auto_ids: true
footnote_nr: 1
Expand Down Expand Up @@ -322,6 +322,15 @@ defaults:
read_time: true
show_date: true
#toc: true
# _trabalho
- scope:
path: ""
type: trabalho
values:
author_profile: false
layout: single
read_time: false
show_date: false
# _posts
- scope:
path: ""
Expand Down
1,902 changes: 1,902 additions & 0 deletions _dwg/Roman_Empire-Lusitania_125_AD.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _dwg/t1.1-exemplo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions _includes/nivelamento.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<div class="csl-bib-body" style="line-height: 1.35; margin-left: 2em; text-indent:-2em;">
<div class="csl-entry">Bonell, Carmen. <i>La divina proporción: las formas geométricas</i>. Barcelona: Edicions UPC, 1999.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_id=urn%3Aisbn%3A978-84-8301-287-1&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=La%20divina%20proporci%C3%B3n%3A%20las%20formas%20geom%C3%A9tricas&amp;rft.place=Barcelona&amp;rft.publisher=Edicions%20UPC&amp;rft.aufirst=Carmen&amp;rft.aulast=Bonell&amp;rft.au=Carmen%20Bonell&amp;rft.date=1999&amp;rft.isbn=978-84-8301-287-1&amp;rft.language=es"></span>
<div class="csl-entry">Corsi, Cristina, Michael Klein, Paul S. Johnson, Devi Taelman, e Frank Vermeulen. <i>Ammaia : uma cidade Romana na Lusitania</i>. Évora: Universidade de Évora, 2013.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_id=urn%3Aisbn%3A978-989-95669-5-8&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=Ammaia%20%3A%20uma%20cidade%20Romana%20na%20Lusitania&amp;rft.place=%C3%89vora&amp;rft.publisher=Universidade%20de%20%C3%89vora&amp;rft.aufirst=Cristina&amp;rft.aulast=Corsi&amp;rft.au=Cristina%20Corsi&amp;rft.au=Michael%20Klein&amp;rft.au=Paul%20S.%20Johnson&amp;rft.au=Devi%20Taelman&amp;rft.au=Frank%20Vermeulen&amp;rft.date=2013&amp;rft.isbn=978-989-95669-5-8&amp;rft.language=pt"></span>
<div class="csl-entry">Corsi, Cristina, e Frank Vermeulen, orgs. <i>Ammaia I: The Survey. A Romano-Lusitanian Townscape Revealed</i>. Archaeological Reports Ghent University 8–9. Ghent: Academia Press, 2012.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_id=urn%3Aisbn%3A978-90-382-1957-8%20978-90-382-2404-6&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=Ammaia%20I%3A%20The%20Survey.%20A%20Romano-Lusitanian%20Townscape%20Revealed&amp;rft.place=Ghent&amp;rft.publisher=Academia%20Press&amp;rft.series=Archaeological%20reports%20Ghent%20University&amp;rft.aufirst=Cristina&amp;rft.aulast=Corsi&amp;rft.au=Cristina%20Corsi&amp;rft.au=Frank%20Vermeulen&amp;rft.date=2012&amp;rft.tpages=192&amp;rft.isbn=978-90-382-1957-8%20978-90-382-2404-6&amp;rft.language=en"></span>
<div class="csl-entry">Doczi, György. <i>O poder dos limites: harmonias e proporções na natureza, arte e arquitetura</i>. Traduzido por Maria Helena de Oliveira Tricca e Júlia Bárány Bartolomei. São Paulo: Mercuryo, 2008.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_id=urn%3Aisbn%3A978-85-7272-021-2&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=O%20poder%20dos%20limites%3A%20harmonias%20e%20propor%C3%A7%C3%B5es%20na%20natureza%2C%20arte%20e%20arquitetura&amp;rft.place=S%C3%A3o%20Paulo&amp;rft.publisher=Mercuryo&amp;rft.aufirst=Gy%C3%B6rgy&amp;rft.aulast=Doczi&amp;rft.au=Gy%C3%B6rgy%20Doczi&amp;rft.au=Maria%20Helena%20de%20Oliveira%20Tricca&amp;rft.au=J%C3%BAlia%20B%C3%A1r%C3%A1ny%20Bartolomei&amp;rft.date=2008&amp;rft.isbn=978-85-7272-021-2&amp;rft.language=pt-BR"></span>
<div class="csl-entry">Langhein, Joachim. “Proportion and Traditional Architecture”. <i><span style="font-variant:small-caps;">INTBAU</span> Ideas and Opinions</i> 1, n<sup>o</sup> 10 (2013). <a href="https://www.intbau.org/wp-content/uploads/2014/10/ProportionandTraditionalArchitecture.pdf">https://www.intbau.org/wp-content/uploads/2014/10/ProportionandTraditionalArchitecture.pdf</a>.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rft.genre=article&amp;rft.atitle=Proportion%20and%20traditional%20architecture&amp;rft.jtitle=%3Csc%3EINTBAU%3C%2Fsc%3E%20Ideas%20and%20Opinions&amp;rft.volume=1&amp;rft.issue=10&amp;rft.aufirst=Joachim&amp;rft.aulast=Langhein&amp;rft.au=Joachim%20Langhein&amp;rft.date=2013&amp;rft.language=en"></span>
<div class="csl-entry">Robertson, D. S. <i>Arquitetura grega e romana</i>. São Paulo: Martins Fontes, 1997.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_id=urn%3Aisbn%3A978-85-336-0594-7&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=Arquitetura%20grega%20e%20romana&amp;rft.place=S%C3%A3o%20Paulo&amp;rft.publisher=Martins%20Fontes&amp;rft.aufirst=D.%20S.&amp;rft.aulast=Robertson&amp;rft.au=D.%20S.%20Robertson&amp;rft.date=1997&amp;rft.isbn=978-85-336-0594-7&amp;rft.language=pt-BR"></span>
<div class="csl-entry">Rocha, Ricardo de Souza. “Instrumentos matemáticos na história da arquitetura”. <i>Métis história e cultura</i> 19, n<sup>o</sup> 37 (30 de outubro de 2020): 432–49. <a href="https://doi.org/10.18226/22362762.v19.n.37.17">https://doi.org/10.18226/22362762.v19.n.37.17</a>.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_id=info%3Adoi%2F10.18226%2F22362762.v19.n.37.17&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rft.genre=article&amp;rft.atitle=Instrumentos%20matem%C3%A1ticos%20na%20hist%C3%B3ria%20da%20arquitetura&amp;rft.jtitle=M%C3%A9tis%20hist%C3%B3ria%20e%20cultura&amp;rft.stitle=M%C3%A9tis&amp;rft.volume=19&amp;rft.issue=37&amp;rft.aufirst=Ricardo%20de%20Souza&amp;rft.aulast=Rocha&amp;rft.au=Ricardo%20de%20Souza%20Rocha&amp;rft.date=2020-10-30&amp;rft.pages=432-449&amp;rft.spage=432&amp;rft.epage=449&amp;rft.issn=22362762&amp;rft.language=pt"></span>
<div class="csl-entry">Scholfield, P. H. <i>Teoría de la proporción en arquitectura</i>. Traduzido por Luis Recasens. Barcelona: Labor, 1971.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=Teor%C3%ADa%20de%20la%20proporci%C3%B3n%20en%20arquitectura&amp;rft.place=Barcelona&amp;rft.publisher=Labor&amp;rft.aufirst=P.%20H&amp;rft.aulast=Scholfield&amp;rft.au=P.%20H%20Scholfield&amp;rft.au=Luis%20Recasens&amp;rft.date=1971&amp;rft.language=es"></span>
<div class="csl-entry">Stierlin, Henri. <i>O Império Romano: dos etruscos ao declínio do império romano</i>. Köln: Taschen, 2002.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=O%20Imp%C3%A9rio%20Romano%3A%20dos%20etruscos%20ao%20decl%C3%ADnio%20do%20imp%C3%A9rio%20romano&amp;rft.place=K%C3%B6ln&amp;rft.publisher=Taschen&amp;rft.aufirst=Henri&amp;rft.aulast=Stierlin&amp;rft.au=Henri%20Stierlin&amp;rft.date=2002&amp;rft.language=pt"></span>
<div class="csl-entry">Vitrúvio. <i>Tratado de arquitetura</i>. Traduzido por M. Justino Maciel. São Paulo: Martins Fontes, 2007.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_id=urn%3Aisbn%3A978-85-7707-003-9&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=Tratado%20de%20arquitetura&amp;rft.place=S%C3%A3o%20Paulo&amp;rft.publisher=Martins%20Fontes&amp;rft.au=undefined&amp;rft.au=M.%20Justino%20Maciel&amp;rft.date=2007&amp;rft.isbn=978-85-7707-003-9&amp;rft.language=pt"></span>
</div>
10 changes: 1 addition & 9 deletions _includes/trabalho-2.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Bibliography</title>
</head>
<body>
<div class="csl-bib-body" style="line-height: 1.35; margin-left: 2em; text-indent:-2em;">
<div class="csl-entry">Alexander, Christopher, Sara Ishikawa, Murray Silverstein, Max Jacobson, Ingrid Fiksdahl-King, e Shlomo Angel. <i>A Pattern Language: Towns, Buildings, Construction</i>. New York: Oxford University Press, 1977.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=A%20pattern%20language%3A%20towns%2C%20buildings%2C%20construction&amp;rft.place=New%20York&amp;rft.publisher=Oxford%20University%20Press&amp;rft.aufirst=Christopher&amp;rft.aulast=Alexander&amp;rft.au=Christopher%20Alexander&amp;rft.au=Sara%20Ishikawa&amp;rft.au=Murray%20Silverstein&amp;rft.au=Max%20Jacobson&amp;rft.au=Ingrid%20Fiksdahl-King&amp;rft.au=Shlomo%20Angel&amp;rft.date=1977&amp;rft.language=en-US"></span>
Expand Down Expand Up @@ -54,5 +47,4 @@
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_id=urn%3Aisbn%3A978-0-262-70031-3&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=Classical%20architecture%3A%20the%20poetics%20of%20order&amp;rft.place=Cambridge%2C%20Mass.&amp;rft.publisher=%3Cspan%20class%3D%22smallcaps%22%3EMIT%3C%2Fspan%3E%20Press&amp;rft.aufirst=Alexander&amp;rft.aulast=Tzonis&amp;rft.au=Alexander%20Tzonis&amp;rft.au=Liane%20Lefaivre&amp;rft.date=1986&amp;rft.isbn=978-0-262-70031-3&amp;rft.language=en-US"></span>
<div class="csl-entry">Vitrúvio. <i>Tratado de arquitetura</i>. Traduzido por M. Justino Maciel. São Paulo: Martins Fontes, 2007.</div>
<span class="Z3988" title="url_ver=Z39.88-2004&amp;ctx_ver=Z39.88-2004&amp;rfr_id=info%3Asid%2Fzotero.org%3A2&amp;rft_id=urn%3Aisbn%3A978-85-7707-003-9&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=Tratado%20de%20arquitetura&amp;rft.place=S%C3%A3o%20Paulo&amp;rft.publisher=Martins%20Fontes&amp;rft.au=undefined&amp;rft.au=M.%20Justino%20Maciel&amp;rft.date=2007&amp;rft.isbn=978-85-7707-003-9&amp;rft.language=pt-BR"></span>
</div></body>
</html>
</div>
Loading