Merge branch 'issue#23' into 'devel'

Issue#23

Esse ramo traz:
  * Desenvolvimentos no capítulo 5 - Serviços Web para Git;
  * Arquivo `template.tex` com as definições de preâmbulo de classe book;
  * Arquivo `apostila_git.tex` que é o preâmbulo com o qual será gerada a apostila usando `\input{}` dos capítulos;
  * O merge !51 juntou o trabalho de correção da @alcl12 no ramo #51 com esse ramo #23.

See merge request !41

.gitignore

@@ -13,3 +13,5 @@ downloads/*
 *.html
 *.orig
 apostila-git.Rproj
+/apostila_git.toc
+/cap05.md

apostila_git.tex

+\documentclass[
+  a5paper,
+  pagesize,
+  9pt,
+  % bibtotoc,
+  pointlessnumbers,
+  normalheadings,
+  % DIV=9,
+  twoside=false
+]{book}
+
+\usepackage[brazil]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+
+\usepackage[sc]{mathpazo}
+% \usepackage{palatino}
+% \linespread{1.05} 
+\usepackage[scaled=0.85]{beramono}
+
+%-----------------------------------------------------------------------
+
+\usepackage{amssymb, amsmath}
+\usepackage{ifxetex, ifluatex}
+
+\usepackage{fixltx2e} % provides \textsubscript
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
+  \usepackage[T1]{fontenc}
+  \usepackage[utf8]{inputenc}
+\else % if luatex or xelatex
+  \ifxetex
+    \usepackage{mathspec}
+    \usepackage{xltxtra,xunicode}
+  \else
+    \usepackage{fontspec}
+  \fi
+  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+  \newcommand{\euro}{€}
+\fi
+
+% use upquote if available, for straight quotes in verbatim environments
+\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
+% use microtype if available
+\IfFileExists{microtype.sty}{%
+\usepackage{microtype}
+\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
+}{}
+
+%-----------------------------------------------------------------------
+% knitr.
+
+\usepackage{color}
+\usepackage{fancyvrb}
+\newcommand{\VerbBar}{|}
+\newcommand{\VERB}{\Verb[commandchars=\\\{\}]}
+\DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
+% Add ',fontsize=\small' for more characters per line
+\usepackage{framed}
+\definecolor{shadecolor}{RGB}{248,248,248}
+\newenvironment{Shaded}{\begin{snugshade}}{\end{snugshade}}
+\newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.13,0.29,0.53}{\textbf{{#1}}}}
+\newcommand{\DataTypeTok}[1]{\textcolor[rgb]{0.13,0.29,0.53}{{#1}}}
+\newcommand{\DecValTok}[1]{\textcolor[rgb]{0.00,0.00,0.81}{{#1}}}
+\newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.00,0.00,0.81}{{#1}}}
+\newcommand{\FloatTok}[1]{\textcolor[rgb]{0.00,0.00,0.81}{{#1}}}
+\newcommand{\CharTok}[1]{\textcolor[rgb]{0.31,0.60,0.02}{{#1}}}
+\newcommand{\StringTok}[1]{\textcolor[rgb]{0.31,0.60,0.02}{{#1}}}
+\newcommand{\CommentTok}[1]{\textcolor[rgb]{0.56,0.35,0.01}{\textit{{#1}}}}
+\newcommand{\OtherTok}[1]{\textcolor[rgb]{0.56,0.35,0.01}{{#1}}}
+\newcommand{\AlertTok}[1]{\textcolor[rgb]{0.94,0.16,0.16}{{#1}}}
+\newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.00,0.00,0.00}{{#1}}}
+\newcommand{\RegionMarkerTok}[1]{{#1}}
+\newcommand{\ErrorTok}[1]{\textbf{{#1}}}
+\newcommand{\NormalTok}[1]{{#1}}
+
+%-----------------------------------------------------------------------
+
+\usepackage{graphicx}
+\makeatletter
+\def\maxwidth{
+  \ifdim\Gin@nat@width>\linewidth\linewidth
+  \else
+  \Gin@nat@width\fi}
+\def\maxheight{
+  \ifdim\Gin@nat@height>\textheight\textheight
+  \else
+  \Gin@nat@height\fi}
+\makeatother
+% Scale images if necessary, so that they will not overflow the page
+% margins by default, and it is still possible to overwrite the defaults
+% using explicit options in \includegraphics[width, height, ...]{}
+\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
+
+\ifxetex
+  \usepackage[setpagesize=false, % page size defined by xetex
+              unicode=false, % unicode breaks when used with xetex
+              xetex]{hyperref}
+\else
+  \usepackage[unicode=true]{hyperref}
+\fi
+
+\hypersetup{breaklinks=true,
+            bookmarks=true,
+            pdfauthor={},
+            pdftitle={},
+            colorlinks=true,
+            citecolor=blue,
+            urlcolor=blue,
+            linkcolor=magenta,
+            pdfborder={0 0 0}}
+\urlstyle{same}  % don't use monospace font for urls
+
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{6pt plus 2pt minus 1pt}
+\setlength{\emergencystretch}{3em}  % prevent overfull lines
+
+\setcounter{secnumdepth}{5}
+
+%%% Use protect on footnotes to avoid problems with footnotes in titles
+\let\rmarkdownfootnote\footnote%
+\def\footnote{\protect\rmarkdownfootnote}
+
+%%% Change title format to be more compact
+\usepackage{titling}
+
+% Create subtitle command for use in maketitle
+\newcommand{\subtitle}[1]{
+  \posttitle{
+    \begin{center}\large#1\end{center}
+    }
+}
+
+\setlength{\droptitle}{-2em}
+
+\title{Apostila Git}
+\pretitle{\vspace{\droptitle}}
+\posttitle{}
+
+\author{PET Estatística UFPR}
+\preauthor{}\postauthor{}
+
+\date{2015}
+\predate{}\postdate{}
+
+\usepackage{wrapfig}
+
+%-----------------------------------------------------------------------
+
+\begin{document}
+
+% \maketitle
+
+%-----------------------------------------------------------------------
+% Capa.
+
+\begin{titlepage}
+  \centering{{\fontsize{40}{48}\selectfont \thetitle}}\\
+ 
+  \vspace{10mm}
+  \centering{\Large{\theauthor}}\\
+  \vspace{\fill} \centering \large{\thedate}
+\end{titlepage}
+
+%-----------------------------------------------------------------------
+% Dedicatórias.
+
+\newpage{}
+\thispagestyle{empty}
+\vspace*{2cm}
+
+\begin{center}
+  \Large{
+    \parbox{10cm}{
+      \begin{raggedright}
+        {\Large 
+          \textit{Não é a vontade de vencer que ganha o jogo, e sim a
+            vontade de se preparar para vencê-lo.}
+        }
+	
+        \vspace{.5cm}\hfill{---Paul ``Bear'' Bryant}
+      \end{raggedright}
+    }
+  }
+\end{center}
+
+\newpage
+
+%-----------------------------------------------------------------------
+% Agradecimentos.
+
+%-----------------------------------------------------------------------
+% Tabela de conteúdo.
+
+{
+\hypersetup{linkcolor=black}
+\setcounter{tocdepth}{2}
+\tableofcontents
+}
+
+%-----------------------------------------------------------------------
+% Capítulos.
+
+% \input{cap01.tex}
+% \input{cap02.tex}
+% \input{cap03.tex}
+% \input{cap04.tex}
+% \chapter{Serviços Web para Projetos Git}
+% \input{cap05.tex}
+% \input{cap06.tex}
+% \input{cap07.tex}
+% \input{cap08.tex}
+% \input{cap09.tex}
+
+\end{document}
+
+%-----------------------------------------------------------------------
\ No newline at end of file

plano.md

@@ -145,6 +145,31 @@
      concluir sobre Sistemas de Controle de Versão, *Cheat Sheet* e uso
      de Git no RStudio.
 6. 2015-12-01:
+   + TODOS: colocar as figuras em ambiente Latex (`center > figure >
+     includegraphics + caption`). Controlar o tamanho das figuras para
+     não ultrapassarem as margens nem ficarem pequenas demais. Colocar
+     os links com âncoras (os não presentes no texto, como
+     `[google](http://www.google.com)`) em
+     `google\footnote{\url{http://www.google.com}}` para aparecer no
+     rodapé das páginas. Usar seções numeradas. Considerar como exemplo
+     o YAML do arquivo `cap05.Rmd`.
+   + Walmes: Fazer revisão completa do capítulo 5 até sexta para o
+     Alcides. Disponibilizar o template para cada um fazer os ajustes
+     finais no seu capítulo.
+   + Alessandra: Corrigir o capítulo 1.
+   + Daniel: Concluir o capítulo de RStudio e o *Cheat Sheet*
+     (**pendencias**). Revisar o dicionário de termos e exemplos de
+     rotinas.
+   + Gabriel: Fazer revisão e acréscimos no capítulo 3 e disponibilizar
+     até sexta para o Eduardo.
+   + Jhenifer: Corrigir o capítulo do Eduardo que será disponibilizado
+     na sexta.
+   + Ângela: Corrigir o capítulo de RStudio disponibilizado na sexta.
+   + Eduardo: Revisar o capítulo 6 até sexta para a Jhenifer. Corrigir o
+     capítulo 3 depois de sexta.
+   + Alcides: Corrigir o capítulo 5 disponibilizado na sexta.
+   + Quem se interessar: Pensar numa capa para a apostila, fazer esboço,
+     *brainstorm*.
 7. 2015-12-08:
 8. 2015-12-15: Apostila Git concluída!
 

template.tex

+% \documentclass[
+%   $if(fontsize)$$fontsize$,
+%   $endif$$if(lang)$$lang$,
+%   $endif$$if(papersize)$$papersize$,
+%   $endif$$for(classoption)$$classoption$$sep$,
+%   $endfor$]{$documentclass$}
+
+\documentclass[
+  a5paper,
+  pagesize,
+  9pt,
+  % bibtotoc,
+  pointlessnumbers,
+  normalheadings,
+  % DIV=9,
+  twoside=false
+]{book}
+
+\usepackage[brazil]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+
+\usepackage[sc]{mathpazo}
+% \usepackage{palatino}
+% \linespread{1.05} 
+\usepackage[scaled=0.85]{beramono}
+
+%-----------------------------------------------------------------------
+
+\usepackage{amssymb, amsmath}
+\usepackage{ifxetex, ifluatex}
+
+\usepackage{fixltx2e} % provides \textsubscript
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
+  \usepackage[T1]{fontenc}
+  \usepackage[utf8]{inputenc}
+$if(euro)$
+  \usepackage{eurosym}
+$endif$
+\else % if luatex or xelatex
+  \ifxetex
+    \usepackage{mathspec}
+    \usepackage{xltxtra,xunicode}
+  \else
+    \usepackage{fontspec}
+  \fi
+  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+  \newcommand{\euro}{€}
+$if(mainfont)$
+    \setmainfont{$mainfont$}
+$endif$
+$if(sansfont)$
+    \setsansfont{$sansfont$}
+$endif$
+$if(monofont)$
+    \setmonofont[Mapping=tex-ansi]{$monofont$}
+$endif$
+$if(mathfont)$
+    \setmathfont(Digits,Latin,Greek){$mathfont$}
+$endif$
+\fi
+
+% use upquote if available, for straight quotes in verbatim environments
+\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
+% use microtype if available
+\IfFileExists{microtype.sty}{%
+\usepackage{microtype}
+\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
+}{}
+$if(geometry)$
+\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
+$endif$
+
+$if(lang)$
+\ifxetex
+  \usepackage{polyglossia}
+  \setmainlanguage{$mainlang$}
+\else
+  \usepackage[shorthands=off,$lang$]{babel}
+\fi
+$endif$
+
+$if(natbib)$
+\usepackage{natbib}
+\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
+$endif$
+
+$if(biblatex)$
+\usepackage{biblatex}
+$if(biblio-files)$
+\bibliography{$biblio-files$}
+$endif$
+$endif$
+
+$if(listings)$
+\usepackage{listings}
+$endif$
+
+$if(lhs)$
+\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
+$endif$
+
+$if(highlighting-macros)$
+$highlighting-macros$
+$endif$
+
+$if(verbatim-in-note)$
+\usepackage{fancyvrb}
+\VerbatimFootnotes
+$endif$
+
+$if(tables)$
+\usepackage{longtable,booktabs}
+$endif$
+
+$if(graphics)$
+\usepackage{graphicx}
+\makeatletter
+\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
+\def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}
+\makeatother
+% Scale images if necessary, so that they will not overflow the page
+% margins by default, and it is still possible to overwrite the defaults
+% using explicit options in \includegraphics[width, height, ...]{}
+\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
+$endif$
+
+\ifxetex
+  \usepackage[setpagesize=false, % page size defined by xetex
+              unicode=false, % unicode breaks when used with xetex
+              xetex]{hyperref}
+\else
+  \usepackage[unicode=true]{hyperref}
+\fi
+
+\hypersetup{breaklinks=true,
+            bookmarks=true,
+            pdfauthor={$author-meta$},
+            pdftitle={$title-meta$},
+            colorlinks=true,
+            citecolor=$if(citecolor)$$citecolor$$else$blue$endif$,
+            urlcolor=$if(urlcolor)$$urlcolor$$else$blue$endif$,
+            linkcolor=$if(linkcolor)$$linkcolor$$else$magenta$endif$,
+            pdfborder={0 0 0}}
+\urlstyle{same}  % don't use monospace font for urls
+
+$if(links-as-notes)$
+% Make links footnotes instead of hotlinks:
+\renewcommand{\href}[2]{#2\footnote{\url{#1}}}
+$endif$
+
+$if(strikeout)$
+\usepackage[normalem]{ulem}
+% avoid problems with \sout in headers with hyperref:
+\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
+$endif$
+
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{6pt plus 2pt minus 1pt}
+\setlength{\emergencystretch}{3em}  % prevent overfull lines
+
+$if(numbersections)$
+\setcounter{secnumdepth}{5}
+$else$
+\setcounter{secnumdepth}{0}
+$endif$
+
+$if(verbatim-in-note)$
+\VerbatimFootnotes % allows verbatim text in footnotes
+$endif$
+
+%%% Use protect on footnotes to avoid problems with footnotes in titles
+\let\rmarkdownfootnote\footnote%
+\def\footnote{\protect\rmarkdownfootnote}
+
+%%% Change title format to be more compact
+\usepackage{titling}
+
+% Create subtitle command for use in maketitle
+\newcommand{\subtitle}[1]{
+  \posttitle{
+    \begin{center}\large#1\end{center}
+    }
+}
+
+\setlength{\droptitle}{-2em}
+
+$if(title)$
+  \title{$title$}
+  \pretitle{\vspace{\droptitle}\centering\huge}
+  \posttitle{\par}
+$else$
+  \title{}
+  \pretitle{\vspace{\droptitle}}
+  \posttitle{}
+$endif$
+
+$if(subtitle)$
+\subtitle{$subtitle$}
+$endif$
+$if(author)$
+  \author{$for(author)$$author$$sep$ \\ $endfor$}
+  \preauthor{\centering\large\emph}
+  \postauthor{\par}
+$else$
+  \author{}
+  \preauthor{}\postauthor{}
+$endif$
+
+$if(date)$
+  \predate{\centering\large\emph}
+  \postdate{\par}
+  \date{$date$}
+$else$
+  \date{}
+  \predate{}\postdate{}
+$endif$
+
+$for(header-includes)$
+$header-includes$
+$endfor$
+
+\begin{document}
+
+\maketitle
+
+$if(abstract)$
+\begin{abstract}
+$abstract$
+\end{abstract}
+$endif$
+
+$for(include-before)$
+$include-before$
+
+$endfor$
+$if(toc)$
+{
+\hypersetup{linkcolor=black}
+\setcounter{tocdepth}{$toc-depth$}
+\tableofcontents
+}
+$endif$
+
+$if(lot)$
+\listoftables
+$endif$
+
+$if(lof)$
+\listoffigures
+$endif$
+
+$body$ %%---------------------------------------------------------------
+
+$if(natbib)$
+$if(biblio-files)$
+$if(biblio-title)$
+$if(book-class)$
+\renewcommand\bibname{$biblio-title$}
+$else$
+\renewcommand\refname{$biblio-title$}
+$endif$
+$endif$
+\bibliography{$biblio-files$}
+
+$endif$
+$endif$
+$if(biblatex)$
+\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$
+
+$endif$
+$for(include-after)$
+$include-after$
+
+$endfor$
+\end{document}