diff options
13 files changed, 52 insertions, 35 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf Binary files differindex 279530637b4..2f1ac2c44d9 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex index 5a87f70b9c1..a716a9faaab 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex @@ -24,8 +24,8 @@ subtitle={New data types}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={2.3.1}, - date={19/11/2017}, + revision={2.3.2}, + date={20/01/2020}, url={https://github.com/maieul/biblatex-bookinarticle}} % biblatex @@ -48,19 +48,19 @@ \section{Introduction} \subsection{Aim} -The default \biblatex's styles provide an entry type called \bibtype{bookinbook}. -However, it can happen, especially in classical philology, that a book is edited in other entry type. +The default \biblatex's styles provide an entry type called \bibtype{bookinbook}. +However, it can happen, especially in classical philology, that a book is edited in other entry type. For example a book can be edited in article, in proceedings, in a thesis etc. This package provides new bibliographic entry types. \subsection{History} -Originally, the package was called \pkg{biblatex-bookinarticle}, because it provided only a new \bibtype{bookinarticle} entry type. -However, many new types were added. +Originally, the package was called \pkg{biblatex-bookinarticle}, because it provided only a new \bibtype{bookinarticle} entry type. +However, many new types were added. Changing the name was required, and when the loading's way has changed, a good occasion happened. \subsection{Credits} -This package was created for Maïeul Rouquette's phd dissertation\footnote{\url{http://apocryphes.hypothese.org}.} in 2014. It is licensed on the \emph{\LaTeX\ Project Public License}\footnote{\url{http://latex-project.org/lppl/lppl-1-3c.html}.}. +This package was created for Maïeul Rouquette's phd dissertation\footnote{\url{http://apocryphes.hypothese.org}.} in 2014. It is licensed on the \emph{\LaTeX\ Project Public License}\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-bookinarticle/issues}.}. @@ -70,9 +70,9 @@ All issues can be submitted, in French or English, in the GitHub issues page\foo The package provides: \begin{itemize} - \item New entry types. - \item Inheritance's mechanism for these entry types. - \item Integration of the entry types following the standard bibliography's styles of biblatex. + \item New entry types. + \item Inheritance's mechanism for these entry types. + \item Integration of the entry types following the standard bibliography's styles of biblatex. \item Integration of the new fields of the \pkg{biblatex-morenames} package. \item New fields when required and not defined in \pkg{biblatex-morenames} package. \end{itemize} @@ -81,10 +81,10 @@ The package provides: \section{Loading package} The package requires \emph{biblatex} 3.4 or later. - + As the package defines new fields, you must load it as a \verb+bibstyle+ option of \biblatex package. - + \begin{minted}{latex} \usepackage[citestyle=yourcitationstyle,bibstyle=bookinother]{biblatex} \end{minted} @@ -92,9 +92,9 @@ As the package defines new fields, you must load it as a \verb+bibstyle+ option Notes that the \namebibstyle{bookinother} bibliography's style automatically loads \namebibstyle{verbose} bibliography's style, which means it is compatible with all the \emph{verbose-xxx} and \namebibstyle{authortitle-xxx} bibliography's styles of \biblatex, because all of them are identical to the \namebibstyle{verbose} \textbf{bibliography style}. Hoewever, if you want to use an other bibliography's style, you can use the \pkg{biblatex-multiple-dm} package, but the uniformity can't be assured. - + In any case, you can choose your own \textbf{citation style}. - + \label{morenames}If you need to use this package with package which also requires loading \emph{via} the \verb+bibstyle+ option, as for example \pkg{biblatex-morenames}, just use the \pkg{biblatex-multiple-dm} package, in the following way: \begin{minted}{latex} @@ -116,14 +116,14 @@ If you want to use this package with \namebibstyle{alphabetic-xxx} or \namebibst The package provides new entry types in the form of \bibtype{bookin\meta{othertype}}. The best way to manage these entry types is to use the crossref mechanism of biber. - So the \bibfield{crossref} field of a \bibtype{bookin\meta{othertype}} entry should refers to the main \bibtype{\meta{othertype}} entry. + So the \bibfield{crossref} field of a \bibtype{bookin\meta{othertype}} entry should refers to the main \bibtype{\meta{othertype}} entry. The package also provides new \bibtype{in\meta{othertype}} entry types. The only differences with the \bibtype{bookin\meta{othertype}} entry types is that the \bibfield{title} is, with standard styles, printed in roman font and wrapped in quotation marks. - + \subsection{Fields} -In the following parts of this handbook, we will describe, for each entry type, the fields inheritance mechanism. +In the following parts of this handbook, we will describe, for each entry type, the fields inheritance mechanism. Here is a list of fields which are NOT inherited : \begin{itemize} @@ -131,17 +131,17 @@ Here is a list of fields which are NOT inherited : \item \bibfield{bookineditor} means the editor of the edited (ancient) book. If this field is equal to the \bibfield{editor} field, the last one is not printed. \item \bibfield{title} means the title of the edited (ancient) book. \item \bibfield{subtitle} means the subtitle of the edited (ancient) book. - + \end{itemize} If you use the \bibfield{ineditor} field of the \pkg{biblatex-morenames} package, it will be inherited as \bibfield{bookeditor} field. Note that the package takes account of the \bibfield{maineditor} field of the \pkg{biblatex-morenames} package, if loaded. -Also note that the \bibfield{bookineditor} field is not added in the style of the \bibtype{bookinbook} entry type, because that is a standard \biblatex\ entry type. +Also note that the \bibfield{bookineditor} field is not added in the style of the \bibtype{bookinbook} entry type, because that is a standard \biblatex\ entry type. Use the \pkg{biblatex-morenames} package to add this field to the style of \bibtype{bookinbook}. - - + + % Here, a loop on the entry type, to automatically generate the handbook \def\firstofthree#1#2#3{#1} @@ -155,9 +155,9 @@ Use the \pkg{biblatex-morenames} package to add this field to the style of \bibt \subsubsection{Meaning} For book edited in a \bibtype{\entrytype} entry. \subsubsection{.bib example} - + \inputminted[breaklines]{latex}{example-bookin\entrytype.bib} - + \subsubsection{Fields inheritance} The graph~\ref{example-bookin\entrytype} shows the fields inheritance. \begin{figure} @@ -165,12 +165,12 @@ Use the \pkg{biblatex-morenames} package to add this field to the style of \bibt \includegraphics[height=0.9\textheight]{example-bookin\entrytype.pdf} \label{example-bookin\entrytype} \caption{Inheritance related to the \bibtype{bookin\entrytype} entry type} - \end{figure} + \end{figure} \subsubsection{Output example} \begin{quotation} \cite{\entrykey} \end{quotation} - \entrymore + \entrymore } % For each entry of the csvlist: @@ -221,6 +221,9 @@ The ways new entry types are printed are derived from the \verb+standard.bbx+ bi \begin{changelog} +\begin{release}{2.3.2}{2020-12-20} + \item Declare correctly the new entrytypes to Biber. +\end{release} \begin{release}{2.3.1}{2017-11-19} \item Fix volume format for \bibtype{bookinjournal} type. \end{release} diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf Binary files differindex c2242b9b6eb..cce51ac30ac 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf Binary files differindex 103429b1504..e26357a8a1a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf Binary files differindex d97de7e6c3b..1b902c62248 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf Binary files differindex fd7c24f29f5..539b094c707 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf Binary files differindex e49d3231a3c..2d3dc6897b6 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf Binary files differindex cac6d3f6110..a5905dedbdb 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf Binary files differindex d686d638a7d..c26afe3567b 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf Binary files differindex b5544d14b46..c8d964ee4b2 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf Binary files differindex 6dc2de37f2f..3ea21cbd4ab 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf diff --git a/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.bbx b/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.bbx index 37776840373..ecb1218b8e3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.bbx @@ -9,12 +9,12 @@ % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. -% +% % The Current Maintainer of this work is Maïeul Rouquette %0. Preamble \ProvidesFile{bookinother.bbx} -[2017/11/19 v2.3.1 biblatex bibliography style to have entry type for book edited in other entry type (MR)] +[2020/01/20 v2.3.2 biblatex bibliography style to have entry type for book edited in other entry type (MR)] \RequireBiber \RequirePackage{xpatch} @@ -62,7 +62,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} - + \DeclareBibliographyDriver{ininarticle}{% \usebibmacro{bibindex}% @@ -106,7 +106,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} - + \DeclareBibliographyDriver{ininbook}{% @@ -242,7 +242,7 @@ \newunit \usebibmacro{bybookineditor}% \newunit\newblock - \usebibmacro{in:}% + \usebibmacro{in:}% \usebibmacro{bybookauthor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{booktitle}% @@ -417,7 +417,7 @@ {}% } {} - {\bookinother@patch@failed{article}} + {\bookinother@patch@failed{article}} @@ -491,7 +491,7 @@ % 5. Inheritance \DeclareDataInheritance{article}{bookinarticle,inarticle}{ - \inherit{author}{bookauthor}% + \inherit{author}{bookauthor}% \inherit{ineditor}{bookeditor}% \inherit{title}{maintitle}% \inherit{subtitle}{mainsubtitle}% @@ -550,7 +550,7 @@ } \DeclareDataInheritance{thesis,phdthesis,mathesis}{bookinthesis,inthesis,inphdthesis,inmathesis,bookinphdthesis,bookinmathesis}{ - \inherit{author}{bookauthor}% + \inherit{author}{bookauthor}% \inherit{title}{booktitle}% \inherit{titleaddon}{booktitleaddon}% \inherit{subtitle}{booksubtitle}% diff --git a/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.dbx b/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.dbx index 77556e5359f..82ad22c3b2a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-bookinother/bookinother.dbx @@ -9,11 +9,25 @@ % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. -% +% % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files realauthor.dbx, realauthor.bbx \ProvidesFile{bookinother.dbx} -[2017/11/19 v2.3.1 biblatex bibliography style to have entry type for book edited in other entry type (MR)] +[2020/01/20 v2.3.2 biblatex bibliography style to have entry type for book edited in other entry type (MR)] + +%0. New entrytypes +\DeclareDatamodelEntrytypes{ + bookinarticle, + inarticle, + bookinthesis, bookinmathesis, bookinphdthesis, + inthesis, inmathesis, inphdthesis, + bookincollection, bookinproceedings, bookinreference, + bookinincollection, bookininproceedings, bookininreference, + inincollection, ininproceedings, ininreference, + bookinjournal, + ininbook, bookininbook, + ininarticle, bookininarticle, +} %1. New fields |