summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/eledform/README.md22
-rw-r--r--Master/texmf-dist/doc/latex/eledform/eledform.pdfbin0 -> 79265 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledform/example.pdfbin0 -> 47426 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledform/example.tex32
-rw-r--r--Master/texmf-dist/doc/latex/eledform/include/stemma.tex23
-rw-r--r--Master/texmf-dist/doc/latex/eledform/makefile44
-rw-r--r--Master/texmf-dist/source/latex/eledform/eledform.dtx313
-rw-r--r--Master/texmf-dist/source/latex/eledform/eledform.ins55
-rw-r--r--Master/texmf-dist/tex/latex/eledform/eledform.sty79
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rw-r--r--Master/tlpkg/tlpsrc/collection-humanities.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/eledform.tlpsrc0
12 files changed, 570 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/latex/eledform/README.md b/Master/texmf-dist/doc/latex/eledform/README.md
new file mode 100644
index 00000000000..1063b29e9b1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/eledform/README.md
@@ -0,0 +1,22 @@
+© Maïeul Rouquette 2012
+
+Licence LPLL 1.3.c
+
+http://www.latex-project.org/lppl/lppl-1-3c.html
+
+This package provides formal commands to describe textual variants.
+It uses eledmac.
+
+The distributions contains :
+- eledform.dtx
+- eledform.ins
+- eledform.PDF
+- include/*
+- example.tex
+- example.pdf
+
+and the present README.md file
+
+Public repository : https://github.com/maieul/eledform.
+
+Support for new features and debug : https://github.com/maieul/eledform/issues \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/eledform/eledform.pdf b/Master/texmf-dist/doc/latex/eledform/eledform.pdf
new file mode 100644
index 00000000000..d20f0945765
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/eledform/eledform.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledform/example.pdf b/Master/texmf-dist/doc/latex/eledform/example.pdf
new file mode 100644
index 00000000000..a31dd5e4335
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/eledform/example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledform/example.tex b/Master/texmf-dist/doc/latex/eledform/example.tex
new file mode 100644
index 00000000000..392717e13aa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/eledform/example.tex
@@ -0,0 +1,32 @@
+\documentclass{article}
+\usepackage{eledform}
+\firstlinenum{1}
+\linenumincrement{1}
+\varseparator{\thinspace;\space} % Separator between variants
+\manvarseparator{$\rightarrow$} % Separator between manuscrit and variant
+\omittext{\emph{del}} % Txt to print when a lemma is ommited
+\manuscript{A,B,C,D} % Define the existing manuscripts
+
+\begin{document}
+\makeatletter
+\varseries{B} % Define the series where textual variants will be printed
+\beginnumbering
+\pstart
+\edtext{}{\Afootnote{s}} % Example to test \varseries
+\var{lorem}{A,B}{ % Basic example
+{{C}{loram}},
+{{D}{lorim}}
+}
+\var{ipsum}{}{{C}{ipsem}} % Only variants
+\var{dolor}{C}{} % Only deletion
+\var[sit\ldots elit]{sit amet consectetur adipiscing elit}{B,C}{} % Syntaxe with shortened lemma
+\var{sed}{}{ % Example with two manuscripts with the same form
+ {{C,D}{sid}}
+ }
+\var{do}{}{ % Example with a wrong manuscript
+ {{C,E}{da}}
+ }
+\var{eiusmod}{A}{}[\Afootnote{dem. pro. ?}]
+\pend
+\endnumbering
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/eledform/include/stemma.tex b/Master/texmf-dist/doc/latex/eledform/include/stemma.tex
new file mode 100644
index 00000000000..620d1e4a397
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/eledform/include/stemma.tex
@@ -0,0 +1,23 @@
+\begin{tikzpicture}
+\footnotesize
+\tikzset{edge from parent/.style={draw,edge from parent path={(\tikzparentnode) -- (\tikzchildnode)}}}
+\Tree [.\textbackslash var
+ [.\textbackslash edtext
+ [.\textbackslash varnote@
+ [.\textbackslash del@
+ [.\textbackslash print@manuscript ]
+ [.\textbackslash manvarseparator@ ]
+ [.\textbackslash omittext@ ]
+ ]
+ [.\textbackslash varseparator@ ]
+ [.\textbackslash var@
+ [.\textbackslash var@@
+ [.\textbackslash print@manuscript ]
+ [.\textbackslash manvarseparator@ ]
+ [. variant ]
+ ]
+ ]
+ ]
+ ]
+ ]
+\end{tikzpicture} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/eledform/makefile b/Master/texmf-dist/doc/latex/eledform/makefile
new file mode 100644
index 00000000000..379b65bf9ec
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/eledform/makefile
@@ -0,0 +1,44 @@
+PACKAGE = *.dtx \
+ eledform.pdf \
+ example.pdf \
+ *.ins \
+ *.tex \
+ include/*\
+ makefile\
+ README.md
+
+
+
+.PHONY: all dist clean cleanall
+
+
+all:eledform.sty eledform.pdf dist clean
+
+
+example.pdf:example.tex eledform.sty
+ pdflatex example.tex
+ pdflatex example.tex
+ pdflatex example.tex
+
+%.sty: %.ins %.dtx
+ @rm -f $*.sty
+ @pdflatex $*.ins
+
+%.pdf: %.dtx %.sty
+ @xelatex $*.dtx
+ @xelatex $*.dtx
+ makeindex -s gglo.ist -o $*.gls $*.glo
+ makeindex -s gind.ist -o $*.ind $*.idx
+ @xelatex $*.dtx
+
+
+dist: $(PACKAGE)
+ @$(RM) ../eledform.zip
+ zip ../eldeform.zip $(PACKAGE)
+
+
+clean:
+ @$(RM) *.aux *.log *.out *.toc *glo *idx *bib *bbl *blg *xml *gls *ilg *gz *ind
+
+cleanall:clean
+ @$(RM) bibleref-french-francais.pdf bibleref-french.pdf test.pdf *sty \ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/eledform/eledform.dtx b/Master/texmf-dist/source/latex/eledform/eledform.dtx
new file mode 100644
index 00000000000..40fbe558304
--- /dev/null
+++ b/Master/texmf-dist/source/latex/eledform/eledform.dtx
@@ -0,0 +1,313 @@
+%\iffalse meta-comment
+%
+% Copyright (C) 2012 by Maïeul Rouquette
+%
+% This file 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 2003/06/01 or later.
+% This work has the LPPL maintenance status "maintained".
+%
+% \fi
+
+% \iffalse
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage{polyglossia,csquotes}
+\setmainlanguage{english}
+\usepackage{eledmac,eledform,tikz,tikz-qtree}
+\usepackage{hyperref}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\begin{document}
+\DocInput{eledform.dtx}
+\end{document}
+%</driver>
+% \fi
+% \CheckSum{82}
+% \CharacterTable
+% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
+% \changes{v1.0}{2012/10/01}{First public release}
+% \GetFileInfo{eledform.sty}
+%\DoNotIndex{\csgdef,\if,\fi,\else,\listgadd}
+%
+%\title{The eledform extension for eledmac}
+% \author{Maïeul Rouquette \\ maieul at maieul dot net}
+% \date{\fileversion\space\filedate}
+% \maketitle
+% \begin{abstract}
+% The \emph{eledmac} package provides tools to make critical editions of texts.
+% But it doesn't provide any formalism to note the textual variants: each user has to make his own formalism.
+% This package tries to provide a formalism
+% which distinguishes between the \emph{formal} notation of textual variants and their typographical notation\footnote{The original idea of this package is described at \url{http://geekographie.maieul.net/Formaliser-les-variantes}. You can suggest new features or report bugs at \url{https://github.com/maieul/eledform/issues}.}.
+% \end{abstract}
+% \tableofcontents
+% \section{Use}
+% \subsection{One Example}
+% \subsubsection{Without formalism}
+% Suppose this case :
+% \begin{enumerate}
+% \item One text, with fives manuscripts: P, A, B, C, D.
+% P is the manuscript which is used as reference.
+% Variants in A, B, C, D are shown in the apparatus.
+% \item The pseudo-word \enquote{lorem} has these variants :
+% \begin{description}
+% \item[A and B]the word is omitted.
+% \item[C]the word is replaced by \enquote{loram}.
+% \item[D]the word is replaced by \enquote{lorim}.
+% \end{description}
+% \end{enumerate}
+% Without formalism, you could write :
+% \begin{verbatim}
+% \edtext{lorem}{\Afootnote{AB \emph{omit} ; C loram ; D lorim}}
+% \end{verbatim}
+% Which produces in the critical notes:
+% \begin{quote}
+% lorem] AB omit ; C loram ; D lorim
+% \end{quote}
+% There is some limits with this method:
+% \begin{itemize}
+% \item If we want to change display, we must changes all notes.
+% \item We can't produce statistics.
+% \item Difficulty to export in other format than \LaTeX.
+% \item No method to check if we don't make mistake about manuscript.
+% \end{itemize}
+% \subsubsection{With formalism}
+% To describe the same thing, we propose this formalism :
+% \begin{verbatim}
+%\var{lorem}{A,B}{
+%{{C}{loram}},
+%{{D}{lorim}}
+%}
+% \end{verbatim}
+% With \emph{eledform}, this will produce the same thing that the non-formalised form,
+% but without described inconveniences.
+% You could see example in the file \href{example.tex}{example.tex}, which produces \href{example.pdf}{example.pdf}.
+% \subsection{References}
+% \subsubsection{Declare the manuscripts}
+% \DescribeMacro{\manuscripts}
+% You must use \cs{Manuscripts}\marg{list}
+% to provide to \LaTeX\space the list of manuscripts used in the apparatus.
+% \LaTeX\ prints a warning message in the log file if you describe a variant
+% inside a manuscript which does'nt exist.
+% It also prints an error in the PDF.
+% The list of manuscripts is a comma separated list:
+% \begin{verbatim}
+% \manuscripts{A,B,C,D}
+% \end{verbatim}
+% \subsubsection{Declare variants}
+% \DescribeMacro{\varseries}
+%
+% The main macro is \cs{var}\oarg{short}\marg{lemma}\marg{del}\marg{variants}\oarg{other}.
+% This macro takes five arguments, two are optional.
+% \begin{description}
+% \item[\meta{short} (optional)]an abbreviated version of the lemma for the notes.
+% \item[\meta{lemma}]the lemma which has variants.
+% \item[\meta{del}]a comma separated list of manuscripts where the lemma is ommited.
+% \item[\meta{variants}]a comma separated list of variants. Each variant has the form \marg{manuscripts}\marg{variant}, where:
+% \begin{description}
+% \item[\meta{manuscripts}]a comma separated list of manuscripts where the variant is.
+% \item[\meta{variant}]the variant itself.
+% \end{description}
+% \item[\meta{other}(optional)]other code linked to the lemma, for example a call to an critical footnote.
+% \end{description}
+% \subsubsection{Customize}
+% \DescribeMacro{\varseries}
+% By default, the notes for textual variants are printed in the A series of footnotes.
+% With \cs{varseries}\marg{letter}, you can change it.
+%
+% \DescribeMacro{\omittext}
+% When a manuscript omit a lemma, \emph{eledform} print \verb|\emph{omit}|.
+% You can change it with \cs{omittext}\marg{text}.
+%
+% \DescribeMacro{\manvarseparator}
+% By default, a non breakable space is printed between the manuscript and the variant.
+% You can change it with \cs{manvarseparator}\marg{separator}.
+%
+% \DescribeMacro{\varseparator}
+% By default, a breakable space is printed between each variant of a lemma.
+% You can change it with \cs{varseparator}\marg{separator}.
+%\StopEventually{\PrintChanges}
+% \section{Implementation}
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{eledform}[2012/10/01 v1.0 formalism for eledmac]
+\RequirePackage{eledmac}
+% \end{macrocode}
+% \subsection{Define manuscripts}
+% \begin{macro}{\manuscripts@}
+% The \cs{manuscripts@} macro is an etoolbox list.
+% \begin{macrocode}
+\def\manuscripts@{}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\manuscripts}
+% The \cs{manuscripts} macro only fills the \cs{manuscripts} macro.
+% \begin{macrocode}
+\newcommand{\manuscript}[1]{%
+ \renewcommand{\do}[1]{\listgadd{\manuscripts@}{##1}}%
+ \docsvlist{#1}%
+}
+% \end{macrocode}
+% \end{macro}
+% \subsection{Print the critical notes}
+% \begin{macro}{\var}
+% The \cs{var} macro is the only public macro, which calls all private macros.
+% \begin{macrocode}
+\newcommandx*{\var}[5][1,5,usedefault]{%
+% \end{macrocode}
+% First, call the \cs{edtext} macro.
+% \begin{macrocode}
+ \edtext{#2}{%
+% \end{macrocode}
+% If the \cs{var} macro is called with the optional first argument,
+% we put it into the \cs{lemma} macro.
+% \begin{macrocode}
+ \ifstrempty{#1}{}{\lemma{#1}}%
+% \end{macrocode}
+% The \cs{varnote@} macro is an Xfootnote macro defined by user, with the \cs{varnote} macro (cf.~\pageref{varnote}).
+% \begin{macrocode}
+ \varnote@{%
+% \end{macrocode}
+% If the third argument is not empty, we call the \cs{del@} macro, which print the manuscript where the lemma is omitted
+%  \begin{macrocode}
+ \ifstrempty{#3}{}%
+ {\del@{#3}%
+% \end{macrocode}
+% If the third and fourth argument are both not empty, we print the separator between variants.
+% \begin{macrocode}
+ \ifstrempty{#4}%
+ {}%
+ {\varseparator@}%
+ }%
+% \end{macrocode}
+% And so, we print all the variants which are not an omission.
+% \begin{macrocode}
+ \var@{#4}%
+ }%
+% \end{macrocode}
+% Eventually, we add the critical notes which are not for textual criticism.
+% \begin{macrocode}
+ #5%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\print@manuscript}
+% The \cs{print@manuscripts} command only prints the manuscripts where a variant exists.
+% \begin{macrocode}
+\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}}%
+ }
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\del@}
+% The \cs{del@} macro prints the manuscripts where the lemma is omitted,
+% and after that, the text to indicate this omission.
+% \begin{macrocode}
+\newcommand{\del@}[1]{%
+ \renewcommand{\do}[1]{%
+ \print@manuscript{##1}%
+ }%
+ \docsvlist{#1}\manvarseparator@\omittext@%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\var@}
+% The \cs{var@} macro loops on the non omission variants.
+% Except for the first variant, it prints the variant separator.
+% \begin{macrocode}
+\newcommand{\var@}[1]{%
+ \newif\iffirst%
+ \firsttrue%
+ \renewcommand{\do}[1]{\iffirst\firstfalse\else\varseparator@\fi{\var@@##1}}%
+ \docsvlist{#1}%
+ }
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\var@@}
+% The \cs{var@@} macro prints manuscripts for a singular variant
+% and this variant after that.
+% \begin{macrocode}
+\newcommand{\var@@}[2]{%
+ \renewcommand{\do}[1]{%
+ \print@manuscript{##1}%
+ }%
+ \docsvlist{#1}\manvarseparator@#2%
+ }
+% \end{macrocode}
+% \end{macro}
+% \subsection{Customization}
+% \subsubsection{The footnote series}
+% \begin{macro}{\varnote@}\label{varnote}
+% The \cs{varnote@} macro is only a reference to a critical footnote macro of eledmac.
+% The default is \cs{Afootnote}.
+% \begin{macrocode}
+\let\varnote@\Afootnote
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\varseries}
+% The \cs{varseries} macro redefines this reference.
+% \begin{macrocode}
+\newcommand{\varseries}[1]{\letcs{\varnote@}{#1footnote}}
+% \end{macrocode}
+% \end{macro}
+% \subsubsection{Display options}
+% \begin{macro}{\new@eledform@custom}
+% The \cs{new@eledform@custom} macro has two actions :
+% \begin{enumerate}
+% \item Define the default value of an option (\cs{option@}).
+% \item Create the command which modifies this option (\cs{option}).
+% \end{enumerate}
+% \begin{macrocode}
+\newcommand{\new@eledform@custom}[2]{%
+ \csgdef{#1@}{#2}%
+ \expandafter\newcommand\csname#1\endcsname[1]{\csgdef{#1@}{##1}}%
+}
+% \end{macrocode}
+% \end{macro}
+% And so, we can call \cs{new@eledform@custom} to define options for user.
+% \begin{macro}{\omittext}
+% \begin{macro}{\manvarseparator}
+% \begin{macro}{\varseparator}
+% \begin{macrocode}
+\new@eledform@custom{omittext}{\emph{omit}}
+\new@eledform@custom{manvarseparator}{~}
+\new@eledform@custom{varseparator}{\space}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \subsection{Stemma of the code}
+% The next figure is a stemma of the code.
+%
+% \hspace{-3cm}\noindent\input{include/stemma}
+% \newpage
+% \addcontentsline{toc}{section}{Changes}
+% \PrintChanges
+% \addcontentsline{toc}{section}{Index}
+% \PrintIndex
+% \Finale
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/eledform/eledform.ins b/Master/texmf-dist/source/latex/eledform/eledform.ins
new file mode 100644
index 00000000000..fdf702a8af4
--- /dev/null
+++ b/Master/texmf-dist/source/latex/eledform/eledform.ins
@@ -0,0 +1,55 @@
+%% Copyright (C) 2012 by Maïeul Rouquette
+%%
+%% This file 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 2003/06/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this work when run through
+%% LaTeX.
+%%
+%%
+%% --------------- start of docstrip commands ------------------
+%%
+\input docstrip.tex
+\keepsilent
+
+\preamble
+Copyright (C) 2012 by Maïeul Rouquette
+
+This file 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 2003/06/01 or later.
+
+This work has the LPPL maintenance status "maintained".
+\endpreamble
+
+\generate{\file{eledform.sty}{\from{eledform.dtx}{package}}}
+
+\Msg{***********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file(s) into a directory searched by LaTeX. See the FAQ on}
+\Msg{* CTAN at /help/uk-tex-faq for more on this.}
+\Msg{*}
+\Msg{* \space\space eledform.sty}
+\Msg{*}
+\Msg{*}
+\Msg{* Happy TeXing}
+\Msg{***********************************************************}
+
+\endbatchfile \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/eledform/eledform.sty b/Master/texmf-dist/tex/latex/eledform/eledform.sty
new file mode 100644
index 00000000000..1af987ca997
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/eledform/eledform.sty
@@ -0,0 +1,79 @@
+%%
+%% This is file `eledform.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% eledform.dtx (with options: `package')
+%% Copyright (C) 2012 by Maïeul Rouquette
+%%
+%% This file 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 2003/06/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{eledform}[2012/10/01 v1.0 formalism for eledmac]
+\RequirePackage{eledmac}
+\def\manuscripts@{}
+\newcommand{\manuscript}[1]{%
+ \renewcommand{\do}[1]{\listgadd{\manuscripts@}{##1}}%
+ \docsvlist{#1}%
+}
+\newcommandx*{\var}[5][1,5,usedefault]{%
+ \edtext{#2}{%
+ \ifstrempty{#1}{}{\lemma{#1}}%
+ \varnote@{%
+ \ifstrempty{#3}{}%
+ {\del@{#3}%
+ \ifstrempty{#4}%
+ {}%
+ {\varseparator@}%
+ }%
+ \var@{#4}%
+ }%
+ #5%
+ }%
+}
+\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}}%
+ }
+\newcommand{\del@}[1]{%
+ \renewcommand{\do}[1]{%
+ \print@manuscript{##1}%
+ }%
+ \docsvlist{#1}\manvarseparator@\omittext@%
+}
+\newcommand{\var@}[1]{%
+ \newif\iffirst%
+ \firsttrue%
+ \renewcommand{\do}[1]{\iffirst\firstfalse\else\varseparator@\fi{\var@@##1}}%
+ \docsvlist{#1}%
+ }
+\newcommand{\var@@}[2]{%
+ \renewcommand{\do}[1]{%
+ \print@manuscript{##1}%
+ }%
+ \docsvlist{#1}\manvarseparator@#2%
+ }
+\let\varnote@\Afootnote
+\newcommand{\varseries}[1]{\letcs{\varnote@}{#1footnote}}
+\newcommand{\new@eledform@custom}[2]{%
+ \csgdef{#1@}{#2}%
+ \expandafter\newcommand\csname#1\endcsname[1]{\csgdef{#1@}{##1}}%
+}
+\new@eledform@custom{omittext}{\emph{omit}}
+\new@eledform@custom{manvarseparator}{~}
+\new@eledform@custom{varseparator}{\space}
+\endinput
+%%
+%% End of file `eledform.sty'.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 355c70f33d6..0fdae8a14bf 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -144,7 +144,7 @@ my @TLP_working = qw(
ebezier ebong ebsthesis ec ecc ecclesiastic ecltree economic
ecv ed edfnotes edmac edmargin ednotes eemeir eepic egameps
egplot eiad eiad-ltx eijkhout einfuehrung ejpecp
- elbioimp electrum eledmac ellipsis elmath elpres elsarticle
+ elbioimp electrum eledform eledmac ellipsis elmath elpres elsarticle
elteikthesis eltex elvish
emarks embrac emptypage emulateapj emp
encxvlna endfloat endheads endiagram endnotes
diff --git a/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc b/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
index 9a3c04fa937..96c2951285e 100644
--- a/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
@@ -13,6 +13,7 @@ depend dramatist
depend ecltree
depend edfnotes
depend ednotes
+depend eledform
depend eledmac
depend gb4e
depend gmverse
diff --git a/Master/tlpkg/tlpsrc/eledform.tlpsrc b/Master/tlpkg/tlpsrc/eledform.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/eledform.tlpsrc