diff options
Diffstat (limited to 'Master')
8 files changed, 246 insertions, 67 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/README b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/README index c6b90f5799b..6b338aab7cf 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/README +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/README @@ -1,4 +1,4 @@ biblatex-bookinarticle ====================== -New biblatex type for old book edited in article : @bookinarticle and @bookinincollection. +New biblatex types for old books edited in article : @bookinarticle, @bookinincollection, @bookinthesis. diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle-crossref.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle-crossref.pdf Binary files differindex 7f3057a12e8..8303a4c9ad7 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle-crossref.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle-crossref.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.dot b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.dot index e3f0e6242ff..d0a9798b806 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.dot +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.dot @@ -8,20 +8,6 @@ digraph Biberdata { style=filled, shape=box ]; - subgraph "cluster_section0/Griggio2008" { - fontsize="10"; - label="Griggio2008 (COLLECTION)"; - tooltip="Griggio2008 (COLLECTION)"; - fillcolor="#deefff"; - - "section0/Griggio2008/editor" [ label="EDITOR" ] - "section0/Griggio2008/location" [ label="LOCATION" ] - "section0/Griggio2008/publisher" [ label="PUBLISHER" ] - "section0/Griggio2008/subtitle" [ label="SUBTITLE" ] - "section0/Griggio2008/title" [ label="TITLE" ] - "section0/Griggio2008/year" [ label="YEAR" ] - } - subgraph "cluster_section0/AcTiteLatin" { fontsize="10"; label="AcTiteLatin (BOOKININCOLLECTION)"; @@ -41,6 +27,49 @@ digraph Biberdata { "section0/AcTiteLatin/year" [ label="YEAR" ] } + subgraph "cluster_section0/phd:2015" { + fontsize="10"; + label="phd:2015 (THESIS)"; + tooltip="phd:2015 (THESIS)"; + fillcolor="#deefff"; + + "section0/phd:2015/author" [ label="AUTHOR" ] + "section0/phd:2015/institution" [ label="INSTITUTION" ] + "section0/phd:2015/subtitle" [ label="SUBTITLE" ] + "section0/phd:2015/title" [ label="TITLE" ] + "section0/phd:2015/type" [ label="TYPE" ] + "section0/phd:2015/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/VanDeun1990" { + fontsize="10"; + label="VanDeun1990 (ARTICLE)"; + tooltip="VanDeun1990 (ARTICLE)"; + fillcolor="#deefff"; + + "section0/VanDeun1990/author" [ label="AUTHOR" ] + "section0/VanDeun1990/journaltitle" [ label="JOURNALTITLE" ] + "section0/VanDeun1990/number" [ label="NUMBER" ] + "section0/VanDeun1990/pages" [ label="PAGES" ] + "section0/VanDeun1990/subtitle" [ label="SUBTITLE" ] + "section0/VanDeun1990/title" [ label="TITLE" ] + "section0/VanDeun1990/year" [ label="YEAR" ] + } + + subgraph "cluster_section0/Griggio2008" { + fontsize="10"; + label="Griggio2008 (COLLECTION)"; + tooltip="Griggio2008 (COLLECTION)"; + fillcolor="#deefff"; + + "section0/Griggio2008/editor" [ label="EDITOR" ] + "section0/Griggio2008/location" [ label="LOCATION" ] + "section0/Griggio2008/publisher" [ label="PUBLISHER" ] + "section0/Griggio2008/subtitle" [ label="SUBTITLE" ] + "section0/Griggio2008/title" [ label="TITLE" ] + "section0/Griggio2008/year" [ label="YEAR" ] + } + subgraph "cluster_section0/Chiesa2008" { fontsize="10"; label="Chiesa2008 (INCOLLECTION)"; @@ -59,6 +88,24 @@ digraph Biberdata { "section0/Chiesa2008/year" [ label="YEAR" ] } + subgraph "cluster_section0/inphd:2015" { + fontsize="10"; + label="inphd:2015 (BOOKINTHESIS)"; + tooltip="inphd:2015 (BOOKINTHESIS)"; + fillcolor="#a0d0ff"; + + "section0/inphd:2015/author" [ label="AUTHOR" ] + "section0/inphd:2015/bookauthor" [ label="BOOKAUTHOR" ] + "section0/inphd:2015/booksubtitle" [ label="BOOKSUBTITLE" ] + "section0/inphd:2015/booktitle" [ label="BOOKTITLE" ] + "section0/inphd:2015/crossref" [ label="CROSSREF" ] + "section0/inphd:2015/institution" [ label="INSTITUTION" ] + "section0/inphd:2015/pages" [ label="PAGES" ] + "section0/inphd:2015/title" [ label="TITLE" ] + "section0/inphd:2015/type" [ label="TYPE" ] + "section0/inphd:2015/year" [ label="YEAR" ] + } + subgraph "cluster_section0/BHG226e" { fontsize="10"; label="BHG226e (BOOKINARTICLE)"; @@ -76,42 +123,33 @@ digraph Biberdata { "section0/BHG226e/year" [ label="YEAR" ] } - subgraph "cluster_section0/VanDeun1990" { - fontsize="10"; - label="VanDeun1990 (ARTICLE)"; - tooltip="VanDeun1990 (ARTICLE)"; - fillcolor="#deefff"; - - "section0/VanDeun1990/author" [ label="AUTHOR" ] - "section0/VanDeun1990/journaltitle" [ label="JOURNALTITLE" ] - "section0/VanDeun1990/number" [ label="NUMBER" ] - "section0/VanDeun1990/pages" [ label="PAGES" ] - "section0/VanDeun1990/subtitle" [ label="SUBTITLE" ] - "section0/VanDeun1990/title" [ label="TITLE" ] - "section0/VanDeun1990/year" [ label="YEAR" ] - } - + "section0/Griggio2008/title" -> "section0/Chiesa2008/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/BOOKTITLE inherited via CROSSREF from Griggio2008/TITLE" ] "section0/Griggio2008/subtitle" -> "section0/Chiesa2008/booksubtitle" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/BOOKSUBTITLE inherited via CROSSREF from Griggio2008/SUBTITLE" ] - "section0/Griggio2008/location" -> "section0/Chiesa2008/location" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/LOCATION inherited via CROSSREF from Griggio2008/LOCATION" ] "section0/Griggio2008/publisher" -> "section0/Chiesa2008/publisher" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/PUBLISHER inherited via CROSSREF from Griggio2008/PUBLISHER" ] - "section0/Griggio2008/title" -> "section0/Chiesa2008/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/BOOKTITLE inherited via CROSSREF from Griggio2008/TITLE" ] - "section0/Griggio2008/editor" -> "section0/Chiesa2008/editor" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/EDITOR inherited via CROSSREF from Griggio2008/EDITOR" ] + "section0/Griggio2008/location" -> "section0/Chiesa2008/location" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/LOCATION inherited via CROSSREF from Griggio2008/LOCATION" ] "section0/Griggio2008/year" -> "section0/Chiesa2008/year" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/YEAR inherited via CROSSREF from Griggio2008/YEAR" ] + "section0/Griggio2008/editor" -> "section0/Chiesa2008/editor" [ penwidth="2.0", color="#7d7879", tooltip="Chiesa2008/EDITOR inherited via CROSSREF from Griggio2008/EDITOR" ] + "section0/VanDeun1990/number" -> "section0/BHG226e/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/NUMBER inherited via CROSSREF from VanDeun1990/NUMBER" ] + "section0/VanDeun1990/journaltitle" -> "section0/BHG226e/journaltitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/JOURNALTITLE inherited via CROSSREF from VanDeun1990/JOURNALTITLE" ] + "section0/VanDeun1990/title" -> "section0/BHG226e/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/MAINTITLE inherited via CROSSREF from VanDeun1990/TITLE" ] + "section0/VanDeun1990/year" -> "section0/BHG226e/year" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/YEAR inherited via CROSSREF from VanDeun1990/YEAR" ] + "section0/VanDeun1990/author" -> "section0/BHG226e/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/BOOKAUTHOR inherited via CROSSREF from VanDeun1990/AUTHOR" ] + "section0/VanDeun1990/subtitle" -> "section0/BHG226e/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/MAINSUBTITLE inherited via CROSSREF from VanDeun1990/SUBTITLE" ] + "section0/phd:2015/year" -> "section0/inphd:2015/year" [ penwidth="2.0", color="#7d7879", tooltip="inphd:2015/YEAR inherited via CROSSREF from phd:2015/YEAR" ] + "section0/phd:2015/institution" -> "section0/inphd:2015/institution" [ penwidth="2.0", color="#7d7879", tooltip="inphd:2015/INSTITUTION inherited via CROSSREF from phd:2015/INSTITUTION" ] + "section0/phd:2015/author" -> "section0/inphd:2015/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="inphd:2015/BOOKAUTHOR inherited via CROSSREF from phd:2015/AUTHOR" ] + "section0/phd:2015/subtitle" -> "section0/inphd:2015/booksubtitle" [ penwidth="2.0", color="#7d7879", tooltip="inphd:2015/BOOKSUBTITLE inherited via CROSSREF from phd:2015/SUBTITLE" ] + "section0/phd:2015/type" -> "section0/inphd:2015/type" [ penwidth="2.0", color="#7d7879", tooltip="inphd:2015/TYPE inherited via CROSSREF from phd:2015/TYPE" ] + "section0/phd:2015/title" -> "section0/inphd:2015/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="inphd:2015/BOOKTITLE inherited via CROSSREF from phd:2015/TITLE" ] + "section0/Chiesa2008/booksubtitle" -> "section0/AcTiteLatin/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/MAINSUBTITLE inherited via CROSSREF from Chiesa2008/BOOKSUBTITLE" ] "section0/Chiesa2008/location" -> "section0/AcTiteLatin/location" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/LOCATION inherited via CROSSREF from Chiesa2008/LOCATION" ] + "section0/Chiesa2008/editor" -> "section0/AcTiteLatin/editor" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/EDITOR inherited via CROSSREF from Chiesa2008/EDITOR" ] "section0/Chiesa2008/publisher" -> "section0/AcTiteLatin/publisher" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/PUBLISHER inherited via CROSSREF from Chiesa2008/PUBLISHER" ] + "section0/Chiesa2008/booktitle" -> "section0/AcTiteLatin/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/MAINTITLE inherited via CROSSREF from Chiesa2008/BOOKTITLE" ] + "section0/Chiesa2008/title" -> "section0/AcTiteLatin/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/BOOKTITLE inherited via CROSSREF from Chiesa2008/TITLE" ] "section0/Chiesa2008/year" -> "section0/AcTiteLatin/year" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/YEAR inherited via CROSSREF from Chiesa2008/YEAR" ] "section0/Chiesa2008/author" -> "section0/AcTiteLatin/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/BOOKAUTHOR inherited via CROSSREF from Chiesa2008/AUTHOR" ] - "section0/Chiesa2008/editor" -> "section0/AcTiteLatin/editor" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/EDITOR inherited via CROSSREF from Chiesa2008/EDITOR" ] - "section0/Chiesa2008/title" -> "section0/AcTiteLatin/booktitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/BOOKTITLE inherited via CROSSREF from Chiesa2008/TITLE" ] - "section0/Chiesa2008/booksubtitle" -> "section0/AcTiteLatin/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/MAINSUBTITLE inherited via CROSSREF from Chiesa2008/BOOKSUBTITLE" ] - "section0/Chiesa2008/booktitle" -> "section0/AcTiteLatin/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="AcTiteLatin/MAINTITLE inherited via CROSSREF from Chiesa2008/BOOKTITLE" ] - "section0/VanDeun1990/year" -> "section0/BHG226e/year" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/YEAR inherited via CROSSREF from VanDeun1990/YEAR" ] - "section0/VanDeun1990/journaltitle" -> "section0/BHG226e/journaltitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/JOURNALTITLE inherited via CROSSREF from VanDeun1990/JOURNALTITLE" ] - "section0/VanDeun1990/author" -> "section0/BHG226e/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/BOOKAUTHOR inherited via CROSSREF from VanDeun1990/AUTHOR" ] - "section0/VanDeun1990/title" -> "section0/BHG226e/maintitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/MAINTITLE inherited via CROSSREF from VanDeun1990/TITLE" ] - "section0/VanDeun1990/number" -> "section0/BHG226e/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/NUMBER inherited via CROSSREF from VanDeun1990/NUMBER" ] - "section0/VanDeun1990/subtitle" -> "section0/BHG226e/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/MAINSUBTITLE inherited via CROSSREF from VanDeun1990/SUBTITLE" ] } diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.pdf b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.pdf Binary files differindex cde8737e3d8..49e88ee8dd3 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.tex b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.tex index 4a5453156e4..6eea20915f1 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.tex +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/biblatex-bookinarticle.tex @@ -17,12 +17,12 @@ \newcommand{\namebibstyle}[1]{\texttt{#1}} % Meta-datas \titlepage{% - title={Book in @article and book in @incollection with biblatex}, + title={Book in @article, in @incollection and in @thesis with biblatex}, subtitle={New data types}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={1.2.0a}, - date={07/02/2016}, + revision={1.3.0}, + date={11/02/2016}, url={https://github.com/maieul/biblatex-bookinarticle}} % biblatex @@ -30,6 +30,7 @@ \usepackage{biblatex-bookinarticle} \addbibresource{example-bookinarticle.bib} \addbibresource{example-bookinincollection.bib} +\addbibresource{example-bookinthesis.bib} \begin{document} \printtitlepage @@ -37,7 +38,7 @@ \section{Introduction} -In classical philology, it happens that ancient books are edited by modern scholar. So, when we refer to them, we have to not refer to the article, but, indeed, to the \emph{book which is in the article}. +In classical philology, it happens that ancient books are edited by modern scholar in article. So, when we refer to them, we have to not refer to the article, but, indeed, to the \emph{book which is in the article}. This package allows to create entry which's type is \bibtype{bookinarticle}, and which are printed like this: @@ -45,17 +46,27 @@ This package allows to create entry which's type is \bibtype{bookinarticle}, and \cite{BHG226e} \end{quotation} -It also allows to create entry which's type is \bibtype{bookinincollection}, for book edited in a article of a collection. +It also allows to create entry which's type is \bibtype{bookinincollection}, for book edited in a article of a collection: \begin{quotation} \cite{AcTiteLatin} \end{quotation} +It also allows to create entry which's type is \bibtype{bookinthesis}, for book edited in a thesis: + +\begin{quotation} + \cite{inphd:2015} +\end{quotation} + +As for the standard \bibtype{thesis} entry type, a \bibtype{bookinthesis} can use the \bibfield{type} field which value can be \enquote{mathesis}, \enquote{phdthesis} or \enquote{candthesis}. + +The package also provides \bibtype{bookinmathesis} and \bibtype{bookinphdthesis}, similar to \bibtype{bookinthesis} but the the \bibfield{type} already defined. + \section{Use} \subsection{\bibtype{bookinarticle} Entry Type} -A new entrytype is defined: \bibtype{bookinarticle}. It use the standard fields of a \bibfield{article}, with those changes: +A new entrytype is defined: \bibtype{bookinarticle}. It uses the standard fields of a \bibfield{article}, with these changes: \begin{itemize} \item \bibfield{author} means the author of the ancient book. @@ -63,7 +74,7 @@ A new entrytype is defined: \bibtype{bookinarticle}. It use the standard fields \item \bibfield{mainsubtitle} means the subtitle of the article where the book is edited. \item \bibfield{maintitle} means the title of the article where the book is edited. In our example \enquote{Un mémoire anonyme sur saint Barnabé (BHG 226e)}. \item \bibfield{pages} means the pages where the book is edited. - \item \bibfield{substitle} means the subtitle of the edited book. + \item \bibfield{subtitle} means the subtitle of the edited book. \item \bibfield{title} means the title of the edited book. In our example \enquote{Mémoire sur le saint apôtre Barnabé}. @@ -72,7 +83,7 @@ A new entrytype is defined: \bibtype{bookinarticle}. It use the standard fields \subsection{\bibtype{bookinincollection} Entry Type} -A new entrytype is defined: \bibtype{bookinincollection}. It use the standard fields of a \bibfield{inincollection}, with those changes: +A new entrytype is defined: \bibtype{bookinincollection}. It uses the standard fields of a \bibfield{inincollection}, with these changes: \begin{itemize} \item \bibfield{author} means the author of the ancient book. @@ -82,24 +93,39 @@ A new entrytype is defined: \bibtype{bookinincollection}. It use the standard fi \item \bibfield{maintitle} means the title of the collection were the article is published, in our example \enquote{Suave mari magno\ldots}. \item \bibfield{mainsubtitle} means the subtitle of the collection were the article is published, in our example \enquote{studi offerti dai colleghi udinesi a Ernesto Berti}. \item \bibfield{pages} means the pages where the book is edited. - \item \bibfield{substitle} means the subtitle of the edited book. + \item \bibfield{subtitle} means the subtitle of the edited book. \item \bibfield{title} means the title of the edited book. In our example \enquote{Passio Sancti Titi Apostoli, Mense Ianurii die Quarto}. \end{itemize} +\subsection{\bibtype{bookinthesis} Entry Type} + +A new entrytype is defined: \bibtype{bookinthesis}. It uses the standard fields of a \bibfield{thesis}, with these changes: + +\begin{itemize} + \item \bibfield{author} means the author of the ancient book. + \item \textbf{\bibfield{bookauthor} means the author of the thesis where the book is edited, e.g. the modern editor of the book}. + \item \bibfield{booksubtitle} means the subtitle of the thesis where the book is edited. + \item \bibfield{booktitle} means the title of the thesis where the book is edited. In our example \enquote{A Nice Title}. + \item \bibfield{pages} means the pages where the book is edited. + \item \bibfield{subtitle} means the subtitle of the edited book. + \item \bibfield{title} means the title of the edited book. In our example \enquote{The Ancient Text}. + + +\end{itemize} \subsection{Crossref's use} You can also use the Biber's crossref's facilities. \subsubsection{For \bibtype{bookinarticle}} -The \bibfield{crossfield} of a \bibtype{bookinarticle} entry refering to a \bibtype{article} entry. The fields are inherited from \bibtype{article} following these rule: +The \bibfield{crossfield} of a \bibtype{bookinarticle} entry refers to a \bibtype{article} entry. The fields are inherited from \bibtype{article} following these rules: \begin{itemize} \item \bibfield{author} becomes \bibfield{bookauthor}. \item \bibfield{title} becomes \bibfield{maintitle}. - \item \bibfield{subtitle} becomes \bibfield{maisubtitle}. + \item \bibfield{subtitle} becomes \bibfield{mainsubtitle}. \end{itemize} @@ -109,7 +135,7 @@ See the following example: \subsubsection{For \bibtype{bookinincollection}} -The \bibfield{crossfield} of a \bibtype{bookinincollection} entry refering to a \bibtype{inincollection} entry. The fields are inherited from \bibtype{inincollection} following these rule: +The \bibfield{crossfield} of a \bibtype{bookinincollection} entry refers to a \bibtype{inincollection} entry. The fields are inherited from \bibtype{inincollection} following these rules: \begin{itemize} \item \bibfield{author} becomes \bibfield{bookauthor}. @@ -123,6 +149,21 @@ The \bibfield{crossfield} of a \bibtype{bookinincollection} entry refering to a See the following example: \inputminted[breaklines]{latex}{example-bookinincollection.bib} + +\subsubsection{For \bibtype{bookinthesis}} +The \bibfield{crossfield} of a \bibtype{bookinthesis} entry refers to a \bibtype{article} entry. The fields are inherited from \bibtype{thesis} following these rules: + +\begin{itemize} + \item \bibfield{author} becomes \bibfield{bookauthor}. + \item \bibfield{title} becomes \bibfield{booktitle}. + \item \bibfield{subtitle} becomes \bibfield{booksubtitle}. + +\end{itemize} + +See the following example: + +\inputminted[breaklines]{latex}{example-bookinthesis.bib} + \subsubsection{Summary} The graphs~\ref{crossref} summaries the use of cross-referencing. @@ -132,15 +173,21 @@ The graphs~\ref{crossref} summaries the use of cross-referencing. \label{crossref} \caption{Using crossref's mechanism with \emph{biblatex-bookinarticle}} \end{figure} -\subsection{\bibtype{inarticle} Entry Type} -The package also provides a \bibtype{inarticle} Entry Type, to show a section of an article with its own title. It's like \bibtype{bookinarticle}, but the \bibtype{title} field is printed with italic, and not with quotation marks. +\subsection{\bibtype{inarticle} entry type} + +The package also provides a \bibtype{inarticle} entry type, to show a section of an article with its own title. It is like \bibtype{bookinarticle}, but the \bibtype{title} field is printed with italic, and not with quotation marks. \subsection{\bibtype{inincollection} Entry Type} -The package also provides a \bibtype{inincollection} Entry Type, to show a section of an article with its own title. It's like \bibtype{bookinincollection}, but the \bibtype{title} field is printed with italic, and not with quotation marks. +The package also provides a \bibtype{inincollection} entry type, to show a section of an article of a collection with its own title. It is like \bibtype{bookinincollection}, but the \bibtype{title} field is printed with italic, and not with quotation marks. +\subsection{\bibtype{inthesis} Entry Type} + +The package also provides a \bibtype{inthesis} entry type, to show a section of a thesis with its own title. It is like \bibtype{bookinthesis}, but the \bibtype{title} field is printed with italic, and not with quotation marks. + +The package also provides \bibtype{inphdthesis} and \bibtype{inmathesis}, similar to \bibtype{thesis}, with the \bibfield{type} field already defined. \subsection{Loading package} @@ -153,7 +200,7 @@ The package must be loaded after the \biblatex package: \subsection{Customization} -The ways which \bibtype{bookinarticle} and \bibtype{bookinincollection} are printed are derivated from the \emph{verbose} bibliographic style. You can customize it by overriding bibliographic macros or bibliographic driver. Look at the file \verb+biblatex-bookinarticle+. +The ways which \bibtype{bookinarticle}, \bibtype{bookinincollection} and \bibtype{bookinthesis} are printed are derivated from the \emph{verbose} bibliographic style. You can customize it by overriding bibliographic macros or bibliographic drivers. Look at the file \verb+biblatex-bookinarticle.sty+. \section{Credits} @@ -168,6 +215,9 @@ All issues can be submitted, in French or English, in the GitHub issues page\foo \begin{changelog} +\begin{release}{1.3.0}{2016-02-11} +\item Add \bibtype{bookinthesis} and \bibtype{inthesis} and related. +\end{release} \begin{release}{1.2.0a}{2016-02-07} \item Fix handbook. diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinthesis.bib b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinthesis.bib new file mode 100644 index 00000000000..2f92b53848a --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/documentation/example-bookinthesis.bib @@ -0,0 +1,14 @@ +@bookinthesis{inphd:2015, + Author = {Aristotle}, + Title = {The Ancient Text}, + Crossref = {phd:2015}, + Pages = {20--55} +} +@thesis{phd:2015, + Address = {Paris}, + Author = {John Doe}, + Institution = {Sorbonne}, + Title = {A Nice Title}, + Type = {thesis}, + Subtitle = {A Very Nice Subtitle}, + Year = {2015}}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile index 2207f1f9da1..cfb42fc1156 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile +++ b/Master/texmf-dist/doc/latex/biblatex-bookinarticle/makefile @@ -15,5 +15,5 @@ clean: $(MAKE) -C documentation clean @$(RM) *.pdf *.toc *.aux *.out *.fdb_latexmk *.log *.bbl *.bcf *.blg *run.xml *.synctex.gz* -all: documentation/biblatex-bookinarticle.tex documentation/example-bookinarticle.bib documentation/example-bookinincollection.bib +all: documentation/biblatex-bookinarticle.tex documentation/example-bookinarticle.bib documentation/example-bookinincollection.bib documentation/example-bookinthesis.bib $(MAKE) -C documentation all diff --git a/Master/texmf-dist/tex/latex/biblatex-bookinarticle/biblatex-bookinarticle.sty b/Master/texmf-dist/tex/latex/biblatex-bookinarticle/biblatex-bookinarticle.sty index fcf4b5abcc1..257849909f5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-bookinarticle/biblatex-bookinarticle.sty +++ b/Master/texmf-dist/tex/latex/biblatex-bookinarticle/biblatex-bookinarticle.sty @@ -1,4 +1,4 @@ -%% Copyright 2014 Maïeul Rouquette +%% Copyright 2014-… Maïeul Rouquette % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -12,7 +12,7 @@ % % The Current Maintainer of this work is Maïeul Rouquette \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{biblatex-bookinarticle}[2016/02/07 v1.2.0a Book in article and book in incollection with biblatex] +\ProvidesPackage{biblatex-bookinarticle}[2016/02/11 v1.3.0 Book in article, in incollection and in thesis with biblatex] % 1. The drivers \DeclareBibliographyDriver{inarticle}{% @@ -103,14 +103,77 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} - -% 2. The alias + + +\DeclareBibliographyDriver{inthesis}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{bybookauthor}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{booktitle}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \printfield{type}% + \newunit + \usebibmacro{institution+location+date}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit + \printfield{pagetotal}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{finentry}} + +% 2. The alias and sourcemaps \DeclareBibliographyAlias{bookinarticle}{inarticle} \DeclareBibliographyAlias{bookinincollection}{inincollection} +\DeclareBibliographyAlias{bookinthesis}{inthesis} + +\DeclareDriverSourcemap[datatype=bibtex]{ + \map{ + \step[typesource=inmastersthesis, typetarget=inthesis, final] + \step[fieldset=type, fieldvalue=mathesis] + } + \map{ + \step[typesource=inphdthesis, typetarget=inthesis, final] + \step[fieldset=type, fieldvalue=phdthesis] + } + \map{ + \step[typesource=bookinmastersthesis, typetarget=inthesis, final] + \step[fieldset=type, fieldvalue=mathesis] + } + \map{ + \step[typesource=bookinphdthesis, typetarget=inthesis, final] + \step[fieldset=type, fieldvalue=phdthesis] + } +} % 3. The formats -\DeclareFieldFormat[inarticle,inincollection]{title}{\mkbibquote{#1\isdot}} -\DeclareFieldFormat[inincollection,bookinincollection]{booktitle}{\mkbibquote{#1\isdot}} +\DeclareFieldFormat[inarticle,inincollection,inthesis]{title}{\mkbibquote{#1\isdot}} +\DeclareFieldFormat[inincollection,bookinincollection,inthesis,bookinthesis]{booktitle}{\mkbibquote{#1\isdot}} \DeclareFieldFormat[inarticle,bookinarticle]{maintitle}{\mkbibquote{#1\isdot}} % Inspired from biblatex.def @@ -129,6 +192,7 @@ \inherit{subtitle}{mainsubtitle}% } + \DeclareDataInheritance{incollection}{bookinincollection,inincollection}{ \inherit{author}{bookauthor}% \inherit{title}{booktitle}% @@ -137,9 +201,22 @@ \inherit{booksubtitle}{mainsubtitle}% } + +\DeclareDataInheritance{thesis,phdthesis,mathesis}{bookinthesis,inthesis,inphdthesis,inmathesis,bookinphdthesis,bookinmathesis}{ + \inherit{author}{bookauthor}% + \inherit{title}{booktitle}% + \inherit{subtitle}{booksubtitle}% +} + + %5. Label name -\DeclareLabelname[bookinincollection,bookinarticle]{ +\DeclareLabelname[bookinincollection,% + bookinarticle,% + bookinthesis,% + bookinphdthesis,% + bookinmathesis + ]{% \field{shortauthor} \field{author} } |