From 272f9f80e4e03897b37395e0adcefca25172e369 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 13 Aug 2015 20:54:49 +0000 Subject: eledform (13aug15) git-svn-id: svn://tug.org/texlive/trunk@38114 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/eledform/eledform.sty | 38 +++++++++++++++++------ 1 file changed, 28 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/eledform') diff --git a/Master/texmf-dist/tex/latex/eledform/eledform.sty b/Master/texmf-dist/tex/latex/eledform/eledform.sty index 1af987ca997..1ac9d51dce0 100644 --- a/Master/texmf-dist/tex/latex/eledform/eledform.sty +++ b/Master/texmf-dist/tex/latex/eledform/eledform.sty @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status "maintained". \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledform}[2012/10/01 v1.0 formalism for eledmac] +\ProvidesPackage{eledform}[2015/08/13 v1.1a formalism for eledmac] \RequirePackage{eledmac} \def\manuscripts@{} \newcommand{\manuscript}[1]{% @@ -31,13 +31,25 @@ \edtext{#2}{% \ifstrempty{#1}{}{\lemma{#1}}% \varnote@{% + \ifdefstring{\omitposition@}{first}{ \ifstrempty{#3}{}% - {\del@{#3}% - \ifstrempty{#4}% - {}% - {\varseparator@}% - }% - \var@{#4}% + {\del@{#3}% + \ifstrempty{#4}% + {}% + {\varseparator@}% + }% + \var@{#4}% + }% + {% + \ifstrempty{#4}% + {}% + {\var@{#4}% + \ifstrempty{#3}% + {}% + {\varseparator@}% + }% + \ifstrempty{#3}{}{\del@{#3}}% + }% }% #5% }% @@ -45,13 +57,15 @@ \newcommand{\print@manuscript}[1]{% \ifinlist{#1}{\manuscripts@}% {#1}% - {\eledmac@warning{Unknew man. #1, p.\the\page@num ; l.\the\line@num}\underline{unknew man. #1}}% + {\eledmac@warning{Manuscript #1 not declared, p.\the\page@num ; l.\the\line@num}\underline{Manuscript #1 not declared!}}% } \newcommand{\del@}[1]{% \renewcommand{\do}[1]{% \print@manuscript{##1}% }% - \docsvlist{#1}\manvarseparator@\omittext@% + \ifdefstring{\manposition@}{last}% + {\omittext@\manvarseparator@\docsvlist{#1}}% + {\docsvlist{#1}\manvarseparator@\omittext@}% } \newcommand{\var@}[1]{% \newif\iffirst% @@ -63,7 +77,9 @@ \renewcommand{\do}[1]{% \print@manuscript{##1}% }% - \docsvlist{#1}\manvarseparator@#2% + \ifdefstring{\manposition@}{last}% + {#2\manvarseparator@\docsvlist{#1}}% + {\docsvlist{#1}\manvarseparator@#2}% } \let\varnote@\Afootnote \newcommand{\varseries}[1]{\letcs{\varnote@}{#1footnote}} @@ -71,6 +87,8 @@ \csgdef{#1@}{#2}% \expandafter\newcommand\csname#1\endcsname[1]{\csgdef{#1@}{##1}}% } +\new@eledform@custom{omitposition}{first} +\new@eledform@custom{manposition}{last} \new@eledform@custom{omittext}{\emph{omit}} \new@eledform@custom{manvarseparator}{~} \new@eledform@custom{varseparator}{\space} -- cgit v1.2.3