From 1d5112325f65cbc2470ff12c81854ada5ce499a9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 16 Mar 2014 21:08:58 +0000 Subject: biblatex-manuscripts-philology (16mar14) git-svn-id: svn://tug.org/texlive/trunk@33195 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-manuscripts-philology.pdf | Bin 73734 -> 76483 bytes .../biblatex-manuscripts-philology.tex | 55 +++++++++++++++++---- .../documentation/example.pdf | Bin 34138 -> 6321 bytes .../latex/biblatex-manuscripts-philology/makefile | 14 +++--- .../english-manuscripts.lbx | 2 +- .../french-manuscripts.lbx | 2 +- .../biblatex-manuscripts-philology/manuscripts.bbx | 33 ++++++++++--- .../biblatex-manuscripts-philology/manuscripts.dbx | 4 +- 8 files changed, 82 insertions(+), 28 deletions(-) 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 7bee647fef0..b32b36d2b74 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf and b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf 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 ba6f1b046aa..965f8b476e4 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 @@ -19,8 +19,8 @@ subtitle={New data types}, email={maieul maieul net}, author={Maïeul Rouquette}, - revision={1.0.0}, - date={20/01/2014}, + revision={1.1.0}, + date={15/03/2014}, url={https://github.com/maieul/biblatex-manuscripts-philology}} @@ -81,8 +81,12 @@ This bibtype can use the optional fields: \fielditem{dating}{litteral} the dating of the manuscript. It can be for example a century. +\fielditem{shortcollection}{litteral} the abreviated form of the collection. Not used by the default style.\label{field:shortcollection} + + \fielditem{shortlibrary}{litteral} 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{pagetotal}{integer} the total number of pages in the manuscript. @@ -90,9 +94,8 @@ This bibtype can use the optional fields: \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{scribe}{name} the scribe(s) who wrote the manuscript. -\fielditem{shorthand}{litteral} the shorthand of the manuscript. If this field is empty, the entry key will be used as shorthand. +\fielditem{shorthand}{litteral} the shorthand of the manuscript. If this field is empty, the entry key will be used as shorthand, except if the option \opt{msnoautoshorthand} is loaded. See \secref{opt:msnoautoshorthand}. \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}. @@ -102,16 +105,16 @@ This bibtype can use the optional fields: There are also two special fields, which are printed only if we ask for them explicitly: \begin{fieldlist} -\fielditem{annotation}{litteral} some annotation about the manuscript and its content. If you want to add paragraph inside it, you must use the \cs{par} command between each paragraph. +\fielditem{annotation}{litteral} 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{catalog}{special} a list of catalogues which describes the manuscript. You must fill this field with arguments of a \cs{cites} command. For example: +\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: \begin{minted}{tex} @manuscript{key, field1 = {value1}, field2 = {value2}, - catalog = {[prenote1][postenote1]{key1}[prenote2][postenote2]{key2}} + catalog = {[prenote1][postnote1]{key1}[prenote2][postnote2]{key2}} \end{minted} @@ -129,9 +132,20 @@ There are also two special fields, which are printed only if we ask for them exp When loading the \biblatex package, use the option \opt{bibstyle} with value equal to \opt{manuscripts}. \begin{minted}{latex} -\usepackage[bibstyle=manuscripts,…]{biblatex} +\usepackage[bibstyle=manuscripts,otheroption…]{biblatex} \end{minted} +\subsubsection{Options} + + +Loading \biblatex, you can use all the standard \biblatex options. But you can also use these specific options: + +\begin{optionlist} + +\boolitem[false]{msnoautoshorthand}\label{opt:msnoautoshorthand} + +Disable the auto definition of manuscript's shorthand by using the citation key. +\end{optionlist} \subsection{Citation of one manuscript} The manuscript description is supposed to be used with a \opt{citestyle} of the \emph{verbose} family (see the \biblatex handbook). @@ -163,11 +177,27 @@ If you want to print a list of manuscripts with detailed fields listed in \secre \cnt{details}. \begin{minted}{latex} -\printshorthands[type=manuscript,env=details,title=Description of manuscripts] +\printbibliography[type=manuscript,env=details,title=Description of manuscripts] \end{minted} In this case, you must run two times biber: one after the first run of \LaTeX\ and one after the second run, to add in the \file{.bbl} the catalogues. After that, run a three time \LaTeX. +If you use \opt{msnoautoshorthand} option, this list could contain manuscripts without shorthand. By default, the descriptions of such manuscripts will be aligned on the left of the shorthands column. + +\label{bibcheck}An other solution is to make two lists: one with manuscripts with shorthand and one with manuscript withoutshortands. You can add to your \cmd{printbiblography} commands a \opt{bibcheck} option, equal to \opt{withshorthand} or \opt{withoutshorthand}: +\begin{minted}{latex} +\printbibliography[ + type=manuscript, + env=details, + title=Description of used manuscripts, + check=withshorthand + ] +\printbibliography[ + type=manuscript, + title=Description of other manuscripts, + check=withoutshorthand + ] +\end{minted} \section{Customization} \subsection{Commands} @@ -214,8 +244,13 @@ The \file{manuscripts.bbx} file defines bibmacros and field formats (read the \b \begin{changelog} +\begin{release}{1.1.0}{2014-03-15} +\item Add \bibfield{shortcollection} field.\see{field:shortcollection} +\item Add \opt{msnoautoshorthand} option. \see{opt:msnoautoshorthand} +\item Add \opt{withshorthand} and \opt{withoutshorthand} bibcheck. \see{bibcheck} +\end{release} -\begin{release}{1.1.0}{2014-01-20} +\begin{release}{1.0.0}{2014-01-20} \item First public release. \end{release} \end{changelog} diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf index 4031bb40fea..8e8ceeb8389 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf and b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile index 9757d01b8ae..55cfde8250a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile +++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile @@ -2,13 +2,13 @@ FILES = *.bbx *.dbx *.lbx documentation makefile README dist: all - rm -rf biblatex-manuscript-philology - mkdir biblatex-manuscript-philology - cp README *bbx *dbx *lbx *makefile biblatex-manuscript-philology - mkdir biblatex-manuscript-philology/documentation - cp documentation/*tex documentation/*bib documentation/*pdf documentation/makefile biblatex-manuscript-philology/documentation - $(RM) ../biblatex-manuscript-philology.zip - zip -r ../biblatex-manuscript-philology.zip biblatex-manuscript-philology + rm -rf biblatex-manuscripts-philology + mkdir biblatex-manuscripts-philology + cp README *bbx *dbx *lbx *makefile biblatex-manuscripts-philology + mkdir biblatex-manuscripts-philology/documentation + cp documentation/*tex documentation/*bib documentation/*pdf documentation/makefile biblatex-manuscripts-philology/documentation + $(RM) ../biblatex-manuscripts-philology.zip + zip -r ../biblatex-manuscripts-philology.zip biblatex-manuscripts-philology clean: 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 4da10fadf3e..9414c2db1ab 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 @@ -13,7 +13,7 @@ % 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{french-manuscripts.lbx}[2013/12/17\space v1.0.0\space manuscripts biblatex localisation] +\ProvidesFile{french-manuscripts.lbx}[2014/03/15\space v1.1.0\space manuscripts biblatex localisation] \InheritBibliographyExtras{english} \NewBibliographyString{1column} 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 8725f5f81a2..73b557f05c2 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 @@ -13,7 +13,7 @@ % 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{french-manuscripts.lbx}[2013/12/17\space v1.0.0\space manuscripts biblatex localisation] +\ProvidesFile{french-manuscripts.lbx}[2014/03/15\space v1.1.0\space manuscripts biblatex localisation] \InheritBibliographyExtras{french} \NewBibliographyString{1column} 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 4a31137feae..0340725651a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx @@ -155,7 +155,7 @@ \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{##1\hss}}} {\endlist} - {\item} + {\item\iffieldundef{shorthand}{\hspace{-\labelwidth}\hspace{-\labelsep}}} % 5. Others %% 5.1 Driver @@ -195,13 +195,9 @@ {\usebibmacro{cite:postnote}} %% 5.3 Mapping - \DeclareStyleSourcemap{ + +\DeclareStyleSourcemap{ \maps[datatype=bibtex]{ - \map{ - \pertype{manuscript} - \step[fieldsource=entrykey] - \step[fieldset=shorthand, origfieldval] - } \map[overwrite]{ \pertype{manuscript} \step[fieldsource=catalog,final] @@ -221,4 +217,27 @@ \DeclareLanguageMapping{english}{english-manuscripts} \DeclareLanguageMapping{french}{french-manuscripts} +% 5.6 Auto shorthand + +\newbool{bbx:msnoautoshorthand} +\DeclareBibliographyOption{msnoautoshorthand}[true]{% + \csuse{bool#1}{bbx:msnoautoshorthand}% +} + +\AtEveryCitekey{% + \notbool{bbx:msnoautoshorthand}{% + \ifentrytype{manuscript}{% + \iffieldundef{shorthand}{% + \savefield{entrykey}{\entrykey}% + \restorefield{shorthand}{\entrykey}% + }{}% + }{}% + }% + {}% +} + +% 5.7 bibcheck + +\defbibcheck{withshorthand}{\iffieldundef{shorthand}{\skipentry}{}} +\defbibcheck{withoutshorthand}{\iffieldundef{shorthand}{}{\skipentry}} \endinput 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 eddfabd573c..91045a5e51a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx @@ -14,8 +14,8 @@ % This work consists of the files manuscripts.dbx, manuscripts.bbx, french-manuscripts.lbx and english-manuscripts.lbx \DeclareDatamodelEntrytypes{manuscript} -\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,shortlibrary,columns, collection,usualtitle,shelfmark,support,columns} +\DeclareDatamodelFields[type=field,datatype=literal]{catalog,dating,shortlibrary,columns, collection,shortcollection,usualtitle,shelfmark,support,columns} \DeclareDatamodelFields[type=list,datatype=name]{scribe,owner} \DeclareDatamodelFields[type=list,datatype=literal]{origin} -\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,columns,languages, collection,usualtitle,shelfmark,support,columns,origin,scribe,owner} +\DeclareDatamodelEntryfields[manuscript]{catalog,dating,shortlibrary,shortcollection,columns,languages, collection,usualtitle,shelfmark,support,columns,origin,scribe,owner} -- cgit v1.2.3