summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-28 20:58:07 +0000
committerKarl Berry <karl@freefriends.org>2016-10-28 20:58:07 +0000
commit989f4a04f17e36b925fab1f02e359bb91c81ecac (patch)
tree00881096146dba77949e1090253e09830a4fd1b6
parent2a6a7fba1491d434954a174b8a7fe2e07d6c104a (diff)
semantic-markup (28oct16)
git-svn-id: svn://tug.org/texlive/trunk@42374 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/semantic-markup/README2
-rw-r--r--Master/texmf-dist/doc/latex/semantic-markup/semantic-markup.pdfbin272012 -> 272931 bytes
-rw-r--r--Master/texmf-dist/doc/latex/semantic-markup/semantic-markup.tex12
-rw-r--r--Master/texmf-dist/tex/latex/semantic-markup/semantic-markup.sty29
4 files changed, 36 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/latex/semantic-markup/README b/Master/texmf-dist/doc/latex/semantic-markup/README
index 507e9579eca..66bb540d2b7 100644
--- a/Master/texmf-dist/doc/latex/semantic-markup/README
+++ b/Master/texmf-dist/doc/latex/semantic-markup/README
@@ -9,5 +9,5 @@ Because the author is a music scholar, the package also includes some macros for
All the commands can be easily redefined as needed.
This material is subject to the current version of the LaTeX Project Public License.
-The author and maintainer is Andrew A. Cashner, cashner@usc.edu.
+The author and maintainer is Andrew A. Cashner, andrewacashner@gmail.com.
diff --git a/Master/texmf-dist/doc/latex/semantic-markup/semantic-markup.pdf b/Master/texmf-dist/doc/latex/semantic-markup/semantic-markup.pdf
index d7a21cbee2b..7488c0e7bd6 100644
--- a/Master/texmf-dist/doc/latex/semantic-markup/semantic-markup.pdf
+++ b/Master/texmf-dist/doc/latex/semantic-markup/semantic-markup.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/semantic-markup/semantic-markup.tex b/Master/texmf-dist/doc/latex/semantic-markup/semantic-markup.tex
index aa79a281802..996242bcaef 100644
--- a/Master/texmf-dist/doc/latex/semantic-markup/semantic-markup.tex
+++ b/Master/texmf-dist/doc/latex/semantic-markup/semantic-markup.tex
@@ -8,7 +8,7 @@
\usepackage{semantic-markup}
\frenchspacing
\usepackage
- [pdftitle={The semantics Package for Meaningful Markup},
+ [pdftitle={The semantic-markup Package for Meaningful Markup},
pdfauthor={Andrew A. Cashner},
pdfsubject={LaTeX package},
pdfkeywords={LaTeX, semantic markup, TEI, humanities}]{hyperref}
@@ -16,7 +16,7 @@
\title{The \texttt{semantic-markup} Package for Meaningful Markup}
\author{Andrew A. Cashner%
- \thanks{Assistant professor of musicology, University of Southern California, \href{mailto:cashner@usc.edu}{\nolinkurl{cashner@usc.edu}}}%
+ \thanks{\href{mailto:andrewacashner@gmail.com}{\nolinkurl{andrewacashner@gmail.com}}}%
}
\begin{document}
@@ -31,9 +31,15 @@ The goal is simply to allow scholars to write with attention to meaning and cont
\section{Package Options}
+\subsection{\texttt{defaultquotes}}
+
The package configures \texttt{csquotes} to place end punctuation inside quotation marks, according to United States usage.
Use the \texttt{defaultquotes} package option to restore the default behavior of \texttt{csquotes}.
+\subsection{\texttt{endnotes}}
+
+The \texttt{endnotes} option converts footnotes to endnotes, including footnotes created with this package's \texttt{Footnote} environment.
+
\section{Semantic Commands Defined Without Arguments}
The following commands are defined (using \texttt{xparse}) as aliases to standard \LaTeX{} commands or \verb|\textquote| from the \texttt{csquotes} package.
@@ -47,7 +53,7 @@ To redefine it to be set in bold, for example, you can use the basic \LaTeX{} co
\begin{center}
\begin{tabularx}{\linewidth}{llX}
\toprule
-Command & Alias & Use\\
+Package Command & Alias & Use\\
\midrule
\verb|\quoted| & \verb|\textquote| & Quoted material, taking care of end punctuation: instead of \verb|``word,''| write \verb|\quoted{word},|\\
\verb|\soCalled| & \verb|\textquote| & Scare quotes\\
diff --git a/Master/texmf-dist/tex/latex/semantic-markup/semantic-markup.sty b/Master/texmf-dist/tex/latex/semantic-markup/semantic-markup.sty
index f4e7f3ffbf9..c6d24f5cb55 100644
--- a/Master/texmf-dist/tex/latex/semantic-markup/semantic-markup.sty
+++ b/Master/texmf-dist/tex/latex/semantic-markup/semantic-markup.sty
@@ -1,7 +1,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{semantic-markup}[2016/09/01
+\ProvidesPackage{semantic-markup}[2016/10/28
Macros for TEI-like semantic markup]
-% Copyright 2016 Andrew A. Cashner, cashner@usc.edu
+% Copyright 2016 Andrew A. Cashner, andrewacashner@gmail.com
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -17,11 +17,24 @@
% This work consists of the package file semantic-markup.sty
% and the documentation file semantic-markup.tex.
+% CHANGE LOG
+% 2016-09-22 `endnotes' option added
+% 2016-09-01 First version on CTAN
+
+% Option to use csquotes default behavior instead of the
+% US localized punctuation used in this package
\newif\ifdefaultquotes
-% Use custom configuration instead of csquotes default
\defaultquotesfalse
\DeclareOption{defaultquotes}{\defaultquotestrue}
+
+% Option to convert footnotes to endnotes, include
+% Footnote environment
+\newif\ifendnotes
+\endnotesfalse
+\DeclareOption{endnotes}{\endnotestrue}
+
\ProcessOptions\relax
+%**************************
\RequirePackage{xparse}
@@ -82,6 +95,16 @@
\RequirePackage{environ}
\NewEnviron{Footnote}{\footnote{\BODY}}[]
+%******************
+% Endnotes, if desired
+% Footnote environment adjusted to fix expansion problem
+\ifendnotes
+ \RequirePackage{endnotes}
+ \RenewEnviron{Footnote}{\expandafter\footnote\expandafter{\BODY}}[]
+ \let\footnote=\endnote
+ \AtEndDocument{\theendnotes}
+\fi
+
%****************************************
% MUSIC SYMBOLS