he-she (4mar13)

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

4 files changed, 86 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/he-she/README b/Master/texmf-dist/doc/latex/he-she/README
index 19917fd1014..6216141df43 100644
--- a/Master/texmf-dist/doc/latex/he-she/README
+++ b/Master/texmf-dist/doc/latex/he-she/README
@@ -8,7 +8,7 @@ three case forms in both uppercase and lowercase. Includes an option to
 flag to turn off xspace, and a silly option for replacing all pronouns
 with 'they/them/their'.
 
-Copyright 2011 by Alan Munn
+Copyright 2011,2013 by Alan Munn
 
 This package may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.3 of this license or
@@ -23,4 +23,4 @@ The Current Maintainer of this package is Alan Munn.
 This package consists of the file he-she.sty and documentation files
 he-she.tex and he-she.pdf
 
-Version 1.0 2011/02/13
+Version 1.1 2013/03/04
diff --git a/Master/texmf-dist/doc/latex/he-she/he-she.pdf b/Master/texmf-dist/doc/latex/he-she/he-she.pdf
index ab3a23907a4..cbaa251a19f 100644
--- a/Master/texmf-dist/doc/latex/he-she/he-she.pdf
+++ b/Master/texmf-dist/doc/latex/he-she/he-she.pdf
diff --git a/Master/texmf-dist/doc/latex/he-she/he-she.tex b/Master/texmf-dist/doc/latex/he-she/he-she.tex
index 0c802c5a83a..7168445150f 100644
--- a/Master/texmf-dist/doc/latex/he-she/he-she.tex
+++ b/Master/texmf-dist/doc/latex/he-she/he-she.tex
@@ -1,16 +1,16 @@
 \documentclass[11pt]{article}
 \title{\textbf{The \textsf{he-she} package}}
 \author{\textbf{Alan Munn}\\Department of Linguistics and Languages\\Michigan State University\\\texttt{\href{mailto:amunn@msu.edu}{amunn@msu.edu}}}
-\date{Version 1.0\\February 13, 2011}
+\date{Version 1.1\\March 4, 2013}
 \usepackage[T1]{fontenc}
-\usepackage[margin=.75in]{geometry}
+\usepackage[margin=.7in]{geometry}
 \usepackage{titling}
 \usepackage[utf8]{inputenc}
 \usepackage{array, booktabs, multicol, fancyhdr, xspace,tabularx}
 \usepackage{enumitem}
 \usepackage{fancyvrb,listings,url}
 \usepackage[sf,compact]{titlesec}
-\usepackage{he-she}
+\usepackage[para]{he-she}
 \usepackage{gb4e}
 \usepackage[colorlinks=true]{hyperref}
 \noautomath
@@ -66,7 +66,7 @@
 
 \abstract{\noindent\begin{quote}This is a package to produce ``gender neutral'' text by allowing one to alternate use of the masculine and feminine genders within a text.  It is not really intended to be taken too seriously (although it works) but it was fun to think about how one would do this automatically.  Some comments about using the package in practice are given at the end.\end{quote}}
 \section{Introduction}
-This package arose out of a question asked on the StackExchange website: \url{http://tex.stackexchange.com/questions/10787/}. The question asked how easy it would be to automatically alternate masculine and feminine pronouns. A couple of almost identical solutions were proposed by Martin Scharrer and someone named Josef.  It became clear to me that the simple solution really wasn't enough, since you don't want to switch pronouns all the time, but also require anaphora to an existing switched pronoun.  This package is the result of that discussion. 
+This package arose out of a question asked on the StackExchange website: \href{http://tex.stackexchange.com/questions/10787/}{Alternate he / she in text}. The question asked how easy it would be to automatically alternate masculine and feminine pronouns. A couple of almost identical solutions were proposed by Martin Scharrer and someone named Josef.  It became clear to me that the simple solution really wasn't enough, since you don't want to switch pronouns all the time, but also require anaphora to an existing switched pronoun.  This package is the result of that discussion. 
 \section{Background}
 If you are trying to write truly gender-neutral text, then generic constructs like (\ref{1}) prescriptively require you to use either the masculine pronoun (\ref{he}) (which today sounds very stuffy) or the somewhat awful-looking \emph{he or she} (\ref{heshe}) or even worse \emph{s/he} (\ref{she}). Or you can try to reverse the male-only trend and use only the feminine pronoun as a replacement for (\ref{he}), as in (\ref{she-only}). With any luck the use of the gender neutral \emph{they} (as in (\ref{they1})) will become more acceptable to editors, but until then, people who don't like either of the other options are stuck.
 
@@ -85,13 +85,14 @@ One option that some seem to have adopted is to switch genders every time a gene
 
 It's debatable whether this is in fact a good strategy, and the present author in no way endorses it, but it was fun to write the resultant package.  So, should you wish to adopt the strategy, and be in need of an automatic way to do it (which makes sense, since otherwise it would be hard to keep track of the switches) the present package is for you.
 \section{Package Options}
-There are two package options, one serious, and one comic.
+There are three package options, two serious, and one comic.
 \begin{center}
 \begin{tabularx}{.8\textwidth}{>{\ttfamily}lX}
 \toprule
 \multicolumn{1}{c}{\textbf{Option name}} & \multicolumn{1}{l}{\textbf{Description}}\\
 \midrule
 {[noxspace]} &  Disable the use of \pkg{\bs xspace}\\
+{[para]} & Automatically switch the gender every paragraph\\
 {[they]} & Replace all pronouns with the gender neutral \emph{they/them/their}. This is not really a practical option, but is included for comic purposes. (See usage notes below.)\\
 \bottomrule
 \end{tabularx}
@@ -99,7 +100,7 @@ There are two package options, one serious, and one comic.
 
 
 \section{User commands}
-The user commands are quite simple: for each pronoun case form (nominative, accusative, and genitive) there is a switching version and an anaphoric version.  Each of these has both an uppercase version and a lowercase version. The anaphoric forms can be of either gender, just to keep everyone happy. (But since the feminine accusative and genitive forms (\emph{her}) are identical, the feminine genitive macro is \pkg{\bs hir}.) There are also a couple of flags that may be of use.\bigskip
+The user commands are quite simple: for each pronoun case form (nominative, accusative, and genitive) there is a switching version and an anaphoric version. In the accusative, there is also a reflexive form.\footnote{In most normal use the reflexive form will only be used in its anaphoric form. I'll leave it as an exercise to the reader to figure out why; linguists in particular may have a use for the switching form, however.}  Each of these has both an uppercase version and a lowercase version. The anaphoric forms can be of either gender, just to keep everyone happy. (But since the feminine accusative and genitive forms (\emph{her}) are identical, the feminine genitive macro is \pkg{\bs hir}.) There are also a couple of flags that may be of use.\bigskip
 
 \begin{tabularx}{.8\textwidth}{>{\ttfamily}lX}
 \toprule
@@ -108,17 +109,21 @@ The user commands are quite simple: for each pronoun case form (nominative, accu
 {\bs heshe} &  Outputs either \emph{he} or \emph{she} and switches gender.\\
 {\bs he} &  Anaphoric \emph{he} or \emph{she} according to the current gender state.\\
 {\bs himher} &  \emph{him} or \emph{her} switch.\\
+{\bs himherself} & \emph{himself} or \emph{herself} switch\\
 {\bs him} &  \emph{him} or \emph{her} anaphoric.\\
+{\bs himself} & \emph{himself} or \emph{herself} anaphoric.\\
 {\bs hisher} &  \emph{his} or \emph{her} switch.\\
 {\bs his} &  \emph{his} or \emph{her} anaphoric.\\
 {\bs Heshe} &  Uppercase version.\\
 {\bs Himher} &  Uppercase version.\\
+{\bs Himherself} & Uppercase version.\\
 {\bs Hisher} &  Uppercase version.\\
 {\bs He} &  Uppercase version.\\
 {\bs Him} &  Uppercase version.\\
+{\bs Himself} & Uppercase version.\\
 {\bs His} &  Uppercase version.\\
-{\bs she,\bs her,\bs hir} & synonyms for the anaphoric pronouns.\\
-{\bs She,\bs Her,\bs Hir} & uppercase synonyms for the anaphoric pronouns.\\
+{\bs she,\bs her,\bs herself, \bs hir} & synonyms for the anaphoric pronouns.\\
+{\bs She,\bs Her, \bs Herself, \bs Hir} & uppercase synonyms for the anaphoric pronouns.\\
 {\bs xspacefalse} &  turn off the use of \texttt{\bs xspace}.\\
 {\bs hetrue,\bs hefalse} &  switches current gender state.\\
 \bottomrule
@@ -154,7 +159,7 @@ When a student registers, \heshe receives an ID card. \He also must go to the ad
 \end{xlist}
 \end{exe}
 
-In the first example, the switching version is used throughout, yielding the gibberish of (\ref{switched}). In the second example the first instance of the pronoun uses the switching version (\pkg{\bs heshe}) (here assuming it has been already used once), but subsequent anaphoric references to the current gender are preserved using the anaphoric versions (\pkg{\bs he,\bs his} or\pkg{\bs his}).
+In the first example, the switching version is used throughout, yielding the gibberish of (\ref{switched}). In the second example the first instance of the pronoun uses the switching version (\pkg{\bs heshe}) (here assuming it has been already used once), but subsequent anaphoric references to the current gender are preserved using the anaphoric versions (\pkg{\bs he,\bs his} or \pkg{\bs his}).
 
 \subsection{Use of the \pkg{xspace} package}
 By default, the package uses the \pkg{xspace} package to insert a space automatically after the pronoun. The \pkg{xspace} package automatically checks for following punctuation and suppresses the space in these cases.  However, it's not perfect, and some users might prefer not to have the space inserted automatically.  They can do this by using the \pkg{[noxspace]} option.
@@ -192,6 +197,9 @@ The booleans \pkg{\bs hetrue} and \pkg{\bs hefalse} can be used anywhere to manu
 \end{exe}
 
 Using the manual method might actually be practical in some cases.  For example, you could set the state at the beginning of a chapter and then just use the anaphoric version of the pronouns for all generic pronouns throughout the chapter.  This might be a less annoying strategy than switching pronouns constantly throughout a chapter.
+\section{The \pkg{[para]} option}
+For some purposes it may be useful to have the genders switch every paragraph.  In this case you may use the \pkg{[para]} option.  With this option, every new paragraph resets the gender.  In this case, as with the per chapter example just discussed, \emph{only} the anaphoric versions of the pronouns should be used in the running text. This option was added in response to another  \href{http://tex.stackexchange.com/q/100108/2693}{Stack Exchange question}.
+
 \section{The \pkg{[they]} option}
 When you get tired of the silliness of alternating genders, you can switch to
 this option, which will replace all of the relevant pronouns with the third
diff --git a/Master/texmf-dist/tex/latex/he-she/he-she.sty b/Master/texmf-dist/tex/latex/he-she/he-she.sty
index be39aad6b0b..a3f2f03a626 100644
--- a/Master/texmf-dist/tex/latex/he-she/he-she.sty
+++ b/Master/texmf-dist/tex/latex/he-she/he-she.sty
@@ -25,8 +25,6 @@
 % This package consists of the file he-she.sty and documentation files
 % he-she.tex and he-she.pdf
 %
-% Version 1.0 2011/02/13
-%
 % Option noxspace
 %
 % xspace can cause problems if the macro is e.g. enclosed in other markup such
@@ -47,15 +45,25 @@
 % As a result, this is probably not intended to be a robust alternative!
 % You have been warned! (And you will be if you use it too.)
 %
-\ProvidesPackage{he-she}[2011/02/12 Semi-automatic pronoun switching with anaphora v1.0]
+% Version history
+% Version 1.0 2011/02/13 Initial release.
+% Version 1.1 2013/03/04 Added [para] option and reflexive forms.
+%
+\ProvidesPackage{he-she}[2013/03/04 Semi-automatic pronoun switching with anaphora v1.1]
 \RequirePackage{xspace}
 \newif\ifxspace\xspacetrue
-\newif\ifthey\theyfalse
+\newif\ifHS@they\HS@theyfalse
+\newif\ifHS@para
 \DeclareOption{noxspace}{\xspacefalse}
 \DeclareOption{they}{%
-\theytrue
-\PackageWarning{he-she}{*** WARNING: Use of option `\CurrentOption` will screw up subject/verb agreement for most nominative pronouns. It is only present for for its comic value! USE AT YOUR OWN RISK! ***}
+  \HS@theytrue
+  \PackageWarning{he-she}{*** WARNING: Use of option `\CurrentOption` will screw up subject/verb agreement for most nominative pronouns. It is only present for for its comic value! USE AT YOUR OWN RISK! ***}
 }
+%
+\DeclareOption{para}{
+  \HS@paratrue
+  \PackageWarning{he-she}{*** WARNING: Use the `\CurrentOption` at your own risk. ***}}
+%
 \DeclareOption*{%
  \PackageWarning{he-she}{Unknown option `\CurrentOption`}%
 }
@@ -64,19 +72,27 @@
 \newif\ifhe\hetrue
 %
 %
-\ifthey
+\ifHS@para%
+  \RequirePackage{everyhook}
+  \PushPreHook{par}{\makebox[0pt][0pt]{\xspacefalse\heshe}}
+\fi
+\ifHS@they
 % Implement the (somewhat useless) 'they' option
 %
 \newcommand*{\heshe}{they\ifxspace\xspace\fi}
 \newcommand*{\Heshe}{They\ifxspace\xspace\fi}
 \newcommand*{\himher}{them\ifxspace\xspace\fi}
+\newcommand*{\himherself}{themselves\ifxspace\xspace\fi}
 \newcommand*{\Himher}{Them\ifxspace\xspace\fi}
+\newcommand*{\Himherself}{Themselves\ifxspace\xspace\fi}
 \newcommand*{\hisher}{their\ifxspace\xspace\fi}
 \newcommand*{\Hisher}{Their\ifxspace\xspace\fi}
 \newcommand*{\he}{they\ifxspace\xspace\fi}
 \newcommand*{\He}{They\ifxspace\xspace\fi}
 \newcommand*{\him}{them\ifxspace\xspace\fi}
+\newcommand*{\himself}{themselves\ifxspace\xspace\fi}
 \newcommand*{\Him}{Them\ifxspace\xspace\fi}
+\newcommand*{\Him}{Themselves\ifxspace\xspace\fi}
 \newcommand*{\his}{their\ifxspace\xspace\fi}
 \newcommand*{\His}{Their\ifxspace\xspace\fi}
 %
@@ -117,6 +133,16 @@
   \fi%
   \ifxspace\xspace\fi
 }%
+% Lowercase switching reflexive form \himherself
+%
+\newcommand*\himherself{%
+\ifhe%
+	herself%
+  \else%
+  	himself%
+  \fi
+  \ifxspace\xspace\fi
+}
 %
 % Accusative lowercase anaphoric form \him
 \newcommand*\him{%
@@ -127,6 +153,16 @@
   \fi
   \ifxspace\xspace\fi
 }
+% Lowercase anaphoric reflexive form \himself
+%
+\newcommand*\himself{%
+\ifhe%
+	herself%
+  \else%
+  	himself%
+  \fi
+  \ifxspace\xspace\fi
+}
 %
 % Genitive lowercase switching form \hisher
 \newcommand*\hisher{%
@@ -185,6 +221,17 @@
   \fi%
   \ifxspace\xspace\fi
 }%
+
+% Uppercase switching reflexive form \Himherself
+%
+\newcommand*\Himherself{%
+\ifhe%
+	Herself%
+  \else%
+  Himself%
+  \fi
+  \ifxspace\xspace\fi
+}
 %
 % Accusative uppercase anaphoric form \Him
 \newcommand*\Him{%
@@ -196,6 +243,17 @@
   \ifxspace\xspace\fi
 }
 %
+% Uppercase anaphoric reflexive form \Himself
+%
+\newcommand*\Himself{%
+\ifhe%
+	Herself%
+  \else%
+  	Himself%
+  \fi
+  \ifxspace\xspace\fi
+}
+%
 % Genitive uppercase switching form \Hisher
 \newcommand*\Hisher{%
   \ifhe%
@@ -221,7 +279,9 @@
 \let\she\he
 \let\She\He
 \let\her\him
+\let\herself\himself
 \let\Her\Him
+\let\Herself\Himself
 \let\hir\his
 \let\Hir\His
 \endinput
\ No newline at end of file