summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/ot-tableau
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/ot-tableau')
-rw-r--r--macros/latex/contrib/ot-tableau/ot-tableau.pdfbin65650 -> 108735 bytes
-rw-r--r--macros/latex/contrib/ot-tableau/ot-tableau.sty36
-rw-r--r--macros/latex/contrib/ot-tableau/ot-tableau.tex49
3 files changed, 76 insertions, 9 deletions
diff --git a/macros/latex/contrib/ot-tableau/ot-tableau.pdf b/macros/latex/contrib/ot-tableau/ot-tableau.pdf
index 46a08bd942..307a031d50 100644
--- a/macros/latex/contrib/ot-tableau/ot-tableau.pdf
+++ b/macros/latex/contrib/ot-tableau/ot-tableau.pdf
Binary files differ
diff --git a/macros/latex/contrib/ot-tableau/ot-tableau.sty b/macros/latex/contrib/ot-tableau/ot-tableau.sty
index 3d2ac05907..a8770ca00e 100644
--- a/macros/latex/contrib/ot-tableau/ot-tableau.sty
+++ b/macros/latex/contrib/ot-tableau/ot-tableau.sty
@@ -11,11 +11,11 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-% The Current Maintainer of this work is Adam Bker.
+% The Current Maintainer of this work is Adam Baker.
%
% This work consists of the files ot-tableau.sty and ot-tableau.tex.
-\ProvidesPackage{ot-tableau}[2021-05-19]
+\ProvidesPackage{ot-tableau}[2023-08-01]
% Package option: notipa
\newif\ifottableau@tipa
@@ -159,20 +159,40 @@
&
\ifottableau@fingerfirst \rowletter \else #1 \fi%
&#2\ExclOff}
-
-\def\vio#1{&%
+% add multi-input candidates (added by Alan Munn 2023/08/01)
+\newcommand\mcand[2][]{\OptimalOff\properlines%
+ \ifottableau@fingerfirst \ipa{#1} \fi%
+ &
+ \ifottableau@fingerfirst \else \ipa{#1} \fi%
+ &
+ \ipa{#2}\ExclOff}
+
+\WithSuffix\newcommand\mcand*[2][]{\OptimalOff\properlines%
+ \ifottableau@fingerfirst #1 \fi%
+ &
+ \ifottableau@fingerfirst \else #1 \fi%
+ &#2\ExclOff}
+
+% add starred version of \vio to remove vertical lines for initial multi-input candidates
+% (added by Alan Munn 2023/08/01)
+\NewDocumentCommand{\vio}{sm}{
+ \IfBooleanTF{#1}
+ {&\multicolumn{1}{c}{#2}}
+ {&%
\ifottableau@circledviolations
\ifottableau@optimal
- \StrSubstitute{#1}{*}{\CircledViolationMarker}
+ \StrSubstitute{#2}{*}{\CircledViolationMarker}
\else
- \StrSubstitute{#1}{*}{\ViolationMarker}
+ \StrSubstitute{#2}{*}{\ViolationMarker}
\fi
\else
- \StrSubstitute{#1}{*}{\ViolationMarker}
+ \StrSubstitute{#2}{*}{\ViolationMarker}
\fi
\ifottableau@excl \ifottableau@shadedcells \ShadeTheCell \fi \fi%
- \ifottableau@excl \empty \else \IfSubStr{#1}{!}{\ExclOn}{\ExclOff} \fi%
+ \ifottableau@excl \empty \else \IfSubStr{#2}{!}{\ExclOn}{\ExclOff} \fi%
}
+ }
+
\newcommand\inp[1]{\multicolumn{3}{|l||}{#1}}
diff --git a/macros/latex/contrib/ot-tableau/ot-tableau.tex b/macros/latex/contrib/ot-tableau/ot-tableau.tex
index 0eba320896..cc583bd1af 100644
--- a/macros/latex/contrib/ot-tableau/ot-tableau.tex
+++ b/macros/latex/contrib/ot-tableau/ot-tableau.tex
@@ -4,7 +4,7 @@
%\usepackage[notipa,usehhline]{ot-tableau}
\usepackage{fullpage,pifont}
\title{The \textsf{ot-tableau} package}
-\date{Revised 2021-05-19}
+\date{Revised 2023-08-01}
\author{Adam Baker}
\def\eg{e.g.,~}
\def\tabl{\textsf{ot-tableau}}
@@ -248,5 +248,52 @@ It makes the most sense to set these options as package options, but if you want
\item[fingerafter] Place the finger-of-optimality after the letter rather than before it. (\verb+\FingerBeforeLetter+, \verb+\LetterBeforeFinger+)
\item[usehhline] Use the \verb+hhline+ package to draw prettier tableau lines. (As of 2021-05-19, a package conflict means that the lines are not actually prettier. Hopefully this will be fixed in the future and we can go back to pretty lines!)
\end{description}
+\section{Multiple input candidates}
+To input candidates with multiple inputs, you can use the \verb+\mcand+ command instead of the \verb+\cand+ command. This suppresses the numbering of the candidate. Since multiple input candidates usually appear with no constraint markings on the candidate itself, the starred version of the \verb+\viol+ command suppresses vertical lines in that cell of the tableau. Here's a full example, adapted from Petrova et al. (2006) in \emph{The Linguistic Review} 23-1.
+\bigskip
+
+\LetterBeforeFinger
+\begin{tableau}{c:c|c|c|c}
+\inp{} \const{Agree} \const{ID preson voi} \const{ID-wf voi} \const{IDvoi}\const{*voi}
+\cand{\ips{pigds}} \vio*{} \vio*{} \vio*{} \vio*{} \vio{}
+\mcand{pigds} \vio{!*} \vio{} \vio{} \vio{} \vio{**}
+\mcand{pigdz} \vio{} \vio{} \vio{*!} \vio{*} \vio{***}
+\mcand[\Optimal]{pikts} \vio{} \vio{} \vio{} \vio{**} \vio{}
+\cand{\ips{pigts}} \vio*{} \vio*{} \vio*{} \vio*{} \vio{}
+\mcand{pigts} \vio{*!} \vio{} \vio{} \vio{} \vio{*}
+\mcand[\Optimal]{pikts} \vio{} \vio{} \vio{} \vio{*} \vio{}
+\mcand{pigdz} \vio{} \vio{} \vio{!*} \vio{**} \vio{***}
+\cand{\ips{pigtz}} \vio*{} \vio*{} \vio*{} \vio*{} \vio{}
+\mcand[\Optimal]{pigdz} \vio{} \vio{} \vio{} \vio{**} \vio{***}
+\mcand{piktz} \vio{*!} \vio{} \vio{} \vio{} \vio{}
+\mcand{pigts} \vio{} \vio{} \vio{!*} \vio{*} \vio{}
+\end{tableau}
+
+\bigskip
+
+Generated by:
+
+\begin{verbatim}
+\LetterBeforeFinger
+\begin{tableau}{c:c|c|c|c}
+\inp{} \const{Agree} \const{ID preson voi} \const{ID-wf voi} \const{IDvoi} \const{*voi}
+\cand{\ips{pigds}} \vio*{} \vio*{} \vio*{} \vio*{} \vio{}
+\mcand{pigds} \vio{!*} \vio{} \vio{} \vio{} \vio{**}
+\mcand{pigdz} \vio{} \vio{} \vio{*!} \vio{*} \vio{***}
+\mcand[\Optimal]{pikts} \vio{} \vio{} \vio{} \vio{**} \vio{}
+\cand{\ips{pigts}} \vio*{} \vio*{} \vio*{} \vio*{} \vio{}
+\mcand{pigts} \vio{*!} \vio{} \vio{} \vio{} \vio{*}
+\mcand[\Optimal]{pikts} \vio{} \vio{} \vio{} \vio{*} \vio{}
+\mcand{pigdz} \vio{} \vio{} \vio{!*} \vio{**} \vio{***}
+\cand{\ips{pigtz}} \vio*{} \vio*{} \vio*{} \vio*{} \vio{}
+\mcand[\Optimal]{pigdz} \vio{} \vio{} \vio{} \vio{**} \vio{***}
+\mcand{piktz} \vio{*!} \vio{} \vio{} \vio{} \vio{}
+\mcand{pigts} \vio{} \vio{} \vio{!*} \vio{*} \vio{}
+\end{tableau}
+\end{verbatim}
+
+
+
+
\end{document}