From 683cda3cef493bed1697c8c51a86bcb79d623623 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 30 Oct 2016 21:47:42 +0000 Subject: biblatex-lni (30oct16) git-svn-id: svn://tug.org/texlive/trunk@42386 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/biblatex-lni/CHANGELOG.md | 9 +- .../doc/latex/biblatex-lni/LNI-examples.bib | 60 +++++++++++ Master/texmf-dist/doc/latex/biblatex-lni/README.md | 2 +- Master/texmf-dist/tex/latex/biblatex-lni/LNI.bbx | 115 +++++++++++++++++++-- 4 files changed, 172 insertions(+), 14 deletions(-) diff --git a/Master/texmf-dist/doc/latex/biblatex-lni/CHANGELOG.md b/Master/texmf-dist/doc/latex/biblatex-lni/CHANGELOG.md index e582d0eeb4d..9a852e9f0c1 100644 --- a/Master/texmf-dist/doc/latex/biblatex-lni/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/biblatex-lni/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. This project **does not** adhere to [Semantic Versioning](http://semver.org/). The markdown syntax is inspired by the conventions proposed by [keepachangelog.com](http://keepachangelog.com/). +## [v0.3] - 2016-10-30 +* Support for empty editor in `InProceedings` and `InCollection` +* Explicit support for `InCollection` +* Improved examples in `LNI-examples.bib` + ## [v0.2] - 2016-10-13 * Labels do not include prefixes any more * `\citeauthor` prints one author if one author, two authors if two authors, and the first author + "et al." in the case of three or more @@ -13,5 +18,5 @@ The markdown syntax is inspired by the conventions proposed by [keepachangelog.c Initial release. -[Unreleased]: https://github.com/latextemplates/biblatex-lni/v0.2...HEAD -[v0.2]: https://github.com/latextemplates/biblatex-lni/v0.1...v0.2 +[v0.3]: https://github.com/latextemplates/biblatex-lni/compare/v0.2...v0.3 +[v0.2]: https://github.com/latextemplates/biblatex-lni/compare/v0.1...v0.2 diff --git a/Master/texmf-dist/doc/latex/biblatex-lni/LNI-examples.bib b/Master/texmf-dist/doc/latex/biblatex-lni/LNI-examples.bib index 73cec3c30e9..3d1bd006bef 100644 --- a/Master/texmf-dist/doc/latex/biblatex-lni/LNI-examples.bib +++ b/Master/texmf-dist/doc/latex/biblatex-lni/LNI-examples.bib @@ -7,6 +7,21 @@ crossref = {Gl01}, } +@InProceedings{Mustermann2015, + author = {Max Mustermann}, + title = {Mustertitel}, + booktitle = {Musterkonferenz}, + editor = {Eva Musterfrau}, + year = {2015}, +} + +@InProceedings{Mustermann2016, + author = {Max Mustermann}, + title = {Mustertitel}, + booktitle = {Musterkonferenz}, + year = {2016}, +} + @InBook{Az09, pages = {135-162}, title = {Die Fußnote in LNI-Bänden}, @@ -14,6 +29,14 @@ crossref = {Gl09}, } +@InProceedings{Qu03, + author = {Quan, Dennis and Bakshi, Karun and Huynh, David and Karger, David R.}, + title = {User Interfaces for Supporting Multiple Categorization}, + pages = {228-235}, + crossref = {Ra03}, + langid = {english}, +} + @InCollection{vdAW2013, author = {Wil M. P. van der Aalst and Mathias Weske}, title = {The {P2P} Approach to Interorganizational Workflows}, @@ -91,6 +114,18 @@ venue = {New York}, } +@Proceedings{Ra03, + editor = {Rauterberg, Matthias and Menozzi, Marino and Wesson, Janet}, + title = {Human-computer Interaction}, + eventtitle = {{INTERACT} '03; {IFIP TC13} {International} Conference on Human-Computer Interaction}, + year = {2003}, + publisher = {IOS Press}, + location = {Amsterdam}, + langid = {english}, + eventdate = {2003-09-01/2003-09-05}, + venue = {Zurich, Switzerland}, +} + @Book{Gl09, editor = {H. I. Glück}, title = {Formatierung 2009}, @@ -109,6 +144,31 @@ year = {2014}, } +@InCollection{BinzBKL14, + author = {Tobias Binz and + Uwe Breitenb{\"{u}}cher and + Oliver Kopp and + Frank Leymann}, + title = {{TOSCA:} Portable Automated Deployment and Management of Cloud Applications}, + pages = {527--549}, + crossref = {aws2014}, + doi = {10.1007/978-1-4614-7535-4_22}, + langid = {english}, +} + +@Collection{aws2014, + editor = {Athman Bouguettaya and + Quan Z. Sheng and + Florian Daniel}, + title = {Advanced Web Services}, + publisher = {Springer}, + year = {2014}, + doi = {10.1007/978-1-4614-7535-4}, + isbn = {978-1-4614-7534-7}, + langid = {english}, +} + + @Comment{jabref-meta: databaseType:biblatex;} @Comment{jabref-meta: saveOrderConfig:specified;author;false;year;false;title;false;} diff --git a/Master/texmf-dist/doc/latex/biblatex-lni/README.md b/Master/texmf-dist/doc/latex/biblatex-lni/README.md index 3c5ccbabe86..0f4fec5cf30 100644 --- a/Master/texmf-dist/doc/latex/biblatex-lni/README.md +++ b/Master/texmf-dist/doc/latex/biblatex-lni/README.md @@ -1,7 +1,7 @@ # biblatex-lni This is a [biblatex] style for [LNI], the Lecture Notes in Informatics of the [Gesellschaft für Informatik e.V.]. -It requires at least [biblatex 3.5] and [biber] 3.6. +It requires at least [biblatex 3.5] and [biber] 2.6. ## Usage diff --git a/Master/texmf-dist/tex/latex/biblatex-lni/LNI.bbx b/Master/texmf-dist/tex/latex/biblatex-lni/LNI.bbx index f08c77639b2..9ca0bc8b5b1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-lni/LNI.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-lni/LNI.bbx @@ -9,8 +9,8 @@ % http://www.latex-project.org/lppl.txt % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. -\def\LNI@date{2016-10-13} -\def\LNI@version{0.2} +\def\LNI@date{2016-10-30} +\def\LNI@version{0.3} \def\LNI@bbxid{\LNI@date\space v\LNI@version\space biblatex-LNI bibliography style (LCB/GD/OK)} \def\LNI@cbxid{\LNI@date\space v\LNI@version\space biblatex-LNI citation style (LCB/GD/OK)} \def\LNI@lbxid{\LNI@date\space v\LNI@version\space biblatex-LNI localization (LCB/GD/OK)} @@ -105,7 +105,10 @@ \newbibmacro*{in+editor+maintitle/booktitle}{% \printtext{\bibstring{in}}% \setunit{\addspace}% - \printtext[parens]{\usebibmacro{editor+others}}% + \ifnameundef{editor} + {} + {\printtext[parens]{% + \usebibmacro{editor+others}}}% \setunit{\nametitledelim}\newblock \usebibmacro{maintitle+booktitle}} @@ -134,7 +137,7 @@ {\usebibmacro{author}}% \setunit{\nametitledelim}\newblock% \usebibmacro{title}% - \setunit{\aftertitledelim}% + \printunit{\aftertitledelim} \usebibmacro{publisher+location}% \printfield{year}% \newunit\newblock @@ -149,17 +152,107 @@ \usebibmacro{finentry}% } +\DeclareBibliographyDriver{collection}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{editor+others}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{maintitle+title}% + \printunit{\aftertitledelim} + \printlist{language}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \printfield{edition}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+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}} + +\DeclareBibliographyDriver{incollection}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/translator+others}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \printunit{\aftertitledelim} + \usebibmacro{in+editor+maintitle/booktitle}% + \printunit{\aftertitledelim} + \printfield{edition}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publisher+location+date}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \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}} + \DeclareBibliographyDriver{inproceedings}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/translator+others}% \setunit{\nametitledelim}\newblock \usebibmacro{title}% - \setunit{\aftertitledelim}% - \usebibmacro{in+editor+maintitle/booktitle}% - \newunit% + \printunit{\aftertitledelim} + \usebibmacro{in+editor+maintitle/booktitle}% + \iffieldundef{eventtitle} + {} + {\printunit{\aftertitledelim}} \usebibmacro{event+venue+date}% - \setunit{\aftertitledelim}\newblock + \printunit{\aftertitledelim}\newblock \iffieldundef{maintitle} {\printfield{volume}% \printfield{part}} @@ -201,9 +294,9 @@ \usebibmacro{author/translator+others}% \setunit{\nametitledelim}\newblock \usebibmacro{title}% - \setunit{\aftertitledelim}% + \printunit{\aftertitledelim}% \usebibmacro{in+editor+maintitle/booktitle}% - \setunit{\aftertitledelim}\newblock + \printunit{\aftertitledelim}\newblock \printfield{edition}% \newunit \iffieldundef{maintitle} @@ -245,7 +338,7 @@ \usebibmacro{author/translator+others}% \setunit{\nametitledelim}\newblock \usebibmacro{title}% - \setunit{\aftertitledelim}%\newblock + \printunit{\aftertitledelim} \printlist{language}% \newunit\newblock \usebibmacro{byauthor}% -- cgit v1.2.3