From 4264d79ed28e27760be5ab7ea4d90aefa9998c1c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 26 Apr 2017 22:45:55 +0000 Subject: biblatex-iso690 (26apr17) git-svn-id: svn://tug.org/texlive/trunk@44066 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-iso690/czech-iso.lbx | 2 +- .../tex/latex/biblatex-iso690/english-iso.lbx | 2 +- .../tex/latex/biblatex-iso690/german-iso.lbx | 16 ++ .../tex/latex/biblatex-iso690/iso-alphabetic.bbx | 46 +++++ .../tex/latex/biblatex-iso690/iso-alphabetic.cbx | 6 + .../tex/latex/biblatex-iso690/iso-authortitle.bbx | 2 +- .../tex/latex/biblatex-iso690/iso-authortitle.cbx | 2 +- .../tex/latex/biblatex-iso690/iso-authortitle.dbx | 2 +- .../tex/latex/biblatex-iso690/iso-authoryear.bbx | 2 +- .../tex/latex/biblatex-iso690/iso-authoryear.cbx | 2 +- .../tex/latex/biblatex-iso690/iso-authoryear.dbx | 2 +- .../tex/latex/biblatex-iso690/iso-numeric.bbx | 10 +- .../tex/latex/biblatex-iso690/iso-numeric.cbx | 2 +- .../tex/latex/biblatex-iso690/iso-numeric.dbx | 2 +- .../texmf-dist/tex/latex/biblatex-iso690/iso.bbx | 18 +- .../texmf-dist/tex/latex/biblatex-iso690/mybib.bib | 194 --------------------- .../tex/latex/biblatex-iso690/slovak-iso.lbx | 2 +- 17 files changed, 95 insertions(+), 217 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-iso690/german-iso.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.bbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.cbx delete mode 100644 Master/texmf-dist/tex/latex/biblatex-iso690/mybib.bib (limited to 'Master/texmf-dist/tex/latex/biblatex-iso690') diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/czech-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/czech-iso.lbx index 8772e7e51b8..84546aa71d1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/czech-iso.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/czech-iso.lbx @@ -1,5 +1,5 @@ \ProvidesFile{czech-iso.lbx} -[2016/05/13 v0.3.1 biblatex localization] +[2017/04/25 v0.3.2 biblatex localization] \InheritBibliographyExtras{czech} \InheritBibliographyStrings{czech} diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/english-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/english-iso.lbx index 537887a1676..e1a5e01b6b1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/english-iso.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/english-iso.lbx @@ -1,5 +1,5 @@ \ProvidesFile{english-iso.lbx} -[2016/05/13 v0.3.1 biblatex localization] +[2017/04/25 v0.3.2 biblatex localization] \InheritBibliographyExtras{english} \InheritBibliographyStrings{english} diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/german-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/german-iso.lbx new file mode 100644 index 00000000000..486a5d506dc --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/german-iso.lbx @@ -0,0 +1,16 @@ +\ProvidesFile{german-iso.lbx} +[2017/04/25 v0.3.2 biblatex localization] + +\InheritBibliographyExtras{german} +\InheritBibliographyStrings{german} + +\DeclareBibliographyStrings{% + at = {{Standort} + {Standort}}, + bysupervisor = {{betreut von}% maybe Betreuer, but gender-dependent then, female: Betreuerin + {betreut von}}, + urlalso = {{auch verf\"{u}gbar unter} + {auch verf\"{u}gbar unter}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.bbx new file mode 100644 index 00000000000..8e460f2cbba --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.bbx @@ -0,0 +1,46 @@ +\ProvidesFile{alphabetic.bbx} +[2017/04/25 v0.3.2 biblatex citation style] + +% This is a copy of alphabetic.bbx +% It only uses iso as base style, instead of standard + +\RequireBibliographyStyle{iso} +\ExecuteBibliographyOptions{labelalpha,sorting=nyt} % was sorting anyt + +\DeclareNameAlias{author}{default} +\DeclareNameAlias{editor}{default} +\DeclareNameAlias{translator}{default} + +\DeclareFieldFormat{labelalphawidth}{\mkbibbrackets{#1}} +\DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}} + +\defbibenvironment{bibliography} + {\list + {\printtext[labelalphawidth]{% + \printfield{labelprefix}% + \printfield{labelalpha}% + \printfield{extraalpha}}} + {\setlength{\labelwidth}{\labelalphawidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\bibitemsep}% + \setlength{\parsep}{\bibparsep}}% + \renewcommand*{\makelabel}[1]{##1\hss}} + {\endlist} + {\item} + +\defbibenvironment{shorthand} + {\list + {\printfield[shorthandwidth]{shorthand}} + {\setlength{\labelwidth}{\shorthandwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\bibitemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}} + {\endlist} + {\item} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.cbx new file mode 100644 index 00000000000..2a4bdcbfa0e --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-alphabetic.cbx @@ -0,0 +1,6 @@ +\ProvidesFile{iso-alphabetic.cbx} +[2017/04/25 v0.3.2 biblatex citation style] + +\RequireCitationStyle{alphabetic} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx index 739482f91aa..e558c54fda3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.bbx @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authortitle.bbx}[2016/05/13 v0.3.1 biblatex bibliography style] +\ProvidesFile{iso-authortitle.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] \RequireBibliographyStyle{iso} \ExecuteBibliographyOptions{% diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx index af9ae218955..f6b9e0aa8d4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.cbx @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authortitle.cbx}[2016/05/13 v0.3.1 biblatex citation style] +\ProvidesFile{iso-authortitle.cbx}[2017/04/25 v0.3.2 biblatex citation style] \ExecuteBibliographyOptions{% maxcitenames=1 diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx index b68153cc736..fe51d184d24 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authortitle.dbx @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authortitle.dbx}[2016/05/13 v0.3.1 biblatex data model extension] +\ProvidesFile{iso-authortitle.dbx}[2017/04/25 v0.3.2 biblatex data model extension] \RequireBiber[3] \DeclareDatamodelFields[type=list,datatype=name]{supervisor} \DeclareDatamodelFields[type=field,datatype=literal]{classification} 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 49629ce0ebf..707a82f64ec 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.bbx @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authoryear.bbx}[2016/05/13 v0.3.1 biblatex bibliography style] +\ProvidesFile{iso-authoryear.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] \RequireBibliographyStyle{iso} \ExecuteBibliographyOptions{% diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx index d3801f640b9..2d58ac71d98 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.cbx @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authoryear.cbx}[2016/05/13 v0.3.1 biblatex citation style] +\ProvidesFile{iso-authoryear.cbx}[2017/04/25 v0.3.2 biblatex citation style] \ExecuteBibliographyOptions{% maxcitenames=1 diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx index 9885b06918f..c024de9d215 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-authoryear.dbx @@ -1,4 +1,4 @@ -\ProvidesFile{iso-authoryear.dbx}[2016/05/13 v0.3.1 biblatex data model extension] +\ProvidesFile{iso-authoryear.dbx}[2017/04/25 v0.3.2 biblatex data model extension] \RequireBiber[3] \DeclareDatamodelFields[type=list,datatype=name]{supervisor} \DeclareDatamodelFields[type=field,datatype=literal]{classification} diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx index d661c3e72dd..ba64c58a693 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.bbx @@ -1,4 +1,4 @@ -\ProvidesFile{iso-numeric.bbx}[2016/05/13 v0.3.1 biblatex bibliography style] +\ProvidesFile{iso-numeric.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] \RequireBibliographyStyle{iso} \ExecuteBibliographyOptions{% @@ -18,15 +18,17 @@ \printfield{prefixnumber}% \printfield{labelnumber}}}}% +% Copy-pasted from 'numeric.bbx' \defbibenvironment{bibliography} {\list% {\MethodFormat}% - {\setlength{\leftmargin}{\bibhang}% - \setlength{\itemindent}{-\leftmargin}% + {\setlength{\labelwidth}{\labelnumberwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}}% \renewcommand*{\makelabel}[1]{\hss##1} - %\raggedright} }% {\endlist}% {\item}% diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx index d2c2011b0ec..dc54ba52279 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.cbx @@ -1,4 +1,4 @@ -\ProvidesFile{iso-numeric.cbx}[2016/05/13 v0.3.1 biblatex citation style] +\ProvidesFile{iso-numeric.cbx}[2017/04/25 v0.3.2 biblatex citation style] \RequireCitationStyle{numeric} \RequireCitationStyle{iso-fullcite} diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx index 4edbb68ace9..c2bded8f073 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso-numeric.dbx @@ -1,4 +1,4 @@ -\ProvidesFile{iso-numeric.dbx}[2016/05/13 v0.3.1 biblatex data model extension] +\ProvidesFile{iso-numeric.dbx}[2017/04/25 v0.3.2 biblatex data model extension] \RequireBiber[3] \DeclareDatamodelFields[type=list,datatype=name]{supervisor} \DeclareDatamodelFields[type=field,datatype=literal]{classification} diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx index 4f240cf3719..92c8a78e9be 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx @@ -1,8 +1,9 @@ -\ProvidesFile{iso.bbx}[2016/05/13 v0.3.1 biblatex bibliography style] +\ProvidesFile{iso.bbx}[2017/04/25 v0.3.2 biblatex bibliography style] \DeclareLanguageMapping{czech}{czech-iso} \DeclareLanguageMapping{english}{english-iso} \DeclareLanguageMapping{slovak}{slovak-iso} +\DeclareLanguageMapping{german}{german-iso} \NewBibliographyString{at,bysupervisor,urlalso} %options @@ -22,9 +23,9 @@ \settoggle{bbx:shortnum}{#1}% \typeout{Short numeration enabled: #1}} -\newtoggle{bbx:thesisinfolast} -\DeclareBibliographyOption{thesisinfolast}[true]{% - \settoggle{bbx:thesisinfolast}{#1}% +\newtoggle{bbx:thesisinfoinnotes} +\DeclareBibliographyOption{thesisinfoinnotes}[true]{% + \settoggle{bbx:thesisinfoinnotes}{#1}% \typeout{Printing thesis info at the end enabled: #1}} @@ -32,14 +33,15 @@ spacecolon=false ,pagetotal=false ,shortnumeration=false - ,thesisinfolast=true + ,thesisinfoinnotes=true %sorting=nyt ,maxnames=9 ,minnames=1 ,citetracker=true %,autolang=other ,date=year - ,urldate=iso8601 + ,urldate=edtf + ,seconds=true } \newbibmacro*{begentry}{} @@ -730,7 +732,7 @@ \newunit\newblock% \usebibmacro{identifier}% \newunit\newblock% -\iftoggle{bbx:thesisinfolast} +\iftoggle{bbx:thesisinfoinnotes} {} {\printfield{type} \newunit\newblock% @@ -744,7 +746,7 @@ {\printfield{pagetotal}} {}% \newunit\newblock% -\iftoggle{bbx:thesisinfolast} +\iftoggle{bbx:thesisinfoinnotes} {\printfield{type} \newunit\newblock% \printlist{institution}% diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/mybib.bib b/Master/texmf-dist/tex/latex/biblatex-iso690/mybib.bib deleted file mode 100644 index 6d1d03cb702..00000000000 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/mybib.bib +++ /dev/null @@ -1,194 +0,0 @@ -% This file was created with JabRef 2.6. -% Encoding: UTF8 -@ONLINE{t00, - editor = {Bratková, Eva}, - editortype={compiler}, - title = {Metody citování literatury a strukturování bibliografických záznamů podle mezinárodních norem ISO 690 a ISO 690-2}, - subtitle = {metodický materiál pro autory vysokoškolských kvalifikačních prací}, edition = {Verze 2.0, aktualiz. a rozšíř.}, - location = {Praha}, - publisher = {Odborná komise pro otázky elektronického zpřístupňování vysokoškolských kvalifikačních prací, Asociace knihoven vysokých škol ČR}, - date = {2008-12-22}, - pagetotal = {60}, - url = {http://www.evskp.cz/SD/4c.pdf}, - urldate = {2011-02-02}, - langid={czech} -} - -@BOOK{t01, - author = {Borgman, Christine L.}, - year={2003}, - title = {From Gutenberg to the global information infrastructure}, - subtitle = {access to information in the networked world}, - edition= {first}, - location = {Cambridge (Mass)}, - publisher = {The MIT Press}, - pagetotal = {xviii, 324}, - isbn = {0-262-52345-0}, - langid={english} -} - -@INCOLLECTION{t02, - author = {Greenberg, David}, - year = {1998}, - title = {Camel drivers and gatecrashers}, - subtitle = {quality control in the digital research library}, - editor = {Hawkins, B.L and Battin, P}, - booktitle = {The mirage of continuity}, - booksubtitle = {reconfiguring academic information resources for the 21st century}, - location = {Washington (D.C.)}, - publisher = {Council on Library and Information Resources; Association of American Universities}, - pages = {105-116}, - langid = {english} -} - -@ARTICLE{t03, - author = {LYNCH, C.}, - year = {2005}, - title = {Where do we go from here?}, - subtitle = {the next decade for digital libraries}, - journaltitle = {DLib Magazine}, - volume = {11}, - number = {7/8}, - urldate ={2005-08-15}, - url = {http://www.dlib.org/dlib/july05/lynch/07lynch.html}, - issn = {1082-9873}, - langid = {english} -} - -@ARTICLE{cr, - author = {{Národní knihovna}}, - title = {A big paper}, - journaltitle = {The journal of big papers}, - year = {1991}, - volume = {12}, - number = {3}, - issn={2232-332X}, - langid={english} -} - -@BOOK{kniha, - title = {A big paper}, - subtitle={Podtitul}, - publisher = {Academia}, - year = {1991}, - author = {Děťa, Hugh and Rychlík, Tomáš}, - edition = {2}, - pagetotal = {550}, - location = {Praha}, - series={Pokusná edice}, - isbn={978-44-55-X}, - url={http://pokus.cz}, - comment={Dostupné také z WWW}, - urldate = {2011-01-12}, - langid={czech} -} - -@BOOK{kniha2, - title = {Úplně úžasná knížka}, - year = {1991}, - author = {Děťa, Hugh and Rychlík, Tomáš and Další, Pepa and Spousta, Pepa and Skoro, Moc and Ale, Nestačí and Hodně}, - edition = {3}, - address = {Praha}, - langid={czech} -} - -@BOOK{kniha3, - title = {Úplně úžasná knížka}, - year = {1991}, - author = {Děťa, Hugh and Rychlík, Tomáš and Další, Pepa and Spousta, Pepa and Skoro, Moc and Ale, Nestačí and Hodně}, - edition = {3}, - publisher={MIT Press}, - address = {Praha}, - pagetotal={332}, - langid={english} -} - -@ARTICLE{small, - author = {Freely, I.P.}, - title = {A small paper}, - subtitle = {Podtitulek}, - journaltitle = {The journal of small papers}, - year = {1997}, - volume = {1}, - note = {to appear}, - pages={2-5}, - number={3}, - langid={czech} -} - -@ARTICLE{big, - author = {Jass, Hugh}, - title = {A big paper}, - journal = {The journal of big papers}, - year = {1991}, - volume = {23} -} - -@ARTICLE{cs, - COMMENT_OUTauthor = {Černý, Hugh}, - title = {Titulek}, - journal = {The journal of big papers}, - year = {1991}, - volume = {12}, - pages = {22-44}, - doi = {10.112.22/jkn}, - number = {2}, -} - -@BOOK{koll, - author = {Kollmannová, Ludmila and Bubeníková, Libuše and Kopecká, Alena}, - title = {Angličtina pro samouky}, - edition = {5}, - location = {Praha}, - publisher = {Státní pedagogické nakladatelství}, - year = {1977}, - pagetotal = {525}, - series = {Učebnice pro samouky}, - number = {4}, - isbn = {80-04-25663-5} -} - -@INBOOK{kap, - author = {Novotná, Pepina}, - title = {Podkapitola}, - pages = {22-29}, - chapter = {2.}, - crossref = {koll} -} - -@PERIODICAL{tug, - journaltitle = {TUGBoat}, - publisher = {TUG}, - issn = {1222-3333}, - langid = {english}, - date = {1980/}, - options = {skipbib=true}, - url={http://tugboat.tug.org/} -} - -@ARTICLE{knuth, - author = {Knuth, Donald}, - title = {Journeys of \TeX}, - volume = {17}, - number = {3}, - year = {2003}, - pages = {12-22}, - url = {http://tugboat.tug.org/kkk.pdf}, - crossref={tug} -} - -@COLLECTION{sbornik, -title = {Mimořádně užitečný sborník}, -editor = {Geniální, Jiří}, -year = {2007}, -langid = {czech}, -location = {Praha}, -publisher = {Academia}, -isbn = {978-222-626-222-2} -} -@INCOLLECTION{prispevek1, -crossref = {sbornik}, -title = {Velmi zajímavý článek}, -author = {Vlaštovka, Josef}, -pages = {22-45} -} diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/slovak-iso.lbx b/Master/texmf-dist/tex/latex/biblatex-iso690/slovak-iso.lbx index 1b1407b74dc..313a4245b6e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-iso690/slovak-iso.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-iso690/slovak-iso.lbx @@ -1,5 +1,5 @@ \ProvidesFile{slovak-iso.lbx} -[2016/05/13 v0.3.1 biblatex localization] +[2017/04/25 v0.3.2 biblatex localization] \InheritBibliographyExtras{slovak} \InheritBibliographyStrings{slovak} -- cgit v1.2.3