diff options
Diffstat (limited to 'Master/texmf-dist')
25 files changed, 1419 insertions, 1250 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES b/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES index 7f26cefd0cd..5168fd03516 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES +++ b/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES @@ -1,9 +1,56 @@ -biblatex-dw 2010/03/11 v1.3 +biblatex-dw 2010/09/21 v1.3a Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2010 Version history --------------- +v1.3a [2010/09/21] +This version of biblatex-dw supports biblatex 0.9d. Please +note that you have to update biblatex at least to version +0.9b if you would like to use biblatex-dw 1.3a! You will +also need to install the package logreq which is a new +requirement since biblatex 0.9b. Users might also need to +update their data due to some changes in biblatex 0.9a and +biblatex 0.9b. Please follow the hints for users given in +biblatex’s RELEASE notes for both of these versions. +The following changes were made to biblatex-dw: + - Option »omitpages« was renamed to »citepages« and + enhanced. As in the verbose standard styles, you can now + choose between »permit«, »omit«, »suppress« and + »separate«. Other as in the biblatex styles, the standard + for this option in biblatex-dw is »separate«. + - Option »herename« dropped. The same functionality can now + be achieved by using »citepages=separate«. Note that the + bibliography string »herename« was also dropped, + »thiscite« is used instead. + - New option »shorthandinbib«: if set to »true«, the + shorthand of each entry will be typeset in the + bibliography before each item. The shorthand will be set + in brackets, separated by a space. You can customize this + behaviour by adjusting the following commands: + \DeclareFieldFormat{shorthandinbib}{\mkbibbrackets{#1}} + \newcommand*{\shorthandinbibpunct}{\addspace} + The default for »shorthandinbib« is »false«. + - BUGFIX: The shorthandpunct could not be redefined by a + simple \renewcommand, but only as an argument of + \AtBeginDocument. This is now fixed, and a simple + \renewcommand is sufficient. + - BUGFIX: The shorthandpunct was also printed, when the + option »shorthandwidth« was not in use (this had only + effect, when the shorthandpunct was redefined). This is + now fixed. + - BUGFIX: When using authortitle-dw with »firstfull=true«, + a \parencite had an erroneous space for the first + citation without a postnote. This is now fixed. + - BUGFIX: The new editorial roles introduced in biblatex + 0.9 were not fully supported. This is now fixed. + - BUGFIX: The option »firstfullname« did not work with + biblatex’s option »uniquename«. This is now fixed. + - BUGFIX: When using hyperref, some links to the + bibliography were broken. This should now be fixed. + - BUGFIX: In @inbook entries the punctuation after a book + author was not the \labelnamepunct. This is now fixed. + v1.3 [2010/03/11] This version of biblatex-dw supports biblatex 0.9. Please @@ -11,25 +58,25 @@ note that you have to update biblatex as well if you would like to use biblatex-dw 1.3! Users might need to update their data due to some changes in biblatex, especially concerned with date specifications. Please follow the hints -for users given in biblatex's RELEASE notes. +for users given in biblatex’s RELEASE notes. Further changes in this release: - - The option 'isrn' and 'issn' were dropped. Their + - The options »isrn« and »issn« were dropped. Their functionality can be achieved by the biblatex option - 'isbn'. - - BUGFIX: When using 'idembibformat=dash', the @inreference + »isbn«. + - BUGFIX: When using »idembibformat=dash«, the @inreference entries had a wrong punctuation inside the title. This is now fixed. - - Option 'pseudoauthor' changed: if set to true (and the - entry option 'pseudoauthor' is used), the author of this + - Option »pseudoauthor« changed: if set to true (and the + entry option »pseudoauthor« is used), the author of this entry is printed. The new commands \bibleftpseudo and \bibrightpseudo are used to enclose the author. These commands are empty by default. If the global option - 'pseudoauthor' is set to 'false', the author of entries - with the entry option 'pseudoauthor' are not printed at - all. The default value for the global option is 'true' + »pseudoauthor« is set to »false«, the author of entries + with the entry option »pseudoauthor« are not printed at + all. The default value for the global option is »true« (i.e. the behaviour is the same regardless of the entry - option 'pseudoauthor'). + option »pseudoauthor«). - New command \locationdatepunct for the punctuation between location and year/date. The default is \addspace. - New command \locationpublisherpunct for the punctuation @@ -40,35 +87,35 @@ Further changes in this release: \addcomma\space. v1.2o [2010/02/14] - - BUGFIX: When using the options 'xref=true' and - 'useeditor=false', the editor was not printed in the + - BUGFIX: When using the options »xref=true« and + »useeditor=false«, the editor was not printed in the bibliography. This is now fixed. Also, some bugs regarding the xref functionality in citations could be fixed. - BUGFIX: The editors in @incollection, @inproceedings and @inreference entries were printed using the name format - 'sortname' ('Lastname, Firstname') where it should have - been the name format 'byeditor' ('Firstname Lastname'). + »sortname« (»Lastname, Firstname«) where it should have + been the name format »byeditor« (»Firstname Lastname«). This is now fixed. - - New option 'omiteditor': If one uses 'useeditor=false' - and 'omiteditor=true', the editor in citations will be + - New option »omiteditor«: If one uses »useeditor=false« + and »omiteditor=true«, the editor in citations will be omitted. The same applies to the xref functionality in - the bibliography. With 'useeditor=true', this option has - no effect. The standard for this option is 'false'. - - The limitation regarding the combination of 'xref=true', - 'edbyidem=true' and 'useeditor=false' is no longer valid. + the bibliography. With »useeditor=true«, this option has + no effect. The standard for this option is »false«. + - The limitation regarding the combination of »xref=true«, + »edbyidem=true« and »useeditor=false« is no longer valid. That means, it is not necessary to have the editor in the - child entry as well in order to get an 'idem' string. + child entry as well in order to get an »idem« string. - Extended the documentation. v1.2n [2010/01/24] - - The option 'edbeforetitle' was discarded. The same - functionality can be obtained by the option 'useeditor'. + - The option »edbeforetitle« was discarded. The same + functionality can be obtained by the option »useeditor«. In this context, some bugs could be resolved. - - New option 'omitpages': if set to 'true', the page range + - New option »omitpages«: if set to »true«, the page range of @article, @inbook, @incollection or @inproceedings entries will be suppressed in full citations. - The standard value is 'false'. + The standard value is »false«. - Extended the documentation regarding the xref functionality. @@ -76,24 +123,24 @@ v1.2m [2010/01/18] - BUGFIX: Changed the default of \citerevsdnamedelim which used to be a \slash. Now it is empty, because otherwise it produced two slashes in some circumstances. - - BUGFIX: In footnote-dw with 'xref=true', the reference to + - BUGFIX: In footnote-dw with »xref=true«, the reference to the first entry did not work if the first citation of a parent was cited via a child. This is now fixed. - BUGFIX: In footnote-dw the punctuation of @collection entries was wrong when using a prenote in conjunction - with 'useeditor=false' or when there was no editor. This + with »useeditor=false« or when there was no editor. This is now fixed. - - The biblatex option 'singletitle' can now be used both + - The biblatex option »singletitle« can now be used both with authortitle-dw and footnote-dw. Using this option, a - work's title is only printed if there is not more than + work«s title is only printed if there is not more than one work by the author or editor. - - New entry option 'pseudoauthor'. If set to true, the + - New entry option »pseudoauthor«. If set to true, the author is put in brackets. This is useful for e.g. editions of works whose authors are not named, but are known. See the documentation for details. The entry option does only have effect if the global option - 'pseudoauthor' is set to 'true'. The default value is - 'false'. + »pseudoauthor« is set to »true«. The default value is + »false«. v1.2l [2009/10/19] - BUGFIX: With footnote-dw, the references to the first @@ -101,25 +148,25 @@ v1.2l [2009/10/19] is now fixed. - BUGFIX: With xref=true, when no volume was present in an @inreference entry as well as in its corresponding - @reference entry, the bibstring 'vol.' was printed. This + @reference entry, the bibstring »vol.« was printed. This is now fixed. - - New option 'shortjournal'. If set to 'true', the field - 'shortjournal' is used instead of 'journaltitle'. This is - useful for journal abbreviations. The default is 'false'. - - New option 'acronyms'. If set to 'true', shorthands (and - with 'shortjournal=true' also the abbreviated journal + - New option »shortjournal«. If set to »true«, the field + »shortjournal« is used instead of »journaltitle«. This is + useful for journal abbreviations. The default is »false«. + - New option »acronyms«. If set to »true«, shorthands (and + with »shortjournal=true« also the abbreviated journal titles) are set with the command \mkbibacro, but only if - the entry option 'acronym' is set to 'true'. The default - is 'false'. - - New option 'pageref' (in footnote-dw only). If set to - 'true', it adds the page to the footnote number pointing + the entry option »acronym« is set to »true«. The default + is »false«. + - New option »pageref« (in footnote-dw only). If set to + »true«, it adds the page to the footnote number pointing to the full citation if it is located on a different page. This option is the same as in the standard styles - 'verbose-note' and 'verbose-inote'. The default is false. + »verbose-note« and »verbose-inote«. The default is false. - In footnote-dw, the pointer to the earlier citation is - suppressed if a shorthand exists and the option 'citedas' + suppressed if a shorthand exists and the option »citedas« is true. Note that you can override the global option - 'citedas' by setting the entry option 'citedas'. + »citedas« by setting the entry option »citedas«. v1.2k [2009/08/22] Adjustments to biblatex version 0.8e. Note that from this @@ -127,14 +174,14 @@ v1.2k [2009/08/22] biblatex as well if you would like to use biblatex-dw 1.2k! - Compound abbreviations (introduced in biblatex-dw 1.2i) are now separated by the new biblatex command - '\addabthinspace'; this affects only the German - localization in strings like 'hg. v.' + »\addabthinspace«; this affects only the German + localization in strings like »hg. v.« - The improved concatenation of roles is used. See - biblatex's release notes for details. + biblatex’s release notes for details. - The new auxiliary macros for ordinals are used. See - biblatex's release notes for details. + biblatex’s release notes for details. BUGFIXES - - BUGFIX: The option 'ibidpage' did not work with + - BUGFIX: The option »ibidpage« did not work with footnote-dw. This is now fixed. Changed Entry Types - @inreference @@ -145,41 +192,41 @@ v1.2k [2009/08/22] incollection entries, please consult the documentation. The @reference type remains an alias for @collection. New Options - - 'isrn' and 'pagetotal' - These options can take the values 'true' and 'false'. + - »isrn« and »pagetotal« + These options can take the values »true« and »false«. With these options you can decide whether you want to have printed the corresponding fields or not. - The default for these options is 'false'. - - 'edstringincitations' - If set to 'true', the editor and translator strings are + The default for these options is »false«. + - »edstringincitations« + If set to »true«, the editor and translator strings are shown in the citations (not only in the full citations). - The default is 'true'. - - 'series=standard|afteryear' - If set to 'afteryear', the series is printed after the + The default is »true«. + - »series=standard|afteryear« + If set to »afteryear«, the series is printed after the year. This affects the entry types @book, @inbook, @collection, @incollection, @proceedings, @inproceedings and @manual. New Commands - - 'seriespunct' + - »seriespunct« punctuation before the series (of a book etc.). This punctuation is set inside the parentheses. You can set it - e.g. to '=\addspace' which is common in some fields. The + e.g. to »=\addspace« which is common in some fields. The default is empty, i.e. the series is printed right after the opening round bracket. - - 'sernumstring' + - »sernumstring« punctuation between series (of a book etc.) and number. - The default is '\addspace'. You can easily redefine it, + The default is »\addspace«. You can easily redefine it, e.g.: \renewcommand*{\sernumstring}{% \addcomma\space\bibstring{volume}\addspace} - This would give '(Name of Series, vol. N)'. - - 'herenamepunct' - If the 'herename' is used, the punctuation before the - herename is determined by 'herenamepunct'. The default is + This would give »(Name of Series, vol. N)«. + - »herenamepunct« + If the »herename« is used, the punctuation before the + herename is determined by »herenamepunct«. The default is \addcomma\space. Localization Changes - - In German localization, the strings 'withcommentator', - 'withannotator' and 'withintroduction' are shortened as + - In German localization, the strings »withcommentator«, + »withannotator« and »withintroduction« are shortened as follows: -> withcommentator: komm. v. -> withannotator: erläut. v. @@ -196,49 +243,49 @@ v1.2j [2009/08/16] and 0.8h, but it will not work with earlier versions. v1.2i [2009/05/10] - - BUGFIX: When using option 'usetranslator=true', the + - BUGFIX: When using option »usetranslator=true«, the translator string was not aware of the option - 'editorstring'. This is now fixed. - - Improved bibmacro 'journal+issuetitle' which is now aware - of the option 'edbeforetitle'. - - The 'typeeditor' field is now supported. It can take the - values 'editor' and 'compiler'. This field determines the + »editorstring«. This is now fixed. + - Improved bibmacro »journal+issuetitle« which is now aware + of the option »edbeforetitle«. + - The »typeeditor« field is now supported. It can take the + values »editor« and »compiler«. This field determines the editor string after the name of the editor(s). The - abbreviated forms are 'ed.' for 'editor' and 'comp.' for - 'compiler'. In German, both strings are the same - ('Herausgeber' or 'Hrsg.'). - - In English, the 'idem' string is now declined (idem, + abbreviated forms are »ed.« for »editor« and »comp.« for + »compiler«. In German, both strings are the same + (»Herausgeber« or »Hrsg.«). + - In English, the »idem« string is now declined (idem, eadem, idem in singular; eidem, eaedem, eadem in plural) and no longer abbreviated, even if abbreviate=true is used. - - Improved the handling of 'origfields=true'. - - In German, the string 'reprint' (Nachdruck) is now - abbreviated as 'Ndr.', not as 'Nachdr.' + - Improved the handling of »origfields=true«. + - In German, the string »reprint« (Nachdruck) is now + abbreviated as »Ndr.«, not as »Nachdr.« - Compound abbreviations are now separated by a thin space rather than a normal one. At the moment, this affects - only the German localization in strings like 'hg. v.' + only the German localization in strings like »hg. v.« v1.2h [2009/03/29] - - BUGFIX: The 'idem' functionality is now also aware of + - BUGFIX: The »idem« functionality is now also aware of page breaks. If the citation is the first on a page (or - double page in twoside mode), the 'idem' is suppressed. - If you don't want this behaviour, you can set the option - 'pagetracker=false'. + double page in twoside mode), the »idem« is suppressed. + If you don’t want this behaviour, you can set the option + »pagetracker=false«. v1.2g [2009/03/20] - - Option 'journalnumber' replaces 'journumafteryear'. The + - Option »journalnumber« replaces »journumafteryear«. The option was enhanced and can now take the values - 'standard', 'afteryear' and 'date'. The value 'standard' + »standard«, »afteryear« and »date«. The value »standard« is the same as the old journumafteryear=false, - 'afteryear' is the same as the old journumafteryear=true. - The new value 'date' assures that the date is printed, + »afteryear« is the same as the old journumafteryear=true. + The new value »date« assures that the date is printed, even if the field issue is given (this is not the case in - the standard styles). Additionally, 'journalnumber=date' + the standard styles). Additionally, »journalnumber=date« prints the number before the date, if the date (at least year and month) is given, but it prints the number after the year, if only the year is given (i.e. if the date is not further specified). See the documentation for - details. The default is 'journalnumber=standard'. + details. The default is »journalnumber=standard«. - Improved german-dw.lbx. - Adjusted the documentation for screen reading. A printer friendly version can still be compiled from the source. @@ -248,33 +295,33 @@ v1.2f [2009/02/15] this version on biblatex 0.8c is required, so you have to update biblatex as well if you would like to use biblatex-dw 1.2f! - -> The biblatex-dw option 'idem' was replaced by the new - biblatex option 'idemtracker'. The standard setting is - 'idemtracker=constrict'. If you would like to switch + -> The biblatex-dw option »idem« was replaced by the new + biblatex option »idemtracker«. The standard setting is + »idemtracker=constrict«. If you would like to switch off the idem functionality, you can use - 'idemtracker=false'. For more information on the - 'idemtracker' option see the biblatex manual. - - New options 'doi', 'eprint', 'isbn' and 'issn' which can - take the values 'true' and 'false'. With these options + »idemtracker=false«. For more information on the + »idemtracker« option see the biblatex manual. + - New options »doi«, »eprint«, »isbn« and »issn« which can + take the values »true« and »false«. With these options you can decide whether you want to have printed the corresponding fields or not. The default for these - options is 'false' (as was the standard before). - - New option 'idemfont' which can take the values - 'smallcaps', 'italic', 'bold' and 'normal'. The default - is none which means that the 'idem' string is printed in - the font shape of 'namefont'. - - New option 'ibidemfont' which can take the values - 'smallcaps', 'italic' and 'bold'. The default is none - which means that the 'ibidem' string is printed in normal + options is »false« (as was the standard before). + - New option »idemfont« which can take the values + »smallcaps«, »italic«, »bold« and »normal«. The default + is none which means that the »idem« string is printed in + the font shape of »namefont«. + - New option »ibidemfont« which can take the values + »smallcaps«, »italic« and »bold«. The default is none + which means that the »ibidem« string is printed in normal font shape. - - New macro 'jourvolstring' which introduces the volume of + - New macro »jourvolstring« which introduces the volume of an article entry. The default is a space (as it was the case before), but you can adjust it to your needs, e.g.: \renewcommand*{\jourvolstring}{\addspace vol\adddot\space} - - New macro 'journumstring' which introduces the number in - article entries, if the option 'journumafteryear' is set - to 'true'. The default for this macro is a comma, - followed by the bibstring 'number' and a non-breakable + - New macro »journumstring« which introduces the number in + article entries, if the option »journumafteryear« is set + to »true«. The default for this macro is a comma, + followed by the bibstring »number« and a non-breakable space. You can redefine it to your needs, e.g.: \renewcommand*{\journumstring}{\addspace} - If there is no volume in an article entry, but the month @@ -289,25 +336,25 @@ v1.2e [2008/12/19] this version on biblatex 0.8b is required, so you have to update biblatex as well if you would like to use biblatex-dw 1.2e! - -> The new biblatex option 'usetranslator' is supported. - - BUGFIX: The option 'firstfullname' introduced in version + -> The new biblatex option »usetranslator« is supported. + - BUGFIX: The option »firstfullname« introduced in version 1.2d had a bug which is now fixed. - - BUGFIX: The 'idem' functionality did not work with the + - BUGFIX: The »idem« functionality did not work with the multicite commands. This is now fixed. - - New option 'journumafteryear': If set to 'true', the - 'number' in article entries is printed after the year and - introduced by the bibstring 'number'. If set to 'false', - the default behaviour is used, i.e. 'Journaltitle - volume.number (year)'. The default is 'true'. - -> If 'journumafteryear' is set 'false', the separator + - New option »journumafteryear«: If set to »true«, the + »number« in article entries is printed after the year and + introduced by the bibstring »number«. If set to »false«, + the default behaviour is used, i.e. »Journaltitle + volume.number (year)«. The default is »true«. + -> If »journumafteryear« is set »false«, the separator between volume and number in @article entries is now - configurable with the new command '\jourvolnumsep'. + configurable with the new command »\jourvolnumsep«. The default is a dot (which is also the default in biblatex). - - When the 'volume' is missing, the parenthesis around the + - When the »volume« is missing, the parenthesis around the year in @article entries is omitted. - The multicite command \cites is now also always printed - as footnote in 'footnote-dw'. + as footnote in »footnote-dw«. - Some changes in the internal code. - Extended the documentation and examples. @@ -316,11 +363,11 @@ v1.2d [2008/12/07] editor in all citations but the first one was always a comma and not configurable by \citenamepunct. This is now fixed. - - New option 'firstfullname': when set to 'true', the + - New option »firstfullname«: when set to »true«, the commands \citeauthor and \textcite (with footnote-dw: \citeauthor only) give the full name of authors/editors when they have not been cited before, not only the last - name. The default is 'false'. + name. The default is »false«. - Support for biblatex version 0.8a including \MakeSentenceCase. - Added lbx files with alternative strings for German and @@ -329,64 +376,64 @@ v1.2d [2008/12/07] language mapping files). v1.2c [2008/11/15] - - New option 'idembibformat': When using 'idembib=true', - you can choose whether you want to have an 'idem' string + - New option »idembibformat«: When using »idembib=true«, + you can choose whether you want to have an »idem« string in the bibliography (idembibformat=idem) or a dash (idembibformat=dash), as is the standard setting in - biblatex. The standard is 'idembibformat=idem'. - - Option 'idembib' changed: Now 'false' means that + biblatex. The standard is »idembibformat=idem«. + - Option »idembib« changed: Now »false« means that subsequent entries of the same author are given with full names, not a dash (as was the behaviour up to now). The - standard is 'idembib=true'. + standard is »idembib=true«. - Improved xref support: The child entry does not only scan - for the 'volume' field of the parent entry, but prints - also 'location' and 'year', if they differ from the + for the »volume« field of the parent entry, but prints + also »location« and »year«, if they differ from the parent entry. v1.2b [2008/11/09] - - BUGFIX: With 'xref=true', the first (full) citation did + - BUGFIX: With »xref=true«, the first (full) citation did not show the overall pages of @INBOOK, @INCOLLECTION and @INPROCEEDINGS entries. This is now fixed. - - New option 'nolocation'. If set to 'true', the location + - New option »nolocation«. If set to »true«, the location and the publisher are omitted (even if you set - 'nopublisher=false'). The default is 'false', i.e. the + »nopublisher=false«). The default is »false«, i.e. the location is printed. - - The option 'shorthandibid' can now also be used on a + - The option »shorthandibid« can now also be used on a per-entry basis. - - Improved xref support: If the 'volume' field of a child - entry is set and the 'volume' field of the corresponding + - Improved xref support: If the »volume« field of a child + entry is set and the »volume« field of the corresponding parent entry is not set, the volume of the child entry will be printed immediately before the pages. v1.2a [2008/10/19] - - Improved option 'edsuper' which also outputs non-integer + - Improved option »edsuper« which also outputs non-integer editions (though not as superscript, but rather similar to a note.) - - The field 'origpublisher' (new in biblatex 0.8) is now + - The field »origpublisher« (new in biblatex 0.8) is now also supported. - - New option 'origfields' which can take the values 'true' - (standard) and 'false'. With this option, you can now + - New option »origfields« which can take the values »true« + (standard) and »false«. With this option, you can now decide, whether you want to have the fields - 'origlocation', 'origpublisher' and 'origyear' to be + »origlocation«, »origpublisher« and »origyear« to be printed or not. - -> New option 'origfieldsformat=parens|brackets|punct'. - The default is 'punct' which means that the new - punctuation mark '\origfieldspunct' (default: + -> New option »origfieldsformat=parens|brackets|punct«. + The default is »punct« which means that the new + punctuation mark »\origfieldspunct« (default: \addcomma\space) is used to introduce the reprint - phrase. If you choose 'parens' or 'brackets', the + phrase. If you choose »parens« or »brackets«, the reprint phrase is put in parentheses or brackets, respectively, and the \origfieldspunct is ignored. - - New option 'shorthandwidth'. With this option you can set + - New option »shorthandwidth«. With this option you can set the width of the label in the list of shorthands to any - length (e.g. '3em' or '40pt'). This is useful if you have + length (e.g. »3em« or »40pt«). This is useful if you have very long shorthands. - -> New punctuation command '\shorthandpunct' which is - only exerted when you use the option 'shorthandwidth'. + -> New punctuation command »\shorthandpunct« which is + only exerted when you use the option »shorthandwidth«. Then it is set to a colon. You can redefine this punctuation command with \renewcommand. - -> New length '\shorthandsep' which is only exerted if - you use the option 'shorthandwidth'. The length - '\shorthandsep' defines the spacing after the label in + -> New length »\shorthandsep« which is only exerted if + you use the option »shorthandwidth«. The length + »\shorthandsep« defines the spacing after the label in the list of shorthands. - Improved package warnings. @@ -395,151 +442,151 @@ v1.2 [2008/10/09] version 1.2 on, biblatex-dw needs at least biblatex 0.8, so you have to update biblatex as well if you would like to use biblatex-dw 1.2! - -> The new biblatex option 'firstinits' is supported. + -> The new biblatex option »firstinits« is supported. -> The new macro \bibpagespunct is also supported. - - Added option 'xref' which can be set to 'true' or - 'false'. If you want to use the crossref functionality + - Added option »xref« which can be set to »true« or + »false«. If you want to use the crossref functionality (introduced in biblatex-dw version 1.1f), you now have to - set 'xref=true'. See the documentation for details. + set »xref=true«. See the documentation for details. - As biblatex 0.8 has changed the handling of the field - 'edition', the option 'edsuper' had to be adjusted. See + »edition«, the option »edsuper« had to be adjusted. See the documentation of biblatex-dw for details. - Updated the documentation. v1.1h [2008/09/24] - - BUGFIX: When using the options 'edbeforetitle' and - 'edbyidem', the idem funcionality did not work. This is + - BUGFIX: When using the options »edbeforetitle« and + »edbyidem«, the idem funcionality did not work. This is now fixed. - Updated documentation (see especially, if you are using the crossref functionality) and examples. v1.1g [2008/09/05] - - The biblatex package option 'mincrossrefs' is set to '1' - (instead of '2'). The reason is that otherwise entries + - The biblatex package option »mincrossrefs« is set to »1« + (instead of »2«). The reason is that otherwise entries that are using the crossref functionality introduced in biblatex-dw version 1.1f could be incomplete. - - If both 'volumes' and 'volume' are present, 'volumes' is - now set before 'volume'. + - If both »volumes« and »volume« are present, »volumes« is + now set before »volume«. v1.1f [2008/08/10] - - BUGFIX: Corrected wrong punctuation when using 'idembib= - false' in conjunction with an editor. - - Added crossref functionality (using biblatex's field - 'xref'). This works for authortitle-dw as well as + - BUGFIX: Corrected wrong punctuation when using »idembib= + false« in conjunction with an editor. + - Added crossref functionality (using biblatex’s field + »xref«). This works for authortitle-dw as well as footnote-dw. For further information please have a look into the package documentation. v1.1e [2008/06/13] - - BUGFIX: The option 'edbeforetitle' caused a problem - when used together with the 'idem' functionality + - BUGFIX: The option »edbeforetitle« caused a problem + when used together with the »idem« functionality (which is the default). This is now fixed. - - Enhanced the 'idem' functionality: If a citation with + - Enhanced the »idem« functionality: If a citation with shorthand precedes a citation of the same author or - editor without shorthand, the string 'idem' is now - replaced by the author's or editor's name, since this + editor without shorthand, the string »idem« is now + replaced by the author’s or editor’s name, since this information cannot be gathered from the shorthand citation and thus could mislead the reader. v1.1d [2008/06/05] - - BUGFIX: The global option 'oldauthor' which was + - BUGFIX: The global option »oldauthor« which was introduced in version 1.1c caused an erroneous behaviour - when used together with 'idembib=true' (which is the + when used together with »idembib=true« (which is the default). This is now fixed. - - New option 'editorstring' which can take the values - 'parens', 'brackets' and 'normal'; the default is - 'parens'. This option sets the string 'editor' - (abbreviated 'ed.') in parentheses or in brackets, or + - New option »editorstring« which can take the values + »parens«, »brackets« and »normal«; the default is + »parens«. This option sets the string »editor« + (abbreviated »ed.«) in parentheses or in brackets, or just puts the string (with a preceding comma) after the editor name. - - New option 'edbeforetitle' which can take the values - 'true' and 'false'; the default is 'false'. When set to - 'true', the editor in @INCOLLECTION and @INPROCEEDINGS - entries will be typeset before the booktitle ('... in: - Editor (ed.): Booktitle ...') rather than afterwards - ('... in: Booktitle, ed. by Editor ...'). + - New option »edbeforetitle« which can take the values + »true« and »false«; the default is »false«. When set to + »true«, the editor in @INCOLLECTION and @INPROCEEDINGS + entries will be typeset before the booktitle (»... in: + Editor (ed.): Booktitle ...«) rather than afterwards + (»... in: Booktitle, ed. by Editor ...«). - Small correction in the terse version of the List of Shorthands concerning the punctuation after authors/ editors. - - Added missing bibliography drivers for option 'edbyidem'. + - Added missing bibliography drivers for option »edbyidem«. v1.1c [2008/05/29] - - BUGFIX: With the option 'idem=false', the author of a + - BUGFIX: With the option »idem=false«, the author of a first citation who was cited immediately before with another work lacked the forename. - - BUGFIX: The option 'edbyidem=false' produced a - superfluous 'ed. by' string. + - BUGFIX: The option »edbyidem=false« produced a + superfluous »ed. by« string. - BUGFIX: Small punctuation issue with repeated citations - and 'herename'. - - New option 'namefont' which can take the values - 'smallcaps', 'italic' and 'bold'. The default is none, + and »herename«. + - New option »namefont« which can take the values + »smallcaps«, »italic« and »bold«. The default is none, i.e. authors and editors are set in normal font shape. - With 'useprefix=true', this option also affects the + With »useprefix=true«, this option also affects the name prefix. - - New option 'firstnamefont' which can take the values - 'smallcaps', 'italic' and 'bold'. This also affects the - name prefix (with 'useprefix=false') and the name + - New option »firstnamefont« which can take the values + »smallcaps«, »italic« and »bold«. This also affects the + name prefix (with »useprefix=false«) and the name affix. - - The option 'oldauthor' is now also available as global + - The option »oldauthor« is now also available as global option in order to disable the feature. If you set - 'oldauthor=false' globally, every entry option - 'oldauthor=true' is ignored. Thus, you can set the + »oldauthor=false« globally, every entry option + »oldauthor=true« is ignored. Thus, you can set the fontname for every author with global options, independent of entry options. v1.1b [2008/04/13] - - BUGFIX: When using \parencite with 'footnote-dw', + - BUGFIX: When using \parencite with »footnote-dw«, additional parentheses (e.g. enclosing the string - 'editor') were lost; they are now replaced by brackets. - - BUGFIX: In 'footnote-dw', the normal \cite command + »editor«) were lost; they are now replaced by brackets. + - BUGFIX: In »footnote-dw«, the normal \cite command always produced a capital letter at the beginning. This is fixed now. - Fixed a small punctuation error in connection with - 'herename'. + »herename«. - New command \titleaddonpunct for the punctuation before titleaddon, booktitleaddon and maintitleaddon. The default is a period now (not a comma, as before). v1.1a [2008/02/09] - - BUGFIX: When using the commands 'mancite' or - 'citereset', the 'idem' functionality was not reset. + - BUGFIX: When using the commands »mancite« or + »citereset«, the »idem« functionality was not reset. This is now fixed. - - New option 'edsuper'. If set to 'true', the edition is + - New option »edsuper«. If set to »true«, the edition is printed as superscript number (not as ordinal number) - straight ahead of the year. The default is 'false'. - - New option 'firstfull' (only in 'authortitle-dw'). If - set to 'true', the first citation is a fullcite. The - default is 'false'. - - Option 'citedas' is now also available for - 'authortitle-dw' and used when 'firstfull' is set to - 'true'. + straight ahead of the year. The default is »false«. + - New option »firstfull« (only in »authortitle-dw«). If + set to »true«, the first citation is a fullcite. The + default is »false«. + - Option »citedas« is now also available for + »authortitle-dw« and used when »firstfull« is set to + »true«. v1.1 [2008/02/01] - - BUGFIX: The 'citedas' functionality did not work if the - first citation of an entry was introduced by 'idem'. - - New option 'terselos' introduced for a terse version of - the list of shorthands (default is 'true'). - - New option 'herename' introduced to specify if the term + - BUGFIX: The »citedas« functionality did not work if the + first citation of an entry was introduced by »idem«. + - New option »terselos« introduced for a terse version of + the list of shorthands (default is »true«). + - New option »herename« introduced to specify if the term \enquote{here} should prelude the pages of a fullcite - (or, with 'footnote-dw', also the first citation of an + (or, with »footnote-dw«, also the first citation of an entry) which has a non-empty \texttt{pages}-field. - - New option 'nopublisher' introduced to suppress the - publisher. The default value is 'true', but if you want + - New option »nopublisher« introduced to suppress the + publisher. The default value is »true«, but if you want to have the publisher printed, you now can set the - option 'nopublisher=false'. - - If the field 'origlocation' is given, it will be set - together with 'origyear', whereas 'location' and 'year' + option »nopublisher=false«. + - If the field »origlocation« is given, it will be set + together with »origyear«, whereas »location« and »year« are appended in parentheses, preluded by the bibstring - 'reprint'. - - The options 'annotation' and 'library' are now also - usable with the style 'footnote-dw'. The annotations + »reprint«. + - The options »annotation« and »library« are now also + usable with the style »footnote-dw«. The annotations and library information are only printed in the bibliography (if there is one), not in the citations or in the list of shorthands. - Updated documentation. v1.01 [2008/01/20] - - BUGFIX: The 'pagetracker' functionality did not work - properly with the style 'footnote-dw' + - BUGFIX: The »pagetracker« functionality did not work + properly with the style »footnote-dw« - Excluded ISBN/ISSN and DOI also from entry types booklet, inproceedings, manual, misc, periodical, proceedings, and report diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH b/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH index f5ecd763ea6..01063edd06c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH +++ b/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH @@ -1,4 +1,4 @@ -biblatex-dw 2010/03/11 v1.3 +biblatex-dw 2010/09/21 v1.3a Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2010 ************************************************************ @@ -104,11 +104,12 @@ Inhalt der Datei LIESMICH außerdem bei folgenden Personen: * Thomas Demmel * Simon Flossmann * Till A. Heilmann * Denis Maier - * Rolf Niepraschk * Jan Hauke Rahm - * Ondrej Salvet * Johann Konrad Schwarz - * Matthias Steinbrink * Philipp Stephani - * Bernhard Tempel * Christofer Zwanzig - * Дмитрий Гордеев + * Rolf Niepraschk * Philipp Pilhofer + * Jan Hauke Rahm * Ondrej Salvet + * Johann Konrad Schwarz * Matthias Steinbrink + * Philipp Stephani * Bernhard Tempel + * Dominik Weber * Christian Weitert + * Christofer Zwanzig * Дмитрий Гордеев 7. Lizenz diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/README b/Master/texmf-dist/doc/latex/biblatex-dw/README index 15d1c2af620..c1282b42b22 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/README +++ b/Master/texmf-dist/doc/latex/biblatex-dw/README @@ -1,4 +1,4 @@ -biblatex-dw 2010/03/11 v1.3 +biblatex-dw 2010/09/21 v1.3a Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2010 ************************************************************ @@ -95,11 +95,12 @@ Contents of README bug reports I would like to thank the following people: * Thomas Demmel * Simon Flossmann * Till A. Heilmann * Denis Maier - * Rolf Niepraschk * Jan Hauke Rahm - * Ondrej Salvet * Johann Konrad Schwarz - * Matthias Steinbrink * Philipp Stephani - * Bernhard Tempel * Christofer Zwanzig - * Дмитрий Гордеев + * Rolf Niepraschk * Philipp Pilhofer + * Jan Hauke Rahm * Ondrej Salvet + * Johann Konrad Schwarz * Matthias Steinbrink + * Philipp Stephani * Bernhard Tempel + * Dominik Weber * Christian Weitert + * Christofer Zwanzig * Дмитрий Гордеев 7. Licence diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-preamble.tex b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-preamble.tex index 41387213bcb..5231591eb2c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-preamble.tex +++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-preamble.tex @@ -5,8 +5,8 @@ % biblatex-dw (both the English and the German version) %%%%% biblatex-dw Version %%%%% version of biblatex-dw %%%%% -\newcommand{\biblatexdwversion}{1.3} -\newcommand{\biblatexdwdate}{\printdate{2010-03-11}} +\newcommand{\biblatexdwversion}{1.3a} +\newcommand{\biblatexdwdate}{\printdate{2010-09-21}} \newcommand{\screenversion}{} \newcommand{\TOC}{} \newcommand{\lizenz}{} @@ -184,6 +184,7 @@ \newcommand{\befehlleer}[2]{\item[\option{\cmd{#1}}]\emph{(\iflanguage{english}{empty}{leer})}\\{#2}} \newcommand{\biblstring}[3]{% \item[\option{#1}]\texttt{#2}\hspace{0.4em}\textbullet\hspace{0.4em}\texttt{#3}} +\newcommand{\feldformat}[3]{\item[{\option{\cmd{DeclareFieldFormat\{{#1}\}\{}\cmd{#2\}}}}]~\\#3} \newcommand{\achtung}{\marginnote{\footnotesize\dbend}} diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.pdf Binary files differindex 38188002c03..86294f7ff19 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex index 975abc9b163..af1152b9e39 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex +++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex @@ -26,14 +26,15 @@ \section{Introduction} \subsection{Installation} -Extract the zip archive to the \texttt{\$LOCALTEXMF} directory of +\bldw{} is part of the distributions MiK\TeX{}\footnote{Website: \url{http://www.miktex.org}.} +and \TeX{}~Live\footnote{Website: \url{http://www.tug.org/texlive}.}~-- thus, you +can easily install it using the respective package manager. If you would like to +install \bldw{} manually, do the following: +Extract the archive \texttt{biblatex-dw.tds.zip} to the \texttt{\$LOCALTEXMF} directory of your system.\footnote{If you don't know what that is, have a look at \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds} or -\url{http://mirror.ctan.org/tds/tds.html}.} Refresh your filename database. In -MiKTeX, this is done in the \enquote{Settings} dialog, button \enquote{Refresh -FNDB}, or from the command line with the command \texttt{initexmf --{}-refresh-fndb}. For other LaTeX distributions, please see its documentation -for details. Here is some additional information from the UK \TeX\ FAQ: +\url{http://mirror.ctan.org/tds/tds.html}.} Refresh your filename database. +Here is some additional information from the UK \TeX\ FAQ: \begin{itemize} \item \href{% http://www.tex.ac.uk/cgi-bin/texfaq2html?label=install-where}{% @@ -256,6 +257,20 @@ Besides some changes in punctuation, there are the following differences: \addcomma\space\bibstring{volume}\addspace} \end{lstlisting} This would give \enquote{(Name of Series, vol. N)}. + \item Using\beschreibung{shorthandinbib} option \option{shorthandinbib=true}, + the shorthands are printed in the bibliography, enclosed by brackets, preceding + the respective entry. The appearance is controlled by the field format + \enquote{shorthandinbib} which can of course be redefined. If you want to get + rid of the default brackets, for instance, you should do the following: + \begin{lstlisting} +\DeclareFieldFormat{shorthandinbib}{#1} + \end{lstlisting} + In this case there will only be a space between shorthand and bibliography entry, + so that you should redefine the punctuation as well which is printed by the + command \cmd{shorthandinbibpunct}. You could alter it to print a colon, e.g.: + \begin{lstlisting} +\renewcommand*{\shorthandinbibpunct}{\addcolon\space} + \end{lstlisting} \item The\beschreibung{annotation} option \option{annotation} is introduced. If it is set to \wert{true}, the field \texttt{annotation} will be printed in \textit{\small small italic} typeface at the end of the entry. The @@ -344,28 +359,61 @@ Besides some changes in punctuation, there are the following differences: is \wert{true}. Note that this behaviour can also be overridden for each entry by using \texttt{options\,= \{citedas=true\}} or \texttt{options\,=\,\{citedas=false\}}, respectively. - \item If\beschreibung{herename} you specify pages to a \cmd{fullcite} (or the first citation with - the option \option{firstfull}) of an entry which has - the field \texttt{pages} defined, the pages of the citation will - be preluded by the term \enquote{here}. This behaviour can be - influenced by the option \option{herename}, which can take - the values \wert{true} or \wert{false}; the standard value - is \wert{true}. - The term can be redefined in the preamble by the following command, - e.g. in order to have a colon after \enquote{here}: + \item The\beschreibung{citepages} + option \option{citepages} allows you to suppress pages or page ranges + in full citations, if the field \texttt{pages} is given: + \option{citepages=permit} allows duplicates, i.e. the \texttt{pages} + field as well as the \texttt{postnote} are printed; + with \option{citepages=suppress} the \texttt{pages} field of the full citations + will be suppressed in any case, thus only the \texttt{postnote} is printed; + \option{citepages=omit} omits the \texttt{pages} only if the \texttt{postnote} + is a number; + \option{citepages=separate} always prints the \texttt{pages} field, but separates + the \texttt{postnote} by using the string \enquote{here}, if it is a number. + In this case, the \emph{bibliography string} \enquote{thiscite} is used. + The standard value for this option is \wert{separate}. + A small illustrating example which uses the following \cmd{cite} commands: \begin{lstlisting} -\DefineBibliographyStrings{german}{% - herename = {here\addcolon\space} -} +\cite{key} +\cite[a note]{key} +\cite[125]{key} \end{lstlisting} - \item With \option{herename=true}, the punctuation before the \enquote{herename} - is determined by the command \cmd{herenamepunct}. The default is - \wert{\cmd{add\-comma}\cmd{space}}. - \item If\beschreibung{omitpages} you set the option \option{omitpages} to \wert{true}, the page range - of \texttt{@article}, \texttt{@inbook}, \texttt{@incollection} and - \texttt{@inproceedings} entries will be suppressed in full citations. - With \option{herename=true}, the \enquote{herename} will be omitted as - well. The standard value for this option is \wert{false}. + % + \option{citepages=permit}: + \begin{quote} + Author: Title, in: Book, pp.\,100--150. + + Author: Title, in: Book, pp.\,100--150, a note. + + Author: Title, in: Book, pp.\,100--150, p.\,125. + \end{quote} + % + \option{citepages=suppress}: + \begin{quote} + Author: Title, in: Book. + + Author: Title, in: Book, a note. + + Author: Title, in: Book, p.\,125. + \end{quote} + % + \option{citepages=omit}: + \begin{quote} + Author: Title, in: Book, pp.\,100--150. + + Author: Title, in: Book, pp.\,100--150, a note. + + Author: Title, in: Book, p.\,125. + \end{quote} + % + \option{citepages=separate}: + \begin{quote} + Author: Title, in: Book, pp.\,100--150. + + Author: Title, in: Book, pp.\,100--150, a note. + + Author: Title, in: Book, pp.\,100--150, here p.\,125. + \end{quote} \item The\beschreibung{firstfullname} option \option{firstfullname=true} offers the possibility to have authors\slash editors printed with first name and last name for the first citation when using the commands \cmd{citeauthor} or @@ -436,8 +484,6 @@ Besides, there are the following differences between \xbx{footnote-dw} and are set to \wert{true}, the annotations and library information are only printed in the bibliography (if there is one), but not in the first citations and in the list of shorthands. - \item The option \option{herename} is valid for full citations - (\cmd{fullcite}) as well as for the first citation of an entry. \end{itemize} \section{Crossref functionality} @@ -544,6 +590,10 @@ The value in parentheses shows the default. The first citation (in \xbx{authortitle-dw} only if the option \option{firstfull} is used) is followed by the string \enquote{henceforth cited as} whenever a \texttt{shorthand} is given. + \optlist{citepages}{separate} + Specifies if the pages of a fullcite or of the first citation (\xbx{authortitle-dw}: + only with option \option{firstfull}) of an entry with \texttt{pages} field + will be printed or not. \optlist{edbyidem}{true} \enquote{ed. by idem} instead of \enquote{ed. by \emph{Editor}}. \optlist{editorstring}{parens} @@ -569,10 +619,6 @@ The value in parentheses shows the default. name prefixes. Possible values are \wert{smallcaps}, \wert{italic}, \wert{bold} and \wert{normal} (which is the default and means that the normal font shape is used). - \optlist{herename}{true} - Specifies if the term \enquote{here} should prelude the pages of a - fullcite or of the first citation (\xbx{authortitle-dw}: only with option - \option{firstfull}) of an entry which has a non-empty \texttt{pages}-field. \optlist{ibidemfont}{normal} Specifies the font shape of the \enquote{ibidem} string. Possible values are \wert{smallcaps}, \wert{italic}, \wert{bold} and @@ -614,10 +660,6 @@ The value in parentheses shows the default. If set to \wert{false}, the entry option \option{oldauthor} is ignored. \optlist{omiteditor}{false} If set to \wert{true}, the editor is omitted in citations. - \optlist{omitpages}{false} - Specifies if the pages of a fullcite or of the first citation (\xbx{authortitle-dw}: - only with option \option{firstfull}) of an \texttt{@article}, \texttt{@inbook}, - \texttt{@incollection} or \texttt{@inproceedings} entry will be printed or not. \optlist{origfields}{true} With \option{origfields=true}, the fields \texttt{origlocation} and \texttt{origdate} (as well as \texttt{origpublisher}, if @@ -640,6 +682,9 @@ The value in parentheses shows the default. \optlist{shorthandibid}{true} Immediately repeated citations of entries with \texttt{shorthand} are replaced by \enquote{ibid.} + \optlist{shorthandinbib}{false} + If set to \wert{true}, the shorthands will be printed ahead of the bibliography + entries. \optnur[no default]{shorthandwidth} Defines the width of the label in the list of shorthands. Additionally, after every label the length \cmd{shorthandsep} (the default is 3pt) and @@ -1046,9 +1091,6 @@ The following list shows additional commands introduced by \bldw{}, along with t first and second name in citations when the scheme \enquote{Surname, Firstname, Firstname Surname} is given. The comma is not meant! Compare \bl's \cmd{revsdnamedelim}.} - \befehl{herenamepunct}{\cmd{addcomma}\cmd{space}}{Punctuation before the - \enquote{herename} (before page indications in fullcites of dependent - works).} \befehl{journumstring}{\cmd{addcomma}\cmd{space}\cmd{bibstring\{number\}}% \cmd{addnbspace}}{Punctuation\slash string ahead of the journal number.} \befehl{jourvolnumsep}{\cmd{adddot}}{Punctuation between journal volume and @@ -1071,8 +1113,10 @@ The following list shows additional commands introduced by \bldw{}, along with t parentheses.} \befehl{sernumstring}{\cmd{addspace}}{Punctuation\slash string between the \texttt{series} and its \texttt{number}.} - \befehl{shorthandpunct}{\cmd{addcolon}}{Puncutation after a shorthand, if - \option{shorthandwidth} is used.} + \befehl{shorthandinbibpunct}{\cmd{addspace}}{Puncutation after a shorthand in the + bibliography, if \option{shorthandinbib} is used.} + \befehl{shorthandpunct}{\cmd{addcolon}}{Puncutation after a shorthand in the list + of shorthands, if \option{shorthandwidth} is used.} \befehl{shorthandsep}{3pt plus 0.5pt minus 0.5pt}{Length between the shorthand and its description, if \option{shorthandwidth} is used.} \befehl{titleaddonpunct}{\cmd{addperiod}\cmd{space}}{Punctuation ahead of @@ -1084,32 +1128,38 @@ The following list shows the additional bibliography strings introduced by \bldw There is always a long and a short version. It depends on the \bl{} option \option{abbreviate} which version is used. \begin{labeling}{mmmmmmm} - \biblstring{herename}{here}{here} - \biblstring{inrefstring}{article}{art\cmd{adddot}} + \biblstring{idemdat}{eidem}{eidem} + \biblstring{idemdatsf}{eidem}{eidem} + \biblstring{idemdatsm}{eidem}{eidem} + \biblstring{idemdatsn}{eidem}{eidem} + \biblstring{idemdatpf}{eisdem}{eisdem} + \biblstring{idemdatpm}{eisdem}{eisdem} + \biblstring{idemdatpn}{eisdem}{eisdem} + \biblstring{idemdatpp}{eisdem}{eisdem} + \biblstring{inrefstring}{article\cmd{addspace}}{art\cmd{adddotspace}} \end{labeling} The bibliography strings can be redefined as follows (but note that you cannot define a long and a short version): \begin{lstlisting} \DefineBibliographyStrings{english}{% - herename = {at}, + thiscite = {at}, inrefstring = {}} \end{lstlisting} -%\subsection{Redefined bibliography strings} -%The following list shows the bibliography strings which are defined by \bl{} -%and redefined by \bldw{}. There is always a long and a short version. -%It depends on the \bl{} option \option{abbreviate} which version is used. -%\begin{labeling}{mmmmmmm} -%% \biblstring{}{}{} - %\biblstring{idem}{idem}{idem} - %\biblstring{idemsm}{idem}{idem} - %\biblstring{idemsf}{eadem}{eadem} - %\biblstring{idemsn}{idem}{idem} - %\biblstring{idempm}{eidem}{eidem} - %\biblstring{idempf}{eaedem}{eaedem} - %\biblstring{idempn}{eadem}{eadem} - %\biblstring{idempp}{eidem}{eidem} -%\end{labeling} +\subsection{Redefined bibliography strings} +The following list shows the bibliography strings which are defined by \bl{} +and redefined by \bldw{}. There is always a long and a short version. +It depends on the \bl{} option \option{abbreviate} which version is used. +\begin{labeling}{mmmmmmm} +% \biblstring{}{}{} + \biblstring{thiscite}{here}{here} +\end{labeling} + +\subsection{Additional field formats} +The following list shows additional field formats defined by \bldw{}. + +\feldformat{shorthandinbib}{mkbibbrackets\{\#1\}}{Format of the shorthands + when using \option{shorthandinbib=true}.} \section{Further hints} The following hints are ideas for advanced users to further customize @@ -1126,7 +1176,7 @@ indicates the place for the \cmd{revsdnamedelim}). \bldw{}, however, has \cmd{bibmultinamedelim}, \cmd{bib\-final\-name\-delim} and \cmd{bibrevsdnamedelim} for the bibliography as well as \cmd{citemultinamedelim}, \cmd{citefinalnamedelim} and -\cmd{citerevsdnamedelim} for the citations. Furthermore, \cmd{multinamedelim}, +\cmd{citerevsdna\-medelim} for the citations. Furthermore, \cmd{multinamedelim}, \cmd{finalnamedelim} and \cmd{revsdnamedelim} are used in the list of shorthands. Thus, you can achieve different results. The standard definitions are as follows: diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.pdf Binary files differindex c14588cbf85..c68a4f907ee 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.tex index b8b83dcd99d..8e90e845561 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.tex +++ b/Master/texmf-dist/doc/latex/biblatex-dw/de-biblatex-dw.tex @@ -29,16 +29,16 @@ \section{Einleitung} \subsection{Installation} -Entpacken Sie die zip-Datei in den \texttt{\$LOCALTEXMF}"=Ordner ihres +\bldw{} ist in den Distributionen MiK\TeX{}\footnote{Webseite: \url{http://www.miktex.org}.} +und \TeX{}~Live\footnote{Webseite: \url{http://www.tug.org/texlive}.} enthalten und +kann mit deren Paketmanagern bequem installiert werden. Wenn Sie stattdessen eine +manuelle Installation durchführen, so gehen Sie wie folgt vor: +Entpacken Sie die Datei \texttt{biblatex-dw.tds.zip} in den \texttt{\$LOCALTEXMF}"=Ordner ihres Systems.\footnote{Falls Sie nicht wissen, was das ist, können Sie sich unter \url{http://projekte.dante.de/DanteFAQ/TDS} bzw. \url{http://mirror.ctan.org/tds/tds.html} informieren.} Aktualisieren Sie anschließend die \emph{filename database} ihrer \TeX"=Distribution. -MiK\TeX"=Benutzer können das entweder im Dialog \enquote{Settings} mit der -Schaltfläche \enquote{Refresh FNDB} erledigen oder von der Kommandozeile aus -mit dem Befehl \texttt{initexmf -{}-refresh-fndb}. Wenn Sie eine andere -\LaTeX"=Distribution verwenden, schlagen Sie bitte in der Dokumentation Ihrer -Distribution nach, wie Sie entsprechend vorgehen müssen. Weitere Informationen: +Weitere Informationen: \begin{itemize} \small \item \url{http://projekte.dante.de/DanteFAQ/PaketInstallation} @@ -314,6 +314,22 @@ Neben einigen Änderungen in der Zeichensetzung gibt es folgende Unterschiede: \addcomma\space\bibstring{volume}\addspace} \end{lstlisting} Das würde \enquote{(Reihentitel, Bd. N)} ergeben. + \item Mit\beschreibung{shorthandinbib} der Option \option{shorthandinbib} + lassen sich die Siglen (\texttt{shorthand}) im Literaturverzeichnis + ausgeben. Mit \option{shorthandinbib=true} werden sie direkt vor dem + entsprechenden Eintrag in eckigen Klammern ausgegeben. Das Erscheinungsbild + wird durch das Feldformat \enquote{shorthandinbib} festgelegt. Will man + die Klammern weglassen, definiert man das Feldformat folgendermaßen: + \begin{lstlisting} +\DeclareFieldFormat{shorthandinbib}{#1} + \end{lstlisting} + Da in diesem Fall nur ein Leerzeichen zwischen Sigle und Literatureintrag + steht, sollte man auch die Zeichensetzung nach der Sigle umdefinieren. Dafür + ist der Befehl \cmd{shorthandinbibpunct} zuständig, dem man etwa einen + Doppelpunkt zuweisen könnte: + \begin{lstlisting} +\renewcommand*{\shorthandinbibpunct}{\addcolon\space} + \end{lstlisting} \item Setzt\beschreibung{annotation} man die Option \option{annotation} auf \wert{true}, wird das Feld \texttt{annotation} in @@ -413,30 +429,62 @@ Neben einigen Änderungen in der Zeichensetzung gibt es folgende Unterschiede: \texttt{options\,=\,\{citedas=true\}} oder \texttt{options\,=\,\{citedas=false\}}. Die globale Einstellung wird dann für den entsprechenden Eintrag ignoriert. - \item Wird\beschreibung{herename} - bei einem Vollzitat (\cmd{fullcite} oder Erstzitat mit der Option - \option{firstfull}) eines Eintrags mit Seitenangaben auch im - Zitat eine Seitenangabe gemacht, wird diese durch \enquote{hier} - eingeleitet. Dies kann durch die Option \option{herename} - beeinflusst werden, die die Werte \wert{true} oder \wert{false} - annehmen kann; der Standard ist \wert{true}. - Der Ausdruck kann mit folgendem Befehl in der Präambel umdefiniert - werden, z.\,B. um einen Doppelpunkt nach \enquote{hier} zu haben: + \item Mit\beschreibung{citepages} + der Option \option{citepages} lassen sich die Seitenangaben in Vollzitaten + unterdrücken, wenn das Feld \texttt{pages} vorhanden ist: + \option{citepages=permit} erlaubt Duplikate, d.\,h. sowohl \texttt{pages} + als auch \texttt{postnote} werden ausgegeben; + mit \option{citepages=suppress} wird das \texttt{pages}"=Feld des Vollzitats + in jedem Fall unterdrückt, es wird also nur die \texttt{postnote} ausgegeben (falls vorhanden); + \option{citepages=omit} unterdrückt die Ausgabe von \texttt{pages} nur, wenn + in der \texttt{postnote} eine Seitenzahl angegeben ist; + \option{citepages=separate} gibt das \texttt{pages}"=Feld immer aus, trennt + die \texttt{postnote} aber mit dem Begriff \enquote{hier} ab, falls es sich + um eine Seitenzahl handelt. Dazu wird der \emph{bibliography string} \enquote{thiscite} + verwendet, der sich natürlich umdefinieren lässt. + Der Standard für diese Option ist \wert{separate}. + Dazu ein Beispiel, das die folgenden Zitierbefehle verwendet: \begin{lstlisting} -\DefineBibliographyStrings{german}{% - herename = {hier\addcolon\space} -} +\cite{BibTeX-Key} +\cite[eine Anmerkung]{BibTeX-Key} +\cite[125]{BibTeX-Key} \end{lstlisting} - \item Mit der Option \option{herename=true} wird die Zeichensetzung vor dem - \enquote{herename} durch den Befehl \cmd{herenamepunct} bestimmt. Der - Standard ist \wert{\cmd{addcomma}\cmd{space}}, also ein Komma gefolgt - von einem Leerzeichen. - \item Mit\beschreibung{omitpages} - der Option \option{omitpages=true} werden die Seitenangaben von - Einträgen der Typen \texttt{@article}, \texttt{@inbook}, \texttt{@incollection} und - \texttt{@inproceedings} in Vollzitaten nicht ausgegeben. Nutzt man - gleichzeitig die Option \option{herename=true}, wird auch der \enquote{herename} - unterdrückt. Der Standard für diese Option ist \wert{false}. + % + \option{citepages=permit}: + \begin{quote} + Autor: Titel, in: Buch, S.\,100--150. + + Autor: Titel, in: Buch, S.\,100--150, eine Anmerkung. + + Autor: Titel, in: Buch, S.\,100--150, S.\,125. + \end{quote} + % + \option{citepages=suppress}: + \begin{quote} + Autor: Titel, in: Buch. + + Autor: Titel, in: Buch, eine Anmerkung. + + Autor: Titel, in: Buch, S.\,125. + \end{quote} + % + \option{citepages=omit}: + \begin{quote} + Autor: Titel, in: Buch, S.\,100--150. + + Autor: Titel, in: Buch, S.\,100--150, eine Anmerkung. + + Autor: Titel, in: Buch, S.\,125. + \end{quote} + % + \option{citepages=separate}: + \begin{quote} + Autor: Titel, in: Buch, S.\,100--150. + + Autor: Titel, in: Buch, S.\,100--150, eine Anmerkung. + + Autor: Titel, in: Buch, S.\,100--150, hier S.\,125. + \end{quote} \item Mit\beschreibung{firstfullname} der Option \option{firstfullname=true} hat man die Möglichkeit, beim ersten Zitieren eines Autors\slash Herausgebers mit dem Befehl \cmd{citeauthor} @@ -517,9 +565,6 @@ Option \option{firstfull}. Daneben gibt es folgende Unterschiede: (\texttt{annotation}) und Bibliotheksinformationen (\texttt{library}) nur in der Bibliographie ausgegeben (falls eine vorhanden ist), nicht aber im Erstzitat und in der Sigelliste. - \item Die Option \option{herename} hat sowohl f"ur Vollzitate - (\cmd{fullcite}) als auch für das jeweilige Erstzitat eines Eintrags - Gültigkeit. \end{itemize} \section{Die Querverweis-Funktionalität} @@ -632,6 +677,10 @@ Der Wert in Klammern gibt den Standard an. Bei Einträgen mit \texttt{shorthand} wird dem Erstzitat (bei \xbx{authortitle-dw} nur mit der Option \option{firstfull}) ein \enquote{im Folgenden zit. als~\ldots} angefügt. + \optlist{citepages}{separate} + Legt fest, ob bei einem Voll- oder Erstzitat (bei \xbx{authortitle-dw} nur mit der + Option \option{firstfull}) eines Eintrags mit \texttt{pages}"=Feld die Seitenangaben ausgegeben + werden oder nicht. \optlist{edbyidem}{true} \enquote{hg.\,v.\,dems.} statt \enquote{hg.\.v. \emph{Herausgeber}}. \optlist{editorstring}{parens} @@ -659,10 +708,6 @@ Der Wert in Klammern gibt den Standard an. Mögliche Werte sind \wert{smallcaps} (Kapitälchen), \wert{italic} (kursiv), \wert{bold} (fett) und \wert{normal} (Voreinstellung~-- das heißt, der normale Schriftschnitt wird verwendet). - \optlist{herename}{true} - Bei einem Voll- oder Erstzitat (bei \xbx{authortitle-dw} nur mit der - Option \option{firstfull}) eines Eintrags mit Seitenangaben werden die - Seitenangaben zum Zitat durch ein \enquote{hier} eingeleitet. \optlist{ibidemfont}{normal} Legt den Schriftschnitt von \enquote{ebenda}\slash\enquote{ebd.} fest. Mögliche Werte sind \wert{smallcaps} (Kapitälchen), \wert{italic} (kursiv), @@ -709,11 +754,6 @@ Der Wert in Klammern gibt den Standard an. \option{oldauthor} ignoriert. \optlist{omiteditor}{false} Unterdrückt die Ausgabe des Herausgebers in Literaturverweisen. - \optlist{omitpages}{false} - Legt fest, ob bei einem Voll- oder Erstzitat (bei \xbx{authortitle-dw} nur mit der - Option \option{firstfull}) eines Eintrags der Typen \texttt{@article}, \texttt{@inbook}, - \texttt{@incollection} oder \texttt{@inproceedings} die Seitenangaben ausgegeben - werden oder nicht. \optlist{origfields}{true} Mit \option{origfields=true} werden die Felder \texttt{origlocation} und \texttt{origdate} (sowie \texttt{origpublisher}, wenn @@ -738,6 +778,9 @@ Der Wert in Klammern gibt den Standard an. \optlist{shorthandibid}{true} Direkte Folgezitate von Einträgen mit \texttt{shorthand} werden durch \enquote{ebd.} ersetzt. + \optlist{shorthandinbib}{false} + Setzt man die Option auf \wert{true}, werden die Siglen (\texttt{shorthand}) + im Literaturverzeichnis direkt vor dem Eintrag ausgegeben. \optnur[kein Standard gesetzt]{shorthandwidth} Legt die Breite der Label im Sigelverzeichnis \emph{(List of Shorthands)} fest. Gleichzeitig werden nach jedem Label \cmd{shorthandsep} @@ -1153,9 +1196,6 @@ Im Folgenden werden die von \bldw{} zur Verfügung gestellten Befehle mit ihrer S dem ersten und zweiten Namen in Zitaten beim Schema \enquote{Nachname, Vorname, Vorname Nachname}. Das Komma ist damit nicht gemeint! Vergleiche \cmd{revsdnamedelim} von \bl.} - \befehl{herenamepunct}{\cmd{addcomma}\cmd{space}}{Zeichen vor dem - \enquote{herename} (vor Seitenangaben in Vollzitaten von unselbständigen - Werken).} \befehl{journumstring}{\cmd{addcomma}\cmd{space}\cmd{bibstring\{number\}}% \cmd{addnbspace}}{Zeichen\slash Begriff vor der Heftnummer (\texttt{number}) einer Zeitschrift.} @@ -1179,7 +1219,9 @@ Im Folgenden werden die von \bldw{} zur Verfügung gestellten Befehle mit ihrer S innerhalb der Klammer.} \befehl{sernumstring}{\cmd{addspace}}{Zeichen\slash Begriff zwischen dem Reihentitel (\texttt{series}) und der Nummer (\texttt{number}).} - \befehl{shorthandpunct}{\cmd{addcolon}}{Zeichen nach einer Sigle, wenn + \befehl{shorthandinbibpunct}{\cmd{addspace}}{Zeichen nach einer Sigle im Literaturverzeichnis, wenn + \option{shorthandinbib} benutzt wird.} + \befehl{shorthandpunct}{\cmd{addcolon}}{Zeichen nach einer Sigle im Sigelverzeichnis, wenn \option{shorthandwidth} benutzt wird.} \befehl{shorthandsep}{3pt plus 0.5pt minus 0.5pt}{Länge zwischen Sigle und Siglenbeschreibung, wenn \option{shorthandwidth} benutzt wird.} @@ -1193,7 +1235,6 @@ aufgeführt. Es gibt sie jeweils in einer langen und einer abgekürzten Form. Welche Form verwendet wird, hängt von der \bl"=Option \option{abbreviate} ab. \begin{labeling}{mmmmmmm} - \biblstring{herename}{hier}{hier} \biblstring{idemdat}{demselben}{dems\cmd{adddot}} \biblstring{idemdatsf}{derselben}{ders\cmd{adddot}} \biblstring{idemdatsm}{demselben}{dems\cmd{adddot}} @@ -1203,8 +1244,8 @@ Welche Form verwendet wird, hängt von der \bl"=Option \option{abbreviate} ab. \biblstring{idemdatpn}{denselben}{dens\cmd{adddot}} \biblstring{idemdatpp}{denselben}{dens\cmd{adddot}} \biblstring{inrefstring}{Artikel\cmd{addspace}}{Art\cmd{adddotspace}} - \end{labeling} + Die \emph{bibliography strings} lassen sich folgendermaßen umdefinieren, wobei nicht zwischen einer langen und einer kurzen Form unterschieden werden kann: \begin{lstlisting} @@ -1232,6 +1273,13 @@ verwenden den Befehl \cmd{addabthinspace}, also einen kurzen Abstand zwischen den einzelnen Teilen der Abkürzung. Die genaue Bedeutung dieses Befehls wird in der \bl"=Dokumentation erklärt. +\subsection{Zusätzliche Feldformate} +In dieser Liste werden die von \bldw{} zusätzlich definierten Feldformate +aufgeführt. + +\feldformat{shorthandinbib}{mkbibbrackets\{\#1\}}{Formatierung der Siglen + bei \option{shorthandinbib=true}.} + \section{Weitere Hinweise} \label{weitere-anpassungen} Die folgenden Hinweise verstehen sich als Anregung für fortgeschrittene Anwender diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdf Binary files differindex 2d26e139370..8178a50f34c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex index bc9dc455fe5..b21f2223723 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex +++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-authortitle-dw.tex @@ -1,17 +1,19 @@ -% v 1.3 +% v 1.3a % This file presents the `authortitle-dw' style % +\listfiles \documentclass[a4paper]{article} \usepackage[T1]{fontenc} \usepackage[latin9]{inputenc} \usepackage[ngerman]{babel} -\usepackage[babel]{csquotes} +\usepackage[autostyle]{csquotes} \usepackage[ style=authortitle-dw, %% biblatex-dw-Optionen %%% %acronyms=true, annotation=true, %citedas=false, + %citepages=suppress,%omit,%permit,%separate, %edbyidem=false, %editorstring=normal,%brackets, %edstringincitations=false, @@ -19,7 +21,6 @@ %firstfull=true, %firstfullname=true, %firstnamefont=smallcaps,%italic,%bold, - %herename=false, %ibidemfont=smallcaps,%italic,%bold, %idembib=false, %idembibformat=dash, @@ -31,13 +32,13 @@ %nopublisher=false, %oldauthor=false, %omiteditor=true, - %omitpages=true, %origfields=false, %origfieldsformat=parens,%brackets,%punct, %pagetotal=true, %pseudoauthor=false, %series=afteryear, %shorthandibid=false, + %shorthandinbib=true, %shorthandwidth=40pt,%3em, %shortjournal=true, %terselos=false, @@ -47,11 +48,12 @@ %citetracker=false, %doi=true, %eprint=true, + %ibidpage=true, %ibidtracker=false, %idemtracker=false, %isbn=true, %pagetracker=false, - hyperref + %hyperref ]{biblatex} \usepackage{hyperref} \bibliography{de-examples-dw} diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-examples-dw.bib b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-examples-dw.bib index 14f4913c863..08c2ff85d3c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-examples-dw.bib +++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-examples-dw.bib @@ -336,15 +336,15 @@ shorttitle = {Nikolauskult}, subtitle = {Eine kultgeographisch-volkskundliche Untersuchung}, date = {1981}, + location = {Düsseldorf}, + origlocation = {Düsseldorf}, + origdate = {1931}, annotation = {Ein \texttt{book}-Eintrag. Man beachte die Felder \texttt{origdate} und \texttt{origlocation}, die dafür sorgen, dass \texttt{date} und \texttt{location} als \enquote*{Nachdruck} erscheinen.}, gender = {sm}, series = {Forschungen zur Volkskunde}, number = {9--12}, - location = {Düsseldorf}, - origlocation = {Düsseldorf}, - origdate = {1931} } @INBOOK{nietzsche:historie, diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.pdf Binary files differindex 3247a8e6fa9..3380a42b644 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.tex index 37a6e6ff79c..0eeae85d02d 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.tex +++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/de-footnote-dw.tex @@ -1,24 +1,24 @@ -% v 1.3 +% v 1.3a % This file presents the `footnote-dw' style % \documentclass[a4paper]{article} \usepackage[T1]{fontenc} \usepackage[latin9]{inputenc} \usepackage[ngerman]{babel} -\usepackage[babel]{csquotes} +\usepackage[autostyle]{csquotes} \usepackage[ style=footnote-dw, %% biblatex-dw-Optionen %%% %acronyms=true, annotation=true, %citedas=false, + %citepages=suppress,%omit,%permit,%separate, %edbyidem=false, %editorstring=normal,%brackets, %edstringincitations=false, %edsuper=true, %firstfullname=true, %firstnamefont=smallcaps,%italic,%bold, - %herename=false, %ibidemfont=smallcaps,%italic,%bold, %idembib=false, %idembibformat=dash, @@ -30,7 +30,6 @@ %nopublisher=false, %oldauthor=false, %omiteditor=true, - %omitpages=true, %origfields=false, %origfieldsformat=parens,%brackets,%punct, %pageref=true, @@ -38,6 +37,7 @@ %pseudoauthor=false, %series=afteryear, %shorthandibid=false, + %shorthandinbib=true, %shorthandwidth=40pt,%3em, %shortjournal=true, %terselos=false, @@ -47,6 +47,7 @@ %citetracker=false, %doi=true, %eprint=true, + %ibidpage=true, %ibidtracker=false, %idemtracker=false, %isbn=true, diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdf Binary files differindex 9bfc76e762f..40ec657f6b8 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex index fe78deb9383..46e5aac8672 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex +++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-authortitle-dw.tex @@ -1,16 +1,17 @@ -% v 1.3 +% v 1.3a % This file presents the `authortitle-dw' style % \documentclass[a4paper]{article} \usepackage[T1]{fontenc} \usepackage[british]{babel} -\usepackage[babel]{csquotes} +\usepackage[autostyle]{csquotes} \usepackage[ style=authortitle-dw, %%% biblatex-dw options %%% %acronyms=true, annotation=true, %citedas=false, + %citepages=suppress,%omit,%permit,%separate, %edbyidem=false, %editorstring=normal,%brackets, %edstringincitations=false, @@ -18,7 +19,6 @@ %firstfull=true, %firstfullname=true, %firstnamefont=smallcaps,%italic,%bold, - %herename=false, %ibidemfont=smallcaps,%italic,%bold, %idembib=false, %idembibformat=dash, @@ -30,12 +30,12 @@ %nopublisher=false, %oldauthor=false, %omiteditor=true, - %omitpages=true, %origfields=false, %origfieldsformat=parens,%brackets,%punct, %pagetotal=true, %pseudoauthor=false, %series=afteryear, + %shorthandinbib=true, %shorthandibid=false, %shorthandwidth=40pt,%3em, %shortjournal=true, @@ -46,6 +46,7 @@ %citetracker=false, %doi=true, %eprint=true, + %ibidpage=true, %ibidtracker=false, %idemtracker=false, %isbn=true, diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf Binary files differindex 0d4f17b9f1d..b0cdbfd13fc 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.tex b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.tex index 0d45af6b97f..1f6dbcd712a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.tex +++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/en-footnote-dw.tex @@ -1,23 +1,24 @@ -% v 1.3 +% v 1.3a % This file presents the `footnote-dw' style % \documentclass[a4paper]{article} \usepackage[T1]{fontenc} \usepackage[british]{babel} -\usepackage[babel]{csquotes} +\usepackage[autostyle]{csquotes} \usepackage[ style=footnote-dw, + useeditor=true, %%% biblatex-dw options %%% %acronyms=true, annotation=true, %citedas=false, + %citepages=suppress,%omit,%permit,%separate, %edbyidem=false, %editorstring=normal,%brackets, %edstringincitations=false, %edsuper=true, %firstfullname=true, %firstnamefont=smallcaps,%italic,%bold, - %herename=false, %ibidemfont=smallcaps,%italic,%bold, %idembib=false, %idembibformat=dash, @@ -29,7 +30,6 @@ %nopublisher=false, %oldauthor=false, %omiteditor=true, - %omitpages=true, %origfields=false, %origfieldsformat=parens,%brackets,%punct, %pageref=true, @@ -37,6 +37,7 @@ %pseudoauthor=false, %series=afteryear, %shorthandibid=false, + %shorthandinbib=true, %shorthandwidth=40pt,%3em, %shortjournal=true, %terselos=false, @@ -46,6 +47,7 @@ %citetracker=false, %doi=true, %eprint=true, + %ibidpage=true, %ibidtracker=false, %idemtracker=false, %isbn=true, @@ -59,6 +61,7 @@ \usepackage{xcolor} \newcommand{\option}[1]{\textcolor{red}{#1}} \setlength{\parindent}{0pt} + \begin{document} \section*{The \texttt{footnote-dw} style} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx index 63235482766..cdc92d47b4a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx @@ -1,13 +1,13 @@ % authortitle-dw.bbx, Dominik Waßenhoven 2010 -\ProvidesFile{authortitle-dw.bbx}[2010/03/11 v1.3 biblatex bibliography style] +\ProvidesFile{authortitle-dw.bbx}[2010/09/21 v1.3a biblatex bibliography style] -\@ifpackagelater{biblatex}{2010/02/14} +\@ifpackagelater{biblatex}{2010/08/04} {} {\PackageError{biblatex} {Outdated 'biblatex' package} {The version of the 'authortitle-dw' style you are using\MessageBreak - requires biblatex v0.9 or later.\MessageBreak + requires biblatex v0.9b or later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now.}% \endinput} @@ -16,8 +16,10 @@ \newbool{bbx:annotation} \newbool{bbx:edbyidem} +\newbool{bbx:editorstring}% Test, ob editorstring auf parens oder brackets gesetzt wurde \newbool{bbx:edsuper} \newbool{bbx:idembib} +\newbool{bbx:idemfont}% Test, ob idemfont gesetzt wurde \newbool{bbx:library} \newbool{bbx:nolocation} \newbool{bbx:nopublisher} @@ -53,37 +55,116 @@ \DeclareBibliographyOption{pseudoauthor}[true]{% \csuse{bool#1}{bbx:pseudoauthor}} -\newcommand{\bbx@idembibformat}{} -\newcommand{\bbx@option@editorstring}{} -\newcommand{\bbx@option@firstnamefont}{} -\newcommand{\bbx@option@namefont}{} -\newcommand{\bbx@option@ibidemfont}{} -\newcommand{\bbx@option@idemfont}{empty}% wichtig zur Überprüfung wegen Paket-Warnung bei falscher Option \newcommand{\bbx@origfieldsformat}{} -\DeclareBibliographyOption{editorstring}{% - \renewcommand{\bbx@option@editorstring}{#1}} -\DeclareBibliographyOption{firstnamefont}{% - \renewcommand{\bbx@option@firstnamefont}{#1}} -\DeclareBibliographyOption{ibidemfont}{% - \renewcommand{\bbx@option@ibidemfont}{#1}} -\DeclareBibliographyOption{idembibformat}{% - \renewcommand{\bbx@idembibformat}{#1}} -\DeclareBibliographyOption{idemfont}{% - \renewcommand{\bbx@option@idemfont}{#1}} -\DeclareBibliographyOption{namefont}{% - \renewcommand{\bbx@option@namefont}{#1}} \DeclareBibliographyOption{origfieldsformat}{% \renewcommand{\bbx@origfieldsformat}{#1}} +\DeclareBibliographyOption{namefont}[normal]{% + \ifcsdef{bbx@opt@namefont@#1} + {\csuse{bbx@opt@namefont@#1}} + {\blxdw@error{% + Invalid option 'namefont=#1'\MessageBreak + Valid values are 'normal', 'smallcaps', 'italic', 'bold'}}} +\newcommand{\bbx@namefont}{} +\def\bbx@opt@namefont@normal{% + \renewcommand{\bbx@namefont}{}} +\def\bbx@opt@namefont@smallcaps{% + \renewcommand{\bbx@namefont}{\textsc}} +\def\bbx@opt@namefont@italic{% + \renewcommand{\bbx@namefont}{\textit}} +\def\bbx@opt@namefont@bold{% + \renewcommand{\bbx@namefont}{\textbf}} + +\DeclareBibliographyOption{firstnamefont}[normal]{% + \ifcsdef{bbx@opt@firstnamefont@#1} + {\csuse{bbx@opt@firstnamefont@#1}} + {\blxdw@error{% + Invalid option 'firstnamefont=#1'\MessageBreak + Valid values are 'normal', 'smallcaps', 'italic', 'bold'}}} +\newcommand{\bbx@firstnamefont}{} +\def\bbx@opt@firstnamefont@normal{% + \renewcommand{\bbx@firstnamefont}{}} +\def\bbx@opt@firstnamefont@smallcaps{% + \renewcommand{\bbx@firstnamefont}{\textsc}} +\def\bbx@opt@firstnamefont@italic{% + \renewcommand{\bbx@firstnamefont}{\textit}} +\def\bbx@opt@firstnamefont@bold{% + \renewcommand{\bbx@firstnamefont}{\textbf}} + +\DeclareBibliographyOption{idemfont}[normal]{% + \ifcsdef{bbx@opt@idemfont@#1} + {\csuse{bbx@opt@idemfont@#1}} + {\blxdw@error{% + Invalid option 'idemfont=#1'\MessageBreak + Valid values are 'normal', 'smallcaps', 'italic', 'bold'}}} +\newcommand{\bbx@idemfont}{} +\def\bbx@opt@idemfont@normal{% + \global\booltrue{bbx:idemfont}% + \renewcommand{\bbx@idemfont}{}} +\def\bbx@opt@idemfont@smallcaps{% + \global\booltrue{bbx:idemfont}% + \renewcommand{\bbx@idemfont}{\textsc}} +\def\bbx@opt@idemfont@italic{% + \global\booltrue{bbx:idemfont}% + \renewcommand{\bbx@idemfont}{\textit}} +\def\bbx@opt@idemfont@bold{% + \global\booltrue{bbx:idemfont}% + \renewcommand{\bbx@idemfont}{\textbf}} + +\DeclareBibliographyOption{ibidemfont}[normal]{% + \ifcsdef{bbx@opt@ibidemfont@#1} + {\csuse{bbx@opt@ibidemfont@#1}} + {\blxdw@error{% + Invalid option 'ibidemfont=#1'\MessageBreak + Valid values are 'normal', 'smallcaps', 'italic', 'bold'}}} +\newcommand{\bbx@ibidemfont}{} +\def\bbx@opt@ibidemfont@normal{% + \renewcommand{\bbx@ibidemfont}{}} +\def\bbx@opt@ibidemfont@smallcaps{% + \renewcommand{\bbx@ibidemfont}{\textsc}} +\def\bbx@opt@ibidemfont@italic{% + \renewcommand{\bbx@ibidemfont}{\textit}} +\def\bbx@opt@ibidemfont@bold{% + \renewcommand{\bbx@ibidemfont}{\textbf}} + +\DeclareBibliographyOption{idembibformat}[idem]{% + \ifcsdef{bbx@opt@idembibformat@#1} + {\csuse{bbx@opt@idembibformat@#1}} + {\blxdw@error{% + Invalid option 'idembibformat=#1'\MessageBreak + Valid values are 'idem', 'dash'}}} +\def\bbx@opt@idembibformat@idem{% + \let\bibnamedashOrig\bibnamedash + \AtBeginBibliography{ + \renewcommand*{\bibnamedash}{% + \bibsentence\bibstring[\mkidem]{idem\thefield{gender}}}}} +\def\bbx@opt@idembibformat@dash{ + \AtBeginBibliography{% + \let\bibnamedash\bibnamedashOrig}}% + +\DeclareBibliographyOption{editorstring}[normal]{% + \ifcsdef{bbx@opt@editorstring@#1} + {\csuse{bbx@opt@editorstring@#1}} + {\blxdw@error{% + Invalid option 'editorstring=#1'\MessageBreak + Valid values are 'normal', 'parens', 'brackets'}}} +\newcommand{\bbx@editorstring}{} +\def\bbx@opt@editorstring@normal{% + \global\boolfalse{bbx:editorstring}% + \renewcommand{\bbx@editorstring}{}} +\def\bbx@opt@editorstring@parens{% + \global\booltrue{bbx:editorstring}% + \renewcommand{\bbx@editorstring}{\mkbibparens}} +\def\bbx@opt@editorstring@brackets{% + \global\booltrue{bbx:editorstring}% + \renewcommand{\bbx@editorstring}{\mkbibbrackets}} + \ExecuteBibliographyOptions{% edbyidem=true, editorstring=parens, - firstnamefont=normal, - ibidemfont=normal, idembib=true, idembibformat=idem, - namefont=normal, nolocation=false, nopublisher=true, oldauthor=true, @@ -136,11 +217,6 @@ \let\revsdnamedelim\bibrevsdnamedelim% \let\multinamedelim\bibmultinamedelim% \let\finalnamedelim\bibfinalnamedelim% -% -%% 'Ders.' statt '--' in der Bibliographie - \ifdefstring{\bbx@idembibformat}{idem} - {\renewcommand*{\bibnamedash}{\bibsentence\bibstring[\mkidem]{idem\thefield{gender}}}}% - {}% } %% Formate in der Bibliographie @@ -242,159 +318,86 @@ % Nachnamen von Einträgen mit 'options = {oldauthor=true}' oder 'options = {oldauthor}' % werden nicht in der Schrift von 'namefont' gesetzt \renewcommand*{\mkbibnamelast}[1]{% - \ifbool{bbx:oldauthor}% bei globaler Option oldauthor=true - {\ifthenelse{% - \boolean{oldauthor}\AND - \(\ifcurrentname{author} - \OR - \(\ifcurrentname{labelname}\AND\NOT\ifnameundef{author}\) - \)} + \ifboolexpr{ + bool {bbx:oldauthor} + and + bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) + } {#1} - {\ifdefstring{\bbx@option@namefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@namefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@namefont}{bold}% - {\textbf{#1}} - {#1}}}}} - {% bei globaler Option oldauthor=false - {\ifdefstring{\bbx@option@namefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@namefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@namefont}{bold}% - {\textbf{#1}} - {#1}}}}}} + {\bbx@namefont{#1}}} % Formatierung der Vornamen entsprechend der Option 'firstnamefont' \renewcommand*{\mkbibnamefirst}[1]{% - \ifbool{bbx:oldauthor}% bei globaler Option oldauthor=true - {\ifthenelse{% - \boolean{oldauthor}\AND - \(\ifcurrentname{author} - \OR - \(\ifcurrentname{labelname}\AND\NOT\ifnameundef{author}\) - \)} + \ifboolexpr{ + bool {bbx:oldauthor} + and + bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) + } {#1} - {\ifdefstring{\bbx@option@firstnamefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@firstnamefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@firstnamefont}{bold}% - {\textbf{#1}} - {#1}}}}} - {% bei globaler Option oldauthor=false - {\ifdefstring{\bbx@option@firstnamefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@firstnamefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@firstnamefont}{bold}% - {\textbf{#1}} - {#1}}}}}} - -% Wenn 'firstnamefont' gesetzt ist, muss auch prefix angepasst werden + {\bbx@firstnamefont{#1}}} + +% prefix richtet sich nach 'namefont' (useprefix=true) +% oder 'firstnamefont' (useprefix=false) \renewcommand*{\mkbibnameprefix}[1]{% - \ifuseprefix{% bei useprefix=true - \ifbool{bbx:oldauthor}% bei globaler Option oldauthor=true - {\ifthenelse{% - \boolean{oldauthor}\AND - \(\ifcurrentname{author} - \OR - \(\ifcurrentname{labelname}\AND\NOT\ifnameundef{author}\) - \)} - {#1} - {\ifdefstring{\bbx@option@namefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@namefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@namefont}{bold}% - {\textbf{#1}} - {#1}}}}} - {% bei globaler Option oldauthor=false - {\ifdefstring{\bbx@option@namefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@namefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@namefont}{bold}% - {\textbf{#1}} - {#1}}}}}} - {% bei useprefix=false richtet es sich nach der Option firstname - \ifdefstring{\bbx@option@firstnamefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@firstnamefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@firstnamefont}{bold}% - {\textbf{#1}} - {#1}}}}} - -% Wenn 'firstnamefont' gesetzt ist, muss auch suffix angepasst werden + \ifboolexpr{ + bool {bbx:oldauthor} + and + bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) + } + {#1} + {\ifuseprefix + {\bbx@namefont{#1}} + {\bbx@firstnamefont{#1}}}} + +% suffix richtet sich nach 'firstnamefont' \renewcommand*{\mkbibnameaffix}[1]{% - \ifbool{bbx:oldauthor}% bei globaler Option oldauthor=true - {\ifthenelse{% - \boolean{oldauthor}\AND - \(\ifcurrentname{author} - \OR - \(\ifcurrentname{labelname}\AND\NOT\ifnameundef{author}\) - \)} - {#1} - {\ifdefstring{\bbx@option@firstnamefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@firstnamefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@firstnamefont}{bold}% - {\textbf{#1}} - {#1}}}}} - {% bei globaler Option oldauthor=false - {\ifdefstring{\bbx@option@firstnamefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@firstnamefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@firstnamefont}{bold}% - {\textbf{#1}} - {#1}}}}}} + \ifboolexpr{ + bool {bbx:oldauthor} + and + bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) + } + {#1} + {\bbx@firstnamefont{#1}}} %% \mkidem: % wenn im Feld 'options' 'oldauthor=true' oder 'oldauthor' steht, % werden keine Kapitälchen o.ä. bei Wiederholungszitaten ('Ders.') gesetzt -% ansonsten Formatierung der Vornamen entsprechend der Option 'idemfont', +% ansonsten Formatierung entsprechend der Option 'idemfont', % falls diese nicht vorhanden ist, wird der Wert von 'namefont' übernommen \newcommand*{\mkidem}[1]{% - \ifbool{bbx:oldauthor}% bei globaler Option oldauthor=true - {\ifbool{oldauthor} + \ifboolexpr{ + bool {bbx:oldauthor} + and + bool {oldauthor} + } {#1} - {\ifdefstring{\bbx@option@idemfont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@idemfont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@idemfont}{bold}% - {\textbf{#1}} - {\ifdefstring{\bbx@option@idemfont}{normal}% - {#1} - {% falls idemfont nicht gesetzt ist, wird von namefont 'geerbt': - \ifdefstring{\bbx@option@namefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@namefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@namefont}{bold}% - {\textbf{#1}} - {#1}}}}}}}}}% - {% bei globaler Option oldauthor=false - \ifdefstring{\bbx@option@idemfont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@idemfont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@idemfont}{bold}% - {\textbf{#1}} - {\ifdefstring{\bbx@option@idemfont}{normal}% - {#1} - {% falls idemfont nicht gesetzt ist, wird von namefont 'geerbt': - \ifdefstring{\bbx@option@namefont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@namefont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@namefont}{bold}% - {\textbf{#1}} - {#1}}}}}}}}} + {\ifbool{bbx:idemfont} + {\bbx@idemfont{#1}} + {\bbx@namefont{#1}}}} %% Punkt zwischen Untertitel und Titelzusatz ([book|main]titleaddon) \renewbibmacro*{title}{% @@ -533,77 +536,63 @@ \newunit}}% ansonsten wird komplett ausgegeben {\printfield{edition}% \newunit}} - + +%% Hilfsmakro für Option editorstring +\newbibmacro*{editorstringpunct}{% + \ifbool{bbx:editorstring} + {\addspace} + {\addcomma\space}} + %% Herausgeber ('Hrsg.') je nach Option editorstring \renewbibmacro*{editorstrg}{% \iffieldundef{editortype} {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\mkbibparens{\bibstring{editors}}}% - {\ifdefstring{\bbx@option@editorstring}{brackets}% - {\mkbibbrackets{\bibstring{editors}}}% - {\bibstring{editors}}}}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\mkbibparens{\bibstring{editor}}}% - {\ifdefstring{\bbx@option@editorstring}{brackets}% - {\mkbibbrackets{\bibstring{editor}}}% - {\bibstring{editor}}}}}% + {\bbx@editorstring{\bibstring{editors}}} + {\bbx@editorstring{\bibstring{editor}}}} {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\mkbibparens{\bibstring{\thefield{editortype}s}}}% - {\ifdefstring{\bbx@option@editorstring}{brackets}% - {\mkbibbrackets{\bibstring{\thefield{editortype}s}}}% - {\bibstring{\thefield{editortype}s}}}}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\mkbibparens{\bibstring{\thefield{editortype}}}}% - {\ifdefstring{\bbx@option@editorstring}{brackets}% - {\mkbibbrackets{\bibstring{\thefield{editortype}}}}% - {\bibstring{\thefield{editortype}}}}}}}% + {\bbx@editorstring{\bibstring{\thefield{editortype}s}}} + {\bbx@editorstring{\bibstring{\thefield{editortype}}}}}} \renewbibmacro*{editor+othersstrg}{% - \ifthenelse{\value{editor}>1\OR\ifandothers{editor}} - {\def\@tempa{editors}} - {\def\@tempa{editor}}% + \iffieldundef{editortype} + {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} + {\def\abx@tempa{editors}} + {\def\abx@tempa{editor}}} + {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} + {\edef\abx@tempa{\thefield{editortype}s}} + {\edef\abx@tempa{\thefield{editortype}}}}% + \let\abx@tempb=\empty \ifnamesequal{editor}{translator} - {\appto\@tempa{tr}% - \clearname{translator}} + {\appto\abx@tempa{tr}% + \appto\abx@tempb{\clearname{translator}}} {}% \ifnamesequal{editor}{commentator} - {\appto\@tempa{co}% - \clearname{commentator}} + {\appto\abx@tempa{co}% + \appto\abx@tempb{\clearname{commentator}}} {\ifnamesequal{editor}{annotator} - {\appto\@tempa{an}% - \clearname{annotator}} + {\appto\abx@tempa{an}% + \appto\abx@tempb{\clearname{annotator}}} {}}% \ifnamesequal{editor}{introduction} - {\appto\@tempa{in}% - \clearname{introduction}} + {\appto\abx@tempa{in}% + \appto\abx@tempb{\clearname{introduction}}} {\ifnamesequal{editor}{foreword} - {\appto\@tempa{fo}% - \clearname{foreword}} + {\appto\abx@tempa{fo}% + \appto\abx@tempb{\clearname{foreword}}} {\ifnamesequal{editor}{afterword} - {\appto\@tempa{af}% - \clearname{afterword}} + {\appto\abx@tempa{af}% + \appto\abx@tempb{\clearname{afterword}}} {}}}% - \ifdefstring{\bbx@option@editorstring}{parens} - {\mkbibparens{\bibstring{\@tempa}}} - {\ifdefstring{\bbx@option@editorstring}{brackets} - {\mkbibbrackets{\bibstring{\@tempa}}} - {\bibstring{\@tempa}}}} + \ifbibxstring{\abx@tempa} + {\bbx@editorstring{\bibstring{\abx@tempa}}% + \abx@tempb} + {\usebibmacro{editorstrg}}} %% Übersetzer ('Übers.') je nach Option editorstring \renewbibmacro*{translatorstrg}{% \ifthenelse{\value{translator}>1\OR\ifandothers{translator}} - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\mkbibparens{\bibstring{translators}}}% - {\ifdefstring{\bbx@option@editorstring}{brackets}% - {\mkbibbrackets{\bibstring{translators}}}% - {\bibstring{translators}}}}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\mkbibparens{\bibstring{translator}}}% - {\ifdefstring{\bbx@option@editorstring}{brackets}% - {\mkbibbrackets{\bibstring{translator}}}% - {\bibstring{translator}}}}} + {\bbx@editorstring{\bibstring{translators}}} + {\bbx@editorstring{\bibstring{translator}}}} \renewbibmacro*{translator+othersstrg}{% \ifthenelse{\value{translator}>1\OR\ifandothers{translator}} @@ -626,11 +615,7 @@ {\appto\abx@tempa{af}% \clearname{afterword}} {}}}% - \ifdefstring{\bbx@option@editorstring}{parens} - {\mkbibparens{\bibstring{\abx@tempa}}} - {\ifdefstring{\bbx@option@editorstring}{brackets} - {\mkbibbrackets{\bibstring{\abx@tempa}}} - {\bibstring{\abx@tempa}}}} + \bbx@editorstring{\bibstring{\abx@tempa}}} %% Option 'editorstring=brackets|parens|normal' %% Option 'idembib=true|false' @@ -642,18 +627,15 @@ {\bibnamedash} {\printnames{editor}% \savefield{namehash}{\bbx@lasthash}}}% - {\printnames{editor}}% - \ifdefstring{\bbx@option@editorstring}{brackets}% - {\addspace}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\addspace}% - {\addcomma\space}}% + {\printnames{editor}% + \global\undef\bbx@lasthash}% + \usebibmacro{editorstringpunct}% \usebibmacro{editorstrg}% \ifbool{bbx:idembib} {} {\labelnamepunct}% \clearname{editor}} - {\global\undef\bbx@lasthash}} + {}} \renewbibmacro*{editor+others}{% \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}} @@ -664,11 +646,7 @@ {\printnames{editor}% \savefield{namehash}{\bbx@lasthash}}}% {\printnames{editor}}% - \ifdefstring{\bbx@option@editorstring}{brackets}% - {\addspace}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\addspace}% - {\addcomma\space}}% + \usebibmacro{editorstringpunct}% \usebibmacro{editor+othersstrg}% \ifbool{bbx:idembib} {} @@ -685,11 +663,7 @@ {\printnames{translator}% \savefield{namehash}{\bbx@lasthash}}}% {\printnames{translator}}% - \ifdefstring{\bbx@option@editorstring}{brackets}% - {\addspace}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\addspace}% - {\addcomma\space}}% + \usebibmacro{editorstringpunct}% \usebibmacro{translatorstrg}% \ifbool{bbx:idembib} {} @@ -706,11 +680,7 @@ {\printnames{translator}% \savefield{namehash}{\bbx@lasthash}}}% {\printnames{translator}}% - \ifdefstring{\bbx@option@editorstring}{brackets}% - {\addspace}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\addspace}% - {\addcomma\space}}% + \usebibmacro{editorstringpunct}% \usebibmacro{translator+othersstrg}% \ifbool{bbx:idembib} {} @@ -718,6 +688,15 @@ \clearname{translator}} {\global\undef\bbx@lasthash}} +\newbibmacro*{editor+others/translator+others}{% + \ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\usebibmacro{editor+others}} + {\usebibmacro{translator+others}}} + %% Option 'idembib=true|false' \renewbibmacro*{author}{% \ifbool{bbx:pseudoauthor} @@ -726,8 +705,17 @@ \newbibmacro*{author:pseudotrue}{% \ifbool{pseudoauthor} - {\printtext{\bibleftpseudo}} - {}% + {\printtext{\bibleftpseudo}% + \usebibmacro{author:output}% + \printtext{\bibrightpseudo}} + {\usebibmacro{author:output}}} + +\newbibmacro*{author:pseudofalse}{% + \ifbool{pseudoauthor} + {} + {\usebibmacro{author:output}}} + +\newbibmacro*{author:output}{% \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}} {\ifbool{bbx:idembib} {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND @@ -735,33 +723,14 @@ {\bibnamedash} {\printnames{author}% \savefield{namehash}{\bbx@lasthash}}} - {\printnames{author}}} - {\global\undef\bbx@lasthash}% + {\printnames{author}% + \global\undef\bbx@lasthash}% \iffieldundef{authortype} {} - {\addcomma\space - \usebibmacro{authorstrg}}% - \ifbool{pseudoauthor} - {\printtext{\bibrightpseudo}} - {}} + {\setunit{\addcomma\space}% + \usebibmacro{authorstrg}}} + {}} -\newbibmacro*{author:pseudofalse}{% - \ifbool{pseudoauthor} - {} - {\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}} - {\ifbool{bbx:idembib} - {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND - \NOT\iffirstonpage} - {\bibnamedash} - {\printnames{author}% - \savefield{namehash}{\bbx@lasthash}}} - {\printnames{author}}} - {\global\undef\bbx@lasthash}% - \iffieldundef{authortype} - {} - {\addcomma\space - \usebibmacro{authorstrg}}}} - %% 'Ders.' bei inbook, wenn gleicher Autor \renewbibmacro*{bybookauthor}{% \ifnamesequal{author}{bookauthor} @@ -774,53 +743,90 @@ %% Wenn Autor und Hrsg. gleich --> hg. v. dems./ders./dens.: \renewbibmacro*{byeditor+others}{% - \ifthenelse{\NOT\ifnameundef{editor}\AND - \(\iffieldundef{editortype}\OR - \iffieldequalstr{editortype}{editor}\)} - {\def\abx@tempa{byeditor}% - \ifnamesequal{editor}{translator} - {\appto\abx@tempa{tr}% - \clearname{translator}} - {}% - \ifnamesequal{editor}{commentator} - {\appto\abx@tempa{co}% - \clearname{commentator}} - {\ifnamesequal{editor}{annotator} - {\appto\abx@tempa{an}% - \clearname{annotator}} - {}}% - \ifnamesequal{editor}{introduction} - {\appto\abx@tempa{in}% - \clearname{introduction}} - {\ifnamesequal{editor}{foreword} - {\appto\abx@tempa{fo}% - \clearname{foreword}} - {\ifnamesequal{editor}{afterword} - {\appto\abx@tempa{af}% - \clearname{afterword}} - {}}}% - \bibstring{\abx@tempa}% + \ifnameundef{editor} + {} + {\usebibmacro{byeditor+othersstrg}% \setunit{\addspace}% - \printnames[byeditor]{editor}% + \ifboolexpr{ + ( test {\ifnamesequal{editor}{author}} + or + bool {xrefidem} ) + and + bool {bbx:edbyidem} + } + {\bibstring[\mkidem]{idemdat\thefield{gender}}} + {\printnames[byeditor]{editor}}% \clearname{editor}% - \newunit - \usebibmacro{byeditorx}}% - {\ifnamesequal{editor}{author} - {\ifbool{bbx:edbyidem} - {\bibstring{byeditor}\addspace\bibstring[\mkidem]{idemdat\thefield{gender}}} - {\usebibmacro{byeditor}}}% - {\usebibmacro{byeditor}}}% + \newunit}% + \usebibmacro{byeditorx}% \usebibmacro{bytranslator+others}} +\renewbibmacro*{bytranslator+others}{% + \ifnameundef{translator} + {} + {\usebibmacro{bytranslator+othersstrg}% + \setunit{\addspace}% + \ifboolexpr{ + ( test {\ifnamesequal{translator}{author}} + or + bool {xrefidem} ) + and + bool {bbx:edbyidem} + } + {\bibstring[\mkidem]{idemdat\thefield{gender}}} + {\printnames[bytranslator]{translator}}% + \clearname{translator}% + \newunit}% + \usebibmacro{withothers}} + +\newbibmacro*{ifuse:byeditor+others}{% + \ifboolexpr{ + ( test \ifuseeditor + and + not test {\ifnameundef{editor}} ) + or + ( test \ifusetranslator + and + not test {\ifnameundef{translator}} ) + } + {} + {\usebibmacro{byeditor+others}}} + +\newbibmacro*{ifuse:xrefidem}{% + \ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\printtext{\bibstring[\mkidem]{idem\thefield{gender}}% + \addspace}% + \usebibmacro{editor+othersstrg}% + \setunit{\labelnamepunct}\newblock} + {}% + \ifboolexpr{ + test \ifusetranslator + and + not test {\ifnameundef{translator}} + and + ( ( not test \ifuseeditor ) + or + ( test \ifuseeditor + and + test {\ifnameundef{editor}} ) ) + } + {\printtext{\bibstring[\mkidem]{idem\thefield{gender}}% + \addspace}% + \usebibmacro{editor+othersstrg}% + \setunit{\labelnamepunct}\newblock} + {}} + %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% Makros aus authortitle.bbx (unverändert) %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -\renewcommand*{\thebibitem}{\item} -\renewcommand*{\thelositem}{\item} \setlength{\bibitemsep}{0pt} -\renewenvironment*{thebibliography} +\defbibenvironment{bibliography} {\list {} {\setlength{\leftmargin}{\bibhang}% @@ -828,5 +834,6 @@ \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}}} {\endlist} + {\item} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx index 4cffc2510fb..b5a1c898766 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/footnote-dw.bbx @@ -1,8 +1,8 @@ % footnote-dw.bbx, Dominik Waßenhoven 2010 -\ProvidesFile{footnote-dw.bbx}[2010/03/11 v1.3 biblatex bibliography style] +\ProvidesFile{footnote-dw.bbx}[2010/09/21 v1.3a biblatex bibliography style] -\@ifpackagelater{biblatex}{2010/02/14} +\@ifpackagelater{biblatex}{2010/08/04} {} {\PackageError{biblatex} {Outdated 'biblatex' package} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx index 8bdd7cf0d44..7641f3d5e68 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx @@ -1,6 +1,6 @@ % standard-dw.bbx, Dominik Waßenhoven 2010 -\ProvidesFile{standard-dw.bbx}[2010/03/11 v1.3 biblatex bibliography style] +\ProvidesFile{standard-dw.bbx}[2010/09/21 v1.3a biblatex bibliography style] \RequireBibliographyStyle{standard} @@ -12,11 +12,13 @@ \newbool{bbx:journumdate} \newbool{bbx:seriesafteryear} \newbool{bbx:shorthandacro} +\newbool{bbx:shorthandinbib} +\newbool{bbx:shorthandinbibpunct}% Kontrolle, ob shorthandinbib ausgegeben wurde \newbool{bbx:shorthandwidthbool} \newbool{bbx:shortjournal} \newbool{bbx:terselos} \newbool{bbx:xref}% soll xref überhaupt verwendet werden? -\newbool{bbx:xrefnoidem} +\newbool{xrefidem} % Schalter zum ein-/ausblenden bestimmter Felder \newbool{bbx:pagetotal} @@ -29,9 +31,12 @@ \DeclareBibliographyOption{acronyms}[true]{% \csuse{bool#1}{bbx:shorthandacro}} +\DeclareBibliographyOption{shorthandinbib}[true]{% + \csuse{bool#1}{bbx:shorthandinbib}} \DeclareBibliographyOption{shorthandwidth}{% \setlength{\bbx@shorthandwidth}{#1} \setlength{\shorthandsep}{3pt plus 0.5pt minus 0.5pt} + \renewcommand{\shorthandpunct}{\addcolon} \csuse{booltrue}{bbx:shorthandwidthbool}} \DeclareBibliographyOption{shortjournal}[true]{% \csuse{bool#1}{bbx:shortjournal}} @@ -69,6 +74,7 @@ journalnumber=standard, pagetotal=false, series=standard, + shorthandinbib=false, terselos=true, xref=false } @@ -118,11 +124,7 @@ {} {\ifnameundef{author} {\printnames{editor}% - \ifdefstring{\bbx@option@editorstring}{brackets}% - {\addspace}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\addspace}% - {\addcomma\space}}% + \usebibmacro{editorstringpunct}% \usebibmacro{editorstrg}} {\printnames{author}}% \setunit{\labelnamepunct}}% @@ -147,8 +149,7 @@ %% List of Shorthands: Länge der Labels einstellbar \AtBeginDocument{% \ifbool{bbx:shorthandwidthbool} - {\renewcommand{\shorthandpunct}{\addcolon} - \renewenvironment*{theshorthands} + {\defbibenvironment{shorthands} {\list {\printfield[shorthandwidth]{shorthand}% \printtext{\shorthandpunct}} @@ -159,11 +160,11 @@ \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{##1\hss}}} - {\endlist}} - {\renewenvironment*{theshorthands} + {\endlist} + {\item}} + {\defbibenvironment{shorthands} {\list - {\printfield[shorthandwidth]{shorthand}% - \printtext{\shorthandpunct}} + {\printfield[shorthandwidth]{shorthand}} {\setlength{\labelwidth}{\shorthandwidth}% \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% @@ -171,33 +172,73 @@ \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{##1\hss}}} - {\endlist}}} + {\endlist} + {\item}}} + +%% Option »shorthandinbib«: +%% Shorthands in der Bibliographie ausgeben +%% außerdem für Option »xref«: +%% Autoren in Liste schreiben für späteren Test xrefnamecheck +% \newcommand*{\@xrefauthornames} +\DeclareFieldFormat{shorthandinbib}{\mkbibbrackets{#1}} +\newcommand*{\shorthandinbibpunct}{\addspace} +\renewbibmacro*{begentry}{% + \ifcitation + {}% im Zitat sollen shorthands nicht ausgegeben werden + {\ifbool{bbx:shorthandinbib} + {\iffieldundef{shorthand} + {} + {\printfield[shorthandinbib]{shorthand}% + \shorthandinbibpunct}}% ohne \setunit, damit das auf jeden Fall ausgegeben wird + {}}} + +%% bei useeditor=true oder usetranslator=true +\newbibmacro*{useeditor+others}{% + \ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\usebibmacro{useeditor}} + {\ifboolexpr{ + test \ifusetranslator + and + not test {\ifnameundef{translator}} + } + {\usebibmacro{usetranslator}} + {}}} + +\newbibmacro*{useeditor}{% + \ifnamesequal{author}{editor} + {\ifbool{bbx:edbyidem} + {\midsentence*\bibstring[\mkidem]{idem\thefield{gender}}% + \addspace}% + {\printnames[byeditor]{editor}% + \usebibmacro{editorstringpunct}% + \savefield{namehash}{\bbx@lasthash}}}% + {\printnames[byeditor]{editor}% + \usebibmacro{editorstringpunct}% + \savefield{namehash}{\bbx@lasthash}}% + \usebibmacro{editorstrg}% + \clearname{editor}% + \setunit{\labelnamepunct}\newblock} + +\newbibmacro*{usetranslator}{% + {\ifnamesequal{author}{translator} + {\ifbool{bbx:edbyidem} + {\midsentence*\bibstring[\mkidem]{idem\thefield{gender}}% + \addspace}% + {\printnames[byeditor]{translator}% + \usebibmacro{editorstringpunct}% + \savefield{namehash}{\bbx@lasthash}}}% + {\printnames[byeditor]{translator}% + \usebibmacro{editorstringpunct}% + \savefield{namehash}{\bbx@lasthash}}% + \usebibmacro{translatorstrg}% + \clearname{translator}% + \setunit{\labelnamepunct}\newblock} + {}} -%% bei useeditor=true -\newbibmacro*{editorincoll}{% - \ifnameundef{editor} - {}% - {\ifnamesequal{author}{editor} - {\ifbool{bbx:edbyidem} - {\midsentence*\bibstring[\mkidem]{idem\thefield{gender}}% - \addspace}% - {\printnames[byeditor]{editor}% - \ifdefstring{\bbx@option@editorstring}{brackets}% - {\addspace}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\addspace}% - {\addcomma\space}}% - \savefield{namehash}{\bbx@lasthash}}}% - {\printnames[byeditor]{editor}% - \ifdefstring{\bbx@option@editorstring}{brackets}% - {\addspace}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\addspace}% - {\addcomma\space}}% - \savefield{namehash}{\bbx@lasthash}}% - \usebibmacro{editorstrg}% - \clearname{editor}}} - %% Wenn 'volumes' und 'volume' angegeben sind, %% 'volumes' immer vor 'volume' ausgeben \newbibmacro*{volumes+volume+part}{% @@ -362,10 +403,7 @@ \global\boolfalse{bbx:journumdate}}}}} \renewbibmacro*{journal+issuetitle}{% - \ifuseeditor - {\usebibmacro{editorincoll}% - \setunit{\labelnamepunct}\newblock} - {}% + \usebibmacro{useeditor+others}% \usebibmacro{journal}% \setunit*{\addspace}% \iffieldundef{series} @@ -406,10 +444,8 @@ {\printtext[parens]{\usebibmacro{issue+date}}}% \newunit\newblock \usebibmacro{issue}% - \ifuseeditor - {} - {\newunit% - \usebibmacro{byeditor+others}}% + \newunit + \usebibmacro{byeditor+others}% \newunit} % journalnumber=afteryear @@ -433,10 +469,8 @@ \printfield{number}}}% \newunit\newblock \usebibmacro{issue}% - \ifuseeditor - {} - {\newunit% - \usebibmacro{byeditor+others}}% + \newunit + \usebibmacro{ifuse:byeditor+others}% \newunit} % journalnumber=date @@ -447,10 +481,8 @@ \usebibmacro{issue+date+number}% \newunit\newblock \usebibmacro{issue}% - \ifuseeditor - {} - {\newunit% - \usebibmacro{byeditor+others}}% + \newunit + \usebibmacro{ifuse:byeditor+others}% \newunit} \renewbibmacro*{issue+date}{% Klammern entfernt @@ -470,10 +502,10 @@ \printdate}}% {\iffieldundef{month}% mit definiertem Feld issue {\printtext[parens]{\printdate}% - \setunit{\addspace}% - \printfield{issue}}% - {\setunit{\addcomma\space}% - \printdate}}}% + \setunit{\addspace}% + \printfield{issue}}% + {\setunit{\addcomma\space}% + \printdate}}}% {\iffieldundef{issue}% mit definiertem Feld number {\iffieldundef{month} {\setunit{\addspace}% @@ -484,9 +516,7 @@ {\setunit{\addcomma\space\journumstring}% \printfield{number}% \setunit{\addcomma\space}% - \printfield{month}% - \setunit{\addspace}% - \printfield{year}}% + \printdate}% {\setunit{\addcomma\space\journumstring}% \printfield{number}% \setunit{\addcomma\space}% @@ -501,9 +531,7 @@ {\setunit{\addspace\journumstring}% \printfield{number}% \setunit{\addcomma\space}% - \printfield{month}% - \setunit{\addspace}% - \printfield{year}% + \printdate \setunit{\addcomma\space}% \printfield{issue}}% {\setunit{\addcomma\space\journumstring}% @@ -514,6 +542,17 @@ \printfield{issue}}}}}% \newunit} +%% pageref: space statt \newunit, da sonst Komma vor Klammer steht +\renewbibmacro*{pageref}{% + \iflistundef{pageref} + {} + {\setunit{\addspace}% + \printtext[parens]{% + \ifnumgreater{\value{pageref}}{1} + {\bibstring{backrefpages}\ppspace} + {\bibstring{backrefpage}\ppspace}% + \printlist[pageref][-\value{listtotal}]{pageref}}}} + %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% Bibmacros für Code, der im Bibliography %%%%% %%%%% Driver aufgerufen wird, wenn KEIN xref %%%%% @@ -521,7 +560,7 @@ %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% \newbibmacro{noxref:inbook}{% \usebibmacro{bybookauthor}% - \newunit\newblock + \setunit{\labelnamepunct}\newblock% \usebibmacro{maintitle+booktitle}% \newunit \usebibmacro{byeditor+others}% @@ -554,16 +593,11 @@ \usebibmacro{pageref}}% \newbibmacro{noxref:incollection}{% - \ifuseeditor - {\usebibmacro{editorincoll}% - \setunit{\labelnamepunct}\newblock} - {}% + \usebibmacro{useeditor+others}% \usebibmacro{maintitle+booktitle}% \newunit - \ifuseeditor - {} - {\usebibmacro{byeditor+others}% - \newunit\newblock}% + \usebibmacro{ifuse:byeditor+others}% + \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% \setunit{\addspace}% @@ -592,18 +626,12 @@ \usebibmacro{pageref}} \newbibmacro{noxref:inproceedings}{% - \ifuseeditor - {\usebibmacro{editorincoll}% - \setunit{\labelnamepunct}\newblock} - {}% + \usebibmacro{useeditor+others}% \usebibmacro{maintitle+booktitle}% \newunit\newblock \usebibmacro{event+venue+date}% \newunit\newblock - \ifuseeditor - {} - {\usebibmacro{byeditor+others}% - \newunit\newblock}% + \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{volumes+volume+part}% \setunit{\addspace}% @@ -634,16 +662,11 @@ \usebibmacro{pageref}}% \newbibmacro{noxref:inreference}{% - \ifuseeditor - {\usebibmacro{editorincoll}% - \setunit{\labelnamepunct}\newblock} - {}% + \usebibmacro{useeditor+others}% \usebibmacro{maintitle+booktitle}% \newunit - \ifuseeditor - {} - {\usebibmacro{byeditor+others}% - \newunit\newblock}% + \usebibmacro{ifuse:byeditor+others}% + \newunit\newblock \usebibmacro{edition}% \setunit{\addspace}% \ifbool{bbx:seriesafteryear} @@ -679,7 +702,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -714,7 +739,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{maintitle+title}% \newunit \printlist{language}% @@ -761,7 +788,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -796,8 +825,10 @@ \usebibmacro{begentry}% \ifbool{cbx:idemfull} {} - {\usebibmacro{editor+others}% - \setunit{\labelnamepunct}\newblock}% + {\usebibmacro{editor+others/translator+others}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}}}% \usebibmacro{maintitle+title}% \newunit \printlist{language}% @@ -842,7 +873,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit\newblock \printlist{language}% @@ -850,10 +883,18 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{in:}% - \ifnamexref{labelname}% - {\global\boolfalse{bbx:xrefnoidem}}% - {\global\booltrue{bbx:xrefnoidem}% - \global\booltrue{cbx:xrefnoidem}}% + \ifboolexpr{ + test \ifuseeditor + or + test \ifusetranslator + } + {\ifnamexref{labelname}% + {\booltrue{xrefidem}}% + {\boolfalse{xrefidem}}} + {\usebibmacro{authedxrefcheck}% + \ifbool{cbx:authedxref} + {\booltrue{xrefidem}} + {\boolfalse{xrefidem}}}% \ifbool{bbx:xref} {\iffieldundef{xref}% {% Code, wenn kein xref vorhanden @@ -870,7 +911,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -878,17 +921,10 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{in:}% - \ifuseeditor - {\ifnamexref{labelname} - {\global\boolfalse{bbx:xrefnoidem}} - {\global\booltrue{bbx:xrefnoidem}% - \global\booltrue{cbx:xrefnoidem}}} - {\usebibmacro{authedxrefcheck}% - \ifbool{cbx:authedxref} - {\global\boolfalse{bbx:xrefnoidem}% - \global\boolfalse{cbx:xrefnoidem}} - {\global\booltrue{bbx:xrefnoidem}% - \global\booltrue{cbx:xrefnoidem}}}% + \usebibmacro{authedxrefcheck}% + \ifbool{cbx:authedxref} + {\booltrue{xrefidem}} + {\boolfalse{xrefidem}}% \ifbool{bbx:xref} {\iffieldundef{xref} {% Code, wenn kein xref vorhanden @@ -905,7 +941,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -913,16 +951,18 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{in:}% - \ifuseeditor + \ifboolexpr{ + test \ifuseeditor + or + test \ifusetranslator + } {\ifnamexref{labelname}% - {\global\boolfalse{bbx:xrefnoidem}}% - {\global\booltrue{bbx:xrefnoidem}% - \global\booltrue{cbx:xrefnoidem}}} + {\booltrue{xrefidem}}% + {\boolfalse{xrefidem}}} {\usebibmacro{authedxrefcheck}% \ifbool{cbx:authedxref} - {\global\boolfalse{bbx:xrefnoidem}} - {\global\booltrue{bbx:xrefnoidem}% - \global\booltrue{cbx:xrefnoidem}}}% + {\booltrue{xrefidem}} + {\boolfalse{xrefidem}}}% \ifbool{bbx:xref} {\iffieldundef{xref}% {% Code, wenn kein xref vorhanden @@ -939,7 +979,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/translator+others}% - \setunit*{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -947,16 +989,18 @@ \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{in:}% - \ifuseeditor + \ifboolexpr{ + test \ifuseeditor + or + test \ifusetranslator + } {\ifnamexref{labelname}% - {\global\boolfalse{bbx:xrefnoidem}}% - {\global\booltrue{bbx:xrefnoidem}% - \global\booltrue{cbx:xrefnoidem}}} + {\booltrue{xrefidem}}% + {\boolfalse{xrefidem}}} {\usebibmacro{authedxrefcheck}% \ifbool{cbx:authedxref} - {\global\boolfalse{bbx:xrefnoidem}} - {\global\booltrue{bbx:xrefnoidem}% - \global\booltrue{cbx:xrefnoidem}}}% + {\booltrue{xrefidem}} + {\boolfalse{xrefidem}}}% \ifbool{bbx:xref} {\iffieldundef{xref}% {% Code, wenn kein xref vorhanden @@ -976,7 +1020,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -1027,7 +1073,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -1063,7 +1111,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/editor+others/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -1096,7 +1146,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -1132,8 +1184,10 @@ \usebibmacro{begentry}% \ifbool{cbx:idemfull} {} - {\usebibmacro{editor+others}% - \setunit{\labelnamepunct}\newblock}% + {\usebibmacro{editor+others/translator+others}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title+issuetitle}% \newunit \printlist{language}% @@ -1158,8 +1212,10 @@ \usebibmacro{begentry}% \ifbool{cbx:idemfull} {} - {\usebibmacro{editor+others}% - \setunit{\labelnamepunct}\newblock}% + {\usebibmacro{editor+others/translator+others}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{maintitle+title}% \newunit \printlist{language}% @@ -1207,7 +1263,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -1247,7 +1305,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -1279,7 +1339,9 @@ \ifbool{cbx:idemfull} {} {\usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock}% + \ifnameundef{labelname} + {} + {\setunit{\labelnamepunct}\newblock}}% \usebibmacro{title}% \newunit \printlist{language}% @@ -1310,7 +1372,8 @@ \DeclareBibliographyDriver{xrefbook}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \ifuseeditor + \ifboolexpr{ + test \ifuseauthor or test \ifuseeditor or test \ifusetranslator} {\usebibmacro{author/editor+others/translator+others}% \setunit{\labelnamepunct}\newblock} {}% @@ -1320,10 +1383,8 @@ \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock - \ifuseeditor - {} - {\usebibmacro{byeditor+others}% - \newunit\newblock}% + \usebibmacro{ifuse:byeditor+others}% + \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% \setunit{\addspace}% @@ -1359,18 +1420,17 @@ \DeclareBibliographyDriver{xrefcollection}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \ifuseeditor - {\usebibmacro{editor+others}% + \ifboolexpr{ + test \ifuseeditor or test \ifusetranslator} + {\usebibmacro{editor+others/translator+others}% \setunit{\labelnamepunct}\newblock} {}% \usebibmacro{maintitle+title}% \newunit \printlist{language}% \newunit\newblock - \ifuseeditor - {} - {\usebibmacro{byeditor+others}% - \newunit\newblock}% + \usebibmacro{ifuse:byeditor+others}% + \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% \setunit{\addspace}% @@ -1406,8 +1466,9 @@ \DeclareBibliographyDriver{xrefproceedings}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \ifuseeditor - {\usebibmacro{editor+others}% + \ifboolexpr{ + test \ifuseeditor or test \ifusetranslator} + {\usebibmacro{editor+others/translator+others}% \setunit{\labelnamepunct}\newblock} {}% \usebibmacro{maintitle+title}% @@ -1416,10 +1477,8 @@ \newunit\newblock \usebibmacro{event+venue+date}% \newunit\newblock - \ifuseeditor - {} - {\usebibmacro{byeditor+others}% - \newunit\newblock}% + \usebibmacro{ifuse:byeditor+others}% + \newunit\newblock \usebibmacro{volumes+volume+part}% \setunit{\addspace}% \ifbool{bbx:seriesafteryear} @@ -1472,7 +1531,7 @@ \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock - \usebibmacro{byeditor+others}% + \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% @@ -1509,17 +1568,12 @@ \DeclareBibliographyDriver{xrefidemcollection}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \ifuseeditor - {\printtext{\bibstring[\mkidem]{idem\thefield{gender}}% - \addspace}% - \usebibmacro{editorstrg}% - \setunit{\labelnamepunct}\newblock} - {}% + \usebibmacro{ifuse:xrefidem}% \usebibmacro{maintitle+title}% \newunit \printlist{language}% \newunit\newblock - \usebibmacro{byeditor+others}% + \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{edition}% \usebibmacro{volumes+volume+part}% @@ -1556,19 +1610,14 @@ \DeclareBibliographyDriver{xrefidemproceedings}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \ifuseeditor - {\printtext{\bibstring[\mkidem]{idem\thefield{gender}}% - \addspace}% - \usebibmacro{editorstrg}% - \setunit{\labelnamepunct}\newblock} - {}% + \usebibmacro{ifuse:xrefidem}% \usebibmacro{maintitle+title}% \newunit \printlist{language}% \newunit\newblock \usebibmacro{event+venue+date}% \newunit\newblock - \usebibmacro{byeditor+others}% + \usebibmacro{ifuse:byeditor+others}% \newunit\newblock \usebibmacro{volumes+volume+part}% \setunit{\addspace}% @@ -1603,9 +1652,15 @@ \usebibmacro{pageref}% \usebibmacro{finentry}} -%%%%% %%%%% %%%%% %%%%% -%%%%% Warnungen %%%%% -%%%%% %%%%% %%%%% %%%%% +%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% +%%%%% Warnungen und Fehlermeldungen %%%%% +%%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% +\protected\def\blxdw@error#1{% + \begingroup + \blx@safe@actives + \PackageError{biblatex-dw}{#1}% + \endgroup} + \protected\def\blxdw@warning#1{% \begingroup \blx@safe@actives @@ -1632,62 +1687,6 @@ {\blxdw@warning@noline{% Unknown value for option 'origfieldsformat'.\MessageBreak Option 'origfieldsformat=punct' used instead}}}}% - \ifdefstring{\bbx@option@namefont}{smallcaps} - {} - {\ifdefstring{\bbx@option@namefont}{italic} - {} - {\ifdefstring{\bbx@option@namefont}{bold} - {} - {\ifdefstring{\bbx@option@namefont}{normal} - {} - {\blxdw@warning@noline{% - Unknown value for option 'namefont'.\MessageBreak - Option 'namefont=normal' used instead}}}}}% - \ifdefstring{\bbx@option@firstnamefont}{smallcaps} - {} - {\ifdefstring{\bbx@option@firstnamefont}{italic} - {} - {\ifdefstring{\bbx@option@firstnamefont}{bold} - {} - {\ifdefstring{\bbx@option@firstnamefont}{normal} - {} - {\blxdw@warning@noline{% - Unknown value for option 'firstnamefont'.\MessageBreak - Option 'firstnamefont=normal' used instead}}}}}% - \ifdefstring{\bbx@option@ibidemfont}{smallcaps} - {} - {\ifdefstring{\bbx@option@ibidemfont}{italic} - {} - {\ifdefstring{\bbx@option@ibidemfont}{bold} - {} - {\ifdefstring{\bbx@option@ibidemfont}{normal} - {} - {\blxdw@warning@noline{% - Unknown value for option 'ibidemfont'.\MessageBreak - Option 'ibidemfont=normal' used instead}}}}}% - \ifdefstring{\bbx@option@idemfont}{smallcaps} - {} - {\ifdefstring{\bbx@option@idemfont}{italic} - {} - {\ifdefstring{\bbx@option@idemfont}{bold} - {} - {\ifdefstring{\bbx@option@idemfont}{normal} - {} - {\ifdefstring{\bbx@option@idemfont}{empty} - {} - {\blxdw@warning@noline{% - Unknown value for option 'idemfont'.\MessageBreak - Value of option 'namefont' used instead}}}}}}% - \ifdefstring{\bbx@option@editorstring}{parens} - {} - {\ifdefstring{\bbx@option@editorstring}{brackets} - {} - {\ifdefstring{\bbx@option@editorstring}{normal} - {} - {\ExecuteBibliographyOptions{editorstring=parens}% - \blxdw@warning@noline{% - Unknown value for option 'editorstring'.\MessageBreak - Option 'editorstring=parens' used instead}}}}% \ifdefstring{\bbx@option@journalnumber}{standard} {} {\ifdefstring{\bbx@option@journalnumber}{afteryear} diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx index 3111bedb54c..b70030ddc5c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/authortitle-dw.cbx @@ -1,6 +1,6 @@ % authortitle-dw.cbx, Dominik Waßenhoven 2010 -\ProvidesFile{authortitle-dw.cbx}[2010/03/11 v1.3 biblatex citation style] +\ProvidesFile{authortitle-dw.cbx}[2010/09/21 v1.3a biblatex citation style] \RequireCitationStyle{standard-dw} @@ -10,7 +10,7 @@ \csuse{bool#1}{cbx:firstfull}} \newbibmacro*{cite}{% - \global\boolfalse{cbx:herename}% + \usebibmacro{cite:citepages}% \global\boolfalse{cbx:loccit}% \global\let\cbx@tempa\empty \ifbool{cbx:firstfull} @@ -32,15 +32,13 @@ {} {\usebibmacro{cite:name}}% \usebibmacro{cite:title}}% - \ifuseeditor + \ifbool{cbx:omiteditor} {} - {\ifbool{cbx:omiteditor} - {} - {\ifnameundef{labelname} - {\newunit - \usebibmacro{cite:byeditor}} - {}}}% - \usebibmacro{cite:save}}}% + {\ifnameundef{labelname} + {\newunit + \usebibmacro{cite:byeditor}} + {}}% + \usebibmacro{cite:save}}}% {\ifbool{cbx:shorthandibid}% {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}% {\usebibmacro{cite:ibid}} @@ -53,31 +51,19 @@ {\usebibmacro{cite:idem}% \booltrue{cbx:idemfull}} {}% - \printtext[bibhyperref]{\usebibmacro{cite:full}} + \printtext[bibhyperref]{\usebibmacro{cite:full}}% \usebibmacro{cite:save}} \newbibmacro*{cite:full}{% + \usebibmacro{cite:full:citepages}% \usedriver - {\ifbool{cbx:option:omitpages} - {\global\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}% \iffieldundef{shorthand} {} {\ifbool{cbx:citedas} {\addspace\usebibmacro{shorthandintro}} - {}}% - \iffieldundef{postnote} - {}% - {\iffieldundef{pages} - {}% - {\ifthenelse{\boolean{cbx:option:herename}\AND\NOT - \boolean{cbx:omitpages}} - {\global\booltrue{cbx:herename}% - \herenamepunct% - \bibstring{herename}} - {}}}} + {}}} \newbibmacro*{cite:shorthand}{% \cbx@tempa @@ -87,18 +73,18 @@ \newbibmacro*{textcite}{% \global\boolfalse{cbx:loccit}% \ifnameundef{labelname} - {\gdef\cbx@tempa{% - \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% - \BibliographyWarning{No author or editor given for \textcite}% - \textbf{\thefield{entrykey}}} + {\blxdw@warning@noline{No author or editor given for \textcite}% + \textbf{\thefield{entrykey}}} {\ifbool{cbx:firstfullname} {\printnames[citeauthor]{labelname}} {\printnames{labelname}}% - \gdef\cbx@tempa{% + \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% \usebibmacro{cite:save}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} @@ -113,47 +99,40 @@ \ifbool{cbx:firstfull} {\ifciteseen {\iffieldundef{shorthand} - {\ifuseeditor - {\ifnameundef{labelname} - {}% - {\ifbool{cbx:xrefnoidem} - {\usebibmacro{cite:editor} - \citenamepunct}% - {\usebibmacro{cite:idem}}}} + {\ifnameundef{labelname} {}% + {\ifbool{xrefidem} + {\usebibmacro{cite:xref:idem}}% + {\usebibmacro{cite:editor} + \citenamepunct}}% \usebibmacro{cite:title}% - \ifuseeditor - {} - {\ifbool{cbx:omiteditor} - {} - {\ifbool{cbx:xrefnoidem} - {\newunit - \usebibmacro{cite:byeditor}} - {\ifbool{bbx:edbyidem} - {\newunit - \bibstring{byeditor}% - \setunit{\addspace}% - \bibstring[\mkidem]{idemdat\thefield{gender}}} - {\newunit - \usebibmacro{cite:byeditor}}}}}}% + \ifnameundef{labelname} + {\ifboolexpr{ + bool {xrefidem} + and + bool {bbx:edbyidem} + } + {\newunit + \bibstring{byeditor}% + \setunit{\addspace}% + \bibstring[\mkidem]{idemdat\thefield{gender}}} + {\newunit + \usebibmacro{cite:byeditor}}} + {}} {\usebibmacro{cite:shorthand}}}% - {\ifbool{cbx:xrefnoidem} - {\usebibmacro{cite:fullxref}}% - {\ifbool{bbx:edbyidem} - {\usebibmacro{cite:fullxrefidem}}% - {\usebibmacro{cite:fullxref}}}}}% + {\ifbool{xrefidem} + {\ifbool{bbx:edbyidem} + {\usebibmacro{cite:fullxrefidem}}% + {\usebibmacro{cite:fullxref}}}% + {\usebibmacro{cite:fullxref}}}}% {\iffieldundef{shorthand} - {\ifuseeditor - {\ifnameundef{labelname} - {}% - {\ifbool{cbx:xrefnoidem} - {\usebibmacro{cite:editor}% - \citenamepunct}% - {\ifbool{bbx:edbyidem} - {\usebibmacro{cite:idem}}% - {\printnames{labelname}% - \citenamepunct}}}} - {}% + {\ifbool{xrefidem} + {\ifbool{bbx:edbyidem} + {\usebibmacro{cite:idem}}% + {\printnames{labelname}% + \citenamepunct}}% + {\usebibmacro{cite:editor}% + \citenamepunct}% \usebibmacro{cite:title}% \ifuseeditor {} @@ -169,14 +148,14 @@ {\ifuseeditor {\ifnameundef{labelname} {} - {\ifbool{bbx:xrefnoidem}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}% + {\ifbool{xrefidem}% {\ifbool{bbx:edbyidem} {\midsentence% \usebibmacro{cite:idem}}% {\printnames{labelname}% - \printtext{\labelnamepunct}}}}} + \printtext{\labelnamepunct}}}% + {\printnames{labelname}% + \printtext{\labelnamepunct}}}} {}% \iffieldundef{shorttitle}% {\printfield{title}}% @@ -187,24 +166,22 @@ {} {\ifnameundef{editor} {} - {\ifbool{bbx:xrefnoidem}% - {\newunit - \usebibmacro{byeditor}}% - {\ifbool{bbx:edbyidem} + {\ifbool{xrefidem}% + {\ifbool{bbx:edbyidem} {\newunit \bibstring{byeditor}% \setunit{\addspace}% \bibstring[\mkidem]{idemdat\thefield{gender}}} {\newunit - \usebibmacro{byeditor}}}}}}}% + \usebibmacro{byeditor}}}% + {\newunit + \usebibmacro{byeditor}}}}}}% {\printtext[bibhyperref]{\printfield{shorthand}}}}} \newbibmacro*{cite:fullxref}{% + \usebibmacro{cite:full:citepages}% \usedriver - {\ifbool{cbx:option:omitpages} - {\global\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {xref\thefield{entrytype}}% \iffieldundef{shorthand} {} @@ -213,77 +190,34 @@ {}}}% \newbibmacro*{cite:fullxrefidem}{% + \usebibmacro{cite:full:citepages}% \usedriver - {\ifbool{cbx:option:omitpages} - {\global\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}% - \clearfield{editor}} + {\DeclareNameAlias{sortname}{default}} {xrefidem\thefield{entrytype}}% \iffieldundef{shorthand} {} {\ifbool{cbx:citedas} {\addspace\usebibmacro{shorthandintro}} - {}}}% - -\DeclareCiteCommand{\textcite} - {\boolfalse{cbx:parens}% - \usebibmacro{prenote}} - {\usebibmacro{citeindex}% - \usebibmacro{textcite}} - {\ifbool{cbx:parens} - {\bibrightparen\boolfalse{cbx:parens}} - {}% - \multicitedelim} - {\iffieldundef{postnote} - {\ifbool{cbx:parens} - {\bibrightparen} - {}}% - {\ifbool{cbx:parens} - {\postnotedelim} - {\addspace\bibleftparen}% - \printfield{postnote}\bibrightparen}} + {}}} \DeclareCiteCommand{\fullcite} - {\usebibmacro{prenote}} + {\usebibmacro{prenote}% + \usebibmacro{cite:full:citepages}} {\usedriver - {\ifbool{cbx:option:omitpages} - {\global\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} {\multicitedelim} - {\iffieldundef{postnote} - {} - {\ifthenelse{\boolean{cbx:option:herename}\AND\NOT - \(\iffieldundef{pages}\OR - \boolean{cbx:omitpages}\)} - {\global\booltrue{cbx:herename}% - \herenamepunct% - \bibstring{herename}} - {\global\boolfalse{cbx:herename}}% - \usebibmacro{postnote}}} + {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\footfullcite}[\mkbibfootnote] {\bibsentence - \usebibmacro{prenote}} + \usebibmacro{prenote}% + \usebibmacro{cite:full:citepages}} {\usedriver - {\ifbool{cbx:option:omitpages} - {\global\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} {\multicitedelim} - {\iffieldundef{postnote} - {} - {\ifthenelse{\boolean{cbx:option:herename}\AND\NOT - \(\iffieldundef{pages}\OR - \boolean{cbx:omitpages}\)} - {\global\booltrue{cbx:herename}% - \herenamepunct% - \bibstring{herename}} - {\global\boolfalse{cbx:herename}}% - \usebibmacro{postnote}}} + {\usebibmacro{cite:postnote}} \newbibmacro*{citetitle}{% \global\boolfalse{cbx:loccit}% @@ -298,12 +232,12 @@ \cbx@tempa \ifsingletitle {\setunit{}}% Löschen des \citenamepunct, falls kein Titel ausgegeben wird - {\printtext[bibhyperlink]{% + {\printtext[bibhyperref]{% \printfield[citetitle]{labeltitle}}}} \newbibmacro*{cite:title:force}{% \cbx@tempa - \printtext[bibhyperlink]{% + \printtext[bibhyperref]{% \printfield[citetitle]{labeltitle}}} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% @@ -325,10 +259,15 @@ {\global\booltrue{cbx:loccit}} {}} -\newbibmacro*{cite:postnote}{% - \ifbool{cbx:loccit} - {}% - {\usebibmacro{postnote}}} +\newbibmacro*{textcite:postnote}{% + \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}} + {\ifbool{cbx:parens} + {\bibcloseparen} + {}} + {\ifbool{cbx:parens} + {\postnotedelim} + {\addspace\bibopenparen}% + \printfield{postnote}\bibcloseparen}} \DeclareCiteCommand{\cite} {\usebibmacro{prenote}} @@ -359,11 +298,27 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\footcite}[\mkbibfootnote] - {\bibsentence - \usebibmacro{prenote}} + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite:postnote}} + +\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] + {\usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite} + {\boolfalse{cbx:parens}} + {\usebibmacro{citeindex}% + \usebibmacro{textcite}} + {\ifbool{cbx:parens} + {\bibcloseparen\boolfalse{cbx:parens}} + {}% + \multicitedelim} + {\usebibmacro{textcite:postnote}} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx index 4df49f87aba..f8545a1ca85 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/footnote-dw.cbx @@ -1,17 +1,14 @@ % footnote-dw.cbx, Dominik Waßenhoven 2010 -\ProvidesFile{footnote-dw.cbx}[2010/03/11 v1.3 biblatex citation style] +\ProvidesFile{footnote-dw.cbx}[2010/09/21 v1.3a biblatex citation style] \RequireCitationStyle{standard-dw} \newbool{cbx:pageref} -\DeclareBibliographyOption{pageref}[true]{% - \setbool{cbx:pageref}{#1}} - \ExecuteBibliographyOptions{ - uniquename=false, % damit bei idem=false Vor- und Nachname gesetzt werden! loccittracker=true,% für die Option 'ibidpage' + uniquename=false, % damit bei idem=false Vor- und Nachname gesetzt werden! } % Kommandos zum Verpacken der Zitate in Fußnoten @@ -30,14 +27,14 @@ {\booltrue{cbx:parencitefoot}% \begingroup \let\mkbibparens\mkbibbrackets - \bibleftparen#1\bibrightparen + \bibopenparen#1\bibcloseparen \endgroup} {\unspace\footnote{% \toggletrue{blx@footnote}% \bibsentence#1\addperiod}}} \newbibmacro*{cite}{% - \global\boolfalse{cbx:herename}% + \usebibmacro{cite:citepages}% \global\boolfalse{cbx:loccit}% \bibhypertarget{cite\the\value{instcount}}{% \ifciteseen @@ -79,56 +76,43 @@ \label{cbx@\the\value{instcount}}} \newbibmacro*{cite:full}{% + \usebibmacro{cite:full:citepages}% \usebibmacro{footref}% - \ifuseeditor - {\ifnameundef{editor} - {\setunit{}} - {}}% - {\setunit{}}% \printtext[bibhypertarget]{% \usedriver - {\ifbool{cbx:option:omitpages} - {\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}% \iffieldundef{shorthand} {} {\ifbool{cbx:citedas} {\addspace\usebibmacro{shorthandintro}} - {}}% - \iffieldundef{pages} - {}% - {\iffieldundef{postnote} - {}% - {\ifthenelse{\boolean{cbx:option:herename}\AND\NOT - \boolean{cbx:omitpages}} - {\global\booltrue{cbx:herename}% - \herenamepunct% - \bibstring{herename}} - {}}}}} - + {}}}} + \newbibmacro*{cite:title}{% \ifsingletitle {\setunit{}}% Löschen des \citenamepunct, falls kein Titel ausgegeben wird {\printtext[bibhyperlink]{% \printfield[citetitle]{labeltitle}}}% - \ifuseeditor + \ifboolexpr{ + test \ifuseeditor + or + test \ifusetranslator + } {} {\ifbool{cbx:omiteditor} {} {\ifnameundef{editor} {} - {\ifbool{bbx:xrefnoidem}% - {\newunit - \usebibmacro{cite:byeditor}}% - {\ifbool{bbx:edbyidem} + {\ifbool{xrefidem}% + {\ifbool{bbx:edbyidem} {\newunit \bibstring{byeditor}% \setunit{\addspace}% \bibstring[\mkidem]{idemdat\thefield{gender}}} {\newunit - \usebibmacro{cite:byeditor}}}}}}% + \usebibmacro{cite:byeditor}}}% + {\newunit + \usebibmacro{cite:byeditor}}}}}% \usebibmacro{cite:seenote}} \newbibmacro*{cite:shorthand}{% @@ -164,29 +148,24 @@ \newbibmacro*{cite:xref}{% \ifciteseen {\iffieldundef{shorthand} - {\ifuseeditor - {\ifnameundef{labelname} - {}% - {\ifbool{cbx:xrefnoidem} - {\usebibmacro{cite:editor}% - \citenamepunct}% - {\usebibmacro{cite:idem}}}} - {}% + {\ifnameundef{labelname} + {} + {\ifbool{xrefidem} + {\usebibmacro{cite:xref:idem}} + {\usebibmacro{cite:editor}% + \citenamepunct}}% \usebibmacro{cite:title}} - {\usebibmacro{cite:shorthand}}}% - {\ifbool{cbx:xrefnoidem} - {\usebibmacro{cite:fullxref}}% + {\usebibmacro{cite:shorthand}}} + {\ifbool{xrefidem} {\ifbool{bbx:edbyidem} {\usebibmacro{cite:fullxrefidem}}% - {\usebibmacro{cite:fullxref}}}}}% + {\usebibmacro{cite:fullxref}}}% + {\usebibmacro{cite:fullxref}}}} \newbibmacro*{cite:fullxref}{% \usebibmacro{footref}% \usedriver - {\ifbool{cbx:option:omitpages} - {\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {xref\thefield{entrytype}}% \iffieldundef{shorthand} {} @@ -197,11 +176,7 @@ \newbibmacro*{cite:fullxrefidem}{% \usebibmacro{footref}% \usedriver - {\ifbool{cbx:option:omitpages} - {\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}% - \clearfield{editor}} + {\DeclareNameAlias{sortname}{default}} {xrefidem\thefield{entrytype}}% \iffieldundef{shorthand} {} @@ -214,38 +189,44 @@ \AtBeginBibliography{% \renewbibmacro*{cite:xref}{% \iffieldundef{shorthand}% - {\ifuseeditor + {\ifboolexpr{ + test \ifuseeditor + or + test \ifusetranslator + } {\ifnameundef{labelname} {} - {\ifbool{bbx:xrefnoidem}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}% + {\ifbool{xrefidem}% {\ifbool{bbx:edbyidem} {\midsentence% - \usebibmacro{cite:idem}}% + \usebibmacro{cite:xref:idem}}% {\printnames{labelname}% - \printtext{\labelnamepunct}}}}} + \printtext{\labelnamepunct}}}% + {\printnames{labelname}% + \printtext{\labelnamepunct}}}} {}% \iffieldundef{shorttitle}% {\printfield{title}}% {\printfield{shorttitle}}% - \ifuseeditor + \ifboolexpr{ + test \ifuseeditor + or + test \ifusetranslator + } {} {\ifbool{cbx:omiteditor} {} - {\ifnameundef{editor} - {} - {\ifbool{bbx:xrefnoidem}% - {\newunit - \usebibmacro{byeditor}}% - {\ifbool{bbx:edbyidem} - {\newunit - \bibstring{byeditor}% - \setunit{\addspace}% - \bibstring[\mkidem]{idemdat\thefield{gender}}} - {\newunit - \usebibmacro{byeditor}}}}}}}% - {\printtext[bibhyperref]{\printfield{shorthand}}}}} + {\ifbool{xrefidem}% + {\ifbool{bbx:edbyidem} + {\newunit + \bibstring{byeditor}% + \setunit{\addspace}% + \bibstring[\mkidem]{idemdat\thefield{gender}}} + {\newunit + \usebibmacro{byeditor+others}}} + {\newunit + \usebibmacro{byeditor+others}}}}}% + {\printtext[bibhyperref]{\printfield{shorthand}}}}} \DeclareCiteCommand{\cite}[\mkfootnotecite] {\usebibmacro{prenote}} @@ -270,45 +251,24 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\fullcite}[\mkfootnotecite] - {\usebibmacro{prenote}} + {\usebibmacro{prenote}% + \usebibmacro{cite:full:citepages}} {\usedriver - {\ifbool{cbx:option:omitpages} - {\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} {\multicitedelim} - {\iffieldundef{postnote} - {} - {\ifthenelse{\boolean{cbx:option:herename}\AND\NOT - \(\iffieldundef{pages}\OR - \boolean{cbx:omitpages}\)} - {\global\booltrue{cbx:herename}% - \herenamepunct% - \bibstring{herename}} - {\global\boolfalse{cbx:herename}}% - \usebibmacro{postnote}}} + {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\footfullcite}[\mkfootnotecite] {\bibsentence - \usebibmacro{prenote}} + \usebibmacro{prenote}% + \usebibmacro{cite:full:citepages}} {\usedriver - {\ifbool{cbx:option:omitpages} - {\booltrue{cbx:omitpages}} - {}% - \DeclareNameAlias{sortname}{default}} + {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} {\multicitedelim} - {\iffieldundef{postnote} - {} - {\ifthenelse{\boolean{cbx:option:herename}\AND\NOT - \(\iffieldundef{pages}\OR - \boolean{cbx:omitpages}\)} - {\global\booltrue{cbx:herename}% - \herenamepunct% - \bibstring{herename}} - {\global\boolfalse{cbx:herename}}% - \usebibmacro{postnote}}} + {\usebibmacro{cite:postnote}} + \DeclareMultiCiteCommand{\cites}[\mkfootnotecite]{\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkparencite]{\parencite}{\multicitedelim} @@ -343,10 +303,5 @@ {}} \newbibmacro*{cite:ibid:page}{} - -\newbibmacro*{cite:postnote}{% - \ifbool{cbx:loccit} - {} - {\usebibmacro{postnote}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx index 2258c80549e..6b4fb701250 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/cbx/standard-dw.cbx @@ -1,34 +1,29 @@ % standard-dw.cbx, Dominik Waßenhoven 2010 -\ProvidesFile{standard-dw.cbx}[2010/03/11 v1.3 biblatex citation style] +\ProvidesFile{standard-dw.cbx}[2010/09/21 v1.3a biblatex citation style] \newbool{cbx:authedxref} \newbool{cbx:citedas} \newbool{cbx:edstringincitations} \newbool{cbx:firstfullname} -\newbool{cbx:herename} \newbool{cbx:idemfull} \newbool{cbx:noidem} \newbool{cbx:omiteditor} -\newbool{cbx:omitpages} -\newbool{cbx:option:herename} -\newbool{cbx:option:omitpages} -\newbool{cbx:xrefnoidem} \newbool{cbx:xrefparent:firstcite} \newbool{cbx:shorthandibid} +\newbibmacro*{cite:citepages}{} +\newbibmacro*{cite:full:citepages}{} +\newbibmacro*{cite:postnote}{} + \DeclareBibliographyOption{citedas}[true]{% \csuse{bool#1}{cbx:citedas}} \DeclareBibliographyOption{edstringincitations}[true]{% \csuse{bool#1}{cbx:edstringincitations}} \DeclareBibliographyOption{firstfullname}[true]{% \csuse{bool#1}{cbx:firstfullname}} -\DeclareBibliographyOption{herename}[true]{% - \csuse{bool#1}{cbx:option:herename}} \DeclareBibliographyOption{omiteditor}[true]{% \csuse{bool#1}{cbx:omiteditor}} -\DeclareBibliographyOption{omitpages}[true]{% - \csuse{bool#1}{cbx:option:omitpages}} \DeclareBibliographyOption{shorthandibid}[true]{% \csuse{bool#1}{cbx:shorthandibid}} @@ -37,12 +32,78 @@ \DeclareEntryOption{shorthandibid}[true]{% \csuse{bool#1}{cbx:shorthandibid}} +\DeclareBibliographyOption{pageref}[true]{% + \setbool{cbx:pageref}{#1}} + +\DeclareBibliographyOption{citepages}[permit]{% + \ifcsdef{cbx@opt@citepages@#1} + {\csuse{cbx@opt@citepages@#1}} + {\PackageError{biblatex} + {Invalid option 'citepages=#1'} + {Valid values are 'permit', 'suppress', 'omit', 'separate'.}}} + +\def\cbx@opt@citepages@permit{% + \renewbibmacro*{cite:citepages}{}% + \renewbibmacro*{cite:full:citepages}{}% + \renewbibmacro*{cite:postnote}{% + \usebibmacro{cite:postnote:ibidpage}}} + +\def\cbx@opt@citepages@suppress{% + \renewbibmacro*{cite:citepages}{}% + \renewbibmacro*{cite:full:citepages}{% + \clearfield{pages}% + \clearfield{pagetotal}}% + \renewbibmacro*{cite:postnote}{% + \usebibmacro{cite:postnote:ibidpage}}} + +\def\cbx@opt@citepages@omit{% + \renewbibmacro*{cite:citepages}{}% + \renewbibmacro*{cite:full:citepages}{% + \ifboolexpr{ + test {\ifnumequal{\value{citecount}}{\value{citetotal}}} + and + test {\iffieldpages{postnote}} + } + {\clearfield{pages}% + \clearfield{pagetotal}} + {}}% + \renewbibmacro*{cite:postnote}{% + \usebibmacro{cite:postnote:ibidpage}}} + +\def\cbx@opt@citepages@separate{% + \providetoggle{cbx:fullcite}% + \renewbibmacro*{cite:citepages}{% + \global\togglefalse{cbx:fullcite}}% + \renewbibmacro*{cite:full:citepages}{% + \global\toggletrue{cbx:fullcite}}% + \renewbibmacro*{cite:postnote}{% + \ifboolexpr{ + togl {cbx:fullcite} + and + test {\iffieldpages{postnote}} + and + test {\ifnumequal{\value{citecount}}{\value{citetotal}}} + and + ( + not test {\iffieldundef{pages}} + or + not test {\iffieldundef{pagetotal}} + ) + } + {\usebibmacro{cite:postnote:pages}} + {\usebibmacro{cite:postnote:ibidpage}}} + \providebibmacro*{cite:postnote:pages}{% + \setunit{\postnotedelim}% + \bibstring{thiscite}% + \setunit{\addspace}% + \printfield{postnote}}} + \ExecuteBibliographyOptions{ autocite=footnote, citedas=true, + citepages=separate, citetracker=true, edstringincitations=true, - herename=true, ibidtracker=constrict, idemtracker=constrict, loccittracker=false, @@ -101,55 +162,56 @@ \DeclareFieldFormat[unpublished]{citetitle}{#1} \DeclareFieldFormat{labelyear}{#1}% e.g., the 'a' in '1995a' -%% herename -\newcommand*{\herenamepunct}{\addcomma\space} - \newbibmacro*{cite:name}{% \printnames{labelname}% - \ifbool{cbx:edstringincitations} - {\usebibmacro{cite:editorstrg/translatorstrg}} - {}% - \setunit*{\citenamepunct}} + \usebibmacro{cite:edstringincitations}} \newbibmacro*{cite:idem}{% \bibstring[\mkidem]{idem\thefield{gender}}% + \usebibmacro{cite:edstringincitations}} + +\newbibmacro*{cite:xref:idem}{% + \bibstring[\mkidem]{idem\thefield{gender}}% + \usebibmacro{cite:edstringincitations}% + \ifuseeditor + {\ifnameundef{editor} + {\ifboolexpr{ + test \ifusetranslator + and + not test {\ifnameundef{translator}} + } + {\clearname{translator}} + {}} + {\clearname{editor}}} + {\ifboolexpr{ + test \ifusetranslator + and + not test {\ifnameundef{translator}} + } + {\clearname{translator}} + {}}} + +\newbibmacro*{cite:edstringincitations}{% \ifbool{cbx:edstringincitations} {\usebibmacro{cite:editorstrg/translatorstrg}} {}% \setunit{\citenamepunct}} - + \newbibmacro*{cite:editorstrg/translatorstrg}{% \ifthenelse{\ifuseeditor\AND\ifnameundef{author}% \AND\NOT\ifnameundef{editor}} - {\ifdefstring{\bbx@option@editorstring}{brackets}% - {\addspace}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\addspace}% - {\addcomma\space}}% + {\usebibmacro{editorstringpunct}% \usebibmacro{editorstrg}% \clearname{editor}} {}% \ifthenelse{\ifusetranslator\AND\ifnameundef{author}% \AND\ifnameundef{editor}% \AND\NOT\ifnameundef{translator}} - {\ifdefstring{\bbx@option@editorstring}{brackets}% - {\addspace}% - {\ifdefstring{\bbx@option@editorstring}{parens}% - {\addspace}% - {\addcomma\space}}% + {\usebibmacro{editorstringpunct}% \usebibmacro{translatorstrg}% \clearname{translator}} {}} -\renewbibmacro*{postnote}{% - \iffieldundef{postnote} - {} - {\ifthenelse{\boolean{cbx:herename}\AND\NOT - \boolean{cbx:omitpages}} - {\addspace} - {\postnotedelim}% - \printfield{postnote}}} - % Option 'nameseen' \newcommand*{\cbx@seennames}{} \newrobustcmd*{\cbx@nameseen}[1]{% @@ -161,7 +223,13 @@ \ifbool{cbx:firstfullname} {\DeclareNameFormat{citeauthor}{% \cbx@ifnameseen{#1#3#5#7} - {\usebibmacro{name:last}{#1}{#3}{#5}{#7}}% + {\ifcase\value{uniquename}% + \usebibmacro{name:last}{#1}{#3}{#5}{#7}% + \or + \ifuseprefix + {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}} + {\usebibmacro{name:first-last}{#1}{#4}{#6}{#8}}% + \fi}% {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% \cbx@nameseen{#1#3#5#7}}% \usebibmacro{name:andothers}} @@ -177,61 +245,92 @@ %% Formatierung von 'ibidem' entsprechend der Option 'ibidemfont' \providecommand*{\mkibid}[1]{% - \ifdefstring{\bbx@option@ibidemfont}{smallcaps}% - {\textsc{#1}}% - {\ifdefstring{\bbx@option@ibidemfont}{italic}% - {\textit{#1}} - {\ifdefstring{\bbx@option@ibidemfont}{bold}% - {\textbf{#1}} - {#1}}}} - -%% pages (berücksichtigt die Option 'omitpages') + \bbx@ibidemfont{#1}} + +%% pages (wichtig für xref) \newbibmacro*{pages}{% - \ifbool{cbx:omitpages} - {}% keine Seitenzahl bei Vollzitat und omitpages=true - {\setunit{\bibpagespunct}% - \printfield{pages}}} - -\renewbibmacro*{chapter+pages}{% - \printfield{chapter}% - \ifbool{cbx:omitpages} - {}% keine Seitenzahl bei Vollzitat und omitpages=true - {\setunit{\bibpagespunct}% - \printfield{pages}}% - \newunit} + \setunit{\bibpagespunct}% + \printfield{pages}} %% in manchen Literaturverweisen (wenn nicht fullcite) %% müssen statt der vollen Namen (Format [byeditor]) %% nur die Nachnamen ausgegeben werden (Format [labelname]) \newbibmacro*{cite:byeditor}{% \ifnameundef{editor} - {} - {\bibstring{byeditor}% + {\ifnameundef{translator} + {} + {\usebibmacro{bytypestrg}{translator}{translator}% + \setunit{\addspace}% + \printnames[labelname]{translator}}} + {\usebibmacro{bytypestrg}{editor}{editor}% \setunit{\addspace}% \printnames[labelname]{editor}}} \newbibmacro*{cite:editor}{% - \ifnameundef{editor} - {} - {\printnames[labelname]{editor}% - \ifbool{cbx:edstringincitations} - {\addspace% - \usebibmacro{editorstrg}} - {\citenamepunct} - \clearname{editor}}} + \ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\ifbool{bbx:edbyidem} + {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + \NOT\iffirstonpage} + {\usebibmacro{cite:idem}} + {\printnames[labelname]{editor}% + \usebibmacro{cite:edstringincitations}}} + {\printnames[labelname]{editor}% + \usebibmacro{cite:edstringincitations}% + \global\undef\bbx@lasthash}% + \clearname{editor}} + {}% + \ifboolexpr{ + test \ifusetranslator + and + not test {\ifnameundef{translator}} + and + ( not test \ifuseeditor + or + ( test \ifuseeditor + and + test {\ifnameundef{editor}} ) ) + } + {\ifbool{bbx:edbyidem} + {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND + \NOT\iffirstonpage} + {\usebibmacro{cite:idem}} + {\printnames[labelname]{translator}% + \usebibmacro{cite:edstringincitations}}} + {\printnames[labelname]{translator}% + \usebibmacro{cite:edstringincitations}% + \global\undef\bbx@lasthash}% + \clearname{translator}} + {}} +\newbibmacro*{cite:postnote:ibidpage}{% + \ifbool{cbx:loccit} + {} + {\usebibmacro{postnote}}} + %% Test, ob author und editor bei xref identisch sind -%% (für xref=true, useeditor=false, edbyidem=true) +%% (für xref=true, useeditor=false oder usetranslator=false, +%% edbyidem=true) \newbibmacro*{authedxrefcheck}{% \iffieldundef{xref} {} {\savefield{xref}{\bbx@tempa}% + \savefield{xref}{\bbx@tempb}% \entrydata{\bbx@tempa}{% \savename{editor}{\bbx@tempa}}% - \ifnameequals{author}{\bbx@tempa}% - {\booltrue{cbx:authedxref}} - {\boolfalse{cbx:authedxref}}}} - + \entrydata{\bbx@tempb}{% + \savename{translator}{\bbx@tempb}}% + \ifboolexpr{ + test {\ifnameequals{author}{\bbx@tempa}} + or + test {\ifnameequals{author}{\bbx@tempb}} + } + {\booltrue{cbx:authedxref}} + {\boolfalse{cbx:authedxref}}}} + %% xref \DeclareCiteCommand{\bbx@xref} {}% diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx index 80f923cadd7..31e360b6301 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/english-dw.lbx @@ -1,15 +1,15 @@ % english-dw.lbx, Dominik Waßenhoven 2010 -\ProvidesFile{english-dw.lbx}[2010/03/11 v1.3 biblatex localization file] +\ProvidesFile{english-dw.lbx}[2010/09/21 v1.3a biblatex localization file] -\NewBibliographyString{herename,idemdat,idemdatsf,idemdatsm,% +\NewBibliographyString{idemdat,idemdatsf,idemdatsm,% idemdatsn,idemdatpf,idemdatpm,idemdatpn,idemdatpp,inrefstring} \InheritBibliographyExtras{english} \DeclareBibliographyStrings{% inherit = {english}, - herename = {{here}{here}}, + thiscite = {{here}{here}}, idemdat = {{eidem}{eidem}}, idemdatsm = {{eidem}{eidem}}, idemdatsf = {{eidem}{eidem}}, @@ -18,7 +18,7 @@ idemdatpf = {{eisdem}{eisdem}}, idemdatpn = {{eisdem}{eisdem}}, idemdatpp = {{eisdem}{eisdem}}, - inrefstring = {{article}{art\adddot}}, + inrefstring = {{article\addspace}{art\adddotspace}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx index 0cbb88ab3a4..42863a4f8aa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-dw/lbx/german-dw.lbx @@ -1,15 +1,14 @@ % german-dw.lbx, Dominik Waßenhoven 2010 -\ProvidesFile{german-dw.lbx}[2010/03/11 v1.3 biblatex localization file] +\ProvidesFile{german-dw.lbx}[2010/09/21 v1.3a biblatex localization file] \InheritBibliographyExtras{german} -\NewBibliographyString{herename,idemdat,idemdatsf,idemdatsm,% +\NewBibliographyString{idemdat,idemdatsf,idemdatsm,% idemdatsn,idemdatpf,idemdatpm,idemdatpn,idemdatpp,inrefstring} \DeclareBibliographyStrings{% inherit = {german}, - herename = {{hier}{hier}}, idem = {{derselbe}{ders\adddot}}, idemsm = {{derselbe}{ders\adddot}}, idemsf = {{dieselbe}{dies\adddot}}, |