4 files changed, 63 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/latex/phonrule/README b/Master/texmf-dist/doc/latex/phonrule/README
index 5dcc5af6467..c2a8f8febf3 100644
--- a/Master/texmf-dist/doc/latex/phonrule/README
+++ b/Master/texmf-dist/doc/latex/phonrule/README
@@ -1,7 +1,7 @@
-PhonRule.sty v1.0.0
+PhonRule.sty v1.1.0
 
-(c) Stefano Coretta
+(c) 2015 Stefano Coretta
 
 LPPL LaTeX Public Project License
 
-This packages provides macros for typesetting phonological rules like those in Sound Pattern of English (Chomsky and Halle 1968). It is indicated for linear phonological works.
-\ No newline at end of file
+This packages provides macros for typesetting phonological rules like those in Sound Pattern of English (Chomsky and Halle 1968). It is recommended for linear phonological works.
+\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/phonrule/phonrule-doc.pdf b/Master/texmf-dist/doc/latex/phonrule/phonrule-doc.pdf
index aad7c096072..0ed39502f20 100644
--- a/Master/texmf-dist/doc/latex/phonrule/phonrule-doc.pdf
+++ b/Master/texmf-dist/doc/latex/phonrule/phonrule-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/phonrule/phonrule-doc.tex b/Master/texmf-dist/doc/latex/phonrule/phonrule-doc.tex
index cf1e3aada51..2afc513011f 100644
--- a/Master/texmf-dist/doc/latex/phonrule/phonrule-doc.tex
+++ b/Master/texmf-dist/doc/latex/phonrule/phonrule-doc.tex
@@ -8,8 +8,8 @@
 \usepackage{phonrule}
 \usepackage{gb4e}
 
-\title{The \texttt{phonrule} package (v1.0.0)}
-\author{Stefano Coretta \\ \texttt{stefano.coretta@me.com}}
+\title{The \texttt{phonrule} package (v1.1.0)}
+\author{Stefano Coretta \\ \texttt{stefano.coretta \textit{at} me.com}}
 
 \reversemarginpar
 
@@ -17,23 +17,23 @@
 \maketitle
 
 \section{Purpose}
-This packages provides macros for typesetting phonological rules like those in \textit{Sound Pattern of English} (Chomsky, Noam \& Morris Halle. 1968. \textit{The sound pattern of English}. New York, Evanston, and London: Harper \& Row).
+This package provides macros for typesetting phonological rules like those in \textit{Sound Pattern of English} (Chomsky, Noam \& Morris Halle. 1968. \textit{The sound pattern of English}. New York, Evanston, and London: Harper \& Row).
 
 \section{Usage}
+
 \begin{quote}
 \begin{verbatim}
 \phon{〈input〉}{〈output〉}
 \end{verbatim}
 \end{quote}
 
-The command \verb+\phon+ has two arguments: the first one is the input of the rule and the second is the output. Here is an example with code and result:
+The command \verb+\phon+ has two arguments: the first one is the input of the rule and the second is its output. Here is an example with the code and the result it produces:
 
 \begin{exe}
 \ex \verb+\phon{z}{r}+
 \ex \phon{z}{r}
 \end{exe}
 
-\section{Usage}
 \begin{quote}
 \begin{verbatim}
 \phonc{〈input〉}{〈output〉}{〈context〉}
@@ -67,21 +67,22 @@ The commands \verb+\phonl+, \verb+\phonr+ and \verb+\phonb+ add a place holder l
 	\end{xlist}
 \end{exe}
 
-The \verb+\oneof+ command provides the possibility to compile several contexts, one per line, embraced by the left curly bracket. You need to use a \verb+\mbox+.
+The \verb+\oneof+ command provides the possibility to compile several contexts, one per line, embraced by a left curly bracket.
 
 \begin{exe}
 \ex
 \begin{verbatim}
 \phonc{t}{ts}{
-\oneof{
-\phold \mbox{i} \\
-\phold \mbox{u}}
-}
+	\oneof{
+	\phold i \\
+	\phold u}
+	}
 \end{verbatim}
 \ex \phonc{t}{ts}{
-\oneof{
-\phold \mbox{i} \\
-\phold \mbox{u}}}
+	\oneof{
+	\phold i \\
+	\phold u}
+	}
 \end{exe}
 
 The \verb+\phonfeat+ command allows you to insert feature specifications:
@@ -90,17 +91,18 @@ The \verb+\phonfeat+ command allows you to insert feature specifications:
 \ex
 \begin{verbatim}
 \phonc{t}{ts}{\phold 
-\phonfeat{
-\mbox{–consonantal} \\
-\mbox{+high} \\
-\mbox{+front}}
-}
+	\phonfeat{
+		−consonantal \\
+		+high \\
+		+front}
+	}
 \end{verbatim}
 \ex \phonc{t}{ts}{\phold 
-\phonfeat{
-\mbox{– consonantal} \\
-\mbox{+high} \\
-\mbox{+front}}}
+	\phonfeat{
+		−consonantal \\
+		+high \\
+		+front}
+	}
 \end{exe}
 
 \verb+\phold+ typesets a place holder line. You can nest \verb|oneof| and \verb|phonfeat| commands for complex rules.
@@ -109,19 +111,23 @@ The \verb+\phonfeat+ command allows you to insert feature specifications:
 \ex
 \begin{verbatim}
 \phonc{x}{y}{\oneof{
-	\phold \mbox{z} \\
+	\phold z \\
 	\phonfeat{
-	+\mbox{feature x} \\
-	-\mbox{feature y}} \phold}}
+		+feature x \\
+		−feature y
+	} \phold
+	}}
 \end{verbatim}
 \ex \phonc{x}{y}{\oneof{
-	\ \phold \mbox{z} \\ \\
+	\phold z \\
 	\phonfeat{
-	\mbox{+feature x} \\
-	\mbox{-feature y}} \phold}}
+		+feature x \\
+		−feature y
+	} \phold
+	}}
 \end{exe}
 
-You can use \verb|\env|, \verb|\envl|, \verb|\envr|, \verb|\envb| for rules with more than one output: these command typeset only the different outputs with their respective environments.
+You can use \verb|\env|, \verb|\envl|, \verb|\envr|, \verb|\envb| for rules with more than one output: these commands typeset only the different outputs with their respective environments.
 
 \begin{exe}
 \ex
@@ -129,24 +135,32 @@ You can use \verb|\env|, \verb|\envl|, \verb|\envr|, \verb|\envb| for rules with
 \phon{x}{\oneof{
 	\envr{w}{\mbox{z}} \\
 	\envl{v}{\phonfeat{
-	+\mbox{feature x} \\
-	-\mbox{feature y}}}}}
+		+feature x \\
+		−feature y
+	}}}}
 \end{verbatim}
 \ex \phon{x}{\oneof{
-	\envr{\mbox{w}}{\mbox{z}} \\
-	\envl{\mbox{v}}{\phonfeat{
-	+\mbox{feature x} \\
-	-\mbox{feature y}}}}}
+	\envr{w}{\mbox{z}} \\
+	\envl{v}{\phonfeat{
+		+feature x \\
+		−feature y
+	}}}}
 \end{exe}
 
 \section{Changelog}
+\subsection{v1.1.0}
+\begin{itemize}
+\item Changed: definition of \verb+\phonfeat+ and \verb+\oneof+ with \verb+\pbox+ (requires package \texttt{pbox})
+\item Fixed: documentation typos
+\end{itemize}
+
 \subsection{v1.0.0}
 \begin{itemize}
-\item new definition of commands with \verb|\ensuremath|
-\item change of environments to commands
-\item definition of new commands \verb|\env| for personalized outputs
-\item updated place holder to 1.5ex length, -1.5pt vertical position
-\item updated curly brackets to only left in \verb|\oneof| command
+\item Added: new commands \verb|\env| for personalised outputs
+\item Changed: definition of commands with \verb|\ensuremath|
+\item Changed: environments to commands
+\item Changed: place holder to 1.5ex length, -1.5pt vertical position
+\item Changed: curly brackets to only left in \verb|\oneof| command
 \end{itemize}
 
 \end{document}
 \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/phonrule/phonrule.sty b/Master/texmf-dist/tex/latex/phonrule/phonrule.sty
index 5da7119c269..1e313c2bb5a 100644
--- a/Master/texmf-dist/tex/latex/phonrule/phonrule.sty
+++ b/Master/texmf-dist/tex/latex/phonrule/phonrule.sty
@@ -1,10 +1,12 @@
 % PhonRule
 % 
-% (c) Stefano Coretta
+% (c) 2015 Stefano Coretta
 % LPPL LaTeX Public Project License
 %  
 \ProvidesPackage{phonrule}
-  [2011/01/11 v1.0.0 LaTeX package for typesetting phonological rules]
+  [2015/07/04 v1.1.0 LaTeX package for typesetting phonological rules]
+  
+\RequirePackage{pbox}
 
 \let\myDate\date
 \newcommand{\phon} [2] {#1 \ensuremath{\rightarrow} #2}
@@ -17,8 +19,8 @@
 \newcommand{\envr} [2] {#1 \ensuremath{/} \rule[-1.5pt]{1.5ex}{.5pt}#2}
 \newcommand{\envl} [2] {#1 \ensuremath{/} #2\rule[-1.5pt]{1.5ex}{.5pt}}
 \newcommand{\envb} [3] {#1 \ensuremath{/} #2\rule[-1.5pt]{1.5ex}{.5pt}#3}
-\newcommand{\phonfeat}[1]{\ensuremath{\left[\begin{array}{c} #1 \end{array}\right]}} % set environment for feature matrix with square brackets; use \mbox{} \\
-\newcommand{\oneof}[1]{\ensuremath{\left\{\begin{array}{l} #1 \end{array}\right.}} % set environment for one of multiple with curly brackets; use \mbox{} \\
+\newcommand{\phonfeat}[1]{\ensuremath{\left[\begin{array}{c} \pbox{\textwidth}{#1} \end{array}\right]}} % set environment for feature matrix with square brackets
+\newcommand{\oneof}[1]{\ensuremath{\left\{\begin{array}{l} \pbox{\textwidth}{#1} \end{array}\right.}} % set environment for one of multiple with curly brackets
 
 \endinput
 %%