summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-03 22:43:02 +0000
committerKarl Berry <karl@freefriends.org>2019-11-03 22:43:02 +0000
commit01b003297fdb3212b399d3a7421eefe0f15e3157 (patch)
tree50c41447d3ba7ba43ad9e0ed07dbdf0056dd2840
parent8eee6a8899b57558d5d83d6e0064c16ee287be7d (diff)
biblatex-iso690
git-svn-id: svn://tug.org/texlive/trunk@52629 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdfbin166874 -> 167673 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex42
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx44
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx694
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-iso690/polish-iso.lbx18
5 files changed, 413 insertions, 385 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf
index c165500314e..99bf7c4a520 100644
--- a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex
index 3ec1ca4d9bc..1ff35be97a1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-iso690/biblatex-iso690.tex
@@ -23,6 +23,7 @@
,sortlocale=cs_CZ
,bibencoding=UTF8
,spacecolon=false
+ % ,isbn=false
%,block=ragged
]{biblatex}
@@ -34,7 +35,7 @@
url={https://github.com/michal-h21/biblatex-iso690},
author={Michal Hoftich},
email={michal.h21@gmail.com},
- revision={0.3.2},
+ revision={0.3.3},
date={\today}}
\hypersetup{%
@@ -124,7 +125,7 @@ The international standard ISO 690 prescribes exactly 3 methods of
citation. However, based on the user input, this package contains
more of them.
-\subsubsection{Official methods}
+\subsubsection{Standardized methods}
\begin{description}
\item[iso-authoryear] name and date system, so-called Harvard style
@@ -134,7 +135,7 @@ more of them.
There is also one more system of running notes, which is not
implemented yet.
-\subsubsection{Unofficial methods}
+\subsubsection{Non-standardized methods}
\begin{description}
\item[iso-alphabetic] alphabetic system
@@ -149,9 +150,9 @@ Frequently used package options are
\begin{description}
\item[style] style to be used for bibliographic references and citations.
-Four possibilities are available, \t|iso-authoryear| commonly known as
-“Harvard system”, \t|iso-numeric| as a numeric system, \t|iso-alphabetic|
-and \t|iso-authortitle|.
+Four possibilities are available for the \t|biblatex-iso690| package,
+\t|iso-authoryear| commonly known as “Harvard system”, \t|iso-numeric| as a
+numeric system, \t|iso-alphabetic| and \t|iso-authortitle|.
\item[backend] backend program for generating bibliographic entries. \biber
is the default one for the \biblatex package, providing a large variety
@@ -161,7 +162,8 @@ are far behind the possibilities of \biber. \biber is the recommended backend.
\item[autolang] controls which language environment is used. The most
significant value is \t|other|, which supports printing localization
terms in the language of the resource or language specific hyphenation.
-Default value is \t|none|, which disables this feature.
+Default value for \biblatex package is \t|none|, which disables this feature.
+Default value for \t|biblatex-iso690| package is \t|other|.
\item[sortlocale] responsible for sorting the bibliography according to the
entered \t|locale| identifier. It should usually be set to one using the
@@ -198,6 +200,18 @@ encoding of the \t|tex| file.
\textit{availability and access} is possible by setting the option
to \t|false|. Otherwise it will be printed in the \textit{notes} section.
Default value is \t|true|.
+
+ \item[doi] enable or disable printing of the DOI number. Default value is
+ \t|true|.
+
+ \item[isbn] enable or disable printing of the ISBN, ISSN and other standard
+ identifiers. Default value is \t|true|.
+
+ \item[eprint] enable or disable printing of the eprint field. Default value
+ is \t|true|.
+
+ \item[url] enable or disable printing of the URL. Default value is \t|true|.
+
\end{description}
@@ -507,7 +521,19 @@ in a reference. The field \t|library| serves for this purpose.
\begin{changelog}
-\begin{release}{0.3.2}{2016-04-25}
+\begin{release}{0.3.3}{2019-10-30}
+\item Doc better wording
+\item Enable multilingual references by default
+\item Added isbn, doi, url and eprint options for blocking corresponding fields
+\item Printing out (the same) editors also in the consecutive entries --
+ get rid of the dash as default (\t|iso-authoryear| style)
+\item Removed deprecated \biblatex\ options
+\item Changed URL address for DOI records
+\item Clean up of indentation and spacing in the source code
+\item Renamed \t|editor| macro to \t|incollection-editor|
+\end{release}
+
+\begin{release}{0.3.2}{2017-04-25}
\item Synchronized \t|iso-numeric| bibliography environment with original \t|numeric| style
\item Added support for alphabetic bibliographic style (\t|iso-alphabetic|)
\item Incompatible change: \t|thesisinfolast| package option changed to \t|thesisinfoinnotes|
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx
index 707a82f64ec..a7a84cb7bc2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx
@@ -8,7 +8,7 @@
\def\printextrayear{%
\ifentrytype{patent}
{}
- {\printfield{year}\printfield{extrayear}}%
+ {\printfield{year}\printfield{extradate}}%
}
% remove second appearance of year in a reference
@@ -45,47 +45,5 @@
\usebibmacro{setpageref}%
\finentry}
-\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}
-\newbibmacro*{bbx:editor}[1]{%
- \ifboolexpr{
- test \ifuseeditor
- and
- not test {\ifnameundef{editor}}
- }
- {\usebibmacro{bbx:dashcheck}
- {\bibnamedash}
- {\usebibmacro{bbx:savehash}%
- \printnames{editor}%
- \addspace%
- \mkbibparens{\usebibmacro{#1}}}%
- \clearname{editor}}%
- {\global\undef\bbx@lasthash
- \usebibmacro{labeltitle}}}%
-
-\newbibmacro*{bbx:dashcheck}[2]{%
- \ifboolexpr{
- test {\iffieldequals{fullhash}{\bbx@lasthash}}
- and
- not test \iffirstonpage
- and
- (
- not bool {bbx@inset}
- or
- test {\iffieldequalstr{entrysetcount}{1}}
- )
- }
- {#1}
- {#2}}
-
-\newbibmacro*{labeltitle}{%
- \iffieldundef{label}
- {\iffieldundef{shorttitle}
- {\usebibmacro{titles}{}{emph}%
- \clearfield{title}%
- \clearfield{subtitle}%
- \clearfield{titleaddon}}
- {\printfield{shorttitle}}}
- {\printfield{label}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx
index 92c8a78e9be..c4d0f165316 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx
@@ -4,6 +4,7 @@
\DeclareLanguageMapping{english}{english-iso}
\DeclareLanguageMapping{slovak}{slovak-iso}
\DeclareLanguageMapping{german}{german-iso}
+\DeclareLanguageMapping{polish}{polish-iso}
\NewBibliographyString{at,bysupervisor,urlalso}
%options
@@ -28,20 +29,43 @@
\settoggle{bbx:thesisinfoinnotes}{#1}%
\typeout{Printing thesis info at the end enabled: #1}}
+\newtoggle{bbx:url}
+\DeclareBibliographyOption{url}[true]{%
+ \settoggle{bbx:url}{#1}%
+ \typeout{Showing URL field enabled: #1}}
+
+\newtoggle{bbx:isbn}
+\DeclareBibliographyOption{isbn}[true]{%
+ \settoggle{bbx:isbn}{#1}%
+ \typeout{Showing ISBN field enabled: #1}}
+
+\newtoggle{bbx:doi}
+\DeclareBibliographyOption{doi}[true]{%
+ \settoggle{bbx:doi}{#1}%
+ \typeout{Showing DOI field enabled: #1}}
+
+\newtoggle{bbx:eprint}
+\DeclareBibliographyOption{eprint}[true]{%
+ \settoggle{bbx:eprint}{#1}%
+ \typeout{Showing eprint field enabled: #1}}
\ExecuteBibliographyOptions{%
- spacecolon=false
- ,pagetotal=false
- ,shortnumeration=false
- ,thesisinfoinnotes=true
- %sorting=nyt
- ,maxnames=9
- ,minnames=1
- ,citetracker=true
- %,autolang=other
- ,date=year
- ,urldate=edtf
- ,seconds=true
+ spacecolon=false,
+ pagetotal=false,
+ shortnumeration=false,
+ thesisinfoinnotes=true,
+ url=true,
+ isbn=true,
+ doi=true,
+ eprint=true,
+ % sorting=nyt,
+ maxnames=9,
+ minnames=1,
+ citetracker=true,
+ autolang=other,
+ date=year,
+ urldate=iso,
+ seconds=true,
}
\newbibmacro*{begentry}{}
@@ -108,38 +132,38 @@
\DeclareFieldFormat[article,periodical]{pages}{%
\iftoggle{bbx:shortnum}
{#1}
- {\mainsstring{pages}\addspace\printtext{#1}}
+ {\mainsstring{pages}\addspace\printtext{#1}}%
}
\DeclareFieldFormat*{pagetotal}{\mkbibbrackets{\mkmlpagetotal[bookpagination]{#1}}}
\DeclareFieldFormat*{number}{\bibsstring{number}\addspace\printtext{#1}}
\DeclareFieldFormat[article,periodical]{number}{%
\iftoggle{bbx:shortnum}
{\mkbibparens{#1}}
- {\bibsstring{number}\addspace\printtext{#1}}
+ {\bibsstring{number}\addspace\printtext{#1}}%
}
\DeclareFieldFormat[patent]{number}{#1}
\DeclareFieldFormat*{url}{%
\iffieldundef{urlyear}
- {\mainlstring{urlalso}\addcolon\space\url{#1}}
- {\mainlstring{urlfrom}\addcolon\space\url{#1}}
+ {\mainlstring{urlalso}\addcolon\space\url{#1}}
+ {\mainlstring{urlfrom}\addcolon\space\url{#1}}%
}
\DeclareFieldFormat{doi}{%
- \printtext{DOI}\addcolon\space%
+ \printtext{DOI}\addcolon\space
\ifhyperref
- {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
- {\nolinkurl{#1}}
+ {\href{https://doi.org/#1}{\nolinkurl{#1}}}
+ {\nolinkurl{#1}}%
}
\DeclareFieldFormat{howpublished}{\mkbibbrackets{#1}}
\DeclareFieldFormat[online]{howpublished}{%
\iffieldundef{howpublished}
{\mkbibbrackets{online}}
- {\mkbibbrackets{#1}}
+ {\mkbibbrackets{#1}}%
}
\DeclareFieldFormat{type}{%
\ifbibstring{#1}
{\mainlstring{#1}}
- {#1}
+ {#1}%
}
\DeclareFieldFormat{supervisor}{%
@@ -147,12 +171,12 @@
%We must handle more than one isbn and issn
\DeclareFieldFormat{isbn}{%
-%\renewcommand*{\do}[1]{\printtext{ISBN}\addspace#1\adddot\addspace}%
-\printtext{ISBN}\addspace#1}%
+ %\renewcommand*{\do}[1]{\printtext{ISBN}\addspace#1\adddot\addspace}%
+ \printtext{ISBN}\addspace#1}%
\DeclareFieldFormat{issn}{%
-\renewcommand*{\do}[1]{\printtext{ISSN}\addspace#1\adddot\addspace}%
-\docsvfield{issn}}%
+ \renewcommand*{\do}[1]{\printtext{ISSN}\addspace#1\adddot\addspace}%
+ \docsvfield{issn}}%
\DeclareFieldFormat{isan}{\printtext{ISAN}\addspace#1}
\DeclareFieldFormat{ismn}{\printtext{ISMN}\addspace#1}
@@ -208,28 +232,22 @@
\newbibmacro*{names:subsidiary}{%
\usebibmacro{byeditor}%
- \newunit%
+ \newunit
\usebibmacro{bytranslator}%
}
-\renewbibmacro*{editor}{%
- \ifboolexpr{
- test \ifuseeditor
- and
- not test {\ifnameundef{editor}}
- }
- {\printnames{editor}%
- \addspace%
- \mkbibparens{\usebibmacro{editorstrg}}%
- \clearname{editor}}%
- {}}
+% https://github.com/michal-h21/biblatex-iso690/issues/68#issuecomment-435650072
+\DeclareFieldFormat{editortype}{\mkbibparens{#1}}
+\DeclareDelimFormat{editortypedelim}{\addspace}
+
+
\newbibmacro*{thesissupervisor}{%
\ifnameundef{supervisor}
{}
{\printtext{\mainlstring{bysupervisor}}%
\addspace%
- \printnames{supervisor}}
+ \printnames{supervisor}}%
}
%titles
@@ -246,7 +264,7 @@
\printfield{#1subtitle}}%
\setunit{\addspace}}%
\printfield{#1titleaddon}%
- \newunit%
+ \newunit
}%
\newbibmacro{volume}{%
@@ -279,7 +297,7 @@
\newbibmacro{periodical:titles}{%
\usebibmacro{titles}{}{emph}%
- \newunit%
+ \newunit
\iffieldundef{issuetitle}
{\iffieldundef{journaltitle}
{}
@@ -346,18 +364,20 @@
%standard identifiers
\newbibmacro*{identifier}{%
- \printfield{isan}%
- \newunit%
- \printfield{isbn}%
- \newunit%
- \printfield{ismn}%
- \newunit%
- \printfield{isrn}%
- \newunit%
- \printfield{issn}%
- \newunit%
- \printfield{iswc}%
- \newunit%
+ \iftoggle{bbx:isbn}
+ {\printfield{isan}%
+ \newunit
+ \printfield{isbn}%
+ \newunit
+ \printfield{ismn}%
+ \newunit
+ \printfield{isrn}%
+ \newunit
+ \printfield{issn}%
+ \newunit
+ \printfield{iswc}%
+ \newunit}
+ {}%
}
%availability and access
@@ -373,9 +393,15 @@
\newbibmacro*{availability+access}{%
\iffieldundef{doi}
{\iffieldundef{eprint}
- {\printfield{url}}
- {\usebibmacro{from-eprint}}}
- {\usebibmacro{from-doi}}%
+ {\iftoggle{bbx:url}
+ {\printfield{url}}
+ {}}
+ {\iftoggle{bbx:eprint}
+ {\usebibmacro{from-eprint}}
+ {}}}
+ {\iftoggle{bbx:doi}
+ {\usebibmacro{from-doi}}
+ {}}%
}
%location
@@ -497,299 +523,299 @@
%bibliography drivers
\DeclareBibliographyDriver{book}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%
-\usebibmacro{multi:titles}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{names:subsidiary}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-\newunit%
-\printfield{version}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{series+number}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\usebibmacro{location}%
-\setunit{\addspace}%
-\iftoggle{bbx:totalpages}
- {\printfield{pagetotal}}
- {}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{names:primary}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{multi:titles}%
+ \setunit{\addspace}%
+ \usebibmacro{medium-type}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \usebibmacro{names:subsidiary}%
+ \newunit\newblock
+ \usebibmacro{location+publisher+date}%
+ \newunit
+ \printfield{version}%
+ \setunit{\addspace}%
+ \usebibmacro{urldate}%
+ \newunit\newblock
+ \usebibmacro{series+number}%
+ \newunit\newblock
+ \usebibmacro{identifier}%
+ \newunit\newblock
+ \usebibmacro{availability+access}%
+ \newunit\newblock
+ \usebibmacro{location}%
+ \setunit{\addspace}%
+ \iftoggle{bbx:totalpages}
+ {\printfield{pagetotal}}
+ {}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{periodical}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-% names macro just because of author-year style
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%%
-\usebibmacro{periodical:titles}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-\setunit*{\addcomma\addspace}%
-\usebibmacro{serial:numeration}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\usebibmacro{location}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ % names macro just because of author-year style
+ \usebibmacro{names:primary}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{periodical:titles}%
+ \setunit{\addspace}%
+ \usebibmacro{medium-type}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \usebibmacro{location+publisher+date}%
+ \setunit*{\addcomma\addspace}%
+ \usebibmacro{serial:numeration}%
+ \setunit{\addspace}%
+ \usebibmacro{urldate}%
+ \newunit\newblock
+ \usebibmacro{identifier}%
+ \newunit\newblock
+ \usebibmacro{availability+access}%
+ \newunit\newblock
+ \usebibmacro{location}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}%
\DeclareBibliographyDriver{article}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%
-\usebibmacro{titles}{}{}%
-\newunit\newblock%
-\usebibmacro{titles}{journal}{emph}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{date}
-\setunit*{\addcomma\addspace}%
-\usebibmacro{serial:numeration}%
-\setunit{\bibpagespunct}%
-\printfield{pages}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\usebibmacro{location}%
-\newunit\newblock%
-\printfield{note}%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%%
-\usebibmacro{finentry}}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{names:primary}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{titles}{}{}%
+ \newunit\newblock
+ \usebibmacro{titles}{journal}{emph}%
+ \setunit{\addspace}%
+ \usebibmacro{medium-type}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \usebibmacro{date}
+ \setunit*{\addcomma\addspace}%
+ \usebibmacro{serial:numeration}%
+ \setunit{\bibpagespunct}%
+ \printfield{pages}%
+ \setunit{\addspace}%
+ \usebibmacro{urldate}%
+ \newunit\newblock
+ \usebibmacro{identifier}%
+ \newunit\newblock
+ \usebibmacro{availability+access}%
+ \newunit\newblock
+ \usebibmacro{location}%
+ \newunit\newblock
+ \printfield{note}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}%
\DeclareBibliographyDriver{inbook}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%
-\usebibmacro{titles}{}{}%
-\newunit\newblock%
-\usebibmacro{in:}%
-\printnames{bookauthor}%
-\newunit\newblock%
-\usebibmacro{host:titles}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{names:subsidiary}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-\setunit*{\addcomma\addspace}%
-\usebibmacro{book:numeration}%
-\setunit{\bibpagespunct}%
-\printfield{pages}%
-\newunit%
-\printfield{version}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{series+number}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\usebibmacro{location}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{names:primary}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{titles}{}{}%
+ \newunit\newblock
+ \usebibmacro{in:}%
+ \printnames{bookauthor}%
+ \newunit\newblock
+ \usebibmacro{host:titles}%
+ \setunit{\addspace}%
+ \usebibmacro{medium-type}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \usebibmacro{names:subsidiary}%
+ \newunit\newblock
+ \usebibmacro{location+publisher+date}%
+ \setunit*{\addcomma\addspace}%
+ \usebibmacro{book:numeration}%
+ \setunit{\bibpagespunct}%
+ \printfield{pages}%
+ \newunit
+ \printfield{version}%
+ \setunit{\addspace}%
+ \usebibmacro{urldate}%
+ \newunit\newblock
+ \usebibmacro{series+number}%
+ \newunit\newblock
+ \usebibmacro{identifier}%
+ \newunit\newblock
+ \usebibmacro{availability+access}%
+ \newunit\newblock
+ \usebibmacro{location}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}%
\DeclareBibliographyDriver{incollection}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%
-\usebibmacro{titles}{}{}%
-\newunit\newblock%
-\usebibmacro{in:}%
-\usebibmacro{editor}%
-\newunit\newblock%
-\usebibmacro{host:titles}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{names:subsidiary}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-% could number be even used in `incollection`?
-% It should be at some other place in this case
-\setunit*{\addcomma\addspace}%
-\usebibmacro{book:numeration}%
-\setunit{\bibpagespunct}%
-\printfield{pages}%
-\newunit%
-\printfield{version}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{series+number}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\usebibmacro{location}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{names:primary}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{titles}{}{}%
+ \newunit\newblock
+ \usebibmacro{in:}%
+ \usebibmacro{editor}%
+ \newunit\newblock
+ \usebibmacro{host:titles}%
+ \setunit{\addspace}%
+ \usebibmacro{medium-type}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \usebibmacro{names:subsidiary}%
+ \newunit\newblock
+ \usebibmacro{location+publisher+date}%
+ % could number be even used in `incollection`?
+ % It should be at some other place in this case
+ \setunit*{\addcomma\addspace}%
+ \usebibmacro{book:numeration}%
+ \setunit{\bibpagespunct}%
+ \printfield{pages}%
+ \newunit
+ \printfield{version}%
+ \setunit{\addspace}%
+ \usebibmacro{urldate}%
+ \newunit\newblock
+ \usebibmacro{series+number}%
+ \newunit\newblock
+ \usebibmacro{identifier}%
+ \newunit\newblock
+ \usebibmacro{availability+access}%
+ \newunit\newblock
+ \usebibmacro{location}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}%
\DeclareBibliographyDriver{online}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%
-\usebibmacro{multi:titles}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{names:subsidiary}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-\newunit%
-\printfield{version}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{series+number}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\setunit{\addspace}%
-\iftoggle{bbx:totalpages}
- {\printfield{pagetotal}}
- {}%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%%
-\usebibmacro{finentry}}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{names:primary}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{multi:titles}%
+ \setunit{\addspace}%
+ \usebibmacro{medium-type}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \usebibmacro{names:subsidiary}%
+ \newunit\newblock
+ \usebibmacro{location+publisher+date}%
+ \newunit
+ \printfield{version}%
+ \setunit{\addspace}%
+ \usebibmacro{urldate}%
+ \newunit\newblock
+ \usebibmacro{series+number}%
+ \newunit\newblock
+ \usebibmacro{identifier}%
+ \newunit\newblock
+ \usebibmacro{availability+access}%
+ \setunit{\addspace}%
+ \iftoggle{bbx:totalpages}
+ {\printfield{pagetotal}}
+ {}%
+ \printfield{note}%
+ \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}%
\DeclareBibliographyDriver{thesis}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%%
-\usebibmacro{titles}{}{emph}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-\newunit%
-\printfield{version}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\iftoggle{bbx:thesisinfoinnotes}
- {}
- {\printfield{type}
- \newunit\newblock%
- \printlist{institution}%
- \newunit\newblock%
- \usebibmacro{thesissupervisor}}%
-\newunit\newblock%
-\usebibmacro{availability+access}
-\setunit{\addspace}%
-\iftoggle{bbx:totalpages}
- {\printfield{pagetotal}}
- {}%
-\newunit\newblock%
-\iftoggle{bbx:thesisinfoinnotes}
- {\printfield{type}
- \newunit\newblock%
- \printlist{institution}%
- \newunit\newblock%
- \usebibmacro{thesissupervisor}}
- {}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{names:primary}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{titles}{}{emph}%
+ \setunit{\addspace}%
+ \usebibmacro{medium-type}%
+ \newunit\newblock
+ \usebibmacro{location+publisher+date}%
+ \newunit
+ \printfield{version}%
+ \setunit{\addspace}%
+ \usebibmacro{urldate}%
+ \newunit\newblock
+ \usebibmacro{identifier}%
+ \newunit\newblock
+ \iftoggle{bbx:thesisinfoinnotes}
+ {}
+ {\printfield{type}
+ \newunit\newblock
+ \printlist{institution}%
+ \newunit\newblock
+ \usebibmacro{thesissupervisor}}%
+ \newunit\newblock
+ \usebibmacro{availability+access}%
+ \setunit{\addspace}%
+ \iftoggle{bbx:totalpages}
+ {\printfield{pagetotal}}
+ {}%
+ \newunit\newblock
+ \iftoggle{bbx:thesisinfoinnotes}
+ {\printfield{type}
+ \newunit\newblock
+ \printlist{institution}%
+ \newunit\newblock
+ \usebibmacro{thesissupervisor}}
+ {}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}%
\DeclareBibliographyDriver{patent}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%%
-\usebibmacro{titles}{}{emph}%
-\newunit\newblock%
-\usebibmacro{names:subsidiary}%
-\newunit\newblock%
-\printfield{classification}%
-\newunit\newblock%
-\printlist{location}%
-\newunit\newblock%
-\iffieldundef{type}
- {}
- {\printfield{type}%
- \setunit*{\addcomma\space}}%
-\printfield{number}%
-\newunit\newblock%
-\usebibmacro{fulldate}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{names:primary}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{titles}{}{emph}%
+ \newunit\newblock
+ \usebibmacro{names:subsidiary}%
+ \newunit\newblock
+ \printfield{classification}%
+ \newunit\newblock
+ \printlist{location}%
+ \newunit\newblock
+ \iffieldundef{type}
+ {}
+ {\printfield{type}%
+ \setunit*{\addcomma\space}}%
+ \printfield{number}%
+ \newunit\newblock
+ \usebibmacro{fulldate}%
+ \setunit{\addspace}%
+ \usebibmacro{urldate}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{availability+access}%
+ \newunit\newblock
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \usebibmacro{finentry}}%
%bibliography aliases
diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/polish-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/polish-iso.lbx
new file mode 100644
index 00000000000..9384b047aeb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/polish-iso.lbx
@@ -0,0 +1,18 @@
+\ProvidesFile{polish-iso.lbx}
+[2016/05/13 v0.3.1 biblatex localization]
+
+\InheritBibliographyExtras{polish}
+\InheritBibliographyStrings{polish}
+
+\DeclareBibliographyStrings{%
+ at = {{w}%
+ {w}},
+ bysupervisor = {{promotor}%
+ {promotor}},
+ urlfrom = {{dostępne z}%
+ {dostępne z}},
+ urlalso = {{dostępne także z}%
+ {dostępne także z}},
+}
+
+\endinput