From 9c4fa47b311d2690f57696da79330a7448685d87 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 21 Sep 2016 20:54:40 +0000 Subject: biblatex-manuscripts-philology (21sep16) git-svn-id: svn://tug.org/texlive/trunk@42119 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-manuscripts-philology-example.bib | 189 +++++++++++++++++++++ .../biblatex-manuscripts-philology-example.pdf | Bin 0 -> 35071 bytes .../biblatex-manuscripts-philology-example.tex | 19 +++ .../biblatex-manuscripts-philology.pdf | Bin 81706 -> 81791 bytes .../biblatex-manuscripts-philology.tex | 28 +-- .../documentation/example.bib | 189 --------------------- .../documentation/example.pdf | Bin 34809 -> 0 bytes .../documentation/example.tex | 19 --- .../documentation/makefile | 6 +- .../latex/biblatex-manuscripts-philology/makefile | 2 +- .../english-manuscripts.lbx | 2 +- .../french-manuscripts.lbx | 2 +- .../italian-manuscripts.lbx | 2 +- .../manuscripts-noautoshorthand.bbx | 2 +- .../manuscripts-noautoshorthand.dbx | 2 +- .../manuscripts-shared.bbx | 45 ++++- .../manuscripts-shared.dbx | 4 +- .../biblatex-manuscripts-philology/manuscripts.bbx | 4 +- .../biblatex-manuscripts-philology/manuscripts.dbx | 2 +- 19 files changed, 278 insertions(+), 239 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib create mode 100644 Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf create mode 100644 Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex delete mode 100644 Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.bib delete mode 100644 Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf delete mode 100644 Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.tex (limited to 'Master/texmf-dist') 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 new file mode 100644 index 00000000000..554b2f99e1c --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib @@ -0,0 +1,189 @@ +%% This BibTeX bibliography file was created using BibDesk. +%% http://bibdesk.sourceforge.net/ + + +%% Created for Maïeul at 2014-04-07 15:08:51 +0200 + + +%% Saved with string encoding Unicode (UTF-8) + + + +@manuscript{C, + Address = {Cambridge}, + Annote = {Some comments }, + Bookpagination = {folio}, + Collection = {Additional greek manuscript}, + Columns = {1}, + 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.}, + Layer = {inf}, + Library = {University Library}, + Pages = {11\recto-11\verso}, + Pagetotal = {16}, + Shelfmark = {4489}, + Support = {pergament}} + +@book{Batiffoll1891, + Address = {Paris}, + Author = {Pierre Batiffol}, + Publisher = {Alphonse Picard}, + Subtitle = {contribution à l'histoire de la Vaticane}, + Title = {L'abbaye de Rossano}, + Year = {1891}} + +@book{Richard857, + Address = {Bruxelles}, + Author = {Franchi de' Cavalieri, Pio Petro}, + Publisher = {Société des Bollandistes}, + Title = {Catalogus codicum hagiographicorum graecorum Bibliothecae Vaticanae}, + Year = {1899}} + +@book{Lake1938, + Address = {Boston}, + Author = {Kirsopp Lake and Silvia Lake}, + Bookpagination = {notice}, + Maintitle = {Dated greek minuscule manuscripts to the year 1200}, + Publisher = {The American Academy of Arts and Sciences}, + Title = {Manuscripts in Rome, in Messina, in Naples, and in London}, + Volume = {9}, + Year = {1938}} + +@book{Richard192-3, + Crossref = {Richard192}, + Subtitle = {Belles-Lettres, Coislin - Supplément, Paris et départements}, + Title = {Ancien fonds grec}, + Volume = {3}, + Year = {1888}} + +@mvbook{Richard192, + Address = {Paris}, + Author = {Henri Omont}, + Date = {1886/1898}, + Publisher = {Alphonse Picard}, + Volumes = {4}} + +@book{Richard834, + Address = {Vatican}, + Author = {Robertus Devreesse}, + Maintitle = {Bibliothecae Apostolicae Vaticanae codices manu scripti recensiti iussu Pii~XI Pontificis Maximi, Praeside Iohanne Mercati S. Georgii in Velabro Card. Diacono, S. R. E. Bybliothecario (\emph{sic}) et Scriniario}, + Publisher = {Bibliotheca Vaticana}, + Richard = {834}, + Subtitle = {Codices~1485-1683}, + Title = {Codices Vaticani Graeci}, + Year = {1950}} + +@mvbook{Ehrhard, + Address = {Osnabrück}, + Author = {Albert Ehrhard}, + Origdate = {1937/1952}, + Origlocation = {Leipzig}, + Origpublisher = {J. C. Hinrichs Verlag}, + Publisher = {Otto Zeller Verlag}, + Subtitle = {von den Anfängen bis zum Ende des 16. Jahrhunderts}, + Title = {Überlieferung und Bestand der hagiographischen und homiletischen Literatur der griechischen Kirche}, + Volumes = {3}, + Year = {1965}} + +@book{Ehrhard1.1, + Crossref = {Ehrhard}, + Origdate = {1937}, + Part = {1}, + Volume = {1}} + +@book{Richard2445, + Address = {Vienne}, + Author = {Herbert Hunger}, + Maintitle = {Katalog der griechischen handschriften des Österreichischen Nationalbibliothek}, + Publisher = {Georg Prachner Verlag}, + Richard = {2445}, + Title = {Codices historici, codices philosophici et philologici}, + Year = {1961}} + +@book{Bodleian_quarto_t1, + Address = {Oxford}, + Author = {Coxe, Henry}, + Bookpagination = {column}, + Maintitle = {Quarto Catalogues}, + Origdate = {1853}, + Publisher = {Bodleian Library}, + Richard = {1843}, + Subtitle = {Reprinted with corrections from the edition of 1853}, + Title = {Greek Manuscripts}, + Volume = {1}, + Year = {1969}} + +@book{Richard1842.1, + Address = {Oxford}, + Author = {Henricus Coxe}, + Bookpagination = {column}, + Maintitle = {Catalogi codicum manuscriptorum Bibliothecae Bodleianae}, + Publisher = {Typographeus Academicus}, + Richard = {1841}, + Title = {recensionem codicum graecorum continens}, + Volume = {1}, + Year = {1853}} + +@manuscript{U, + Address = {Vatican}, + Annotation = {Some comments \par Some comments}, + Bookpagination = {folio}, + Catalog = {[334]{Lake1938}[161-164]{Richard857}[421-425]{Richard834}[673-676]{Ehrhard1.1}[80]{Batiffoll1891}}, + Collection = {Grec}, + Columns = {1}, + Dating = {\textsc{x}\textsuperscript{e} c.}, + Library = {Biblioteca Apostolica Vaticana}, + Origin = {Constantinople (Monastère Saint~Jean le Précurseur)}, + Pages = {326\verso-340\verso}, + Pagetotal = {406}, + Scribe = {Dorothee}, + Shelfmark = {1671}, + Support = {Pergament}} + +@manuscript{O, + Address = {Vienna}, + Annotation = {Some comments \par Some comments}, + Bookpagination = {folio}, + Catalog = {[50-54]{Richard2445}[682-688]{Ehrhard1.1}}, + Collection = {Hist. gr.}, + Columns = {2}, + Dating = {\textsc{xi}\textsuperscript{e} c.}, + Library = {Österreichische Nationalbibliothek}, + Origin = {Constantinople ?}, + Pages = {263\recto-273\verso}, + Pagetotal = {310}, + Shelfmark = {45}, + Shortlibrary = {ÖNB}, + Support = {pergament}} + +@manuscript{L, + Address = {Oxford}, + Annotation = {Some comments \par Some comments}, + Catalog = {[543D-546C]{Richard1842.1}{Bodleian_quarto_t1}}, + Collection = {Laudian Collection}, + Columns = {1}, + Dating = {\textsc{xvi}\textsuperscript{e} c.}, + Library = {Bodleian Library}, + Pages = {219-238}, + Pagetotal = {426}, + Shelfmark = {Gr.~64a}, + Support = {paper}} + +@manuscript{S, + Address = {Paris}, + Annotation = {Some comments \par Some comments}, + Bookpagination = {folio}, + Catalog = {[55]{Richard192-3}[678-679]{Ehrhard1.1}}, + Collection = {Supplément grec}, + Columns = {2}, + Date-Modified = {2013-12-24 15:21:30 +0000}, + Dating = {\textsc{x}\textsuperscript{e} c.}, + Library = {Bibliothèque Nationale de France}, + Origin = {Constantinople}, + Pages = {233\verso-245\recto}, + Pagetotal = {282}, + Scribe = {Stephen}, + Shelfmark = {241}, + Shortlibrary = {BNF}, + Support = {Pergament}} 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 new file mode 100644 index 00000000000..985878454be Binary files /dev/null and b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex new file mode 100644 index 00000000000..9a43f1ec4d2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.tex @@ -0,0 +1,19 @@ +\documentclass{article} +\usepackage{fontspec} +\usepackage{polyglossia} +\setmainlanguage{english} +\setmainfont{Linux Libertine O} +\usepackage[backend=biber,bibstyle=manuscripts,citestyle=verbose]{biblatex} +\addbibresource{biblatex-manuscripts-philology-example.bib} +\begin{document} +\title{biblatex-manuscripts-philology-examples} +\author{Maïeul Rouquette} +\maketitle +\nocite{*} + +\printshorthands[type=manuscript,title=Manuscripts' description,env=details] +\newpage +\printshorthands[type=manuscript,title=Conspectus siglorum] + + +\end{document} 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 6ec25b6ae96..53afea76166 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 deb6f81a7aa..c517a3577cd 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.10.1}, - date={07/09/2016}, + revision={1.11.0}, + date={21/09/2016}, url={https://github.com/maieul/biblatex-manuscripts-philology}} @@ -228,27 +228,31 @@ You can use the special field \bibfield{sortshelfmark} if the way you shelf mark 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. \begin{ltxsyntax} -\csitem{collectionshelfmarkpunct} the punct between \bibfield{collection} and \bibfield{shelfmark}. By default \cs{addspace}. +\csitem{collectionshelfmarkpunct} the punctuation between \bibfield{collection} and \bibfield{shelfmark}. By default \cs{addspace}. -\csitem{datingpagespunct} the punct between \bibfield{dating} and \bibfield{pages}. By default \cs{addcomma}\cs{addspace}. The \cs{isdot} is automatically called when printing \bibfield{dating} field. +\csitem{columnslayerpunct} the punctuation between \bibfield{columns} and \bibfield{layer}. By default \cs{addsemicolon}\cs{addspace}. -\csitem{librarycollectionpunct} the punct between \bibfield{library} and \bibfield{collection}. By default \cs{addcomma}\cs{addspace}. +\csitem{datingpagespunct} the punctuation between \bibfield{dating} and \bibfield{pages}. By default \cs{addcomma}\cs{addspace}. The \cs{isdot} is automatically called when printing \bibfield{dating} field. + +\csitem{librarycollectionpunct} the punctuation between \bibfield{library} and \bibfield{collection}. By default \cs{addcomma}\cs{addspace}. \csitem{mkcolumns} the way the \bibfield{columns} are printed. By default, in parens. +\csitem{mkcolumnslayer} the way the \bibfield{columns} and \bibfield{layer} fields are printed together. By default, in parens. + \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{mkshcite} the way the shorthand is printed when using \cs{shcite}. By default, no special formatting. -\cs{locationlibrarypunct} the punct between \bibfield{location} and \bibfield{library}. By default \cs{addcolon}\cs{addspace}. +\cs{locationlibrarypunct} the punctuation between \bibfield{location} and \bibfield{library}. By default \cs{addcolon}\cs{addspace}. -\cs{manuscriptdescriptionlabelpunct} the punct between label and text, for the special fields. By default \cs{addcolon}\cs{addspace}. +\cs{manuscriptdescriptionlabelpunct} the punctuation between label and text, for the special fields. By default \cs{addcolon}\cs{addspace}. -\cs{moreinterpunct} the punct between each special fields when printing in the same paragraph. By default \cs{addcolon}\cs{addspace}. +\cs{moreinterpunct} the punctuation between each special fields when printing in the same paragraph. By default \cs{addcolon}\cs{addspace}. -\cs{pagetotalpagespunct} the punct between \bibfield{pagetotal} and \bibfield{pages}. By default \cs{addcolon}\cs{addspace}. +\cs{pagetotalpagespunct} the punctuation between \bibfield{pagetotal} and \bibfield{pages}. By default \cs{addcolon}\cs{addspace}. \end{ltxsyntax} \subsection{Commands to use in the \bibfield{pages} field} @@ -272,7 +276,11 @@ To use this package with the features of \verb+biblatex-realauthor+, you must us \begin{changelog} -\begin{release}{1.10.1}{2016-06-09} +\begin{release}{1.11.0}{2016-09-21} + \item Fix typographical bug when using both \bibfield{layer} and \bibfield{columns} fields without \bibfield{pages} field. +\end{release} + +\begin{release}{1.10.1}{2016-09-07} \item Use \cs{mkbibnamefamily} instead of \cs{mkbibnamelast} (biblatex 3.3 and later). \end{release} diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.bib b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.bib deleted file mode 100644 index 554b2f99e1c..00000000000 --- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.bib +++ /dev/null @@ -1,189 +0,0 @@ -%% This BibTeX bibliography file was created using BibDesk. -%% http://bibdesk.sourceforge.net/ - - -%% Created for Maïeul at 2014-04-07 15:08:51 +0200 - - -%% Saved with string encoding Unicode (UTF-8) - - - -@manuscript{C, - Address = {Cambridge}, - Annote = {Some comments }, - Bookpagination = {folio}, - Collection = {Additional greek manuscript}, - Columns = {1}, - 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.}, - Layer = {inf}, - Library = {University Library}, - Pages = {11\recto-11\verso}, - Pagetotal = {16}, - Shelfmark = {4489}, - Support = {pergament}} - -@book{Batiffoll1891, - Address = {Paris}, - Author = {Pierre Batiffol}, - Publisher = {Alphonse Picard}, - Subtitle = {contribution à l'histoire de la Vaticane}, - Title = {L'abbaye de Rossano}, - Year = {1891}} - -@book{Richard857, - Address = {Bruxelles}, - Author = {Franchi de' Cavalieri, Pio Petro}, - Publisher = {Société des Bollandistes}, - Title = {Catalogus codicum hagiographicorum graecorum Bibliothecae Vaticanae}, - Year = {1899}} - -@book{Lake1938, - Address = {Boston}, - Author = {Kirsopp Lake and Silvia Lake}, - Bookpagination = {notice}, - Maintitle = {Dated greek minuscule manuscripts to the year 1200}, - Publisher = {The American Academy of Arts and Sciences}, - Title = {Manuscripts in Rome, in Messina, in Naples, and in London}, - Volume = {9}, - Year = {1938}} - -@book{Richard192-3, - Crossref = {Richard192}, - Subtitle = {Belles-Lettres, Coislin - Supplément, Paris et départements}, - Title = {Ancien fonds grec}, - Volume = {3}, - Year = {1888}} - -@mvbook{Richard192, - Address = {Paris}, - Author = {Henri Omont}, - Date = {1886/1898}, - Publisher = {Alphonse Picard}, - Volumes = {4}} - -@book{Richard834, - Address = {Vatican}, - Author = {Robertus Devreesse}, - Maintitle = {Bibliothecae Apostolicae Vaticanae codices manu scripti recensiti iussu Pii~XI Pontificis Maximi, Praeside Iohanne Mercati S. Georgii in Velabro Card. Diacono, S. R. E. Bybliothecario (\emph{sic}) et Scriniario}, - Publisher = {Bibliotheca Vaticana}, - Richard = {834}, - Subtitle = {Codices~1485-1683}, - Title = {Codices Vaticani Graeci}, - Year = {1950}} - -@mvbook{Ehrhard, - Address = {Osnabrück}, - Author = {Albert Ehrhard}, - Origdate = {1937/1952}, - Origlocation = {Leipzig}, - Origpublisher = {J. C. Hinrichs Verlag}, - Publisher = {Otto Zeller Verlag}, - Subtitle = {von den Anfängen bis zum Ende des 16. Jahrhunderts}, - Title = {Überlieferung und Bestand der hagiographischen und homiletischen Literatur der griechischen Kirche}, - Volumes = {3}, - Year = {1965}} - -@book{Ehrhard1.1, - Crossref = {Ehrhard}, - Origdate = {1937}, - Part = {1}, - Volume = {1}} - -@book{Richard2445, - Address = {Vienne}, - Author = {Herbert Hunger}, - Maintitle = {Katalog der griechischen handschriften des Österreichischen Nationalbibliothek}, - Publisher = {Georg Prachner Verlag}, - Richard = {2445}, - Title = {Codices historici, codices philosophici et philologici}, - Year = {1961}} - -@book{Bodleian_quarto_t1, - Address = {Oxford}, - Author = {Coxe, Henry}, - Bookpagination = {column}, - Maintitle = {Quarto Catalogues}, - Origdate = {1853}, - Publisher = {Bodleian Library}, - Richard = {1843}, - Subtitle = {Reprinted with corrections from the edition of 1853}, - Title = {Greek Manuscripts}, - Volume = {1}, - Year = {1969}} - -@book{Richard1842.1, - Address = {Oxford}, - Author = {Henricus Coxe}, - Bookpagination = {column}, - Maintitle = {Catalogi codicum manuscriptorum Bibliothecae Bodleianae}, - Publisher = {Typographeus Academicus}, - Richard = {1841}, - Title = {recensionem codicum graecorum continens}, - Volume = {1}, - Year = {1853}} - -@manuscript{U, - Address = {Vatican}, - Annotation = {Some comments \par Some comments}, - Bookpagination = {folio}, - Catalog = {[334]{Lake1938}[161-164]{Richard857}[421-425]{Richard834}[673-676]{Ehrhard1.1}[80]{Batiffoll1891}}, - Collection = {Grec}, - Columns = {1}, - Dating = {\textsc{x}\textsuperscript{e} c.}, - Library = {Biblioteca Apostolica Vaticana}, - Origin = {Constantinople (Monastère Saint~Jean le Précurseur)}, - Pages = {326\verso-340\verso}, - Pagetotal = {406}, - Scribe = {Dorothee}, - Shelfmark = {1671}, - Support = {Pergament}} - -@manuscript{O, - Address = {Vienna}, - Annotation = {Some comments \par Some comments}, - Bookpagination = {folio}, - Catalog = {[50-54]{Richard2445}[682-688]{Ehrhard1.1}}, - Collection = {Hist. gr.}, - Columns = {2}, - Dating = {\textsc{xi}\textsuperscript{e} c.}, - Library = {Österreichische Nationalbibliothek}, - Origin = {Constantinople ?}, - Pages = {263\recto-273\verso}, - Pagetotal = {310}, - Shelfmark = {45}, - Shortlibrary = {ÖNB}, - Support = {pergament}} - -@manuscript{L, - Address = {Oxford}, - Annotation = {Some comments \par Some comments}, - Catalog = {[543D-546C]{Richard1842.1}{Bodleian_quarto_t1}}, - Collection = {Laudian Collection}, - Columns = {1}, - Dating = {\textsc{xvi}\textsuperscript{e} c.}, - Library = {Bodleian Library}, - Pages = {219-238}, - Pagetotal = {426}, - Shelfmark = {Gr.~64a}, - Support = {paper}} - -@manuscript{S, - Address = {Paris}, - Annotation = {Some comments \par Some comments}, - Bookpagination = {folio}, - Catalog = {[55]{Richard192-3}[678-679]{Ehrhard1.1}}, - Collection = {Supplément grec}, - Columns = {2}, - Date-Modified = {2013-12-24 15:21:30 +0000}, - Dating = {\textsc{x}\textsuperscript{e} c.}, - Library = {Bibliothèque Nationale de France}, - Origin = {Constantinople}, - Pages = {233\verso-245\recto}, - Pagetotal = {282}, - Scribe = {Stephen}, - Shelfmark = {241}, - Shortlibrary = {BNF}, - Support = {Pergament}} 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 deleted file mode 100644 index cdf27ba74de..00000000000 Binary files a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.tex b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.tex deleted file mode 100644 index 1e0d9e88d16..00000000000 --- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/example.tex +++ /dev/null @@ -1,19 +0,0 @@ -\documentclass{article} -\usepackage{fontspec} -\usepackage{polyglossia} -\setmainlanguage{english} -\setmainfont{Linux Libertine O} -\usepackage[backend=biber,bibstyle=manuscripts,citestyle=verbose]{biblatex} -\addbibresource{example.bib} -\begin{document} -\title{Examples} -\author{Maïeul Rouquette} -\maketitle -\nocite{*} - -\printshorthands[type=manuscript,title=Manuscripts' description,env=details] -\newpage -\printshorthands[type=manuscript,title=Conspectus siglorum] - - -\end{document} diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/makefile b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/makefile index c124f4dc726..50a403d2106 100644 --- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/makefile +++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation/makefile @@ -1,9 +1,9 @@ all: *tex *bib xelatex --shell-escape biblatex-manuscripts-philology.tex xelatex --shell-escape biblatex-manuscripts-philology.tex - xelatex --shell-escape example.tex - biber example - xelatex --shell-escape example.tex + xelatex --shell-escape biblatex-manuscripts-philology-example.tex + biber biblatex-manuscripts-philology-example + xelatex --shell-escape biblatex-manuscripts-philology-example.tex clean: $(MAKE) -C documentation clean diff --git a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile index d01c1c4d7a7..9e988010666 100644 --- a/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/makefile +++ b/Master/texmf-dist/doc/latex/biblatex-manuscripts-philology/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/example.tex documentation/biblatex-manuscripts-philology.tex documentation/example.bib +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 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 6dfda0920a9..00a2f31ded4 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,7 +12,7 @@ % % 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}[2016/09/07 v1.10.1 manuscripts biblatex localisation] +\ProvidesFile{english-manuscripts.lbx}[2016/09/21 v1.11.0 manuscripts biblatex localisation]% \InheritBibliographyStrings{english} \InheritBibliographyExtras{english} 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 65461fa7bac..ef104be05f8 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,7 +12,7 @@ % % 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}[2016/09/07 v1.10.1 manuscripts biblatex localisation] +\ProvidesFile{french-manuscripts.lbx}[2016/09/21 v1.11.0 manuscripts biblatex localisation]% \InheritBibliographyStrings{french} \InheritBibliographyExtras{french} 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 e4e20b26261..56de1e499dd 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,7 +12,7 @@ % % 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}[2016/09/07 v1.10.1 manuscripts biblatex localisation] +\ProvidesFile{italian-manuscripts.lbx}[2016/09/21 v1.11.0 manuscripts biblatex localisation]% \InheritBibliographyStrings{italian} \InheritBibliographyExtras{italian} 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 a73ba11addd..3b55965896e 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} -[2016/09/07 v1.10.1 biblatex bibliography style (MR)] +[2016/09/21 v1.11.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 92ba829aac6..7e114e0f734 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} -[2016/09/07 v1.10.1 biblatex bibliography style (MR)] +[2016/09/21 v1.11.0 biblatex bibliography style (MR)] \blx@inputonce{manuscripts-shared.dbx}{}{}{}{}{} \ No newline at end of file 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 4da3121ea90..ef0589b9920 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} -[2016/09/07 v1.10.1 biblatex bibliography style (MR)] +[2016/09/21 v1.11.0 biblatex bibliography style (MR)]% \ifdef{\biblatexmultipledm@bibstyle} {\RequireBibliographyStyle{\biblatexmultipledm@bibstyle}} @@ -34,6 +34,7 @@ \newcommand{\mkcolumns}[1]{\addspace\mkbibparens{#1}} \newcommand{\mklayer}[1]{\addspace\mkbibparens{#1}} +\newcommand{\mkcolumnslayer}[1]{\addspace\mkbibparens{#1}}% \newcommand{\mklocation}[1]{\mkbibnamefamily{#1}} \newcommand{\mkmanuscriptdescriptionlabel}[1]{\textbf{#1}\manuscriptdescriptionlabelpunct} \newcommand{\mkshcite}[1]{#1} @@ -42,6 +43,7 @@ \newcommand{\manuscriptdescriptionlabelpunct}{\addcolon\addspace} \newcommand{\moreinterpunct}{\addsemicolon\addspace} \newcommand{\pagetotalpagespunct}{\addcolon\addspace} +\newcommand{\columnslayerpunct}{\addsemicolon\addspace}% \def\recto{r} @@ -102,12 +104,40 @@ \newbibmacro{manuscript:pages}{% \printfield{pagetotal}% - \iffieldundef{columns}{}{\bibstring[\mkcolumns]{\strfield{columns}column}}% - \setunit{\pagetotalpagespunct}% - \printfield{pages}% - \iffieldundef{layer}{}{\bibstring[\mklayer]{\strfield{layer}layer}}% + \iffieldundef{pages}% + {% + \usebibmacro{manuscript:columns+layer}% + }% + {% + \usebibmacro{manuscript:columns}% + \setunit{\pagetotalpagespunct}% + \printfield{pages}% + \usebibmacro{manuscript:layer}% + }% } +\newbibmacro{manuscript:columns+layer}{% + \ifboolexpr{test {\iffieldundef{columns}} or test{\iffieldundef{layer}}}{% + \usebibmacro{manuscript:columns}% + \usebibmacro{manuscript:layer}% + }% + {% + \printtext[columns+layer]{% + \bibstring{\strfield{columns}column}% + \setunit{\columnslayerpunct}% + \bibstring{\strfield{layer}layer}% + }% + }% +}% + +\newbibmacro{manuscript:columns}{% + \iffieldundef{columns}{}{\bibstring[\mkcolumns]{\strfield{columns}column}}% +}% + +\newbibmacro{manuscript:layer}{% + \iffieldundef{layer}{}{\bibstring[\mklayer]{\strfield{layer}layer}}% +}% + \newbibmacro{support+dating}{% \printfield{support}% \newunit% @@ -122,9 +152,10 @@ \DeclareFieldFormat{collection+shelfmark}{% \printtext[title]{#1}% } -\DeclareFieldFormat{dating}{#1\isdot} +\DeclareFieldFormat{columns+layer}{\mkcolumnslayer{#1}}% +\DeclareFieldFormat{dating}{#1\isdot}% -\DeclareFieldFormat{support}{\bibstring{#1}} +\DeclareFieldFormat{support}{\bibstring{#1}}% \DeclareNameFormat{manuscript}{% \nameparts{#1}% 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 0106866a7e4..185a55da7d5 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 @@ -12,8 +12,8 @@ % % 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} -[2016/09/07 v1.10.1 biblatex bibliography style (MR)] +\ProvidesFile{manuscripts-shared.dbx}% +[2016/09/21 v1.11.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} 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 a6397215039..551f99fc6e1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx @@ -12,8 +12,8 @@ % % 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} -[2016/09/07 v1.10.1 biblatex bibliography style (MR)] +\ProvidesFile{manuscripts.bbx}% +[2016/09/21 v1.11.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 33340abad92..643763b3e60 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} -[2016/09/07 v1.10.1 biblatex bibliography style (MR)] +[2016/09/21 v1.11.0 biblatex bibliography style (MR)] \blx@inputonce{manuscripts-shared.dbx}{}{}{}{}{} \ No newline at end of file -- cgit v1.2.3