Made clauses a package

2 files changed, 95 insertions, 96 deletions

diff --git a/clauses.sty b/clauses.sty
new file mode 100644
index 0000000..f24efd8
--- /dev/null
+++ b/clauses.sty
@@ -0,0 +1,78 @@
+\NeedsTeXFormat{LaTeX2e}[1994/06/01]
+\ProvidesPackage{clauses}
+  [2016/04/08 v0.1 Typesetting sentences in clauses]
+
+\RequirePackage{fancybox}
+\RequirePackage{pdftexcmds}
+\RequirePackage{alphalph}
+
+\newcounter{clausenrtemp}
+\def\clausenr#1#2{%
+  \setcounter{clausenrtemp}{#2}%
+  \ifnum\pdf@strcmp{#1}{0}=\z@ %
+    \arabic{clausenrtemp}%
+  \else\ifnum\pdf@strcmp{#1}{1}=\z@ %
+    \alphalph{\value{clausenrtemp}}%
+  \else\ifnum\pdf@strcmp{#1}{2}=\z@ %
+    \roman{clausenrtemp}%
+  \fi\fi\fi%
+}
+
+\newdimen\clauseskip
+\clauseskip=3pt
+
+\def\clause@itab#1{\hspace{0em}\rlap{#1}}
+\def\clause@tab#1{\hspace{.06\textwidth}\rlap{#1}}
+
+\newcount\clauselevel\clauselevel=0
+\newcount\clausenra\clausenra=0
+\newcount\clausenrb\clausenrb=0
+\newcount\clausenrc\clausenrc=0
+\long\def\clause#1{%
+  \advance\clauselevel by 1
+  \ifnum\clauselevel=1 %
+    \advance\clausenra by 1%
+    \clause@itab{\LR{\clausenr0{\the\clausenra}}} \clause@tab{#1}
+    \clausenrb=0
+  \else\ifnum\clauselevel=2
+    \advance\clausenrb by 1%
+    \clause@itab{\LR{\clausenr0{\the\clausenra}\clausenr1{\the\clausenrb}}} \clause@tab{#1}
+    \clausenrc=0
+  \else\ifnum\clauselevel=3
+    \advance\clausenrc by 1%
+    \clause@itab{\LR{\clausenr0{\the\clausenra}\clausenr1{\the\clausenrb}\clausenr2{\the\clausenrc}}} \clause@tab{#1}
+  \fi\fi\fi
+  \advance\clauselevel by -1
+  \vskip\clauseskip
+}
+\long\def\clauses#1{%
+  \advance\clauselevel by 1
+  \ifnum\clauselevel=1 %
+    \advance\clausenra by 1%
+    #1
+    \clausenrb=0
+  \else\ifnum\clauselevel=2 %
+    \advance\clausenrb by 1%
+    #1
+    \clausenrc=0
+  \else\ifnum\clauselevel=3 %
+    \advance\clausenrc by 1%
+    #1
+  \fi\fi\fi
+  \advance\clauselevel by -1
+  \par
+}
+
+\def\clausei#1#2{\clause{\clause@indent#1 #2}} % Indented clause
+
+\newcount\clause@indent@count
+\def\clause@indent#1{%
+  \begingroup
+  \clause@indent@count=\z@
+  \@whilenum\clause@indent@count<#1\do{\quad\advance\clause@indent@count\@ne}%
+  \endgroup
+}
+
+\def\subj#1{\ovalbox{#1}}
+\def\pred#1{\fbox{#1}}
+
diff --git a/college9.tex b/college9.tex
index 035be33..432c94d 100644
--- a/college9.tex
+++ b/college9.tex
@@ -1,7 +1,8 @@
 \documentclass[a4paper]{article}
 
-\usepackage{geometry}
-\usepackage{xcolor}
+\usepackage[right=2cm]{geometry}
+\usepackage{clauses}
+\usepackage{multicol}
 
 \usepackage{polyglossia} 
 \setdefaultlanguage{dutch}
@@ -13,104 +14,22 @@
 \title{Genesis 11:1-9\\\large{Huiswerk Exegese OT, college 9}}
 \author{Camil Staps}
 
-\usepackage{expex}
-\lingset{everygla=\large,everyglb=\footnotesize\dutchfont\beginL,aboveexskip=0pt,belowexskip=0pt,exnoformat={X},extraglskip=10pt,aboveglbskip=-10pt,aboveglcskip=-10pt,glwordalign=left,glspace=1em}
-\makeatletter
-\def\ep@rawexnoprint{}
-\makeatother
-
-\def\JHWH{\bgroup\footnotesize{JHWH}\egroup}
-
-\usepackage{pdftexcmds}
-\usepackage{alphalph}
-
-\newcounter{clausenrtemp}
-\makeatletter
-\def\clausenr#1#2{%
-  \setcounter{clausenrtemp}{#2}%
-  \ifnum\pdf@strcmp{#1}{0}=\z@ %
-    \arabic{clausenrtemp}%
-  \else\ifnum\pdf@strcmp{#1}{1}=\z@ %
-    \alphalph{\value{clausenrtemp}}%
-  \else\ifnum\pdf@strcmp{#1}{2}=\z@ %
-    \roman{clausenrtemp}%
-  \fi\fi\fi%
-}
-\makeatother
-
-\def\itab#1{\hspace{0em}\rlap{#1}}
-\def\tab#1{\hspace{.06\textwidth}\rlap{#1}}
-
-\newcount\clauselevel
-\newcount\clausenra
-\newcount\clausenrb
-\newcount\clausenrc
-\clauselevel=0
-\clausenra=0
-\clausenrb=0
-\clausenrc=0
-\long\def\clause#1{%
-  \advance\clauselevel by 1
-  \ifnum\clauselevel=1 %
-    \advance\clausenra by 1%
-    \itab{\LR{\clausenr0{\the\clausenra}}} \tab{#1}
-    \clausenrb=0
-  \else\ifnum\clauselevel=2
-    \advance\clausenrb by 1%
-    \itab{\LR{\clausenr0{\the\clausenra}\clausenr1{\the\clausenrb}}} \tab{#1}
-    \clausenrc=0
-  \else\ifnum\clauselevel=3
-    \advance\clausenrc by 1%
-    \itab{\LR{\clausenr0{\the\clausenra}\clausenr1{\the\clausenrb}\clausenr2{\the\clausenrc}}} \tab{#1}
-  \fi\fi\fi
-  \advance\clauselevel by -1
-  \par
-}
-\long\def\verse#1{%
-  \advance\clauselevel by 1
-  \ifnum\clauselevel=1 %
-    \advance\clausenra by 1%
-    #1
-    \clausenrb=0
-  \else\ifnum\clauselevel=2 %
-    \advance\clausenrb by 1%
-    #1
-    \clausenrc=0
-  \else\ifnum\clauselevel=3 %
-    \advance\clausenrc by 1%
-    #1
-  \fi\fi\fi
-  \advance\clauselevel by -1
-  \par
-}
-
-\makeatletter
-\def\clausei#1#2{\clause{\clause@indent#1 #2}} 
-
-\newcount\clause@indent@count
-\def\clause@indent#1{%
-  \begingroup
-  \clause@indent@count=\z@
-  \@whilenum\clause@indent@count<#1\do{\quad\advance\clause@indent@count\@ne}%
-  \endgroup
-}
-\makeatother
-
-\def\subj#1{\bgroup\textcolor{red}{#1}\egroup}
-\def\pred#1{\bgroup\textcolor{blue}{#1}\egroup}
-
 \begin{document}
 
 \maketitle
 
+Het gezegde is \pred{rechthoekig} gemarkeerd; het onderwerp \subj{rondhoekig}.
+\bigskip
+
+\begin{multicols}{2}
 \begin{hebrew}
   \clause{\pred{וַיְהִי} \subj{כָל־הָאָרֶץ}, שָׂפָה אֶחָת, וּדְבָרִים, אֲחָדִים.}
-  \verse{
+  \clauses{
     \clause{\pred{וַיְהִי}, בְּנָסְעָם מִקֶּדֶם;}
     \clause{\pred{וַיִּמְצְאוּ} בִקְעָה בְּאֶרֶץ שִׁנְעָר,}
     \clause{\pred{וַיֵּשְׁבוּ} שָׁם.}
   }
-  \verse{
+  \clauses{
     \clause{\pred{וַיֹּאמְרוּ} אִישׁ אֶל־ רֵעֵהוּ,}
     \clausei2{\pred{הָבָה}}
     \clausei2{\pred{נִלְבְּנָה} לְבֵנִים,}
@@ -118,18 +37,19 @@
     \clause{\pred{וַתְּהִי} לָהֶם \subj{הַלְּבֵנָה}, לְאָבֶן,}
     \clause{\subj{וְהַחֵמָר}, \pred{הָיָה} לָהֶם לַחֹמֶר.}
   }
-  \verse{
+  \clauses{
     \clause{\pred{וַיֹּאמְרוּ}}
     \clausei2{\pred{הָבָה}}
     \clausei2{\pred{נִבְנֶה}־לָּנוּ עִיר, וּמִגְדָּל}
     \clausei2{\subj{וְרֹאשׁוֹ} בַשָּׁמַיִם,}
     \clausei2{\pred{וְנַעֲשֶׂה}־לָּנוּ, שֵׁם: פֶּן־נָפוּץ, עַל־פְּנֵי כָל־הָאָרֶץ.}
   }
-  \verse{
+  \clauses{
     \clause{\pred{וַיֵּרֶד} \subj{יְהוָה}, לִרְאֹת אֶת־הָעִיר וְאֶת־הַמִּגְדָּל,}
     \clausei1{אֲשֶׁר \pred{בָּנוּ}, \subj{בְּנֵי הָאָדָם}.}
   }
-  \verse{
+  \vfill\columnbreak
+  \clauses{
     \clause{\pred{וַיֹּאמֶר} \subj{יְהוָה},}
     \clausei2{הֵן \subj{עַם אֶחָד}}
     \clausei2{\subj{וְשָׂפָה אַחַת} לְכֻלָּם,}
@@ -137,21 +57,22 @@
     \clausei2{\subj{וְעַתָּה} לֹא־\pred{יִבָּצֵר} מֵהֶם,}
     \clausei3{כֹּל אֲשֶׁר \pred{יָזְמוּ} לַעֲשׂוֹת.}
   }
-  \verse{
+  \clauses{
     \clausei2{\pred{הָבָה,}}
     \clausei2{\pred{נֵרְדָה,}}
     \clausei2{\pred{וְנָבְלָה} שָׁם, שְׂפָתָם}
     \clausei3{אֲשֶׁר לֹא \pred{יִשְׁמְעוּ}, אִישׁ שְׂפַת רֵעֵהוּ.}
   }
-  \verse{
+  \clauses{
     \clause{\pred{וַיָּפֶץ} \subj{יְהוָה} אֹתָם מִשָּׁם, עַל־פְּנֵי כָל־הָאָרֶץ;}
     \clause{\pred{וַיַּחְדְּלוּ}, לִבְנֹת הָעִיר.}
   }
-  \verse{
+  \clauses{
     \clause{עַל־כֵּן \pred{קָרָא} שְׁמָהּ, בָּבֶל,}
     \clausei1{כִּי־שָׁם \pred{בָּלַל} \subj{יְהוָה}, שְׂפַת כָּל־הָאָרֶץ;}
     \clausei2{וּמִשָּׁם \pred{הֱפִיצָם} \subj{יְהוָה}, עַל־פְּנֵי כָּל־הָאָרֶץ.}
   }
 \end{hebrew}
+\end{multicols}
 
 \end{document}