From 9c45fe88cb4094081b2b1243cd17bcc43439c041 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 14 Jul 2012 23:29:42 +0000 Subject: biblatex-apa (10jul12) git-svn-id: svn://tug.org/texlive/trunk@27057 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/biblatex-apa/README | 23 +- .../biblatex-apa/biblatex-apa-test-citations.bib | 17 + .../biblatex-apa/biblatex-apa-test-references.bib | 209 +++++----- .../doc/latex/biblatex-apa/biblatex-apa-test.pdf | Bin 97382 -> 100393 bytes .../doc/latex/biblatex-apa/biblatex-apa-test.tex | 48 ++- .../doc/latex/biblatex-apa/biblatex-apa.pdf | Bin 73998 -> 74095 bytes .../doc/latex/biblatex-apa/biblatex-apa.tex | 96 ++--- .../tex/latex/biblatex-apa/american-apa.lbx | 19 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 422 +++++++++++++++------ Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 88 +++-- Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx | 143 +++++++ .../tex/latex/biblatex-apa/brazilian-apa.lbx | 13 +- .../tex/latex/biblatex-apa/british-apa.lbx | 13 +- .../tex/latex/biblatex-apa/dutch-apa.lbx | 13 +- .../tex/latex/biblatex-apa/french-apa.lbx | 13 +- .../tex/latex/biblatex-apa/german-apa.lbx | 13 +- .../tex/latex/biblatex-apa/greek-apa.lbx | 13 +- .../tex/latex/biblatex-apa/italian-apa.lbx | 13 +- .../tex/latex/biblatex-apa/ngerman-apa.lbx | 13 +- .../tex/latex/biblatex-apa/spanish-apa.lbx | 13 +- 20 files changed, 857 insertions(+), 325 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index ecd1a4adf83..d9074de689d 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/README +++ b/Master/texmf-dist/doc/latex/biblatex-apa/README @@ -1,4 +1,4 @@ -Version 4.7 +Version 5.0 Permission is granted to copy, distribute and/or modify this software under the terms of the LaTeX Project Public License, version @@ -16,17 +16,16 @@ In this document and in the code, the specific APA requirements are referred to by the section and (if appropriate) the example number of the APA Style Guide 6th Edition). -You will need to be using csquotes >= 4.3 and biblatex >= 1.4. -The biber backend for biblatex >= 0.9.2 is also strongly recommended and some -functionality is unavailable without this (see docs). If you want -to take advantage of the biblatex \DeclareQuotePunctuation facility -to enforce the APA required "American punctuation", you should use the -babel package with the "american" option (see biblatex manual -section |3.9.1|). You can of course use other languages but in such cases, -to adhere to APA "American" punctuation rules (following commas moved -inside closing quotes etc.), then you should set up -\DeclareQuotePunctuation yourself as per section 4.7.5 of the -biblatex manual. +You will need to be using csquotes >= 4.3 and biblatex >= 2.0 The biber +backend for biblatex >= 1.0 is also required. This style will not work +correctly if using bibtex as the backend for biblatex. If you want to take +advantage of the biblatex \DeclareQuotePunctuation facility to enforce the +APA required "American punctuation", you should use the babel package with +the "american" option (see biblatex manual section |3.9.1|). You can of +course use other languages but in such cases, to adhere to APA "American" +punctuation rules (following commas moved inside closing quotes etc.), then +you should set up \DeclareQuotePunctuation yourself as per section 4.7.5 of +the biblatex manual. You can also use this with apa.cls version 1.3.4 or greater by using the "noapacite" class option to that class package (which prevents it from diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib index 6891dc775e1..eacc8427a2a 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib @@ -365,3 +365,20 @@ TITLE = {Looking at Spiders}, YEAR = {2010} } + +% Testing "with" +@BOOK{with1, + AUTHOR = {James Jaunty and Russell Rendition}, + WITH = {Alan Also}, + TITLE = {Look for Lost Limps}, + YEAR = {2000} +} + +% Testing citeauthor +@BOOK{ca1, + AUTHOR = {Brian Blameless and Colin Careless and Derek Delusional}, + TITLE = {Three Modern Men}, + YEAR = {2001} +} + + diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib index 53bfb6f55a0..3c8b9c97e14 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib @@ -15,7 +15,7 @@ % (APA 7.01 Example 2) @ARTICLE{7.01:2, AUTHOR = {D. G. Gilbert and J. F. McClernon and N. E. Rabinovich and C. Sugai and L. C. Plath and G. Asgaard and D. Dickinson and N. Botros}, - TITLE = {Effects of Quitting Smoking and {EEG} Activation and Attention Last for More Than 31 Days and are More Severe With Stress, Depedence, {DRD2 A1} Allele, and Depressive Traits}, + TITLE = {Effects of Quitting Smoking and {EEG} Activation and Attention Last for More Than 31 Days and are More Severe With Stress, Dependence, {DRD2 A1} Allele, and Depressive Traits}, JOURNALTITLE = {Nicotine and Tobacco Research}, VOLUME = {6}, PAGES = {249--267}, @@ -37,7 +37,7 @@ @ARTICLE{7.01:3b, AUTHOR = {M. A. Light and I. H. Light}, - TITLE = {The Geographic Expansion of Mexican Immigration in the United States and its Implications for Local Law Enforcement}, + TITLE = {The Geographic Expansion of {M}exican Immigration in the {U}nited {S}tates and its Implications for Local Law Enforcement}, YEAR = {2008}, JOURNALTITLE = {Law Enforcement Executive Forum Journal}, VOLUME = {8}, @@ -49,7 +49,7 @@ @ARTICLE{7.01:4, AUTHOR = {P. Guimard and A. Florin}, ORIGTITLE = {Les évaluations des enseignants en grande section de maternelle sont-elles prédictives des difficultés de lecture au cours préparatoire?}, - TITLE = {Are Teacher Rating in Kindergarten Predictive of Reading Dificulties in First Grade?}, + TITLE = {Are Teacher Ratings in Kindergarten Predictive of Reading Dificulties in First Grade?}, JOURNALTITLE = {Approche Neuropsychologique des Apprentissages chez l'Enfant}, VOLUME = {19}, PAGES = {5--17}, @@ -113,25 +113,25 @@ } % (APA 7.01 Example 10) -% Use ENTRYSUBTYPE "newspaper" for newspaper articles so that the pages specification +% Use entrytype "NEWSARTICLE" for newspaper articles so that the pages specification % is formatted correctly (needs "p/pp" whereas normal articles don't) +% Use the "NEWSPAPER" field for the title of the paper, otherwise this entrytype +% is similar to ARTICLE % Numeral format is redefined to allow page number starting in letters % Discontinuous pages are ok -@ARTICLE{7.01:10, - ENTRYSUBTYPE = {newspaper}, +@NEWSARTICLE{7.01:10, AUTHOR = {J. Schwartz}, TITLE = {Obesity Affects Economic, Social Status}, - JOURNALTITLE = {The Washington Post}, + NEWSPAPER = {The Washington Post}, PAGES = {A1, A4}, DATE = {1993-09-30}, } % (APA 7.01 Example 11) -@ARTICLE{7.01:11, - ENTRYSUBTYPE = {newspaper}, +@NEWSARTICLE{7.01:11, AUTHOR = {J. E. Brody}, TITLE = {Mental Reserves Keep Brain Agile}, - JOURNALTITLE = {The New York Times}, + NEWSPAPER = {The New York Times}, DATE = {2007-12-11}, URL = {http://www.nytimes.com} } @@ -174,7 +174,7 @@ % Monographs can be specified as articles with appropriate NUMBER fields @ARTICLE{7.01:13a, AUTHOR = {D. C. Ganster and J. Schaubroeck and W. E. Sime and B. T. Mayes}, - TITLE = {The Nomological Validity of the Type A Personality Among Employed Adults}, + TITLE = {The Nomological Validity of the {T}ype {A} Personality Among Employed Adults}, TITLEADDON = {Monograph}, JOURNALTITLE = {Journal of Applied Psychology}, VOLUME = {76}, @@ -238,22 +238,20 @@ YEAR = {1991} } -% Note use of special USERB field value to specify that the URL is for the abstract +% Note use of ABSTRACTURL field value to specify that the URL is for the abstract % and so the entry gets "Abstract retrieved from" instead of just "retrieved from" -% USERB must equal "urlisabstract" to do this @ARTICLE{7.01:16b, - USERB = {urlisabstract}, AUTHOR = {S. R. Lassen and M. M. Steele and W. Sailor}, TITLE = {The Relationship of School-wide Positive Behavour Support to Academic Achievement in an Urban Middle School}, JOURNALTITLE = {Psychology in the Schools}, VOLUME = {43}, PAGES = {701--712}, YEAR = {2006}, - URL = {http://www.interscience.wiley.com} + ABSTRACTURL = {http://www.interscience.wiley.com} } % (APA 7.01 Example 17) -% It's a bit clumsy but such extra information can be included in the NOTE field. +% Such unstructured extra information can be included in the NOTE field. % If the abstract/article was retreived from a standard online URI, things are little % better defined - see examples 7.01:16*). @ARTICLE{7.01:17, @@ -299,7 +297,7 @@ % (APA 7.02 Example 20) @BOOK{7.02:20, AUTHOR = {E. O'Keefe}, - TITLE = {Egoism \& the Crisis in Western Values}, + TITLE = {Egoism \& the Crisis in {W}estern Values}, URL = {http://www.onlineoriginals.com/showitem.asp?itemID=135} } @@ -377,13 +375,23 @@ LOCATION = {Hillsdale, NJ}, PUBLISHER = {Erlbaum}, YEAR = {1988}, - ADDENDUM = {Reprinted from Manual of child psychology, pp. 703--732, by P. H. Mussen, Ed., 1970, New York: Wiley} + RELATED = {mcppiaget}, + RELATEDTYPE = {reprintfrom} +} + +@INCOLLECTION{mcppiaget, + EDITOR = {P. H. Mussen}, + TITLE = {Manual of Child Psychology}, + DATE = {1970}, + LOCATION = {New York, NY}, + PUBLISHER = {Wiley}, + PAGES = {703--732} } % (APA 7.02 Example 27) @BOOK{7.02:27, EDITOR = {G. R. VandenBos}, - TITLE = {APA Dictionary of Psychology}, + TITLE = {{APA} Dictionary of Psychology}, LOCATION = {Washington, DC}, PUBLISHER = {American Psychological Association}, YEAR = {2007}, @@ -440,11 +448,11 @@ AUTHOR = {{American Psychological Association, Task Force on the Sexualization of Girls}}, TITLE = {Report of the {APA} {T}ask {F}orce on the {S}exualization of {G}irls}, YEAR = {2007}, - URL = {http://www.apa.org/pi/wpo/sexualizaion.html} + URL = {http://www.apa.org/pi/wpo/sexualization.html} } % (APA 7.03 Example 33) -% Use ORGANIZATION to introduce website address defaults to "Retreived from" +% Use URLDESCRIPTION to introduce website address; defaults to just "Retreived from" % if not present @REPORT{7.03:33, AUTHOR = {S. S. A. Kessy and F. M. Urio}, @@ -452,12 +460,11 @@ TYPE = {Research Report}, NUMBER = {06.3}, YEAR = {2006}, - ORGANIZATION = {Poverty Alleviation website}, + URLDESCRIPTION = {Poverty Alleviation website}, URL = {http://www.repoa.or.tz/documents_storage/Publications/Reports/06.3_Kessey_and_Urio.pdf} } % (APA 7.03 Example 34) -% Use the ORGANIZATION field to describe the URL % This example is an anomaly as it doesnt' have "No." before the report number. % This style does this consistently for all reports with numbers @REPORT{7.03:34, @@ -467,7 +474,7 @@ TYPE = {CIERA Report}, NUMBER = {3-025}, YEAR = {2002}, - ORGANIZATION = {University of Michigan, Center for Improvement of Early Reading Achievement website}, + URLDESCRIPTION = {University of Michigan, Center for Improvement of Early Reading Achievement website}, URL = {http://www.ciera.org/library/reports/inquiry-3/3-025/3-025.pdf} } @@ -483,26 +490,27 @@ } % (APA 7.04 Example 36) +% Note this renders with a period before the LOCATION which is more consistent with other entries @INPROCEEDINGS{7.04:36, AUTHOR = {J. Muelbauer}, TITLE = {Housing, Credit and Consumer Expenditure}, EDITORA = {S. C. Ludvigson}, EDITORATYPE = {chair}, BOOKTITLE = {Housing and Consumer Behaviour}, - EVENTTITLE = {Symposium Conducted at the Meeting of the {F}ederal {R}eserve {B}ank of {K}ansas {C}ity, Jackson Hole, WY}, + EVENTTITLE = {Symposium Conducted at the Meeting of the {F}ederal {R}eserve {B}ank of {K}ansas {C}ity}, + LOCATION = {Jackson Hole, WY}, DATE = {2007-09} } % (APA 7.04 Example 37) % Unpublished conference papers are UNPUBLISHED type @UNPUBLISHED{7.04:37, - USERB = {urlisabstract}, AUTHOR = {S. Liu}, TITLE = {Defending Against Business Crises with the Help of Inteligent Agent Based Early Warning Solutions}, DATE = {2005-05}, LOCATION = {Miami, FL}, NOTE = {Paper presented at the Seventh International Conferene on Enterprise Information Systems}, - URL = {http://www.iceis.org/iceis2005/abstracts_2005.htm} + ABSTRACTURL = {http://www.iceis.org/iceis2005/abstracts_2005.htm} } % (APA 7.04 Example 38) @@ -590,17 +598,16 @@ } % (APA 7.06 Example 45) -% Use ENTRYSUBTYPE to specify the reviewed item -% Use ORIGTITLE to specify the reviewed item title -% Use VERBA to specify the reviewed item original author until BibLaTeX gets a -% ORIGAUTHOR or ORIGTITLEADDON or similar - +% Note how this is handled by the biblatex/biber "related entries" functionality +% We have included the year in the reviewed item for consistency, as per 7.06:46 +% The comma after the reviewed title is ommited for consistency, as per 7.06:48 @REVIEW{7.06:45, AUTHOR = {B. R. Schatz}, TITLE = {Learning By Text or Context?}, - ENTRYSUBTYPE = {Review of the book}, - ORIGTITLE = {The Social Life of Information}, - VERBA = {by J. S. Brown & P. Duguid}, + REVIEWTEXT = {the book}, + RELATED = {brdu}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Review of the book}, JOURNALTITLE = {Science}, VOLUME = {290}, PAGES = {1304}, @@ -608,68 +615,87 @@ DOI = {10.1126/science.290.5495.1304}, } +@BOOK{brdu, + AUTHOR = {John Seely Brown and Paul Duguid}, + TITLE = {The Social Life of Information}, + DATE = {2000}, + PUBLISHER = {Harvard Business School Press} +} + % (APA 7.06 Example 46) +% Note that this example drops the "produced" in the reviewed item. It's not worth +% automating this sort of verb as "by" is perfectly acceptable. @REVIEW{7.06:46, AUTHOR = {A. Axelman and J. L. Shapiro}, TITLE = {Does the Solution Warrant the Problem?}, - ENTRYSUBTYPE = {Review of the {DVD}}, - ORIGTITLE = {Brief Therapy With Adolescents}, - VERBA = {produced by the American Psychological Association, 2007}, + RELATED = {apavid}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Review of the {DVD}}, JOURNALTITLE = {PsycCRITIQUES}, VOLUME = {52}, NUMBER = {51}, DATE = {2007}, - DOI = {10.1037/a0009036}, + DOI = {10.1037/a0009036} +} +@VIDEO{apavid, + AUTHOR = {{the American Psychological Association}}, + TITLE = {Brief Therapy With Adolescents}, + DATE = {2007} } % (APA 7.06 Example 47) +% Again we drop the "produced" as with Example 46 @REVIEW{7.06:47, - ENTRYSUBTYPE = {Review of the video game}, - ORIGTITLE = {BioShock}, - VERBA = {produced by 2K Games, 2007}, + RELATED = {bioshock}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Review of the video game}, URL = {http://www.whattheyplay.com/products/bioshock-for-xbox-360/?fm=3&ob=1&t=0#166}, - } +@SOFTWARE{bioshock, + AUTHOR = {{2K Games}}, + ENTRYSUBTYPE = {Computer Game}, + TITLE = {BioShock}, + DATE = {2007} + } + % (APA 7.06 Example 48) @REVIEW{7.06:48, AUTHOR = {K. S. Wolf}, TITLE = {The Future for {D}eaf Individuals is Not That Bleak}, - ENTRYSUBTYPE = {Peer commentary on the paper}, - ORIGTITLE = {``{D}ecrease of {D}eaf potential in a mainstreamed environment''}, - VERBA = {by K. S. Wolf}, + RELATED = {deaf}, + RELATEDTYPE = {reviewof}, + RELATEDSTRING = {Peer commentary on the paper}, DATE = {2005}, URL = {http://www.personalityresearch.org/papers/hal.htm#wolf} } +@ARTICLE{deaf, + AUTHOR = {K. S. Wolf}, + TITLE = {``{D}ecrease of {D}eaf potential in a mainstreamed environment''}, + JOURNALTITLE = {Some Journal}, + VOLUME = {2}, + NUMBER = {1}, + PAGES = {1--10}, + YEAR = {2003}, +} + % (APA 7.07 Example 49) -% There is no way to format in the required manner without using custom fields currently. -% This makes the .bib file unportable between styles but there is no clean way round this -% until BibTeX is replaced in biblatex. -% Use NAMEA/NAMEATYPE and NAMEB/NAMEBTYPE for the two main credits. Since these are not -% recognised as sorting fields, be sure to specify how you want the entry sorted in the -% References section using the SORTKEY field. -% The default string before URLs is "Retrieved from". Use USERA to override -% "Retrieved". The contents of USERA are a bibstring defined in the lbx so don't -% capitalise or it won't match a localisable string +% We render this with "retrieved from" instead of "available from" as this is arbitrary +% and ugly to parameterise. Forcing this means we can use a localisable string for "retrieved" @VIDEO{7.07:49, ENTRYSUBTYPE = {{DVD}}, - SORTKEY = {American Psychological Association}, - NAMEA = {{American Psychological Association}}, - NAMEATYPE = {Producer}, + PRODUCER = {{American Psychological Association}}, TITLE = {Responding Therapeutically to Patient Expressions of Sexual Attraction}, YEAR = {2000}, - USERA = {available}, URL = {http://www.apa.org/videos/} } % (APA 7.07 Example 50) @AUDIO{7.07:50, ENTRYSUBTYPE = {Audio Podcast}, - SORTKEY = {Van Nuys, D.}, - NAMEA = {D. {Van Nuys}}, - NAMEATYPE = {Producer}, + PRODUCER = {D. {Van Nuys}}, TITLE = {Shrink Rap Radio}, DATE = {2007-12-19}, URL = {http://www.shrinkrapradio.com/} @@ -678,13 +704,9 @@ % (APA 7.07 Example 51) @VIDEO{7.07:51, ENTRYSUBTYPE = {Television series episode}, - SORTKEY = {Egan, D.}, - NAMEA = {D. Egan}, - NAMEATYPE = {Writer}, - NAMEB = {J. Alexander}, - NAMEBTYPE = {Director}, - NAMEC = {D. Shore}, - NAMECTYPE = {Executive producer}, + WRITER = {D. Egan}, + DIRECTOR = {J. Alexander}, + EXECPRODUCER = {D. Shore}, TITLE = {Failure to Communicate}, MAINTITLE = {House}, LOCATION = {New York, NY}, @@ -707,7 +729,6 @@ } % (APA 7.07 Example 53) -% Here, we use the flexible editor fields @MISC{7.07:53, AUTHOR = {{Lewis County Geographic Information Services}}, NAMEADDON = {Cartographer}, @@ -718,13 +739,11 @@ } % (APA 7.08 Example 54) -% Data sets need special formatting of name so we use USERD with "dataset" to specify them -@MISC{7.08:54, - USERD = {dataset}, +@DATA{7.08:54, + ENTRYSUBTYPE = {Data file and code book}, AUTHOR = {{Pew Hispanic Center}}, TITLE = {Changing Channels and Crisscrossing Cultures}, SUBTITLE = {A Survey of {L}atinos on the News Media}, - ENTRYSUBTYPE = {Data file and code book}, YEAR = {2004}, URL = {http://pewhispanic.org/datasets/} } @@ -752,7 +771,7 @@ % (APA 7.08 Example 57) @MISC{7.08:57, TITLE = {{Eyelink II}}, - TITLEADDON = {Apparatus and software}, + ENTRYSUBTYPE = {Apparatus and software}, LOCATION = {Mississauga, Ontario, Canada}, PUBLISHER = {SR Research}, YEAR = {2004}, @@ -773,17 +792,15 @@ AUTHOR = {J. Y. Ting and P. Florsheim and W. Huang}, TITLE = {Mental Health Help-Seeking in Ethnic Minority Populations}, SUBTITLE = {A Theoretical Perspective}, - HOWPUBLISHED = {Unpublished submitted for publication}, + HOWPUBLISHED = {Manuscript submitted for publication}, YEAR = {2008}, } % (APA 7.09 Example 60) -% Have to trick BibTeX into thinking there is a title so you can add a TITLEADDON -@UNPUBLISHED{7.09:60, +@DATA{7.09:60, AUTHOR = {F. Bordi and J. E. LeDoux}, - TITLE = {{}}, - TITLEADDON = {Auditory Response Latencies in Rat Auditory Cortex}, - HOWPUBLISHED = {Unpublished raw data}, + ENTRYSUBTYPE = {Auditory Response Latencies in Rat Auditory Cortex}, + NOTE = {Unpublished raw data}, YEAR = {1993}, } @@ -805,7 +822,6 @@ YEAR = {2007}, } - % (APA 7.09 Example 62) % "eric" is defined as a recognised eprint type in the style and will be formatted as a % localised version of "Retrieved from ERIC database ()" @@ -819,9 +835,6 @@ } % (APA 7.10 Example 63) -% Note that this example is inconsistent in the APA 6th Edition (2nd printing) manual -% with example 7.10:65. They differ in that 7.10:63 has a comma before the location -% and 7.10:65 has a period. I have chosen a period for consistency. @LETTER{7.10:63, AUTHOR = {L. K. Frank}, TITLE = {Letter to {R}obert {M}. {O}gden}, @@ -840,9 +853,8 @@ } % (APA 7.10 Example 65) -% ENTRYSUBTYPE is "collection" for a collection of letters -@LETTER{7.10:65, - ENTRYSUBTYPE = {collection}, +% Entrytype is "LETTERS" (plural) for a collection of letters +@LETTERS{7.10:65, AUTHOR = {G. W. Allport}, TITLE = {Correspondence}, DATE = {1930/1967}, @@ -861,11 +873,11 @@ } % (APA 7.10 Example 67) -% Have to use USERE to specifiy the "known" status of the AUTHOR and/or DATE. -% Defined types are "unkauth" for doubtful AUTHOR, "unkdate" for doubtful date, -% "unkauthdate" for both doubtful. +% Pseudo-boolean fields "DOUBTFULAUTHOR" and "DOUBTFULDATE" to specify doubtful information +% to the drivers. Values should only ever be "true" if present. @UNPUBLISHED{7.10:67, - USERE = {unkauthdate}, + DOUBTFULAUTHOR = {true}, + DOUBTFULDATE = {true}, AUTHOR = {A. Allport}, TITLE = {Marion {T}aylor Today---By the Biographer}, YEAR = {1937}, @@ -905,10 +917,11 @@ } % (APA 7.10 Example 71) -@MISC{7.10:71, +% If no normal paper citation, use ENTRYSUBTYPE to say what this NEWSARTICLE is +@NEWSARTICLE{7.10:71, TITLE = {Psychoanalysis Institute to Open}, - ENTRYSUBTYPE = {Clipping from an unidentified Dayton, OH newspaper}, DATE = {1948-09-18}, + ENTRYSUBTYPE = {Clipping from an unidentified Dayton, OH newspaper}, NOTE = {Copy in possession of author} } @@ -923,15 +936,15 @@ } % (APA 7.10 Example 73) -% Use USERE to specifiy the "known" status of the AUTHOR and/or DATE (see Example 67) +% Use DOUBTFULDATE to specifiy the "known" status of the DATE (see Example 67) % Note that this example is inconsistent in the APA 6th Edition (2nd printing) manual % with example 7.10:67. They differ in that 7.10:67 has brackets around the approximate % date and 7.10:73 has parenthesis. I have chosen brackets for consistency. -% Use USERD as "description" to indicate that the title is a description and not a real +% Use TITLEISDESCRIPTION to indicate a title that is really a description and not a real % title @MISC{7.10:73, - USERE = {unkdate}, - USERD = {description}, + DOUBTFULDATE = {true}, + TITLEISDESCRIPTION = {true}, TITLE = {{Photographs of Robert M. Yerkes}}, DATE = {1917/1954}, HOWPUBLISHED = {Robert Mearns Yerkes Papers (Box 137, Folder 2292)}, diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf index b9f1eeed274..6e8f32521d3 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf and b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex index a6db225eeeb..90310e25e7d 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex @@ -47,8 +47,38 @@ \setlength{\parskip}{3ex} \makeatletter -\def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\expandafter\zap@space\detokenize{#1} \@empty}}\\$\rcurvearrowse$ \textbf{#1}} -\def\apaexs#1{\hbox{\texttt{\footnotesize\expandafter\zap@space\detokenize{#1} \@empty}} \textbf{\small #1}} +% This solution to detokenize leaving a space after the command and +% arguments is due to Bruno Le Floch on T.SE +\long\def\apaexi#1% + {% + \catcode64=11 + \begingroup + % Ensure that every character is preserved by \lowercase. + \count@\z@ + \loop\ifnum\count@<256 + \lccode\count@\z@ + \advance\count@\@ne + \repeat + % Except spaces, changed to ^^A + \lccode32=\@ne + \lowercase + {% + \endgroup + \expandafter\test@\detokenize{#1}\relax% + \catcode64=12 + }% + } +% Then map {^^A => space, space =>} onto the string. +\def\test@#1% + {% + \ifx#1\relax\test@end\fi + \ifnum`#1=\@ne\space\else#1\fi + \test@ + } +\def\test@end\fi#1\test@{\fi} + +\def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\apaexi{#1}}}\\$\rcurvearrowse$ \textbf{#1}} +\def\apaexs#1{\hbox{\texttt{\footnotesize\apaexi{#1}}} \textbf{\small #1}} \makeatother % This just makes it easier to find a specific (APA 7.x) example in the @@ -308,18 +338,30 @@ expanding to be properly disambiguated. Truncating either would be ambiguous.\\ \noindent Some misc citation cases\\ \apaex{\textcite{6.16c,6.16d,6.16e}}\\ +\apaex{\textcite{6.16f,6.16g,6.16h}}\\ \apaex{\textcite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\ +Note here that the multicite delimiter is a comma as in running text, a +semi-colon would be strange: +\apaex{\textcites{6.16f}{6.16g}{6.16h}{6.16i}{6.16j}}\\ \apaex{\cite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\ \apaex{\cite{6.16k,6.16l}}\\ \apaex{\fullcite{FC1}}\\ \apaex{\fullcitebib{FC1}} +\noindent Testing «with»\\ +\apaex{\cite{with1}}\\ +\apaex{\textcite{with1}} + +\noindent Testing author name citing\\ +\apaex{\citeauthor{ca1}}\\ +\apaex{\citeauthor{ca1}} + \end{refsection} \begin{refsection}[biblatex-apa-test-references] \nocite{*} \end{refsection} \newpage -% Just (APA 7.x) real references examples here +% Just (APA 7.x) real references and related entry examples here \printbibliography[section=2] \newpage % Include a references section for citation examples just so hyperref diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf index 38b0673d6b5..13e5992005b 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf and b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex index 22d8f2b063e..291d65ce7be 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex @@ -25,7 +25,7 @@ url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={4.7}, + revision={5.0}, date={\today}} \hypersetup{% @@ -45,6 +45,25 @@ Please see the revision history below (section \ref{rev}) for details on change version. This section is just for important things like incompatible changes which users should be aware of. +\minisec{5.0} +The style now uses the customisable data model functionality of |biblatex| +2.0 and |biber| 1.0 and so these are now required. Several cases +which previously were forced to use custom fields like |USERA|, +|USERB| etc. can now be more naturally implemented with semantically +appropriate fields. See \file{biblatex-apa-references.bib} for +examples. This particularly aids the use of |VIDEO| entries, for +example which now support fields |DIRECTOR|, |PRODUCER|, +|WRITER| and |EXECPRODUCER|. + +Entries which relate to other entries like reviews and reprints are +now implemented more naturally using the |biblatex| 2 «related +entries» functionality. See entries with the |RELATED| field in +\file{biblatex-apa-references.bib} and the |biblatex| manual for +details and examples. + +Entries where authors are listed as «with» are now supported using the +name field |WITH|. See examples file. + \minisec{4.5} |biber| is now \emph{required}. This is because APA style needs a custom sorting scheme and only |biber| supports this. |bibtex| support is going @@ -79,14 +98,15 @@ press». This package is a Bib\LaTeX\ style for APA (American Psychological Association) style compliant documents typeset in \latex. It implements a -citation style (\path{apa.cbx}), a references section style -(\path{apa.bbx}) and string localisation files (\path{-apa.lbx}). -Currently there are only string localisations for a few languages---if you can help with any other languages, please mail me; the -localisation |.lbx| files are very small and simple and it would be a small -translation task for the few APA-specific strings needed. -The styles are loaded just like any other Bib\LaTeX\ styles but I -wouldn't try to use the citation and references styles separately as they -rely on each other, macro-wise, in places. +citation style (\file{apa.cbx}), a references section style +(\file{apa.bbx}), some data model enhancements (\file{apa.dbx}) and string +localisation files (\path{-apa.lbx}). Currently there are only +string localisations for a few languages---if you can help with any other +languages, please mail me; the localisation |.lbx| files are very small and +simple and it would be a small translation task for the few APA-specific +strings needed. The styles are loaded just like any other Bib\LaTeX\ styles +but I wouldn't try to use the citation and references styles separately as +they rely on each other, macro-wise, in places. In this document and in the code, the specific APA requirements are referred to by the section and (if appropriate) the example number of the @@ -94,18 +114,15 @@ APA Style Guide (6th Edition). \subsection{Requirements}\label{ref:req} -You will need to be using \sty{csquotes} ($\geq$ 4.3) and Bib\LaTeX\ -($\geq$ 1.4). Some features will not work\footnote{Automatic name and name - list uniqueness disambiguation, for example---see examples doc} without the -Biber backend for Bib\LaTeX\ ($\geq$ 0.9.2) which is strongly -recommended. If you want to take advantage of the Bib\LaTeX\ -|\DeclareQuotePunctuation| facility to enforce the APA required «American» -punctuation, you should normally use the \sty{babel} package with the -«american» option (see Bib\LaTeX\ manual section |3.9.1|). You can of -course use other languages but in such cases, to adhere to APA «American» -punctuation rules (following commas moved inside closing quotes etc.), then -you should set up |\DeclareQuotePunctuation| yourself as per section -|4.7.5| of the Bib\LaTeX\ manual. +You will need to be using \sty{csquotes} ($\geq$ 4.3), Bib\LaTeX\ ($\geq$ +2.0) and Biber ($\geq$ 1.0). If you want to take advantage of the +Bib\LaTeX\ |\DeclareQuotePunctuation| facility to enforce the APA required +«American» punctuation, you should normally use the \sty{babel} package +with the «american» option (see Bib\LaTeX\ manual section |3.9.1|). You can +of course use other languages but in such cases, to adhere to APA +«American» punctuation rules (following commas moved inside closing quotes +etc.), then you should set up |\DeclareQuotePunctuation| yourself as per +section |4.7.5| of the Bib\LaTeX\ manual. If you are using the |apa.cls| \latex class, you need be using version $\geq$ 1.3.4. The class should be invoked with the |noapacite| class option @@ -255,12 +272,6 @@ and references style is implemented, there are just a few exceptions which are hardly worth the coding pain since they ambiguous and easily worked around. -\subsubsection{Reference Section Limitations} - -\begin{description} -\item\apa{6.27} Can't deal yet with authors listed as «with». -\end{description} - \section{Details} The detailed information for this style is contained in the example document and @@ -290,6 +301,9 @@ accompanying \path{.bib} files: \item[\path{apa.bbx}] The |biblatex-apa| references style. It is decently structured with comments but shouldn't need to be read for normal use. +\item[\path{apa.dbx}] The |biblatex-apa| data model additions. This allows + users to utilise more natural entry type and field names for certain + entries. See comments in the \path{biblatex-apa-test-references.bib}. \item[\path{*.lbx}] The |biblatex-apa| localisation files. These files override some language-specific macros for some fixed strings. \end{description} @@ -346,35 +360,27 @@ general notes: citations and the references will be the localisation of the |PUBSTATE| value key (|PUBSTATE| takes a pre-defined set of localisation keys as values, see |biblatex| manual). -\item There are occasions where there is no sensible \path{.bib} key to - use. This applies to things like |AUDIO| and |VIDEO| entries mainly. The - format of these requires that different roles (Director, Producer etc.) - are separately specified for different names. This is not really possible - for the usual |AUTHOR| or |EDITOR| fields. In such cases, I have resorted - to the Bib\LaTeX\ custom |NAME| and |NAMETYPE| fields which are not - very portable but until the Bib\TeX\ backend support is dropped in Bib\LaTeX\ - there is no way round this without making things very messy. This will - happen around Bib\LaTeX\ version 2.0. \item APA style sometimes refers to the «series» of a multi-volume work. This corresponds to the |MAINTITLE| field in the \path{.bib} and \emph{not} the |SERIES| field. \item |VOLUME|, |NUMBER| and |CHAPTER| are forced into arabic numerals if they are given as roman numerals, as required by \apa{6.22}. -\item |USERB| is sometimes used to specify that a URL is for an abstract - rather than the paper itself. Not very portable but that's because of Bib\TeX\ data - model limtations. -\item |USERD| is sometimes used to specify information that indicates - special formatting. Not very portable but that's because of Bib\TeX\ data - model limtations. -\item |USERE| is sometimes used to specify questionable dates/authors for - special formatting. Not very portable but that's because of Bib\TeX\ data - model limtations. \end{itemize} \section{Revision history}\label{rev} \begin{changelog} +\begin{release}{5.0}{2012-07-01} +\item Using |biblatex| 2.0/|biber 1.0| data model facility. +\end{release} + +\begin{release}{4.8}{2012-06-02} +\item Put in proper package version strings +\item Fixed a problem with \cmd{textcites} (thanks to Florian Sesser and + Cornielia Entner for reporting) +\end{release} + \begin{release}{4.7}{2012-04-19} \item Made |firstinits=false| possible \item Fixed a problem with explicit «and others» with names (thanks to diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx index 411537fd556..fdccae125f5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx @@ -1,5 +1,4 @@ -% v4.6 -\ProvidesFile{american-apa.lbx} +\ProvidesFile{american-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations @@ -21,6 +20,11 @@ \NewBibliographyString{archivedat} \NewBibliographyString{origyear} \NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} \DeclareBibliographyStrings{% inherit = {american}, @@ -33,9 +37,16 @@ from = {{from}{from}}, archivedat = {{archived\space at}{archived\space at}}, nodate = {{no\space date}{{}n\adddot d\adddot}}, - reviewof = {{Review\space of}{review\space of}}, + with = {{with}{with}}, + reprintas = {{reprinted as}{reprinted as}}, + reprintfrom = {{reprinted from}{reprinted from}}, + reviewof = {{review\space of}{review\space of}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, january = {{January}{January}}, february = {{February}{February}}, march = {{March}{March}}, @@ -48,7 +59,7 @@ october = {{October}{October}}, november = {{November}{November}}, december = {{December}{December}}, - mathesis = {{Master's thesis}{Master's\addabbrvspace thesis}}, + mathesis = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}}, phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}}, origyear = {{original\space work\space published}{original\space work\space published}}, typechair = {{Chair}{Chair}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 1d346fad9e4..49cb6e1bc2b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -1,5 +1,4 @@ -%% apa.bbx v4.7 -%% Copyright 2011 Philip Kime +%% Copyright 2012 Philip Kime %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -17,6 +16,7 @@ %% %% apa.cbx (biblatex citation style) %% apa.bbx (biblatex references style) +%% apa.dbx (biblatex style data model) %% *.lbx (localisation files for APA-specific strings) %% biblatex-apa.pdf (Style documentation) %% biblatex-apa.tex (Style documentation source) @@ -25,8 +25,8 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.bbx} -\RequireBiber[2] +\ProvidesFile{apa.bbx}[2012/07/01\space v5.0\space APA biblatex references style] +\RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -146,19 +146,15 @@ % eprint references \DeclareFieldFormat{eprint:eric}{% - \iffieldequalstr{userb}{urlisabstract} - {\printtext{\bibcpstring{abstract}}\addspace% - \printtext{\bibstring{retrieved}}} - {\printtext{\bibcpstring{retrieved}}}% - \setunit{\addspace}% - \printtext{\bibstring{from}}\addspace% - ERIC\addspace database\addspace% - \mkbibparens{#1}} + \printtext{\bibcpstring{retrieved}}% + \setunit{\addspace}% + \printtext{\bibstring{from}}\addspace% + ERIC\addspace database\adddot\addspace% + \mkbibparens{#1}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.12) Five author max before "et al" and a one author truncation policy % However, only after the first cite, see the labelname format @@ -179,10 +175,15 @@ \field{sortkey} } \sort{ - \name{sortname} - \name{author} - \name{editor} - \name{translator} + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{writer} + \field{director} + \field{producer} + \field{execproducer} + \field{origauthor} \field{sorttitle} \field{title} } @@ -203,6 +204,10 @@ \DeclareLabelyear{pubstate,year,eventyear,origyear,urlyear} +% Due to APA strange requirements like truncation after first cite and +% ellipsis from 7th to n-1 in bib, there might be some really strange +% edge cases which can't be handled as this sort of this needs treating in +% the style after biber has finished. Very unlikely though. \ExecuteBibliographyOptions{labelyear=true,% sorting=apa,% backref=true,% @@ -213,8 +218,10 @@ uniquelist=true,% uniquename=init,% citetracker=true,% - maxnames=2,% - minnames=1,% + maxcitenames=2,% + mincitenames=1,% + maxbibnames=7,% + minbibnames=6,% abbreviate=true,% mincrossrefs=999,% alldates=apalong} @@ -245,6 +252,17 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.06:47) Reviews are awkward - if no author, date +% position changes so we need a flag to +% track this + +\newbool{bbx:noreviewauthor} +\AtEveryBibitem{\global\boolfalse{bbx:noreviewauthor}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.30) Sometimes "Vol" is inside the additional % material parens, sometimes not. This bool @@ -333,7 +351,7 @@ {\addcomma\addspace\ldots\addspace} {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}} {} - {\ifthenelse{\iffieldequalstr{usere}{unkauth}\OR\iffieldequalstr{usere}{unkauthdate}} + {\ifthenelse{\iffieldequalstr{doubtfulauthor}{true}} {\iffirstinits {\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}?}} {\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}?}}} @@ -347,7 +365,12 @@ {\usebibmacro{labeltitle}} {\printnames[apaauthor][-\value{listtotal}]{author}% \setunit*{\addspace}% - \printfield{nameaddon}}% + \printfield{nameaddon}% + \ifnameundef{with} + {} + {\printtext{\bibstring{with}\addspace}% + \printnames[apaauthor][-\value{listtotal}]{with} + \setunit*{\addspace}}}% \newunit\newblock% \usebibmacro{labelyear+extrayear}} @@ -402,7 +425,7 @@ {\printtext[yearorunkyear]{\printdateextra}}}} \DeclareFieldFormat{yearorunkyear}{% - \ifthenelse{\iffieldequalstr{usere}{unkdate}\OR\iffieldequalstr{usere}{unkauthdate}} + \ifthenelse{\iffieldequalstr{doubtfuldate}{true}} {\mkbibbrackets{ca\adddot\addspace#1}} {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND\iffieldundef{day}} {\mkbibparens{\usebibmacro{noyear}}} @@ -426,7 +449,7 @@ \DeclareFieldFormat{apacase}{\MakeSentenceCase*{#1}} \DeclareFieldFormat{issuetitle}{#1\isdot} -\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot} +\DeclareFieldFormat{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{\mkbibemph{#1}\isdot}} \DeclareFieldFormat{origtitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot} \DeclareFieldFormat[article]{title}{#1\isdot} \DeclareFieldFormat[article]{origtitle}{\MakeSentenceCase*{#1}\isdot} @@ -443,12 +466,17 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% (APA 7.01 Example 10) Articles that aren't newspapers don't have -% prefix for pages. +% (APA 7.01 Example 10) Newspapers have prefix for pages. + +\DeclareFieldFormat[newsarticle]{pages}{\mkpageprefix{#1}} +\DeclareFieldFormat[newsarticle]{newspaper}{\mkbibemph{#1}} +\DeclareFieldFormat[newsarticle]{entrysubtype}{\mkbibbrackets{#1}} +\DeclareFieldFormat[newsarticle]{title}{#1} +\DeclareFieldFormat[article]{pages}{#1} -\DeclareFieldFormat[article]{pages}{\iffieldequalstr{entrysubtype}{newspaper} - {\mkpageprefix{#1}} - {#1}} +\newbibmacro*{newspaper}{% + \printfield{newspaper} + \setunit{\addcomma\space}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -494,8 +522,9 @@ \ifthenelse{% \ifnameundef{author}\AND% \(\ifnameundef{editor}\AND\NOT\boolean{bbx:editorinauthpos}\)\AND% - \ifnameundef{namea}\AND% - \ifnameundef{nameb}} + \ifnameundef{producer}\AND% + \ifnameundef{director}\AND% + \ifnameundef{writer}} {\newunit\newblock \usebibmacro{labelyear+extrayear}} {}}} @@ -645,7 +674,7 @@ \NumCheckSetup{\ifcurrentfield{pages} {\DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}} - {\DeclareNumChars{.}}} + {}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -821,7 +850,7 @@ \newunit\newblock \iffieldundef{volume} {} - {\setunit{\global\booltrue{bbx:volseen}}% + {\setunit{\addspace\global\booltrue{bbx:volseen}}% \printfield{volume}% \printfield{part}% \setunit{\adddot}% @@ -929,81 +958,73 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 7.06) Reviews -\DeclareFieldFormat[review]{title}{#1} -\DeclareFieldFormat[review]{origtitle}{\mkbibemph{#1}} +% The title of the review depends on the entrytype of the thing reviewed +\DeclareFieldFormat[review]{title}{ + \entrydata*{\thefield{related}}{% + \iffieldequalstr{entrytype}{article} + {\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}} + {\printtext[apacase]{\thefield{savedtitle}}}}} + \DeclareFieldFormat[review]{pages}{#1} \DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}} \DeclareFieldFormat[review]{number}{\mkbibparens{\apanum{#1}}} -\newbibmacro*{reviewauthor}{% +\renewbibmacro*{reviewauthor}{% \ifnameundef{author} - {\usebibmacro{reviewlabeltitle}} - {\printnames[apaauthor][-\value{listtotal}]{author}}% - \newunit\newblock% - \usebibmacro{labelyear+extrayear}} - -\newbibmacro*{reviewlabeltitle}{% - \iffieldundef{label} - {\usebibmacro{reviewof}% - \clearfield{entrysubtype}% - \clearfield{origtitle}% - \clearfield{verba}} - {\printfield{label}}} - -\newbibmacro*{reviewtitle}{% - \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}} - {\printtext{}}% Dummy printtext as we do want to record that we output - % a title for the punctuation tracker - {\printtext[title]{% - \printfield[apacase]{title}% - \setunit{\subtitlepunct}% - \printfield[apacase]{subtitle}}% - \setunit{\addspace}% - \printfield{titleaddon}}} - -\newbibmacro*{reviewof}{% - \iffieldundef{origtitle} - {} - {\printtext[brackets]{% - \printfield{entrysubtype}\addspace% - \printtext[origtitle]{% - \printfield[apacase]{origtitle}% - \setunit{\subtitlepunct}% - \printfield[apacase]{origsubtitle}}% - \setunit{\addcomma\addspace}% - \printfield{verba}}}} + {\booltrue{bbx:noreviewauthor}} + {\usebibmacro{author}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Films +% Media authors -\newbibmacro*{mediaauthor}{% - \ifnameundef{namea} +\newbibmacro*{producer}{% + \ifnameundef{producer} {} - {\printnames[apanames][-\value{listtotal}]{namea}% - \newunit% - \printtext[parens]{\printfield{nameatype}}} - \setunit*{\addcomma\addspace\&\addspace}% - \ifnameundef{nameb} + {\printnames[apaauthor][-\value{listtotal}]{producer}% + \newunit + \printtext[parens]{\bibcpstring{producer}}% + \setunit*{\addcomma\addspace\&\addspace}}} + +\newbibmacro*{director}{% + \ifnameundef{director} {} - {\printnames[apanames][-\value{listtotal}]{nameb}% - \setunit{\addspace}% - \printtext[parens]{\printfield{namebtype}}} - \newunit - \usebibmacro{labelyear+extrayear}} + {\printnames[apaauthor][-\value{listtotal}]{director}% + \newunit + \printtext[parens]{\bibcpstring{director}}% + \setunit*{\addcomma\addspace\&\addspace}}} + +\newbibmacro*{writer}{% + \ifnameundef{writer} + {} + {\printnames[apaauthor][-\value{listtotal}]{writer}% + \newunit + \printtext[parens]{\bibcpstring{writer}}% + \setunit*{\addcomma\addspace\&\addspace}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%% -% (APA 7.07) Misc +% (APA 7.07) Misc and data -\DeclareFieldFormat[misc]{title}{\iffieldequalstr{userd}{dataset}{\mkbibemph{#1}}{% - \iffieldequalstr{userd}{description}{\mkbibbrackets{#1}}{#1}}} +\DeclareFieldFormat[data]{title}{\mkbibemph{#1}} +\DeclareFieldFormat[data]{entrysubtype}{\mkbibbrackets{#1}} \DeclareFieldFormat[misc]{entrysubtype}{\mkbibbrackets{#1}} \DeclareFieldFormat[misc]{nameaddon}{\mkbibparens{#1}} +\DeclareFieldFormat[misc]{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{{#1}\isdot}} + +\newbibmacro*{datatitle}{% + \iffieldundef{title} + {\iffieldundef{entrysubtype} + {} + {\printfield{entrysubtype}}} + {\iffieldundef{entrysubtype} + {} + {\usebibmacro{title}\addspace + \printfield{entrysubtype}}}} % %%%%%%%%%%%%%%%%% @@ -1024,11 +1045,11 @@ \iffieldundef{maintitle} {} {\usebibmacro{in}% - \ifnameundef{namec} + \ifnameundef{execproducer} {} - {\printnames[apanames][-\value{listtotal}]{namec}% - \setunit{\addspace}% - \printtext[parens]{\printfield{namectype}}} + {\printnames[apanames][-\value{listtotal}]{execproducer}% + \addspace + \printtext[parens]{\bibcpstring{execproducer}}} \setunit{\addcomma\addspace}% \usebibmacro{avmaintitle}% \newunit}} @@ -1043,13 +1064,10 @@ \setunit{\addspace}} \printfield{maintitleaddon}} -\newbibmacro*{on}{% - \bibcpstring{on}\setunit{\space}} - \newbibmacro*{album}{% \iffieldundef{maintitle} {} - {\usebibmacro{on}% + {\bibcpstring{on}% \setunit{\addspace}% \usebibmacro{avmaintitle}% \newunit}} @@ -1059,11 +1077,12 @@ %%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%% -% (APA 7.10) Letters - +% (APA 7.10) Letter/Letters -\DeclareFieldFormat[letter]{title}{\iffieldequalstr{entrysubtype}{collection}{#1}{\mkbibbrackets{#1}}} +\DeclareFieldFormat[letter]{title}{\mkbibbrackets{#1}} +\DeclareFieldFormat[letters]{title}{#1} \DeclareFieldFormat[letter]{number}{\mkbibparens{#1}} +\DeclareFieldFormat[letters]{number}{\mkbibparens{#1}} % %%%%%%%%%%%%%%%%%%%% @@ -1072,17 +1091,16 @@ % (APA 6.31) URLs \DeclareFieldFormat{url}{\url{#1}} +\DeclareFieldFormat{abstracturl}{\url{#1}} \DeclareFieldFormat{urldate}{#1} \renewbibmacro*{url+urldate}{% - \def\@apaar{retrieved}% default - \ifthenelse{\iffieldundef{url}\OR\NOT\iffieldundef{doi}} + \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\)\OR\NOT\iffieldundef{doi}} {} - {\iffieldundef{usera}{}{\patchcmd{\@apaar}{retrieved}{\thefield{usera}}{}{}}% - \iffieldequalstr{userb}{urlisabstract} - {\printtext{\bibcpstring{abstract}}\addspace% - \printtext{\bibstring{\@apaar}}} - {\printtext{\bibcpstring{\@apaar}}}% + {\iffieldundef{abstracturl} + {} + {\printtext{\bibcpstring{abstract}}\addspace}% + \printtext{\bibstring{retrieved}}% \setunit{\addspace}% \iffieldundef{urlyear} {} @@ -1090,10 +1108,10 @@ \setunit*{\addcomma\addspace}}% \printtext{\bibstring{from}}% \setunit*{\addspace}% - \printlist{organization}% + \printfield{urldescription}% \setunit*{\addcolon\addspace}% - \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}}} - + \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}% + \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}} % %%%%%%%%%%%%%%%%% @@ -1138,7 +1156,45 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newbibmacro*{apa:finpunct}{% - \iffieldundef{addendum}{}{\renewcommand*{\finentrypunct}{\relax}}} + \ifboolexpr{ + test {\iffieldundef{addendum}} + and + test {\iffieldundef{related}}} + {} + {\renewcommand*{\finentrypunct}{\relax}}} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Related entries + +\DeclareFieldFormat{related:reprintfrom}{\mkbibparens{#1}} +\DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}} + +\newbibmacro*{related:reprintfrom}[1]{% + \entrydata*{#1}{% + \printtext{\mkbibemph{\printfield[apacase]{title}}}% + \setunit{\bibpagespunct}% + \printfield{pages}% + \setunit{\addcomma\addspace}% + \bibstring{byauthor}\addspace + \printnames[apanames][-\value{listtotal}]{editor}% + \printnames[apanames][-\value{listtotal}]{author}% + \setunit{\addcomma\addspace}% + \usebibmacro{location+publisher}}} + +\newbibmacro*{related:reviewof}[1]{% + \setunit{}% Sanitize this in case no author + \entrydata*{#1}{% + \ifentrytype{article} + {\printtext{\printfield[apacase]{title}}} + {\printtext{\mkbibemph{\printfield[apacase]{title}}}}% + \setunit{\addspace}% + \bibstring{byauthor}\addspace + \printnames[apanames][-\value{listtotal}]{author}% + \setunit{\addcomma\addspace}% + \printdateextra}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 7.x) General type layouts @@ -1159,6 +1215,32 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% + \usebibmacro{apa:finpunct}% + \usebibmacro{apa:pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{newsarticle}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{title}% + \newunit\newblock + \usebibmacro{newspaper}% + \setunit{\bibpagespunct}% + \printfield{pages}% + \newunit\newblock + \printfield{entrysubtype}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:finpunct}% \usebibmacro{apa:pageref}% \usebibmacro{finentry}} @@ -1183,6 +1265,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1205,6 +1289,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1233,6 +1319,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1255,6 +1343,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1283,6 +1373,8 @@ \usebibmacro{origyear}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1311,6 +1403,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1334,7 +1428,7 @@ \newunit\newblock \printlist{organization}% \newunit - \printfield{eventtitle}% + \printfield[apacase]{eventtitle}% \newunit \printfield{venue}% \newunit\newblock @@ -1345,6 +1439,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1373,6 +1469,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1400,6 +1498,8 @@ \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}} \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1423,6 +1523,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1447,6 +1549,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1468,6 +1572,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1486,6 +1592,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1495,9 +1603,11 @@ \usebibmacro{begentry}% \usebibmacro{reviewauthor}% \setunit{\labelnamepunct}\newblock - \usebibmacro{reviewtitle}% + \usebibmacro{title}% \newblock - \usebibmacro{reviewof}% + \usebibmacro{related}% + \newunit\newblock + \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extrayear}}{}% \newunit\newblock \usebibmacro{journal+issuetitle}% \newunit\newblock @@ -1536,11 +1646,63 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{data}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author}% + \newunit\newblock + \usebibmacro{datatitle}% + \newunit\newblock + \printfield{type}% + \newunit + \printfield{version}% + \newunit + \printfield{note}% + \newunit\newblock + \printlist{organization}% + \newunit\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} \DeclareBibliographyDriver{letter}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{title}% + \newunit\newblock + \printlist{institution}% + \setunit{\addspace}\newblock + \printfield{number}% + \newunit\newblock + \printfield{note}% + \setunit{\addcomma\addspace}\newblock + \usebibmacro{location+publisher}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% + \usebibmacro{apa:pageref}% + \usebibmacro{apa:finpunct}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{letters}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{author/editor}% @@ -1558,6 +1720,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1565,7 +1729,11 @@ \DeclareBibliographyDriver{video}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \usebibmacro{mediaauthor}% + \usebibmacro{writer}% + \usebibmacro{director}% + \usebibmacro{producer}% + \newunit\newblock + \usebibmacro{labelyear+extrayear}% \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \setunit{\addspace}\newblock @@ -1578,6 +1746,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1585,7 +1755,11 @@ \DeclareBibliographyDriver{movie}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \usebibmacro{mediaauthor}% + \usebibmacro{writer}% + \usebibmacro{director}% + \usebibmacro{producer}% + \newunit\newblock + \usebibmacro{labelyear+extrayear}% \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \setunit{\addspace}\newblock @@ -1598,6 +1772,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1605,7 +1781,11 @@ \DeclareBibliographyDriver{audio}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \usebibmacro{mediaauthor}% + \usebibmacro{writer}% + \usebibmacro{director}% + \usebibmacro{producer}% + \newunit\newblock + \usebibmacro{labelyear+extrayear}% \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \setunit{\addspace}\newblock @@ -1616,6 +1796,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1631,6 +1813,8 @@ \newunit\newblock \usebibmacro{location+publisher}% \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1646,6 +1830,8 @@ \newunit\newblock \usebibmacro{doi+eprint+url}% \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1668,6 +1854,8 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct} \usebibmacro{finentry}} @@ -1747,6 +1935,7 @@ \newunit} \newbibmacro*{type+institution}{% + \setunit{\addspace}% \ifthenelse{\iffieldundef{type}\AND\iffieldundef{institution}} {} {\printtext[parens]{% @@ -1764,7 +1953,10 @@ \iffieldundef{label} {\iffieldundef{shorttitle} {\printfield{title}% - \clearfield{title} + \clearfield{title}% + \setunit{\addspace}% + \printfield{entrysubtype}% + \clearfield{entrysubtype}% \global\booltrue{bbx:titleinauthpos}} {\printfield[title]{shorttitle}}} {\printfield{label}}} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 14cee944036..13d0e397643 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -1,5 +1,4 @@ -%% apa.cbx v4.7 -%% Copyright 2011 Philip Kime +%% Copyright 2012 Philip Kime %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -17,6 +16,7 @@ %% %% apa.cbx (biblatex citation style) %% apa.bbx (biblatex references style) +%% apa.dbx (biblatex style data model) %% *.lbx (localisation files for APA-specific strings) %% biblatex-apa.pdf (Style documentation) %% biblatex-apa.tex (Style documentation source) @@ -25,8 +25,8 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.cbx} -\RequireBiber[1] +\ProvidesFile{apa.cbx}[2012/07/01\space 5.0\space APA biblatex citation style] +\RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.16) year postfix is not emphasised or italic @@ -164,6 +164,25 @@ % (APA 6.28) If no date, use "(n.d.)" % (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present +\newbibmacro*{cite:author}{% + \iffieldequals{namehash}{\cbx@lasthash} +% Multiple cites in one command + {\setunit{\compcitedelim}% + \usebibmacro{cite:plabelyear+extrayear}}% +% Single cite + {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}} +% No author/editor + {\usebibmacro{cite:noname}% + \savefield{namehash}{\cbx@lasthash}} +% Normal cite + {\ifnameundef{shortauthor} + {\printnames[labelname][-\value{listtotal}]{labelname}\usebibmacro{with}}% + {\ifciteseen + {\printnames{shortauthor}} + {\printnames[labelname][-\value{listtotal}]{author}\usebibmacro{with}\addspace\printnames[sabrackets]{shortauthor}}}% + \savefield{namehash}{\cbx@lasthash}}}% + \setunit{\multicitedelim}} + \newbibmacro*{cite}{% \iffieldequals{namehash}{\cbx@lasthash} % Multiple cites in one command @@ -178,22 +197,33 @@ \savefield{namehash}{\cbx@lasthash}} % Normal cite {\ifnameundef{shortauthor} - {\printnames[labelname][-\value{listtotal}]{labelname}} + {\printnames[labelname][-\value{listtotal}]{labelname}\usebibmacro{with}}% {\ifciteseen {\printnames{shortauthor}} - {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}% + {\printnames[labelname][-\value{listtotal}]{author}\usebibmacro{with}\addspace\printnames[sabrackets]{shortauthor}}}% \setunit{\nameyeardelim}% \usebibmacro{cite:plabelyear+extrayear}% \savefield{namehash}{\cbx@lasthash}}}% \setunit{\multicitedelim}} +\newbibmacro*{with}{% + \ifnameundef{with} + {} + {\setunit{}\addspace\bibopenparen\bibstring{with}\addspace + \printnames[labelname][-\value{listtotal}]{with}\bibcloseparen}} + \newbibmacro*{textcite}{% \iffieldequals{namehash}{\cbx@lasthash} % Compact cite - more than one thing for same author {\setunit{\compcitedelim}% \usebibmacro{cite:plabelyear+extrayear}} -% Single cite - {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}} +% New cite + {% + \ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% + \setunit{\compcitedelim}% + \ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}} % No author/editor or patent {\iffieldundef{shorthand}% % Cite using title @@ -208,11 +238,11 @@ % Normal full cite {\ifnameundef{shortauthor}% % Normal full cite - {\printnames[labelname][-\value{listtotal}]{labelname}} + {\printnames[labelname][-\value{listtotal}]{labelname}\usebibmacro{with}} % Cite using short author {\ifciteseen {\printnames{shortauthor}} - {\printnames[labelname][-\value{listtotal}]{author}}}% + {\printnames[labelname][-\value{listtotal}]{author}\usebibmacro{with}}}% % Year \setunit{\ifbool{cbx:np} {\nameyeardelim} @@ -224,14 +254,9 @@ {} {\printnames{shortauthor}\setunit{\nameyeardelim}}}% % Actual year printing - \usebibmacro{cite:plabelyear+extrayear}% - \savefield{namehash}{\cbx@lasthash}}}% - \setunit{% - \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}% - % multicitedelim semi-colon doesn't make much sense for textcites - \compcitedelim}} + \usebibmacro{cite:plabelyear+extrayear}% + % Save name hash for checks later + \savefield{namehash}{\cbx@lasthash}}}} \newbibmacro*{cite:plabelyear+extrayear}{% \iffieldundef{labelyear} @@ -308,6 +333,8 @@ {\nameyeardelim \printfield{postnote}}} + + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -372,18 +399,9 @@ \newbibmacro*{textcite:postnote}{% \usebibmacro{postnote}% - \ifthenelse{\value{multicitecount}=\value{multicitetotal}} - {\setunit{}% - \printtext{% - \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}}} - {\setunit{% - \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}% - \multicitedelim}}} - + \ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}} \newbibmacro*{cite:init}{% \global\boolfalse{cbx:parens}% @@ -434,6 +452,8 @@ {} {\usebibmacro{postnote}} +\DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim} + \DeclareCiteCommand{\textcite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} @@ -442,4 +462,12 @@ {} {\usebibmacro{textcite:postnote}} +\DeclareCiteCommand{\citeauthor} + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite:author}} + {} + {\usebibmacro{postnote}} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx new file mode 100644 index 00000000000..a29a1c2c545 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx @@ -0,0 +1,143 @@ +%% Copyright 2012 Philip Kime +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Philip Kime. +%% +%% This work consists of the files: +%% +%% apa.cbx (biblatex citation style) +%% apa.bbx (biblatex references style) +%% apa.dbx (biblatex style data model) +%% *.lbx (localisation files for APA-specific strings) +%% biblatex-apa.pdf (Style documentation) +%% biblatex-apa.tex (Style documentation source) +%% biblatex-apa-test.pdf (Style examples) +%% biblatex-apa-test.tex (Style examples source) +%% biblatex-apa-test-citations.bib (Style examples - citations) +%% biblatex-apa-test-references.bib (Style examples - references) + +\ProvidesFile{apa.dbx}[2012/07/01\space v5.0\space APA biblatex style data model] +\RequireBiber[3] + +\DeclareDatamodelEntrytypes{ + letters, + data, + newsarticle} + +\DeclareDatamodelFields[type=list, datatype=name]{ + with, + writer, + producer, + execproducer, + director} + +\DeclareDatamodelFields[type=field, datatype=literal]{ + doubtfulauthor, + doubtfuldate, + titleisdescription, + newspaper, + urldescription} + +\DeclareDatamodelFields[type=field, datatype=verbatim]{ + abstracturl} + +\DeclareDatamodelEntryfields{ + titleisdescription, + with, + doubtfulauthor, + doubtfuldate, + abstracturl, + urldescription} + + +\DeclareDatamodelEntryfields[video]{ + writer, + producer, + execproducer, + director} + +\DeclareDatamodelEntryfields[newsarticle]{ + author, + newspaper, + title, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, + doi, + editor, + editora, + editorb, + editorc, + editoratype, + editorbtype, + editorctype, + eid, + eprint, + eprintclass, + eprinttype, + issn, + issue, + issuetitle, + issuesubtitle, + language, + note, + number, + origlanguage, + pages, + series, + subtitle, + titleaddon, + translator, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, + volume} + +\DeclareDatamodelEntryfields[data]{ + title, + day, + endday, + endmonth, + endyear, + day, + endday, + endmonth, + endyear, + month, + year, + addendum, + author, + language, + location, + note, + organization, + pubstate, + subtitle, + titleaddon, + type, + url, + urlday, + urlendday, + urlendmonth, + urlendyear, + urlmonth, + urlyear, + version} + diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx index b297ecd12f6..78ee414a269 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx @@ -1,5 +1,4 @@ -% v4.6 -\ProvidesFile{brazilian-apa.lbx} +\ProvidesFile{brazilian-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} % (APA 6.22) The example abbreviations @@ -21,6 +20,11 @@ \NewBibliographyString{archivedat} \NewBibliographyString{origyear} \NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} \DeclareBibliographyStrings{% inherit = {brazilian}, @@ -32,6 +36,11 @@ archivedat = {{arquivado\space em}{arquivado\space em}}, nodate = {{sem\space data}{{}s\adddot d\adddot}}, reviewof = {{Revis\~ao\space de}{revis\~ao\space de}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + with = {{with}{with}}, origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}}, typechair = {{Coordenador}{Coord\adddot}}, typechairs = {{Coordenadores}{Coords\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx index a4196e8f3d2..da4080ef7e3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx @@ -1,5 +1,4 @@ -% v4.7 -\ProvidesFile{british-apa.lbx} +\ProvidesFile{british-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation] \InheritBibliographyExtras{british} % (APA 6.22) The example abbreviations @@ -21,6 +20,11 @@ \NewBibliographyString{archivedat} \NewBibliographyString{origyear} \NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} \DeclareBibliographyStrings{% inherit = {british}, @@ -34,6 +38,11 @@ archivedat = {{archived\space at}{archived\space at}}, nodate = {{no\space date}{{}n\adddot d\adddot}}, reviewof = {{Review\space of}{review\space of}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + with = {{with}{with}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, january = {{January}{January}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx index a0eee6a4b39..d61f489088e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx @@ -1,5 +1,4 @@ -% v4.7 -\ProvidesFile{dutch-apa.lbx} +\ProvidesFile{dutch-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations @@ -21,6 +20,11 @@ \NewBibliographyString{archivedat} \NewBibliographyString{origyear} \NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} \DeclareBibliographyStrings{% inherit = {dutch}, @@ -34,6 +38,11 @@ archivedat = {{gearchiveerd\space onder}{gearchiveerd\space onder}}, nodate = {{geen\space datum}{{}n\adddot d\adddot}}, reviewof = {{Bespreking\space van}{bespreking\space van}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + with = {{with}{with}}, paragraph = {{par\adddot}{par\adddot}}, paragraphs = {{par\adddot}{par\adddot}}, january = {{januari}{januari}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx index 82c4be76ffa..4283c0d10b0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx @@ -1,5 +1,4 @@ -% v4.7 -\ProvidesFile{french-apa.lbx} +\ProvidesFile{french-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations @@ -21,6 +20,11 @@ \NewBibliographyString{archivedat} \NewBibliographyString{origyear} \NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} \DeclareBibliographyStrings{% inherit = {french}, @@ -42,6 +46,11 @@ pages = {{Pages}{{}pp\adddot}}, on = {{le}{le}}, retrieved = {{R\'ecup\'er\'ee}{R\'ecup\'er\'ee}}, + with = {{avec}{avec}}, + producer = {{producteur}{producteur}}, + execproducer = {{producteur ex\'ecutif}{producteur ex\'ecutif}}, + director = {{r\'ealisateur}{r\'ealisateur}}, + writer = {{\'ecrivain}{\'ecrivain}}, available = {{disponible}{disponible}}, from = {{\`a\space partir\space de}{\`a\space partir\space de}}, archivedat = {{archiv\'es\space \`a}{archiv\'es\space \`a}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx index 72127eeb8c2..6ccca606d32 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx @@ -1,5 +1,4 @@ -% v4.7 -\ProvidesFile{german-apa.lbx} +\ProvidesFile{german-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations @@ -21,6 +20,11 @@ \NewBibliographyString{archivedat} \NewBibliographyString{origyear} \NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} \DeclareBibliographyStrings{% inherit = {german}, @@ -37,11 +41,16 @@ november = {{November}{November}}, december = {{Dezember}{Dezember}}, revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{Produzent}{Produzent}}, + director = {{Regisseur}{Regisseur}}, + writer = {{Schriftsteller}{Schriftsteller}}, page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, retrieved = {{Zugriff\space am}{Zugriff\space am}}, available = {{Erh\"altlich}{Erh\"altlich}}, + with = {{mit}{mit}}, from = {{unter}{unter}}, archivedat = {{archiviert\space unter}{archiviert\space unter}}, nodate = {{ohne\space Datum}{{}o\adddot D\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx index eef20f1564e..46ff26e2071 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx @@ -1,5 +1,4 @@ -% v4.7 -\ProvidesFile{greek-apa.lbx} +\ProvidesFile{greek-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation] \InheritBibliographyExtras{greek} % (APA 6.22) The example abbreviations @@ -21,6 +20,11 @@ \NewBibliographyString{archivedat} \NewBibliographyString{origyear} \NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} \DeclareBibliographyStrings{% inherit = {greek}, @@ -34,6 +38,11 @@ archivedat = {{αρχειοθετήθηκε\space στις}{αρχειοθετήθηκε\space στις}}, nodate = {{χωρίς\space ημερομηνία}{{}χ\adddot η\adddot}}, reviewof = {{Αναθεώρηση\space του}{αναθεώρηση\space του}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + with = {{with}{with}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, january = {{Ιανουάριος}{Ιανουάριος}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx index 62858b83328..c000e3d47f4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx @@ -1,5 +1,4 @@ -% v4.7 -\ProvidesFile{italian-apa.lbx} +\ProvidesFile{italian-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation] \InheritBibliographyExtras{italian} % (APA 6.22) The example abbreviations @@ -21,6 +20,11 @@ \NewBibliographyString{archivedat} \NewBibliographyString{origyear} \NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} \DeclareBibliographyStrings{% inherit = {italian}, @@ -34,6 +38,11 @@ archivedat = {{archiviato\space il}{archiviato\space il}}, nodate = {{senza\space data}{{}n\adddot d\adddot}}, reviewof = {{Revisione\space di}{revisione\space di}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + with = {{with}{with}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, january = {{Gennaio}{Gennaio}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx index 61a352828df..594fe2e509a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx @@ -1,5 +1,4 @@ -% v4.7 -\ProvidesFile{ngerman-apa.lbx} +\ProvidesFile{ngerman-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations @@ -21,6 +20,11 @@ \NewBibliographyString{archivedat} \NewBibliographyString{origyear} \NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} \DeclareBibliographyStrings{% inherit = {ngerman}, @@ -37,6 +41,11 @@ november = {{November}{November}}, december = {{Dezember}{Dezember}}, revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{Produzent}{Produzent}}, + director = {{Regisseur}{Regisseur}}, + writer = {{Schriftsteller}{Schriftsteller}}, + with = {{mit}{mit}}, page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx index 5ea970378a2..a85ed039e37 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx @@ -1,5 +1,4 @@ -% v4.7 -\ProvidesFile{spanish-apa.lbx} +\ProvidesFile{spanish-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -23,6 +22,11 @@ \NewBibliographyString{archivedat} \NewBibliographyString{origyear} \NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} \DeclareBibliographyStrings{% inherit = {spanish}, @@ -42,6 +46,11 @@ mathesis = {{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}}, phdthesis = {{Tesis\addabbrvspace doctoral}{Tesis\addabbrvspace doctoral}}, revisededition = {{Edici\'on\space Revisada}{\'Ed\adddot\space R\'ev\adddot}}, + producer = {{producer}{producer}}, + execproducer = {{executive producer}{executive producer}}, + director = {{director}{director}}, + writer = {{writer}{writer}}, + with = {{with}{with}}, page = {{P\'agina}{{}p\adddot}}, pages = {{P\'aginas}{{}pp\adddot}}, on = {{el}{el}}, -- cgit v1.2.3