diff options
| author | Karl Berry <karl@freefriends.org> | 2011-11-24 22:37:11 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2011-11-24 22:37:11 +0000 |
| commit | 221e3f5a227809dc8ecae2d464966d254aecc46f (patch) | |
| tree | 07c36b579d73f6533adfee2a8fd66a75b0764111 /Master/texmf-dist | |
| parent | 1766bcbd5d57f14320a8adcbed669b358001f8fc (diff) | |
biblatex 1.4 (21nov11)
git-svn-id: svn://tug.org/texlive/trunk@24647 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
28 files changed, 970 insertions, 1251 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES b/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES index 872f55c5a8b..eddca4163a9 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES +++ b/Master/texmf-dist/doc/latex/biblatex-dw/CHANGES @@ -1,636 +1 @@ -biblatex-dw 2011/02/06 v1.3c -Copyright (c) 2008-2011 Dominik Waßenhoven <domwass(at)web.de> - - Version history - --------------- - -v1.3c [2011/02/06] -This version of biblatex-dw needs biblatex 1.1a. Please note -that you have to update biblatex as well if you would like -to use biblatex-dw 1.3c! - - BUGFIX: Under some circumstances, an error occurred - (command \cbx@tempa could not be found). This should be - fixed now. - - BUGFIX: Some of the German translations were broken due - to a change of internal commands in biblatex. This is now - fixed. - - The entry type @review is now supported. You can - specify a reviewed work via the xref field. See the - documentation for details. - - Some internal changes concerning \DeclareFieldFormat - directives. - -v1.3b [2010/11/21] -This version of biblatex-dw was tested against biblatex 1.0, -but it should also work with versions from biblatex 0.9d. -The following changes were made to biblatex-dw: - - BUGFIX: Using pagetotal=false and citepages=separate, the - herename was printed as soon as the pagetotal field was - present (although the pagetotal field itself was not - printed). This is now fixed, and the citepages option - pays attention to the pagetotal option. - - In order to match as closely as possible to biblatex - itself, the \citenamepunct command was renamed to - \nametitledelim. For compatibility reasons with earlier - versions of biblatex-dw, the \citenamepunct was kept. - Thus, it does not matter if you redefine \nametitledelim - or \citenamepunct, the effect will be the same; but note - that the \citenamepunct may be dropped in later versions - of biblatex-dw. - - In full citations \nametitledelim is used instead of - \labelnamepunct. - - Improvements regarding idem functionality in combination - with xref=true. - - Improved the documentation. - -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 -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. - -Further changes in this release: - - The options »isrn« and »issn« were dropped. Their - functionality can be achieved by the biblatex option - »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 - 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« - (i.e. the behaviour is the same regardless of the entry - option »pseudoauthor«). - - New command \locationdatepunct for the punctuation - between location and year/date. The default is \addspace. - - New command \locationpublisherpunct for the punctuation - between location and publisher. The default is - \addcolon\space. - - New command \publisherdatepunct for the punctuation - between publisher and year/date. The default is - \addcomma\space. - -v1.2o [2010/02/14] - - 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«). - This is now fixed. - - 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. - That means, it is not necessary to have the editor in the - 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«. - In this context, some bugs could be resolved. - - 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«. - - Extended the documentation regarding the xref - functionality. - -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 - 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 - is now fixed. - - 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 - one work by the author or editor. - - 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«. - -v1.2l [2009/10/19] - - BUGFIX: With footnote-dw, the references to the first - citations did not work, when refsections were used. This - 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 - 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 - 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 - 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. - - In footnote-dw, the pointer to the earlier citation is - 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«. - -v1.2k [2009/08/22] - Adjustments to biblatex version 0.8e. Note that from this - version on biblatex 0.8e is required, so you have to update - 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.« - - The improved concatenation of roles is used. See - biblatex’s release notes for details. - - The new auxiliary macros for ordinals are used. See - biblatex’s release notes for details. - BUGFIXES - - BUGFIX: The option »ibidpage« did not work with - footnote-dw. This is now fixed. - Changed Entry Types - - @inreference - Up to now, this entry type was an alias for - @incollection. From now on, this entry type can be used - for articles in encyclopedias or dictionaries. For - details on how @inreference entries differ from @ - 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«. - 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 - 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 - year. This affects the entry types @book, @inbook, - @collection, @incollection, @proceedings, @inproceedings - and @manual. - New Commands - - »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 - default is empty, i.e. the series is printed right after - the opening round bracket. - - »sernumstring« - punctuation between series (of a book etc.) and number. - 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 - \addcomma\space. - Localization Changes - - In German localization, the strings »withcommentator«, - »withannotator« and »withintroduction« are shortened as - follows: - -> withcommentator: komm. v. - -> withannotator: erläut. v. - -> withintroduction: eingel. v. - The long versions stay the same as in standard biblatex. - -v1.2j [2009/08/16] - - This is just a bugfix release. The only files changed are - footnote-dw.cbx, CHANGES, README and LIESMICH. - - BUGFIX: Since biblatex version 0.8e, footnote-dw gave an - error (Undefined control sequence: \blx@addperiod). This - is now fixed; thus, biblatex-dw (or rather footnote-dw) - should work with the biblatex versions 0.8e, 0.8f, 0.8g - and 0.8h, but it will not work with earlier versions. - -v1.2i [2009/05/10] - - 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 - 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, - 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.« - - 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.« - -v1.2h [2009/03/29] - - 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«. - -v1.2g [2009/03/20] - - Option »journalnumber« replaces »journumafteryear«. The - option was enhanced and can now take the values - »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, - even if the field issue is given (this is not the case in - 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«. - - Improved german-dw.lbx. - - Adjusted the documentation for screen reading. A printer - friendly version can still be compiled from the source. - -v1.2f [2009/02/15] - - Adjustments to biblatex version 0.8c. Note that from - 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 - 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 - 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 - font shape. - - 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 - 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 - field is set, the date is separated from the journal - title by a comma and a space, not only a space. - - Fixed some BUGS concerning the xref functionality. - - Reorganized some bibliography drivers. - - Enhanced the documentation. - -v1.2e [2008/12/19] - - Adjustments to biblatex version 0.8b. Note that from - 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 - 1.2d had a bug which is now fixed. - - 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 - between volume and number in @article entries is now - 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 - year in @article entries is omitted. - - The multicite command \cites is now also always printed - as footnote in »footnote-dw«. - - Some changes in the internal code. - - Extended the documentation and examples. - -v1.2d [2008/12/07] - - BUGFIX: In footnote-dw, the punctuation after the author/ - 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 - 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«. - - Support for biblatex version 0.8a including - \MakeSentenceCase. - - Added lbx files with alternative strings for German and - additional strings for both German and English (these - strings were already included, but are now stored in the - 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 - 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 - 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«. - - 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 - parent entry. - -v1.2b [2008/11/09] - - 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 - and the publisher are omitted (even if you set - »nopublisher=false«). The default is »false«, i.e. the - location is printed. - - 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 - 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 - editions (though not as superscript, but rather similar - to a note.) - - 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 - decide, whether you want to have the fields - »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: - \addcomma\space) is used to introduce the reprint - 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 - the width of the label in the list of shorthands to any - 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«. - 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 - the list of shorthands. - - Improved package warnings. - -v1.2 [2008/10/09] - - Adjustments to biblatex version 0.8. Note that from - 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 macro \bibpagespunct is also supported. - - 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. - - As biblatex 0.8 has changed the handling of the field - »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 - 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 - 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«. - -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 - 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 - (which is the default). This is now fixed. - - 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 - 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 - introduced in version 1.1c caused an erroneous behaviour - 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 - 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 ...«). - - Small correction in the terse version of the List of - Shorthands concerning the punctuation after authors/ - editors. - - Added missing bibliography drivers for option »edbyidem«. - -v1.1c [2008/05/29] - - 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: Small punctuation issue with repeated citations - 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 - 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 - affix. - - 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 - fontname for every author with global options, - independent of entry options. - -v1.1b [2008/04/13] - - 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 - always produced a capital letter at the beginning. This - is fixed now. - - Fixed a small punctuation error in connection with - »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. - This is now fixed. - - 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«. - -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 - \enquote{here} should prelude the pages of a fullcite - (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 - 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« - 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 - 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« - - Excluded ISBN/ISSN and DOI also from entry types - booklet, inproceedings, manual, misc, periodical, - proceedings, and report - - Punctuation corrections for the same entry types - concerning the series+number - -v1.0 [2008/01/14] - - Initial release +biblatex-dw 2011/11/20 v1.4
Copyright (c) 2008-2011 Dominik Waßenhoven <domwass(at)web.de>
Version history
---------------
v1.4 [2011/11/20]
This version of biblatex-dw was tested with biblatex 1.7 and
requires at least version 1.6 of biblatex.
- BUGFIX: With @review entries cited by \fullcite or
\footfullcite the reviewed work was not printed in full.
This is now fixed.
- BUGFIX: With "shorthandinbib=true" and "terselos=false",
the shorthand was printed twice in the list of
shorthands. This is now fixed.
- The \smartcite commands introduced by biblatex 1.2 are
now supported.
- The \textcite and \textcites commands are now also supported
by footnote-dw.
- New command \textcitesdelim: delimiter between author names
when using \textcites. The default is:
\addspace\bibstring{and}\space
- New option "seriesformat" which can take the values
"standard" and "parens". If set to "parens", the series
of a book etc. will be printed in parentheses, otherwise
without (as is the biblatex standard behaviour). The
default value for this option is "parens" (as was the
behaviour in earlier biblatex-dw versions).
- New option "editorstringfont" which can take the values
"normal" and "namefont". With "normal", the normal font
is used, with "namefont", the setting for the option
"namefont" is also used for the editor string (and
translator string etc.). The default value for this
option is "normal".
- New option "editionstring": If set to "true", the
bibliography string "edition" will be added to the
"edition" field, even if it is not an integer. Thus,
you can type, e.g.,
edition = {2., aktualisierte}
in your bib file and you will get "2., aktualisierte
Aufl." (or, with option abbreviate=false: "2.,
aktualisierte Auflage"). "editionstring=false" will give
biblatex’s default behaviour. The default for this option
is "false".
- New entry option "oldbookauthor" which is equivalent to
"oldauthor" but for the bookauthor (this is useful for
@inbook entries representing, e.g., an introduction to an
edition of a work by an author that should not be typeset
in the usual font for last names). This option can be set
on a per entry basis and can be disabled with the global
option "oldauthor=false".
- Improved options "namefont", "firstnamefont", "idemfont"
and "ibidemfont" which are now aware of the setting of
the biblatex option "punctfont".
- Small bugfix for the xref functionality.
v1.3c [2011/02/06]
This version of biblatex-dw needs biblatex 1.1a. Please note
that you have to update biblatex as well if you would like
to use biblatex-dw 1.3c!
- BUGFIX: Under some circumstances, an error occurred
(command \cbx@tempa could not be found). This should be
fixed now.
- BUGFIX: Some of the German translations were broken due
to a change of internal commands in biblatex. This is now
fixed.
- The entry type @review is now supported. You can
specify a reviewed work via the xref field. See the
documentation for details.
- Some internal changes concerning \DeclareFieldFormat
directives.
v1.3b [2010/11/21]
This version of biblatex-dw was tested against biblatex 1.0,
but it should also work with versions from biblatex 0.9d.
The following changes were made to biblatex-dw:
- BUGFIX: Using pagetotal=false and citepages=separate, the
herename was printed as soon as the pagetotal field was
present (although the pagetotal field itself was not
printed). This is now fixed, and the citepages option
pays attention to the pagetotal option.
- In order to match as closely as possible to biblatex
itself, the \citenamepunct command was renamed to
\nametitledelim. For compatibility reasons with earlier
versions of biblatex-dw, the \citenamepunct was kept.
Thus, it does not matter if you redefine \nametitledelim
or \citenamepunct, the effect will be the same; but note
that the \citenamepunct may be dropped in later versions
of biblatex-dw.
- In full citations \nametitledelim is used instead of
\labelnamepunct.
- Improvements regarding idem functionality in combination
with xref=true.
- Improved the documentation.
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
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.
Further changes in this release:
- The options "isrn" and "issn" were dropped. Their
functionality can be achieved by the biblatex option
"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
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"
(i.e. the behaviour is the same regardless of the entry
option "pseudoauthor").
- New command \locationdatepunct for the punctuation
between location and year/date. The default is \addspace.
- New command \locationpublisherpunct for the punctuation
between location and publisher. The default is
\addcolon\space.
- New command \publisherdatepunct for the punctuation
between publisher and year/date. The default is
\addcomma\space.
v1.2o [2010/02/14]
- 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").
This is now fixed.
- 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.
That means, it is not necessary to have the editor in the
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".
In this context, some bugs could be resolved.
- 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".
- Extended the documentation regarding the xref
functionality.
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
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
is now fixed.
- 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
one work by the author or editor.
- 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".
v1.2l [2009/10/19]
- BUGFIX: With footnote-dw, the references to the first
citations did not work, when refsections were used. This
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
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
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
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.
- In footnote-dw, the pointer to the earlier citation is
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".
v1.2k [2009/08/22]
Adjustments to biblatex version 0.8e. Note that from this
version on biblatex 0.8e is required, so you have to update
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."
- The improved concatenation of roles is used. See
biblatex’s release notes for details.
- The new auxiliary macros for ordinals are used. See
biblatex’s release notes for details.
BUGFIXES
- BUGFIX: The option "ibidpage" did not work with
footnote-dw. This is now fixed.
Changed Entry Types
- @inreference
Up to now, this entry type was an alias for
@incollection. From now on, this entry type can be used
for articles in encyclopedias or dictionaries. For
details on how @inreference entries differ from @
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".
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
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
year. This affects the entry types @book, @inbook,
@collection, @incollection, @proceedings, @inproceedings
and @manual.
New Commands
- "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
default is empty, i.e. the series is printed right after
the opening round bracket.
- "sernumstring"
punctuation between series (of a book etc.) and number.
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
\addcomma\space.
Localization Changes
- In German localization, the strings "withcommentator",
"withannotator" and "withintroduction" are shortened as
follows:
-> withcommentator: komm. v.
-> withannotator: erläut. v.
-> withintroduction: eingel. v.
The long versions stay the same as in standard biblatex.
v1.2j [2009/08/16]
- This is just a bugfix release. The only files changed are
footnote-dw.cbx, CHANGES, README and LIESMICH.
- BUGFIX: Since biblatex version 0.8e, footnote-dw gave an
error (Undefined control sequence: \blx@addperiod). This
is now fixed; thus, biblatex-dw (or rather footnote-dw)
should work with the biblatex versions 0.8e, 0.8f, 0.8g
and 0.8h, but it will not work with earlier versions.
v1.2i [2009/05/10]
- 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
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,
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."
- 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."
v1.2h [2009/03/29]
- 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".
v1.2g [2009/03/20]
- Option "journalnumber" replaces "journumafteryear". The
option was enhanced and can now take the values
"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,
even if the field issue is given (this is not the case in
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".
- Improved german-dw.lbx.
- Adjusted the documentation for screen reading. A printer
friendly version can still be compiled from the source.
v1.2f [2009/02/15]
- Adjustments to biblatex version 0.8c. Note that from
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
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
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
font shape.
- 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
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
field is set, the date is separated from the journal
title by a comma and a space, not only a space.
- Fixed some BUGS concerning the xref functionality.
- Reorganized some bibliography drivers.
- Enhanced the documentation.
v1.2e [2008/12/19]
- Adjustments to biblatex version 0.8b. Note that from
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
1.2d had a bug which is now fixed.
- 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
between volume and number in @article entries is now
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
year in @article entries is omitted.
- The multicite command \cites is now also always printed
as footnote in "footnote-dw".
- Some changes in the internal code.
- Extended the documentation and examples.
v1.2d [2008/12/07]
- BUGFIX: In footnote-dw, the punctuation after the author/
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
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".
- Support for biblatex version 0.8a including
\MakeSentenceCase.
- Added lbx files with alternative strings for German and
additional strings for both German and English (these
strings were already included, but are now stored in the
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
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
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".
- 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
parent entry.
v1.2b [2008/11/09]
- 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
and the publisher are omitted (even if you set
"nopublisher=false"). The default is "false", i.e. the
location is printed.
- 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
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
editions (though not as superscript, but rather similar
to a note.)
- 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
decide, whether you want to have the fields
"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:
\addcomma\space) is used to introduce the reprint
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
the width of the label in the list of shorthands to any
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".
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
the list of shorthands.
- Improved package warnings.
v1.2 [2008/10/09]
- Adjustments to biblatex version 0.8. Note that from
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 macro \bibpagespunct is also supported.
- 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.
- As biblatex 0.8 has changed the handling of the field
"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
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
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".
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
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
(which is the default). This is now fixed.
- 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
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
introduced in version 1.1c caused an erroneous behaviour
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
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 ...").
- Small correction in the terse version of the List of
Shorthands concerning the punctuation after authors/
editors.
- Added missing bibliography drivers for option "edbyidem".
v1.1c [2008/05/29]
- 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: Small punctuation issue with repeated citations
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
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
affix.
- 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
fontname for every author with global options,
independent of entry options.
v1.1b [2008/04/13]
- 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
always produced a capital letter at the beginning. This
is fixed now.
- Fixed a small punctuation error in connection with
"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.
This is now fixed.
- 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".
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
\enquote{here} should prelude the pages of a fullcite
(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
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"
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
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"
- Excluded ISBN/ISSN and DOI also from entry types
booklet, inproceedings, manual, misc, periodical,
proceedings, and report
- Punctuation corrections for the same entry types
concerning the series+number
v1.0 [2008/01/14]
- Initial release
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH b/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH index c2b7c974dae..ea93c674820 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH +++ b/Master/texmf-dist/doc/latex/biblatex-dw/LIESMICH @@ -1,164 +1,164 @@ -biblatex-dw 2011/02/06 v1.3c -Copyright (c) 2008-2011 Dominik Waßenhoven <domwass(at)web.de> - -************************************************************ - -Inhalt der Datei LIESMICH - 1. Kurzbeschreibung - 2. Installationshinweise - 3. Benutzung - 4. Dokumentation - 5. Versionsgeschichte - 6. Danksagung - 7. Lizenz - 8. Dateien - - - 1. Kurzbeschreibung - ------------------- - - biblatex-dw ist eine kleine Sammlung von styles für das - Paket biblatex von Philipp Lehman. Sie ist gedacht zum - Zitieren im geisteswissenschaftlichen Bereich und bietet - dafür einige Funktionen, die über die Standardfunktionen - von biblatex hinausgehen. biblatex-dw baut vollständig auf - biblatex auf und kann nicht ohne biblatex (mindestens - Version 0.9) benutzt werden! - - Anregungen und Verbesserungsvorschläge sind jederzeit - willkommen. - - - 2. Installationshinweise - ------------------------ - - biblatex-dw ist in den Distributionen MiKTeX und TeX Live - 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 zip-Datei in den $LOCALTEXMF-Ordner ihres - Systems. Aktualisieren Sie anschließend die 'filename - database' ihrer TeX-Distribution. Für weitere Informationen - schauen Sie bitte in die Dokumentation Ihrer Distribution. - - - 3. Benutzung - ------------ - - Die hier angebotenen Zitierstile werden wie die Standard- - Stile beim Laden des Pakets biblatex eingebunden: - - \usepackage[style=authortitle-dw]{biblatex} - bzw. - \usepackage[style=footnote-dw]{biblatex} - - Für zusätzliche Optionen, die von den Stilen bereitgestellt - werden, wird auf die Dokumentation von biblatex-dw sowie - auf die Beispiele 'de-authortitle-dw' und 'de-footnote-dw' - im Ordner 'examples' verwiesen. - - - 4. Dokumentation - ---------------- - - Die deutschsprachige Dokumentation von biblatex-dw findet - sich in der Datei 'de-biblatex-dw.pdf'. Diese Datei ist für - den Bildschirm optimiert. Eine Druckversion lässt sich aber - leicht aus der Datei 'de-biblatex-dw.tex' generieren, indem - man die Zeile - \input{biblatex-dw-screen} - auskommentiert (also das Kommentarzeichen % davorstellt) - und stattdessen die Zeile - \input{biblatex-dw-print} - nicht auskommentiert (also das Kommentarzeichen % vor - dieser Zeile löscht). - Achtung: Möglicherweise sind die Schriften nicht auf Ihrem - System vorhanden. Für die Dokumentation wurden folgende - Schriften verwendet: - * Linux Libertine als Brotschrift - * Linux Biolinum (Teil des Libertine-Pakets) für - Überschriften - * BeraMono als Festbreitenschrift - Diese Schriften sind frei verfügbar. Wenn Sie die Schriften - nicht installiert haben oder nicht installieren wollen, - verwenden Sie einfach andere Schriften. Die entsprechenden - Einstellungen finden Sie in der Datei - 'biblatex-dw-preamble.tex'. - - - 5. Versionsgeschichte - --------------------- - - siehe Datei CHANGES - - - 6. Danksagung - ------------- - - Ohne biblatex gäbe es natürlich auch kein biblatex-dw, - deshalb gebührt mein Dank zuvorderst Philipp Lehman, auch - für die vielen Hilfestellungen und Hinweise, die er mir - immer wieder gegeben hat. Für Anregungen, Hinweise und - das Auffinden und Melden von Fehlern bedanke ich mich - außerdem bei folgenden Personen: - * Thomas Demmel * Simon Flossmann - * Till A. Heilmann * Denis Maier - * Rolf Niepraschk * Philipp Pilhofer - * Jan Hauke Rahm * Ondrej Salvet - * Johann Konrad Schwarz * Jonas Stein - * Matthias Steinbrink * Philipp Stephani - * Bernhard Tempel * Dominik Weber - * Christian Weitert * Christofer Zwanzig - * Дмитрий Гордеев - - - 7. Lizenz - --------- - - Dieses Werk darf nach den Bedingungen der LaTeX Project - Public Lizenz, entweder Version 1.3 oder (nach Ihrer Wahl) - jede spaetere Version, verteilt und/oder verändert werden. - Die neueste Version dieser Lizenz finden Sie unter - http://www.latex-project.org/lppl.txt. Version 1.3 (oder - eine neuere) ist Teil aller Verteilungen von LaTeX - Version 2005/12/01 oder spaeter. - - Dieses Werk hat den LPPL-Betreuungs-Status 'maintained' - (betreut). - - Der aktuelle Betreuer dieses Werkes ist Dominik Waßenhoven. - - - 8. Dateien - ---------- - - Dieses Werk (bzw. Paket) besteht aus folgenden Dateien: - - * LIESMICH % diese Datei (inkl. Lizenz) - * README % diese Datei in englisch - * CHANGES % Versionsgeschichte (englisch) - * standard-dw.bbx - * standard-dw.cbx - * authortitle-dw.bbx - * authortitle-dw.cbx - * footnote-dw.bbx - * footnote-dw.cbx - * english-dw.lbx % Englische Sprachdatei - * german-dw.lbx % Deutsche Sprachdatei - * biblatex-dw.pdf % englische Dokumentation - * biblatex-dw.tex % englische Dokumentation - * biblatex-dw-preamble.tex % Präambel der Dokumentation - * biblatex-dw-print.tex % Einstellungen für Druckversion - * biblatex-dw-screen.tex % Einst. für Bildschirmversion - * de-biblatex-dw.pdf % deutsche Dokumentation - * de-biblatex-dw.tex % deutsche Dokumentation - * de-authortitle-dw.pdf % deutsches Beispiel - * de-authortitle-dw.tex % deutsches Beispiel - * de-footnote-dw.pdf % deutsches Beispiel - * de-footnote-dw.tex % deutsches Beispiel - * en-authortitle-dw.pdf - * en-authortitle-dw.tex - * en-footnote-dw.pdf - * en-footnote-dw.tex - * examples-dw.bib - * de-examples-dw.bib % bib-Datei für die Beispiele +biblatex-dw 2011/11/20 v1.4
+Copyright (c) 2008-2011 Dominik Waßenhoven <domwass(at)web.de>
+
+************************************************************
+
+Inhalt der Datei LIESMICH
+ 1. Kurzbeschreibung
+ 2. Installationshinweise
+ 3. Benutzung
+ 4. Dokumentation
+ 5. Versionsgeschichte
+ 6. Danksagung
+ 7. Lizenz
+ 8. Dateien
+
+
+ 1. Kurzbeschreibung
+ -------------------
+
+ biblatex-dw ist eine kleine Sammlung von styles für das
+ Paket biblatex von Philipp Lehman. Sie ist gedacht zum
+ Zitieren im geisteswissenschaftlichen Bereich und bietet
+ dafür einige Funktionen, die über die Standardfunktionen
+ von biblatex hinausgehen. biblatex-dw baut vollständig auf
+ biblatex auf und kann nicht ohne biblatex benutzt werden!
+
+ Anregungen und Verbesserungsvorschläge sind jederzeit
+ willkommen.
+
+
+ 2. Installationshinweise
+ ------------------------
+
+ biblatex-dw ist in den Distributionen MiKTeX und TeX Live
+ 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 zip-Datei in den $LOCALTEXMF-Ordner ihres
+ Systems. Aktualisieren Sie anschließend die 'filename
+ database' ihrer TeX-Distribution. Für weitere Informationen
+ schauen Sie bitte in die Dokumentation Ihrer Distribution.
+
+
+ 3. Benutzung
+ ------------
+
+ Die hier angebotenen Zitierstile werden wie die Standard-
+ Stile beim Laden des Pakets biblatex eingebunden:
+
+ \usepackage[style=authortitle-dw]{biblatex}
+ bzw.
+ \usepackage[style=footnote-dw]{biblatex}
+
+ Für zusätzliche Optionen, die von den Stilen bereitgestellt
+ werden, wird auf die Dokumentation von biblatex-dw sowie
+ auf die Beispiele 'de-authortitle-dw' und 'de-footnote-dw'
+ im Ordner 'examples' verwiesen.
+
+
+ 4. Dokumentation
+ ----------------
+
+ Die deutschsprachige Dokumentation von biblatex-dw findet
+ sich in der Datei 'de-biblatex-dw.pdf'. Diese Datei ist für
+ den Bildschirm optimiert. Eine Druckversion lässt sich aber
+ leicht aus der Datei 'de-biblatex-dw.tex' generieren, indem
+ man die Zeile
+ \input{biblatex-dw-screen}
+ auskommentiert (also das Kommentarzeichen % davorstellt)
+ und stattdessen die Zeile
+ \input{biblatex-dw-print}
+ nicht auskommentiert (also das Kommentarzeichen % vor
+ dieser Zeile löscht).
+ Achtung: Möglicherweise sind die Schriften nicht auf Ihrem
+ System vorhanden. Für die Dokumentation wurden folgende
+ Schriften verwendet:
+ * Linux Libertine als Brotschrift
+ * Linux Biolinum (Teil des Libertine-Pakets) für
+ Ãœberschriften
+ * BeraMono als Festbreitenschrift
+ Diese Schriften sind frei verfügbar. Wenn Sie die Schriften
+ nicht installiert haben oder nicht installieren wollen,
+ verwenden Sie einfach andere Schriften. Die entsprechenden
+ Einstellungen finden Sie in der Datei
+ 'biblatex-dw-preamble.tex'.
+
+
+ 5. Versionsgeschichte
+ ---------------------
+
+ siehe Datei CHANGES
+
+
+ 6. Danksagung
+ -------------
+
+ Ohne biblatex gäbe es natürlich auch kein biblatex-dw,
+ deshalb gebührt mein Dank zuvorderst Philipp Lehman, auch
+ für die vielen Hilfestellungen und Hinweise, die er mir
+ immer wieder gegeben hat. Für Anregungen, Hinweise und
+ das Auffinden und Melden von Fehlern bedanke ich mich
+ außerdem bei folgenden Personen:
+ * Thomas Demmel * Simon Flossmann
+ * Till A. Heilmann * Dominic Kobelt
+ * Denis Maier * Rolf Niepraschk
+ * Philipp Pilhofer * Jan Hauke Rahm
+ * Ondrej Salvet * Johann Konrad Schwarz
+ * Salome Södergran * Jonas Stein
+ * Matthias Steinbrink * Philipp Stephani
+ * Bernhard Tempel * Dominik Weber
+ * Christian Weitert * Christofer Zwanzig
+ * Дмитрий Гордеев
+
+
+ 7. Lizenz
+ ---------
+
+ Dieses Werk darf nach den Bedingungen der LaTeX Project
+ Public Lizenz, entweder Version 1.3 oder (nach Ihrer Wahl)
+ jede spaetere Version, verteilt und/oder verändert werden.
+ Die neueste Version dieser Lizenz finden Sie unter
+ http://www.latex-project.org/lppl.txt. Version 1.3 (oder
+ eine neuere) ist Teil aller Verteilungen von LaTeX
+ Version 2005/12/01 oder spaeter.
+
+ Dieses Werk hat den LPPL-Betreuungs-Status 'maintained'
+ (betreut).
+
+ Der aktuelle Betreuer dieses Werkes ist Dominik Waßenhoven.
+
+
+ 8. Dateien
+ ----------
+
+ Dieses Werk (bzw. Paket) besteht aus folgenden Dateien:
+
+ * LIESMICH % diese Datei (inkl. Lizenz)
+ * README % diese Datei in englisch
+ * CHANGES % Versionsgeschichte (englisch)
+ * standard-dw.bbx
+ * standard-dw.cbx
+ * authortitle-dw.bbx
+ * authortitle-dw.cbx
+ * footnote-dw.bbx
+ * footnote-dw.cbx
+ * english-dw.lbx % Englische Sprachdatei
+ * german-dw.lbx % Deutsche Sprachdatei
+ * biblatex-dw.pdf % englische Dokumentation
+ * biblatex-dw.tex % englische Dokumentation
+ * biblatex-dw-preamble.tex % Präambel der Dokumentation
+ * biblatex-dw-print.tex % Einstellungen für Druckversion
+ * biblatex-dw-screen.tex % Einst. für Bildschirmversion
+ * de-biblatex-dw.pdf % deutsche Dokumentation
+ * de-biblatex-dw.tex % deutsche Dokumentation
+ * de-authortitle-dw.pdf % deutsches Beispiel
+ * de-authortitle-dw.tex % deutsches Beispiel
+ * de-footnote-dw.pdf % deutsches Beispiel
+ * de-footnote-dw.tex % deutsches Beispiel
+ * en-authortitle-dw.pdf
+ * en-authortitle-dw.tex
+ * en-footnote-dw.pdf
+ * en-footnote-dw.tex
+ * examples-dw.bib
+ * de-examples-dw.bib % bib-Datei für die Beispiele
diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/README b/Master/texmf-dist/doc/latex/biblatex-dw/README index 7418f98d5ec..4b724e45f95 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 2011/02/06 v1.3c +biblatex-dw 2011/11/20 v1.4 Copyright (c) 2008-2011 Dominik Waßenhoven <domwass(at)web.de> ************************************************************ @@ -21,8 +21,7 @@ Contents of README biblatex package. It was designed for citations in the Humanities and offers some features that are not provided by the standard biblatex styles. biblatex-dw is dependend - on biblatex (version 0.9 at least) and cannot be used - without it! + on biblatex and cannot be used without it! Any suggestions concerning this package are highly appreciated. @@ -95,10 +94,11 @@ Contents of README Furthermore, for numerous suggestions, contributions and bug reports I would like to thank the following people: * Thomas Demmel * Simon Flossmann - * Till A. Heilmann * Denis Maier - * Rolf Niepraschk * Philipp Pilhofer - * Jan Hauke Rahm * Ondrej Salvet - * Johann Konrad Schwarz * Jonas Stein + * Till A. Heilmann * Dominic Kobelt + * Denis Maier * Rolf Niepraschk + * Philipp Pilhofer * Jan Hauke Rahm + * Ondrej Salvet * Johann Konrad Schwarz + * Salome Södergran * Jonas Stein * Matthias Steinbrink * Philipp Stephani * Bernhard Tempel * Dominik Weber * Christian Weitert * Christofer Zwanzig 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 b54f6d73025..195d9295ec0 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 @@ -1,20 +1,21 @@ % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2010 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2011 % % This file is the preamble for the documentation of % biblatex-dw (both the English and the German version) %%%%% biblatex-dw Version %%%%% version of biblatex-dw %%%%% -\newcommand{\biblatexdwversion}{1.3c} -\newcommand{\biblatexdwdate}{\printdate{2011-02-06}} -\newcommand{\mindestanforderung}{1.1a}% minimum biblatex version +\newcommand{\biblatexdwversion}{1.4} +\newcommand{\biblatexdwdate}{\printdate{2011-11-20}} +\newcommand{\mindestanforderung}{1.6}% minimum biblatex version +\newcommand{\testversion}{1.7}% tested biblatex version \newcommand{\screenversion}{} \newcommand{\TOC}{} \newcommand{\lizenz}{} %%%%% Kodierung %%%%% Encoding %%%%% \usepackage[T1]{fontenc} -\usepackage[latin9]{inputenc} +\usepackage[latin1]{inputenc} %%%%% Inhaltsverzeichnis %%%%% Table of Contents %%%%% \setcounter{tocdepth}{2} @@ -90,7 +91,6 @@ %%%%% Anführungszeichen %%%%% quotation marks %%%%% \usepackage[babel,german=guillemets]{csquotes} -\MakeAutoQuote{»}{«} %%%%% Listings %%%%% listings %%%%% \usepackage{listings} @@ -116,13 +116,12 @@ %%%%% biblatex %%%%% biblatex %%%%% \usepackage[% - bibtex8=true, - bibencoding=inputenc, + bibencoding=utf8, style=authortitle-dw, % bernhard=true,% journalnumber=date ]{biblatex} -\bibliography{examples/examples-dw} +\addbibresource{examples/examples-dw.bib} %%%%% Hyperref %%%%% Hyperref %%%%% \usepackage{hyperref} @@ -201,7 +200,12 @@ \newcommand{\Mindestanforderung}{% \iflanguage{english}% {\textcolor{dkred}{needs at least version~\mindestanforderung{} of \bl{}}}% - {\textcolor{dkred}{mindestens Version~\mindestanforderung{} von \bl{}}}} + {\textcolor{dkred}{benötigt mindestens Version~\mindestanforderung{} von \bl{}}}} + +\newcommand{\Testversion}{% + \iflanguage{english}% + {~and was tested with version~\testversion{} of \bl{}}% + {~und wurde mit Version~\testversion{} von \bl{} getestet}} %%%%% Titelei %%%%% title page %%%%% \author{Dominik Waßenhoven} @@ -213,3 +217,5 @@ \hyphenation{ Stan-dard-ein-stel-lun-gen } + +\nonfrenchspacing
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-print.tex b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-print.tex index 19b5101517b..3e8f53fb67c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-print.tex +++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-print.tex @@ -1,5 +1,5 @@ % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2010 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2011 % % This file configures the documentation % of biblatex-dw to be printed diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-screen.tex b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-screen.tex index 69bf2055519..37170a95173 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-screen.tex +++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw-screen.tex @@ -1,5 +1,5 @@ % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2010 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2011 % % This file configures the documentation % of biblatex-dw to be viewed on a screen 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 5205d119c5c..e7a4a26dc02 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 4d376a853a2..f3e2663b1bc 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex +++ b/Master/texmf-dist/doc/latex/biblatex-dw/biblatex-dw.tex @@ -1,5 +1,5 @@ % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2010 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2011 \documentclass[english]{scrartcl} \input{biblatex-dw-preamble}% preamble @@ -17,8 +17,8 @@ \bl{} package. It was designed for citations in the Humanities and offers some features that are not provided by the standard \bl{} styles. \bldw{} is dependent - on \bl{}~-- version~\biblatexdwversion{} \Mindestanforderung{} - (please note also the requirements of the \bl{} package itself).} + on \bl{}~-- version~\biblatexdwversion{} \Mindestanforderung{}\Testversion. + Please note also the requirements of the \bl{} package itself.} \lizenz \screenversion @@ -58,19 +58,19 @@ or \usepackage[style=footnote-dw]{biblatex} \end{lstlisting} The styles are built in a very entangled way which means that the combination of a \bldw\ style with another style is not possible without fail. +For an overview of the styles see the examples \enquote{en-authortitle-dw} + and \enquote{en-footnote-dw} in the \texttt{examples} folder. +\subsection{Global options and entry options} The options provided by \bl{} are also available with \bldw{}. The additional options provided by \bldw{} are described on the next pages. There is a general difference between global options and entry options: global options are valid for all references of a document; they are set either as optional arguments when loading \bl{} or in a separate config file (\texttt{biblatex.cfg}). Entry options are set in the field -\texttt{options} of an entry in the bib file. Entry options may override +\texttt{options} of an entry in the bib file. Entry options can sometimes override global options for the respective entry. -For an overview of the styles see the examples \enquote{en-authortitle-dw} - and \enquote{en-footnote-dw} in the \texttt{examples} folder. - \subsection{Frequently asked Questions (FAQ)} I answered some frequently asked questions concerning \bl{} and \bldw{} and made them available online:\\ @@ -93,10 +93,16 @@ Besides some changes in punctuation, there are the following differences: \item If\beschreibung{oldauthor} you set the \option{namefont}, but nevertheless need some of the names being typeset in upright shape (e.g. medieval or antique authors), you can add \texttt{options\,=\,\{oldauthor=true\}} - or \texttt{options\,=\,\{oldauthor\}} to the respective entry of your + to the respective entry of your bib file. If you have to switch back to the normal appearance also for entries with this \texttt{oldauthor} flag, you can set the global option \option{oldauthor=false} in order to override the entry option. + \item There\beschreibung{oldbookauthor} is also the entry option \option{oldbookauthor} + which is the same as \option{oldauthor} but for the bookauthor. This is + useful for \texttt{@inbook} entries representing, e.g., an introduction to an + edition of a work by an author that should not be typeset in the usual font + for last names. This option can be set on a per entry basis and can be + disabled with the global option \option{oldauthor=false}. \item The\beschreibung{idemfont} font shape of the \enquote{idem} string (see below) can be set by the option \option{idemfont} which can take the values \wert{smallcaps}, \wert{italic}, \wert{bold} and \wert{normal}. If you @@ -127,11 +133,27 @@ Besides some changes in punctuation, there are the following differences: \wert{true}, the default value for \option{idembibformat} is \wert{idem}. \item When\beschreibung{edbyidem} \texttt{author} and \texttt{editor} are the same in - \texttt{@incollection} or \texttt{@inbook} entries, the name is not + \texttt{@inbook}, \texttt{@incollection} or \texttt{@inreference} entries, the name is not repeated but substituted by the string \enquote{idem}. This feature is controled by the option \option{edbyidem} which can be set to \wert{true} or \wert{false}; the default value is \wert{true}. - \item Using\beschreibung{pseudoauthor} the entry option \option{pseudoauthor}, the author can be put + \item The\beschreibung{editorstring} option \option{editorstring} can take the values + \wert{parens}, \wert{brackets} and \wert{normal}; the default is + \wert{parens}. This option sets the string \enquote{editor} + (abbreviated \enquote{ed.}) in parentheses or in brackets. If you set + the option to \wert{normal}, the editor string is not + surrounded by parentheses or brackets. Instead, a comma is added after + the editor's name. + If \option{usetranslator=true} is used, the setting for + \option{editorstring} is also valid for the string + \enquote{translator} (abbreviated \enquote{trans.}). + \item The\beschreibung{editorstringfont} option \option{editorstringfont} + determines the font used for the editor string (and + translator string). With \wert{normal}, + the normal font is used, with \wert{namefont}, the setting for the option + \option{namefont} is also used for the editor string. The default value for this + option is \wert{normal}. + \item Using\beschreibung{pseudoauthor} the entry option \option{pseudoauthor}, the author can be put in brackets or omitted. This is useful for editions of works whose authors are not named, but are known, for instance. If the global option \option{pseudoauthor} is set to \wert{true} (and the entry option \option{pseudoauthor} is used), the author of this @@ -185,9 +207,9 @@ Besides some changes in punctuation, there are the following differences: \item The punctuation before \texttt{titleaddon}, \texttt{booktitleaddon} and \texttt{maintitleaddon} is controlled by the new command \cmd{titleaddonpunct}. The default is a period. - \item The\beschreibung{edsuper} option \option{edsuper} is introduced. If it is set to \wert{true}, + \item With\beschreibung{edsuper} \option{edsuper=true}, the edition is printed as superscript number (not as ordinal number) - straight ahead of the year. The default value for this option is + just before the year. The default value for this option is \wert{false}.\\ \achtung Note that this works only, if you have integers in the field \texttt{edition}, and nothing but integers. Information like @@ -197,16 +219,18 @@ Besides some changes in punctuation, there are the following differences: option \option{edsuper} for one of your documents, you should ensure that you put only integers into the \texttt{edition} field and use the field \texttt{note} for more detailed information on editions. - \item The\beschreibung{editorstring} option \option{editorstring} is introduced. It can take the values - \wert{parens}, \wert{brackets} and \wert{normal}; the default is - \wert{parens}. This option sets the string \enquote{editor} - (abbreviated \enquote{ed.}) in parentheses or in brackets. If you set - the option to \wert{normal}, the editor string is not - surrounded by parentheses or brackets. Instead, a comma is added after - the editor's name. - If \option{usetranslator=true} is used, the setting for - \option{editorstring} is also valid for the string - \enquote{translator} (abbreviated \enquote{trans.}). + \item With\beschreibung{editionstring} \option{editionstring=true}, the + bibliography string \enquote{edition} will be added to the + \texttt{edition} field, even if it is not an integer. Thus, + you can type, e.g., + \begin{lstlisting} +edition = {2., revised} + \end{lstlisting} + in your bib file and you will get \enquote{2., revised ed.} + \option{editionstring=false} will give the additional bibliography + string only if there is an integer in the \texttt{edition} field + (which is \bl's standard behaviour). + The default for this option is \wert{false}. \item If\beschreibung{shortjournal} the option \option{shortjournal} is set to \wert{true}, the field \texttt{shortjournal} is used instead of \texttt{journaltitle}. This is useful for journal abbreviations. @@ -243,16 +267,20 @@ Besides some changes in punctuation, there are the following differences: \renewcommand*{\jourvolstring}{% \addspace vol\adddot\space} \end{lstlisting} - \item The fields \texttt{series} and \texttt{number} are put in - parentheses. \item The\beschreibung{series} option \option{series} affects the position of the \texttt{series} field. If set to \wert{afteryear}, the series is printed after the year. This affects the entry types \texttt{@book}, \texttt{@inbook}, \texttt{@collection}, \texttt{@incollection}, \texttt{@proceedings}, \texttt{@inproceedings} and \texttt{@manual}. The standard value for this option is \wert{standard}. + \item The\beschreibung{seriesformat} option \option{seriesformat} can + take the values \wert{standard} and \wert{parens}. If set to + \wert{parens}, \texttt{series} and \texttt{number} (of a book etc.) + will be printed in parentheses, otherwise without (as is the biblatex + standard behaviour). The default value for this option is \wert{parens}. \item The command \cmd{seriespunct} is the punctuation before the - \texttt{series} (of a book etc.). This punctuation is set inside the + \texttt{series} (of a book etc.). With \option{seriesformat=parens}, + this punctuation is set inside the parentheses. You can set it e.g. to \wert{=\cmd{addspace}} which is common in some fields. The default is empty, i.e.\ the series is printed right after the opening round bracket. @@ -485,7 +513,10 @@ Besides, there are the following differences between \xbx{footnote-dw} and \begin{itemize} \item Citations are \emph{only} possible inside footnotes. Citations which are not inside footnotes will automatically be turned into - a \cmd{footcite}. + a \cmd{footcite}. The only exception is \cmd{textcite} which will + give the author's name in the text and a footnote citation; when used inside + a footnote, \cmd{textcite} will give the author's name, followed by the + citation in parenthesis. \item The first citation will give a full reference, following citations will only use \texttt{author} and \texttt{shorttitle} (or \texttt{title}, if no \texttt{shorttitle} is given) with the @@ -501,8 +532,6 @@ Besides, there are the following differences between \xbx{footnote-dw} and footnotes, the \cmd{parencite} command will work as expected. The addition \enquote{see n.~\ldots} will be surrounded by brackets instead of parentheses. - \item The \cmd{textcite} command is not defined and will be - replaced by a \cmd{cite} command. \item If one or both of the options \option{annotation} and \option{library} are set to \wert{true}, the annotations and library information are only printed in the bibliography (if there is one), but not in the @@ -621,11 +650,17 @@ file (\texttt{biblatex.cfg}). The value in parentheses shows the default. will be printed or not. \optlist{edbyidem}{true} \enquote{ed. by idem} instead of \enquote{ed. by \emph{Editor}}. + \optlist{editionstring}{false} + Adds the string \enquote{ed.} to the edition, regardless of the content of the + \texttt{edition} field. \optlist{editorstring}{parens} Sets the editor string (with \option{usetranslator=true} also the translator string) in parentheses (\wert{parens}) or brackets (\wert{brackets}). If set to \wert{normal}, the editor string is put after the editor's name and preceded by a comma. + \optlist{editorstringfont}{normal} + The editor\slash translator strings are typeset either in normal font (\wert{normal}) or + in the font used by \option{namefont} (\wert{namefont}). \optlist{edstringincitations}{true} In citations, the editor string (with \option{usetranslator=true} also the translator string) is put after the editor's name (and the @@ -635,8 +670,8 @@ file (\texttt{biblatex.cfg}). The value in parentheses shows the default. \optlist[\xbx{authortitle-dw} only]{firstfull}{false} The first citation is printed with full reference. \optlist{firstfullname}{false} - At the first citation with \cmd{citeauthor} or \cmd{textcite} (with - footnote-dw: \cmd{citeauthor} only) the full name is printed, at all + At the first citation with \cmd{citeauthor} or \cmd{textcite} + the full name is printed, at all subsequent citations only the last name is printed. \optlist{firstnamefont}{normal} Specifies the font shape of the first names of authors and editors as well @@ -682,7 +717,8 @@ file (\texttt{biblatex.cfg}). The value in parentheses shows the default. publisher is omitted, too, even if \option{nopublisher} is set to \wert{false}. \optlist{oldauthor}{true} - If set to \wert{false}, the entry option \option{oldauthor} is ignored. + If set to \wert{false}, the entry options \option{oldauthor} and + \option{oldbookauthor} are ignored. \optlist{omiteditor}{false} If set to \wert{true}, the editor is omitted in citations. \optlist{origfields}{true} @@ -704,6 +740,9 @@ file (\texttt{biblatex.cfg}). The value in parentheses shows the default. \optlist{series}{standard} Position of a work's \texttt{series}: with \wert{standard} as in the standard styles, with \wert{afteryear} after the \texttt{year}. + \optlist{seriesformat}{parens} + Format of a work's \texttt{series}: with \wert{standard} as in the + standard styles, with \wert{parens} in parentheses. \optlist{shorthandibid}{true} Immediately repeated citations of entries with \texttt{shorthand} are replaced by \enquote{ibid.} @@ -742,7 +781,10 @@ They may override global options for the respective entry. with a \texttt{shorthand} is enforced (\wert{true}) or suppressed (\wert{false}). \opt{oldauthor} - The author is not set in the font shape chosen by \option{namefont}, + The \texttt{author} is not set in the font shape chosen by \option{namefont}, + if the global option \option{oldauthor} is set to \wert{true}. + \opt{oldbookauthor} + The \texttt{bookauthor} is not set in the font shape chosen by \option{namefont}, if the global option \option{oldauthor} is set to \wert{true}. \opt{pseudoauthor} The author is printed between \cmd{bibleftpseudo} and \cmd{bibright\-pseudo}, @@ -1144,6 +1186,8 @@ The following list shows additional commands introduced by \bldw{}, along with t 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{textcitesdelim}{\cmd{addspace}\cmd{bibstring\{and\}}\cmd{space}}{Delimiter between + multiple authors when using \cmd{textcites}.} \befehl{titleaddonpunct}{\cmd{addperiod}\cmd{space}}{Punctuation ahead of \texttt{titleaddon}, \texttt{booktitleaddon} and \texttt{maintitle\-addon}.} 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 ef224b98b04..fe1a9c1ff1d 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 7bb99bdc069..e6b446b46ae 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 @@ -1,5 +1,5 @@ % biblatex-dw -% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2010 +% Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2011 % % Diese Datei enthält die deutschsprachige Dokumentation von biblatex-dw @@ -20,9 +20,9 @@ Zitieren und Bibliographieren im geisteswissenschaftlichen Bereich und bietet dafür einige Funktionen, die über die Standardfunktionen von \bl{} hinausgehen. \bldw{} baut vollständig auf - \bl{} auf~-- in der Version~\biblatexdwversion{} wird - \Mindestanforderung{} benötigt (bitte achten Sie auch auf die - Mindestanforderungen von \bl{} selbst).} + \bl{} auf~-- die Version~\biblatexdwversion{} + \Mindestanforderung{}\Testversion. Bitte achten Sie auch auf die + Mindestanforderungen von \bl{} selbst.} \lizenz \screenversion @@ -60,19 +60,19 @@ bzw. Die Stile sind so konstruiert, dass sie stark miteinander verschränkt sind. Das bedeutet, dass die Kombination eines \bldw"=Stiles mit einem anderen Stil nicht unbedingt möglich sein wird. +Für einen ersten Überblick über die Stile stehen die Beispiele \enquote{de-authortitle-dw} +und \enquote{de-footnote-dw} im Ordner \texttt{examples} zur Verfügung. +\subsection{Globale Optionen und Eintragsoptionen} Die Optionen, die \bl{} zur Verfügung stellt, können auch mit \bldw{} verwendet werden. Die von den \bldw"=Stilen zusätzlich bereitgestellten Optionen werden im Folgenden erläutert. Dabei ist grundsätzlich zu unterscheiden zwischen globalen Optionen und Eintragsoptionen: Globale Optionen gelten für alle Literaturverweise im Dokument; sie werden entweder als Option beim Laden von \bl{} oder in einer Konfigurationsdatei (\texttt{biblatex.cfg}) gesetzt. Eintragsoptionen -werden für jeden einzelnen Eintrag im Feld \texttt{options} gesetzt. Eintragsoptionen -überschreiben für den jeweiligen Eintrag eventuell gesetzte globale Optionen. +werden für jeden einzelnen Eintrag im Feld \texttt{options} gesetzt. Manche der +Eintragsoptionen überschreiben für den jeweiligen Eintrag eventuell gesetzte globale Optionen. -Für einen ersten Überblick über die Stile stehen die Beispiele \enquote{de-authortitle-dw} -und \enquote{de-footnote-dw} im Ordner \texttt{examples} zur Verfügung. - \subsection{Fragen und Antworten (FAQ)} In der deutschen \TeX"=FAQ, die auf den Internetseiten der Deutschen Anwendervereinigung \TeX\ e.\,V. (\DANTE) eingesehen werden kann, sind auch einige häufig gestellte Fragen @@ -116,6 +116,12 @@ Neben einigen Änderungen in der Zeichensetzung gibt es folgende Unterschiede: mit \texttt{oldauthor} gekennzeichneten Einträge in derselben Schrift gesetzt werden wie die anderen Einträge, kann man die Eintragsoption mit der globalen Option \option{oldauthor=false} überschreiben. + \item Es\beschreibung{oldbookauthor} gibt auch die Eintragsoption \option{oldbookauthor}, + die dieselbe Funktionalität wie \option{oldauthor} für das Feld \texttt{bookauthor} + bereitstellt. Dies ist nützlich für \texttt{@inbook}"=Einträge, die beispielsweise + eine Einleitung zur Edition eines Werkes bieten, dessen Autor nicht in der normalen + Schrift gesetzt werden soll. Diese Option lässt sich mit der globalen Option + \option{oldauthor=false} ausschalten. \item Die\beschreibung{idemfont} Schriftart von \enquote{Ders.}\slash\enquote{Dies.} (siehe unten) kann mit der Option \option{idemfont} auf \wert{normal}, @@ -155,14 +161,35 @@ Neben einigen Änderungen in der Zeichensetzung gibt es folgende Unterschiede: \wert{true}, der Standard für \option{idembibformat} ist \wert{idem}. \item Wenn\beschreibung{edbyidem} - Autor und Herausgeber bei \texttt{@incollection}"~ oder - \texttt{@inbook}"=Einträgen dieselben sind, werden ihre Namen nicht + Autor und Herausgeber bei \texttt{@inbook}"~, \texttt{@incollection}"~ oder + \texttt{@inreference}"=Einträgen dieselben sind, werden ihre Namen nicht wiederholt, sondern durch \enquote{hg.\,v.\,ders.}, \enquote{hg.\,v.\,dems.} etc. ersetzt. Das Geschlecht wird im Feld \texttt{gender} festgelegt (siehe dazu die \bl{}"=Dokumentation). Diese Funktion wird durch die Option \option{edbyidem} kontrolliert, die die Werte \wert{true} oder \wert{false} annehmen kann; der Standard ist \wert{true}. + \item Die\beschreibung{editorstring} + Option \option{editorstring} kann die Werte \wert{parens}, + \wert{brackets} und \wert{normal} annehmen; der Standard ist + \wert{parens}. Diese Option setzt den Ausdruck \enquote{Herausgeber} + (abgekürzt \enquote{Hrsg.}) in runde Klammern (parens) oder in eckige + Klammern (brackets). Wenn die Option den Wert \wert{normal} hat, wird + der Ausdruck \enquote{Hrsg.} nicht von Klammern umgeben. Stattdessen + wird er an den Namen des Herausgebers und ein anschließendes Komma + angehängt. + Bei Verwendung von \option{usetranslator=true} trifft die Einstellung + von \option{editorstring} auch auf den Ausdruck \enquote{Übersetzer} + (abgekürzt \enquote{Übers.}) zu. + \item Die\beschreibung{editorstringfont} Option \option{editorstringfont} + bestimmt die Schriftart, die für den Ausdruck \enquote{Herausgeber} + (abgekürzt \enquote{Hrsg.}) benutzt wird. Mit \wert{normal} wird die + Standardschrift des Dokuments benutzt, \wert{namefont} übernimmt die + Einstellung der Option \option{namefont}. + Bei Verwendung von \option{usetranslator=true} trifft die Einstellung + von \option{editorstringfont} auch auf den Ausdruck \enquote{Übersetzer} + (abgekürzt \enquote{Übers.}) zu. Der Standard für diese Option + ist \wert{normal}. \item Mit\beschreibung{pseudoauthor} der Eintragsoption \option{pseudoauthor} kann man Autorennamen in eckige Klammern einschließen oder ganz unterdrücken. Das ist beispielsweise nützlich für @@ -202,7 +229,7 @@ Neben einigen Änderungen in der Zeichensetzung gibt es folgende Unterschiede: \texttt{origlocation} gesetzt ist, werden die \enquote{orig}"=Felder ausgegeben. In diesem Fall werden dann die Felder \texttt{location}, \texttt{publisher} und \texttt{date} in Klammern angefügt, eingeleitet - durch den \emph{bibstring} \texttt{reprint} (\enquote{Nachdr.} oder + durch den \emph{bibliography string} \texttt{reprint} (\enquote{Nachdr.} oder \enquote{Nachdruck}). Dabei werden die Felder \texttt{publisher} und \texttt{origpublisher} nur ausgegeben, wenn die Option \option{nopublisher=false} eingestellt ist. @@ -239,18 +266,18 @@ Neben einigen Änderungen in der Zeichensetzung gibt es folgende Unterschiede: dringend geraten, in das Feld \texttt{edition} weiterhin nur Zahlwerte einzugeben und für ausführliche Angaben zu Auf"|lagen das Feld \texttt{note} zu verwenden. - \item Die\beschreibung{editorstring} - Option \option{editorstring} kann die Werte \wert{parens}, - \wert{brackets} und \wert{normal} annehmen; der Standard ist - \wert{parens}. Diese Option setzt den Ausdruck \enquote{Herausgeber} - (abgekürzt \enquote{Hrsg.}) in runde Klammern (parens) oder in eckige - Klammern (brackets). Wenn die Option den Wert \wert{normal} hat, wird - der Ausdruck \enquote{Hrsg.} nicht von Klammern umgeben. Stattdessen - wird er an den Namen des Herausgebers und ein anschließendes Komma - angehängt. - Bei Verwendung von \option{usetranslator=true} trifft die Einstellung - von \option{editorstring} auch auf den Ausdruck \enquote{Übersetzer} - (abgekürzt \enquote{Übers.}) zu. + \item Mit\beschreibung{editionstring} \option{editionstring=true} wird + der \emph{bibliography string} \enquote{edition} zur Edition (Feld + \texttt{edition}) automatisch hinzugefügt, auch wenn es sich dabei + nicht um eine Zahl handelt. Man kann also beispielsweise in der bib-Datei + \begin{lstlisting} +edition = {2., aktualisierte} + \end{lstlisting} + schreiben und erhält \enquote{2., aktualisierte Aufl.} + Setzt man die Option auf \wert{false}, wird nur dann der \emph{bibliography string} + hinzugefügt, wenn in \texttt{edition} nur eine Zahl angegeben wird + (\bl"=Standard"=Verhalten). + Der Standard für diese Option ist \wert{false}. \item Mit\beschreibung{shortjournal} der Option \option{shortjournal=true} wird statt \texttt{journaltitle} das Feld \texttt{shortjournal} verwendet. Das ist sehr nützlich für @@ -298,8 +325,6 @@ Neben einigen Änderungen in der Zeichensetzung gibt es folgende Unterschiede: \renewcommand*{\jourvolstring}{% \addspace Jg\adddot\space} \end{lstlisting} - \item Die Felder \texttt{series} und \texttt{number} werden von - Klammern umschlossen. \item Die\beschreibung{series} Option \option{series} bestimmt die Position der Reihe (Feld \texttt{series}). Setzt man sie auf \wert{afteryear}, wird die Reihe @@ -307,9 +332,16 @@ Neben einigen Änderungen in der Zeichensetzung gibt es folgende Unterschiede: \texttt{@inbook}, \texttt{@collection}, \texttt{@incollection}, \texttt{@proceedings}, \texttt{@inproceedings} und \texttt{@manual}. Der Standardwert für diese Option ist \wert{standard}. + \item Die\beschreibung{seriesformat} Option \option{seriesformat} kann + die Werte \wert{standard} und \wert{parens} annehmen. Mit + \wert{parens} werden Reihe und Nummer eines Werkes (\texttt{series} und + \texttt{number}) von Klammern umgeben, ansonsten ohne Klammern (wie es + in den Standard"=Stilen der Fall ist). Der Standard für diese Option ist + \wert{parens}. \item Der Befehl \cmd{seriespunct} bestimmt die Zeichensetzung vor dem - Reihentitel (Feld \texttt{series}). Das Zeichen wird innerhalb der - Klammer gesetzt. Es kann z.\,B. auf \wert{=\cmd{addspace}} eingestellt + Reihentitel (Feld \texttt{series}). Bei \option{seriesformat=parens} + wird das Zeichen innerhalb der Klammer gesetzt. + Es kann z.\,B. auf \wert{=\cmd{addspace}} eingestellt werden, was in manchen Fächern üblich ist. Standardmäßig ist dieser Befehl leer, d.\,h. der Reihentitel wird direkt nach der öffnenden runden Klammer gesetzt. @@ -563,7 +595,10 @@ Option \option{firstfull}. Daneben gibt es folgende Unterschiede: \begin{itemize} \item Zitate sind \emph{nur} innerhalb von Fußnoten möglich. Zitate außerhalb von Fußnoten werden automatisch zu einem \cmd{footcite} - geändert. + geändert. Einzige Ausnahme ist \cmd{textcite}, das im Text den + Namen und ein Zitat in der Fußnote ausgibt; verwendet man + \cmd{textcite} in einer Fußnote, wird der Name ausgegeben und + das Zitat in Klammern dahinter gesetzt. \item Das erste Zitat eines Eintrags gibt die volle Literaturangabe aus, alle weiteren Zitate desselben Eintrags werden nur durch den Autor (\texttt{author}) und den Kurztitel (\texttt{shorttitle}) @@ -583,9 +618,7 @@ Option \option{firstfull}. Daneben gibt es folgende Unterschiede: Klammern gesetzt, sondern stattdessen der Befehl \cmd{footcite} ausgeführt. Innerhalb einer Fußnote funktioniert \cmd{parencite} wie erwartet. Der Zusatz \enquote{wie Anm.~\ldots} wird dann von - eckigen Klammern eingeschlossen, nicht von runden Klammern. - \item Der Befehl \cmd{textcite} ist nicht definiert und wird durch - \cmd{cite} ersetzt. + eckigen Klammern eingeschlossen, nicht von runden Klammern. \item Sind die Optionen \option{annotation} und \option{library} (oder eine von ihnen) auf \wert{true} gesetzt, werden die Anmerkungen (\texttt{annotation}) und Bibliotheksinformationen (\texttt{library}) @@ -710,13 +743,20 @@ gesetzt. Der Wert in Klammern gibt den Standard an. 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}}. + \enquote{hg.\,v.\,dems.} statt \enquote{hg.\,v. \emph{Herausgeber}}. + \optlist{editionstring}{false} + Setzt den Ausdruck \enquote{Aufl.} immer hinter die Edition, unabhängig vom Inhalt + des Feldes \texttt{edition}. \optlist{editorstring}{parens} Setzt den Ausdruck \enquote{Hrsg.} (und bei \option{usetranslator=true} auch \enquote{Übers.}) in runde Klammern (\wert{parens}) oder in eckige Klammern (\wert{brackets}). Mit dem Wert \wert{normal} wird der Ausdruck \enquote{Hrsg.} nach dem Namen des Herausgebers und einem angehängten Komma angefügt. + \optlist{editorstringfont}{normal} + Schriftart, die für den Ausdruck \enquote{Hrsg.} (und bei \option{usetranslator=true} + auch \enquote{Übers.}) benutzt wird: normale Schrift (\wert{normal}) oder + die Schrift, die mit der Option \option{namefont} gewählt wurde (\wert{namefont}). \optlist{edstringincitations}{true} Setzt im Zitat den Ausdruck \enquote{Hrsg.} (und bei \option{usetranslator=true} auch \enquote{Übers.}) hinter den Herausgeber bzw. Übersetzer. @@ -726,8 +766,8 @@ gesetzt. Der Wert in Klammern gibt den Standard an. \optlist[nur \xbx{authortitle-dw}]{firstfull}{false} Beim ersten Zitat wird die volle Literaturangabe ausgegeben. \optlist{firstfullname}{false} - Beim ersten Zitat mit \cmd{citeauthor} oder \cmd{textcite} (bei - footnote-dw: nur bei \cmd{citeauthor}) wird der volle Name ausgegeben, bei + Beim ersten Zitat mit \cmd{citeauthor} oder \cmd{textcite} + wird der volle Name ausgegeben, bei allen weiteren Zitaten nur der Nachname. \optlist{firstnamefont}{normal} Legt den Schriftschnitt der Vornamen von Autoren und Editoren fest, ebenso @@ -758,7 +798,7 @@ gesetzt. Der Wert in Klammern gibt den Standard an. \optlist{journalnumber}{standard} Position der Heftnummer (\texttt{number}) einer Zeitschrift: bei \wert{standard} wie in den Standard"=Stilen, bei \wert{afteryear} nach dem - Jahr (\texttt{year}\slash \texttt{date}), eingeleitet durch den bibstring \enquote{number} + Jahr (\texttt{year}\slash \texttt{date}), eingeleitet durch den \emph{bibliography string} \enquote{number} (\enquote{Nr.}), und bei \wert{date} in Abhängigkeit von den Datumsangaben (siehe Abschnitt~\ref{journalnumberdate} auf Seite~\pageref{journalnumberdate}). @@ -778,8 +818,8 @@ gesetzt. Der Wert in Klammern gibt den Standard an. Außerdem wird dann auch der Verlag nicht ausgegeben, selbst wenn \option{nopublisher} auf \wert{false} gesetzt wird. \optlist{oldauthor}{true} - Setzt man die Option auf \wert{false}, wird die Eintragsoption - \option{oldauthor} ignoriert. + Setzt man die Option auf \wert{false}, werden die Eintragsoptionen + \option{oldauthor} und \option{oldbookauthor} ignoriert. \optlist{omiteditor}{false} Unterdrückt die Ausgabe des Herausgebers in Literaturverweisen. \optlist{origfields}{true} @@ -803,6 +843,9 @@ gesetzt. Der Wert in Klammern gibt den Standard an. Position der Reihe (\texttt{series}) eines Werkes: bei \wert{standard} wie in den Standard"=Stilen, bei \wert{afteryear} nach dem Jahr (\texttt{year}\slash \texttt{date}). + \optlist{seriesformat}{parens} + Format der Reihe (\texttt{series}) eines Werkes: bei \wert{standard} wie in + den Standard"=Stilen, bei \wert{parens} in Klammern. \optlist{shorthandibid}{true} Direkte Folgezitate von Einträgen mit \texttt{shorthand} werden durch \enquote{ebd.} ersetzt. @@ -844,7 +887,10 @@ Sie überschreiben für den jeweiligen Eintrag eventuell gesetzte globale Optionen angefügte \enquote{im Folgenden zit. als~\ldots} erzwingen (\wert{true}) bzw. unterdrücken (\wert{false}). \opt{oldauthor} - Der Autor wird nicht in dem mit \option{namefont} gewählten Schriftschnitt + Der Autor (Feld \texttt{author}) wird nicht in dem mit \option{namefont} gewählten Schriftschnitt + gesetzt, sofern die globale Option \option{oldauthor} aktiviert ist. + \opt{oldbookauthor} + Der Buchautor (Feld \texttt{bookauthor}) wird nicht in dem mit \option{namefont} gewählten Schriftschnitt gesetzt, sofern die globale Option \option{oldauthor} aktiviert ist. \opt{pseudoauthor} Der Autor wird von \cmd{bibleftpseudo} und \cmd{bibrightpseudo} umgeben, @@ -1253,6 +1299,8 @@ Im Folgenden werden die von \bldw{} zur Verfügung gestellten Befehle mit ihrer S \option{shorthandwidth} benutzt wird.} \befehl{shorthandsep}{3pt plus 0.5pt minus 0.5pt}{Länge zwischen Sigle und Siglenbeschreibung, wenn \option{shorthandwidth} benutzt wird.} + \befehl{textcitesdelim}{\cmd{addspace}\cmd{bibstring\{and\}}\cmd{space}}{Trenner zwischen + mehreren Autoren bei Verwendung von \cmd{textcites}.} \befehl{titleaddonpunct}{\cmd{addperiod}\cmd{space}}{Zeichen vor dem Titelzusatz (\texttt{titleaddon}, \texttt{booktitleaddon}, \texttt{maintitleaddon}).} 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 aa0f92481f2..60855678dc8 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 1b2eb995896..c0c0dc47c95 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,10 +1,10 @@ -% v 1.3c +% v 1.4 % This file presents the `authortitle-dw' style % \listfiles \documentclass[a4paper]{article} \usepackage[T1]{fontenc} -\usepackage[latin9]{inputenc} +\usepackage[utf8]{inputenc} \usepackage[ngerman]{babel} \usepackage[autostyle]{csquotes} \usepackage[ @@ -53,7 +53,8 @@ %idemtracker=false, %isbn=true, %pagetracker=false, - %hyperref + %hyperref, + backend=biber ]{biblatex} \usepackage{hyperref} \bibliography{de-examples-dw} @@ -82,51 +83,51 @@ \subsection*{\cmd{parencite}-Beispiele} -Dies ist nur Fülltext \parencite{aristotle:rhetoric}. +Dies ist nur Fülltext \parencite{aristotle:rhetoric}. -Dies ist nur Fülltext \parencite[59]{aristotle:rhetoric}. +Dies ist nur Fülltext \parencite[59]{aristotle:rhetoric}. -Dies ist nur Fülltext \parencite[Siehe][]{springer}. +Dies ist nur Fülltext \parencite[Siehe][]{springer}. -Dies ist nur Fülltext \parencite[Siehe][92--95]{springer}. +Dies ist nur Fülltext \parencite[Siehe][92--95]{springer}. \subsection*{\cmd{citeauthor}- und \cmd{parencite*}-Beispiele} -\citeauthor{aristotle:rhetoric} zeigt, dass dies nur Fülltext +\citeauthor{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist \parencite*{aristotle:rhetoric}. -\citeauthor{aristotle:rhetoric} zeigt, dass dies nur Fülltext +\citeauthor{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist \parencite*[59]{aristotle:rhetoric}. -\citeauthor{springer} zeigt, dass dies nur Fülltext +\citeauthor{springer} zeigt, dass dies nur Fülltext ist \parencite*[Siehe][]{springer}. -\citeauthor{springer} zeigt, dass dies nur Fülltext +\citeauthor{springer} zeigt, dass dies nur Fülltext ist \parencite*[Siehe][92--95]{springer}. \subsection*{\cmd{footcite}-Beispiele} -Dies ist nur Fülltext.\footcite{aristotle:rhetoric} +Dies ist nur Fülltext.\footcite{aristotle:rhetoric} -Dies ist nur Fülltext.\footcite[59]{aristotle:rhetoric} +Dies ist nur Fülltext.\footcite[59]{aristotle:rhetoric} -Dies ist nur Fülltext.\footcite[Siehe][]{springer} +Dies ist nur Fülltext.\footcite[Siehe][]{springer} -Dies ist nur Fülltext.\footcite[Siehe][92--95]{springer} +Dies ist nur Fülltext.\footcite[Siehe][92--95]{springer} \subsection*{\cmd{textcite}-Beispiele} -\textcite{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist. +\textcite{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist. -\textcite[59]{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist. +\textcite[59]{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist. -\textcite[Siehe][]{springer} für mehr Fülltext. +\textcite[Siehe][]{springer} für mehr Fülltext. -\textcite[Siehe][92--95]{springer} für mehr Fülltext. +\textcite[Siehe][92--95]{springer} für mehr Fülltext. \subsection*{\cmd{autocite}-Beispiele} -Dies ist nur Fülltext \autocite{springer}. +Dies ist nur Fülltext \autocite{springer}. \subsection*{Mehrere Zitate} @@ -142,23 +143,23 @@ Dies ist nur Fülltext \autocite{springer}. \subsection*{\cmd{fullcite}-Beispiele} -Dies ist nur Fülltext. \fullcite{aristotle:rhetoric} +Dies ist nur Fülltext. \fullcite{aristotle:rhetoric} -Dies ist nur Fülltext. \fullcite[59]{aristotle:rhetoric} +Dies ist nur Fülltext. \fullcite[59]{aristotle:rhetoric} -Dies ist nur Fülltext. \fullcite[Siehe][]{springer} +Dies ist nur Fülltext. \fullcite[Siehe][]{springer} -Dies ist nur Fülltext. \fullcite[Siehe][92--95]{springer} +Dies ist nur Fülltext. \fullcite[Siehe][92--95]{springer} \subsection*{\cmd{footfullcite}-Beispiele} -Dies ist nur Fülltext. \footfullcite{aristotle:rhetoric} +Dies ist nur Fülltext. \footfullcite{aristotle:rhetoric} -Dies ist nur Fülltext. \footfullcite[59]{aristotle:rhetoric} +Dies ist nur Fülltext. \footfullcite[59]{aristotle:rhetoric} -Dies ist nur Fülltext. \footfullcite[Siehe][]{springer} +Dies ist nur Fülltext. \footfullcite[Siehe][]{springer} -Dies ist nur Fülltext. \footfullcite[Siehe][92--95]{springer} +Dies ist nur Fülltext. \footfullcite[Siehe][92--95]{springer} \clearpage 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 2f95b9a467f..c89d3018f92 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 @@ -11,14 +11,14 @@ volume = {97}, date = {2002}, pages = {431--456, 791--823}, - annotation = {Ein deutschsprachiger Aufsatz in einer französischen Zeitschrift. + annotation = {Ein deutschsprachiger Aufsatz in einer französischen Zeitschrift. Abgesehen davon ein typischer \texttt{article}-Eintrag. Man beachte die Felder \texttt{indextitle}, \texttt{shortjournal} und \texttt{options}.}, hyphenation = {german}, indextitle = {In Honore Salvatoris}, journaltitle = {Revue d'Histoire Eccl{\'e}siastique}, shortjournal = {RHE}, - library = {Im Feld \texttt{library} ist Platz für Bibliotheksinformationen.}, + library = {Im Feld \texttt{library} ist Platz für Bibliotheksinformationen.}, options = {acronym=true} } @@ -30,7 +30,7 @@ publisher = cup, date = {1877}, editor = {Cope, Edward Meredith}, - annotation = {Eine kommentierte Edition. Man beachte die Verknüpfung der Felder + annotation = {Eine kommentierte Edition. Man beachte die Verknüpfung der Felder \texttt{editor} und \texttt{commentator} sowie \texttt{volumes}, \texttt{sorttitle} und \texttt{indextitle}.}, commentator = {Cope, Edward Meredith}, @@ -114,7 +114,7 @@ publisher = {C.~A. Kaemmerer}, date = {1892}, editor = {Hannes, Ludwig}, - annotation = {Eine kommentierte Edition. Man beachte die Verknüpfung der Felder + annotation = {Eine kommentierte Edition. Man beachte die Verknüpfung der Felder \texttt{editor}, \texttt{translator} und \texttt{commentator}; ebenso die Felder \texttt{shorttitle}, \texttt{indextitle}, \texttt{sorttitle}, und \texttt{indexsorttitle}.}, @@ -139,7 +139,7 @@ publisher = {S.~Hermann}, date = {1869}, editor = {Hercz, J.}, - annotation = {Ein \texttt{book}-Eintrag. Man beachte die Verknüpfung der Felder + annotation = {Ein \texttt{book}-Eintrag. Man beachte die Verknüpfung der Felder \texttt{editor} und \texttt{translator} sowie die Felder \texttt{indextitle} und \texttt{indexsorttitle}.}, hyphenation = {german}, @@ -166,7 +166,7 @@ annotation = {Ein \texttt{incollection}-Eintrag mit Reihe (\texttt{series}) und Nummer (\texttt{number}). Man beachte das Format des Namens und vergleiche die \texttt{useprefix}-Option im Feld \texttt{options}. Man beachte - außerdem die Felder \texttt{indextitle} und \texttt{indexsorttitle}.}, + außerdem die Felder \texttt{indextitle} und \texttt{indexsorttitle}.}, hyphenation = {german}, indexsorttitle = {Nordischen Lander von der Mitte des 11. Jahrhunderts bis 1448}, indextitle = {Nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts bis 1448, @@ -184,8 +184,8 @@ editor = {Blank-Sangmeister, Ursula}, afterword = {Thraede, Klaus}, annotation = {Eine zweisprachige Edition von Ciceros \emph{De natura deorum} mit - deutscher Übersetzung. Man beachte das Format des \texttt{language}-Felds - in der \texttt{bib}-Datei, die Verknüpfung der Felder \texttt{editor} + deutscher Ãœbersetzung. Man beachte das Format des \texttt{language}-Felds + in der \texttt{bib}-Datei, die Verknüpfung der Felder \texttt{editor} und \texttt{translator} sowie das Feld \texttt{afterword}.}, hyphenation = {german}, indextitle = {De natura deorum}, @@ -197,7 +197,7 @@ @Article{duggan, author = {Duggan, Anne J.}, title = {The Lorv\~ao transcription of Benedict of Peterborough's \emph{Liber - miraculorum beati Thome}: Lisbon, Cod.~Alcobaça CCXC/143}, + miraculorum beati Thome}: Lisbon, Cod.~Alcobaça CCXC/143}, shorttitle = {The Lorv\~ao transcription}, journal = {Scriptorium}, volume = {51}, @@ -216,9 +216,9 @@ title = {Earl, Saint, Bishop, Skald~-- and Music}, date = {1985}, type = {phdthesis}, - annotation = {Dies ist ein typischer \texttt{thesis}-Eintrag für eine Dissertationsschrift. + annotation = {Dies ist ein typischer \texttt{thesis}-Eintrag für eine Dissertationsschrift. Man beachte das Feld \texttt{type} in der \texttt{bib}-Datei, das - einen \emph{localization key} enthält.}, + einen \emph{localization key} enthält.}, hyphenation = {british}, institution = {Uppsala Universitet}, location = {Uppsala}, @@ -232,7 +232,7 @@ publisher = {Artemis \& Winkler}, date = {2004}, edition = {3}, - annotation = {Eine deutsche Übersetzung der \emph{Ilias}. Man beachte die Felder + annotation = {Eine deutsche Ãœbersetzung der \emph{Ilias}. Man beachte die Felder \texttt{translator} und \texttt{introduction}, das Format des \texttt{location}-Felds in der \texttt{bib}-Datei sowie die Felder \texttt{sorttitle} und \texttt{indextitle}.}, @@ -255,7 +255,7 @@ date = {1968}, annotation = {Eine Edition von Kants Werken, Band 5. Dies ist ein \texttt{inbook}-Eintrag, der sich nur auf die \emph{Kritik der praktischen Vernunft} bezieht, - nicht auf den gesamten fünften Band. Man beachte die Felder \texttt{author} + nicht auf den gesamten fünften Band. Man beachte die Felder \texttt{author} und \texttt{bookauthor} in der \texttt{bib}-Datei. In den Standardeinstellungen wird \texttt{bookauthor} ignoriert, falls die Werte der Felder \texttt{author} und \texttt{bookauthor} identisch sind.}, @@ -276,7 +276,7 @@ date = {1968}, annotation = {Eine Edition von Kants Werken, Band 5. Dies ist ein \texttt{inbook}-Eintrag, der sich nur auf die \emph{Kritik der Urtheilskraft} bezieht, nicht - auf den gesamten fünften Band.}, + auf den gesamten fünften Band.}, hyphenation = {german}, location = {Berlin}, maintitle = {Kants Werke. Akademie Textausgabe}, @@ -290,7 +290,7 @@ xref = {LMA}, volume = {2}, date = {1983}, - location = {München and Zürich}, + location = {München and Zürich}, pages = {1484}, pagination = {column}, bookpagination = {column}, @@ -304,14 +304,14 @@ @REFERENCE{LMA, title = {Lexikon des Mittelalters}, - location = {München and Zürich}, + location = {München and Zürich}, date = {1980/1999}, gender = {pp}, hyphenation = {ngerman}, volumes = {10}, shorthand = {LMA}, options = {acronym=true}, - annotation = {Ein \texttt{reference}-Eintrag, gedacht für Nachschlagewerke. Intern + annotation = {Ein \texttt{reference}-Eintrag, gedacht für Nachschlagewerke. Intern nichts anderes als ein \texttt{collection}-Eintrag. Man beachte auch das Feld \texttt{options}.} } @@ -336,11 +336,11 @@ shorttitle = {Nikolauskult}, subtitle = {Eine kultgeographisch-volkskundliche Untersuchung}, date = {1981}, - location = {Düsseldorf}, - origlocation = {Düsseldorf}, + 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} + und \texttt{origlocation}, die dafür sorgen, dass \texttt{date} und \texttt{location} als \enquote*{Nachdruck} erscheinen.}, gender = {sm}, series = {Forschungen zur Volkskunde}, @@ -385,9 +385,9 @@ editor = {Colli, Giorgio and Montinari, Mazzino}, edition = {2}, annotation = {Die kritische Ausgabe von Nietzsches Werken. Dieser \texttt{book}-Eintrag - bezieht sich auf die gesamte, 15-bändige Edition. Man beachte das + bezieht sich auf die gesamte, 15-bändige Edition. Man beachte das \texttt{volumes}-Feld und das Format der Felder \texttt{publisher} - und \texttt{location} in der \texttt{bib}-Datei. Man beachte außerdem + und \texttt{location} in der \texttt{bib}-Datei. Man beachte außerdem die Felder \texttt{sorttitle} und \texttt{sortyear}, die die Sortierung der Bibliographie beeinflussen.}, hyphenation = {german}, @@ -411,7 +411,7 @@ \texttt{book}-Eintrag bezieht sich nur auf den ersten Band. Man beachte die Felder \texttt{title} und \texttt{maintitle} sowie die Felder \texttt{sorttitle} und \texttt{sortyear}. Dieser Eintrag soll nach - dem Eintrag erscheinen, der die gesamte Edition anführt.}, + dem Eintrag erscheinen, der die gesamte Edition anführt.}, bookauthor = {Nietzsche, Friedrich}, hyphenation = {german}, indexsorttitle = {Samtliche Werke I}, @@ -446,7 +446,7 @@ publisher = {Iberdrola}, date = {1993}, note = {Ed. facs. de la realizada en 1948--49}, - annotation = {Ein mehrbändiges Buch. Dies ist ein \texttt{book}-Eintrag mit den + annotation = {Ein mehrbändiges Buch. Dies ist ein \texttt{book}-Eintrag mit den Feldern \texttt{volumes}, \texttt{note}, \texttt{sorttitle} und \texttt{indextitle}.}, hyphenation = {spanish}, indextitle = {Peregrinaciones a Santiago de Compostela, Las}, @@ -462,7 +462,7 @@ location = {Hannover}, date = {2004}, annotation = {Ein \texttt{collection}-Eintrag. Man beachte das Feld \texttt{shorthand} - und vergleiche im Sigelverzeichnis. Man beachte außerdem die Option \texttt{citedas} + und vergleiche im Sigelverzeichnis. Man beachte außerdem die Option \texttt{citedas} im \texttt{options}-Feld.}, gender = {sf}, series = {MGH. Scriptores rerum Germanicarum in usum scholarum separatim editi}, @@ -472,7 +472,7 @@ } @REVIEW{Koerntgen, - author = {Körntgen, Ludger}, + author = {Körntgen, Ludger}, xref = {Annales-Quedlinburgenses}, journaltitle = {sehepunkte}, volume = {7}, @@ -491,7 +491,7 @@ date = {1885/1888}, edition = {2}, annotation = {Ein \texttt{collection}-Eintrag mit den Feldern \texttt{edition} und - \texttt{volumes}. Man beachte außerdem die Felder \texttt{editora}, \texttt{editoratype} + \texttt{volumes}. Man beachte außerdem die Felder \texttt{editora}, \texttt{editoratype} und \texttt{library}.}, library = {Bibliothek: Signatur}, location = {Leipzig}, @@ -506,12 +506,12 @@ publisher = {Encyclop{\ae}dia Britannica}, date = {2003}, edition = {15}, - annotation = {Dies ist ein \texttt{collection}-Eintrag für ein Lexikon. Man beachte + annotation = {Dies ist ein \texttt{collection}-Eintrag für ein Lexikon. Man beachte die \texttt{useeditor}-Option im \texttt{options}-Feld sowie das \texttt{sorttitle}-Feld. Dieser Eintrag soll nach dem Titel einsortiert werden, obwohl es - einen Herausgeber gibt. Außerdem soll der Titel unter \enquote*{E} - einsortiert werden, nicht unter \enquote*{T}. Man beachte außerdem - das \texttt{label}-Feld, das für Autor-Jahr-Stile angegeben wurde.}, + einen Herausgeber gibt. Außerdem soll der Titel unter \enquote*{E} + einsortiert werden, nicht unter \enquote*{T}. Man beachte außerdem + das \texttt{label}-Feld, das für Autor-Jahr-Stile angegeben wurde.}, hyphenation = {british}, indextitle = {Encyclop{\ae}dia Britannica, The New}, label = {EB}, @@ -525,12 +525,12 @@ title = {CTAN}, date = {2006}, annotation = {Ein \texttt{online}-Eintrag. Der \textsc{url}, der im Feld \texttt{url} - steht, wird automatisch in einen Link verwandelt, sofern die \texttt{hyperref}-Unterstützung + steht, wird automatisch in einen Link verwandelt, sofern die \texttt{hyperref}-Unterstützung geladen wurde. Man beachte das Format des \texttt{urldate}-Felds (\texttt{yyyy-mm-dd}) in der \texttt{bib}-Datei. - Man beachte außerdem das \texttt{label}-Feld, das als \emph{fallback} + Man beachte außerdem das \texttt{label}-Feld, das als \emph{fallback} (Sicherung) von Zitierstilen genutzt werden kann, die die Felder - \texttt{author} und\slash oder \texttt{year} bzw. \texttt{date} benötigen.}, + \texttt{author} und\slash oder \texttt{year} bzw. \texttt{date} benötigen.}, hyphenation = {american}, label = {CTAN}, subtitle = {The Comprehensive \TeX\ Archive Network}, @@ -540,7 +540,7 @@ @ARTICLE{Fingiert:1939, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, number = {65}, @@ -551,7 +551,7 @@ } @ARTICLE{Fingiert:1939a, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, number = {65}, @@ -561,20 +561,20 @@ keywords = {journalnumberdate}} @ARTICLE{Gerstmann:2007a, - author = {Gerstmann, Günter}, - title = {Gerhart Hauptmann-Aktivitäten in Hohenhaus}, + author = {Gerstmann, Günter}, + title = {Gerhart Hauptmann-Aktivitäten in Hohenhaus}, journal = {Schlesischer Kulturspiegel}, date = {2007}, volume = {42}, number = {1}, pages = {13}, - issue = {Januar--März}, + issue = {Januar--März}, keywords = {journalnumberdate}, } @ARTICLE{GMG:1939, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, number = {65}, @@ -605,7 +605,7 @@ } @ARTICLE{Fingiert:1939b, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, number = {65}, issue = {Morgen-Ausg\adddot}, @@ -615,7 +615,7 @@ } @ARTICLE{Fingiert:1939c, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, issue = {Morgen-Ausg\adddot}, @@ -636,7 +636,7 @@ @ARTICLE{Fingiert:1939d, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, pages = {2}, @@ -645,7 +645,7 @@ @ARTICLE{Fingiert:1939e, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, pages = {2}, @@ -653,8 +653,8 @@ keywords = {journalnumberdate}} @ARTICLE{Landolt:2000, - author = {Landolt, H. P. and Borbély, A. A.}, - title = {Alkohol und Schlafstörungen}, + author = {Landolt, H. P. and Borbély, A. A.}, + title = {Alkohol und Schlafstörungen}, journal = {Therapeutische Umschau}, date = {2000}, volume = {57}, @@ -676,7 +676,7 @@ @ARTICLE{Fingiert:1939f, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, number = {65}, pages = {2}, @@ -698,8 +698,8 @@ @ARTICLE{Essig:2005, author = {Essig, Rolf-Bernhard}, title = {Mit liebender Schafsgeduld}, - subtitle = {Erhart Kästner im Dienste Gerhart Hauptmanns}, - journal = {Süddeutsche Zeitung}, + subtitle = {Erhart Kästner im Dienste Gerhart Hauptmanns}, + journal = {Süddeutsche Zeitung}, number = {237}, pages = {16}, date = {2005-10-14}, @@ -709,8 +709,8 @@ @ARTICLE{Kluwe:2007, author = {Kluwe, Sandra}, title = {Furor poeticus}, - subtitle = {Ansätze zu einer neurophysiologisch fundierten Theorie - der literarischen Kreativität am Beispiel der Produktionsästhetik + subtitle = {Ansätze zu einer neurophysiologisch fundierten Theorie + der literarischen Kreativität am Beispiel der Produktionsästhetik Rilkes und Kafkas}, journal = {literaturkritik.de}, date = {2007-02}, @@ -721,9 +721,9 @@ @ARTICLE{Burckhardt:2006, author = {Burckhardt, Barbara}, - title = {Frauen sind einfach klüger, starke Frauen}, + title = {Frauen sind einfach klüger, starke Frauen}, subtitle = {Michael Thalheimers \enquote{Rose Bernd} am Hamburger - Thalia Theater und Schirin Khodadadians Kasseler Räuber}, + Thalia Theater und Schirin Khodadadians Kasseler Räuber}, journal = {Theater heute}, date = {2006}, number = {5}, @@ -742,7 +742,7 @@ @ARTICLE{Fingiert:1939g, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, issue = {Abend-Ausgabe}, pages = {2}, @@ -763,9 +763,9 @@ @ARTICLE{Hofer:2006, author = {Hofer, Hermann}, title = {Der Schrei der Verwundeten}, - subtitle = {Erschütternd: Gerhart + subtitle = {Erschütternd: Gerhart Hauptmanns \enquote{Rose Bernd} am Hamburger Thalia Theater}, - journal = {Lübecker Nachrichten}, + journal = {Lübecker Nachrichten}, date = {2006-03-14}, keywords = {journalnumberdate} } @@ -779,7 +779,7 @@ @ARTICLE{Fingiert:1939h, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, pages = {2}, date = {1939}, @@ -800,3 +800,52 @@ annotation = {Eine Edition von Predigten eines mittelalterlichen Autors. Man beachte das Feld \texttt{options} sowie die Felder \texttt{isbn}, \texttt{origlocation} und \texttt{origdate}.} } + +@INBOOK{Judic1992, + author = {Bruno Judic}, + title = {Introduction}, + booktitle = {Régle pastorale}, + date = {1992}, + bookauthor = {{Gregor der Große}}, + editor = {Floribert Rommel}, + translator = {Charles Morel}, + commentator = {Bruno Judic}, + volume = {1}, + series = {Sources chrétiennes}, + number = {381}, + publisher = {Éditions du Cerf}, + location = {Paris}, + pages = {15-111}, + gender = {sm}, + hyphenation = {french}, + options = {pseudoauthor=true,oldbookauthor=true}, + xref = {Regula-Pastoralis}, + annotation = {Die Einleitung zur Edition eines frühmittelalterlichen Textes. + Die Edition hat außerdem einen Herausgeber (\texttt{editor}), einen + Ãœbersetzer (\texttt{translator}) und einen Kommentator (\texttt{commentator}). + Man beachte die Option \texttt{oldbookauthor} im Feld \texttt{options}.} +} + +@BOOK{Regula-Pastoralis, + author = {{Gregor der Große}}, + title = {Régle pastorale}, + date = {1992}, + editor = {Floribert Rommel}, + translator = {Charles Morel}, + commentator = {Bruno Judic}, + introduction = {Bruno Judic}, + volumes = {2}, + series = {Sources chrétiennes}, + number = {381}, + publisher = {Éditions du Cerf}, + location = {Paris}, + gender = {sm}, + hyphenation = {french}, + keywords = {Gregor der Große, Regula Pastoralis}, + options = {pseudoauthor=true,oldauthor=true}, + annotation = {Die Edition eines frühmittelalterlichen Textes. Die Edition hat + einen Herausgeber (\texttt{editor}), einen Ãœbersetzer (\texttt{translator}) + und einen Kommentator (\texttt{commentator}), der gleichzeitig auch die + Einleitung (\texttt{introduction}) geschrieben hat. Man beachte daneben + das Feld \texttt{options}.} +} 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 0ebd34492f4..1b927b8071c 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 eaf44628c3b..485711e4467 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,9 +1,9 @@ -% v 1.3c +% v 1.4 % This file presents the `footnote-dw' style % \documentclass[a4paper]{article} \usepackage[T1]{fontenc} -\usepackage[latin9]{inputenc} +\usepackage[utf8]{inputenc} \usepackage[ngerman]{babel} \usepackage[autostyle]{csquotes} \usepackage[ @@ -52,7 +52,8 @@ %idemtracker=false, %isbn=true, %pagetracker=false, - hyperref + hyperref, + backend=biber ]{biblatex} \usepackage{hyperref} \bibliography{de-examples-dw} @@ -77,51 +78,51 @@ \subsection*{\cmd{parencite}-Beispiele} -Dies ist nur Fülltext \parencite{aristotle:rhetoric}. +Dies ist nur Fülltext \parencite{aristotle:rhetoric}. -Dies ist nur Fülltext \parencite[59]{aristotle:rhetoric}. +Dies ist nur Fülltext \parencite[59]{aristotle:rhetoric}. -\footnote{Dies ist nur Fülltext \parencite[Siehe][]{springer}.} +\footnote{Dies ist nur Fülltext \parencite[Siehe][]{springer}.} -\footnote{Dies ist nur Fülltext \parencite[Siehe][92--95]{springer}.} +\footnote{Dies ist nur Fülltext \parencite[Siehe][92--95]{springer}.} \subsection*{\cmd{citeauthor}- und \cmd{parencite*}-Beispiele} -\citeauthor{aristotle:rhetoric} zeigt, dass dies nur Fülltext +\citeauthor{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist \parencite*{aristotle:rhetoric}. -\citeauthor{aristotle:rhetoric} zeigt, dass dies nur Fülltext +\citeauthor{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist \parencite*[59]{aristotle:rhetoric}. -\footnote{\citeauthor{springer} zeigt, dass dies nur Fülltext +\footnote{\citeauthor{springer} zeigt, dass dies nur Fülltext ist \parencite*[Siehe][]{springer}.} -\footnote{\citeauthor{springer} zeigt, dass dies nur Fülltext +\footnote{\citeauthor{springer} zeigt, dass dies nur Fülltext ist \parencite*[Siehe][92--95]{springer}.} \subsection*{\cmd{footcite}-Beispiele} -Dies ist nur Fülltext. \footcite{aristotle:rhetoric} +Dies ist nur Fülltext. \footcite{aristotle:rhetoric} -Dies ist nur Fülltext. \footcite[59]{aristotle:rhetoric} +Dies ist nur Fülltext. \footcite[59]{aristotle:rhetoric} -\footnote{Dies ist nur Fülltext. \footcite[Siehe][]{springer}} +\footnote{Dies ist nur Fülltext. \footcite[Siehe][]{springer}} -\footnote{Dies ist nur Fülltext. \footcite[Siehe][92--95]{springer}} +\footnote{Dies ist nur Fülltext. \footcite[Siehe][92--95]{springer}} \subsection*{\cmd{textcite}-Beispiele} -\textcite{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist. +\textcite{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist. -\textcite[59]{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist. +\textcite[59]{aristotle:rhetoric} zeigt, dass dies nur Fülltext ist. -\footnote{\textcite[Siehe][]{springer} für mehr Fülltext.} +\footnote{\textcite[Siehe][]{springer} für mehr Fülltext.} -\footnote{\textcite[Siehe][92--95]{springer} für mehr Fülltext.} +\footnote{\textcite[Siehe][92--95]{springer} für mehr Fülltext.} \subsection*{\cmd{autocite}-Beispiele} -Dies ist nur Fülltext \autocite{springer}. +Dies ist nur Fülltext \autocite{springer}. \subsection*{Mehrere Zitate} @@ -139,23 +140,23 @@ Dies ist nur Fülltext \autocite{springer}. \subsection*{\cmd{fullcite}-Beispiele} -Dies ist nur Fülltext. \fullcite{aristotle:rhetoric} +Dies ist nur Fülltext. \fullcite{aristotle:rhetoric} -Dies ist nur Fülltext. \fullcite[59]{aristotle:rhetoric} +Dies ist nur Fülltext. \fullcite[59]{aristotle:rhetoric} -\footnote{Dies ist nur Fülltext. \fullcite[Siehe][]{springer}} +\footnote{Dies ist nur Fülltext. \fullcite[Siehe][]{springer}} -\footnote{Dies ist nur Fülltext. \fullcite[Siehe][92--95]{springer}} +\footnote{Dies ist nur Fülltext. \fullcite[Siehe][92--95]{springer}} \subsection*{\cmd{footfullcite}-Beispiele} -Dies ist nur Fülltext. \footfullcite{aristotle:rhetoric} +Dies ist nur Fülltext. \footfullcite{aristotle:rhetoric} -Dies ist nur Fülltext. \footfullcite[59]{aristotle:rhetoric} +Dies ist nur Fülltext. \footfullcite[59]{aristotle:rhetoric} -\footnote{Dies ist nur Fülltext. \footfullcite[Siehe][]{springer}} +\footnote{Dies ist nur Fülltext. \footfullcite[Siehe][]{springer}} -\footnote{Dies ist nur Fülltext. \footfullcite[Siehe][92--95]{springer}} +\footnote{Dies ist nur Fülltext. \footfullcite[Siehe][92--95]{springer}} \clearpage 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 7deeda8a5df..601cf391a8b 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 f255655923f..dd024e8ca88 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,8 +1,9 @@ -% v 1.3c +% v 1.4 % This file presents the `authortitle-dw' style % \documentclass[a4paper]{article} \usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} \usepackage[british]{babel} \usepackage[autostyle]{csquotes} \usepackage[ @@ -51,7 +52,8 @@ %idemtracker=false, %isbn=true, %pagetracker=false, - hyperref + hyperref, + backend=biber ]{biblatex} \usepackage{hyperref} \bibliography{examples-dw} 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 9b8d8d01ae2..dabd012a427 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 ffac05808c8..bc481731fa2 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,8 +1,9 @@ -% v 1.3c +% v 1.4 % This file presents the `footnote-dw' style % \documentclass[a4paper]{article} \usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} \usepackage[british]{babel} \usepackage[autostyle]{csquotes} \usepackage[ @@ -52,7 +53,8 @@ %idemtracker=false, %isbn=true, %pagetracker=false, - hyperref + hyperref, + backend=biber ]{biblatex} \usepackage{hyperref} \bibliography{examples-dw} diff --git a/Master/texmf-dist/doc/latex/biblatex-dw/examples/examples-dw.bib b/Master/texmf-dist/doc/latex/biblatex-dw/examples/examples-dw.bib index 8f3c0ebe452..e0476075010 100644 --- a/Master/texmf-dist/doc/latex/biblatex-dw/examples/examples-dw.bib +++ b/Master/texmf-dist/doc/latex/biblatex-dw/examples/examples-dw.bib @@ -183,7 +183,7 @@ @Article{duggan, author = {Duggan, Anne J.}, title = {The Lorv\~ao transcription of Benedict of Peterborough's \emph{Liber - miraculorum beati Thome}: Lisbon, Cod.~Alcobaça CCXC/143}, + miraculorum beati Thome}: Lisbon, Cod.~Alcobaça CCXC/143}, shorttitle = {The Lorv\~ao transcription}, journal = {Scriptorium}, volume = {51}, @@ -468,7 +468,7 @@ } @REVIEW{Koerntgen, - author = {Körntgen, Ludger}, + author = {Körntgen, Ludger}, xref = {Annales-Quedlinburgenses}, journaltitle = {sehepunkte}, volume = {7}, @@ -484,21 +484,21 @@ title = {Nikolauskult und Nikolausbrauch im Abendlande}, shorttitle = {Nikolauskult}, subtitle = {Eine kultgeographisch-volkskundliche Untersuchung}, - origlocation = {Düsseldorf}, + origlocation = {Düsseldorf}, origdate = {1931}, annotation = {A \texttt{book} entry. Note the \texttt{origdate} and \texttt{origlocation} fields and the \enquote*{reprint} output}, gender = {sm}, series = {Forschungen zur Volkskunde}, number = {9--12}, - location = {Düsseldorf}, + location = {Düsseldorf}, date = {1981} } @ARTICLE{Fingiert:1939, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, number = {65}, @@ -509,7 +509,7 @@ } @ARTICLE{Fingiert:1939a, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, number = {65}, @@ -519,20 +519,20 @@ keywords = {journalnumberdate}} @ARTICLE{Gerstmann:2007a, - author = {Gerstmann, Günter}, - title = {Gerhart Hauptmann-Aktivitäten in Hohenhaus}, + author = {Gerstmann, Günter}, + title = {Gerhart Hauptmann-Aktivitäten in Hohenhaus}, journal = {Schlesischer Kulturspiegel}, date = {2007}, volume = {42}, number = {1}, pages = {13}, - issue = {Januar--März}, + issue = {Januar--März}, keywords = {journalnumberdate}, } @ARTICLE{GMG:1939, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, number = {65}, @@ -563,7 +563,7 @@ } @ARTICLE{Fingiert:1939b, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, number = {65}, issue = {Morgen-Ausg\adddot}, @@ -573,7 +573,7 @@ } @ARTICLE{Fingiert:1939c, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, issue = {Morgen-Ausg\adddot}, @@ -594,7 +594,7 @@ @ARTICLE{Fingiert:1939d, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, pages = {2}, @@ -603,7 +603,7 @@ @ARTICLE{Fingiert:1939e, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, volume = {91}, pages = {2}, @@ -611,8 +611,8 @@ keywords = {journalnumberdate}} @ARTICLE{Landolt:2000, - author = {Landolt, H. P. and Borbély, A. A.}, - title = {Alkohol und Schlafstörungen}, + author = {Landolt, H. P. and Borbély, A. A.}, + title = {Alkohol und Schlafstörungen}, journal = {Therapeutische Umschau}, date = {2000}, volume = {57}, @@ -634,7 +634,7 @@ @ARTICLE{Fingiert:1939f, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, number = {65}, pages = {2}, @@ -656,8 +656,8 @@ @ARTICLE{Essig:2005, author = {Essig, Rolf-Bernhard}, title = {Mit liebender Schafsgeduld}, - subtitle = {Erhart Kästner im Dienste Gerhart Hauptmanns}, - journal = {Süddeutsche Zeitung}, + subtitle = {Erhart Kästner im Dienste Gerhart Hauptmanns}, + journal = {Süddeutsche Zeitung}, number = {237}, pages = {16}, date = {2005-10-14}, @@ -667,8 +667,8 @@ @ARTICLE{Kluwe:2007, author = {Kluwe, Sandra}, title = {Furor poeticus}, - subtitle = {Ansätze zu einer neurophysiologisch fundierten Theorie - der literarischen Kreativität am Beispiel der Produktionsästhetik + subtitle = {Ansätze zu einer neurophysiologisch fundierten Theorie + der literarischen Kreativität am Beispiel der Produktionsästhetik Rilkes und Kafkas}, journal = {literaturkritik.de}, date = {2007-02}, @@ -679,9 +679,9 @@ @ARTICLE{Burckhardt:2006, author = {Burckhardt, Barbara}, - title = {Frauen sind einfach klüger, starke Frauen}, + title = {Frauen sind einfach klüger, starke Frauen}, subtitle = {Michael Thalheimers \enquote{Rose Bernd} am Hamburger - Thalia Theater und Schirin Khodadadians Kasseler Räuber}, + Thalia Theater und Schirin Khodadadians Kasseler Räuber}, journal = {Theater heute}, date = {2006}, number = {5}, @@ -700,7 +700,7 @@ @ARTICLE{Fingiert:1939g, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, issue = {Abend-Ausgabe}, pages = {2}, @@ -721,9 +721,9 @@ @ARTICLE{Hofer:2006, author = {Hofer, Hermann}, title = {Der Schrei der Verwundeten}, - subtitle = {Erschütternd: Gerhart + subtitle = {Erschütternd: Gerhart Hauptmanns \enquote{Rose Bernd} am Hamburger Thalia Theater}, - journal = {Lübecker Nachrichten}, + journal = {Lübecker Nachrichten}, date = {2006-03-14}, keywords = {journalnumberdate} } @@ -737,7 +737,7 @@ @ARTICLE{Fingiert:1939h, author = {Anonym}, - title = {Gegen Mißbrauch der Genußgifte}, + title = {Gegen Mißbrauch der Genußgifte}, journal = {Hannoverscher Kurier}, pages = {2}, date = {1939}, @@ -749,7 +749,7 @@ xref = {LMA}, volume = {2}, date = {1983}, - location = {München and Zürich}, + location = {München and Zürich}, pages = {1484}, pagination = {column}, bookpagination = {column}, @@ -764,7 +764,7 @@ @REFERENCE{LMA, title = {Lexikon des Mittelalters}, - location = {München and Zürich}, + location = {München and Zürich}, date = {1980/1999}, gender = {pp}, hyphenation = {ngerman}, @@ -791,3 +791,50 @@ annotation = {An edition of homilies by one medieval author. Note the \texttt{options} field as well as the fields \texttt{isbn}, \texttt{origlocation} and \texttt{origdate}.} } + +@INBOOK{Judic1992, + author = {Bruno Judic}, + title = {Introduction}, + booktitle = {Régle pastorale}, + date = {1992}, + bookauthor = {{Gregor der Große}}, + editor = {Floribert Rommel}, + translator = {Charles Morel}, + commentator = {Bruno Judic}, + volume = {1}, + series = {Sources chrétiennes}, + number = {381}, + publisher = {Éditions du Cerf}, + location = {Paris}, + pages = {15-111}, + gender = {sm}, + hyphenation = {french}, + options = {pseudoauthor=true,oldbookauthor=true}, + xref = {Regula-Pastoralis}, + annotation = {The introduction to an edition of an early medieval text. + The edition features an \texttt{editor}, a \texttt{translator} and a + \texttt{commentator}. Note also the option \texttt{oldbookauthor} inside + the \texttt{options} field.} +} + +@BOOK{Regula-Pastoralis, + author = {{Gregor der Große}}, + title = {Régle pastorale}, + date = {1992}, + editor = {Floribert Rommel}, + translator = {Charles Morel}, + commentator = {Bruno Judic}, + introduction = {Bruno Judic}, + volumes = {2}, + series = {Sources chrétiennes}, + number = {381}, + publisher = {Éditions du Cerf}, + location = {Paris}, + gender = {sm}, + hyphenation = {french}, + keywords = {Gregor der Große, Regula Pastoralis}, + options = {pseudoauthor=true,oldauthor=true}, + annotation = {The edition of an early medieval text with an \texttt{editor}, + a \texttt{translator} and a \texttt{commentator} who also wrote an + \texttt{introduction}. Note also the \texttt{options} field.} +}
\ No newline at end of file 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 c00749fce5e..e5400e4e648 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 2011 +% authortitle-dw.bbx, Dominik Waßenhoven 2011 -\ProvidesFile{authortitle-dw.bbx}[2011/02/06 v1.3c biblatex bibliography style] +\ProvidesFile{authortitle-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style] -\@ifpackagelater{biblatex}{2011/01/08} +\@ifpackagelater{biblatex}{2011/07/29} {} {\PackageError{biblatex} {Outdated 'biblatex' package} {The version of the 'authortitle-dw' style you are using\MessageBreak - requires biblatex v1.1a or later.\MessageBreak + requires biblatex v1.6 or later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now.}% \endinput} @@ -17,6 +17,7 @@ \newbool{bbx:annotation} \newbool{bbx:edbyidem} \newbool{bbx:editorstring}% Test, ob editorstring auf parens oder brackets gesetzt wurde +\newbool{bbx:editionstring} \newbool{bbx:edsuper} \newbool{bbx:idembib} \newbool{bbx:idemfont}% Test, ob idemfont gesetzt wurde @@ -26,9 +27,12 @@ \newbool{bbx:oldauthor} \newbool{bbx:origfields} \newbool{bbx:pseudoauthor} +\newbool{oldbookauthor} \newbool{oldauthor} \newbool{pseudoauthor} +\DeclareEntryOption{oldbookauthor}[true]{% + \csuse{bool#1}{oldbookauthor}} \DeclareEntryOption{oldauthor}[true]{% \csuse{bool#1}{oldauthor}} \DeclareEntryOption{pseudoauthor}[true]{% @@ -38,6 +42,8 @@ \csuse{bool#1}{bbx:annotation}} \DeclareBibliographyOption{edbyidem}[true]{% \csuse{bool#1}{bbx:edbyidem}} +\DeclareBibliographyOption{editionstring}[true]{% + \csuse{bool#1}{bbx:editionstring}} \DeclareBibliographyOption{edsuper}[true]{% \csuse{bool#1}{bbx:edsuper}} \DeclareBibliographyOption{idembib}[true]{% @@ -72,9 +78,9 @@ \def\bbx@opt@namefont@smallcaps{% \renewcommand{\bbx@namefont}{\textsc}} \def\bbx@opt@namefont@italic{% - \renewcommand{\bbx@namefont}{\textit}} + \renewcommand{\bbx@namefont}{\mkbibemph}} \def\bbx@opt@namefont@bold{% - \renewcommand{\bbx@namefont}{\textbf}} + \renewcommand{\bbx@namefont}{\mkbibbold}} \DeclareBibliographyOption{firstnamefont}[normal]{% \ifcsdef{bbx@opt@firstnamefont@#1} @@ -88,9 +94,9 @@ \def\bbx@opt@firstnamefont@smallcaps{% \renewcommand{\bbx@firstnamefont}{\textsc}} \def\bbx@opt@firstnamefont@italic{% - \renewcommand{\bbx@firstnamefont}{\textit}} + \renewcommand{\bbx@firstnamefont}{\mkbibemph}} \def\bbx@opt@firstnamefont@bold{% - \renewcommand{\bbx@firstnamefont}{\textbf}} + \renewcommand{\bbx@firstnamefont}{\mkbibbold}} \DeclareBibliographyOption{idemfont}[normal]{% \ifcsdef{bbx@opt@idemfont@#1} @@ -107,10 +113,10 @@ \renewcommand{\bbx@idemfont}{\textsc}} \def\bbx@opt@idemfont@italic{% \global\booltrue{bbx:idemfont}% - \renewcommand{\bbx@idemfont}{\textit}} + \renewcommand{\bbx@idemfont}{\mkbibemph}} \def\bbx@opt@idemfont@bold{% \global\booltrue{bbx:idemfont}% - \renewcommand{\bbx@idemfont}{\textbf}} + \renewcommand{\bbx@idemfont}{\mkbibbold}} \DeclareBibliographyOption{ibidemfont}[normal]{% \ifcsdef{bbx@opt@ibidemfont@#1} @@ -124,9 +130,9 @@ \def\bbx@opt@ibidemfont@smallcaps{% \renewcommand{\bbx@ibidemfont}{\textsc}} \def\bbx@opt@ibidemfont@italic{% - \renewcommand{\bbx@ibidemfont}{\textit}} + \renewcommand{\bbx@ibidemfont}{\mkbibemph}} \def\bbx@opt@ibidemfont@bold{% - \renewcommand{\bbx@ibidemfont}{\textbf}} + \renewcommand{\bbx@ibidemfont}{\mkbibbold}} \DeclareBibliographyOption{idembibformat}[idem]{% \ifcsdef{bbx@opt@idembibformat@#1} @@ -159,6 +165,18 @@ \def\bbx@opt@editorstring@brackets{% \global\booltrue{bbx:editorstring}% \renewcommand{\bbx@editorstring}{\mkbibbrackets}} + +\DeclareBibliographyOption{editorstringfont}[normal]{% + \ifcsdef{bbx@opt@edstringfont@#1} + {\csuse{bbx@opt@edstringfont@#1}} + {\blxdw@error{% + Invalid option 'editorstringfont=#1'\MessageBreak + Valid values are 'normal' and 'namefont'}}} +\newcommand{\bbx@edstringfont}{} +\def\bbx@opt@edstringfont@normal{% + \renewcommand{\bbx@edstringfont}{}} +\def\bbx@opt@edstringfont@namefont{% + \renewcommand{\bbx@edstringfont}{\bbx@namefont}} \ExecuteBibliographyOptions{% edbyidem=true, @@ -173,7 +191,7 @@ pseudoauthor=true } -%% Autoren, Herausgeber und Übersetzter in der Bibliographie +%% Autoren, Herausgeber und Ãœbersetzter in der Bibliographie \DeclareNameAlias{author}{sortname} \DeclareNameAlias{editor}{sortname} \DeclareNameAlias{translator}{sortname} @@ -202,7 +220,7 @@ %% Zeichen vor 'Nachdruck' bei Benutzung von 'origfields' \newcommand*{\origfieldspunct}{\addcomma\space} -%% Zeichen für pseudoauthor=true +%% Zeichen für pseudoauthor=true \newcommand*{\bibleftpseudo}{} \newcommand*{\bibrightpseudo}{} @@ -219,7 +237,7 @@ \let\finalnamedelim\bibfinalnamedelim% } -%% Makros für Schriften der Felder 'annotation' und 'library' +%% Makros für Schriften der Felder 'annotation' und 'library' \newcommand{\annotationfont}{\small\itshape} \newcommand{\libraryfont}{\small\sffamily} @@ -227,7 +245,13 @@ \DeclareFieldFormat{annotation}{% \annotationfont #1\addperiod} \DeclareFieldFormat{booktitle}{#1} -\DeclareFieldFormat{edition:super}{% für Option 'edsuper' +\DeclareFieldFormat{edition}{% + \ifinteger{#1} + {\mkbibordedition{#1}~\bibstring{edition}} + {\ifbool{bbx:editionstring} + {#1\addspace\bibstring{edition}\isdot} + {#1\isdot}}} +\DeclareFieldFormat{edition:super}{% für Option 'edsuper' \ifinteger{#1} {\textsuperscript{#1}} {\blxdw@warning@noline{% @@ -276,7 +300,7 @@ {#1\isdot}} {#1\isdot}} -%% Umdefinierung von finentry für 'annotation' und 'library' +%% Umdefinierung von finentry für 'annotation' und 'library' \newbibmacro*{finentry:annotation}{% \iffieldundef{annotation} {\finentry}% @@ -285,47 +309,61 @@ } \newbibmacro*{finentry:library}{% \iffieldundef{library} - {\finentry}% + {\finentry} {\setunit{\addperiod\par} - \printfield{library}}% + \printfield{library}% + \finentry} } \renewbibmacro*{finentry}{% - \ifbool{bbx:annotation} - {\ifbool{bbx:library}% BEIDE true - {\iffieldundef{annotation} - {}% kein \finentry! + \ifboolexpr{ + test {\iffieldundef{annotation}} + and + test {\iffieldundef{library}} + } + {\finentry} + {\iffieldundef{library} + {} + {\ifbool{bbx:library} + {\setunit{\addperiod\par} + \printfield{library}} + {}}% + \iffieldundef{annotation} + {} + {\ifbool{bbx:annotation} {\setunit{\addperiod\par} - \printfield{annotation}}% - \usebibmacro{finentry:library}} - {\usebibmacro{finentry:annotation}}}% nur annotation=true - {\ifbool{bbx:library}% nur library=true - {\usebibmacro{finentry:library}} - {\finentry}}}% BEIDE false - -% Ausschalten von annotation und library für die List of Shorthands + \printfield{annotation}} + {}}% + \finentry}} + +% Ausschalten von annotation und library für die List of Shorthands \AtEveryLositem{% \boolfalse{bbx:annotation}% \boolfalse{bbx:library}% } -%% Wichtig für die Herausgebernamen in der List of Shorthands +%% Wichtig für die Herausgebernamen in der List of Shorthands \InitializeBibliographyStyle{% \let\bbx@lasthash\undefined} -% Formatierung der Nachnamen entsprechend der Option 'namefont' -% Nachnamen von Einträgen mit 'options = {oldauthor=true}' oder 'options = {oldauthor}' +% Nachnamen von Einträgen mit 'options = {oldauthor=true}' +% oder 'options = {oldbookauthor=true}' % werden nicht in der Schrift von 'namefont' gesetzt +% Formatierung der Nachnamen entsprechend der Option 'namefont' \renewcommand*{\mkbibnamelast}[1]{% \ifboolexpr{ bool {bbx:oldauthor} and - bool {oldauthor} - and - ( test {\ifcurrentname{author}} + ( ( bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) ) or - ( test {\ifcurrentname{labelname}} + ( bool {oldbookauthor} and - not test {\ifnameundef{author}} ) ) + test {\ifcurrentname{bookauthor}} ) ) } {#1} {\bbx@namefont{#1}}} @@ -335,13 +373,17 @@ \ifboolexpr{ bool {bbx:oldauthor} and - bool {oldauthor} - and - ( test {\ifcurrentname{author}} + ( ( bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) ) or - ( test {\ifcurrentname{labelname}} + ( bool {oldbookauthor} and - not test {\ifnameundef{author}} ) ) + test {\ifcurrentname{bookauthor}} ) ) } {#1} {\bbx@firstnamefont{#1}}} @@ -352,13 +394,17 @@ \ifboolexpr{ bool {bbx:oldauthor} and - bool {oldauthor} - and - ( test {\ifcurrentname{author}} + ( ( bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) ) or - ( test {\ifcurrentname{labelname}} + ( bool {oldbookauthor} and - not test {\ifnameundef{author}} ) ) + test {\ifcurrentname{bookauthor}} ) ) } {#1} {\ifuseprefix @@ -370,22 +416,26 @@ \ifboolexpr{ bool {bbx:oldauthor} and - bool {oldauthor} - and - ( test {\ifcurrentname{author}} + ( ( bool {oldauthor} + and + ( test {\ifcurrentname{author}} + or + ( test {\ifcurrentname{labelname}} + and + not test {\ifnameundef{author}} ) ) ) or - ( test {\ifcurrentname{labelname}} + ( bool {oldbookauthor} and - not test {\ifnameundef{author}} ) ) + test {\ifcurrentname{bookauthor}} ) ) } {#1} {\bbx@firstnamefont{#1}}} %% \mkidem: % wenn im Feld 'options' 'oldauthor=true' oder 'oldauthor' steht, -% werden keine Kapitälchen o.ä. bei Wiederholungszitaten ('Ders.') gesetzt +% werden keine Kapitälchen o.ä. bei Wiederholungszitaten ('Ders.') gesetzt % ansonsten Formatierung entsprechend der Option 'idemfont', -% falls diese nicht vorhanden ist, wird der Wert von 'namefont' übernommen +% falls diese nicht vorhanden ist, wird der Wert von 'namefont' übernommen \newcommand*{\mkidem}[1]{% \ifboolexpr{ bool {bbx:oldauthor} @@ -430,7 +480,7 @@ %% Ort, Verlag, Jahr: %% - mit 'origfields=true' werden origlocation, origpublisher -%% und origyear gesetzt, der Rest als 'reprint' angehängt +%% und origyear gesetzt, der Rest als 'reprint' angehängt %% - der Verlag ist optional (nopublisher=true|false) %% - die Edition kann hochgestellt werden (edsuper=true|false) \newbibmacro*{origdate}{\printorigdate} @@ -535,7 +585,7 @@ {\printfield{edition}% \newunit}} -%% Hilfsmakro für Option editorstring +%% Hilfsmakro für Option editorstring \newbibmacro*{editorstringpunct}{% \ifbool{bbx:editorstring} {\addspace} @@ -545,11 +595,11 @@ \renewbibmacro*{editorstrg}{% \iffieldundef{editortype} {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} - {\bbx@editorstring{\bibstring{editors}}} - {\bbx@editorstring{\bibstring{editor}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{editors}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{editor}}}}} {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} - {\bbx@editorstring{\bibstring{\thefield{editortype}s}}} - {\bbx@editorstring{\bibstring{\thefield{editortype}}}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{\thefield{editortype}s}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{\thefield{editortype}}}}}}} \renewbibmacro*{editor+othersstrg}{% \iffieldundef{editortype} @@ -582,15 +632,15 @@ \appto\abx@tempb{\clearname{afterword}}} {}}}% \ifbibxstring{\abx@tempa} - {\bbx@editorstring{\bibstring{\abx@tempa}}% + {\bbx@edstringfont{\bbx@editorstring{\bibstring{\abx@tempa}}}% \abx@tempb} {\usebibmacro{editorstrg}}} -%% Übersetzer ('Übers.') je nach Option editorstring +%% Ãœbersetzer ('Ãœbers.') je nach Option editorstring \renewbibmacro*{translatorstrg}{% \ifthenelse{\value{translator}>1\OR\ifandothers{translator}} - {\bbx@editorstring{\bibstring{translators}}} - {\bbx@editorstring{\bibstring{translator}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{translators}}}} + {\bbx@edstringfont{\bbx@editorstring{\bibstring{translator}}}}} \renewbibmacro*{translator+othersstrg}{% \ifthenelse{\value{translator}>1\OR\ifandothers{translator}} @@ -613,7 +663,7 @@ {\appto\abx@tempa{af}% \clearname{afterword}} {}}}% - \bbx@editorstring{\bibstring{\abx@tempa}}} + \bbx@edstringfont{\bbx@editorstring{\bibstring{\abx@tempa}}}} %% Option 'editorstring=brackets|parens|normal' %% Option 'idembib=true|false' @@ -821,7 +871,7 @@ {}} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -%%%%% Makros aus authortitle.bbx (unverändert) %%%%% +%%%%% Makros aus authortitle.bbx (unverändert) %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% \setlength{\bibitemsep}{0pt} 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 1bb8f04ecb5..16f962ff196 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,13 +1,13 @@ -% footnote-dw.bbx, Dominik Waßenhoven 2011 +% footnote-dw.bbx, Dominik Waßenhoven 2011 -\ProvidesFile{footnote-dw.bbx}[2011/02/06 v1.3c biblatex bibliography style] +\ProvidesFile{footnote-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style] -\@ifpackagelater{biblatex}{2011/01/08} +\@ifpackagelater{biblatex}{2011/07/29} {} {\PackageError{biblatex} {Outdated 'biblatex' package} {The version of the 'footnote-dw' style you are using\MessageBreak - requires biblatex v1.1a or later.\MessageBreak + requires biblatex v1.6 or later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now.}% \endinput} 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 452941a469a..462231a704f 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 +% standard-dw.bbx, Dominik Waßenhoven 2011 -\ProvidesFile{standard-dw.bbx}[2011/02/06 v1.3c biblatex bibliography style] +\ProvidesFile{standard-dw.bbx}[2011/11/20 v1.4 biblatex bibliography style] \RequireBibliographyStyle{standard} @@ -11,21 +11,28 @@ \newbool{bbx:journumafteryear} \newbool{bbx:journumdate} \newbool{bbx:seriesafteryear} +\newbool{bbx:seriesinparens} \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:xref}% soll xref überhaupt verwendet werden? \newbool{xrefidem} +\newtoggle{listofshorthands}% sind wir in der List of Shorthands? + % Schalter zum ein-/ausblenden bestimmter Felder \newbool{bbx:pagetotal} +% Längen für Shorthand \newlength{\bbx@shorthandwidth} \newlength{\shorthandsep} +% Hilfsbefehl für @review +\newcommand*{\bbx@reviewparent} + \DeclareEntryOption{acronym}[true]{% \csuse{bool#1}{bbx:acronym}} @@ -67,6 +74,15 @@ {\global\booltrue{bbx:seriesafteryear}} {\global\boolfalse{bbx:seriesafteryear}}} +% Option seriesformat=standard|parens +\newcommand{\bbx@option@seriesformat}{} +\DeclareBibliographyOption{seriesformat}{% + \renewcommand{\bbx@option@seriesformat}{#1}} +\AtBeginDocument{% + \ifdefstring{\bbx@option@seriesformat}{parens} + {\global\booltrue{bbx:seriesinparens}} + {\global\boolfalse{bbx:seriesinparens}}} + \ExecuteBibliographyOptions{ doi=false, eprint=false, @@ -74,6 +90,7 @@ journalnumber=standard, pagetotal=false, series=standard, + seriesformat=parens, shorthandinbib=false, terselos=true, xref=false @@ -106,47 +123,54 @@ %% -> vor 'number' (z.B. ', Bd. ') \newcommand*{\sernumstring}{\addspace} -%% Reihe in Klammern +%% Reihe in Klammern (Option seriesformat) \renewbibmacro*{series+number}{% \iffieldundef{series}% {} - {\printtext[parens]{% + {\ifbool{bbx:seriesinparens} + {\printtext[parens]{% \seriespunct% \printfield{series}% \setunit*{\sernumstring}% - \printfield{number}% - \newunit}}} + \printfield{number}}% + \newunit} + {\setunit{\newunitpunct\seriespunct}% + \printfield{series}% + \setunit*{\sernumstring}% + \printfield{number}% + \newunit}}} -%% Kürzere Ausgabe der List of Shorthands +%% Kürzere Ausgabe der List of Shorthands \newbibmacro*{terselos}{% -\ifbool{bbx:terselos} - {\ifnameundef{labelname} - {} - {\ifnameundef{author} - {\printnames{editor}% - \usebibmacro{editorstringpunct}% - \usebibmacro{editorstrg}} - {\printnames{author}}% - \setunit{\labelnamepunct}}% - \iffieldundef{booktitle} - {\usebibmacro{maintitle+title}} - {\usebibmacro{title}% - \newunit\newblock - \usebibmacro{in:}% - \usebibmacro{maintitle+booktitle}}% - \finentry} - {\usedriver - {\DeclareNameAlias{sortname}{default}} - {\thefield{entrytype}}% - \finentry}} + \ifbool{bbx:terselos} + {\ifnameundef{labelname} + {} + {\ifnameundef{author} + {\printnames{editor}% + \usebibmacro{editorstringpunct}% + \usebibmacro{editorstrg}} + {\printnames{author}}% + \setunit{\labelnamepunct}}% + \iffieldundef{booktitle} + {\usebibmacro{maintitle+title}} + {\usebibmacro{title}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{maintitle+booktitle}}% + \finentry} + {\usedriver + {\DeclareNameAlias{sortname}{default}} + {\thefield{entrytype}}% + \finentry}} \DeclareBibliographyDriver{shorthands}{% + \toggletrue{listofshorthands}% \usebibmacro{terselos}} %% Zeichensetzung nach dem Shorthand-Label \newcommand{\shorthandpunct}{} -%% List of Shorthands: Länge der Labels einstellbar +%% List of Shorthands: Länge der Labels einstellbar \AtBeginDocument{% \ifbool{bbx:shorthandwidthbool} {\defbibenvironment{shorthands} @@ -175,16 +199,20 @@ {\endlist} {\item}}} -%% Option »shorthandinbib«: +%% Option »shorthandinbib«: %% Shorthands in der Bibliographie ausgeben -%% außerdem für Option »xref«: -%% Autoren in Liste schreiben für späteren Test xrefnamecheck +%% 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 + \ifboolexpr{ + test {\ifcitation} + or + togl {listofshorthands} + } + {}% im Zitat und der langen List of Shorthands sollen shorthands nicht ausgegeben werden {\ifbool{bbx:shorthandinbib} {\iffieldundef{shorthand} {} @@ -300,7 +328,7 @@ {}} %% Tests werden bei 'xref=true' in @book, @collection, -%% @proceedings und @reference ausgeführt +%% @proceedings und @reference ausgeführt \AtDataInput[book]{% \usebibmacro{xrefvolumecheck}% \usebibmacro{xrefcitedascheck}} @@ -380,7 +408,7 @@ {\printfield{shortjournal}}} {\usebibmacro{journal:normal}}} -\newbibmacro*{journal:normal}{% vollständige, 'normale' Ausgabe eines Zeitschriftentitels +\newbibmacro*{journal:normal}{% vollständige, 'normale' Ausgabe eines Zeitschriftentitels \iffieldundef{journaltitle} {} {\printtext[journaltitle]{% @@ -552,9 +580,17 @@ {\bibstring{backrefpages}\ppspace} {\bibstring{backrefpage}\ppspace}% \printlist[pageref][-\value{listtotal}]{pageref}}}} + +\renewbibmacro*{note+pages}{% + \printfield{note}% + \ifbool{cbx:rpcited} + {} + {\setunit{\bibpagespunct}% + \printfield{pages}}% + \newunit} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -%%%%% Bibmacros für Code, der im Bibliography %%%%% +%%%%% Bibmacros für Code, der im Bibliography %%%%% %%%%% Driver aufgerufen wird, wenn KEIN xref %%%%% %%%%% vorhanden ist. %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% @@ -1305,7 +1341,7 @@ \usebibmacro{begentry}% \ifbool{cbx:idemfull} {} - {\usebibmacro{author/translator+others}% + {\usebibmacro{author}% \ifnameundef{labelname} {} {\setunit{\labelnamepunct}\newblock}}% @@ -1321,7 +1357,8 @@ \newunit\newblock \printfield{version}} {% Code, wenn xref vorhanden - \printtext[review]{\bbx@xref{\thefield{xref}}}}% + \savefield{xref}{\bbx@reviewparent}% + \printtext[review]{\bbx@review{\thefield{xref}}}}% \newunit\newblock \usebibmacro{in:}% \usebibmacro{journal+issuetitle}% @@ -1407,7 +1444,7 @@ %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% Die folgenden 'xref'-BibliographyDriver sind %%%%% -%%%%% nötig, damit bei Erstzitaten mit xref die %%%%% +%%%%% nötig, damit bei Erstzitaten mit xref die %%%%% %%%%% Option useeditor=true beachtet wird. %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% @@ -1556,7 +1593,7 @@ %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% Die folgenden 'xrefidem'-BibliographyDriver %%%%% -%%%%% sind nötig damit bei Erstzitaten mit demselben %%%%% +%%%%% sind nötig damit bei Erstzitaten mit demselben %%%%% %%%%% Autor und xref ein Vollzitat erfolgen kann, %%%%% %%%%% ohne den Autor des referenzierten Werkes (der %%%%% %%%%% durch 'idem' ersetzt wird) auszugeben. %%%%% @@ -1746,6 +1783,20 @@ Thus, 'omiteditor' is ignored}} {}}% {}% + \ifdefstring{\bbx@option@series}{standard} + {} + {\ifdefstring{\bbx@option@series}{afteryear} + {} + {\blxdw@warning@noline{% + Unknown value for option 'series'.\MessageBreak + Option 'series=standard' used instead}}}% + \ifdefstring{\bbx@option@seriesformat}{standard} + {} + {\ifdefstring{\bbx@option@seriesformat}{parens} + {} + {\blxdw@warning@noline{% + Unknown value for option 'seriesformat'.\MessageBreak + Option 'seriesformat=standard' used instead}}}% } \endinput 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 8b539f59755..2147945d171 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 2011 +% authortitle-dw.cbx, Dominik Waßenhoven 2011 -\ProvidesFile{authortitle-dw.cbx}[2011/02/06 v1.3c biblatex citation style] +\ProvidesFile{authortitle-dw.cbx}[2011/11/20 v1.4 biblatex citation style] \RequireCitationStyle{standard-dw} @@ -141,21 +141,10 @@ \AtBeginBibliography{% \renewbibmacro*{cite:xref}{% - \iffieldundef{shorthand}% - {\ifuseeditor - {\ifnameundef{labelname} - {} - {\ifbool{xrefidem}% - {\ifbool{bbx:edbyidem} - {\midsentence% - \usebibmacro{cite:idem}}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}}} - {}% - \iffieldundef{shorttitle}% - {\printfield{title}}% + \iffieldundef{shorthand} + {\usebibmacro{cite:editor}% + \iffieldundef{shorttitle} + {\printfield{title}} {\printfield{shorttitle}}% \ifuseeditor {} @@ -163,17 +152,17 @@ {} {\ifnameundef{editor} {} - {\ifbool{xrefidem}% + {\ifbool{xrefidem} {\ifbool{bbx:edbyidem} - {\newunit + {\newunit% \bibstring{byeditor}% \setunit{\addspace}% \bibstring[\mkidem]{idemdat\thefield{gender}}} - {\newunit + {\newunit% \usebibmacro{byeditor}}}% - {\newunit - \usebibmacro{byeditor}}}}}}% - {\printtext[bibhyperref]{\printfield{shorthand}}}}} + {\newunit% + \usebibmacro{byeditor}}}}}} + {\printtext[bibhyperref]{\printfield{shorthand}}}}} \newbibmacro*{cite:fullxref}{% \usebibmacro{cite:full:citepages}% @@ -199,7 +188,8 @@ \DeclareCiteCommand{\fullcite} {\usebibmacro{prenote}% - \usebibmacro{cite:full:citepages}} + \usebibmacro{cite:full:citepages}% + \booltrue{cbx:fullcite}} {\usedriver {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} @@ -209,7 +199,8 @@ \DeclareCiteCommand{\footfullcite}[\mkbibfootnote] {\bibsentence \usebibmacro{prenote}% - \usebibmacro{cite:full:citepages}} + \usebibmacro{cite:full:citepages}% + \booltrue{cbx:fullcite}} {\usedriver {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} @@ -226,13 +217,13 @@ \newbibmacro*{cite:title}{% \ifsingletitle - {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird + {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird {\ifboolexpr{ - test {\iffieldequalstr{entrytype}{review}} + test {\ifentrytype{review}} and not test {\iffieldundef{xref}} } - {\printtext[review]{\bbx@xref{\thefield{xref}}}} + {\printtext[review]{\bbx@review{\thefield{xref}}}} {\printtext[bibhyperref]{% \printfield[citetitle]{labeltitle}}}}} @@ -279,7 +270,7 @@ {\usebibmacro{textcite:postnote}} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -%%%%% Unverändert übernommen aus authortitle-ibid.cbx %%%%% +%%%%% Unverändert übernommen aus authortitle-ibid.cbx %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% \newbool{cbx:parens} @@ -320,4 +311,11 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite: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 4bf04a27fd0..cd6cd7c6b8d 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,19 @@ -% footnote-dw.cbx, Dominik Waßenhoven 2010 +% footnote-dw.cbx, Dominik Waßenhoven 2011 -\ProvidesFile{footnote-dw.cbx}[2011/02/06 v1.3c biblatex citation style] +\ProvidesFile{footnote-dw.cbx}[2011/11/20 v1.4 biblatex citation style] \RequireCitationStyle{standard-dw} \newbool{cbx:pageref} +\newbool{cbx:review} +\newbool{cbx:textcitefull} \ExecuteBibliographyOptions{ - loccittracker=true,% für die Option 'ibidpage' + 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 +% Befehle zum Verpacken der Zitate in Fußnoten \newrobustcmd{\mkfootnotecite}[1]{% \iffootnote {#1} @@ -20,8 +22,8 @@ \bibsentence#1\addperiod}}} \newbool{cbx:parencitefoot}% wenn parencite innerhalb einer - % Fußnote aufgerufen wird - % (wichtig für seenote) + % Fußnote aufgerufen wird + % (wichtig für seenote) \newrobustcmd{\mkparencite}[1]{% \iffootnote {\booltrue{cbx:parencitefoot}% @@ -33,11 +35,21 @@ \toggletrue{blx@footnote}% \bibsentence#1\addperiod}}} +% Befehl zum Testen, ob in Fußnote (für \textcite) +\newrobustcmd{\footnotecheck}{% + \iffootnote + {\booltrue{cbx:parencitefoot}} + {\boolfalse{cbx:parencitefoot}}} + \newbibmacro*{cite}{% \usebibmacro{cite:citepages}% \global\boolfalse{cbx:loccit}% \bibhypertarget{cite\the\value{instcount}}{% - \ifciteseen + \ifboolexpr{ + test {\ifciteseen} + and not + bool {cbx:textcitefull} + } {\iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}% @@ -90,15 +102,15 @@ \newbibmacro*{cite:title}{% \ifboolexpr{ - test {\iffieldequalstr{entrytype}{review}} + test {\ifentrytype{review}} and not test {\iffieldundef{xref}} } - {\booltrue{cbx:review}% für cite:seenote (damit das rezensierte Werk keinen Verweis bekommt) - \printtext[review]{\bbx@xref{\thefield{xref}}}% - \boolfalse{cbx:review}}% \boolfalse ist nötig, damit @review selbst wieder einen Verweis bekommt + {\booltrue{cbx:review}% für cite:seenote (damit das rezensierte Werk keinen Verweis bekommt) + \printtext[review]{\bbx@review{\thefield{xref}}}% + \boolfalse{cbx:review}}% \boolfalse ist nötig, damit @review selbst wieder einen Verweis bekommt {\ifsingletitle - {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird + {\setunit{}}% Löschen des \nametitledelim, falls kein Titel ausgegeben wird {\printtext[bibhyperlink]{% \printfield[citetitle]{labeltitle}}}}% \ifboolexpr{ @@ -134,23 +146,23 @@ {} {\ifbool{cbx:parencitefoot} {\addspace\mkbibbrackets{% - \bibstring{seenote}\addnbspace%\ref{\thefield{entrykey}}% + \bibstring{seenote}\addnbspace% \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}% \ifbool{cbx:pageref} {\ifsamepage{\the\value{instcount}} {\csuse{cbx@first@\thefield{entrykey}}} {} - {\addcomma\space\bibstring{page}\addnbspace + {\addcomma\space\bibstring{page}\addnbspace% \pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}} {}}} {\addspace\mkbibparens{% - \bibstring{seenote}\addnbspace%\ref{\thefield{entrykey}}% + \bibstring{seenote}\addnbspace% \ref{cbx@\csuse{cbx@first@\thefield{entrykey}}}% \ifbool{cbx:pageref} {\ifsamepage{\the\value{instcount}} {\csuse{cbx@first@\thefield{entrykey}}} {} - {\addcomma\space\bibstring{page}\addnbspace + {\addcomma\space\bibstring{page}\addnbspace% \pageref{cbx@\csuse{cbx@first@\thefield{entrykey}}}}} {}}}}} @@ -203,22 +215,7 @@ \AtBeginBibliography{% \renewbibmacro*{cite:xref}{% \iffieldundef{shorthand}% - {\ifboolexpr{ - test \ifuseeditor - or - test \ifusetranslator - } - {\ifnameundef{labelname} - {} - {\ifbool{xrefidem}% - {\ifbool{bbx:edbyidem} - {\midsentence% - \usebibmacro{cite:xref:idem}}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}}% - {\printnames{labelname}% - \printtext{\labelnamepunct}}}} - {}% + {\usebibmacro{cite:editor}% \iffieldundef{shorttitle}% {\printfield{title}}% {\printfield{shorttitle}}% @@ -266,7 +263,8 @@ \DeclareCiteCommand{\fullcite}[\mkfootnotecite] {\usebibmacro{prenote}% - \usebibmacro{cite:full:citepages}} + \usebibmacro{cite:full:citepages}% + \booltrue{cbx:fullcite}} {\usedriver {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} @@ -276,20 +274,35 @@ \DeclareCiteCommand{\footfullcite}[\mkfootnotecite] {\bibsentence \usebibmacro{prenote}% - \usebibmacro{cite:full:citepages}} + \usebibmacro{cite:full:citepages}% + \booltrue{cbx:fullcite}} {\usedriver {\DeclareNameAlias{sortname}{default}} {\thefield{entrytype}}} {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite}[\footnotecheck\cbx@textcite\footcite] + {\gdef\cbx@savedkeys{}} + {\printnames{labelname}% + \ifciteseen + {\global\boolfalse{cbx:textcitefull}} + {\global\booltrue{cbx:textcitefull}}% + \xappto\cbx@savedkeys{\thefield{entrykey},}} + {\multinamedelim} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite}[2]{% + \def\cbx@savedcites{#1}\ifbool{cbx:parencitefoot}{#2\addspace{\mkbibparens{\cbx@savedcites}}}{#2\cbx@savedcites}} \DeclareMultiCiteCommand{\cites}[\mkfootnotecite]{\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkparencite]{\parencite}{\multicitedelim} \DeclareMultiCiteCommand{\footcites}[\mkfootnotecite]{\footcite}{\multicitedelim} +\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\textcitesdelim} %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% -%%%%% Unverändert aus verbose-trad1 übernommen %%%%% +%%%%% Unverändert aus verbose-trad1 übernommen %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% %%%%% \newbool{cbx:loccit} @@ -318,4 +331,11 @@ \newbibmacro*{cite:ibid:page}{} +\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote] + {\usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {\multicitedelim} + {\usebibmacro{cite: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 9a0652c4c3f..b0375079178 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,16 +1,17 @@ -% standard-dw.cbx, Dominik Waßenhoven 2011 +% standard-dw.cbx, Dominik Waßenhoven 2011 -\ProvidesFile{standard-dw.cbx}[2011/02/06 v1.3c biblatex citation style] +\ProvidesFile{standard-dw.cbx}[2011/11/20 v1.4 biblatex citation style] \newbool{cbx:authauthxref} \newbool{cbx:authedxref} \newbool{cbx:citedas} \newbool{cbx:edstringincitations} \newbool{cbx:firstfullname} +\newbool{cbx:fullcite}% Test, ob fullcite ausgeführt wurde (wichtig für @review) \newbool{cbx:idemfull} \newbool{cbx:noidem} \newbool{cbx:omiteditor} -\newbool{cbx:review} +\newbool{cbx:rpcited}% wurde der parent des @review schon zitiert? \newbool{cbx:xrefparent:firstcite} \newbool{cbx:shorthandibid} @@ -80,19 +81,19 @@ \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}} - and - bool {bbx:pagetotal} - ) - ) + togl {cbx:fullcite} + and + test {\iffieldpages{postnote}} + and + test {\ifnumequal{\value{citecount}}{\value{citetotal}}} + and + ( not test {\iffieldundef{pages}} + or + ( not test {\iffieldundef{pagetotal}} + and + bool {bbx:pagetotal} + ) + ) } {\usebibmacro{cite:postnote:pages}} {\usebibmacro{cite:postnote:ibidpage}}} @@ -131,14 +132,14 @@ \csxdef{cbx:lastcite@\thefield{entrykey}}{\the\value{instcount}}% \global\boolfalse{cbx:noidem}} -% Ausschalten von annotation und library für Zitate im Text +% Ausschalten von annotation und library für Zitate im Text \AtEveryCite{% \boolfalse{bbx:annotation}% \boolfalse{bbx:library}% } %% Doppelpunkt nach Autoren/Editoren -%% aus Kompatibilitätsgründen zu früheren Versionen wird +%% aus Kompatibilitätsgründen zu früheren Versionen wird %% \citenamepunct verwendet \newcommand*{\citenamepunct}{\addcolon\space} \renewcommand*{\nametitledelim}{\citenamepunct} @@ -150,7 +151,7 @@ \newcommand*{\citerevsdnamedelim}{} \newcommand*{\citemultinamedelim}{\slash} \newcommand*{\citefinalnamedelim}{\slash} -\AtEveryCite{% +\AtBeginDocument{% \let\revsdnamedelim\citerevsdnamedelim \let\multinamedelim\citemultinamedelim \let\finalnamedelim\citefinalnamedelim @@ -161,6 +162,9 @@ \let\citefinalnamedelim\bibfinalnamedelim } +%% Textcite delimiter +\newcommand*{\textcitesdelim}{\addspace\bibstring{and}\space} + %% Titelformate in Zitaten \DeclareFieldFormat*{citetitle}{#1} @@ -249,13 +253,13 @@ \providecommand*{\mkibid}[1]{% \bbx@ibidemfont{#1}} -%% pages (wichtig für xref) +%% pages (wichtig für xref) \newbibmacro*{pages}{% \setunit{\bibpagespunct}% \printfield{pages}} %% in manchen Literaturverweisen (wenn nicht fullcite) -%% müssen statt der vollen Namen (Format [byeditor]) +%% müssen statt der vollen Namen (Format [byeditor]) %% nur die Nachnamen ausgegeben werden (Format [labelname]) \newbibmacro*{cite:byeditor}{% \ifnameundef{editor} @@ -314,7 +318,7 @@ {\usebibmacro{postnote}}} %% Test, ob author und editor bei xref identisch sind -%% (für xref=true, useeditor=false oder usetranslator=false, +%% (für xref=true, useeditor=false oder usetranslator=false, %% edbyidem=true) \newbibmacro*{authedxrefcheck}{% \iffieldundef{xref} @@ -333,8 +337,8 @@ {\booltrue{cbx:authedxref}} {\boolfalse{cbx:authedxref}}}} -%% Test, author des @inbook und author des @book) bei xref -%% identisch sind (für xref=true, edbyidem=true); nötig, +%% Test, ob author des @inbook und author des @book bei xref +%% identisch sind (für xref=true, edbyidem=true); nötig, %% damit der Herausgeber nicht durch idem ersetzt wird \newbibmacro*{authauthxrefcheck}{% \iffieldundef{xref} @@ -348,11 +352,26 @@ {\booltrue{cbx:authauthxref}} {\boolfalse{cbx:authauthxref}}}} +%% für @review +\DeclareCiteCommand{\bbx@review} + {} + {\usebibmacro{citeindex}% + \ifentryseen{\bbx@reviewparent} + {\global\booltrue{cbx:rpcited}} + {\global\boolfalse{cbx:rpcited}}% + \ifbool{cbx:fullcite} + {\usedriver + {\DeclareNameAlias{sortname}{default}} + {\thefield{entrytype}}} + {\usebibmacro{cite}}} + {} + {} + %% xref \DeclareCiteCommand{\bbx@xref} - {}% - {\usebibmacro{cite:xref}}% - {}% - {}% + {} + {\usebibmacro{cite:xref}} + {} + {} \endinput 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 33127f0bc76..4e26c9c1578 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,10 +1,18 @@ -% english-dw.lbx, Dominik Waßenhoven 2010 +% english-dw.lbx, Dominik Waßenhoven 2011 -\ProvidesFile{english-dw.lbx}[2011/02/06 v1.3c biblatex localization file] +\ProvidesFile{english-dw.lbx}[2011/11/20 v1.4 biblatex localization file] -\NewBibliographyString{idemdat,idemdatsf,idemdatsm,% - idemdatsn,idemdatpf,idemdatpm,idemdatpn,idemdatpp,% - inrefstring,review} +\NewBibliographyString{% + idemdat,% + idemdatsf,% + idemdatsm,% + idemdatsn,% + idemdatpf,% + idemdatpm,% + idemdatpn,% + idemdatpp,% + inrefstring,% + review} \InheritBibliographyExtras{english} 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 c57df0387f7..106eea7ac72 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,12 +1,20 @@ -% german-dw.lbx, Dominik Waßenhoven 2010 +% german-dw.lbx, Dominik Waßenhoven 2011 -\ProvidesFile{german-dw.lbx}[2011/02/06 v1.3c biblatex localization file] +\ProvidesFile{german-dw.lbx}[2011/11/20 v1.4 biblatex localization file] \InheritBibliographyExtras{german} -\NewBibliographyString{idemdat,idemdatsf,idemdatsm,% - idemdatsn,idemdatpf,idemdatpm,idemdatpn,idemdatpp,% - inrefstring,review} +\NewBibliographyString{% + idemdat,% + idemdatsf,% + idemdatsm,% + idemdatsn,% + idemdatpf,% + idemdatpm,% + idemdatpn,% + idemdatpp,% + inrefstring,% + review} \DeclareBibliographyStrings{% inherit = {german}, |