ling-macros, previously lingmacros (13oct16)

git-svn-id: svn://tug.org/texlive/trunk@42268 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 843 insertions, 2 deletions

diff --git a/Master/texmf-dist/doc/latex/ling-macros/README.txt b/Master/texmf-dist/doc/latex/ling-macros/README.txt
new file mode 100644
index 00000000000..01b31308491
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ling-macros/README.txt
@@ -0,0 +1,28 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%	ling-macros package
+%
+%%%%%%  %% ling-macros.sty
+%%%%    %% version 2.2
+%%%	%% 2016-10-12
+%
+%% Copyright 2016 Andrew McKenzie (andrew.mckenzie@ku.edu)
+%
+% %% not to be confused with lingmacros.sty, a part of tree-dvips.sty
+%
+%%%%  Thanks to Lydia Newkirk for the name suggestion.
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% 
+% The Current Maintainer of this work is Andrew McKenzie.
+%
+% This work consists of the files ling-macros.sty and ling-macros-doc.tex
+
+% The linguistics package provides macros for typesetting formal linguistics.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/ling-macros/ling-macros-doc.pdf b/Master/texmf-dist/doc/latex/ling-macros/ling-macros-doc.pdf
new file mode 100644
index 00000000000..32767d7c964
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ling-macros/ling-macros-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/ling-macros/ling-macros-doc.tex b/Master/texmf-dist/doc/latex/ling-macros/ling-macros-doc.tex
new file mode 100644
index 00000000000..90ba6fe05a3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ling-macros/ling-macros-doc.tex
@@ -0,0 +1,426 @@
+%%%% 
+%%%
+%%
+%	DOCUMENTATION FOR THE ling-macros PACKAGE
+%	by ANDREW MCKENZIE (andrew.mckenzie@ku.edu)
+%	Version 2.2 
+%	2016-10-12
+%
+% %% not to be confused with lingmacros.sty, a part of tree-dvips.sty
+%%
+%%%  Thanks to Lydia Newkirk for the name suggestion.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%
+%%%%%%  %% ling-macros-doc.tex
+%% Copyright 2016 Andrew McKenzie (andrew.mckenzie@ku.edu)
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% 
+% The Current Maintainer of this work is Andrew McKenzie.
+%
+% This work consists of the files ling-macros.sty and ling-macros-doc.tex
+
+
+\documentclass{article}
+ 
+\usepackage{tipa}									% phonetic alphabet package
+\usepackage{xcolor}
+\usepackage{parskip}
+ \definecolor{KUBlue}{RGB}{0,34,180}						% Kansas University Blue
+ \definecolor{KUCrimson}{RGB}{232,0,13}					% Crimson (Rock Chalk!)
+\usepackage[colorlinks=true,urlcolor=KUBlue]{hyperref}	
+\usepackage{array}
+\usepackage[]{ling-macros}								% uses the ling-macros package
+
+\newcommand{\structure}{\color{KUBlue}}				% highlighting
+\newcommand{\cbl}{{\color{green!60!black}{\{}}}			% green left curly braces
+\newcommand{\cbr}{{\color{green!60!black}{\}}}}			% green right curly braces
+\newcommand{\mathbit}[1]{{\color{green!60!black}{\$}}#1{\color{green!60!black}{\$}}}  % for typing things between math mode delimiters
+\newcommand{\comm}[2]{{\rmfamily{\structure{$\backslash$#1}}\cbl#2\cbr}} % for typing commands. first arg is command, second is argument
+\newcommand{\comopt}[3]{{\rmfamily{\structure{$\backslash$#1}}[#2]\cbl#3\cbr}} % for typing commands. first arg is command, second is argument
+\newcommand{\decla}[1]{{\rmfamily{\structure{$\backslash$#1}}}}  %for typing declarations
+\newcommand{\lat}[1]{{\color{KUBlue}\bfseries\ttfamily #1}}		% for typing names of LaTeX objects 
+
+
+\title{The \lat{ling-macros} package \\ \Large Version 2.2}
+\author{Andrew McKenzie \\ \href{mailto:andrew.mckenzie@ku.edu}{andrew.mckenzie@ku.edu} \\ \href{http://people.ku.edu/~a326m085}{http://people.ku.edu/$\sim$a326m085}
+}
+\date{October 12, 2016}
+
+\begin{document}
+\newcommand{\commb}[1]{\comm{#1}{\ldots}}
+
+\maketitle
+
+\setcounter{tocdepth}{2}
+\tableofcontents
+
+\section{About \texttt{ling-macros}}
+
+The \lat{ling-macros} package is designed to allow easier use of formal symbols used in formal linguistics, especially in formal linguistics. The set arose from the macros that I have been using over the years for papers and class handouts.  Suggestions and additions are welcome.  Note: This is not the same package as \lat{ling{}macros}, which is part of \lat{tree-dvips}.
+
+To call the package, type \comm{usepackage}{ling-macros} in the preamble of your document. The package has the following options:
+
+\begin{tabular}{>{\bfseries\ttfamily}l p{3in}}
+text-semantics & typesets formal semantic expressions in upright fashion rather than italicized or math fashion\\
+shortspace & removes space before, after, and between examples in \lat{exe} environment (see sect.\ \ref{gbr3}) \\
+leftflush  & pulls examples to the left edge in \lat{exe} environment  (see sect.\ \ref{gbr3}) \\
+abstract  & combines {\bfseries\ttfamily shortspace} and {\bfseries\ttfamily leftflush}; useful for abstracts (see sect.\ \ref{gbr3})  \\
+\end{tabular} 
+
+The \lat{ling-macros} package calls for the following packages: \lat{stmaryrd}, \lat{ulem}, \lat{amssymb}, \lat{upgreek}, \lat{gb4e}, \lat{relsize}, and \lat{pbox}.   Also included are call commands for phonetic writing (\lat{tipa}) and tree structures (\lat{qtree}), but they are commented out to prevent option clashes (look for {\color{red}\%$\backslash${RequirePackage}\{qtree\}}, etc., if you want to turn them on for your version).
+
+Using \lat{ling-macros} is pretty straightforward, since it is just a series of macros. The macros are organized by module of the grammar.
+
+   
+
+\section{General linguistics}
+
+\subsection{Ordinary macros}
+The following macros are used pretty generally throughout the subfields.
+
+\begin{tabular}{>{\bfseries}l p{2in} l c }
+ \mdseries command & purpose & in source file  & in print \\\hline
+\decla{nl} &  null symbol & \decla{nl} & \nl  \\[3pt]
+\comm{m}{\ldots} & small caps for morpheme gloss & \comm{m}{acc.pl} & \m{acc.pl} \\
+\comm{mc}{\ldots} & small caps for morpheme gloss & \comm{mc}{acc.pl} & \m{acc.pl} \\
+\decla{mb} & wider hyphen for morpheme breaks  (can be changed globally) & ant\decla{mb} s & ant\mb s  \\
+\commb{ol} & object language text & \comm{ol}{clermontois} & \ol{clermontois} \\
+\commb{alert} & highlights parts of examples & work\comm{alert}{horse}  & work\alert{horse}  \\
+\commb{term} & highlights terminology being introduced &  \comm{term}{causative} & \term{causative} \\
+ \\
+\comm{ix}{\ldots} &   subscript index (upright text with \lat{text-semantics} option)  & Bill\comm{ix}{j}, x\comm{ix}{cat} & Bill\ix{j}, x\ix{cat} \\[3pt]
+\comm{ux}{\ldots} &   subscript index with upright text (no matter what) & Bill\comm{ux}{j}, x\comm{ux}{cat} & Bill\ux{j}, x\ux{cat} \\[3pt] 
+\comm{superx}{\ldots} & superscript index with upright text & x\comm{superx}{3}, y\comm{superx}{i} & x\superx{3}, y\superx{i} \\
+
+\hline\end{tabular}
+
+The \textbf{\commb{alert}} command is compatible with the \lat{beamer} class. It puts highlighted text in boldface. This can be changed with \lat{renewcommand}.
+
+The \textbf{\decla{nl}} declaration requires the \lat{amssymb} package.  (\decla{null} is already used by \TeX\ for empty boxes, so it's best not to replace it).
+
+The \textbf{\commb{ol}} command is for object language text.  It is currently set to italics, but you can change that globally or locally with a \decla{renewcommand} command.
+
+ The \textbf{\comm{m}{\ldots}} command sets grammatical morphemes (m) in \textsc{small caps}.  This is helpful in glosses, notably using \lat{gb4e}, since it makes the source easier to read.  Also, if you need to change the morphemes' typesetting globally, a simple \decla{renewcommand} of \decla{m} will suffice.
+ 
+ However, if you use the \lat{fontspec} package for Xe\LaTeX , beware, for it employs \decla{m} for various diacritics.  So you can comment it out and use \commb{mc} for morpheme caps instead.  Also, \comm{usepackage}{ling-macros} must be placed in your preamble after \comm{usepackage}{fontspec}.
+
+ \subsection{Macros for \lat{gb4e} environment}\label{gbr3} 
+ 
+The following declarations make the use of the \lat{gb4e} more streamlined and allow for easy tweaking of example alignment. 
+
+ \begin{tabular}{>{\bfseries}l l l c}
+  \mdseries declaration & command it replaces & purpose & name origin\\\hline
+\decla{bex} & \comm{begin}{exe} & begin example environment & begin exe \\
+\decla{fex} & \comm{end}{exe} & end example environment & finish exe \\
+\\
+\decla{bxl} & \comm{begin}{xlist} & begin example subenvironment & begin xlist \\
+\decla{fxl} & \comm{end}{xlist} & end example subenvironment & finish xlist \\
+
+\end{tabular}
+
+These declarations also define a number of variable widths that can be used to reformat the example environments.   The reformatting is done globally by setting the package options \lat{leftflush}, \lat{shortspace}, or \lat{abstract}. 
+
+\textbf{Warning:} The package options do not reformat \lat{exe} environments unless you use the \decla{bex} and \decla{bxl} declarations.  Otherwise, one would need to adjust the \lat{gb4e} package itself.
+
+The \lat{leftflush} option puts example numbers to the left, but numbers 1-9 are not all the way to the left.  To force them to be, place the declaration \decla{lessthanten} in the document before the first example.  This will place examples 10 and above too far left, so use the declaration \decla{tenormore} to undo this effect.  
+
+While we're at it, here is a similar list of abbreviations for ordinary list environments.  
+
+ \begin{tabular}{>{\bfseries}l l l c}
+  \mdseries declaration & command it replaces & purpose & name origin\\\hline
+\decla{ben} & \comm{begin}{enumerate} & begin enumerate environment & begin enumerate \\
+\decla{fen} & \comm{end}{enumerate} & end enumerate environment & finish enumerate \\
+\\
+\decla{bit} & \comm{begin}{itemize} & begin itemize environment & begin itemize \\
+\decla{fit} & \comm{end}{itemize} & end itemize environment & finish itemize \\
+
+\end{tabular}
+
+
+ \subsection{The \lat{context} environment}
+ 
+ The \lat{context} environment typesets the context used to elicit or set-up an example.  The typesetting can be changed globally.
+ 
+ \begin{context}
+ 	Denny arrived at the restaurant, and sat at an empty table.  The moment he did so, a waiter approached and asked him: 
+	\end{context}
+ 
+ 	\bex \ex[\#]{Would you like some more water?}
+	\fex
+
+\comm{begin}{context}  \\
+	Denny arrived at the restaurant, and sat at an empty table.  The moment he did so, a waiter approached and asked him: \\
+	\comm{end}{context}
+
+	\decla{bex} \comopt{ex}{\decla{\#}}{Would you like some water?} \decla{fex}
+
+
+\section{Phonology}
+
+OT Tableaux can be made with a number of packages, each with their own macros for symbols.  To write phonological rules, however, you can use the following macros to simplify things.
+
+\begin{tabular}{>{\bfseries}l l l c }
+ \mdseries command & purpose & source & in print \\\hline
+\commb{underlying} & the input to the rule  & \comm{underlying}{+back} & \underlying{+back} \\
+\decla{becomes} & the arrow & \decla{becomes} & \becomes \\
+\commb{spoken} & the output & \comm{spoken}{--back}   & \spoken{--back} \\
+\decla{environ} & `in the environment of' slash & \decla{environ} & \environ \\ 
+\decla{spot}  &   the exact spot of the change & \decla{spot} &\spot \\
+\decla{syll} & syllable subscript  & [\decla{syll} ~~~ ]\decla{syll} & [\syll ~~~ ]\syll \\\hline 
+\decla{fmleft} & feature matrix left bracket & \decla{fmleft} &  \\
+\decla{fmright} & feature matrix right bracket & \decla{fmright} &   \\
+ \comm{fmat}{\ldots}\cbl \ldots\cbr & feature matrix line & \parbox[c]{1.1in}{\comm{fmat}{+}\cbl{coronal}\cbr \\\comm{fmat}{-}\cbl{voiced}\cbr }  &  \fmleft \fmat{+}{coronal}\fmat{-}{voiced}\fmright \\ 
+\end{tabular}
+
+Combined, these get a source code like this, for a  rule fronting a back vowel between /i/ and any consonant: 
+
+\comm{underlying}{+back}  \decla{becomes} \comm{spoken}{--back} \decla{environ}  i\decla{spot} C
+
+The commands \decla{prule} and \decla{iparule} are macros combining the above macros.
+
+About the \comm{prule}{\ldots}\cbl \ldots\cbr\cbl \ldots\cbr\ command: The first command is the underlying form, the second the spoken form, and the third the environment.  The \comm{iparule}{\ldots}\cbl \ldots\cbr\cbl \ldots\cbr\ does the same, but puts everything in the rule in IPA. The \decla{iparule} command requires the \lat{tipa} package, which you probably already use if you're typesetting phonology.
+
+ 
+\hspace*{2em}\comm{prule}{+back}\cbl --back\cbr\cbl i\decla{spot} C\cbr  \hspace{1cm} \prule{+back}{--back}{i\spot C} \\
+\hspace*{2em}\comm{iparule}{2}\cbl E\cbr\cbl i\decla{spot} \decla{*}C\cbr  \hspace{1.8cm} \iparule{2}{E}{i\spot \*C} \\
+ 
+ 
+The \comm{fmat}{\ldots}\cbl \ldots\cbr command is for feature matrices.   Use \decla{fmleft} and \decla{fmright} for each bracket, and for each line in the feature matrix, use \comm{fmat} with its two arguments.  The first argument will be $+/-$, and the second will be the feature name. 
+  
+You can put feature matrices inside a phonological rule command as well. 
+
+
+\section{Syntax}
+
+For syntax trees, a tree package like \lat{qtree}, \lat{tikz-qtree}, or \lat{parsetree} suffices.  The following macros allow quick and regular typing of some common syntactic symbols, in better looking ways than are offered by ordinary distributions and packages.  
+
+\hspace*{-1cm}\begin{tabular}{>{\bfseries}l l l c }
+ \mdseries command & purpose & source & in print \\\hline
+\commb{head}  & the head circle & \comm{head}{V} & \head{V} \\
+\commb{xbar} & the bar in X-bar &   \comm{xbar}{Asp} & \xbar{Asp}~ \\ 
+\decla{lv} & little v & \decla{lv} & \lv ~~\\
+\commb{feat}  & syntactic feature in trees & \comm{feat}{fem} & \feat{{fem}} \\ 
+\commb{textfeat}  & syntactic feature in text & \comm{textfeat}{fem} & \textfeat{{fem}} \\ 
+\commb{dcopy} & deleted copy (strike-out)\footnotemark & \comm{dcopy}{the car} & \dcopy{the car} \\
+\commb{mroot} & morpheme root & \comm{mroot}{car} & \mroot{car} \\
+\commb{ufeat} & unvalued/uninterpretable feature in trees & \comm{ufeat}{T} & \ufeat{T} \\ 
+\commb{unv} & unvalued/uninterpretable feature & \comm{feat}{\comm{unv}{T}} & \ufeat{T}   \\ 
+\end{tabular}\footnotetext{Requires the \lat{ulem} package}
+
+The \decla{unv} command should be used inside a \decla{feat} or \decla{textfeat} command, but of course doesn't have to be.  If you want to use an upright $\phi$ symbol ($\upphi$), use the \decla{upphi} declaration in math mode.
+
+Use the \comm{featuresize}{$\langle$size$\rangle$} command to adjust the size of features in \commb{feat}.
+
+The \commb{xbar} command places a bar over the entire head name.  For a prime symbol instead, you can use use the \decla{pri} declaration.
+
+For bracket subscript labels, you can use the \comm{ix}{\ldots} or \comm{ux}{\ldots} commands. 
+
+\begin{center}
+	  \cbl [\cbr\comm{ux}{TP}   \comm{head}{T} [\comm{ux}{VP} \comm{head}{V}  [\comm{ux}{DP} \head{D} ] ] ]  \\
+	 {[}\ux{TP} \head{T} [\ux{VP} \head{V} [\ux{DP}  \head{D} ] ] ]
+\end{center}
+
+
+ 
+\section{Semantics}
+
+Formal semantics uses math mode more clearly than most areas of linguistics.  You can use the \commb{form} command to put anything into math mode. 
+More recently, semanticists have been writing formulas in text, with mathematical symbols.  Using the \lat{text-semantics} option will convert these formulas from math mode to text mode.  Some symbols you will want to stay in math mode.  Putting them between \mathbit{\ldots} often creates errors. Instead, the \commb{ensuremath} command will protect them.  For short, you can use the \commb{f} command for any symbol you want to remain in math mode even as \commb{form} is redefined as text mode.
+
+ Along with formal expressions, the  \commb{readas} command is used with denotations to write formal expressions out in metalanguage.
+ 
+ \denol{every car} = \form{\lamd{Q}{et}.~ \all{y}[~ car(y) = 1 \to Q(y) = 1~]} \\
+ \readas{the function from properties of entities to truth values such that for all \form{y}, if \form{y} is a car, then \form{Q(y) = 1}
+}
+
+
+\subsection{Operators and Symbols}
+
+Operators all require math mode, and putting them in math mode makes source documents hard to read.  These macros simplify the writing of common operators, and make the source code more intuitive to read. 
+
+\hspace*{-2em}\begin{tabular}{>{\bfseries}l l l c }
+ \mdseries command & purpose & source & in print \\\hline
+\comm{lam}{{\small\itshape variable}}		&  lambda operator  &  \comm{lam}{x}  & \lam{x} \\
+\comm{lamd}{{\small\itshape var.}}\cbl {\small\itshape type}\cbr  & lambda operator with domain D\ix{type} &  \comm{lam}{P}\cbl s,t\cbr & \lamd{P}{s,t}\\
+\comm{all}{{\small\itshape var.}} & universal quantifier & \comm{all}{x} & \all{x} \\
+\comm{some}{{\small\itshape var.}} & existential quantifier & \comm{some}{x} & \some{x} \\
+\comm{no}{{\small\itshape var.}} & negative quantifier & \comm{no}{x} & \no{x} \\
+\comm{ddet}{{\small\itshape var.}} & iota-operator (definite determiner) & \comm{ddet}{x} & \ddet{x}\\
+\decla{pri} & prime symbol in text or math mode & x\decla{pri} & x\pri \\
+\end{tabular} 
+%\EX 
+
+
+ 
+ \subsection{Semantic types}
+ 
+ The \commb{type} command is used for writing semantic types.  It places its argument in ordered pair brackets, in math mode.   It can be used inside the arguments of another \decla{type} command to get complex types.
+ 
+ \begin{tabular}{l l}
+ \comm{type}{e,t}   & \type{e,t} \\
+ \comm{type}{e,\comm{type}{s,t}} & \type{e,\type{s,t}} \\
+\comm{type}{\comm{type}{e,t},\comm{type}{\comm{type}{e,t},t}} & \type{\type{e,t},\type{\type{e,t},t}} \\
+\end{tabular}
+
+Since \decla{type} places its arguments in math mode, it can be used for ordinary ordered pairs as well.  For simple types, which don't require ordered pair brackets, simply place the type in math mode:  \mathbit{e}, \mathbit{t} $\Rightarrow$ $e$, $t$ 
+
+The \lat{text-semantics} option will not put types in text mode. If you really want semantic types with upright letters, use the \commb{uptype} command wherever you'd use \commb{type}.
+
+\subsection{Sets}
+
+The \commb{set} and \commb{varset} commands are used to write sets.  The \decla{set} command is purely for making the source code more intuitive, since \decla{\{} is not exactly hard to type.  The \decla{varset} command (`variable set') writes an abstracted set.  \decla{varset} uses a vertical line for `such that'. For the older colon notation, use the \decla{cvarset} command. 
+
+\begin{tabular}{l l}
+\comm{set}{a, b, c, d}  & \set{a, b, c, d} \\
+\comm{varset}{x \comm{f}{\decla{in}} D}\cbl x is happy\cbr  &  \varset{x \in D }{x ~is ~happy} \\
+\comm{cvarset}{x}\cbl x is happy\cbr  &  \cvarset{x}{x ~is ~happy} \\
+\end{tabular}
+
+%Under the \lat{text-semantics} option: 
+%
+%\begin{tabular}{l l}
+% \comm{set}{a, b, c, d}  & {\{ {a, b, c, d} \}} \\
+%\comm{varset}{x \mathbit{\decla{in}}  D}\cbl x is happy\cbr  &  \{ {x $\in$ D} $|$ {x  is happy} \} \\
+%\comm{cvarset}{x}\cbl x is happy\cbr  &  \{ {x} $:$ {x is happy} \} \\
+%\end{tabular}
+
+\subsection{Functions}
+
+Use the command \commb{funcnot}\cbl \ldots \cbr\cbl \ldots \cbr\cbl \ldots \cbr\cbl \ldots \cbr , which allows quick writing of functions in an explicit functional notation (hence the name). The first argument is the variable representing the function; the second is the domain of the function, the third is the range, the fourth is the argument variable, and the fifth are the truth conditions.  
+
+%\begin{minipage}{.45\textwidth} 
+\comm{funcnot}{f}{\cbl D\cbr}{\cbl R\cbr}\cbl y\cbr\cbl 1 iff \comm{form}{y} is a bandit\cbr  \\
+
+\parbox[t]{2in}{With no options : } \funcnot{f}{D}{R}{y}{1 iff \form{y} is a bandit}
+
+\parbox[t]{2in}{With \lat{text-semantics} option : }  {  \renewcommand{\funcnot}[5]{%
+ {#1} : \pbox[t]{2.0\textwidth}{%  1 the function
+		  {#2} {\ensuremath{\to}} #3 \\% the buffoon % the domain
+		\all{}{#4} \ensuremath{\in}  #2,  {#1(#4) =} #5% %object of domain
+		}%
+		}%%
+		\funcnot{f}{D}{R}{y}{1 iff {y} is a bandit}
+}
+
+Functions can be embedded in others by putting the second function in the truth-conditions of the first
+  
+\comm{funcnot}{f}{\cbl D\comm{ix}{e}\cbr}{\cbl  D\comm{ix}{et}\cbr}\cbl x\cbr\cbl{\color{red}\%} \\
+		\comm{funcnot}{g}{\cbl D\comm{ix}{e}\cbr}{\cbl  D\comm{ix}{t}\cbr}\cbl y\cbr\cbl 1 iff \comm{form}{y} is tall\cbr{\color{red}\%} \\
+		\cbr{\color{red}\%} 
+
+		\funcnot{f}%FUNCTION
+			{D\ix{e}}%DOMAIN
+			{D\ix{et}}%RANGE
+			{x}%VARIABLE
+			{\funcnot{g}%FUNCTION'
+				{D\ix{e}}%DOMAIN'
+				{D\ix{t}}%RANGE'
+				{y}%VARIABLE'
+				{1 iff \form{y} is tall}%TRUTH-CONDITIONS'
+				}%TRUTH-CONDITIONS
+
+
+
+
+To write a function in array format requires math mode and the array environment.  This is inconvenient, so the following macros simplify this.
+
+\begin{enumerate} \item The \decla{fleft} (function left) declaration gives the left bracket.  
+\item The \comm{func}{\ol{domain}}\cbl \ol{range}\cbr\ command is used for each line of the function.  
+\item The \decla{fright} (function right) declaration gives the right bracket.
+\end{enumerate}
+
+To write the function \set{\uptype{a,1},\uptype{b,2}}: 
+
+\begin{minipage}{.45\textwidth} 
+
+\decla{fleft}{\color{KUCrimson}\%}  \\
+\comm{func}{a}\cbl 1\cbr{\color{KUCrimson}\%}   \\
+\comm{func}{b}\cbl 2\cbr{\color{KUCrimson}\%}  \\
+\decla{fright}{\color{KUCrimson}\%}  
+\end{minipage}
+\begin{minipage}{.45\textwidth} 
+\fleft 
+\func{a}{1}
+\func{b}{2}
+\fright
+\end{minipage}
+
+These macros can be used recursively.
+
+\begin{minipage}{.45\textwidth} 
+\decla{fleft}{\color{KUCrimson}\%}  \\
+\comm{func}{a}\cbl{\color{KUCrimson}\% range of a}   \\
+  	\decla{fleft}~\comm{func}{c}\cbl 1\cbr {\color{KUCrimson}\%} \\
+\hspace*{6ex}\comm{func}{d}\cbl 2\cbr{\color{KUCrimson}\%} \\
+	\decla{fright}\cbr {\color{KUCrimson}\% end of range of a}  \\
+\decla{fright}{\color{KUCrimson}\%}  
+\end{minipage}
+\begin{minipage}{.45\textwidth} 
+\fleft 
+\func{a}{
+	\fleft\func{c}{1}
+		\func{d}{2}
+	\fright} 
+ 
+\fright
+\end{minipage}
+
+
+\subsection{Scope brackets with \decla{scopebox}}
+
+The \commb{scopebox} command places brackets ([ ]) around an expression to signal its scope.  This command allows the use of multi-line scope brackets, to make things easier to read.  If you put more than one scope box inside the largest one, you should use \commb{innerscopebox} for the inside ones.
+
+Compare the following formulas, with simple brackets, and then with \commb{scopebox}.
+
+\form{\all{x}[ ~dog(x) \&\ on(\textrm{the car})(x) \f{\to} \some{y}[ ~cat(y) ~\&\ \some{e}[ \textsc{perfective}(e) ~\&\ chase(x)(y)(e) ] ] ] }
+
+\form{\all{\textrm{x}}\scopebox{dog(x) \&\ on(the car)(x) \f{\to}  ~~~~~~~~\\
+				\some{\textrm{y}}\innerscopebox{cat(y) \&\ \\
+					\some{e}\innerscopebox{ \m{perf}(e) \&\ chase(x)(y)(e) } }}}
+
+
+
+Note:  These commands force their expression to be in text mode, because they rely on \commb{pbox}, which is part of the \lat{pbox} package.  \\
+Note 2: Sometimes you may need to add spaces to the outside scopebox (with \raisebox{-3pt}{\~{}}  ) to make sure it's the widest.
+
+\subsection{Denotation brackets}
+
+ 
+Several commands involve double brackets for denotations (or interpretation functions).  These all require the \lat{stmaryrd} package, which is called by the \lat{ling-macros} package.
+
+Many commands involve assignment modifications.  These modifications are already in math mode, so any use of {\color{green!60!black}{\$}} in them will lead to an error.  If you need to use math mode inside these, use \comm{ensuremath}{\ldots} or \comm{f}{\ldots}.
+
+\hspace*{-5em}\begin{tabular}{>{\bfseries}l l l c}
+ \mdseries command & purpose & source & in print  \\[2pt]\hline
+\commb{den} & denotation brackets & \comm{den}{car} & \hspace{-1.1ex}\den{car}  \\% & req. \lat{stmaryrd} pkg. \\
+\commb{dena}\cbl\ldots \cbr & denotation w/ assignment & \comm{dena}{car}\cbl g\cbr &  \dena{car}{g}  \\% 
+\commb{denac}\cbl\ldots \cbr & d.b. w/ asst., context c & \comm{denac}{car}\cbl g\cbr & ~\denac{car}{g} \\%
+\comm{denamod}{..}\cbl ..\cbr\cbl ..\cbr & {\small d.b. w/ modified assignment} & \comm{denamod}{car}\cbl g\cbr\cbl x\decla{to} 1\cbr &  \denamod{car}{g}{x \ensuremath{\to} 1} \\ %
+ \comm{denacmod}{..}\cbl ..\cbr\cbl ..\cbr & {\small d.b. w/ modified asst, context c} & \comm{denacmod}{car}\cbl g\cbr\cbl x\decla{to} 1\cbr &  \denacmod{car}{g}{x \ensuremath{\to} 1} \\% 
+\end{tabular}
+
+\vspace{8pt}There is also a series of commands which are identical to those of the \decla{den} family, except that the text is already in the object language font (\decla{ol}).  These commands declutter the source code.  With \decla{ol} set to \decla{itshape}: 
+ 
+ \hspace*{-5em}\begin{tabular}{>{\bfseries}l l l c}
+ \mdseries command & purpose & source & in print  \\[2pt] \hline
+ \commb{denol} & denotation brackets & \comm{denol}{car} & \hspace{-1.1ex}\denol{car}  \\% & req. \lat{stmaryrd} pkg. \\
+\commb{denola}\cbl\ldots \cbr & denotation w/ assignment & \comm{denola}{car}\cbl g\cbr &  \denola{car}{g}  \\% 
+\commb{denolac}\cbl\ldots \cbr & d.b. w/ asst., context c & \comm{denolac}{car}\cbl g\cbr & ~\denolac{car}{g} \\%
+\comm{denolamod}{..}\cbl ..\cbr\cbl ..\cbr & {\small d.b. w/ modified assignment} & \comm{denolamod}{car}\cbl g\cbr\cbl x\decla{to} 1\cbr &  \denolamod{car}{g}{x \ensuremath{\to} 1} \\ %
+ \comm{denolacmod}{..}\cbl ..\cbr\cbl ..\cbr & {\small d.b. w/ modified asst, context c} & \comm{denolacmod}{car}\cbl g\cbr\cbl x\decla{to} 1\cbr &  \denolacmod{car}{g}{x \ensuremath{\to} 1} \\% 
+ 
+\end{tabular} 
+
+  
+
+
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/ling-macros/ling-macros.sty b/Master/texmf-dist/tex/latex/ling-macros/ling-macros.sty
new file mode 100644
index 00000000000..768945fe9fc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ling-macros/ling-macros.sty
@@ -0,0 +1,387 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%
+%%%%%%  %% ling-macros.sty
+%% Copyright 2016 Andrew McKenzie (andrew.mckenzie@ku.edu)
+%
+%% not to be confused with lingmacros.sty, a part of tree-dvips.sty
+% 
+%
+ %%%  Thanks to Lydia Newkirk for the name suggestion.
+ %
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% 
+% The Current Maintainer of this work is Andrew McKenzie.
+%
+% This work consists of the files ling-macros.sty and ling-macros-doc.tex
+ 
+
+
+%%%%%%%%% ESSENTIAL COMMANDS %%%%%%%%%%%%%%%%%%%%%%%%%%%			
+\NeedsTeXFormat{LaTeX2e} 								  					%  the format
+ \ProvidesPackage{ling-macros}[2016/10/01 package of linguistics macros]				%  package delivery
+ 
+ %			2011/12/10, version 1.0
+% 			2012/07/31, version 1.2											%  update
+% last update: 	2014/01/28, version 1.3		% update with semantics stuff			
+% last update:    2014/02/10, version 2.0		% clean and organize commands, add documentation
+% last update:    2016/10/01, version 2.1		% add options, clean up for CTAN
+% last update:    2016/10/12, version 2.2		% changed name to ling-macros
+
+
+ 	\RequirePackage{gb4e}				% Example numbering and linguistic glosses 	(gb4e style) if you turn this off, turn off the corresponding macros! 
+	%Lengths for example macros. As is they don't affect gb4e, but options will adjust these
+	\newlength{\bexskip}\setlength{\bexskip}{-.0\baselineskip}% space before exe environment {in proportions of \baselineskip}
+		\newlength{\bxlskip}\setlength{\bxlskip}{-.0\baselineskip}% space before xlist environment {in proportions of \baselineskip}
+	\newlength{\bexsep}\setlength{\bexsep}{0pt}% space between examples in exe environment {in points}
+		\newlength{\bxlsep}\setlength{\bxlsep}{0pt}% space between examples in exe environment {in points}
+	\newlength{\bexindent}\setlength{\bexindent}{0ex}%% space of label indent in exe environment  {in ex units}  
+		\newlength{\bxlindent}\setlength{\bxlindent}{0ex}%% space of label indent in xlist environment  {in ex units}  
+	\newlength{\fexskip}\setlength{\fexskip}{.0\baselineskip}% space after exe environment {in proportions of \baselineskip}}
+		\newlength{\fxlskip}\setlength{\fxlskip}{.0\baselineskip}% space after xlist environment {in proportions of \baselineskip}}
+	\newlength{\bexlabel}\setlength{\bexlabel}{0pt}
+		\newlength{\bxllabel}\setlength{\bxllabel}{0pt}	
+		
+	 % Example macros (gb4e package)
+	\newcommand{\bex}{%									% Begin example environment
+					\vspace{\bexskip}%					 	% space before	
+					\begin{exe}%		
+					\addtolength{\itemsep}{\bexsep}%			% space between examples
+					\addtolength{\itemindent}{\bexindent}%		% space before example number
+					\addtolength{\labelsep}{\bexlabel}%			% space between example number and example
+					}%			
+ 	\newcommand{\fex}{%									% End (finish) example environment
+					\end{exe}%	
+					\vspace{\fexskip}%						% space after
+					}%		
+%%%	%%%%%%%				
+	\newcommand{\bxl}{%									% Begin xlist environment
+					\vspace{\bxlskip}%					 	% space before	
+					\begin{xlist}%		
+					\addtolength{\itemsep}{\bexsep}%			% space between examples
+					\addtolength{\itemindent}{\bxlindent}%		% space before example number
+					\addtolength{\labelsep}{\bxllabel}%			% space between example number and example
+					}%			
+ 	\newcommand{\fxl}{%									% End (finish) xlist environment
+					\end{xlist}%	
+					\vspace{\fxlskip}%						% space after
+					}%	
+	
+ %	\RequirePackage{linguex}				% Example numbering and linguistic glosses	(linguex style) Turn off gb4e if you use this
+ 
+ %    \RequirePackage{tipa}				% International Phonetic Alphabet 
+		
+	\RequirePackage{stmaryrd}			% Necessary for some semantics symbols (see \den)
+	\RequirePackage{amssymb}			% Necessary for some mathematic symbols (see \nl)
+	\RequirePackage{pbox}				% Necessary for scope boxes
+	\RequirePackage{ulem}				% For striking-out text and special underlining
+	
+%	\RequirePackage{qtree}				% Tree diagrams
+%	\RequirePackage{tikz-qtree}			% Tree diagrams with tikz
+%	\RequirePackage{tree-dvips}			% Arrows in trees and glosses  (On menu bar, set "Typeset" to TeX and DVI)
+%	%\RequirePackage{parsetree}			% Alternate tree diagram drawing package
+
+	\RequirePackage{upgreek}				%upright rather than italic Greek letters
+	\RequirePackage{relsize}				% allows relative sizes for small things
+ 
+ 
+
+%LaTeX list macros
+\newcommand{\ben}{\begin{enumerate}}				% Begin enumerate environment
+\newcommand{\fen}{\end{enumerate}}				% End (finish) enumerate environment
+\newcommand{\bit}{\begin{itemize}}					% Begin itemize environment
+\newcommand{\fit}{\end{itemize}}					% End (finish) enumerate environment
+
+
+
+
+%Common Linguistics stuff
+\newcommand{\featuresize}{\smaller[2]}	% necessary for feature commands!  you can change this, though.
+\newcommand{\alert}{\textbf} 			% highlights a part of an example. Compatible with beamer
+ \newcommand{\term}[1]{{\bfseries #1}}						% New terminology
+\newcommand{\ol}[1]{\textit{#1}} 							% Object language expression
+
+
+%Indices %requires relsize package 
+ \newcommand{\ix}[1]{\ensuremath{_{#1}}}   % ix =index; in text-semantics mode, allows upright subscript indices with non-math mode text 
+								
+  \newcommand{\ux}[1]{\ensuremath{_{\textrm{\smaller[2]{#1}}}}}	% ux = upright index; in all modes, places upright subscript indices with non-math mode text 
+							 
+\newcommand{\superx}[1]{\ensuremath{^{\textrm{\smaller[2]{#1}}}}}		
+								% superx = superscript index.  For subscripts, see \ix and \ux above
+	
+	\newcommand{\readas}[1]{{\scshape{read:} \textsl{#1}}}			% Read formal expressions in plain language
+
+
+% Null symbol										     
+\newcommand{\nl}{\ensuremath{\varnothing}}	  		% Null symbol (\null is already used)  
+			 				 			 	% Requires amssymb package, or a class that calls it 	
+%% Prime symbol in text
+ \newcommand{\pri}{\ensuremath{^\prime}}			% allows a redefinition for text mode
+ 
+%% Glossing
+ 
+ \newcommand{\m}[1]{\textsc{#1}}		% morpheme glossing as small caps: clashes with fontspec, where \m does stuff.  
+  \newcommand{\mc}[1]{\textsc{#1}}		% morpheme glossing as small caps: does not clash with fontspec 
+\newcommand{\mb}{\ensuremath{-}}  	%wider morpheme break symbol (and can be changed) 
+
+%% Contexts for elicitation:
+
+\newenvironment{context}{\begin{quote}%
+			\bfseries Context: \\% 
+			\mdseries\slshape }%open environment
+			{\end{quote}}%close environment
+			
+			
+%% Phonology
+\newcommand{\underlying}[1]{\settowidth{\prulewidth}{#1}\ensuremath{\left/ \pbox[c]{\prulewidth}{#1} \right/}}					% underlying form
+\newcommand{\becomes}{\ensuremath{\to}~}				% changes to
+\newlength{\prulewidth}								% sets variable width for \prules (requires pbox package}
+\newcommand{\spoken}[1]{\settowidth{\prulewidth}{#1}\ensuremath{\left[~  \pbox[c]{\prulewidth}{#1} ~\right]}}						% spoken form		
+\newcommand{\environ}{\parbox[c]{1em}{\larger[2] \ensuremath{\left/ \right.}}}		% in the environment of (requires relsize)
+
+\newcommand{\spot}{\rule[-1pt]{2ex}{.5pt}}				% location of change
+
+\newcommand{\prule}[3]{\underlying{#1} \becomes \spoken{#2} \environ #3}		% puts all the other commands together
+\newcommand{\iparule}[3]{{\tipaencoding \underlying{#1} \becomes \spoken{#2} \environ #3} } % puts all the other commands together with ipa. Requires tipa package
+
+% allows setting of environment bar
+\newcommand{\environset}[1]{\parbox[c]{1em}{\larger[#1] $/$}}		% in the environment of, variable size (requires relsize)
+\newcommand{\pruleset}[4]{\underlying{#1} \becomes \spoken{#2} \environset{#4} #3}		% puts all the other commands together
+\newcommand{\iparuleset}[4]{{\tipaencoding \underlying{#1} \becomes \spoken{#2} \environset{#4} #3} } % puts all the other commands together with ipa   Requires tipa package
+
+ \newcommand{\syll}{\ensuremath{_\sigma}}				% syllable symbol 
+
+ %%% Writing feature matrices
+\newcommand{\fmleft}{$\left[ \begin{array}{c l}} 				% Big brackets, left
+\newcommand{\fmright}{\end{array} \right]$} 					% Big brackets, right
+ \newcommand{\fmat}[2]{{#1}&{\textrm{#2}} \\ } 	% Inside array notation
+
+
+%%%%%%%%%% SYNTAX MACROS %%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\xbar}[1]{$\overline{\textrm{#1}}$}			% The bar in X-bar (see \pri for prime mark)
+\newcommand{\head}[1]{#1{\ensuremath{^\circ}}}			% Syntactic head naming  ... \head{C}
+\newcommand{\lv}{{\itshape v}}						% Little v label 
+\newcommand{\feat}[1]{{\featuresize\ensuremath{[}#1\ensuremath{]}}}		% features in trees and diagrams
+\newcommand{\textfeat}[1]{\ensuremath{[}\mbox{#1}\ensuremath{]}}				% features in text
+\newcommand{\dcopy}[1]{\sout{~#1~}}					% deleted copy (requires ulem package)
+\newcommand{\ufeat}[1]{\feat{\textit{u}#1:\rule[-1pt]{2ex}{.5pt}}} 	% Unvalued/uninterpretable feature;   given X: [uX:__]  
+\newcommand{\unv}[1]{\textit{u}#1:\rule[-1pt]{2ex}{.5pt}}	  % Unvalued/uninterpretable feature part;   given X: [uX:__]  % Goes inside \feat or \textfeat command
+ \newcommand{\mroot}[1]{\ensuremath{\sqrt{\hspace{1pt}\textrm{#1}\hspace{2pt}}}}  % morphological roots
+
+ 												
+
+%%%%%%%%% SEMANTICS MACROS%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+	
+	% Delimiters
+	
+\newcommand{\den}[1]{\ensuremath{\llbracket}\,{#1}\,\ensuremath{\rrbracket}}	
+				%  Denotation brackets
+				%  Requires stmaryrd package		 ... \usepackage{stmaryrd}
+\newcommand{\dena}[2]{{\ensuremath{\llbracket}\,{#1}\,\ensuremath{\rrbracket}}\ensuremath{^{{#2}}}}	
+				% Denotation brackets with assignment variables (requires stmaryrd package)	
+\newcommand{\denamod}[3]{\ensuremath{\llbracket}\,{#1}\,\ensuremath{\rrbracket^{{#2}^{{#3}}}}}
+				% Denotation brackets with modified assignment variables (requires stmaryrd package)			
+\newcommand{\denac}[2]{\ensuremath{\llbracket}\,{#1}\,\ensuremath{\rrbracket^{{#2}_{c}}}}	
+				% Denotation brackets with assignment variable, context c (requires stmaryrd)			
+\newcommand{\denacmod}[3]{\ensuremath{\llbracket}\,{#1}\,\ensuremath{\rrbracket^{{#2}_{{c}}^{{#3}}}}}
+			 	% Denotation brackets with modified assignment variable, context c (requires stmaryrd)
+ 
+ \newcommand{\denol}[1]{\den{\ol{#1}}}						% Denotation with object language
+ \newcommand{\denola}[2]{\dena{\ol{#1}}{#2}}					% Denotation + assignment with object language
+ \newcommand{\denolamod}[3]{\denamod{\ol{#1}}{#2}{#3}}		% Denotation + modified assignment with object language 
+ \newcommand{\denolac}[2]{\denac{\ol{#1}}{#2}} 
+ \newcommand{\denolacmod}[3]{\denacmod{\ol{#1}}{#2}{#3}}
+ 
+ % Nested scope boxes  (these can be useful for clarifying complex formulas. Requires pbox package
+ \newlength{\scopewidth}											%introduces a variable width
+ \newcommand{\scopebox}[1]{\settowidth{\scopewidth}{#1}				% sets width to that of line, then creates a pbox with maximum of that width with delimiters.  
+ 			\ensuremath{\left[ ~ {\pbox[c]{\scopewidth}{#1}}~\right] }}
+ \newcommand{\innerscopebox}[1]{%								% creates a pbox with parent maximum width with delimiters.  		
+ 			\ensuremath{\left[ ~ {\pbox[c]{\scopewidth}{#1}}~\right] }}
+	
+
+  
+ 
+\newcommand{\type}[1]{\ensuremath{\langle{#1}\rangle}}		% Type brackets for type-theory 	 ... \type{e,\type{s,t}}	
+\newcommand{\uptype}[1]{\ensuremath{\langle{\mathrm{#1}}\rangle}}	
+	
+ % Set notation:
+ 	\newcommand{\set}[1]{\ensuremath{\{~ #1 ~\}}} 						% Encloses a set (easier to see in source)
+	\newcommand{\varset}[2]{\ensuremath{\{~ #1 ~|~  #2 ~\}}}		% Encloses an abstracted set
+	\newcommand{\cvarset}[2]{\ensuremath{\{~ #1 ~{:}~  #2 ~\}}}		% Encloses an abstracted set, with a colon
+	
+	%Semantic operators
+	\newcommand{\lam}[1]{\ensuremath{\lambda #1}}		% Lambda operator 		... \lam{x}
+	\newcommand{\some}[1]{\ensuremath{\exists #1}}			% Existential quantifier	 	... \some{x} 	
+	\newcommand{\all}[1]{\ensuremath{\forall #1}}													%Universal quantifier	 	... \all{x}
+	\newcommand{\no}[1]{\ensuremath{\neg\exists #1}}		% Negative quantifier 
+	\newcommand{\ddet}[1]{\ensuremath{\iota #1}}			% Definite determiner 		...  \ddet{x}
+	% \newcommand{\EX}{{\sffamily E\hspace{-.4ex}X}}			% Exemplification operator
+
+
+%% Semantics stuff
+\newcommand{\form}[1]{\ensuremath{#1}}					% Formal expression / formula
+\newcommand{\f}[1]{\ensuremath{#1}} 						% Formal expresssion that stay formal in text-semantics
+ \newcommand{\lamd}[2]{\lam{#1} \ensuremath{\in} D\ix{#2}}			% lambda-notation with domain
+
+ 
+ %% Writing functions
+\newcommand{\fleft}{$\left[ \begin{array}{ccr}} 				% Big brackets, left
+\newcommand{\fright}{\end{array} \right]$} 					% Big brackets, right
+ \newcommand{\func}[2]{{\textrm{#1}} & \to & {\textrm{#2}} \\ } 	% Inside array notation
+ 
+ %%% Function notation : to write out the parts of the function explicitly
+\newcommand{\funcnot}[5]{%
+\ensuremath{#1} : %#1 the function variable
+	\pbox[t]{2.0\textwidth}{% 
+		 \ensuremath{#2}% #2 domain
+		 ~\ensuremath{\to} \ensuremath{#3} \\%#3 the range
+		\all{#4}%#4 the argument variable 
+		~\ensuremath{\in}  \ensuremath{#2}, \ensuremath{#1(#4) =} #5% #5 the truth-conditions
+		}%
+		}
+
+
+ 
+% \newcommand{\funcnot}[3]{\ensuremath{f }: \pbox[t]{.8\textwidth}{\ensuremath{#1  \to  \{1, 0\}  }\\ \ensuremath{\all{#2} \in #1; f(#2)  = 1} iff #3}}	% Function notation 
+   
+    % \newcommand{\funcnotx}[2]{\parbox[m]{2.5in}{\vspace{2pt}f : #1 $\to$ \{1, 0\}  \\for all x $\in$ #1, f(x) = 1 iff #2}}	% Function %notation
+ 
+% \newcommand{\crule}[1]{\textbf{#1 :}}					% compositional rule in a tree
+%%% 
+
+
+
+ \DeclareOption{leftflush}{% sets gb4e examples as left flushed
+
+ 
+\setlength{\bexindent}{-3.2ex}		% shortens indentation of examples to put them on the left
+\setlength{\bexlabel}{-2ex}		% shortens space between example number and example
+\setlength{\bxllabel}{-1.0ex}		% shortens indentation of examples to put them nearer to the left
+\setlength{\bxlindent}{-5ex}		% shortens space between example number and example
+
+ \newcommand{\lessthanten}{			% sets ex numbers 1-9 all the way at the left.  Must put command outside exe 
+ 	\setlength{\bexindent}{-3.5ex}		% shortens indentation of examples to put them on the left
+	\setlength{\bexlabel}{-1.2ex}		% shortens space between example number and example
+ 	}
+
+\newcommand{\tenormore}{		% sets ex numbers 10+ to the left. (i.e. undoes \lessthanten)  Must put command outside exe 
+\setlength{\bexindent}{-3.2ex}		% shortens indentation of examples to put them on the left
+\setlength{\bexlabel}{-2ex}		% shortens space between example number and example
+}
+
+ }%%end of option leftflush
+ 
+ 
+ \DeclareOption{shortspace}{%sets gb4e examples with less white space.  
+
+ \setlength{\bexskip}{-.7\baselineskip}   % reduces space before 
+ 	\setlength{\bxlskip}{-.4\baselineskip}
+\setlength{\bexsep}{-4pt} 				% reduces space between examples
+	\setlength{\bxlsep}{-2pt} 	
+ \setlength{\fexskip}{-.7\baselineskip}	% reduces space after
+ 	\setlength{\fxlskip}{-.2\baselineskip}
+
+ 				
+}%%end of option shortspace
+
+\DeclareOption{abstract}{%combines leftflush and shortspace for use in abstracts 
+
+ 
+\setlength{\bexindent}{-3.2ex}		% shortens indentation of examples to put them on the left
+\setlength{\bexlabel}{-2ex}		% shortens space between example number and example
+\setlength{\bxllabel}{-1.0ex}		% shortens indentation of examples to put them nearer to the left
+\setlength{\bxlindent}{-5ex}		% shortens space between example number and example
+
+ \setlength{\bexskip}{-.7\baselineskip}   % reduces space before 
+ 	\setlength{\bxlskip}{-.4\baselineskip}
+\setlength{\bexsep}{-4pt} 				% reduces space between examples
+	\setlength{\bxlsep}{-2pt} 	
+ \setlength{\fexskip}{-.7\baselineskip}	% reduces space after
+ 	\setlength{\fxlskip}{-.2\baselineskip}
+
+\newcommand{\lessthanten}{			% sets ex numbers 1-9 all the way at the left.  Must put command outside exe 
+ 	\setlength{\bexindent}{-3.5ex}		% shortens indentation of examples to put them on the left
+	\setlength{\bexlabel}{-1.2ex}		% shortens space between example number and example
+ 	}
+
+\newcommand{\tenormore}{		% sets ex numbers 10+ to the left. (i.e. undoes \lessthanten)  Must put command outside exe 
+\setlength{\bexindent}{-3.2ex}		% shortens indentation of examples to put them on the left
+\setlength{\bexlabel}{-2ex}		% shortens space between example number and example
+}
+%%%
+		}%end of option abstract
+	
+ \DeclareOption{text-semantics}{%% sets semantic formulas in upright fashion 
+ 
+ 	% Delimiters
+	
+\renewcommand{\den}[1]{\ensuremath{\llbracket}\,{#1}\,\ensuremath{\rrbracket}}	
+				%  Denotation brackets
+				%  Requires stmaryrd package		 ... \usepackage{stmaryrd}
+\renewcommand{\dena}[2]{{\ensuremath{\llbracket}\,{#1}\,\ensuremath{\rrbracket}}\ensuremath{^{\textrm{\smaller[2]{#2}}}}}	
+				% Denotation brackets with assignment variables (requires stmaryrd package)	
+\renewcommand{\denamod}[3]{\ensuremath{\llbracket}\,{#1}\,\ensuremath{\rrbracket^{\mathrm{\smaller[2]{#2}}^{\textrm{\smaller[4]{#3}}}}}}
+				% Denotation brackets with modified assignment variables (requires stmaryrd package)			
+\renewcommand{\denac}[2]{$\llbracket$\,{#1}\,$\rrbracket^{\mathrm{#2}_{\tiny\textrm{c}}}$}	
+				% Denotation brackets with assignment variable, context c (requires stmaryrd)			
+\renewcommand{\denacmod}[3]{$\llbracket$\,{#1}\,$\rrbracket^{\mathrm{#2}_{\tiny\textrm{c}}^{\tiny\textrm{#3}}}$}	
+			 	% Denotation brackets with modified assignment variable, context c (requires stmaryrd)
+ 
+ \renewcommand{\denol}[1]{\den{\ol{#1}}}						% Denotation with object language
+ \renewcommand{\denola}[2]{\dena{\ol{#1}}{#2}}					% Denotation + assignment with object language
+ \renewcommand{\denolamod}[3]{\denamod{\ol{#1}}{#2}{#3}}		% Denotation + modified assignment with object language 
+ \renewcommand{\denolac}[2]{\denac{\ol{#1}}{#2}} 
+ \renewcommand{\denolacmod}[3]{\denacmod{\ol{#1}}{#2}{#3}}
+
+
+ %Sets
+ 	\renewcommand{\set}[1]{\{ #1 \}} 						% Encloses a set (easier to see in source)
+	\renewcommand{\varset}[2]{\{ #1 \ensuremath{|}  #2 \}}		% Encloses an abstracted set
+	\renewcommand{\cvarset}[2]{\{ #1 \ensuremath{:}  #2 \}}		% Encloses an abstracted set, with a colon
+ %Indices
+  \renewcommand{\ix}[1]{\ensuremath{_{\textrm{\smaller[2]{#1}}}}}	
+ 								% ix =index; Upright subscript indices with non-math mode text 
+
+	 \renewcommand{\lamd}[2]{\lam{#1} \ensuremath{\in} D\ix{#2}}			% lambda-notation with domain						 
+\renewcommand{\superx}[1]{\ensuremath{^{\textrm{\smaller[2]{#1}}}}}		
+								% superx = superscript index.  For subscripts, see \ix above
+								
+
+	
+ %Semantic operators
+	\renewcommand{\lam}[1]{\ensuremath{\uplambda}#1}		% Lambda operator 		... \lam{x}
+	\renewcommand{\some}[1]{\ensuremath{\exists}#1}			% Existential quantifier	 	... \some{x}
+	\renewcommand{\no}[1]{\ensuremath{\neg\exists}#1}		% Negative quantifier 
+	\renewcommand{\all}[1]{\ensuremath{\forall}#1}			%Universal quantifier	 	... \all{x}
+	\renewcommand{\form}{}								% Formal expression / formula
+	\renewcommand{\pri}{\ensuremath{^\prime}}
+	\renewcommand{\ddet}[1]{\ensuremath{\upiota}#1}			% Definite determiner 		...  \ddet{x}
+ 
+ 
+ %Funcnot
+  \renewcommand{\funcnot}[5]{%
+ {#1} : \pbox[t]{2.0\textwidth}{%  1 the function
+		  {#2} {\ensuremath{\to}} #3 \\% the buffoon % the domain
+		\all{}{#4} \ensuremath{\in}  #2,  {#1(#4) =} #5% %object of domain
+		}%
+		}	
+
+ }%%end of option text-semantics
+ 
+
+ \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+  \ProcessOptions
+ 
+		
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 85044d04155..37b5bffdc2c 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -356,7 +356,7 @@ my @TLP_working = qw(
     libertine libertinegc libertinus libertinust1math
     libgreek librarian librebaskerville librebodoni librecaslon
     libris lilyglyphs limap linearA linegoal
-    lineno lingmacros linguex linop
+    lineno ling-macros linguex linop
     lipsum lisp-on-tex
     listbib listing listings listings-ext listlbls listliketab
     listofitems listofsymbols
diff --git a/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc b/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
index c040320dc60..3dc0eae39b7 100644
--- a/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
@@ -29,7 +29,7 @@ depend ledmac
 depend leipzig
 depend lexikon
 depend lexref
-depend lingmacros
+depend ling-macros
 depend linguex
 depend liturg
 depend metrix
diff --git a/Master/tlpkg/tlpsrc/ling-macros.tlpsrc b/Master/tlpkg/tlpsrc/ling-macros.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/ling-macros.tlpsrc