Merge pull request #39 from yax-lakam-tuun/29-chapter-terminology

29 chapter terminology

.chktexrc

@@ -1,2 +1,2 @@
 # Disable warnings about spaces
-CmdLine { -n 1 -n 24 }
+CmdLine { -n 1 -n 24 -n 36 }

.vscode/ltex.dictionary.en-US.txt

@@ -21,3 +21,66 @@ Yucatec
 calendrical
 Roys
 Norweb
+json
+devcontainer
+BibLaTeX
+Graphemes
+subgraphemic
+Tikal
+graphemes
+Knorozov
+ix
+winikhaab
+ajaw
+tza
+wa
+ja
+kal
+tzapaw
+Ajaw
+Winikhaab
+kab
+chan
+Looper
+Macri
+winik
+jo
+TWKM
+Prager
+Grube
+biscript
+Ignace
+Gelb
+Coe
+Logographic
+Logosyllabography
+Logosyllabic
+logograms
+Logograms
+Abjad
+Ugaritic
+abjad
+Syllabary
+Abugida
+Ethiopic
+Zender
+Landa
+Relación
+cosas
+las
+syllabary
+Historia
+Chumayel
+Chichén
+Itzá
+Monjas
+Kakupakal
+decipherments
+syllabograms
+Logogram
+syllabogram
+logogram
+Syllabograms
+Pakal
+Vail
+infixed

ConvertFrom-Svg.ps1

@@ -50,7 +50,7 @@ if ($SvgFiles.Length -eq -0) {
 }
 
 foreach ($Svg in $SvgFiles) {
-    $Pdf = $Svg.ToLower().Replace('.svg', '.pdf')
+    $Pdf = $Svg.Replace('.svg', '.pdf').Replace('.SVG', '.pdf')
 
     # inkscape's exit codes are not reliable so we print everything always
     # (see https://gitlab.com/inkscape/inkscape/-/issues/270)

container/Dockerfile

@@ -24,7 +24,7 @@ RUN apt-get -qq install \
 
 # Install PowerShell
 ARG TARGETPLATFORM
-RUN curl -L -o /tmp/powershell.tar.gz https://github.com/PowerShell/PowerShell/releases/download/v7.3.4/powershell-7.3.4-$(echo "$TARGETPLATFORM" | sed 's/amd64/x64/g' | sed 's/\//-/g').tar.gz && \
+RUN curl -L -o /tmp/powershell.tar.gz https://github.com/PowerShell/PowerShell/releases/download/v7.3.9/powershell-7.3.9-$(echo "$TARGETPLATFORM" | sed 's/amd64/x64/g' | sed 's/\//-/g').tar.gz && \
     mkdir -p /opt/microsoft/powershell/7 && \
     tar zxf /tmp/powershell.tar.gz -C /opt/microsoft/powershell/7 && \
     chmod +x /opt/microsoft/powershell/7/pwsh && \

documentation/latex.md

@@ -101,7 +101,7 @@ There are some files like scripts which have a special function inside the proje
 Here's a short summary:
 * [document-version.tex](../document-version.tex): 
   The current version of the document as it is used for a possible release.
-  Managed by [Edit-DocumentVersion.ps1](Edit-DocumentVersion.ps1).
+  Managed by [Edit-DocumentVersion.ps1](../Edit-DocumentVersion.ps1).
 * [preamble.sty](../preamble.sty): Entry point for everything LaTeX in this project. 
   Includes used LaTeX libraries and defines some settings used in the document.
 * [maya.sty](../maya.sty): Library for Maya specific LaTeX command (e.g. hieroglyph commands etc.)

introduction/introduction.tex

@@ -11,7 +11,7 @@ \chapter{Introduction}
 
 In addition to the famous writings on stelas, temples and altars, the Maya also wrote on sheets of 
 bark paper (\cite[34\psq]{vonhagen1944}) which were then bundled and 
-folded to books (see~\ref{fig:introduction-example-dresden-codex} for some sample pages).
+folded to books (\Cref{fig:introduction-example-dresden-codex} for some sample pages).
 These books are usually called \emph{codices}.
 \begin{center}
     \includegraphics[width=\textwidth,keepaspectratio]{img/example-dresden-codex}
@@ -24,74 +24,76 @@ \chapter{Introduction}
 the \pariscodex and \mayamexicocodex(also known as \groliercodex).
 The codices are named after the location where they have been found or stored.
 Hieroglyphs can also be found on incised bones, shells, Jade and Hard stones and on painted or 
-carved pottery (see for example~\ref{fig:introduction-panel-with-royal-woman} and
-~\ref{fig:introduction-vessel-with-battle-scene}).
+carved pottery (\Cref{fig:introduction-panel-with-royal-woman} and
+\Cref{fig:introduction-vessel-with-battle-scene}).
+% LTeX: enabled=false
 \begin{figure}
     \centering
-    \begin{subfigure}[b]{0.49\textwidth}
+    \subfloat[][]{
         \centering
-        \includegraphics[width=\textwidth]{img/panel-with-royal-woman}
-        \caption{Panel with royal woman, Classic Period,
-                 Cleveland Museum of Art, Purchase from the J. H. Wade Fund 1962.32}
+        \includegraphics[width=0.47\textwidth]{img/panel-with-royal-woman}
         \label{fig:introduction-panel-with-royal-woman}
-    \end{subfigure}
+    }
     \hfill
-    \begin{subfigure}[b]{0.49\textwidth}
+    \subfloat[][]{
         \centering
-        \includegraphics[width=\textwidth]{img/vessel-with-battle-scene}
-        \caption{Vessel with Battle Scene, Late Classic Period,
-                 Cleveland Museum of Art, John L. Severance Fund 2012.32}
+        \includegraphics[width=0.47\textwidth]{img/vessel-with-battle-scene}
         \label{fig:introduction-vessel-with-battle-scene}
-    \end{subfigure}
-    \caption{Maya art from the Classic and Late Classic}
+    }
+    \caption[Maya art from the Classic and Late Classic]{Maya art from the Classic and Late Classic.
+             \subref{fig:introduction-panel-with-royal-woman} Panel with royal woman, 
+             Classic Period, Cleveland Museum of Art, Purchase from the J. H. Wade Fund 1962.32;
+             \subref{fig:introduction-vessel-with-battle-scene} Vessel with Battle Scene, 
+             Late Classic Period, Cleveland Museum of Art, John L. Severance Fund 2012.32}
 \end{figure}
+% LTeX: enabled=true
 
 Besides hieroglyphic texts, several manuscripts written in Yucatec Maya using the Latin alphabet 
 have been written  during 16th, 17th and 18th century.
 % LTeX: enabled=false
-\textcquote[p.68]{brinton1882}{The[se] ``old writings'' [\ldots] were composed by natives 
+\textcquote[68]{brinton1882}{The[se] ``old writings'' \elide were composed by natives 
 who had learned to write the Maya in the alphabet adopted by the early missionaries and 
-conquerors\ldots There were at one time a large number of these records.}
+conquerors\elide There were at one time a large number of these records.}
 % LTeX: enabled=true
 Many Maya villages had such a book.
 All books claim to be written by \emph{Chilam Balam} --- a great prophet from the 16th century
 who predicted the arrival of the Spaniards in Yucat\'{a}n
-(\textcquote[\ppno~186--187]{roys1933}{[\ldots] bearded man would come from the east and 
+(\textcquote[\ppno~186--187]{roys1933}{\elide bearded man would come from the east and 
 introduce a new religion}).
 Every book is named after the town the manuscript was located in, e.g. 
 \emph{The Book of Chilam Balam of Tizimin} originated from \emph{Tizimin} --- a town 
 in Yucat\'{a}n
-(~\ref{fig:introduction-chilam-balam-of-tizimin-cover-page} shows the title page).
+(\Cref{fig:introduction-chilam-balam-of-tizimin-cover-page} shows the title page).
 Some other books still exist, many have been lost during the colonial period.
-
 % LTeX: enabled=false
 \begin{figure}[ht]
     \centering
-    \begin{subfigure}[b]{0.49\textwidth}
+    \subfloat[][]{
         \centering
-        \includegraphics[width=\textwidth]{img/chilam-balam-of-tizimin-cover-page}
-        \caption{Cover of the \emph{Book of Chilam Balam of Tizimin}
-                 (\emph{Chilam Balam ``C\'odice Tizimin''}).}
+        \includegraphics[width=0.47\textwidth]{img/chilam-balam-of-tizimin-cover-page}
         \label{fig:introduction-chilam-balam-of-tizimin-cover-page}
-    \end{subfigure}
+    }
     \hfill
-    \begin{subfigure}[b]{0.49\textwidth}
+    \subfloat[][]{
         \centering
-        \includegraphics[width=\textwidth]{img/chilam-balam-of-ixil-page-20r}
-        \caption{Page 20r of \emph{Book of Chilam Balam of Ixil}.
-                 It shows the \haab months and \tzolkin days.}
+        \includegraphics[width=0.47\textwidth]{img/chilam-balam-of-ixil-page-20r}
         \label{fig:introduction-chilam-balam-of-ixil-page-20r}
-    \end{subfigure}
-    \caption{Sample pages of the books of \emph{Chilam Balam}.}
+    }
+    \caption[Sample pages of the books of \emph{Chilam Balam}]{Sample pages of the books of 
+             \emph{Chilam Balam}.
+             \subref{fig:introduction-chilam-balam-of-tizimin-cover-page} Cover of the 
+             \emph{Book of Chilam Balam of Tizimin} (\emph{Chilam Balam ``C\'odice Tizimin''});
+             \subref{fig:introduction-chilam-balam-of-ixil-page-20r} Page 20r of 
+             \emph{Book of Chilam Balam of Ixil}. It shows the \haab months and \tzolkin days.}
 \end{figure}
 % LTeX: enabled=true
-
 These books also play an important role during the process of hieroglyphic decipherment as they 
 contain vital information about historical events, calendrical information, ritual and 
 medical descriptions and many more aspects which help to analyze the great writings of the 
 Maya (\cite[3\psq]{roys1933}).
-Figure~\ref{fig:introduction-chilam-balam-of-ixil-page-20r} for instance, shows some 
-calendrical information from the \tzolkin and \haab calendars.
+For instance, some pages of these books for instance, shows some 
+calendrical information from the \tzolkin and \haab calendars 
+(\Cref{fig:introduction-chilam-balam-of-ixil-page-20r}).
 
 \section{Early attempts in deciphering the Maya hieroglyphs}
 For centuries, the hieroglyphic writings remained largely mysterious, as the Maya script was 

main.tex

@@ -50,4 +50,5 @@
 
 	%chapters
 	\subfile{introduction/introduction}
+	\subfile{terminology/terminology}
 \end{document}

maya.sty

@@ -3,3 +3,5 @@
 
 \RequirePackage{maya/codices}
 \RequirePackage{maya/calendars}
+\RequirePackage{maya/linguistics}
+\RequirePackage{maya/names}

maya/calendars.sty

@@ -1,2 +1,6 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{maya/calendars}[Package for all calendar related things]
+\RequirePackage{xspace}
+
 \newcommand{\tzolkin}{\emph{Tzolk'in}\xspace}
 \newcommand{\haab}{\emph{Haab'}\xspace}

maya/codices.sty

@@ -1,3 +1,7 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{maya/codices}[Package for all codex related things]
+\RequirePackage{xspace}
+
 \newcommand{\dresdencodex}{\emph{Dresden Codex}\xspace}
 \newcommand{\madridcodex}{\emph{Madrid Codex}\xspace}
 \newcommand{\groliercodex}{\emph{Grolier Codex}\xspace}

maya/linguistics.sty

@@ -0,0 +1,21 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{maya/linguistics}[Package for all kinds of linguistics]
+\RequirePackage{xspace}
+
+\newcommand{\transliteration}[1]{\textbf{#1}}
+\newcommand{\syllabogram}[1]{\textbf{\expandafter\MakeLowercase\expandafter{#1}}}
+\newcommand{\logogram}[1]{\textbf{\expandafter\MakeUppercase\expandafter{#1}}}
+\newcommand{\grapheme}[1]{$\langle\textrm{\expandafter{#1}}\rangle$}
+\newcommand{\glottalstop}{’}
+\newcommand{\narrowtranscription}[1]{/#1/}
+\newcommand{\widetranscription}[1]{\lbrack\expandafter{#1}\rbrack}
+\newcommand{\glyphblockheight}{2.5cm}
+\newcommand{\writing}[3]{\textbf{#1}, \emph{#2}, "#3"}
+\newcommand{\mayan}[1]{\emph{#1}\xspace}
+\newcommand{\english}[1]{\emph{#1}\xspace}
+\newcommand{\spanish}[1]{\emph{#1}\xspace}
+\newcommand{\nahuatl}[1]{\emph{#1}\xspace}
+\newcommand{\nullmorpheme}{$\emptyset$\xspace}
+\newcommand{\thompson}[1]{T#1\xspace}
+\newcommand*\elide{\textup{[\,\dots]}}
+\newcommand{\remark}[1]{\textup{[#1]}}

maya/names.sty

@@ -0,0 +1,7 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{maya/names}[Package for all names, titles, locations etc.]
+\RequirePackage{xspace}
+\RequirePackage{maya/linguistics}
+
+\newcommand{\chichenitza}{Chich\'{e}n Itz\'{a}\xspace}
+\newcommand{\kakupakal}{\mayan{K\glottalstop{}ak\glottalstop{}upakal\xspace}}

preamble.sty

@@ -1,8 +1,9 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{preamble}[Things which are needed for literally all tex files in this project]
 
-% creates links in table of contents
-\RequirePackage{hyperref}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Standard LaTeX settings
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % for pictures etc.
 \RequirePackage{graphicx}
@@ -16,11 +17,18 @@
 % quoting and bibliography
 \RequirePackage[backend=biber,style=alphabetic]{biblatex}
 \RequirePackage{csquotes}
+\emergencystretch=1em  % avoid warnings overfull hbox in cite commands
+
+% Multiple rows in tables
+\usepackage{multirow}
 
 % figures/subfigures
 % hypcap=false disables non-useful warning "Warning: The option hypcap=true will be ignored for this"
 \RequirePackage[hypcap=false]{caption}
-\RequirePackage{subcaption} 
+\RequirePackage[subrefformat=parens]{subfig}
+
+% todonodes: ability to add short annotations for things that still have to be done
+\usepackage[colorinlistoftodos,prependcaption,textsize=tiny]{todonotes}
 
 % our own stuff everything maya located maya.sty
 \RequirePackage{maya}                                     % 
@@ -29,7 +37,7 @@
 \pdfsuppresswarningpagegroup=1
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% stuff for headline and footer
+% Headline and footer
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \RequirePackage{scrlayer-scrpage}
 \pagestyle{scrheadings}
@@ -53,5 +61,30 @@
 }
 \makeatother
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% References
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{hyperref} % creates links in table of contents
+\RequirePackage[noabbrev]{cleveref}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Translation support
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% {<page in reference>}{<reference key>}{<original text>}{<translated text>}
+\newcommand{\quotemytranslated}[4][]{%
+    \begin{quote}
+        #4
+        \footnote{My translation from (\cite[#1]{#2}): #3}
+    \end{quote}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Document related
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% note for drawings created by me
+\newcommand{\authordrawings}{drawings by Sebastian Bauer}
+
 % get document version
 \input{document-version.tex}