summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-19 21:26:14 +0000
committerKarl Berry <karl@freefriends.org>2018-09-19 21:26:14 +0000
commitfd09f0183da0c8d80efc777f3bcc4e311a871495 (patch)
tree6e782e478e09a9666f8edecf6f421dbc69fbb12a /Master/texmf-dist
parentd39904e9b47ce8671ce17c1e6ceeca60c7467c5e (diff)
biblatex-manuscripts-philology (19sep18)
git-svn-id: svn://tug.org/texlive/trunk@48701 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/README4
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib3
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdfbin35880 -> 36386 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdfbin85108 -> 100830 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex140
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx25
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx25
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx39
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-NewBibliographyString.sty23
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx62
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx45
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx2
16 files changed, 265 insertions, 113 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/README b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/README
index 992c89d92c9..da94e9ad0d4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/README
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/README
@@ -9,6 +9,8 @@ This work contains:
- manuscripts.dbx
- french-manuscripts.lbx
- english-manuscripts.lbx
+ - italian-manuscripts.lbx
+ - manuscripts-NewBibliographyString.sty
- The documentation folde:
- biblatex-manuscripts-philology.tex
- the derivated file: biblatex-manuscripts-philology.pdf
@@ -20,4 +22,4 @@ This work contains:
- latexmkrc
- This README file
-All features can be requested in https://github.com/maieul/biblatex-manuscripts-philology/issues \ No newline at end of file
+All features can be requested in https://github.com/maieul/biblatex-manuscripts-philology/issues
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib
index 554b2f99e1c..c6a8e8ea2c5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib
@@ -15,6 +15,7 @@
Bookpagination = {folio},
Collection = {Additional greek manuscript},
Columns = {1},
+ Content = {A description of the content. \par We can insert paragraphs using \texttt{\textbackslash verb}},
Date-Added = {2014-04-07 12:59:25 +0000},
Date-Modified = {2014-04-07 13:08:49 +0000},
Dating = {\textsc{viii}-\textsc{ix}\textsuperscript{e} c.},
@@ -179,7 +180,7 @@
Columns = {2},
Date-Modified = {2013-12-24 15:21:30 +0000},
Dating = {\textsc{x}\textsuperscript{e} c.},
- Library = {Bibliothèque Nationale de France},
+ Library = {Bibliothèque nationale de France},
Origin = {Constantinople},
Pages = {233\verso-245\recto},
Pagetotal = {282},
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf
index 20138c6dd8e..20faf507a85 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf
index efb20c5785e..bcc9f922fb9 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex
index 645693774a8..cee261beb63 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex
@@ -10,18 +10,19 @@
\usepackage{shortvrb}
\usepackage{pifont}
\usepackage{minted}
-% Usefull commands
+% Useful commands
\newcommand{\biblatex}{biblatex\xspace}
\pretocmd{\bibfield}{\sloppy}{}{}
\pretocmd{\bibtype}{\sloppy}{}{}
+\newcommand{\meta}[1]{\texttt{<#1>}}
% Meta-datas
\titlepage{%
title={Manuscripts description for philology with biblatex},
subtitle={New data types},
email={maieul <at> maieul <dot> net},
author={Maïeul Rouquette},
- revision={1.12.3},
- date={26/11/2017},
+ revision={2.0.0},
+ date={19/09/2018},
url={https://github.com/maieul/biblatex-manuscripts-philology}}
@@ -31,12 +32,15 @@
\tableofcontents
\section{Introduction}
\subsection{Goals}
-The \biblatex package defines some standard fields for entry, and allows to use extra fields, like \bibfield{usera}, \bibfield{userb}. However, the number of extra fields needed to describe manuscripts in an introduction of a critical edition of classical texts is too great to use these fields' names without mistake.
+The \biblatex package defines some standard fields for entry, and allows the use
+of extra fields, like \bibfield{usera}, \bibfield{userb}. However, the number of
+extra fields needed to describe manuscripts in an introduction of a critical edition
+of classical texts is too great to use these fields' names without mistake.
-The aim of this package is double:
+The aim of this package is twofold:
\begin{itemize}
-\item Provides new datatype: \bibtype{manuscripts} with adapted fields.
+\item Provides new datatype: \bibtype{manuscripts} with appropriate fields.
\item Provides new bibliography styles to print the list of manuscripts:
\begin{itemize}
\item As a detailed list of witnesses of a text.
@@ -47,7 +51,10 @@ The aim of this package is double:
You can see minimal example in the file \href{file:example.pdf}{example.pdf}.
\subsection{Credits}
-This package was created for Maïeul Rouquette's PHD\footnote{\url{http://apocryphes.hypothese.org}.} in 2014. It is licenced on the \emph{\LaTeX\ Project Public Licence}\footnote{\url{http://latex-project.org/lppl/lppl-1-3c.html}.}.
+This package was created for Maïeul Rouquette's
+PhD\footnote{\url{http://apocryphes.hypothese.org}.} in 2014. It is licenced on
+the \emph{\LaTeX\ Project Public
+Licence}\footnote{\url{http://latex-project.org/lppl/lppl-1-3c.html}.}.
All issues can be submitted, in French or English, in the GitHub issues page\footnote{\url{https://github.com/maieul/biblatex-manuscripts-philology/issues}.}.
@@ -64,14 +71,18 @@ This bibtype has these mandatory fields:
\begin{fieldlist}
-\fielditem{collection}{literal} the collection in the library. For example: \verb+Supplément grec+.
+\fielditem{collection}{literal} the collection in the library. For example:
+\verb+Supplément grec+ or \verb+Vaidyaka+.
-\fielditem{location}{literal} the city or place where the manuscript is kept. For example: \verb+Paris+ or \verb+Oxford+.
+\fielditem{location}{literal} the city or place where the manuscript is kept. For
+example: \verb+Paris+ or \verb+Oxford+ or \verb+Varanasi+.
-\fielditem{library}{literal} the library where the manuscript is kept. For example: \verb+Bibliothèque Nationale de France+.
+\fielditem{library}{literal} the library where the manuscript is kept. For example:
+\verb+Bibliothèque nationale de France+ or \verb+Sarasvatī Bhavan Library+.
-\fielditem{shelfmark}{literal} the shelfmark in the collection. For example: \verb+241+.
+\fielditem{shelfmark}{literal} the shelfmark in the collection. For example:
+\verb+241+. Do not prefix with \enquote{MS}.
\end{fieldlist}
\subsection{Optional}
@@ -79,11 +90,20 @@ This bibtype can use the optional fields:
\begin{fieldlist}
-\fielditem{bookpagination}{key} the pagination of the manuscript which is studied. The standard pagination keys are allowed, but the package add a new key: \texttt{folio}. The value of this field is to be used for printing the \bibfield{pages} and \bibfield{pagetotal}.
+\fielditem{bookpagination}{key} the pagination or foliation of the manuscript
+which is studied. The standard \biblatex pagination keys are allowed, but the
+package adds a new key: \texttt{folio}.
+
+The value of this field will be used
+when printing the \bibfield{pages} and \bibfield{pagetotal}.
+E.g., ``ff.~3--5'' (when \bibfield{bookpagination} =
+\enquote{folio}) or ``pp.~88--99'' (\enquote{page}). See the \biblatex manual for details.
\fielditem{columns}{integer} the number of column by pages. Basically, only two numbers are allowed: \verb+1+ or \verb+2+.
-\fielditem{dating}{literal} the dating of the manuscript. It can be for example a century.
+\fielditem{dating}{literal} the dating of the manuscript. It can be for example a
+century.
+
\label{field:layer}\fielditem{layer}{key} for palimpsests, the layer which is studied. There is two possibility:
\begin{description}
@@ -97,25 +117,46 @@ This bibtype can use the optional fields:
\fielditem{shortlibrary}{literal} the abreviated form of the library. Not used by the default style.
-\fielditem{pages}{range} the pages which are studied in the manuscript. In this field, you can use the macros \cs{recto} and \cs{verso}.
+\fielditem{pages}{range} the pages which are studied in the manuscript. In this
+field, you can use the macros \cs{recto} and \cs{verso}. This value will be used
+when formatting citations.
+
+Use this field also for manuscript folio numbers. E.g., \enquote{3\cs{verso}--5\cs{recto}}.
-\fielditem{pagetotal}{integer} the number of pages in the manuscript.
+\fielditem{pagetotal}{integer} the number of pages or folios in the manuscript.
-\fielditem{pagination}{key} the pagination of part of manuscript which is studied. The standard pagination key are allowed, but the package add a new key: \verb+folio+.
+\fielditem{pagination}{key} the pagination of part of manuscript which is studied.
+The standard pagination keys are allowed, but the package adds a new key:
+\verb+folio+. This value will control the formatting the
+$\langle$\emph{postnote}$rangle$ argument of a citation command (see the
+\biblatex manual for details).
\fielditem{shorthand}{literal} the shorthand of the manuscript. If this field is empty, the entry key will be used as shorthand, except if the version \opt{manuscript-noautoshorthand} is loaded. See \secref{noautoshorthand}.
-\fielditem{support}{key} the support of the manuscript, which will be translated in your work language. These keys are defined: \texttt{papyrus}, \texttt{paper}, \texttt{pergament}.
+\listitem{script}{key or literal} the script, i.e. the \emph{writing system} of the
+manuscript (for example Devanāgarī, Śāradā, Cyrillic).
+ You can use or a key-value system, or just use literal value. No default keys are defined.
+ To define your own key, see \secref{key-definition}.
+
+ \fielditem{support}{key or literal} the support of the manuscript, which will be translated into your work language. These keys are defined: \begin{itemize}
+ \item \texttt{birch-bark};
+ \item \texttt{palm-leaf};
+ \item \texttt{papyrus};
+ \item \texttt{paper};
+ \item \texttt{parchment}.\footnote{Historically,
+ the keyword was \texttt{pergament}, which is kept only for ascendant compatibility.}
+\end{itemize}
+ To define your own key, see \secref{key-definition}.
\end{fieldlist}
\subsection{Special}\label{fields:special}
There are also two special fields, which are printed only if we ask for them explicitly:
\begin{fieldlist}
-\fielditem{annotation}{literal} some annotation about the manuscript and its content. If you want to add paragraphs inside it, you must use the \cs{par} command between each paragraph.
+\fielditem{annotation}{literal} some annotation about the manuscript and its contents. If you want to add paragraphs inside it, you must use the \cs{par} command between each paragraph.
\fielditem{catalog}{special} a list of catalogues which describe the manuscript. You must fill this field with arguments of a \cs{cites} command. For example:
@@ -127,6 +168,11 @@ There are also two special fields, which are printed only if we ask for them exp
catalog = {[prenote1][postnote1]{key1}[prenote2][postnote2]{key2}}
\end{minted}
+\fielditem{content}{literal} description of the manuscript's content, can be used
+with or instead of \bibfield{annotation}. It starts a new block into the description
+output. If you want to add paragraphs inside it, you must use the \cs{par}
+command between each paragraph. E.g., ``Covers chapters 1--3 only.''
+
\fielditem{origin}{list} the places where the manuscript was written.
@@ -245,6 +291,30 @@ If you need more sorting scheme, please contact us, we could integrate them easi
\section{Customization}
+\subsection{Create your own keys}\label{key-definition}
+
+The \bibfield{support} and \bibfield{script} fields can contains either literal string, either key that \biblatex will transform to a value.
+
+That use only standard \biblatex localization string.
+
+To define your owns key, add into your preamble:
+\begin{minted}{tex}
+ \NewBibliographyString{<key1>}
+ \NewBibliographyString{<key2>}
+ …
+ \NewBibliographyString{<keyn>}
+ \DefineBibliographyStrings{%
+ <key1> = {<value1},
+ <key2> = {<value2>},
+ …,
+ <keyn> = {<valuen>}
+ }
+
+\end{minted}
+
+Where \meta{key1}, \meta{key2} \ldots\ \meta{keyn} must be replaced by the keys, and \meta{value1}, \meta{value2} \ldots\ \meta{valuen} by the value.
+
+
\subsection{Commands}
You can redefine, with \cs{renewcommand} some commands defined in \file{manuscripts.bbx}. The commands starting with \cs{mk...} take one argument, the other take no argument. In these command, use the punctuation commands of \biblatex.
@@ -264,7 +334,10 @@ You can redefine, with \cs{renewcommand} some commands defined in \file{manuscri
\csitem{mklocation} the way the \bibfield{location} is printed. By default, with the command \cs{mkbibnamefamily}.
-\csitem{mkmanuscriptdescriptionlabel} the way the label are printed before the special field. By default, in bold, following with \cs{manuscriptdescriptionlabelpunct}.
+\csitem{mkmanuscriptdescriptionlabel} the way the label are printed before the special fields. By default, in bold, followed with \cs{manuscriptdescriptionlabelpunct}.
+
+\csitem{mkmanuscriptdescriptionlabel} the way the label are printed before the special fields which can contains paragraph (e.g. \bibfield{content}.
+B default, in bold, followed with \cs{par}.
\csitem{mkshcite} the way the shorthand is printed when using \cs{shcite}. By default, no special formatting.
@@ -293,11 +366,38 @@ The \file{manuscripts-shared.bbx} file defines bibmacros and field formats (read
To use this package with the features of \verb+biblatex-realauthor+, you must use the package \verb+biblatex-multiple-dm+.
-
+\section{Migration to v.2.0.0}
+
+The version 2.0.0 adds some modification which could require modifications in your own customization.
+
+\begin{enumerate}
+ \item We have decided to prefix all bibmacros concerning manuscript with \verb+manuscript:+.
+ If you have redefined one of the following macros, or if you have created your own macros which call them, you should adapt your code:
+ \begin{itemize}
+ \item \verb+annotation+;
+ \item \verb+catalog+;
+ \item \verb|collection+shelfmark|;
+ \item \verb+date/dating+;
+ \item \verb|more+annotation+catalog|;
+ \end{itemize}
+ \item The \verb|support+dating| does not exist anymore.
+ \item Now, the annotation field is introduced with a label.
+ If you don't want this label, add into your preamble/custom style:
+ \begin{minted}{tex}
+ \DeclareFieldFormat{annotation}{#1}
+ \end{minted}
+\end{enumerate}
\section{Change history}
\begin{changelog}
+\begin{release}{2.0.0}{2018-09-19}
+ \item Add \bibfield{contents} and \bibfield{script} fields.
+ \item Add new support types.
+ \item Improve handbook (thanks to Dominik Wujastyk).
+ \item Really add italian translation.
+\end{release}
+
\begin{release}{1.12.3}{2017-11-26}
\item Add compatibility with biblatex 3.8.
\end{release}
diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile
index 9e988010666..b7ed3443094 100644
--- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile
+++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile
@@ -4,7 +4,7 @@ FILES = *.bbx *.dbx *.lbx documentation makefile README
dist: all
rm -rf biblatex-manuscripts-philology
mkdir biblatex-manuscripts-philology
- ln README *bbx *dbx *lbx *makefile biblatex-manuscripts-philology
+ ln README *sty *bbx *dbx *lbx *makefile biblatex-manuscripts-philology
mkdir biblatex-manuscripts-philology/documentation
ln documentation/*tex documentation/*bib documentation/*pdf documentation/makefile biblatex-manuscripts-philology/documentation
$(RM) ../biblatex-manuscripts-philology.zip
@@ -16,4 +16,4 @@ clean:
@$(RM) *.pdf *.toc *.aux *.out *.fdb_latexmk *.log *.bbl *.bcf *.blg *run.xml *.synctex.gz*
all: documentation/biblatex-manuscripts-philology-example.tex documentation/biblatex-manuscripts-philology.tex documentation/biblatex-manuscripts-philology-example.bib
- $(MAKE) -C documentation all \ No newline at end of file
+ $(MAKE) -C documentation all
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx
index 087f066abf8..82a2b93671e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx
@@ -12,30 +12,19 @@
%
% The Current Maintainer of this work is Maïeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{english-manuscripts.lbx}[2017/11/26 v1.12.3 manuscripts biblatex localisation]%
+\ProvidesFile{english-manuscripts.lbx}[2018/09/19 v2.0.0 manuscripts biblatex localisation]%
\InheritBibliographyStrings{english}
\InheritBibliographyExtras{english}
-\NewBibliographyString{1column}
-\NewBibliographyString{2column}
-\NewBibliographyString{catalog}
-\NewBibliographyString{folio}
-\NewBibliographyString{folios}
-\NewBibliographyString{foliototal}
-\NewBibliographyString{foliototals}
-\NewBibliographyString{inflayer}
-\NewBibliographyString{suplayer}
-\NewBibliographyString{origin}
-\NewBibliographyString{owner}
-\NewBibliographyString{paper}
-\NewBibliographyString{papyrus}
-\NewBibliographyString{pergament}
-\NewBibliographyString{scribe}
+\RequirePackage{manuscripts-NewBibliographyString}
\DeclareBibliographyStrings{%
1column = {{one column}{1\addnbspace col\adddot}},
2column = {{two columns}{2\addnbspace col\adddot}},
+ annotation = {{remarks}{remarks}},
+ birch-bark = {{birch bark}{bich bark}},
catalog = {{catalog}{cat\adddot}},
+ contents = {{contents}{contents}},
folio = {{folio}{f\adddot}},
folios = {{folios}{ff\adddot}},
foliototal = {{folio}{f\adddot}},
@@ -44,9 +33,11 @@
suplayer = {{superior layer}{sup\adddotspace lay\adddot}},
origin = {{origin}{orig\adddot}},
owner = {{owner}{own\adddot}},
+ palm-leaf = {{palm leaf}{palm leaf}},
paper = {{paper}{pap\adddot}},
papyrus = {{papyrus}{papy\adddot}},
- pergament = {{pergament}{perg\adddot}},
+ parchment = {{parchment}{perch\adddot}},
+ pergament = {{parchment}{perch\adddot}},%% Kept for ascendant compatibility, cf. https://github.com/maieul/biblatex-manuscripts-philology/issues/6
scribe = {{scribe}{scr\adddot}}
}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx
index 62dde5d3295..7ca5c792663 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx
@@ -12,30 +12,19 @@
%
% The Current Maintainer of this work is Maïeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{french-manuscripts.lbx}[2017/11/26 v1.12.3 manuscripts biblatex localisation]%
+\ProvidesFile{french-manuscripts.lbx}[2018/09/19 v2.0.0 manuscripts biblatex localisation]%
\InheritBibliographyStrings{french}
\InheritBibliographyExtras{french}
-\NewBibliographyString{1column}
-\NewBibliographyString{2column}
-\NewBibliographyString{catalog}
-\NewBibliographyString{folio}
-\NewBibliographyString{folios}
-\NewBibliographyString{foliototal}
-\NewBibliographyString{foliototals}
-\NewBibliographyString{inflayer}
-\NewBibliographyString{suplayer}
-\NewBibliographyString{origin}
-\NewBibliographyString{owner}
-\NewBibliographyString{paper}
-\NewBibliographyString{papyrus}
-\NewBibliographyString{pergament}
-\NewBibliographyString{scribe}
+\RequirePackage{manuscripts-NewBibliographyString}
\DeclareBibliographyStrings{%
1column = {{une colonne}{1\addnbspace col\adddot}},
2column = {{deux colonnes}{2\addnbspace col\adddot}},
+ annotation = {{remarques}{rem\adddot}},
+ birch-bark = {{écorce de bouleau}{éc.\addotspace de boul\adddot}},
catalog = {{catalogue}{cat\adddot}},
+ contents = {{contenu}{contenu}},
folio = {{folio}{f\adddot}},
folios = {{folios}{f\adddot}},
foliototal = {{folio}{f\adddot}},
@@ -44,9 +33,11 @@
suplayer = {{couche supérieure}{c\adddotspace sup\adddot}},
origin = {{origine}{orig\adddot}},
owner = {{posseseur}{poss\adddot}},
+ palm-leaf = {{feuille de palmier}{f\adddotspace de pal\adddotspace}},
paper = {{papier}{pap\adddot}},
papyrus = {{papyrus}{papy\adddot}},
- pergament = {{parchemin}{parch\adddot}},
+ parchment = {{parchemin}{parch\adddot}},
+ pergament = {{parchemin}{parch\adddot}},% Kept for ascendant compatibility, cf. https://github.com/maieul/biblatex-manuscripts-philology/issues/6
scribe = {{scribe}{scr\adddot}}
}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx
index e8c5b2bec5c..a1f02db1371 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx
@@ -12,41 +12,32 @@
%
% The Current Maintainer of this work is Maïeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{italian-manuscripts.lbx}[2017/11/26 v1.12.3 manuscripts biblatex localisation]%
+\ProvidesFile{italian-manuscripts.lbx}[2018/09/19 v2.0.0 manuscripts biblatex localisation]%
\InheritBibliographyStrings{italian}
\InheritBibliographyExtras{italian}
-\NewBibliographyString{1column}
-\NewBibliographyString{2column}
-\NewBibliographyString{catalog}
-\NewBibliographyString{folio}
-\NewBibliographyString{folios}
-\NewBibliographyString{foliototal}
-\NewBibliographyString{foliototals}
-\NewBibliographyString{inflayer}
-\NewBibliographyString{suplayer}
-\NewBibliographyString{origin}
-\NewBibliographyString{owner}
-\NewBibliographyString{paper}
-\NewBibliographyString{papyrus}
-\NewBibliographyString{pergament}
-\NewBibliographyString{scribe}
+\RequirePackage{manuscripts-NewBibliographyString}
\DeclareBibliographyStrings{%
1column = {{una colonna}{1\addnbspace col\adddot}},
2column = {{due colonne}{2\addnbspace col\adddot}},
+ annotation = {{osservazioni}{osservazioni}},
+ birch-bark = {{corteccia di betulla}{corteccia di betulla}},
catalog = {{catalogo}{cat\adddot}},
- folio = {{folio}{f\adddot}},
- folios = {{folios}{ff\adddot}},
- foliototal = {{folio}{f\adddot}},
- foliototals = {{folios}{f\adddot}},
- inflayer = {{scrittura inferiore}{script\adddotspace inf\adddot}},
- suplayer = {{scrittura superiore}{script\adddotspace sup\adddot}},
+ contents = {{contenuto}{contenuto}},
+ folio = {{foglio}{f\adddot}},
+ folios = {{fogli}{ff\adddot}},
+ foliototal = {{foglio}{f\adddot}},
+ foliototals = {{fogli}{f\adddot}},
+ inflayer = {{scrittura inferiore}{scritt\adddotspace inf\adddot}},
+ suplayer = {{scrittura superiore}{scritt\adddotspace sup\adddot}},
origin = {{origine}{orig\adddot}},
owner = {{possessore}{poss\adddot}},
- paper = {{carta}{chart\adddot}},
+ palm-leaf = {{foglia di palma}{f\adddotspace di palma}},
+ paper = {{carta}{cart\adddot}},
papyrus = {{papiro}{pap\adddot}},
- pergament = {{pergamena}{membr\adddot}},
+ parchment = {{pergamena}{perg\adddot}},
+ pergament = {{pergamena}{perg\adddot}},% Kept for ascendant compatibility, cf. https://github.com/maieul/biblatex-manuscripts-philology/issues/6
scribe = {{scriba}{scr\adddot}}
}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-NewBibliographyString.sty b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-NewBibliographyString.sty
new file mode 100644
index 00000000000..9edd170fdfe
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-NewBibliographyString.sty
@@ -0,0 +1,23 @@
+\ProvidesFile{manuscript-NewBibliographyString.sty}[2017/11/26 v1.12.3 manuscripts biblatex declaration of localisation string]%
+
+
+\NewBibliographyString{1column}
+\NewBibliographyString{2column}
+\NewBibliographyString{annotation}
+\NewBibliographyString{birch-bark}
+\NewBibliographyString{catalog}
+\NewBibliographyString{contents}
+\NewBibliographyString{folio}
+\NewBibliographyString{folios}
+\NewBibliographyString{foliototal}
+\NewBibliographyString{foliototals}
+\NewBibliographyString{inflayer}
+\NewBibliographyString{suplayer}
+\NewBibliographyString{origin}
+\NewBibliographyString{owner}
+\NewBibliographyString{palm-leaf}
+\NewBibliographyString{paper}
+\NewBibliographyString{papyrus}
+\NewBibliographyString{parchment}
+\NewBibliographyString{pergament}
+\NewBibliographyString{scribe}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx
index 51e621c9bc1..ebd7195fffc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx
@@ -13,7 +13,7 @@
% The Current Maintainer of this work is Maïeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
\ProvidesFile{manuscripts-noautoshorthand.bbx}
-[2017/11/26 v1.12.3 biblatex bibliography style (MR)]%
+[2018/09/19 v2.0.0 biblatex bibliography style (MR)]%
\RequireBibliographyStyle{manuscripts-shared}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx
index 043382f749a..9140588e670 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx
@@ -13,5 +13,5 @@
% The Current Maintainer of this work is Maïeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
\ProvidesFile{manuscripts-noautoshorthand.dbx}
-[2017/11/26 v1.12.3 biblatex bibliography style (MR)]
+[2018/09/19 v2.0.0 biblatex bibliography style (MR)]
\blx@inputonce{manuscripts-shared.dbx}{}{}{}{}{}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx
index 412c448e333..20f284f9c2c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx
@@ -14,7 +14,7 @@
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
\ProvidesFile{manuscripts-commons}
-[2017/11/26 1.12.3 biblatex bibliography style (MR)]%
+[2018/09/19 2.0.0 biblatex bibliography style (MR)]%
\ifdef{\biblatexmultipledm@bibstyle}
{\RequireBibliographyStyle{\biblatexmultipledm@bibstyle}}
@@ -37,6 +37,7 @@
\newcommand{\mkcolumnslayer}[1]{\addspace\mkbibparens{#1}}%
\newcommand{\mklocation}[1]{\mkbibnamefamily{#1}}
\newcommand{\mkmanuscriptdescriptionlabel}[1]{\textbf{#1}\manuscriptdescriptionlabelpunct}
+\newcommand{\mkmanuscriptdescriptionlabelparagraphed}[1]{\textbf{#1}\par}
\newcommand{\mkshcite}[1]{#1}
\newcommand{\locationlibrarypunct}{\addcolon\addspace}
@@ -54,10 +55,13 @@
% 2. Some macros
-\newbibmacro{annotation}{%
- \iffieldundef{annotation}{}{\printfield{annotation}}
+\newbibmacro{manuscript:annotation}{%
+ \printfield{annotation}%
}
+\newbibmacro{manuscript:contents}{%
+ \printfield{contents}%
+}%
\newbibmacro{manuscript:more}{%
\printlist{origin}%
\setunit*{\moreinterpunct}%
@@ -65,23 +69,24 @@
\setunit*{\moreinterpunct}%
\printnames{owner}%
}
-\newbibmacro{more+annotation+catalog}{%
+\newbibmacro{manuscript:more+annotation+catalog}{%
\iftoggle{shorthand:details}{%
\setunit{\finentrypunct\par}%
\usebibmacro{manuscript:more}%
\setunit{\finentrypunct\par}%
- \usebibmacro{annotation}%
+ \usebibmacro{manuscript:contents}%
+ \setunit{\finentrypunct\par}%
+ \usebibmacro{manuscript:annotation}%
\setunit{\finentrypunct\par}%
- \usebibmacro{catalog}%
+ \usebibmacro{manuscript:catalog}%
}{}%
}
-\newbibmacro{catalog}{%
- \iffieldundef{catalog}{}%
- {\printfield{catalog}}%
+\newbibmacro{manuscript:catalog}{%
+ \printfield{catalog}%
}
-\newbibmacro{collection+shelfmark}{%
+\newbibmacro{manuscript:collection+shelfmark}{%
\printtext[collection+shelfmark]{%
\printfield{collection}%
\setunit*{\collectionshelfmarkpunct}%
@@ -89,7 +94,7 @@
}%
}
-\newbibmacro{date/dating}{%
+\newbibmacro{manuscript:date/dating}{%
\iffieldundef{dating}{\usebibmacro{date}}
{\printfield{dating}}%
}
@@ -99,7 +104,7 @@
\setunit{\locationlibrarypunct}%
\printfield{library}%
\setunit{\librarycollectionpunct}%
- \usebibmacro{collection+shelfmark}%
+ \usebibmacro{manuscript:collection+shelfmark}%
}
\newbibmacro{manuscript:pages}{%
@@ -138,11 +143,6 @@
\iffieldundef{layer}{}{\bibstring[\mklayer]{\strfield{layer}layer}}%
}%
-\newbibmacro{support+dating}{%
- \printfield{support}%
- \newunit%
- \usebibmacro{date/dating}%
- }
% 3. Some Field or List Format
\DeclareFieldFormat{catalog}{%
@@ -155,7 +155,13 @@
\DeclareFieldFormat{columns+layer}{\mkcolumnslayer{#1}}%
\DeclareFieldFormat{dating}{#1\isdot}%
-\DeclareFieldFormat{support}{\bibstring{#1}}%
+\DeclareFieldFormat{support}{\ifbibstring{#1}{\bibstring{#1}}{#1}}%
+\DeclareListFormat[]{script}{%
+ \ifnumgreater{\value{listcount}}{\value{liststart}}%
+ {\multilistdelim}%
+ {}%
+ \ifbibstring{#1}{\bibstring{#1}}{#1}%
+}%
\DeclareNameFormat{manuscript}{%
\nameparts{#1}%
@@ -180,6 +186,13 @@
#1%
}
+\DeclareFieldFormat{manuscript:paragraphedfield}{%
+ \bibstring[\mkmanuscriptdescriptionlabelparagraphed]{\currentfield}%
+ #1%
+}%
+\DeclareFieldAlias{contents}{manuscript:paragraphedfield}%
+\DeclareFieldAlias{annotation}{manuscript:paragraphedfield}%
+
% 4. Printshorthands Environment
\newtoggle{shorthand:details}
@@ -211,7 +224,11 @@
\newunit\newblock
\printfield{note}%
\newunit\newblock%
- \usebibmacro{support+dating}%
+ \printfield{support}%
+ \newunit%
+ \printlist{script}%
+ \newunit%
+ \usebibmacro{manuscript:date/dating}%
\setunit{\datingpagespunct}%
\usebibmacro{manuscript:pages}%
\iftoggle{bbx:related}%
@@ -223,7 +240,7 @@
\iftoggle{bbx:url}%
{\usebibmacro{url+urldate}}%
{}%
- \usebibmacro{more+annotation+catalog}%
+ \usebibmacro{manuscript:more+annotation+catalog}%
\usebibmacro{finentry}%
}
@@ -237,11 +254,11 @@
\newunit\newblock%
\printfield{note}%
\newunit\newblock%
- \usebibmacro{support+dating}%
+ \usebibmacro{manuscript:support+dating}%
\newunit\newblock%
\setunit{\datingpagespunct}%
\usebibmacro{manuscript:pages}%
- \usebibmacro{more+annotation+catalog}%
+ \usebibmacro{manuscript:more+annotation+catalog}%
\usebibmacro{finentry}%
}
@@ -263,6 +280,7 @@
\DeclareLanguageMapping{english}{english-manuscripts}
\DeclareLanguageMapping{french}{french-manuscripts}
+\DeclareLanguageMapping{italian}{italian-manuscripts}
% 5.5 bibcheck
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx
index 2f0cbf6d6a0..4b53e0cdcb4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx
@@ -13,10 +13,45 @@
% The Current Maintainer of this work is Maïeul Rouquette
% This work consists of the files manuscripts.dbx, manuscripts.bbx, french-manuscripts.lbx and english-manuscripts.lbx
\ProvidesFile{manuscripts-shared.dbx}%
-[2017/11/26 v1.12.3 biblatex bibliography style (MR)]%
+[2018/09/19 v2.0.0 biblatex bibliography style (MR)]%
\DeclareDatamodelEntrytypes{manuscript}
-\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,sortshelfmark,support,columns,layer}
-\DeclareDatamodelFields[type=list,datatype=name]{scribe,owner}
-\DeclareDatamodelFields[type=list,datatype=literal]{origin}
-\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,shortcollection,columns,languages, collection,usualtitle,shelfmark,sortshelfmark,support,columns,origin,scribe,owner}
+\DeclareDatamodelFields[type=field,datatype=literal]{%
+ catalog,
+ dating,
+ shortlibrary,
+ columns,
+ collection,
+ shortcollection,
+ usualtitle,
+ shelfmark,
+ sortshelfmark,
+ support,
+ columns,
+ layer,
+ contents}
+\DeclareDatamodelFields[type=list,datatype=name]{%
+ scribe,
+ owner}
+\DeclareDatamodelFields[type=list,datatype=literal]{%
+ script,
+ origin}
+\DeclareDatamodelEntryfields[manuscript]{%
+ catalog,
+ dating,
+ shortlibrary,
+ shortcollection,
+ columns,
+ languages,
+ collection,
+ usualtitle,
+ shelfmark,
+ sortshelfmark,
+ script,
+ support,
+ columns,
+ layer,
+ contents,
+ origin,
+ scribe,
+ owner}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx
index 0e6f0bb84ed..e36bcb436ed 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx
@@ -13,7 +13,7 @@
% The Current Maintainer of this work is Maïeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
\ProvidesFile{manuscripts.bbx}%
-[2017/11/19 v1.12.3 biblatex bibliography style (MR)]%
+[2018/09/19 v2.0.0 biblatex bibliography style (MR)]%
\RequireBibliographyStyle{manuscripts-shared}
diff --git a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx
index 5cb30bdfa8e..48893d6a1cb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx
@@ -13,5 +13,5 @@
% The Current Maintainer of this work is Maïeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
\ProvidesFile{manuscripts.dbx}
-[2017/11/26 v1.12.3 biblatex bibliography style (MR)]
+[2018/09/19 v2.0.0 biblatex bibliography style (MR)]
\blx@inputonce{manuscripts-shared.dbx}{}{}{}{}{}