5 files changed, 70 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/philex/README b/Master/texmf-dist/doc/latex/philex/README
index c773ac3de72..e7fdbe24dfe 100644
--- a/Master/texmf-dist/doc/latex/philex/README
+++ b/Master/texmf-dist/doc/latex/philex/README
@@ -1,12 +1,11 @@
-Philex is a small package with additions to Wolfgang
-Sternefeld's linguex package (adapted to version 4.1).
+Philex provides extended functions for formatting, dynamically
+repeating and cross-referencing numbered and named sentences,
+with hyperref support. It is an addition to Wolfgang
+Sternefeld's linguex package (adapted to version 4.3). 
 
-It provides extended functions for cross-referencing and
-repeating numbered and named sentences, additional formatting
-options and hyperref support.
-
-Version: 1.01
+Version: 1.2
+Licence type: lppl
 
 Author: Peter Pagin (with a contribution by Robin Fairbairns).
-email:  peter.pagin@philosophy.su.se
-Date:   2013.09.09
+email: peter.pagin@philosophy.su.se
+Date: 2014.03.28
diff --git a/Master/texmf-dist/doc/latex/philex/README.rtf b/Master/texmf-dist/doc/latex/philex/README.rtf
new file mode 100644
index 00000000000..38717513007
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/philex/README.rtf
@@ -0,0 +1,15 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
+{\fonttbl\f0\fmodern\fcharset0 Courier;}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\deftab720
+\pard\pardeftab720
+
+\f0\fs26 \cf0 Philex provides extended functions for formatting, dynamically repeating and cross-referencing numbered and named sentences, with hyperref support. It is an addition to Wolfgang Sternefeld's linguex package (adapted to version 4.3). \
+\
+Version: 1.2\
+Licence type: lppl\
+\
+Author: Peter Pagin (with a contribution by Robin Fairbairns).\
+email:  peter.pagin@philosophy.su.se\
+Date:   2014.03.28}
+\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/philex/philexmanual.pdf b/Master/texmf-dist/doc/latex/philex/philexmanual.pdf
index 7f14b8da6a0..3591f473f39 100644
--- a/Master/texmf-dist/doc/latex/philex/philexmanual.pdf
+++ b/Master/texmf-dist/doc/latex/philex/philexmanual.pdf
diff --git a/Master/texmf-dist/doc/latex/philex/philexmanual.tex b/Master/texmf-dist/doc/latex/philex/philexmanual.tex
index aeee089300a..103d5380428 100644
--- a/Master/texmf-dist/doc/latex/philex/philexmanual.tex
+++ b/Master/texmf-dist/doc/latex/philex/philexmanual.tex
@@ -24,7 +24,7 @@
 \setcounter{minute}{\time-60*\thehour}
 \ifnum\thehour<10 \def\nowh{0\thehour} \else \def\nowh{\thehour}\fi
 \ifnum\theminute<10\def\nowm{0\theminute} \else \def\nowm{\theminute}\fi
-\def\now{\nowh:\nowm}
+\def\now{\nowh:\nowm\\License type: lppl}
 \def\aut{Peter Pagin\\ peter.pagin@philosophy.su.se}
 \def\home{\begin{flushright}
 \item Department of Philosophy
@@ -34,26 +34,23 @@
 
 
 \begin{document}
-\tracingassigns=3
-\title{The \tt philex \rm Package \\ version 1.1}
+\title{The \tt philex \rm Package \\ version 1.2}
 \author{\aut}
 \date{\today, \now}
 \maketitle
 \reversemarginpar
 \setlength{\marginparwidth}{3cm}
-\subsection*{Changes since version 1.01}
--- Local cross-references added.\\
--- Possibility of repeating a sentence without its associated footnote.\\
--- \verb+\bpxformat+ now resets \verb+bpx+ counters.\\
--- Extra counter \verb+bnp+ and associated commands.\\
--- Manual: labelled brackets.\\
--- Manual: glosses.\\
--- Bugfix: cross-references to sub-sentences did not work properly in connection with unusual combinations of using and not using optional arguments. Now fixed.
+\subsection*{Changes since version 1.1}
+-- Grammaticality judgments added.\\
+-- Bugfix: Horizontal spacing with \verb+\rn+. Fixed.\footnote
+	{This bug was fixed in version 1.01, but stupidly reintroduced in version 1.1 because of bad file management.}
+
+
 
 
 
 \section*{Manual}
-The \verb+philex+ package is intended for use in topics such as philosophy and linguistics, where there is a need both of many example sentences and of named principles, and of cross-references to them in the text. Sometimes one wants cross-reference to environment numbers (or prefix plus number), sometimes to a non-numbered named environment, and sometimes to the content of the environment, for repeating the content in running text or in another environment. The package is a small addition to Wolfgang Sternefeld's \verb+linguex+ package and requires \verb+linguex+. As of version 0.2 it also requires \verb+calc+. \verb+philex+ will load \verb+linguex+ if it is installed. The purpose of \verb+philex+ is to add functions for more flexible cross-referencing, for repeating and embedding named or numbered environments, \verb+hyperref+ support and a some further formatting options.
+The \verb+philex+ package is intended for use in subjects like philosophy and linguistics, where there is a need both of many example sentences and of named principles, and of cross-references to them in the text. Sometimes one wants cross-reference to environment numbers (or prefix plus number), sometimes to a non-numbered named environment, and sometimes to the content of the environment, for repeating the content in running text or in another environment. The package is a small addition to Wolfgang Sternefeld's \verb+linguex+ package and requires \verb+linguex+. As of version 0.2 it also requires \verb+calc+. \verb+philex+ will load \verb+linguex+ if it is installed. The purpose of \verb+philex+ is to add functions for more flexible cross-referencing, for repeating and embedding named or numbered environments, \verb+hyperref+ support and a some further formatting options.
 
 As of version 0.5 \verb+philex+ writes cross-ref information to the .aux file and reads that information at the beginning of the subsequent run of typesetting. This allows forward cross-referencing to environments that are named or numbered+named, such as \rf{clauses} on p. \pageref{clauses}, 
 in analogy to the label-reference system of LaTeX itself. As of version 0.9 hyperlinks produced by \verb+hyperref+ are created also for named environments with the \verb+<hyper>+ package option.
@@ -67,7 +64,7 @@ With \marginpar{\tt <hyper>} the \verb+<hyper>+ option hyperlinks will be create
 With the \verb+<oldpunct>+ package option \marginpar{\tt <oldpunct>} the old punctuation commands (see below) will still work. This is for the purpose of using more recent versions of \verb+philex+ with older files, without needing search-and-replace.
 
 \section{Top-level environments}
-The basic environment command of \verb+philex+ is \marginpar{\tt \(\backslash\)lb} \verb+\lb{}{}+. It takes two obligatory arguments. The first argument is the label of the environment, and the second is the content of the environment itself. \verb+lb+ uses the \verb+\ex.+ formatting of \verb+linguex+, and thereby the \verb+ExNo+ counter. Type 
+The basic environment command of \verb+philex+ is \marginpar{\tt \(\backslash\)lb} \verb+\lb{}{}+. It takes two obligatory arguments. The first argument is the label of the environment, and the second is the content of the environment itself. \verb+\lb+ uses the \verb+\ex.+ formatting of \verb+linguex+, and thereby the \verb+ExNo+ counter. Type 
 
 \begin{verbatim}
 \lb{nice}{This is a nice day. \\ Not too hot.}
@@ -107,8 +104,7 @@ produces
 \lbpa{kno}{John is in the know.} 
 \lbpa{hu}{Elsa is, too.} 
 \lbpa{kne}{Alfred agrees.}
-These enumerations are independent of \verb+ExNO+ and of each other, and the counters (\verb+bpx+) are reset with the relevant \verb+\bpxformat+.\footnote
-	{This is actually a bug-fix, since in the resetting was documented but not implemented before.}
+These enumerations are independent of \verb+ExNO+ and of each other, and the counters (\verb+bpx+) are reset with the relevant \verb+\bpxformat+.
 	 They still work with sub-clauses, cross-references and the rest of the apparatus. Note that these enumerations do not have to be contiguous: 
 
 \lbpa{glufs}{But he shouldn't.} 
@@ -156,6 +152,20 @@ If someone in the desert draws and lives ... \\
 If someone in the desert draws and lives ... \\
 \trans ‘if one retreats to the desert and ... ’}
 
+Grammaticality judgments, \marginpar{Grammaticality judgments} and other judgments of oddity, can now be inserted, with the symbols of your choice, by means of the \verb+\oddity+ command. 
+
+\begin{verbatim}
+\lb{gram}{
+\lba{grama}{\oddity{*}He lives in N.Y since two years.}
+\lbb{gramb}{\oddity{**}Whom does he live in N.Y. since two years?}}
+\end{verbatim}% 
+% 
+delivers
+
+\lb{gram}{
+\lba{grama}{\oddity{*}He lives in N.Y since two years.}
+\lbb{gramb}{\oddity{**}Whom does he live in N.Y. since two years?}}
+
 By means of \verb+philex+ commands, the brackets can be \marginpar{Top-level brackets} removed or replaced for all the top-level environments except \verb+\lb+ itself. However, as of version 4.0 of \verb+linguex+, the brackets for the \verb+\lb+ command can be customized. 
 
 \begin{verbatim}
@@ -163,8 +173,9 @@ By means of \verb+philex+ commands, the brackets can be \marginpar{Top-level bra
 \renewcommand{\ExRBr}{[}
 \renewcommand{\FnExLBr}{\{}
 \renewcommand{\FnExRBr}{\}}
-\end{verbatim}
-	you can change the \verb+\lb+ brackets to square brackets in main text and to curly brackets in footnotes.
+\end{verbatim}% 
+% 
+You can change the \verb+\lb+ brackets to square brackets in main text and to curly brackets in footnotes.
 
 
 For the other cases, you might e.g. want an \verb+\lbp+ environment without label. To turn the brackets off, give the command \verb+\broff+ before the environment. To turn them back on later, give the command \verb+\bron+.
@@ -272,7 +283,7 @@ However, \verb+philex+ provides \marginpar{\tt \(\backslash\)rf, \(\backslash\)r
 \item \noindent \verb+\rf{nice}+ \(\longrightarrow\) \rf{nice} \hfill (target on page \pageref{nice})
 \item \noindent \verb+\rf{kne}+ \(\longrightarrow\) \rf{kne} \hfill (target on page \pageref{kne})
 \item \noindent \verb+\rn{kne}+ \(\longrightarrow\) \rn{kne} \hfill (target on page \pageref{kne})
-\item \verb+\rn{clauseup}+ \(\longrightarrow\) \rn{clausesup} \hfill (target on page \pageref{clausesup})
+\item \verb+\rn{clauseup}+ \(\longrightarrow\) \rn{clausesup}  \hfill (target on page \pageref{clausesup})
 \item \verb+\rf{lastnew}+ \(\longrightarrow\) \rf{lastnew}\hfill (target on page \pageref{lastnew})
 \item \verb+\rf{lastnewb}+ \(\longrightarrow\) \rf{lastnewb} \hfill (target on page \pageref{lastnewb})
 \end{trivlist}
@@ -468,6 +479,15 @@ There is also a \marginpar{Clash with \texttt{tipa}} clash between \verb+linguex
 Finally, \marginpar{Comments} bug reports, comments or suggestions are welcome and should be directed to Peter Pagin at \hyperref{mailto:peter.pagin@philosophy.su.se}{}{}{peter.pagin@philosophy.su.se}.
 
 \section{Version history}
+\subsection*{Changes in version 1.1}
+-- Local cross-references added.\\
+-- Possibility of repeating a sentence without its associated footnote.\\
+-- \verb+\bpxformat+ now resets \verb+bpx+ counters.\\
+-- Extra counter \verb+bnp+ and associated commands.\\
+-- Manual: labelled brackets.\\
+-- Manual: glosses.\\
+-- Bugfix: cross-references to sub-sentences did not work properly in connection with unusual combinations of using and not using optional arguments. Now fixed.
+
 \subsection*{Changes in version 1.01}
 -- Bugfix: eliminated unwanted space after \verb+\rn{}+ cross-references.
 
diff --git a/Master/texmf-dist/tex/latex/philex/philex.sty b/Master/texmf-dist/tex/latex/philex/philex.sty
index 608d6ed988a..119369cdfa2 100644
--- a/Master/texmf-dist/tex/latex/philex/philex.sty
+++ b/Master/texmf-dist/tex/latex/philex/philex.sty
@@ -1,8 +1,9 @@
 %This is a small package with additions to Wolfgang Sternefeld's linguex package (adapted to version 4.3). It provides extended functions for cross-referencing and repeating numbered and named sentences, additional formatting options and hyperref support.
 %Author: Peter Pagin (with a contribution by Robin Fairbairns).
 %email: peter.pagin@philosophy.su.se
-%Date: 2013.09.09
-%Version: 1.1
+%Date: 2014.03.28
+%Version: 1.2
+%License type: lppl
 
 
 \NeedsTeXFormat{LaTeX2e}
@@ -23,7 +24,6 @@
 \newcounter{altsub}
 \newcounter{altsubsub}
 \renewcommand{\thealtsub}{\subettan{altsub}}
-%\renewcommand{\thealtsubsub}{\thealtsub\refdash\Exroman{altsubsub}}
 \renewcommand{\Exroman}{\roman}
 \newcommand{\refdash}{-}
 
@@ -442,10 +442,10 @@
 \fi}
 
 %Cross-reference without brackets
-\newcommand{\rn}[2][]{
-\ifhyperref
+\newcommand{\rn}[2][]{%
+\ifhyperref%
 \hyperlink{#2}{\csname#2\endcsname}#1%
-\else
+\else%
 \csname#2\endcsname#1%
 \fi}
 
@@ -538,6 +538,9 @@
 
 \newcommand{\sab}{\renewcommand{\SubExRBr}{)}\renewcommand{\SubExlabel}{\SubExLBr\alph{SubExNo}\SubExRBr}\renewcommand{\theSubExNo}{\arabic{ExNo}\alph{SubExNo}}}
 
+%Grammaticality and other judgments
+\newlength{\grlen}
+\newcommand{\oddity}[1]{\settowidth{\grlen}{#1}\hspace{-\grlen}#1}