From ca6d1ceb71368bca13dc008c6693b695be209e62 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Sep 2016 22:25:04 +0000 Subject: biblatex-opcit-booktitle git-svn-id: svn://tug.org/texlive/trunk@42071 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-opcit-booktitle-example.bib | 21 ++++++++++++ .../biblatex-opcit-booktitle-example.pdf | Bin 20670 -> 27720 bytes .../biblatex-opcit-booktitle-example.tex | 10 ++++-- .../documentation/biblatex-opcit-booktitle.pdf | Bin 74189 -> 76357 bytes .../documentation/biblatex-opcit-booktitle.tex | 29 +++++++++++++++-- .../biblatex-opcit-booktitle.sty | 36 ++++++++++++++------- 6 files changed, 79 insertions(+), 17 deletions(-) diff --git a/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.bib b/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.bib index d5f97dd8ecb..c8c5f0f620f 100644 --- a/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.bib +++ b/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.bib @@ -1,5 +1,26 @@ +@bookinarticle{BHG1850z_o, + Crossref = {Halkin1961}, + Pages = {244-252}, + Title = {Τοῦ ἁγίου ἀποστόλου Τίτου, ἐπισκόπου γενομένου Κρήτης πόλεως Γορτύνης, μαθητοῦ τοῦ ἁγίου ἀποστόλου Παύλου}, + } + +@bookinarticle{BHG1850z_r, + Crossref = {Halkin1961}, + Pages = {252-256}, + Title = {Τοῦ ἁγίου ἀποστόλου Τίτου, ἐπισκόπου Γορτύνης τῆς Κρητῶν νήσου}, + } + +@article{Halkin1961, + Author = {François Halkin}, + Date = {1961}, + Journal = {Analecta Bollandiana}, + Number = {79}, + Pages = {241-256}, + Title = {La légende crétoise de Saint Tite} +} + @incollection{Klausner1997, Author = {David N. Klausner}, Crossref = {Izydorczyk1997}, diff --git a/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.pdf b/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.pdf index 96217f106af..19960d3ace4 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.pdf and b/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.tex b/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.tex index 3d190a3f4ee..c679a115783 100644 --- a/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.tex +++ b/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle-example.tex @@ -1,8 +1,9 @@ \documentclass{article} -\usepackage{fontspec} +\usepackage{libertine} \usepackage{polyglossia} \setmainlanguage{french} -\usepackage[bibstyle=verbose,citestyle=verbose-trad2,citepages=omit]{biblatex} +\usepackage[tools={bookinother,morenames}]{biblatex-multiple-dm} +\usepackage[bibstyle=multiple-dm,citestyle=verbose-trad2,citepages=omit]{biblatex} \usepackage{biblatex-opcit-booktitle} \bibliography{biblatex-opcit-booktitle-example.bib} \usepackage{hyperref} @@ -12,7 +13,7 @@ \cite{Klausner1997} - +\cite{BHG1850z_o} \cite{Pleiade_Barnabe} @@ -25,5 +26,8 @@ \cite{Pleiade_Tite} \cite[22]{Pseudo-Hippolyte} + +\cite{BHG1850z_r} + \end{document} diff --git a/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.pdf b/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.pdf index 3c4f2d033cd..d76d3551488 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.pdf and b/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.tex b/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.tex index 11bf430bf64..7a03bdc6020 100644 --- a/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.tex +++ b/Master/texmf-dist/doc/latex/biblatex-opcit-booktitle/documentation/biblatex-opcit-booktitle.tex @@ -22,8 +22,8 @@ subtitle={Abbreviated references}, email={maieul maieul net}, author={Maïeul Rouquette}, - revision={1.5.0a}, - date={2016/06/12}, + revision={1.6.0}, + date={2016/09/08}, url={https://git.framasoft.org/maieul/biblatex-opcit-booktitle}} % biblatex @@ -166,12 +166,32 @@ If your citation style is public (i. e. published on CTAN), please contact us: w If you have created your own \verb+cite+ bibmacro, this bibmacro must call, directly or indirectly the `cite:test:ifrelated` bibmacro (or your adaptation of this bibmacro). + \subsection{Customization} You can change the \verb+inbook:rel:verbose-trad-xxx+ bibliographic driver to customize the way the main title is printed, \verb+xxx+ meaning 1, 2, or 3, depending of you specific citation style. +\subsection{Use with new entrytypes} + +If you create new entrytypes, as the \emph{biblatex-bookintother} package does, you can let know to \emph{biblatex-opcit-booktitle} that these entry types are concerned by using short form of the main entry. + + +To do it, just add in your \verb+.bbx+ or \verb+.dbx+ file: +\begin{minted}{latex} +\listadd\opcit@booktitle@entrytypes{} +\end{minted} + +\verb++ must be the new sub-entrytype concerned. For example, the \emph{biblatex-bookintother} package contains: + +\begin{minted}{latex} +\listadd\opcit@booktitle@entrytypes{inarticle} +\end{minted} + +Depending of the fields of the new entry, you could have to modify the \verb+inbook:rel:verbose-trad-xxx+. But in this case, please contact us, in order to know if we could provide a generic mechanism directly in this package. \section{Credits} + + This package was created for Maïeul Rouquette's phd dissertation\footnote{\url{http://apocryphes.hypothese.org}.} in 2015. It is freely inspired by Paul Stanley code.\footnote{\url{http://tex.stackexchange.com/a/172777/7712}.} It is licensed on the \emph{\LaTeX\ Project Public License}.\footnote{\url{http://latex-project.org/lppl/lppl-1-3c.html}.}. @@ -183,6 +203,11 @@ All issues can be submitted, in French or English, in the Framasoft issues page\ \begin{changelog} + +\begin{release}{1.6.0}{2016-09-08} + \item Add hooks for new entrytype. +\end{release} + \begin{release}{1.5.0a}{2016-06-12} \item Precisions in the handbook. \end{release} diff --git a/Master/texmf-dist/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty b/Master/texmf-dist/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty index 02a6d52a006..8f8994b1d61 100644 --- a/Master/texmf-dist/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty +++ b/Master/texmf-dist/tex/latex/biblatex-opcit-booktitle/biblatex-opcit-booktitle.sty @@ -15,9 +15,16 @@ % % The Current Maintainer of this work is Maïeul Rouquette \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{biblatex-opcit-booktitle}[2016/06/12 v1.5.0a Manage op. cit. when using subentry] +\ProvidesPackage{biblatex-opcit-booktitle}[2016/09/08 v1.6.0 Manage op. cit. when using subentry] \RequirePackage{xpatch} +% Declaration of the entry concerned. Some package could have already add their own entry +\listadd\opcit@booktitle@entrytypes{inbook} +\listadd\opcit@booktitle@entrytypes{incollection} +\listadd\opcit@booktitle@entrytypes{inproceedings} +\listadd\opcit@booktitle@entrytypes{bookinbook} + + \DeclareFieldFormat{bibhypertarget:crossref}{% \bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{crossref}}{#1}} @@ -67,10 +74,7 @@ \newbibmacro*{cite:test:ifrelated}% {\ifboolexpr {% test {\iffieldundef{crossref}}% - or not (test {\ifentrytype{inbook}}% - or test {\ifentrytype{incollection}}% - or test {\ifentrytype{inproceedings}}% - or test {\ifentrytype{bookinbook}})}% + or not (test {\xifinlist{\thefield{entrytype}}{\opcit@booktitle@entrytypes}})}% {\usebibmacro{cite:full}% \usebibmacro{cite:save}}% {\ifrelatedunseen% @@ -83,10 +87,7 @@ \newbibmacro*{cite:test:ifrelated:verbose-trad3}% {\ifboolexpr {% test {\iffieldundef{crossref}}% - or not (test {\ifentrytype{inbook}}% - or test {\ifentrytype{incollection}}% - or test {\ifentrytype{inproceedings}}% - or test {\ifentrytype{bookinbook}})}% + or not (test {\xifinlist{\thefield{entrytype}}{\opcit@booktitle@entrytypes}})}% {\usebibmacro{cite:full}% }% {\ifrelatedunseen% @@ -132,7 +133,8 @@ \newunit\newblock \usebibmacro{in:}% \printtext[bibhyperlink:crossref]{% - \usebibmacro{maintitle+booktitle}% + \usebibmacro{inbook:rel:bookauthor}% + \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit% @@ -172,7 +174,8 @@ \newunit\newblock \usebibmacro{in:}% \printtext[bibhyperlink:crossref]{% - \usebibmacro{maintitle+booktitle}% + \usebibmacro{inbook:rel:bookauthor}% + \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit% @@ -209,7 +212,8 @@ \newunit\newblock \usebibmacro{in:}% \printtext[bibhyperlink:crossref]{% - \usebibmacro{maintitle+booktitle}% + \usebibmacro{inbook:rel:bookauthor}% + \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit% @@ -230,4 +234,12 @@ {}% \usebibmacro{finentry}} +\newbibmacro{inbook:rel:bookauthor}{% + \ifnameundef{bookauthor}% + {} + {% + \usebibmacro{bybookauthor}% + \setunit{\labelnamepunct}\newblock% + }% +} \endinput -- cgit v1.2.3