galaaz 2.1.8 → 2.1.9

data/blogs/nse_dplyr/nse_dplyr.tex

@@ -101,7 +101,7 @@
 \usepackage[utf8]{inputenc}
 
 \usepackage{geometry}
-\geometry{a4paper, top=1in}
+\geometry{a4paper, top=1.05in, headheight=30pt, headsep=14pt}
 
 % needed for kableExtra
 \usepackage{longtable}
@@ -122,29 +122,60 @@
 \usepackage{graphicx}
 
 \usepackage{fancyhdr}
-% set the header and foot style
-% style 'fancy' adds the section name on the header
-% and the page number on the footer
+% Header: small Galaaz mark (left); page number + section title (right),
+% matching classic LaTeX style: "4  AN EXTENSION TO THE EXAMPLE"
+% (upright page number, uppercase italic section name).
+% Logo paths cover repo blogs (../../sty/), installed ~/sty/, and local images/.
+% Blogs may delay headers with \renewcommand{\galaazheaderfrompage}{3} after this sty
+% (e.g. skip title/TOC and a logo splash page).
+\newcommand{\galaazheaderfrompage}{1}
+\newcommand{\galaazheaderlogo}{%
+  \raisebox{-0.12\height}{%
+    \IfFileExists{../../sty/galaaz-header.png}{%
+      \includegraphics[height=0.32in]{../../sty/galaaz-header.png}%
+    }{%
+      \IfFileExists{galaaz-header.png}{%
+        \includegraphics[height=0.32in]{galaaz-header.png}%
+      }{%
+        \IfFileExists{images/galaaz-header.png}{%
+          \includegraphics[height=0.32in]{images/galaaz-header.png}%
+        }{}%
+      }%
+    }%
+  }%
+}
+% Section title only in marks (no \thesection); page number is separate.
+\renewcommand{\sectionmark}[1]{\markboth{#1}{}}
+\renewcommand{\subsectionmark}[1]{}% keep the current section in the header
+\newcommand{\galaazmaybeheaderlogo}{%
+  \ifnum\value{page}<\galaazheaderfrompage\relax\else\galaazheaderlogo\fi}
+\newcommand{\galaazmayberighthead}{%
+  \ifnum\value{page}<\galaazheaderfrompage\relax
+  \else
+    \textup{\thepage}\hspace{1em}\textit{\MakeUppercase{\leftmark}}%
+  \fi
+}
 \pagestyle{fancy}
-
-% style 'fancyhf' leaves header and footer empty
-%\fancyhf{}
-
-% sets the left head element to \rightmark, which contains the
-% current section (\leftmark is the current chapter)
-%\fancyhead[L]{\rightmark} .
-
-% sets the right head element to the page number.
-% \fancyhead[R]{\thepage}
-
-% lets the head rule disappear.
-% \renewcommand{\headrulewidth}{0pt}
-% Possible selectors for the optional argument of \fancyhead/\fancyfoot
-% are L (left), C (center) or R (right) for the position of the element
-% and E (even) or O (odd) to distinguish even and odd pages. If you omit
-% E/O the element is set for all pages.
-
-% \usepackage{lipsum}
+\fancyhf{}
+\fancyhead[L]{\galaazmaybeheaderlogo}
+\fancyhead[R]{\galaazmayberighthead}
+\renewcommand{\headrulewidth}{0.3pt}
+\makeatletter
+\renewcommand{\headrule}{%
+  \ifnum\value{page}<\galaazheaderfrompage\relax
+  \else
+    \hrule\@height\headrulewidth\@width\headwidth
+    \vskip-\headrulewidth
+  \fi
+}
+\makeatother
+% First page often uses plain; same conditional header logic.
+\fancypagestyle{plain}{%
+  \fancyhf{}%
+  \fancyhead[L]{\galaazmaybeheaderlogo}%
+  \fancyhead[R]{\galaazmayberighthead}%
+  \renewcommand{\headrulewidth}{0.3pt}%
+}
 
 % make available command lastpage
 \usepackage{lastpage}
@@ -189,6 +220,10 @@
 
 % 
 %\newcommand{\atraso}[1]{\color{red} \textbf {Tempo desde a Assinatura do Contrato: #1 dias}}
+% No header on title/TOC (p.1) or splash logo page (p.2);
+% logo + page number + section title from page 3 onward.
+% Load after galaaz.sty.
+\renewcommand{\galaazheaderfrompage}{3}
 \usepackage{bookmark}
 \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available
 \urlstyle{same}
@@ -209,6 +244,8 @@
 \setcounter{tocdepth}{2}
 \tableofcontents
 }
+\begin{center}\includegraphics[width=0.45\linewidth]{images/galaaz-lockup-stacked} \end{center}
+
 \section{Introduction}\label{introduction}
 
 According to Steven Sagaert's answer on Quora about ``Is programming
@@ -796,7 +833,7 @@ Let's start by taking a look at this dataset:
 
 \begin{verbatim}
 ## ~(dim(flights))
-## <environment: 0x57d8ad019298>
+## <environment: 0x5acac1752f98>
 \end{verbatim}
 
 Now, let's use a first verb of \emph{dplyr}: `filter'. This verb,

data/blogs/oh_my/oh_my.Rmd

@@ -9,9 +9,17 @@ output:
   html_document:
     self_contained: true
     keep_md: true
+    toc: true
+    toc_float: true
+    toc_depth: 2
+    number_sections: true
+    includes:
+      before_body: _logo_before_body.html
   pdf_document:
     includes:
-      in_header: "../../sty/galaaz.sty"
+      in_header:
+        - "../../sty/galaaz.sty"
+        - "../../sty/galaaz-headers-from-p3.tex"
     keep_tex: yes
     number_sections: yes
     toc: true
@@ -23,6 +31,11 @@ fontsize: 11pt
 options(width = 70)
 ```
 
+```{r brand_logo, echo=FALSE, fig.align='center', out.width='45%', eval=knitr::is_latex_output()}
+# PDF only — HTML uses _logo_before_body.html (above the TOC).
+knitr::include_graphics("images/galaaz-lockup-stacked.png")
+```
+
 # Introduction
 
 This paper introduces and compares Galaaz with R's S4.  It is **modeled closely** on

data/blogs/oh_my/oh_my.md

@@ -9,9 +9,17 @@ output:
   html_document:
     self_contained: true
     keep_md: true
+    toc: true
+    toc_float: true
+    toc_depth: 2
+    number_sections: true
+    includes:
+      before_body: _logo_before_body.html
   pdf_document:
     includes:
-      in_header: "../../sty/galaaz.sty"
+      in_header:
+        - "../../sty/galaaz.sty"
+        - "../../sty/galaaz-headers-from-p3.tex"
     keep_tex: yes
     number_sections: yes
     toc: true
@@ -21,6 +29,8 @@ fontsize: 11pt
 
 
 
+
+
 # Introduction
 
 This paper introduces and compares Galaaz with R's S4.  It is **modeled closely** on
@@ -104,7 +114,7 @@ puts @traj
 ```
 
 ```
-## #<RC::Trajectories:0x58ea712d>
+## #<RC::Trajectories:0x3cbcf7a0>
 ```
 
 To see the contents of an object, one needs to access its components using the '.' operator:
@@ -587,27 +597,27 @@ end
 ## 32
 ## * Traj (limited to a matrix 10x10) = 
 ##       [,1]    [,2]    [,3]    [,4]    [,5]    [,6]    [,7]    [,8]   
-##  [1,] "16.11" "16.22" "16.57" "16.54" "16.06" "16.73" "16.52" "17.07"
-##  [2,] "16.22" "15.78" "16.51" "16.27" "16.78" "17.07" "16.89" "17.03"
-##  [3,] "16.11" "16.32" "16.17" "16.56" "16.63" "16.83" "16.76" "17.17"
-##  [4,] "16.28" "16.11" "16.42" "16.40" "16.54" "16.22" "16.48" "17.14"
-##  [5,] "16.11" "16.30" "16.12" "16.47" "16.49" "16.66" "16.98" "17.17"
-##  [6,] "15.63" "16.22" "16.53" "16.52" "16.50" "16.63" "17.07" "17.04"
-##  [7,] "16.18" "16.16" "15.89" "16.22" "16.82" "16.97" "17.16" "17.22"
-##  [8,] "15.53" "15.93" "16.36" "16.86" "16.26" "16.92" "16.96" "16.97"
-##  [9,] "15.92" "16.22" "16.22" "16.13" "16.52" "16.77" "17.14" "16.76"
-## [10,] "16.45" "15.91" "16.14" "16.62" "16.53" "17.11" "16.96" "17.00"
+##  [1,] "15.85" "16.10" "16.34" "16.33" "16.58" "16.91" "16.89" "16.99"
+##  [2,] "15.67" "16.28" "16.37" "16.34" "16.31" "16.39" "17.19" "16.84"
+##  [3,] "16.02" "16.03" "16.40" "16.52" "16.68" "16.99" "16.87" "17.26"
+##  [4,] "15.99" "16.24" "16.30" "16.38" "16.76" "16.84" "16.60" "16.96"
+##  [5,] "15.89" "15.96" "16.43" "16.68" "16.48" "16.68" "16.87" "16.59"
+##  [6,] "16.35" "15.97" "16.04" "16.65" "16.66" "16.58" "16.95" "17.01"
+##  [7,] "16.17" "16.22" "16.37" "16.34" "16.53" "16.34" "16.93" "16.96"
+##  [8,] "15.98" "15.97" "16.08" "16.49" "16.91" "16.97" "16.91" "17.43"
+##  [9,] "16.49" "16.26" "16.08" "16.44" "16.57" "16.92" "17.14" "17.46"
+## [10,] "16.10" "15.95" "16.19" "16.16" "16.66" "16.99" "17.03" "17.12"
 ##       [,9]    [,10]  
-##  [1,] "17.24" "17.34"
-##  [2,] "17.60" "17.19"
-##  [3,] "17.63" "17.24"
-##  [4,] "17.18" "17.55"
-##  [5,] "17.25" "17.49"
-##  [6,] "17.19" "17.06"
-##  [7,] "16.90" "17.34"
-##  [8,] "17.32" "17.01"
-##  [9,] "17.46" "17.31"
-## [10,] "17.29" "17.21"
+##  [1,] "17.38" "17.30"
+##  [2,] "17.00" "17.47"
+##  [3,] "17.02" "17.28"
+##  [4,] "17.06" "17.28"
+##  [5,] "17.01" "17.14"
+##  [6,] "16.95" "17.14"
+##  [7,] "17.02" "17.08"
+##  [8,] "17.15" "17.67"
+##  [9,] "17.06" "17.43"
+## [10,] "17.10" "17.57"
 ## ******* End Show (trajectories) *******
 ```
 
@@ -2104,7 +2114,7 @@ puts @a
 ## [1] A B C B B A
 ## Levels: A B C
 ## 
-## #<RC::PartitionSimple:0x666d3927>
+## #<RC::PartitionSimple:0x5520a83a>
 ```
 
 
@@ -2132,7 +2142,7 @@ puts @b
 ## [1] A E C D B D
 ## Levels: A < B < C < D < E
 ## 
-## #<RC::PartitionEval:0x22d4f3a8>
+## #<RC::PartitionEval:0x6b85a357>
 ```
 
 
@@ -2174,7 +2184,7 @@ puts @a
 ## [1] A B C B B A
 ## Levels: A B C
 ## 
-## #<RC::PartitionSimple:0x666d3927>
+## #<RC::PartitionSimple:0x5520a83a>
 ```
 
 As can be seen, 'puts @a' now calls method 'to_s' defined in class PartitionSimple.  This
@@ -2197,7 +2207,7 @@ puts @b
 ## [1] A E C D B D
 ## Levels: A < B < C < D < E
 ## 
-## #<RC::PartitionEval:0x22d4f3a8>
+## #<RC::PartitionEval:0x6b85a357>
 ```
 
 # Internal Modification of an Object

data/blogs/oh_my/oh_my.tex

@@ -101,7 +101,7 @@
 \usepackage[utf8]{inputenc}
 
 \usepackage{geometry}
-\geometry{a4paper, top=1in}
+\geometry{a4paper, top=1.05in, headheight=30pt, headsep=14pt}
 
 % needed for kableExtra
 \usepackage{longtable}
@@ -122,29 +122,60 @@
 \usepackage{graphicx}
 
 \usepackage{fancyhdr}
-% set the header and foot style
-% style 'fancy' adds the section name on the header
-% and the page number on the footer
+% Header: small Galaaz mark (left); page number + section title (right),
+% matching classic LaTeX style: "4  AN EXTENSION TO THE EXAMPLE"
+% (upright page number, uppercase italic section name).
+% Logo paths cover repo blogs (../../sty/), installed ~/sty/, and local images/.
+% Blogs may delay headers with \renewcommand{\galaazheaderfrompage}{3} after this sty
+% (e.g. skip title/TOC and a logo splash page).
+\newcommand{\galaazheaderfrompage}{1}
+\newcommand{\galaazheaderlogo}{%
+  \raisebox{-0.12\height}{%
+    \IfFileExists{../../sty/galaaz-header.png}{%
+      \includegraphics[height=0.32in]{../../sty/galaaz-header.png}%
+    }{%
+      \IfFileExists{galaaz-header.png}{%
+        \includegraphics[height=0.32in]{galaaz-header.png}%
+      }{%
+        \IfFileExists{images/galaaz-header.png}{%
+          \includegraphics[height=0.32in]{images/galaaz-header.png}%
+        }{}%
+      }%
+    }%
+  }%
+}
+% Section title only in marks (no \thesection); page number is separate.
+\renewcommand{\sectionmark}[1]{\markboth{#1}{}}
+\renewcommand{\subsectionmark}[1]{}% keep the current section in the header
+\newcommand{\galaazmaybeheaderlogo}{%
+  \ifnum\value{page}<\galaazheaderfrompage\relax\else\galaazheaderlogo\fi}
+\newcommand{\galaazmayberighthead}{%
+  \ifnum\value{page}<\galaazheaderfrompage\relax
+  \else
+    \textup{\thepage}\hspace{1em}\textit{\MakeUppercase{\leftmark}}%
+  \fi
+}
 \pagestyle{fancy}
-
-% style 'fancyhf' leaves header and footer empty
-%\fancyhf{}
-
-% sets the left head element to \rightmark, which contains the
-% current section (\leftmark is the current chapter)
-%\fancyhead[L]{\rightmark} .
-
-% sets the right head element to the page number.
-% \fancyhead[R]{\thepage}
-
-% lets the head rule disappear.
-% \renewcommand{\headrulewidth}{0pt}
-% Possible selectors for the optional argument of \fancyhead/\fancyfoot
-% are L (left), C (center) or R (right) for the position of the element
-% and E (even) or O (odd) to distinguish even and odd pages. If you omit
-% E/O the element is set for all pages.
-
-% \usepackage{lipsum}
+\fancyhf{}
+\fancyhead[L]{\galaazmaybeheaderlogo}
+\fancyhead[R]{\galaazmayberighthead}
+\renewcommand{\headrulewidth}{0.3pt}
+\makeatletter
+\renewcommand{\headrule}{%
+  \ifnum\value{page}<\galaazheaderfrompage\relax
+  \else
+    \hrule\@height\headrulewidth\@width\headwidth
+    \vskip-\headrulewidth
+  \fi
+}
+\makeatother
+% First page often uses plain; same conditional header logic.
+\fancypagestyle{plain}{%
+  \fancyhf{}%
+  \fancyhead[L]{\galaazmaybeheaderlogo}%
+  \fancyhead[R]{\galaazmayberighthead}%
+  \renewcommand{\headrulewidth}{0.3pt}%
+}
 
 % make available command lastpage
 \usepackage{lastpage}
@@ -189,6 +220,10 @@
 
 % 
 %\newcommand{\atraso}[1]{\color{red} \textbf {Tempo desde a Assinatura do Contrato: #1 dias}}
+% No header on title/TOC (p.1) or splash logo page (p.2);
+% logo + page number + section title from page 3 onward.
+% Load after galaaz.sty.
+\renewcommand{\galaazheaderfrompage}{3}
 \usepackage{bookmark}
 \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available
 \urlstyle{same}
@@ -209,6 +244,8 @@
 \setcounter{tocdepth}{2}
 \tableofcontents
 }
+\begin{center}\includegraphics[width=0.45\linewidth]{images/galaaz-lockup-stacked} \end{center}
+
 \section{Introduction}\label{introduction}
 
 This paper introduces and compares Galaaz with R's S4. It is
@@ -301,7 +338,7 @@ contents as in R.
 \end{Shaded}
 
 \begin{verbatim}
-## #<RC::Trajectories:0x4433c45f>
+## #<RC::Trajectories:0x7df91b21>
 \end{verbatim}
 
 To see the contents of an object, one needs to access its components
@@ -483,11 +520,11 @@ correctly set:
 \begin{verbatim}
 ## [1] 1 3 4 5
 ## 
-##          [,1] [,2] [,3] [,4]
-## g2_v7095 15.0 15.1 15.2 15.2
-## g2_v7096 16.0 15.9 16.0 16.4
-## g2_v7097 15.2   NA 15.3 15.3
-## g2_v7098 15.7 15.6 15.8 16.0
+##         [,1] [,2] [,3] [,4]
+## g2_v729 15.0 15.1 15.2 15.2
+## g2_v730 16.0 15.9 16.0 16.4
+## g2_v731 15.2   NA 15.3 15.3
+## g2_v732 15.7 15.6 15.8 16.0
 ## 
 ##  [1]  1  2  3  4  5  6  7  8  9 10 12 14 16 18 20 22 24 26 28 30 32
 \end{verbatim}
@@ -700,11 +737,11 @@ Trajectories's print we need to write `Kernel.print'.
 ## 4
 ## 5
 ## traj =
-##          [,1] [,2] [,3] [,4]
-## g2_v7095 15.0 15.1 15.2 15.2
-## g2_v7096 16.0 15.9 16.0 16.4
-## g2_v7097 15.2   NA 15.3 15.3
-## g2_v7098 15.7 15.6 15.8 16.0
+##         [,1] [,2] [,3] [,4]
+## g2_v729 15.0 15.1 15.2 15.2
+## g2_v730 16.0 15.9 16.0 16.4
+## g2_v731 15.2   NA 15.3 15.3
+## g2_v732 15.7 15.6 15.8 16.0
 ## ******* End Print (trajectories) *******
 \end{verbatim}
 
@@ -831,27 +868,27 @@ we have already seen, others will be described now:
 ## 32
 ## * Traj (limited to a matrix 10x10) = 
 ##       [,1]    [,2]    [,3]    [,4]    [,5]    [,6]    [,7]    [,8]   
-##  [1,] "16.08" "16.63" "16.39" "16.47" "16.60" "16.90" "17.07" "17.38"
-##  [2,] "16.35" "15.96" "16.29" "16.41" "16.65" "16.45" "17.23" "16.84"
-##  [3,] "15.70" "16.08" "16.70" "16.20" "16.67" "16.67" "16.94" "17.10"
-##  [4,] "15.94" "16.05" "16.30" "16.57" "16.48" "16.80" "16.95" "17.06"
-##  [5,] "16.06" "16.07" "16.33" "16.71" "16.91" "16.92" "17.22" "16.91"
-##  [6,] "16.17" "15.85" "16.61" "16.78" "16.41" "16.78" "17.00" "17.09"
-##  [7,] "16.03" "15.86" "16.46" "16.60" "16.80" "16.79" "16.97" "17.21"
-##  [8,] "16.24" "16.54" "16.21" "16.46" "16.81" "17.07" "16.67" "17.34"
-##  [9,] "15.89" "16.24" "16.30" "16.46" "16.53" "17.11" "17.06" "17.17"
-## [10,] "16.15" "16.06" "16.38" "16.10" "16.36" "16.94" "16.78" "17.08"
+##  [1,] "16.25" "16.49" "16.28" "16.18" "16.59" "16.78" "16.93" "17.34"
+##  [2,] "16.00" "16.39" "16.54" "16.74" "16.74" "16.69" "16.52" "16.79"
+##  [3,] "16.03" "16.48" "16.21" "16.34" "16.46" "16.99" "17.07" "17.04"
+##  [4,] "16.18" "16.03" "16.22" "16.38" "16.74" "16.83" "16.94" "17.04"
+##  [5,] "16.11" "15.72" "16.01" "16.32" "16.27" "16.68" "17.18" "16.95"
+##  [6,] "16.03" "16.17" "16.13" "16.60" "17.02" "16.57" "17.26" "16.91"
+##  [7,] "15.99" "16.10" "16.51" "16.39" "16.97" "16.82" "16.74" "17.10"
+##  [8,] "16.32" "15.85" "16.65" "16.33" "16.60" "15.93" "16.77" "17.19"
+##  [9,] "16.13" "16.41" "16.56" "16.47" "16.71" "16.59" "16.94" "16.83"
+## [10,] "15.77" "16.23" "16.28" "16.27" "16.83" "16.32" "16.86" "16.74"
 ##       [,9]    [,10]  
-##  [1,] "17.29" "17.29"
-##  [2,] "16.97" "17.13"
-##  [3,] "16.94" "17.47"
-##  [4,] "16.65" "17.61"
-##  [5,] "17.17" "17.49"
-##  [6,] "16.98" "17.87"
-##  [7,] "17.16" "17.29"
-##  [8,] "17.18" "17.48"
-##  [9,] "17.09" "17.18"
-## [10,] "17.69" "17.54"
+##  [1,] "17.20" "17.30"
+##  [2,] "17.26" "17.50"
+##  [3,] "17.10" "17.00"
+##  [4,] "17.20" "17.33"
+##  [5,] "17.33" "17.15"
+##  [6,] "17.24" "17.45"
+##  [7,] "17.07" "17.65"
+##  [8,] "16.81" "17.63"
+##  [9,] "17.24" "17.47"
+## [10,] "16.92" "17.42"
 ## ******* End Show (trajectories) *******
 \end{verbatim}
 
@@ -2484,7 +2521,7 @@ to show Ruby's inheritance:
 ## [1] A B C B B A
 ## Levels: A B C
 ## 
-## #<RC::PartitionSimple:0x5f44865c>
+## #<RC::PartitionSimple:0x6b85a357>
 \end{verbatim}
 
 \begin{Shaded}
@@ -2514,7 +2551,7 @@ to show Ruby's inheritance:
 ## [1] A E C D B D
 ## Levels: A < B < C < D < E
 ## 
-## #<RC::PartitionEval:0x45e699f1>
+## #<RC::PartitionEval:0x462891eb>
 \end{verbatim}
 
 \begin{Shaded}
@@ -2560,7 +2597,7 @@ name of the class:
 ## [1] A B C B B A
 ## Levels: A B C
 ## 
-## #<RC::PartitionSimple:0x5f44865c>
+## #<RC::PartitionSimple:0x6b85a357>
 \end{verbatim}
 
 As can be seen, `puts @a' now calls method `to\_s' defined in class
@@ -2584,7 +2621,7 @@ particular `to\_s' method.
 ## [1] A E C D B D
 ## Levels: A < B < C < D < E
 ## 
-## #<RC::PartitionEval:0x45e699f1>
+## #<RC::PartitionEval:0x462891eb>
 \end{verbatim}
 
 \section{Internal Modification of an