summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-22 22:04:45 +0000
committerKarl Berry <karl@freefriends.org>2013-07-22 22:04:45 +0000
commitd8c45c205a8c3d026e4db8c8af520b856e430463 (patch)
tree6a9dec763e855c3c3992d0c74601c6a928205572 /Master
parent6cc97d4684de46171247737d676c4cbf45afdbbf (diff)
apacite (22jul13)
git-svn-id: svn://tug.org/texlive/trunk@31264 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/bibtex/bst/apacite/apacann.bst453
-rw-r--r--Master/texmf-dist/bibtex/bst/apacite/apacannx.bst453
-rw-r--r--Master/texmf-dist/bibtex/bst/apacite/apacite.bst436
-rw-r--r--Master/texmf-dist/bibtex/bst/apacite/apacitex.bst436
-rw-r--r--Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib179
-rw-r--r--Master/texmf-dist/doc/bibtex/apacite/apacite.pdfbin628196 -> 622231 bytes
-rw-r--r--Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex86
-rw-r--r--Master/texmf-dist/source/bibtex/apacite/apacite.drv24
-rw-r--r--Master/texmf-dist/source/bibtex/apacite/apacite.dtx1532
-rw-r--r--Master/texmf-dist/tex/latex/apacite/apacdoc.sty16
-rw-r--r--Master/texmf-dist/tex/latex/apacite/apacite.sty50
-rw-r--r--Master/texmf-dist/tex/latex/apacite/dutch.apc2
-rw-r--r--Master/texmf-dist/tex/latex/apacite/english.apc2
-rw-r--r--Master/texmf-dist/tex/latex/apacite/finnish.apc2
-rw-r--r--Master/texmf-dist/tex/latex/apacite/german.apc2
-rw-r--r--Master/texmf-dist/tex/latex/apacite/greek.apc2
-rw-r--r--Master/texmf-dist/tex/latex/apacite/ngerman.apc2
-rw-r--r--Master/texmf-dist/tex/latex/apacite/norsk.apc2
-rw-r--r--Master/texmf-dist/tex/latex/apacite/spanish.apc2
-rw-r--r--Master/texmf-dist/tex/latex/apacite/swedish.apc2
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds14
22 files changed, 1999 insertions, 1700 deletions
diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacann.bst b/Master/texmf-dist/bibtex/bst/apacite/apacann.bst
index 7aa48c55c8c..1335e670175 100644
--- a/Master/texmf-dist/bibtex/bst/apacite/apacann.bst
+++ b/Master/texmf-dist/bibtex/bst/apacite/apacann.bst
@@ -43,7 +43,7 @@
%% the generated files.
%%
%% apacann.bst
-%% [2013/07/04 v6.02 APA annotated bibliography style]
+%% [2013/07/21 v6.03 APA annotated bibliography style]
%% apacann.bst : reference list according to APA manual
%% with annotations
%% Written by Erik Meijer
@@ -51,7 +51,7 @@
FUNCTION {identify.apacite.version}
{ % Put identifying string in the .blg file
"apacann.bst"
- " [2013/07/04 v6.02 APA annotated bibliography style]"
+ " [2013/07/21 v6.03 APA annotated bibliography style]"
* top$
}
ENTRY
@@ -139,6 +139,11 @@ STRINGS { s t u old.label field
year.label.old
}
FUNCTION {test} { #0 }
+FUNCTION {dump.stack}
+{ "---- STACK {" cite$ * "} ----" * top$
+ stack$
+ "---- END STACK {" cite$ * "} ----" * top$
+}
FUNCTION {make.index} { #0 }
FUNCTION {unsorted} { #0 }
MACRO {jan} {"{\APACmonth{01}}"}
@@ -621,9 +626,8 @@ FUNCTION {remove.spaces}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
- % starting new block by writing what's left on the stack,
- % starting a new line and adding some extra space or
- % whatever is more defined in \newblock
+ % end block by writing what's left on the stack and
+ % starting a new line
%
FUNCTION {output.end.block}
{ write$
@@ -632,14 +636,23 @@ FUNCTION {output.end.block}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+ % end block by adding a period and writing what's left
+ % on the stack and starting a new line
+ %
+FUNCTION {output.dot.end.block}
+{ add.period$
+ output.end.block
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %
% starting new block by writing what's left on the stack,
% starting a new line and adding some extra space or
% whatever is more defined in \newblock
%
FUNCTION {output.new.block}
{ output.end.block
- "\newblock" write$
- newline$
+ "\newblock" write$ newline$
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -659,8 +672,6 @@ FUNCTION {start.new.block}
{ "\unskip\ " write$ newline$
"\newblock " write$ newline$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {sort.name.format.classic} { "{ll{}}{ f{}}{ vv{}}{ jj{}}" }
@@ -2045,10 +2056,8 @@ FUNCTION {make.title.number}
FUNCTION {make.citeorder.number}
{ old.number #1 + 'cite.order :=
cite.order 'old.number :=
- cite.order conv.int.to.str citeorder.sort.label :=
+ cite.order conv.int.to.str 'citeorder.sort.label :=
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {last.part.name.format.classic} { "{ll}" }
@@ -3343,8 +3352,6 @@ FUNCTION {format.year.month.day.check}
"}" *
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {format.atitle.no.dot}
{ "{\BBOQ}" swap$
"{\BBCQ}" swap$
@@ -3807,16 +3814,6 @@ FUNCTION { format.type.number }
if$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format howpublished if not empty,
- % for various entry types
- % call with
- % format.howpublished
- %
FUNCTION {format.howpublished}
{ howpublished empty$
'skip$
@@ -3829,14 +3826,6 @@ FUNCTION {format.howpublished}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format howpublished if not empty,
- % for misc
- % call with
- % output.howpublished
- %
FUNCTION {output.howpublished}
{ howpublished empty$
'skip$
@@ -3845,9 +3834,15 @@ FUNCTION {output.howpublished}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+FUNCTION {howpublished.block}
+{ howpublished empty$
+ 'skip$
+ { start.new.block
+ "\APAChowpublished {" howpublished * "}" *
+ output.dot.end.block
+ }
+ if$
+}
FUNCTION {begin.end.url.env}
{ "\begin{APACrefURL} "
lastchecked empty$
@@ -3870,18 +3865,8 @@ FUNCTION {begin.end.msg.env}
{ "\begin{APACrefURLmsg} "
" \end{APACrefURLmsg} "
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format url given that it is not empty,
- % for various entry types
- % call with
- % format.url
- %
FUNCTION {format.url}
-{ % First format begin and end of the enclosing environment.
- % With posted messages, a different environment is used.
- type.2 empty$
+{ type.2 empty$
{ begin.end.url.env }
{ type.2 "\bibmessage" =
{ begin.end.msg.env }
@@ -3889,37 +3874,47 @@ FUNCTION {format.url}
if$
}
if$
- % The url string.
"\url{" url * "}" *
- % Enclose in begin and end environment
enclose.check
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format doi given that it is not empty,
- % for various entry types
- % call with
- % format.doi
- %
+FUNCTION {url.block}
+{ doi empty$
+ { url empty$
+ 'skip$
+ { start.new.block
+ format.url
+ output.end.block
+ }
+ if$
+ }
+ 'skip$
+ if$
+}
FUNCTION {format.doi}
-{ % First format begin and end of the enclosing environment.
- begin.end.doi.env
- % The doi string.
+{ begin.end.doi.env
"\doi{" doi * "}" *
- % Enclose in begin and end environment
enclose.check
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format optional note
- %
+FUNCTION {doi.block}
+{ doi empty$
+ 'skip$
+ { start.new.block
+ format.doi
+ output.end.block
+ }
+ if$
+}
FUNCTION {format.note}
{ "\APACrefnote{" "}" note enclose.check }
+FUNCTION {note.block}
+{ note empty$
+ 'skip$
+ { start.new.block
+ format.note
+ output.end.block
+ }
+ if$
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -4015,20 +4010,14 @@ FUNCTION {format.orig.note}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % finish current entry
- % by writing what's left on the stack and starting a new line
- %
FUNCTION {fin.entry}
{ doi empty$
- { output.end.block }
+ 'skip$
{ output.new.block
format.doi
- output.end.block
}
if$
+ output.end.block
"\PrintBackRefs{\CurrentBib}" write$ newline$
test
{ "\vspace{\baselineskip}" write$ newline$ }
@@ -4059,8 +4048,31 @@ FUNCTION {fin.entry}
}
if$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+FUNCTION {fin.entry.2}
+{ doi.block
+ "\PrintBackRefs{\CurrentBib}" write$ newline$
+ test
+ { "\vspace{\baselineskip}" write$ newline$ }
+ 'skip$
+ if$
+ annote empty$
+ {% Try annotate
+ annotate empty$
+ 'skip$
+ { % add annotation
+ "\begin{APACrefannotation}" write$ newline$
+ annotate write$ newline$
+ "\end{APACrefannotation}" write$ newline$
+ }
+ if$
+ }
+ { % add annotation
+ "\begin{APACrefannotation}" write$ newline$
+ annote write$ newline$
+ "\end{APACrefannotation}" write$ newline$
+ }
+ if$
+}
FUNCTION {periodical}
{
author empty$
@@ -4363,8 +4375,13 @@ FUNCTION {format.tr.title.number}
% warning if no institution
%
FUNCTION {format.address.institution.check}
-{ "institution" institution warning.if.empty
- "address" address warning.if.empty
+{ url empty$
+ doi empty$ and
+ { "institution" institution warning.if.empty
+ "address" address warning.if.empty
+ }
+ 'skip$
+ if$
institution empty$
address empty$
and
@@ -4623,122 +4640,95 @@ FUNCTION {lecture}
fin.entry
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % default thesis type is on top of stack
- % now, if type field is empty, this default is used
- % else default is removed and replaced by value of
- % type field
- %
-FUNCTION {format.type.school}
-{ type empty$
- 'skip$
- { pop$
- type "t" change.case$
- }
- if$
- school connect.with.comma.check
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % phd theses, etc.
- % call with
- % "default.published.thesis" "default.unpublished.thesis" thesis
- %
-FUNCTION {thesis}
-{ author empty$
- { "author" author warning.if.empty }
- { format.authors start.new.block }
+FUNCTION {format.ttitle.type.school}
+{ doi empty$ not
+ url empty$ not or
+ howpublished empty$ not or
+ { pop$ }
+ { swap$ pop$ }
if$
- %
- % format year and check if year present
- %
- format.year.check output.dot.new.block
- %
- % format title and check if title present
- % journal empty => unpublished PhD thesis
- % journal not empty => published (e.g., Dissertation Abstracts Int.)
- %
- journal empty$
- { format.btitle.vol.edition output.dot.new.block
- %
- % pop default unpublished thesis, top is default published thesis
- %
- swap$ pop$
- format.type.school
- address connect.with.comma.check
- }
- %
- % pop default published thesis, top is default unpublished thesis
- %
- { pop$
- type empty$
- school empty$ and
- originalyear empty$ and
+ type empty$
+ 'skip$
+ { type "\bibnotype" =
{ pop$
""
}
- { format.type.school
- originalyear connect.with.comma.check
- parenthesize.check
+ { pop$
+ type
}
if$
- format.aetitle.check
- swap$ connect.with.space.check
- "title" title warning.if.empty
- title format.atitle.connect output.new.block
- pages format.journal.vol.num.pages.check
}
if$
- %
- % if not empty, insert howpublished.
- % (used if thesis is retrieved from the internet)
- %
- format.howpublished add.period$
- %
- % format url
- %
- url empty$
- 'skip$
- { % Clear the stack
- duplicate$ empty$
+ duplicate$ empty$
+ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ address empty$
+ school empty$ and or and
+ { 'pop$
+ title empty$ not
+ englishtitle empty$ not or
+ { start.new.block }
'skip$
- { output.new.block }
if$
- format.url
+ ""
+ }
+ { start.new.block
+ "\APACtypeAddressSchool {" swap$ * "}{" *
+ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ { "}{}" * }
+ { address "" connect.check "}{" *
+ school "" connect.check "}" *
+ }
+ if$
}
if$
- %
- % format optional note
- %
- note empty$
- 'skip$
- { % Clear the stack
- duplicate$ empty$
+ format.betitle.check swap$
+ connect.with.space.check
+ "title" title warning.if.empty
+ title format.btitle.connect
+}
+FUNCTION {unpub.address.school.block}
+{ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ { "school" school warning.if.empty
+ school empty$
+ address empty$ and
'skip$
- { output.new.block }
+ { start.new.block
+ "\APACaddressSchool {" address "" connect.check "}{" *
+ school "" connect.check "}" *
+ output.dot.end.block
+ }
if$
- format.note
+ }
+ 'skip$
+ if$
+}
+FUNCTION {thesis}
+{ journal empty$ not
+ { pop$ pop$
+ article
+ }
+ { author empty$
+ { "author" author warning.if.empty }
+ { format.authors start.new.block }
+ if$
+ format.year.check output.dot.end.block
+ format.ttitle.type.school output.dot.end.block
+ unpub.address.school.block
+ howpublished.block
+ url.block
+ note.block
+ fin.entry.2
}
if$
- fin.entry
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % phd theses, etc.
- %
FUNCTION {phdthesis}
{ "\BPhD" "\BUPhD" thesis }
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % master's theses, etc.
- %
FUNCTION {mastersthesis}
{ "\BMTh" "\BUMTh" thesis }
@@ -5027,11 +5017,6 @@ FUNCTION {manual}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
- % following functions not used for APA Manual examples
- %
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
% booklet
%
FUNCTION {booklet}
@@ -5072,57 +5057,24 @@ FUNCTION {proceedings}
FUNCTION {default.type}
{ misc }
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {initialize}
-{ %
- % Maximum number of names to be formatted .
+{
#6 'name.max :=
%% #250 'entry.max$ :=
%% #5000 'global.max$ :=
}
-
FUNCTION {init.old.number}
-{ %
- % For numbering the entries according to current sorting order.
- #0 'old.number :=
-}
-
+{ #0 'old.number := }
FUNCTION {init.old.label}
-{ %
- % For comparing labels across entries .
- "zzzzzz" 'old.label :=
-}
-
+{ "zzzzzz" 'old.label := }
FUNCTION {init.cite.initials.add.to.year}
-{ %
- % Initialize "cite initials" indicator for all entries.
- #0 'cite.initials :=
- %
- % Initialize "add to year", i.e., whether a, b, etc. must
- % be added to the year in citation, to "no".
+{ #0 'cite.initials :=
#0 'add.to.year :=
- %
}
-
FUNCTION {move.forward}
-{ %
- % Indicates that we're moving forward (ITERATE) through the entry list .
- #1 'forward :=
-}
-
+{ #1 'forward := }
FUNCTION {move.backward}
-{ %
- % Indicates that we're moving backward (REVERSE) through the entry list .
- #0 'forward :=
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+{ #0 'forward := }
FUNCTION {begin.bib}
{ preamble$ empty$
'skip$
@@ -5130,101 +5082,44 @@ FUNCTION {begin.bib}
if$
"\begin{thebibliography}{}" write$ newline$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {end.bib}
{ newline$
"\end{thebibliography}" write$ newline$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {write.bbl.entry}
-{ %
- % Output \bibitem and \citeauthoryear command.
- %
+{
make.cite.labels
- %
- % Format and output reference list entry.
- %
call.type$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
READ
-
-
EXECUTE { identify.apacite.version }
-
-
EXECUTE { initialize }
-
-
EXECUTE { init.old.number }
-
ITERATE { make.citeorder.number }
-
-
ITERATE { make.sort.title }
-
SORT
-
EXECUTE { init.old.number }
-
EXECUTE { init.old.label }
-
ITERATE { make.title.number }
-
-
ITERATE { make.tentative.sort.label }
-
SORT
-
-
ITERATE { init.cite.initials.add.to.year }
-
EXECUTE { init.initials }
-
ITERATE { check.add.initials }
-
EXECUTE { init.initials }
-
REVERSE { check.add.initials }
-
ITERATE { tentative.cite.num.names }
-
EXECUTE { init.cite.num.names }
-
EXECUTE { move.forward }
-
ITERATE { definitive.cite.num.names }
-
EXECUTE { init.cite.num.names }
-
EXECUTE { move.backward }
-
REVERSE { definitive.cite.num.names }
-
-
ITERATE { make.final.sort.key }
-
SORT
-
-
EXECUTE { begin.bib }
-
-
ITERATE { write.bbl.entry }
-
-
EXECUTE { end.bib }
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
%%
%% End of file `apacann.bst'.
diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst b/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst
index 79e3ddb0b96..90bf644d606 100644
--- a/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst
+++ b/Master/texmf-dist/bibtex/bst/apacite/apacannx.bst
@@ -43,7 +43,7 @@
%% the generated files.
%%
%% apacannx.bst
-%% [2013/07/04 v6.02 APA annotated bibl. style with author index info]
+%% [2013/07/21 v6.03 APA annotated bibl. style with author index info]
%% apacannx.bst : reference list according to APA manual
%% with annotations and author indexing information
%% Written by Erik Meijer
@@ -51,7 +51,7 @@
FUNCTION {identify.apacite.version}
{ % Put identifying string in the .blg file
"apacannx.bst"
-" [2013/07/04 v6.02 APA annotated bibl. style with author index info]"
+" [2013/07/21 v6.03 APA annotated bibl. style with author index info]"
* top$
}
ENTRY
@@ -139,6 +139,11 @@ STRINGS { s t u old.label field
year.label.old
}
FUNCTION {test} { #0 }
+FUNCTION {dump.stack}
+{ "---- STACK {" cite$ * "} ----" * top$
+ stack$
+ "---- END STACK {" cite$ * "} ----" * top$
+}
FUNCTION {make.index} { #1 }
FUNCTION {unsorted} { #0 }
MACRO {jan} {"{\APACmonth{01}}"}
@@ -621,9 +626,8 @@ FUNCTION {remove.spaces}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
- % starting new block by writing what's left on the stack,
- % starting a new line and adding some extra space or
- % whatever is more defined in \newblock
+ % end block by writing what's left on the stack and
+ % starting a new line
%
FUNCTION {output.end.block}
{ write$
@@ -632,14 +636,23 @@ FUNCTION {output.end.block}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+ % end block by adding a period and writing what's left
+ % on the stack and starting a new line
+ %
+FUNCTION {output.dot.end.block}
+{ add.period$
+ output.end.block
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %
% starting new block by writing what's left on the stack,
% starting a new line and adding some extra space or
% whatever is more defined in \newblock
%
FUNCTION {output.new.block}
{ output.end.block
- "\newblock" write$
- newline$
+ "\newblock" write$ newline$
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -659,8 +672,6 @@ FUNCTION {start.new.block}
{ "\unskip\ " write$ newline$
"\newblock " write$ newline$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {sort.name.format.classic} { "{ll{}}{ f{}}{ vv{}}{ jj{}}" }
@@ -2045,10 +2056,8 @@ FUNCTION {make.title.number}
FUNCTION {make.citeorder.number}
{ old.number #1 + 'cite.order :=
cite.order 'old.number :=
- cite.order conv.int.to.str citeorder.sort.label :=
+ cite.order conv.int.to.str 'citeorder.sort.label :=
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {last.part.name.format.classic} { "{ll}" }
@@ -3343,8 +3352,6 @@ FUNCTION {format.year.month.day.check}
"}" *
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {format.atitle.no.dot}
{ "{\BBOQ}" swap$
"{\BBCQ}" swap$
@@ -3807,16 +3814,6 @@ FUNCTION { format.type.number }
if$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format howpublished if not empty,
- % for various entry types
- % call with
- % format.howpublished
- %
FUNCTION {format.howpublished}
{ howpublished empty$
'skip$
@@ -3829,14 +3826,6 @@ FUNCTION {format.howpublished}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format howpublished if not empty,
- % for misc
- % call with
- % output.howpublished
- %
FUNCTION {output.howpublished}
{ howpublished empty$
'skip$
@@ -3845,9 +3834,15 @@ FUNCTION {output.howpublished}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+FUNCTION {howpublished.block}
+{ howpublished empty$
+ 'skip$
+ { start.new.block
+ "\APAChowpublished {" howpublished * "}" *
+ output.dot.end.block
+ }
+ if$
+}
FUNCTION {begin.end.url.env}
{ "\begin{APACrefURL} "
lastchecked empty$
@@ -3870,18 +3865,8 @@ FUNCTION {begin.end.msg.env}
{ "\begin{APACrefURLmsg} "
" \end{APACrefURLmsg} "
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format url given that it is not empty,
- % for various entry types
- % call with
- % format.url
- %
FUNCTION {format.url}
-{ % First format begin and end of the enclosing environment.
- % With posted messages, a different environment is used.
- type.2 empty$
+{ type.2 empty$
{ begin.end.url.env }
{ type.2 "\bibmessage" =
{ begin.end.msg.env }
@@ -3889,37 +3874,47 @@ FUNCTION {format.url}
if$
}
if$
- % The url string.
"\url{" url * "}" *
- % Enclose in begin and end environment
enclose.check
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format doi given that it is not empty,
- % for various entry types
- % call with
- % format.doi
- %
+FUNCTION {url.block}
+{ doi empty$
+ { url empty$
+ 'skip$
+ { start.new.block
+ format.url
+ output.end.block
+ }
+ if$
+ }
+ 'skip$
+ if$
+}
FUNCTION {format.doi}
-{ % First format begin and end of the enclosing environment.
- begin.end.doi.env
- % The doi string.
+{ begin.end.doi.env
"\doi{" doi * "}" *
- % Enclose in begin and end environment
enclose.check
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format optional note
- %
+FUNCTION {doi.block}
+{ doi empty$
+ 'skip$
+ { start.new.block
+ format.doi
+ output.end.block
+ }
+ if$
+}
FUNCTION {format.note}
{ "\APACrefnote{" "}" note enclose.check }
+FUNCTION {note.block}
+{ note empty$
+ 'skip$
+ { start.new.block
+ format.note
+ output.end.block
+ }
+ if$
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -4015,20 +4010,14 @@ FUNCTION {format.orig.note}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % finish current entry
- % by writing what's left on the stack and starting a new line
- %
FUNCTION {fin.entry}
{ doi empty$
- { output.end.block }
+ 'skip$
{ output.new.block
format.doi
- output.end.block
}
if$
+ output.end.block
"\PrintBackRefs{\CurrentBib}" write$ newline$
test
{ "\vspace{\baselineskip}" write$ newline$ }
@@ -4059,8 +4048,31 @@ FUNCTION {fin.entry}
}
if$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+FUNCTION {fin.entry.2}
+{ doi.block
+ "\PrintBackRefs{\CurrentBib}" write$ newline$
+ test
+ { "\vspace{\baselineskip}" write$ newline$ }
+ 'skip$
+ if$
+ annote empty$
+ {% Try annotate
+ annotate empty$
+ 'skip$
+ { % add annotation
+ "\begin{APACrefannotation}" write$ newline$
+ annotate write$ newline$
+ "\end{APACrefannotation}" write$ newline$
+ }
+ if$
+ }
+ { % add annotation
+ "\begin{APACrefannotation}" write$ newline$
+ annote write$ newline$
+ "\end{APACrefannotation}" write$ newline$
+ }
+ if$
+}
FUNCTION {periodical}
{
author empty$
@@ -4363,8 +4375,13 @@ FUNCTION {format.tr.title.number}
% warning if no institution
%
FUNCTION {format.address.institution.check}
-{ "institution" institution warning.if.empty
- "address" address warning.if.empty
+{ url empty$
+ doi empty$ and
+ { "institution" institution warning.if.empty
+ "address" address warning.if.empty
+ }
+ 'skip$
+ if$
institution empty$
address empty$
and
@@ -4623,122 +4640,95 @@ FUNCTION {lecture}
fin.entry
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % default thesis type is on top of stack
- % now, if type field is empty, this default is used
- % else default is removed and replaced by value of
- % type field
- %
-FUNCTION {format.type.school}
-{ type empty$
- 'skip$
- { pop$
- type "t" change.case$
- }
- if$
- school connect.with.comma.check
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % phd theses, etc.
- % call with
- % "default.published.thesis" "default.unpublished.thesis" thesis
- %
-FUNCTION {thesis}
-{ author empty$
- { "author" author warning.if.empty }
- { format.authors start.new.block }
+FUNCTION {format.ttitle.type.school}
+{ doi empty$ not
+ url empty$ not or
+ howpublished empty$ not or
+ { pop$ }
+ { swap$ pop$ }
if$
- %
- % format year and check if year present
- %
- format.year.check output.dot.new.block
- %
- % format title and check if title present
- % journal empty => unpublished PhD thesis
- % journal not empty => published (e.g., Dissertation Abstracts Int.)
- %
- journal empty$
- { format.btitle.vol.edition output.dot.new.block
- %
- % pop default unpublished thesis, top is default published thesis
- %
- swap$ pop$
- format.type.school
- address connect.with.comma.check
- }
- %
- % pop default published thesis, top is default unpublished thesis
- %
- { pop$
- type empty$
- school empty$ and
- originalyear empty$ and
+ type empty$
+ 'skip$
+ { type "\bibnotype" =
{ pop$
""
}
- { format.type.school
- originalyear connect.with.comma.check
- parenthesize.check
+ { pop$
+ type
}
if$
- format.aetitle.check
- swap$ connect.with.space.check
- "title" title warning.if.empty
- title format.atitle.connect output.new.block
- pages format.journal.vol.num.pages.check
}
if$
- %
- % if not empty, insert howpublished.
- % (used if thesis is retrieved from the internet)
- %
- format.howpublished add.period$
- %
- % format url
- %
- url empty$
- 'skip$
- { % Clear the stack
- duplicate$ empty$
+ duplicate$ empty$
+ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ address empty$
+ school empty$ and or and
+ { 'pop$
+ title empty$ not
+ englishtitle empty$ not or
+ { start.new.block }
'skip$
- { output.new.block }
if$
- format.url
+ ""
+ }
+ { start.new.block
+ "\APACtypeAddressSchool {" swap$ * "}{" *
+ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ { "}{}" * }
+ { address "" connect.check "}{" *
+ school "" connect.check "}" *
+ }
+ if$
}
if$
- %
- % format optional note
- %
- note empty$
- 'skip$
- { % Clear the stack
- duplicate$ empty$
+ format.betitle.check swap$
+ connect.with.space.check
+ "title" title warning.if.empty
+ title format.btitle.connect
+}
+FUNCTION {unpub.address.school.block}
+{ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ { "school" school warning.if.empty
+ school empty$
+ address empty$ and
'skip$
- { output.new.block }
+ { start.new.block
+ "\APACaddressSchool {" address "" connect.check "}{" *
+ school "" connect.check "}" *
+ output.dot.end.block
+ }
if$
- format.note
+ }
+ 'skip$
+ if$
+}
+FUNCTION {thesis}
+{ journal empty$ not
+ { pop$ pop$
+ article
+ }
+ { author empty$
+ { "author" author warning.if.empty }
+ { format.authors start.new.block }
+ if$
+ format.year.check output.dot.end.block
+ format.ttitle.type.school output.dot.end.block
+ unpub.address.school.block
+ howpublished.block
+ url.block
+ note.block
+ fin.entry.2
}
if$
- fin.entry
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % phd theses, etc.
- %
FUNCTION {phdthesis}
{ "\BPhD" "\BUPhD" thesis }
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % master's theses, etc.
- %
FUNCTION {mastersthesis}
{ "\BMTh" "\BUMTh" thesis }
@@ -5027,11 +5017,6 @@ FUNCTION {manual}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
- % following functions not used for APA Manual examples
- %
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
% booklet
%
FUNCTION {booklet}
@@ -5072,57 +5057,24 @@ FUNCTION {proceedings}
FUNCTION {default.type}
{ misc }
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {initialize}
-{ %
- % Maximum number of names to be formatted .
+{
#6 'name.max :=
%% #250 'entry.max$ :=
%% #5000 'global.max$ :=
}
-
FUNCTION {init.old.number}
-{ %
- % For numbering the entries according to current sorting order.
- #0 'old.number :=
-}
-
+{ #0 'old.number := }
FUNCTION {init.old.label}
-{ %
- % For comparing labels across entries .
- "zzzzzz" 'old.label :=
-}
-
+{ "zzzzzz" 'old.label := }
FUNCTION {init.cite.initials.add.to.year}
-{ %
- % Initialize "cite initials" indicator for all entries.
- #0 'cite.initials :=
- %
- % Initialize "add to year", i.e., whether a, b, etc. must
- % be added to the year in citation, to "no".
+{ #0 'cite.initials :=
#0 'add.to.year :=
- %
}
-
FUNCTION {move.forward}
-{ %
- % Indicates that we're moving forward (ITERATE) through the entry list .
- #1 'forward :=
-}
-
+{ #1 'forward := }
FUNCTION {move.backward}
-{ %
- % Indicates that we're moving backward (REVERSE) through the entry list .
- #0 'forward :=
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+{ #0 'forward := }
FUNCTION {begin.bib}
{ preamble$ empty$
'skip$
@@ -5130,101 +5082,44 @@ FUNCTION {begin.bib}
if$
"\begin{thebibliography}{}" write$ newline$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {end.bib}
{ newline$
"\end{thebibliography}" write$ newline$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {write.bbl.entry}
-{ %
- % Output \bibitem and \citeauthoryear command.
- %
+{
make.cite.labels
- %
- % Format and output reference list entry.
- %
call.type$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
READ
-
-
EXECUTE { identify.apacite.version }
-
-
EXECUTE { initialize }
-
-
EXECUTE { init.old.number }
-
ITERATE { make.citeorder.number }
-
-
ITERATE { make.sort.title }
-
SORT
-
EXECUTE { init.old.number }
-
EXECUTE { init.old.label }
-
ITERATE { make.title.number }
-
-
ITERATE { make.tentative.sort.label }
-
SORT
-
-
ITERATE { init.cite.initials.add.to.year }
-
EXECUTE { init.initials }
-
ITERATE { check.add.initials }
-
EXECUTE { init.initials }
-
REVERSE { check.add.initials }
-
ITERATE { tentative.cite.num.names }
-
EXECUTE { init.cite.num.names }
-
EXECUTE { move.forward }
-
ITERATE { definitive.cite.num.names }
-
EXECUTE { init.cite.num.names }
-
EXECUTE { move.backward }
-
REVERSE { definitive.cite.num.names }
-
-
ITERATE { make.final.sort.key }
-
SORT
-
-
EXECUTE { begin.bib }
-
-
ITERATE { write.bbl.entry }
-
-
EXECUTE { end.bib }
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
%%
%% End of file `apacannx.bst'.
diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacite.bst b/Master/texmf-dist/bibtex/bst/apacite/apacite.bst
index fc6365ea3a7..e0ed8ae56e4 100644
--- a/Master/texmf-dist/bibtex/bst/apacite/apacite.bst
+++ b/Master/texmf-dist/bibtex/bst/apacite/apacite.bst
@@ -43,14 +43,14 @@
%% the generated files.
%%
%% apacite.bst
-%% [2013/07/04 v6.02 APA bibliography style]
+%% [2013/07/21 v6.03 APA bibliography style]
%% apacite.bst : reference list according to APA manual
%% Written by Erik Meijer
FUNCTION {identify.apacite.version}
{ % Put identifying string in the .blg file
"apacite.bst"
- " [2013/07/04 v6.02 APA bibliography style]"
+ " [2013/07/21 v6.03 APA bibliography style]"
* top$
}
ENTRY
@@ -138,6 +138,11 @@ STRINGS { s t u old.label field
year.label.old
}
FUNCTION {test} { #0 }
+FUNCTION {dump.stack}
+{ "---- STACK {" cite$ * "} ----" * top$
+ stack$
+ "---- END STACK {" cite$ * "} ----" * top$
+}
FUNCTION {make.index} { #0 }
FUNCTION {unsorted} { #0 }
MACRO {jan} {"{\APACmonth{01}}"}
@@ -620,9 +625,8 @@ FUNCTION {remove.spaces}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
- % starting new block by writing what's left on the stack,
- % starting a new line and adding some extra space or
- % whatever is more defined in \newblock
+ % end block by writing what's left on the stack and
+ % starting a new line
%
FUNCTION {output.end.block}
{ write$
@@ -631,14 +635,23 @@ FUNCTION {output.end.block}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+ % end block by adding a period and writing what's left
+ % on the stack and starting a new line
+ %
+FUNCTION {output.dot.end.block}
+{ add.period$
+ output.end.block
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %
% starting new block by writing what's left on the stack,
% starting a new line and adding some extra space or
% whatever is more defined in \newblock
%
FUNCTION {output.new.block}
{ output.end.block
- "\newblock" write$
- newline$
+ "\newblock" write$ newline$
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -658,8 +671,6 @@ FUNCTION {start.new.block}
{ "\unskip\ " write$ newline$
"\newblock " write$ newline$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {sort.name.format.classic} { "{ll{}}{ f{}}{ vv{}}{ jj{}}" }
@@ -2044,10 +2055,8 @@ FUNCTION {make.title.number}
FUNCTION {make.citeorder.number}
{ old.number #1 + 'cite.order :=
cite.order 'old.number :=
- cite.order conv.int.to.str citeorder.sort.label :=
+ cite.order conv.int.to.str 'citeorder.sort.label :=
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {last.part.name.format.classic} { "{ll}" }
@@ -3342,8 +3351,6 @@ FUNCTION {format.year.month.day.check}
"}" *
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {format.atitle.no.dot}
{ "{\BBOQ}" swap$
"{\BBCQ}" swap$
@@ -3806,16 +3813,6 @@ FUNCTION { format.type.number }
if$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format howpublished if not empty,
- % for various entry types
- % call with
- % format.howpublished
- %
FUNCTION {format.howpublished}
{ howpublished empty$
'skip$
@@ -3828,14 +3825,6 @@ FUNCTION {format.howpublished}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format howpublished if not empty,
- % for misc
- % call with
- % output.howpublished
- %
FUNCTION {output.howpublished}
{ howpublished empty$
'skip$
@@ -3844,9 +3833,15 @@ FUNCTION {output.howpublished}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+FUNCTION {howpublished.block}
+{ howpublished empty$
+ 'skip$
+ { start.new.block
+ "\APAChowpublished {" howpublished * "}" *
+ output.dot.end.block
+ }
+ if$
+}
FUNCTION {begin.end.url.env}
{ "\begin{APACrefURL} "
lastchecked empty$
@@ -3869,18 +3864,8 @@ FUNCTION {begin.end.msg.env}
{ "\begin{APACrefURLmsg} "
" \end{APACrefURLmsg} "
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format url given that it is not empty,
- % for various entry types
- % call with
- % format.url
- %
FUNCTION {format.url}
-{ % First format begin and end of the enclosing environment.
- % With posted messages, a different environment is used.
- type.2 empty$
+{ type.2 empty$
{ begin.end.url.env }
{ type.2 "\bibmessage" =
{ begin.end.msg.env }
@@ -3888,37 +3873,47 @@ FUNCTION {format.url}
if$
}
if$
- % The url string.
"\url{" url * "}" *
- % Enclose in begin and end environment
enclose.check
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format doi given that it is not empty,
- % for various entry types
- % call with
- % format.doi
- %
+FUNCTION {url.block}
+{ doi empty$
+ { url empty$
+ 'skip$
+ { start.new.block
+ format.url
+ output.end.block
+ }
+ if$
+ }
+ 'skip$
+ if$
+}
FUNCTION {format.doi}
-{ % First format begin and end of the enclosing environment.
- begin.end.doi.env
- % The doi string.
+{ begin.end.doi.env
"\doi{" doi * "}" *
- % Enclose in begin and end environment
enclose.check
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format optional note
- %
+FUNCTION {doi.block}
+{ doi empty$
+ 'skip$
+ { start.new.block
+ format.doi
+ output.end.block
+ }
+ if$
+}
FUNCTION {format.note}
{ "\APACrefnote{" "}" note enclose.check }
+FUNCTION {note.block}
+{ note empty$
+ 'skip$
+ { start.new.block
+ format.note
+ output.end.block
+ }
+ if$
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -4014,28 +4009,28 @@ FUNCTION {format.orig.note}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % finish current entry
- % by writing what's left on the stack and starting a new line
- %
FUNCTION {fin.entry}
{ doi empty$
- { output.end.block }
+ 'skip$
{ output.new.block
format.doi
- output.end.block
}
if$
+ output.end.block
+ "\PrintBackRefs{\CurrentBib}" write$ newline$
+ test
+ { "\vspace{\baselineskip}" write$ newline$ }
+ 'skip$
+ if$
+}
+FUNCTION {fin.entry.2}
+{ doi.block
"\PrintBackRefs{\CurrentBib}" write$ newline$
test
{ "\vspace{\baselineskip}" write$ newline$ }
'skip$
if$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {periodical}
{
author empty$
@@ -4338,8 +4333,13 @@ FUNCTION {format.tr.title.number}
% warning if no institution
%
FUNCTION {format.address.institution.check}
-{ "institution" institution warning.if.empty
- "address" address warning.if.empty
+{ url empty$
+ doi empty$ and
+ { "institution" institution warning.if.empty
+ "address" address warning.if.empty
+ }
+ 'skip$
+ if$
institution empty$
address empty$
and
@@ -4598,122 +4598,95 @@ FUNCTION {lecture}
fin.entry
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % default thesis type is on top of stack
- % now, if type field is empty, this default is used
- % else default is removed and replaced by value of
- % type field
- %
-FUNCTION {format.type.school}
-{ type empty$
- 'skip$
- { pop$
- type "t" change.case$
- }
- if$
- school connect.with.comma.check
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % phd theses, etc.
- % call with
- % "default.published.thesis" "default.unpublished.thesis" thesis
- %
-FUNCTION {thesis}
-{ author empty$
- { "author" author warning.if.empty }
- { format.authors start.new.block }
+FUNCTION {format.ttitle.type.school}
+{ doi empty$ not
+ url empty$ not or
+ howpublished empty$ not or
+ { pop$ }
+ { swap$ pop$ }
if$
- %
- % format year and check if year present
- %
- format.year.check output.dot.new.block
- %
- % format title and check if title present
- % journal empty => unpublished PhD thesis
- % journal not empty => published (e.g., Dissertation Abstracts Int.)
- %
- journal empty$
- { format.btitle.vol.edition output.dot.new.block
- %
- % pop default unpublished thesis, top is default published thesis
- %
- swap$ pop$
- format.type.school
- address connect.with.comma.check
- }
- %
- % pop default published thesis, top is default unpublished thesis
- %
- { pop$
- type empty$
- school empty$ and
- originalyear empty$ and
+ type empty$
+ 'skip$
+ { type "\bibnotype" =
{ pop$
""
}
- { format.type.school
- originalyear connect.with.comma.check
- parenthesize.check
+ { pop$
+ type
}
if$
- format.aetitle.check
- swap$ connect.with.space.check
- "title" title warning.if.empty
- title format.atitle.connect output.new.block
- pages format.journal.vol.num.pages.check
}
if$
- %
- % if not empty, insert howpublished.
- % (used if thesis is retrieved from the internet)
- %
- format.howpublished add.period$
- %
- % format url
- %
- url empty$
- 'skip$
- { % Clear the stack
- duplicate$ empty$
+ duplicate$ empty$
+ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ address empty$
+ school empty$ and or and
+ { 'pop$
+ title empty$ not
+ englishtitle empty$ not or
+ { start.new.block }
'skip$
- { output.new.block }
if$
- format.url
+ ""
+ }
+ { start.new.block
+ "\APACtypeAddressSchool {" swap$ * "}{" *
+ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ { "}{}" * }
+ { address "" connect.check "}{" *
+ school "" connect.check "}" *
+ }
+ if$
}
if$
- %
- % format optional note
- %
- note empty$
- 'skip$
- { % Clear the stack
- duplicate$ empty$
+ format.betitle.check swap$
+ connect.with.space.check
+ "title" title warning.if.empty
+ title format.btitle.connect
+}
+FUNCTION {unpub.address.school.block}
+{ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ { "school" school warning.if.empty
+ school empty$
+ address empty$ and
'skip$
- { output.new.block }
+ { start.new.block
+ "\APACaddressSchool {" address "" connect.check "}{" *
+ school "" connect.check "}" *
+ output.dot.end.block
+ }
if$
- format.note
+ }
+ 'skip$
+ if$
+}
+FUNCTION {thesis}
+{ journal empty$ not
+ { pop$ pop$
+ article
+ }
+ { author empty$
+ { "author" author warning.if.empty }
+ { format.authors start.new.block }
+ if$
+ format.year.check output.dot.end.block
+ format.ttitle.type.school output.dot.end.block
+ unpub.address.school.block
+ howpublished.block
+ url.block
+ note.block
+ fin.entry.2
}
if$
- fin.entry
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % phd theses, etc.
- %
FUNCTION {phdthesis}
{ "\BPhD" "\BUPhD" thesis }
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % master's theses, etc.
- %
FUNCTION {mastersthesis}
{ "\BMTh" "\BUMTh" thesis }
@@ -5002,11 +4975,6 @@ FUNCTION {manual}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
- % following functions not used for APA Manual examples
- %
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
% booklet
%
FUNCTION {booklet}
@@ -5047,57 +5015,24 @@ FUNCTION {proceedings}
FUNCTION {default.type}
{ misc }
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {initialize}
-{ %
- % Maximum number of names to be formatted .
+{
#6 'name.max :=
%% #250 'entry.max$ :=
%% #5000 'global.max$ :=
}
-
FUNCTION {init.old.number}
-{ %
- % For numbering the entries according to current sorting order.
- #0 'old.number :=
-}
-
+{ #0 'old.number := }
FUNCTION {init.old.label}
-{ %
- % For comparing labels across entries .
- "zzzzzz" 'old.label :=
-}
-
+{ "zzzzzz" 'old.label := }
FUNCTION {init.cite.initials.add.to.year}
-{ %
- % Initialize "cite initials" indicator for all entries.
- #0 'cite.initials :=
- %
- % Initialize "add to year", i.e., whether a, b, etc. must
- % be added to the year in citation, to "no".
+{ #0 'cite.initials :=
#0 'add.to.year :=
- %
}
-
FUNCTION {move.forward}
-{ %
- % Indicates that we're moving forward (ITERATE) through the entry list .
- #1 'forward :=
-}
-
+{ #1 'forward := }
FUNCTION {move.backward}
-{ %
- % Indicates that we're moving backward (REVERSE) through the entry list .
- #0 'forward :=
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+{ #0 'forward := }
FUNCTION {begin.bib}
{ preamble$ empty$
'skip$
@@ -5105,101 +5040,44 @@ FUNCTION {begin.bib}
if$
"\begin{thebibliography}{}" write$ newline$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {end.bib}
{ newline$
"\end{thebibliography}" write$ newline$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {write.bbl.entry}
-{ %
- % Output \bibitem and \citeauthoryear command.
- %
+{
make.cite.labels
- %
- % Format and output reference list entry.
- %
call.type$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
READ
-
-
EXECUTE { identify.apacite.version }
-
-
EXECUTE { initialize }
-
-
EXECUTE { init.old.number }
-
ITERATE { make.citeorder.number }
-
-
ITERATE { make.sort.title }
-
SORT
-
EXECUTE { init.old.number }
-
EXECUTE { init.old.label }
-
ITERATE { make.title.number }
-
-
ITERATE { make.tentative.sort.label }
-
SORT
-
-
ITERATE { init.cite.initials.add.to.year }
-
EXECUTE { init.initials }
-
ITERATE { check.add.initials }
-
EXECUTE { init.initials }
-
REVERSE { check.add.initials }
-
ITERATE { tentative.cite.num.names }
-
EXECUTE { init.cite.num.names }
-
EXECUTE { move.forward }
-
ITERATE { definitive.cite.num.names }
-
EXECUTE { init.cite.num.names }
-
EXECUTE { move.backward }
-
REVERSE { definitive.cite.num.names }
-
-
ITERATE { make.final.sort.key }
-
SORT
-
-
EXECUTE { begin.bib }
-
-
ITERATE { write.bbl.entry }
-
-
EXECUTE { end.bib }
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
%%
%% End of file `apacite.bst'.
diff --git a/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst b/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst
index 5cdb579a91a..b0a97162617 100644
--- a/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst
+++ b/Master/texmf-dist/bibtex/bst/apacite/apacitex.bst
@@ -43,7 +43,7 @@
%% the generated files.
%%
%% apacitex.bst
-%% [2013/07/04 v6.02 APA bibl. style with author index info]
+%% [2013/07/21 v6.03 APA bibl. style with author index info]
%% apacitex.bst : reference list according to APA manual
%% with author indexing information
%% Written by Erik Meijer
@@ -51,7 +51,7 @@
FUNCTION {identify.apacite.version}
{ % Put identifying string in the .blg file
"apacitex.bst"
- " [2013/07/04 v6.02 APA bibl. style with author index info]"
+ " [2013/07/21 v6.03 APA bibl. style with author index info]"
* top$
}
ENTRY
@@ -139,6 +139,11 @@ STRINGS { s t u old.label field
year.label.old
}
FUNCTION {test} { #0 }
+FUNCTION {dump.stack}
+{ "---- STACK {" cite$ * "} ----" * top$
+ stack$
+ "---- END STACK {" cite$ * "} ----" * top$
+}
FUNCTION {make.index} { #1 }
FUNCTION {unsorted} { #0 }
MACRO {jan} {"{\APACmonth{01}}"}
@@ -621,9 +626,8 @@ FUNCTION {remove.spaces}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
- % starting new block by writing what's left on the stack,
- % starting a new line and adding some extra space or
- % whatever is more defined in \newblock
+ % end block by writing what's left on the stack and
+ % starting a new line
%
FUNCTION {output.end.block}
{ write$
@@ -632,14 +636,23 @@ FUNCTION {output.end.block}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+ % end block by adding a period and writing what's left
+ % on the stack and starting a new line
+ %
+FUNCTION {output.dot.end.block}
+{ add.period$
+ output.end.block
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %
% starting new block by writing what's left on the stack,
% starting a new line and adding some extra space or
% whatever is more defined in \newblock
%
FUNCTION {output.new.block}
{ output.end.block
- "\newblock" write$
- newline$
+ "\newblock" write$ newline$
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -659,8 +672,6 @@ FUNCTION {start.new.block}
{ "\unskip\ " write$ newline$
"\newblock " write$ newline$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {sort.name.format.classic} { "{ll{}}{ f{}}{ vv{}}{ jj{}}" }
@@ -2045,10 +2056,8 @@ FUNCTION {make.title.number}
FUNCTION {make.citeorder.number}
{ old.number #1 + 'cite.order :=
cite.order 'old.number :=
- cite.order conv.int.to.str citeorder.sort.label :=
+ cite.order conv.int.to.str 'citeorder.sort.label :=
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {last.part.name.format.classic} { "{ll}" }
@@ -3343,8 +3352,6 @@ FUNCTION {format.year.month.day.check}
"}" *
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {format.atitle.no.dot}
{ "{\BBOQ}" swap$
"{\BBCQ}" swap$
@@ -3807,16 +3814,6 @@ FUNCTION { format.type.number }
if$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format howpublished if not empty,
- % for various entry types
- % call with
- % format.howpublished
- %
FUNCTION {format.howpublished}
{ howpublished empty$
'skip$
@@ -3829,14 +3826,6 @@ FUNCTION {format.howpublished}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format howpublished if not empty,
- % for misc
- % call with
- % output.howpublished
- %
FUNCTION {output.howpublished}
{ howpublished empty$
'skip$
@@ -3845,9 +3834,15 @@ FUNCTION {output.howpublished}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+FUNCTION {howpublished.block}
+{ howpublished empty$
+ 'skip$
+ { start.new.block
+ "\APAChowpublished {" howpublished * "}" *
+ output.dot.end.block
+ }
+ if$
+}
FUNCTION {begin.end.url.env}
{ "\begin{APACrefURL} "
lastchecked empty$
@@ -3870,18 +3865,8 @@ FUNCTION {begin.end.msg.env}
{ "\begin{APACrefURLmsg} "
" \end{APACrefURLmsg} "
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format url given that it is not empty,
- % for various entry types
- % call with
- % format.url
- %
FUNCTION {format.url}
-{ % First format begin and end of the enclosing environment.
- % With posted messages, a different environment is used.
- type.2 empty$
+{ type.2 empty$
{ begin.end.url.env }
{ type.2 "\bibmessage" =
{ begin.end.msg.env }
@@ -3889,37 +3874,47 @@ FUNCTION {format.url}
if$
}
if$
- % The url string.
"\url{" url * "}" *
- % Enclose in begin and end environment
enclose.check
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format doi given that it is not empty,
- % for various entry types
- % call with
- % format.doi
- %
+FUNCTION {url.block}
+{ doi empty$
+ { url empty$
+ 'skip$
+ { start.new.block
+ format.url
+ output.end.block
+ }
+ if$
+ }
+ 'skip$
+ if$
+}
FUNCTION {format.doi}
-{ % First format begin and end of the enclosing environment.
- begin.end.doi.env
- % The doi string.
+{ begin.end.doi.env
"\doi{" doi * "}" *
- % Enclose in begin and end environment
enclose.check
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format optional note
- %
+FUNCTION {doi.block}
+{ doi empty$
+ 'skip$
+ { start.new.block
+ format.doi
+ output.end.block
+ }
+ if$
+}
FUNCTION {format.note}
{ "\APACrefnote{" "}" note enclose.check }
+FUNCTION {note.block}
+{ note empty$
+ 'skip$
+ { start.new.block
+ format.note
+ output.end.block
+ }
+ if$
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -4015,28 +4010,28 @@ FUNCTION {format.orig.note}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % finish current entry
- % by writing what's left on the stack and starting a new line
- %
FUNCTION {fin.entry}
{ doi empty$
- { output.end.block }
+ 'skip$
{ output.new.block
format.doi
- output.end.block
}
if$
+ output.end.block
+ "\PrintBackRefs{\CurrentBib}" write$ newline$
+ test
+ { "\vspace{\baselineskip}" write$ newline$ }
+ 'skip$
+ if$
+}
+FUNCTION {fin.entry.2}
+{ doi.block
"\PrintBackRefs{\CurrentBib}" write$ newline$
test
{ "\vspace{\baselineskip}" write$ newline$ }
'skip$
if$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FUNCTION {periodical}
{
author empty$
@@ -4339,8 +4334,13 @@ FUNCTION {format.tr.title.number}
% warning if no institution
%
FUNCTION {format.address.institution.check}
-{ "institution" institution warning.if.empty
- "address" address warning.if.empty
+{ url empty$
+ doi empty$ and
+ { "institution" institution warning.if.empty
+ "address" address warning.if.empty
+ }
+ 'skip$
+ if$
institution empty$
address empty$
and
@@ -4599,122 +4599,95 @@ FUNCTION {lecture}
fin.entry
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % default thesis type is on top of stack
- % now, if type field is empty, this default is used
- % else default is removed and replaced by value of
- % type field
- %
-FUNCTION {format.type.school}
-{ type empty$
- 'skip$
- { pop$
- type "t" change.case$
- }
- if$
- school connect.with.comma.check
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % phd theses, etc.
- % call with
- % "default.published.thesis" "default.unpublished.thesis" thesis
- %
-FUNCTION {thesis}
-{ author empty$
- { "author" author warning.if.empty }
- { format.authors start.new.block }
+FUNCTION {format.ttitle.type.school}
+{ doi empty$ not
+ url empty$ not or
+ howpublished empty$ not or
+ { pop$ }
+ { swap$ pop$ }
if$
- %
- % format year and check if year present
- %
- format.year.check output.dot.new.block
- %
- % format title and check if title present
- % journal empty => unpublished PhD thesis
- % journal not empty => published (e.g., Dissertation Abstracts Int.)
- %
- journal empty$
- { format.btitle.vol.edition output.dot.new.block
- %
- % pop default unpublished thesis, top is default published thesis
- %
- swap$ pop$
- format.type.school
- address connect.with.comma.check
- }
- %
- % pop default published thesis, top is default unpublished thesis
- %
- { pop$
- type empty$
- school empty$ and
- originalyear empty$ and
+ type empty$
+ 'skip$
+ { type "\bibnotype" =
{ pop$
""
}
- { format.type.school
- originalyear connect.with.comma.check
- parenthesize.check
+ { pop$
+ type
}
if$
- format.aetitle.check
- swap$ connect.with.space.check
- "title" title warning.if.empty
- title format.atitle.connect output.new.block
- pages format.journal.vol.num.pages.check
}
if$
- %
- % if not empty, insert howpublished.
- % (used if thesis is retrieved from the internet)
- %
- format.howpublished add.period$
- %
- % format url
- %
- url empty$
- 'skip$
- { % Clear the stack
- duplicate$ empty$
+ duplicate$ empty$
+ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ address empty$
+ school empty$ and or and
+ { 'pop$
+ title empty$ not
+ englishtitle empty$ not or
+ { start.new.block }
'skip$
- { output.new.block }
if$
- format.url
+ ""
+ }
+ { start.new.block
+ "\APACtypeAddressSchool {" swap$ * "}{" *
+ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ { "}{}" * }
+ { address "" connect.check "}{" *
+ school "" connect.check "}" *
+ }
+ if$
}
if$
- %
- % format optional note
- %
- note empty$
- 'skip$
- { % Clear the stack
- duplicate$ empty$
+ format.betitle.check swap$
+ connect.with.space.check
+ "title" title warning.if.empty
+ title format.btitle.connect
+}
+FUNCTION {unpub.address.school.block}
+{ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ { "school" school warning.if.empty
+ school empty$
+ address empty$ and
'skip$
- { output.new.block }
+ { start.new.block
+ "\APACaddressSchool {" address "" connect.check "}{" *
+ school "" connect.check "}" *
+ output.dot.end.block
+ }
if$
- format.note
+ }
+ 'skip$
+ if$
+}
+FUNCTION {thesis}
+{ journal empty$ not
+ { pop$ pop$
+ article
+ }
+ { author empty$
+ { "author" author warning.if.empty }
+ { format.authors start.new.block }
+ if$
+ format.year.check output.dot.end.block
+ format.ttitle.type.school output.dot.end.block
+ unpub.address.school.block
+ howpublished.block
+ url.block
+ note.block
+ fin.entry.2
}
if$
- fin.entry
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % phd theses, etc.
- %
FUNCTION {phdthesis}
{ "\BPhD" "\BUPhD" thesis }
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % master's theses, etc.
- %
FUNCTION {mastersthesis}
{ "\BMTh" "\BUMTh" thesis }
@@ -5003,11 +4976,6 @@ FUNCTION {manual}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
- % following functions not used for APA Manual examples
- %
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
% booklet
%
FUNCTION {booklet}
@@ -5048,57 +5016,24 @@ FUNCTION {proceedings}
FUNCTION {default.type}
{ misc }
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {initialize}
-{ %
- % Maximum number of names to be formatted .
+{
#6 'name.max :=
%% #250 'entry.max$ :=
%% #5000 'global.max$ :=
}
-
FUNCTION {init.old.number}
-{ %
- % For numbering the entries according to current sorting order.
- #0 'old.number :=
-}
-
+{ #0 'old.number := }
FUNCTION {init.old.label}
-{ %
- % For comparing labels across entries .
- "zzzzzz" 'old.label :=
-}
-
+{ "zzzzzz" 'old.label := }
FUNCTION {init.cite.initials.add.to.year}
-{ %
- % Initialize "cite initials" indicator for all entries.
- #0 'cite.initials :=
- %
- % Initialize "add to year", i.e., whether a, b, etc. must
- % be added to the year in citation, to "no".
+{ #0 'cite.initials :=
#0 'add.to.year :=
- %
}
-
FUNCTION {move.forward}
-{ %
- % Indicates that we're moving forward (ITERATE) through the entry list .
- #1 'forward :=
-}
-
+{ #1 'forward := }
FUNCTION {move.backward}
-{ %
- % Indicates that we're moving backward (REVERSE) through the entry list .
- #0 'forward :=
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+{ #0 'forward := }
FUNCTION {begin.bib}
{ preamble$ empty$
'skip$
@@ -5106,101 +5041,44 @@ FUNCTION {begin.bib}
if$
"\begin{thebibliography}{}" write$ newline$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {end.bib}
{ newline$
"\end{thebibliography}" write$ newline$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FUNCTION {write.bbl.entry}
-{ %
- % Output \bibitem and \citeauthoryear command.
- %
+{
make.cite.labels
- %
- % Format and output reference list entry.
- %
call.type$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
READ
-
-
EXECUTE { identify.apacite.version }
-
-
EXECUTE { initialize }
-
-
EXECUTE { init.old.number }
-
ITERATE { make.citeorder.number }
-
-
ITERATE { make.sort.title }
-
SORT
-
EXECUTE { init.old.number }
-
EXECUTE { init.old.label }
-
ITERATE { make.title.number }
-
-
ITERATE { make.tentative.sort.label }
-
SORT
-
-
ITERATE { init.cite.initials.add.to.year }
-
EXECUTE { init.initials }
-
ITERATE { check.add.initials }
-
EXECUTE { init.initials }
-
REVERSE { check.add.initials }
-
ITERATE { tentative.cite.num.names }
-
EXECUTE { init.cite.num.names }
-
EXECUTE { move.forward }
-
ITERATE { definitive.cite.num.names }
-
EXECUTE { init.cite.num.names }
-
EXECUTE { move.backward }
-
REVERSE { definitive.cite.num.names }
-
-
ITERATE { make.final.sort.key }
-
SORT
-
-
EXECUTE { begin.bib }
-
-
ITERATE { write.bbl.entry }
-
-
EXECUTE { end.bib }
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
%%
%% End of file `apacitex.bst'.
diff --git a/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib b/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib
index 04bf44e07a5..7bbcaaa14b9 100644
--- a/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib
+++ b/Master/texmf-dist/doc/bibtex/apacite/apa5ex.bib
@@ -43,7 +43,7 @@
%% the generated files.
%%
%% apa5ex.bib
-%% [2013/07/04 v6.02 bibliography database for examples]
+%% [2013/07/21 v6.03 bibliography database for examples]
%%
%% apa5ex.bib: References from the 5th edition of the Publication Manual
%% of the APA, plus a few additional references
@@ -2321,10 +2321,179 @@ edition = {Fall 2007},
url = {http://plato.stanford.edu/entries/behaviorism/},
}
@incollection{apa6:ch7-ex30,
- title = {Heuristic},
-booktitle = {Merriam-{Webster}'s Online Dictionary},
-edition = {11},
- url = {http://www.m-w.com/dictionary/heuristic},
+ title = {Heuristic},
+ booktitle = {Merriam-{Webster}'s Online Dictionary},
+ edition = {11},
+ url = {http://www.m-w.com/dictionary/heuristic},
+}
+@techreport{apa6:ch7-ex31,
+ author = {{\bibcorporate{U.S. Department of Health and Human
+ Services, National Institutes of Health, National Heart,
+ Lung, and Blood Institute}}},
+ firstkey = {{U.S. Department of Health and Human
+ Services, National Institutes of Health, National Heart,
+ Lung, and Blood Institute [NHLBI]}},
+ key = {{NHLBI}},
+ year = {2003},
+ title = {Managing Asthma: A Guide for Schools},
+ type = {NIH Publication},
+ number = {02-2650},
+ url = {http://www.nhlbi.nih.gov/health/prof/lung/asthma/asth_sch.pdf},
+}
+@techreport{apa6:ch7-ex32,
+ author = {{\bibcorporate{American Psychological Association, Task
+ Force on the Sexualization of Girls}}},
+ firstkey = {{American Psychological Association, Task
+ Force on the Sexualization of Girls [APA]}},
+ key = {{APA}},
+ year = {2007},
+ title = {Report of the {APA} {Task} {Force} on the {Sexualization}
+ of {Girls}},
+ type = {\bibnotype},
+ url = {http://www.apa.org/pi/wpo/sexualization.html},
+}
+@techreport{apa6:ch7-ex33,
+ author = {Kessy, Severine S. A. and Urio, Fratern M.},
+ year = {2006},
+ title = {The Contribution of Microfinance Institutions to
+ Poverty Reduction in {Tanzania}},
+ type = {Research Report\APACredefineOnce{BRetrievedFrom}
+ {Retrieved from Research on Poverty Alleviation
+ website:\ }},
+ number = {06.3},
+ url = {http://www.repoa.or.tz/documents_storage/Publications/Reports/06.3_Kessy_and_Urio.pdf},
+}
+@techreport{apa6:ch7-ex34,
+ author = {McDaniel, Julie E. and Miskel, Cecil G.},
+ year = {2002},
+ title = {The Effect of Groups and Individuals on National
+ Decisionmaking: Influence and Domination in the
+ Reading Policymaking Environment},
+ type = {CIERA Report\APACredefineOnce{BRetrievedFrom}
+ {Retrieved from University of Michigan, Center for
+ Improvement of Early Reading Achievement website:\ }},
+ number = {3-025},
+ url = {http://www.ciera.org/library/reports/inquiry-3/3-025/3-025.pdf},
+}
+@techreport{apa6:ch7-ex35,
+ author = {{\bibcorporate{Employee Benefit Research Institute}}},
+ firstkey = {{Employee Benefit Research Institute [EBRI]}},
+ key = {{EBRI}},
+ year = {1992},
+ month = feb,
+ title = {Sources of Health Insurance and Characteristics of the
+ Uninsured, Analysis of the {March} 1991 {Current}
+ {Population} {Survey}},
+ type = {Issue Brief},
+ number = {123},
+ address = {Washington, DC},
+ institution = {{\bibcorporate{Employee Benefit Research Institute}}},
+}
+@lecture{apa6:ch7-ex36,
+ author = {Muellbauer, John},
+ year = {2007},
+ month = sep,
+ title = {Housing, Credit and Consumer Expenditure},
+ chair = {Ludvigson, Sydney C.},
+ symposium = {Housing and Consumer Behavior},
+ howpublished = {Symposium conducted at the meeting of the {Federal}
+ {Reserve} {Bank} of {Kansas} {City}},
+ address = {Jackson Hole, WY},
+}
+@lecture{apa6:ch7-ex37,
+ author = {Liu, Shuhua},
+ year = {2005},
+ month = may,
+ title = {Defending Against Business Crises with the Help of
+ Intelligent Agent Based Early Warning Solutions},
+ howpublished = {Paper presented at the Seventh International
+ Conference on Enterprise Information Systems},
+ address = {Miami, FL\APACredefineOnce{BRetrievedFrom}{Abstract
+ retrieved from\ }},
+ url = {http://www.iceis.org/iceis2005/abstracts_2005.htm},
+}
+@article{apa6:ch7-ex38,
+ author = {Herculano-Houzel, Suzana and Collins, Christine E.
+ and Wong, Peiyan and Kaas, Jon H. and Lent, Roberto},
+ year = {2008},
+ title = {The Basic Nonuniformity of the Cerebral Cortex},
+ journal = {Proceedings of the National Academy of Sciences, USA},
+ volume = {105},
+ pages = {12593--12598},
+ doi = {10.1073/pnas.0805417105},
+}
+@incollection{apa6:ch7-ex39,
+ author = {Katz, Itai and Gabayan, Kevin and Aghajan, Hamid},
+ year = {2007},
+ title = {A Multi-touch Surface Using Multiple Cameras},
+ editor = {Blanc-Talon, Jacques and Philips, Wilfried
+ and Popescu, Dan and Scheunders, Paul},
+ booktitle = {{Lecture} {Notes} in {Computer} {Science}: Vol.~4678.
+ {Advanced} Concepts for Intelligent Vision Systems},
+ pages = {97--108},
+ doi = {10.1007/978-3-540-74607-2_9},
+}
+@mastersthesis{apa6:ch7-ex40,
+ author = {McNiel, Donita S.},
+ year = {2006},
+ title = {Meaning Through Narrative: A Personal Narrative
+ Discussing Growing Up with an Alcoholic Mother},
+ howpublished = {Available from ProQuest Dissertations and Theses
+ database},
+ note = {UMI No.\ 1434728},
+}
+@phdthesis{apa6:ch7-ex40-2,
+ author = {Wilfley, Denise E.},
+ year = {1989},
+ title = {An Analysis of Psychological Distress, Self-concept,
+ and Patterns of Family Interactions in Two Subgroups
+ of Bulimia--Normal Weight and Obese},
+ school = {University of Missouri},
+ address = {Columbia},
+}
+@mastersthesis{apa6:ch7-ex40-3,
+ author = {Almeida, David M.},
+ year = {1989},
+ title = {Fathers' Participation in Family Work: Consequences
+ for Fathers' Stress and Father-Child Relations},
+ school = {University of Victoria},
+ address = {Victoria, British Columbia, Canada},
+}
+@phdthesis{apa6:ch7-ex41,
+ author = {Adams, Ronald Jerry},
+ year = {1973},
+ title = {Building a Foundation for Evaluation of Instruction in
+ Higher Education and Continuing Education},
+ url = {http://www.ohiolink.edu/etd/},
+}
+@phdthesis{apa6:ch7-ex42,
+ author = {Bruckman, Amy},
+ year = {1997},
+ title = {{MOOSE} Crossing: Construction, Community, and
+ Learning in a Networked Virtual World for Kids},
+ school = {Massachusetts Institute of Technology},
+ url = {http://www-static.cc.gatech.edu/~asb/thesis/},
+}
+@phdthesis{apa6:ch7-ex43,
+ author = {Appelbaum, Lawrence G.},
+ year = {2005},
+ title = {Three Studies of Human Information Processing:
+ Texture Amplification, Motion Representation, and
+ Figure-Ground Segregation},
+ journal = {Dissertation Abstracts International: Section B.
+ Sciences and Engineering},
+ volume = {65},
+ number = {10},
+ pages = {5428},
+}
+@phdthesis{apa6:ch7-ex44,
+ author = {Carlbom, Pelle},
+ year = {2000},
+ title = {Carbody and Passengers in Rail Vehicle Dynamics},
+ type = {Doctoral thesis},
+ school = {Royal Institute of Technology},
+ address = {Stockholm, Sweden},
+ url = {http://urn.kb.se/resolve?urn=urn:nbn:se:kth:diva-3029},
}
@book{APAManual3,
author = {{\bibcorporate{American Psychological Association}}},
diff --git a/Master/texmf-dist/doc/bibtex/apacite/apacite.pdf b/Master/texmf-dist/doc/bibtex/apacite/apacite.pdf
index 9e8c077f336..9420e5f8b50 100644
--- a/Master/texmf-dist/doc/bibtex/apacite/apacite.pdf
+++ b/Master/texmf-dist/doc/bibtex/apacite/apacite.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex b/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex
index cbfbec3be7d..a1d85ecd118 100644
--- a/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex
+++ b/Master/texmf-dist/doc/bibtex/apacite/apacxmpl.tex
@@ -43,7 +43,7 @@
%% the generated files.
%%
%% apacxmpl.tex
-%% [2013/07/04 v6.02 LaTeX file for examples]
+%% [2013/07/21 v6.03 LaTeX file for examples]
\documentclass{article}
\usepackage{url}
\usepackage{apacite}
@@ -53,12 +53,12 @@
\author{Erik Meijer\\
\textsf{apacite at gmail.com}
}
-\date{2013/07/04}
+\date{2013/07/21}
\begin{document}
\maketitle
\begin{abstract}
-This document tests \textsf{apacite} [2013/07/04 v6.02]. See the
+This document tests \textsf{apacite} [2013/07/21 v6.03]. See the
\textsf{apacite} documentation for more information.
\end{abstract}
@@ -257,6 +257,86 @@ This document tests \textsf{apacite} [2013/07/04 v6.02]. See the
\cite{apa6:ch7-ex30} \\
\fullciteA{apa6:ch7-ex30} \\
\citeA{apa6:ch7-ex30}
+\item
+\cite{apa6:ch7-ex31} \\
+\cite{apa6:ch7-ex31} \\
+\fullciteA{apa6:ch7-ex31} \\
+\citeA{apa6:ch7-ex31}
+\item
+\cite{apa6:ch7-ex32} \\
+\cite{apa6:ch7-ex32} \\
+\fullciteA{apa6:ch7-ex32} \\
+\citeA{apa6:ch7-ex32}
+\item
+\cite{apa6:ch7-ex33} \\
+\cite{apa6:ch7-ex33} \\
+\fullciteA{apa6:ch7-ex33} \\
+\citeA{apa6:ch7-ex33}
+\item
+\cite{apa6:ch7-ex34} \\
+\cite{apa6:ch7-ex34} \\
+\fullciteA{apa6:ch7-ex34} \\
+\citeA{apa6:ch7-ex34}
+\item
+\cite{apa6:ch7-ex35} \\
+\cite{apa6:ch7-ex35} \\
+\fullciteA{apa6:ch7-ex35} \\
+\citeA{apa6:ch7-ex35}
+\item
+\cite{apa6:ch7-ex36} \\
+\cite{apa6:ch7-ex36} \\
+\fullciteA{apa6:ch7-ex36} \\
+\citeA{apa6:ch7-ex36}
+\item
+\cite{apa6:ch7-ex37} \\
+\cite{apa6:ch7-ex37} \\
+\fullciteA{apa6:ch7-ex37} \\
+\citeA{apa6:ch7-ex37}
+\item
+\cite{apa6:ch7-ex38} \\
+\cite{apa6:ch7-ex38} \\
+\fullciteA{apa6:ch7-ex38} \\
+\citeA{apa6:ch7-ex38}
+\item
+\cite{apa6:ch7-ex39} \\
+\cite{apa6:ch7-ex39} \\
+\fullciteA{apa6:ch7-ex39} \\
+\citeA{apa6:ch7-ex39}
+\item
+\cite{apa6:ch7-ex40} \\
+\cite{apa6:ch7-ex40} \\
+\fullciteA{apa6:ch7-ex40} \\
+\citeA{apa6:ch7-ex40} \\
+\mbox{}\\
+\cite{apa6:ch7-ex40-2} \\
+\cite{apa6:ch7-ex40-2} \\
+\fullciteA{apa6:ch7-ex40-2} \\
+\citeA{apa6:ch7-ex40-2} \\
+\mbox{}\\
+\cite{apa6:ch7-ex40-3} \\
+\cite{apa6:ch7-ex40-3} \\
+\fullciteA{apa6:ch7-ex40-3} \\
+\citeA{apa6:ch7-ex40-3}
+\item
+\cite{apa6:ch7-ex41} \\
+\cite{apa6:ch7-ex41} \\
+\fullciteA{apa6:ch7-ex41} \\
+\citeA{apa6:ch7-ex41}
+\item
+\cite{apa6:ch7-ex42} \\
+\cite{apa6:ch7-ex42} \\
+\fullciteA{apa6:ch7-ex42} \\
+\citeA{apa6:ch7-ex42}
+\item
+\cite{apa6:ch7-ex43} \\
+\cite{apa6:ch7-ex43} \\
+\fullciteA{apa6:ch7-ex43} \\
+\citeA{apa6:ch7-ex43}
+\item
+\cite{apa6:ch7-ex44} \\
+\cite{apa6:ch7-ex44} \\
+\fullciteA{apa6:ch7-ex44} \\
+\citeA{apa6:ch7-ex44}
\end{enumerate}
\bibliographystyle{apacite}
\bibliography{apa5ex}
diff --git a/Master/texmf-dist/source/bibtex/apacite/apacite.drv b/Master/texmf-dist/source/bibtex/apacite/apacite.drv
index 5ebef50f0df..399069fb3fa 100644
--- a/Master/texmf-dist/source/bibtex/apacite/apacite.drv
+++ b/Master/texmf-dist/source/bibtex/apacite/apacite.drv
@@ -48,13 +48,13 @@
%% do not change apacite.dtx for this purpose.
%%
\ProvidesFile{apacite.drv}
- [2013/07/04 v6.02 apacite documentation driver file]
+ [2013/07/21 v6.03 apacite documentation driver file]
\documentclass{ltxdoc}
%\documentclass[twoside]{ltxdoc}
%\documentclass[a4paper]{ltxdoc}
%\documentclass[twoside,a4paper]{ltxdoc}
%%
-\usepackage{apacdoc}[2013/07/04 v6.02]
+\usepackage{apacdoc}[2013/07/21 v6.03]
%% The |\providecommand|s make sure we don't get an error during
%% installation.
%% Define document-specific macros that are not interesting for
@@ -70,23 +70,12 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% LOADING OF PACKAGES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The following line can be uncommented to test compatibility with TeX4ht.
-%% \usepackage{tex4ht}
-%%
%% The following line is used for references to internet sources.
%% It is not generally necessary for apacite, but used in the examples.
\usepackage{url}
%%
-%% The following lines can be uncommented to test compatibility with
-%% the mentioned other packages and test the language support of
-%% apacite.
-%% \usepackage[dvips,pagebackref]{hyperref}
-%% \usepackage[pdftex,pagebackref]{hyperref}
-%% \usepackage[english]{babel}% babel must be loaded before apacite
-%% \usepackage{german}
-%%
%% Loading apacite with author index option.
-\usepackage[ltxemindex,bibnewpage]{apacite}[2013/07/04 v6.02]
+\usepackage[ltxemindex,bibnewpage]{apacite}[2013/07/21 v6.03]
%%
\raggedbottom
%%
@@ -104,12 +93,9 @@
%% and reprocess, with or without this line (faster without)
% \RecordChanges
%%
-\DisableCrossrefs %May stay; zapped by \EnableCrossrefs
-\CodelineNumbered %May stay
+\DisableCrossrefs % May stay; zapped by \EnableCrossrefs
+\CodelineNumbered % May stay
%%
-%% For getting something useful out of greek.apc in the documentation.
-%%\IfFileExists{iso-8859-7.def}{%
-%% \usepackage[iso-8859-7]{inputenc}}{}
\begin{document}
\DocInput{apacite.dtx}
\end{document}
diff --git a/Master/texmf-dist/source/bibtex/apacite/apacite.dtx b/Master/texmf-dist/source/bibtex/apacite/apacite.dtx
index bdfe93f0eea..30d4088ede6 100644
--- a/Master/texmf-dist/source/bibtex/apacite/apacite.dtx
+++ b/Master/texmf-dist/source/bibtex/apacite/apacite.dtx
@@ -56,7 +56,7 @@
% \iffalse
%<*dtx>
\ProvidesFile{apacite.dtx}
- [2013/07/04 v6.02 apacite dtx file]
+ [2013/07/21 v6.03 apacite dtx file]
%</dtx>
%<driver>\ProvidesFile{apacite.drv}
%<package|docpkg>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
@@ -82,27 +82,27 @@
%^^A command such that the value of the command is written to the file instead
%^^A of the name.
%^^A
-%<driver> [2013/07/04 v6.02 apacite documentation driver file]
-%<package> [2013/07/04 v6.02 APA citation]
-%<docpkg> [2013/07/04 v6.02 apacite documentation style]
-%<english> [2013/07/04 v6.02 apacite language file]
-%<dutch> [2013/07/04 v6.02 apacite language file]
-%<finnish> [2013/07/04 v6.02 apacite language file]
-%<german> [2013/07/04 v6.02 apacite language file]
-%<ngerman> [2013/07/04 v6.02 apacite language file]
-%<greek> [2013/07/04 v6.02 apacite language file]
-%<norsk> [2013/07/04 v6.02 apacite language file]
-%<spanish> [2013/07/04 v6.02 apacite language file]
-%<swedish> [2013/07/04 v6.02 apacite language file]
-%<xmpl>%% [2013/07/04 v6.02 LaTeX file for examples]
-%<bibdb>%% [2013/07/04 v6.02 bibliography database for examples]
-%<bibstyle&!annotated>%% [2013/07/04 v6.02 APA bibliography style]
+%<driver> [2013/07/21 v6.03 apacite documentation driver file]
+%<package> [2013/07/21 v6.03 APA citation]
+%<docpkg> [2013/07/21 v6.03 apacite documentation style]
+%<english> [2013/07/21 v6.03 apacite language file]
+%<dutch> [2013/07/21 v6.03 apacite language file]
+%<finnish> [2013/07/21 v6.03 apacite language file]
+%<german> [2013/07/21 v6.03 apacite language file]
+%<ngerman> [2013/07/21 v6.03 apacite language file]
+%<greek> [2013/07/21 v6.03 apacite language file]
+%<norsk> [2013/07/21 v6.03 apacite language file]
+%<spanish> [2013/07/21 v6.03 apacite language file]
+%<swedish> [2013/07/21 v6.03 apacite language file]
+%<xmpl>%% [2013/07/21 v6.03 LaTeX file for examples]
+%<bibdb>%% [2013/07/21 v6.03 bibliography database for examples]
+%<bibstyle&!annotated>%% [2013/07/21 v6.03 APA bibliography style]
%<*xbibstyle&!annotated>
-%% [2013/07/04 v6.02 APA bibl. style with author index info]
+%% [2013/07/21 v6.03 APA bibl. style with author index info]
%</xbibstyle&!annotated>
-%<bibstyle&annotated>%% [2013/07/04 v6.02 APA annotated bibliography style]
+%<bibstyle&annotated>%% [2013/07/21 v6.03 APA annotated bibliography style]
%<*xbibstyle&annotated>
-%% [2013/07/04 v6.02 APA annotated bibl. style with author index info]
+%% [2013/07/21 v6.03 APA annotated bibl. style with author index info]
%</xbibstyle&annotated>
%
%<*install>
@@ -430,7 +430,7 @@ do not change apacite.dtx for this purpose.
%<driver>%\documentclass[a4paper]{ltxdoc}
%<driver>%\documentclass[twoside,a4paper]{ltxdoc}
%%
-\usepackage{apacdoc}[2013/07/04 v6.02]
+\usepackage{apacdoc}[2013/07/21 v6.03]
%% The |\providecommand|s make sure we don't get an error during
%% installation.
%% Define document-specific macros that are not interesting for
@@ -446,23 +446,12 @@ do not change apacite.dtx for this purpose.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% LOADING OF PACKAGES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The following line can be uncommented to test compatibility with TeX4ht.
-%% \usepackage{tex4ht}
-%%
%% The following line is used for references to internet sources.
%% It is not generally necessary for apacite, but used in the examples.
\usepackage{url}
%%
-%% The following lines can be uncommented to test compatibility with
-%% the mentioned other packages and test the language support of
-%% apacite.
-%% \usepackage[dvips,pagebackref]{hyperref}
-%% \usepackage[pdftex,pagebackref]{hyperref}
-%% \usepackage[english]{babel}% babel must be loaded before apacite
-%% \usepackage{german}
-%%
%% Loading apacite with author index option.
-\usepackage[ltxemindex,bibnewpage]{apacite}[2013/07/04 v6.02]
+\usepackage[ltxemindex,bibnewpage]{apacite}[2013/07/21 v6.03]
%%
\raggedbottom
%%
@@ -480,12 +469,9 @@ do not change apacite.dtx for this purpose.
%% and reprocess, with or without this line (faster without)
%<driver>% \RecordChanges
%%
-\DisableCrossrefs %May stay; zapped by \EnableCrossrefs
-\CodelineNumbered %May stay
+\DisableCrossrefs % May stay; zapped by \EnableCrossrefs
+\CodelineNumbered % May stay
%%
-%% For getting something useful out of greek.apc in the documentation.
-%%\IfFileExists{iso-8859-7.def}{%
-%% \usepackage[iso-8859-7]{inputenc}}{}
\begin{document}
\DocInput{apacite.dtx}
\end{document}
@@ -523,11 +509,13 @@ do not change apacite.dtx for this purpose.
% and extended language support; more extensive customizability.}
% \changes{v4.05}{2009/03/01}{Some bug fixes; extended language support;
% annotated bibliographies.}
-% \changes{v6.00}{2012/02/14}{First step towards compliance with v6 of
+% \changes{v6.00}{2012/02/14}{First step toward compliance with v6 of
% the APA manual; version number now indicates which version of the APA
% manual is implemented.}
% \changes{v6.01}{2012/02/25}{Bug fix}
% \changes{v6.02}{2013/07/04}{Bug fixes}
+% \changes{v6.03}{2013/07/21}{Thesis formatting adapted to 6th edition
+% requirements}
%
% \GetFileInfo{apacite.sty}
%
@@ -650,172 +638,24 @@ will be inconvenient to other users, then I will not pursue it.
\subsection*{New in this version}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-The current version \fileversion{} \APACversiondate{2013/07/04} and
-the previous one (v6.01, \APACversiondate{2012/02/25}) fix a few bugs
-in version v6.00 \APACversiondate{2012/02/14}, which affected
-documents compiled with the \pkgoption{natbibapa} option. In the rest
-of this document, ``the previous version'' should be interpreted as
-``the \APACversiondate{2009/03/01} version''.
-
-The \APACversiondate{2009/03/01} version of \pkg{apacite}
-implemented the rules in the 5th edition of the APA manual. The current
-version aims to conform with the new (2009) 6th edition of the APA manual.
-It does not completely succeed in this yet, although the instances of
-incorrectly formatted cases will be rare. Most problems can be solved by
-using \LaTeX{} or \BibTeX{} tricks in the \fname{.bib} file, but this
-makes the \fname{.bib} file less compatible with other styles. In the
-test examples in section~\ref{sec:xmpl} below, many tricks are used and
-discussed. Remaining problems, omissions, and things-to-be-done can be
-found in section~\ref{sec:todo}.
-
-The changes since the \APACversiondate{2009/03/01} version are:
+Changes with respect to the previous version (v6.02,
+\APACversiondate{2013/07/04}):
\begin{itemize}
\item
-Changes in order to conform to the 6th edition of the APA Manual: (a) added
-\fieldname{doi} field and \pkgoption{doi} and \pkg{nodoi} options; (b)
-added examples (but not all yet) from the 6th edition to the bibliography
-database; (c) changed formatting of reference list entry with more than
-7 authors (the first 6, then dots, then the last, instead of the first 6 and
-``et al.'') and correspondingly added the \cmd{\BDBL} command;
-(d) added the new command \cmd{\BRetrievedFrom} for ``Retrieved from''
-without date and replaced uses of \cmd{\BAvailFrom} by \cmd{\BRetrievedFrom}
-(although \cmd{\BAvailFrom} is still defined).
-
-\item
-Introduced the examples \LaTeX{} file \fname{apacxmpl.tex}, which makes
-it easier to test \pkg{apacite} and get insight in how nonstandard
-cases can be formatted according to APA rules. (Far from finished.)
-
-\item
-Added a style command for authors in the reference list
-(\cmd{\APACrefauthstyle}).
-
-\item
-Introduced the \cmd{\usespanishe} command to \fname{spanish.apc} to
-support cases in which ``and'' should be ``e'' instead of ``y''.
+Thesis formatting (\entryname{@phdthesis}, \entryname{@mastersthesis})
+rewritten in order to conform to the 6th edition of the APA Manual.
\item
-Changed some internal code so that \pkg{apacite} can now be used with
-the \pkg{bibentry} package.
+Added the \cmd{\APACaddressSchool} and \cmd{\APACtypeAddressSchool}
+commands to facilitate customization of the formatting of theses.
\item
-Changed handling of ``von parts''. Corresponding to examples in
-earlier editions of the APA manual, \pkg{apacite} used to format
-names with von parts as ``Helmholtz, H. L. F. von'' in the reference
-list and as ``Helmholtz'' in the text, but in arguably the vast
-majority of situations encountered by \pkg{apacite} users, it
-is more desirable to format von parts as ``de Waal, E.'' in the
-reference list and as ``de Waal'' in the text. This change implies
-that it is no longer necessary to include the name in an additional
-pair of braces in the \fname{.bib} file, and that, with \pkg{natbib},
-capitalization of the von part (at the beginning of a sentence) with
-\cmd{\Citet} and its siblings now works as well. The flipside that
-it is now more difficult to obtain the previous behavior.
+Added the \cmd{\APACredefineOnce} command to \fname{apacdoc.sty}.
\item
-Added options to select different citation commands:
-\begin{itemize}
-\item[(a)]
-\pkgoption{apaciteclassic} (default) defines the ``classic''
-\pkg{apacite} citation commands \cmd{\cite}, \cmd{\citeA},
-\cmd{\citeNP}, etc., with the angled bracket prenotes, e.g.,
-|\citeA<see>[for more details]{ex1}|.
-\item[(b)]
-\pkgoption{natbibapa} loads \pkg{natbib} and thus defines the
-\pkg{natbib} citation commands \cmd{\citet}, \cmd{\citep}, etc.,
-with the double square bracket notes, e.g.,
-|\citep[see][for more details]{ex1}|. \pkg{apacite}
-now contains some improved compatibility code so that the
-combination of \pkg{natbib} and \pkg{apacite} better follows
-the APA rules. In particular, the standard \pkg{natbib} style
-``(2008a,b)'' is now replaced by the APA style ``(2008a, 2008b)''
-and the usage of ``and'' versus ``\&'' also satisfies the APA
-rules. \pkg{apacite} defines a few additional commands that are
-missing from \pkg{natbib}, but useful for \pkg{apacite} users.
-In particular, \pkg{apacite} defines \cmd{\citeauthort} and
-\cmd{\citeauthorp}. The former uses ``and'' and the latter uses
-``\&''. \pkg{natbib}'s \cmd{\citeauthor} is configured such that
-it is the same as \cmd{\citeauthort}.
-
-Note that \pkg{natbib} also supports sorting the citations
-within a citation command and has commands to capitalize the
-first letter of a citation (e.g., \cmd{\Citet}), which should
-be used when names with von parts such as ``de Waal'' start a
-sentence.
-\item[(c)]
-\pkgoption{nocitation}, which does not define any citation
-commands at all.
-\end{itemize}
-
-\item
-Added masked citation commands and the \pkgoption{mask} and
-\pkgoption{unmask} options to activate or deactivate them.
-With the \pkgoption{apaciteclassic} option, the following
-masked citation commands are defined:
-\cmd{\maskcite},
-\cmd{\maskfullcite},
-\cmd{\maskshortcite},
-\cmd{\maskciteNP},
-\cmd{\maskfullciteNP},
-\cmd{\maskshortciteNP},
-\linebreak[4]\cmd{\maskciteA},
-\cmd{\maskfullciteA},
-\cmd{\maskshortciteA},
-\cmd{\maskciteauthor},
-\linebreak[4]\cmd{\maskfullciteauthor},
-\cmd{\maskshortciteauthor},
-\cmd{\maskciteauthorNP},
-\linebreak[4]\cmd{\maskfullciteauthorNP},
-\cmd{\maskshortciteauthorNP},
-\cmd{\maskciteauthorA},
-\cmd{\maskfullciteauthorA},
-\cmd{\maskshortciteauthorA},
-\cmd{\maskciteyear}, and
-\linebreak[4]\cmd{\maskciteyearNP}.
-They have exactly the same syntax as the corresponding commands
-without ``|mask|''. With the \pkgoption{unmask} option (default),
-their definitions are also identical to the non-|mask| commands.
-In contrast, with the \pkgoption{mask} option, a message of the form
-``\emph{(2 citations removed for masked review)}'' is printed.
-The actual message is defined in \cmd{\onemaskedcitationmsg} and
-\cmd{\maskedcitationsmsg}, depending on whether one or more citations
-are masked.
-
-In addition to these commands, \cmd{\masknocite} is defined, which
-is the same as \cmd{\nocite} with \pkgoption{unmask} and does nothing
-with \pkgoption{mask}, and \cmd{\masktext} is defined. The latter has
-one mandatory argument, which is the text included in the document
-when the \pkgoption{unmask} option is chosen, and one optional
-argument (the default being empty), which is the text inserted when
-the \pkgoption{mask} option is chosen.
-
-Similarly, with the \pkgoption{natbibapa} option selected, the
-following commands are provided:
-\cmd{\masknocite},
-\cmd{\maskcitep},
-\cmd{\maskcitealp},
-\cmd{\maskcitet},
-\cmd{\maskcitealt},
-\cmd{\maskciteauthor},
-\cmd{\maskcitefullauthor},
-\cmd{\maskciteyearpar},
-\cmd{\maskciteyear},
-\cmd{\maskcite},
-\cmd{\maskcitetalias},
-\cmd{\maskcitepalias},
-\cmd{\maskCitet},
-\cmd{\maskCitep},
-\cmd{\maskCitealt},
-\cmd{\maskCitealp},
-\cmd{\maskCiteauthor},
-\cmd{\maskcitenum},
-\cmd{\maskciteauthort},
-\cmd{\maskciteauthorp},
-\cmd{\maskCitefullauthor},
-\cmd{\maskCiteauthort},
-\cmd{\maskCiteauthorp}, and
-\cmd{\masktext}.
+Added examples 31--44 from the APA manual to \fname{apacxmpl.tex} and
+\fname{apa5ex.bib}.
\item
Improved source code documentation in the \fname{.dtx} file.
@@ -2880,7 +2720,7 @@ also a comma, as required by the APA manual, which is standard U.S.
usage. Other styles, particularly European, such as British English,
omit this comma. Again, in such a case, you would redefine this
``comma'' to be the empty string. (This is in fact done in several of
-the language files. See section~\ref{sec:language}.)
+the language files. See section~\ref{sec:compat-babel}.)
\DescribeMacro{\BDBL}
\cmd{\BDBL} is the dots before the last author in the reference
@@ -3464,6 +3304,12 @@ the code as desired.\\[-0.3\baselineskip]
\par\noindent\DescribeMacro{\APACaddressInstitutionEqAuth}
\makebox[2.1in][l]{\cmd{\APACaddressInstitutionEqAuth}}
\makebox{Address and institution if the latter is the author}
+\par\noindent\DescribeMacro{\APACaddressSchool}
+\makebox[2.1in][l]{\cmd{\APACaddressSchool}}
+\makebox{Address and school (for theses)}
+\par\noindent\DescribeMacro{\APACtypeAddressSchool}
+\makebox[2.1in][l]{\cmd{\APACtypeAddressSchool}}
+\makebox{Type, address, and school (for theses)}
\par\noindent\DescribeMacro{\APAChowpublished}
\makebox[2.1in][l]{\cmd{\APAChowpublished}}
\makebox{\fieldname{howpublished} field}
@@ -4643,6 +4489,16 @@ is only activated for the author index. This has technical
reasons and it does not work under all circumstances. Used in
examples 4.08-3, 65, 66, and 68.
+\item[\cmd{\APACredefineOnce}] \DescribeMacro{\APACredefineOnce}
+This macro takes two arguments: (1) the name of a command (without the
+backslash) and (2) arbitrary \TeX{} code. It then redefines the
+command (1) to the \TeX{} code (2) as a one-time change, so after the
+command (1) has been invoked once, it reverts to its definition before
+\cmd{\APACredefineOnce} was issued. This can be used to redefine, say,
+\cmd{\BRetrievedFrom} from ``Retrieved from'' to ``Retrieved from
+Poverty Alleviation website'' for a single reference but restore it
+to ``Retrieved from'' immediately afterwards.
+
\item[\cmd{\bibeditortype}] \DescribeMacro{\bibeditortype}
This has one argument. The macro changes the definitions of the macros
\cmd{\BED} and \cmd{\BEDS} to the argument and then immediately
@@ -4714,7 +4570,8 @@ section~\ref{sec:xmpl} below.
happens when one has 6 authors and another 7, with the same first 6
authors.
\item In an \entryname{unpublished} entry, if \fieldname{author} and
- \fieldname{organization} are equivalent, replace the latter with
+ \fieldname{organization} are equivalent, maybe we should replace
+ the latter with
``Author'' in the output, analogous to the situation where
\fieldname{publisher} or \fieldname{institution} are equal to
\fieldname{author} in several of the other entry types.
@@ -4725,10 +4582,7 @@ section~\ref{sec:xmpl} below.
(p.~184) same last name and same initials, but different first name;
(p.~185) ``ca.\hbox{}''; (p.~198) Advance online publication;
(p.~202) Abstract retrieved from; (pp.~208, 212) better deal with
- named archives; (p.~208) treat theses with a
- URL as published theses; (p.~208) ``Doctoral thesis'' instead of
- ``Doctoral dissertation'', form a university outside the United
- States; (p.~214) uncertain author;
+ named archives; (p.~214) uncertain author;
update the language files (\fname{.apc}) with correct definitions
of new text string commands; finish the examples file.
Many of these cases will not be a feature, but an ad-hoc workaround,
@@ -8382,9 +8236,11 @@ short form, of the examples.
%
% \begin{macro}{\APACaddressPublisher}
% \begin{macro}{\APACaddressInstitution}
-% Address and publisher/institution (|#1| = address, |#2| = publisher).
+% \begin{macro}{\APACaddressSchool}
+% Address and publisher, institution, or school (|#1| = address,
+% |#2| = publisher).
% \begin{macrocode}
-\newcommand{\APACaddressPublisher}[2]{%
+\DeclareRobustCommand{\APACaddressPublisher}[2]{%
\ifx\@empty#1\@empty
\ifx\@empty#2\@empty
\else
@@ -8399,9 +8255,62 @@ short form, of the examples.
\fi
}
\let\APACaddressInstitution\APACaddressPublisher
+\DeclareRobustCommand{\APACaddressSchool}[2]{%
+ \ifx\@empty#2\@empty
+ \ifx\@empty#1\@empty
+ \else
+ {#1}% address
+ \fi
+ \else
+ {#2}% school
+ \ifx\@empty#1\@empty
+ \else
+ \unskip, {#1}% address
+ \fi
+ \fi
+}
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\APACtypeAddressSchool}
+% Type, school, and address in parenthese after the title in a thesis.
+% \begin{macrocode}
+\DeclareRobustCommand{\APACtypeAddressSchool}[3]{%
+ \ifx\@empty#1\@empty
+ \ifx\@empty#3\@empty
+ \ifx\@empty#2\@empty
+ \else
+ ({#2})% address
+ \fi
+ \else
+ ({#3}% school
+ \ifx\@empty#2\@empty
+ \else
+ \unskip, {#2}% address
+ \fi
+ )%
+ \fi
+ \else
+ ({#1}% type
+ \ifx\@empty#3\@empty
+ \ifx\@empty#2\@empty
+ \else
+ \unskip, {#2}% address
+ \fi
+ \else
+ \unskip, {#3}% school
+ \ifx\@empty#2\@empty
+ \else
+ \unskip, {#2}% address
+ \fi
+ \fi
+ )%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\APACaddressPublisherEqAuth}
% \begin{macro}{\APACaddressInstitutionEqAuth}
@@ -10609,6 +10518,33 @@ short form, of the examples.
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\APACredefineOnce}
+% This macro takes two arguments: (1) the name of a command (without the
+% backslash) and (2) arbitrary \TeX{} code. It then redefines the
+% command (1) to the \TeX{} code (2) as a one-time change, so after the
+% command (1) has been invoked once, it reverts to its definition before
+% \cmd{\APACredefineOnce} was issued. This can be used to redefine, say,
+% \cmd{\BRetrievedFrom} from ``Retrieved from'' to ``Retrieved from
+% Poverty Alleviation website'' for a single reference but restore it
+% to ``Retrieved from'' immediately afterwards.
+% \begin{macrocode}
+\DeclareRobustCommand\APACredefineOnce[2]{%
+ \global
+ \expandafter\let
+ \csname old#1\expandafter\endcsname
+ \csname #1\endcsname
+ \expandafter\gdef
+ \csname #1\expandafter\endcsname
+ {{#2}%
+ \global
+ \expandafter\let
+ \csname #1\expandafter\endcsname
+ \csname old#1\endcsname
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\bibeditortype}
% \begin{macro}{\renewbibeditortype}
% The following macro changes the definitions of the macros \cmd{\BED}
@@ -15612,12 +15548,12 @@ short form, of the examples.
\author{Erik Meijer\\
\textsf{apacite at gmail.com}
}
-\date{2013/07/04}
+\date{2013/07/21}
\begin{document}
\maketitle
\begin{abstract}
-This document tests \textsf{apacite} [2013/07/04 v6.02]. See the
+This document tests \textsf{apacite} [2013/07/21 v6.03]. See the
\textsf{apacite} documentation for more information.
\end{abstract}
@@ -16297,16 +16233,16 @@ This document tests \textsf{apacite} [2013/07/04 v6.02]. See the
% written by the same authors, so I'd think we'd normally list the book title
% in the \fieldname{title} field and in the text refer to the specific chapter
% or pages, rather than single out the chapter in the reference list. (2)
-% The doi of the actual chapter is \doi{10.1037/10762-006}; the doi given here
+% The doi of the chapter is \doi{10.1037/10762-006}; the doi given here
% is the one for the whole book. (3) It is unclear why we would mention the
% series in which the book appears or the series editor. My impression from
% earlier versions of the \emph{APA manual} is that this is only done if the
% ``series'' is to be considered a joint work (like an encyclopedia) where
% different volumes have different editors and there is a series editor. It is
% my impression that the current work is just a book in a series of books, like
-% every publisher has its various series with their series editors. (4) It is
-% unclear why the series title needs to be capitalized. So in summary, I would
-% normally format this example as
+% every publisher has its various series with their series editors. (Note that
+% the series title has to be capitalized.) So in summary, I would normally
+% format this example as
% \begin{verbatim}
% @book{apa6:ch7-ex24,
% author = {Strong, Edward K., Jr. and Uhrbrock, Richard S.},
@@ -16471,10 +16407,10 @@ author = {{\bibcorporate{Real Academia Espa\~{n}ola}}},
%</xmpl>
%<*bibdb>
@incollection{apa6:ch7-ex30,
- title = {Heuristic},
- booktitle = {Merriam-{Webster}'s Online Dictionary},
- edition = {11},
- url = {http://www.m-w.com/dictionary/heuristic},
+ title = {Heuristic},
+ booktitle = {Merriam-{Webster}'s Online Dictionary},
+ edition = {11},
+ url = {http://www.m-w.com/dictionary/heuristic},
}
%</bibdb>
% \end{macrocode}
@@ -16483,6 +16419,433 @@ author = {{\bibcorporate{Real Academia Espa\~{n}ola}}},
% instead of ``n.d.''.
% \begin{macrocode}
%<*xmpl>
+\item
+\cite{apa6:ch7-ex31} \\
+\cite{apa6:ch7-ex31} \\
+\fullciteA{apa6:ch7-ex31} \\
+\citeA{apa6:ch7-ex31}
+%</xmpl>
+%<*bibdb>
+@techreport{apa6:ch7-ex31,
+ author = {{\bibcorporate{U.S. Department of Health and Human
+ Services, National Institutes of Health, National Heart,
+ Lung, and Blood Institute}}},
+ firstkey = {{U.S. Department of Health and Human
+ Services, National Institutes of Health, National Heart,
+ Lung, and Blood Institute [NHLBI]}},
+ key = {{NHLBI}},
+ year = {2003},
+ title = {Managing Asthma: A Guide for Schools},
+ type = {NIH Publication},
+ number = {02-2650},
+ url = {http://www.nhlbi.nih.gov/health/prof/lung/asthma/asth_sch.pdf},
+}
+%</bibdb>
+% \end{macrocode}
+% This is an awfully long author name. In the 5th edition,
+% section~3.96, example~1, only ``National Institute of Mental Health''
+% was used, without all the higher levels in the hierarchy.
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex32} \\
+\cite{apa6:ch7-ex32} \\
+\fullciteA{apa6:ch7-ex32} \\
+\citeA{apa6:ch7-ex32}
+%</xmpl>
+%<*bibdb>
+@techreport{apa6:ch7-ex32,
+ author = {{\bibcorporate{American Psychological Association, Task
+ Force on the Sexualization of Girls}}},
+ firstkey = {{American Psychological Association, Task
+ Force on the Sexualization of Girls [APA]}},
+ key = {{APA}},
+ year = {2007},
+ title = {Report of the {APA} {Task} {Force} on the {Sexualization}
+ of {Girls}},
+ type = {\bibnotype},
+ url = {http://www.apa.org/pi/wpo/sexualization.html},
+}
+%</bibdb>
+% \end{macrocode}
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex33} \\
+\cite{apa6:ch7-ex33} \\
+\fullciteA{apa6:ch7-ex33} \\
+\citeA{apa6:ch7-ex33}
+%</xmpl>
+%<*bibdb>
+@techreport{apa6:ch7-ex33,
+ author = {Kessy, Severine S. A. and Urio, Fratern M.},
+ year = {2006},
+ title = {The Contribution of Microfinance Institutions to
+ Poverty Reduction in {Tanzania}},
+ type = {Research Report\APACredefineOnce{BRetrievedFrom}
+ {Retrieved from Research on Poverty Alleviation
+ website:\ }},
+ number = {06.3},
+ url = {http://www.repoa.or.tz/documents_storage/Publications/Reports/06.3_Kessy_and_Urio.pdf},
+}
+%</bibdb>
+% \end{macrocode}
+% Note the use of \cmd{\APACredefineOnce} from the \pkg{apacdoc}
+% package to make a one-time change of the \cmd{\BRetrievedFrom}
+% command to accommodate the ``Research on Poverty Alleviation
+% website''.
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex34} \\
+\cite{apa6:ch7-ex34} \\
+\fullciteA{apa6:ch7-ex34} \\
+\citeA{apa6:ch7-ex34}
+%</xmpl>
+%<*bibdb>
+@techreport{apa6:ch7-ex34,
+ author = {McDaniel, Julie E. and Miskel, Cecil G.},
+ year = {2002},
+ title = {The Effect of Groups and Individuals on National
+ Decisionmaking: Influence and Domination in the
+ Reading Policymaking Environment},
+ type = {CIERA Report\APACredefineOnce{BRetrievedFrom}
+ {Retrieved from University of Michigan, Center for
+ Improvement of Early Reading Achievement website:\ }},
+ number = {3-025},
+ url = {http://www.ciera.org/library/reports/inquiry-3/3-025/3-025.pdf},
+}
+%</bibdb>
+% \end{macrocode}
+% The APA manual does not have a ``No.'' after ``CIERA Report'',
+% which seems like an error in the manual to me.
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex35} \\
+\cite{apa6:ch7-ex35} \\
+\fullciteA{apa6:ch7-ex35} \\
+\citeA{apa6:ch7-ex35}
+%</xmpl>
+%<*bibdb>
+@techreport{apa6:ch7-ex35,
+ author = {{\bibcorporate{Employee Benefit Research Institute}}},
+ firstkey = {{Employee Benefit Research Institute [EBRI]}},
+ key = {{EBRI}},
+ year = {1992},
+ month = feb,
+ title = {Sources of Health Insurance and Characteristics of the
+ Uninsured, Analysis of the {March} 1991 {Current}
+ {Population} {Survey}},
+ type = {Issue Brief},
+ number = {123},
+ address = {Washington, DC},
+ institution = {{\bibcorporate{Employee Benefit Research Institute}}},
+}
+%</bibdb>
+% \end{macrocode}
+% The APA manual does not include a url, perhaps for the sake of
+% an example that shows address and publisher, but I was able to
+% retrieve it from \url{http://www.ebri.org/publications/ib/}
+% Also, the APA manual does not list the full title.
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex36} \\
+\cite{apa6:ch7-ex36} \\
+\fullciteA{apa6:ch7-ex36} \\
+\citeA{apa6:ch7-ex36}
+%</xmpl>
+%<*bibdb>
+@lecture{apa6:ch7-ex36,
+ author = {Muellbauer, John},
+ year = {2007},
+ month = sep,
+ title = {Housing, Credit and Consumer Expenditure},
+ chair = {Ludvigson, Sydney C.},
+ symposium = {Housing and Consumer Behavior},
+ howpublished = {Symposium conducted at the meeting of the {Federal}
+ {Reserve} {Bank} of {Kansas} {City}},
+ address = {Jackson Hole, WY},
+}
+%</bibdb>
+% \end{macrocode}
+% There are several things not right about this entry. A minor point is
+% that the title does not have a comma after ``Credit''. More
+% importantly, the entry seems to misrepresent the symposium. On the
+% website
+% \url{http://www.kc.frb.org/publications/research/escp/escp-2007.cfm},
+% the symposium is listed as ``Housing, Housing Finance, \& Monetary
+% Policy, a symposium sponsored by the Federal Reserve Bank of Kansas
+% City''. So the title of the symposium is different and it is not a
+% ``meeting of'' but a ``symposium sponsored by''. ``Housing and
+% Consumer Behavior'' is the title of the session, in which
+% Muellbauer's paper is the only paper, so it appears this was simply
+% a provisional title of the paper. Ludvigson is the discussant, which
+% is not generally the same as the chair, and in fact Martin Feldstein
+% is listed as the chair of the general discussion, who also gives the
+% ``Overview and concluding remarks'' at the end of the symposium. The
+% Kansas City Fed's website posts two versions of the paper (neither of
+% which is listed in the APA manual): one downloadable from the website
+% mentioned above, which is nicely typeset and starts at page 267, and
+% thus looks like an edited published version, and one at
+% \url{http://www.kc.frb.org/publicat/sympos/2007/pdf/2007.09.17.muellbauer.pdf},
+% which looks like the accepted version from the author. The former
+% lists the middle initial ``N.'' of the author, whereas the latter
+% does not. Normally, one would cite the published version, but for the
+% sake of this example, we cite the paper presented. Nevertheless, the
+% description in the APA manual seems grossly inaccurate.
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex37} \\
+\cite{apa6:ch7-ex37} \\
+\fullciteA{apa6:ch7-ex37} \\
+\citeA{apa6:ch7-ex37}
+%</xmpl>
+%<*bibdb>
+@lecture{apa6:ch7-ex37,
+ author = {Liu, Shuhua},
+ year = {2005},
+ month = may,
+ title = {Defending Against Business Crises with the Help of
+ Intelligent Agent Based Early Warning Solutions},
+ howpublished = {Paper presented at the Seventh International
+ Conference on Enterprise Information Systems},
+ address = {Miami, FL\APACredefineOnce{BRetrievedFrom}{Abstract
+ retrieved from\ }},
+ url = {http://www.iceis.org/iceis2005/abstracts_2005.htm},
+}
+%</bibdb>
+% \end{macrocode}
+% The website itself uses ``7th'' instead of ``Seventh''.
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex38} \\
+\cite{apa6:ch7-ex38} \\
+\fullciteA{apa6:ch7-ex38} \\
+\citeA{apa6:ch7-ex38}
+%</xmpl>
+%<*bibdb>
+@article{apa6:ch7-ex38,
+ author = {Herculano-Houzel, Suzana and Collins, Christine E.
+ and Wong, Peiyan and Kaas, Jon H. and Lent, Roberto},
+ year = {2008},
+ title = {The Basic Nonuniformity of the Cerebral Cortex},
+ journal = {Proceedings of the National Academy of Sciences, USA},
+ volume = {105},
+ pages = {12593--12598},
+ doi = {10.1073/pnas.0805417105},
+}
+%</bibdb>
+% \end{macrocode}
+% Despite the name ``Proceedings'', this is an ordinary journal and
+% thus there is nothing special about this reference. It is
+% noteworthy, though, that in the first printing of the 6th edition
+% of the APA manual, ``, USA,'' was missing, and this addition is
+% listed as a correction in the errata on the APA website. Still this
+% is an interesting case where the APA departs from its policy of not
+% abbreviating journal titles: PNAS's website lists the name of the
+% journal as ``Proceedings of the National Academy of Sciences of the
+% United States of America'', and abbreviates it to PNAS.
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex39} \\
+\cite{apa6:ch7-ex39} \\
+\fullciteA{apa6:ch7-ex39} \\
+\citeA{apa6:ch7-ex39}
+%</xmpl>
+%<*bibdb>
+@incollection{apa6:ch7-ex39,
+ author = {Katz, Itai and Gabayan, Kevin and Aghajan, Hamid},
+ year = {2007},
+ title = {A Multi-touch Surface Using Multiple Cameras},
+ editor = {Blanc-Talon, Jacques and Philips, Wilfried
+ and Popescu, Dan and Scheunders, Paul},
+ booktitle = {{Lecture} {Notes} in {Computer} {Science}: Vol.~4678.
+ {Advanced} Concepts for Intelligent Vision Systems},
+ pages = {97--108},
+ doi = {10.1007/978-3-540-74607-2_9},
+}
+%</bibdb>
+% \end{macrocode}
+% For references with a doi or url, the general rule in the 6th edition
+% is to omit the publisher and its address, so this is what I did, and
+% the example in the APA manual seems incorrect. Also, the
+% capitalization of the book title seems incorrect (cf.\ example~24).
+% From previous versions of the APA manual, I got the impression that
+% ``series'' in APA speak was the title of a coherent multivolume work
+% with possibly different volume editors, and not the name of a book
+% series with unrelated works. Because the \fieldname{series} field in
+% \BibTeX{} is intended for the latter, which would not normally be
+% included in a reference in psychology, \pkg{apacite} has ignored it
+% thus far. This example, however, falls in the latter category, and
+% thus I may need to reconsider how \pkg{apacite} deals with this,
+% especially because it seems more natural then to split what is now
+% in the \fieldname{booktitle} field into \fieldname{series},
+% \fieldname{volume}, and \fieldname{booktitle}. Note that the example
+% does not mention the series editors, unlike series examples in
+% previous editions of the APA manual.
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex40} \\
+\cite{apa6:ch7-ex40} \\
+\fullciteA{apa6:ch7-ex40} \\
+\citeA{apa6:ch7-ex40} \\
+%</xmpl>
+%<*bibdb>
+@mastersthesis{apa6:ch7-ex40,
+ author = {McNiel, Donita S.},
+ year = {2006},
+ title = {Meaning Through Narrative: A Personal Narrative
+ Discussing Growing Up with an Alcoholic Mother},
+ howpublished = {Available from ProQuest Dissertations and Theses
+ database},
+ note = {UMI No.\ 1434728},
+}
+%</bibdb>
+% \end{macrocode}
+% The APA manual gives rules for unpublished theses, but provides no
+% explicit examples. So let's reuse two examples from the 5th edition
+% here. Note, however, that I obtained this information and the
+% abstracts, though not the full text, from ProQuest, and it says that
+% these are abstracted in \emph{DAI} (Series~B, Vol.~50, No.~11,
+% p.~5303, 1990) and \emph{MAI} (Vol.~30, No.~3, p.~906, 1992),
+% respectively. This also lists the title of the first one and the year
+% of the second one differently from the 5th edition of the APA manual.
+% I used the ProQuest information.
+% \begin{macrocode}
+%<*xmpl>
+\mbox{}\\
+\cite{apa6:ch7-ex40-2} \\
+\cite{apa6:ch7-ex40-2} \\
+\fullciteA{apa6:ch7-ex40-2} \\
+\citeA{apa6:ch7-ex40-2} \\
+\mbox{}\\
+\cite{apa6:ch7-ex40-3} \\
+\cite{apa6:ch7-ex40-3} \\
+\fullciteA{apa6:ch7-ex40-3} \\
+\citeA{apa6:ch7-ex40-3}
+%</xmpl>
+%<*bibdb>
+@phdthesis{apa6:ch7-ex40-2,
+ author = {Wilfley, Denise E.},
+ year = {1989},
+ title = {An Analysis of Psychological Distress, Self-concept,
+ and Patterns of Family Interactions in Two Subgroups
+ of Bulimia--Normal Weight and Obese},
+ school = {University of Missouri},
+ address = {Columbia},
+}
+@mastersthesis{apa6:ch7-ex40-3,
+ author = {Almeida, David M.},
+ year = {1989},
+ title = {Fathers' Participation in Family Work: Consequences
+ for Fathers' Stress and Father-Child Relations},
+ school = {University of Victoria},
+ address = {Victoria, British Columbia, Canada},
+}
+%</bibdb>
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex41} \\
+\cite{apa6:ch7-ex41} \\
+\fullciteA{apa6:ch7-ex41} \\
+\citeA{apa6:ch7-ex41}
+%</xmpl>
+%<*bibdb>
+@phdthesis{apa6:ch7-ex41,
+ author = {Adams, Ronald Jerry},
+ year = {1973},
+ title = {Building a Foundation for Evaluation of Instruction in
+ Higher Education and Continuing Education},
+ url = {http://www.ohiolink.edu/etd/},
+}
+%</bibdb>
+% \end{macrocode}
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex42} \\
+\cite{apa6:ch7-ex42} \\
+\fullciteA{apa6:ch7-ex42} \\
+\citeA{apa6:ch7-ex42}
+%</xmpl>
+%<*bibdb>
+@phdthesis{apa6:ch7-ex42,
+ author = {Bruckman, Amy},
+ year = {1997},
+ title = {{MOOSE} Crossing: Construction, Community, and
+ Learning in a Networked Virtual World for Kids},
+ school = {Massachusetts Institute of Technology},
+ url = {http://www-static.cc.gatech.edu/~asb/thesis/},
+}
+%</bibdb>
+% \end{macrocode}
+% On the thesis, the author's given names are listed as ``Amy Susan'',
+% but the APA manual only lists the first initial and the author cites
+% only her first given name in her reference list as well. The format
+% with MIT listed in parentheses fits neither rule on p.~207 of the
+% APA manual. Presumably, this was done because of a combination of
+% factors: thesis obtained from the web, but not a stable database,
+% and from the author's website at her current affiliation, not the
+% university where the degree was obtained.
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex43} \\
+\cite{apa6:ch7-ex43} \\
+\fullciteA{apa6:ch7-ex43} \\
+\citeA{apa6:ch7-ex43}
+%</xmpl>
+%<*bibdb>
+@phdthesis{apa6:ch7-ex43,
+ author = {Appelbaum, Lawrence G.},
+ year = {2005},
+ title = {Three Studies of Human Information Processing:
+ Texture Amplification, Motion Representation, and
+ Figure-Ground Segregation},
+ journal = {Dissertation Abstracts International: Section B.
+ Sciences and Engineering},
+ volume = {65},
+ number = {10},
+ pages = {5428},
+}
+%</bibdb>
+% \end{macrocode}
+% Unlike previous versions of the APA manual, where DAI abstracts had a
+% parenthetical part like ``(Doctoral dissertation, University of
+% California, Irvine, 2004)'', this is now formatted purely as a
+% journal article, so I could have simply used the \entryname{@article}
+% entry type. The \fieldname{school} and in particular
+% \fieldname{originalyear} fields should now be omitted.
+% \begin{macrocode}
+%<*xmpl>
+\item
+\cite{apa6:ch7-ex44} \\
+\cite{apa6:ch7-ex44} \\
+\fullciteA{apa6:ch7-ex44} \\
+\citeA{apa6:ch7-ex44}
+%</xmpl>
+%<*bibdb>
+@phdthesis{apa6:ch7-ex44,
+ author = {Carlbom, Pelle},
+ year = {2000},
+ title = {Carbody and Passengers in Rail Vehicle Dynamics},
+ type = {Doctoral thesis},
+ school = {Royal Institute of Technology},
+ address = {Stockholm, Sweden},
+ url = {http://urn.kb.se/resolve?urn=urn:nbn:se:kth:diva-3029},
+}
+%</bibdb>
+% \end{macrocode}
+% This follows the same pattern as example~42. ``Doctoral thesis'' is
+% presumably an error; it should be ``Doctoral dissertation''.
+% \begin{macrocode}
+%<*xmpl>
\end{enumerate}
\bibliographystyle{apacite}
\bibliography{apa5ex}
@@ -16809,15 +17172,15 @@ FUNCTION {identify.apacite.version}
%<*!annotated>
%<bibstyle> "apacite.bst"
%<xbibstyle> "apacitex.bst"
-%<bibstyle> " [2013/07/04 v6.02 APA bibliography style]"
-%<xbibstyle> " [2013/07/04 v6.02 APA bibl. style with author index info]"
+%<bibstyle> " [2013/07/21 v6.03 APA bibliography style]"
+%<xbibstyle> " [2013/07/21 v6.03 APA bibl. style with author index info]"
%</!annotated>
%<*annotated>
%<bibstyle> "apacann.bst"
%<xbibstyle> "apacannx.bst"
-%<bibstyle> " [2013/07/04 v6.02 APA annotated bibliography style]"
+%<bibstyle> " [2013/07/21 v6.03 APA annotated bibliography style]"
%<*xbibstyle>
-" [2013/07/04 v6.02 APA annotated bibl. style with author index info]"
+" [2013/07/21 v6.03 APA annotated bibl. style with author index info]"
%</xbibstyle>
%</annotated>
%<*bibstyle|xbibstyle>
@@ -16914,9 +17277,14 @@ STRINGS { s t u old.label field
year.label.old
}
% \end{macrocode}
-% A small function for testing purposes.
+% Two functions that can be used for testing purposes.
% \begin{macrocode}
FUNCTION {test} { #0 }
+FUNCTION {dump.stack}
+{ "---- STACK {" cite$ * "} ----" * top$
+ stack$
+ "---- END STACK {" cite$ * "} ----" * top$
+}
% \end{macrocode}
% A small function that indicates whether index entries must be generated.
% This is the only line that is different between \fname{apacite.bst} and
@@ -17509,15 +17877,23 @@ FUNCTION {remove.spaces}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
- % starting new block by writing what's left on the stack,
- % starting a new line and adding some extra space or
- % whatever is more defined in \newblock
+ % end block by writing what's left on the stack and
+ % starting a new line
%
FUNCTION {output.end.block}
{ write$
newline$
}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %
+ % end block by adding a period and writing what's left
+ % on the stack and starting a new line
+ %
+FUNCTION {output.dot.end.block}
+{ add.period$
+ output.end.block
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -17527,8 +17903,7 @@ FUNCTION {output.end.block}
%
FUNCTION {output.new.block}
{ output.end.block
- "\newblock" write$
- newline$
+ "\newblock" write$ newline$
}
@@ -17554,10 +17929,10 @@ FUNCTION {start.new.block}
}
% \end{macrocode}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \subsection{Functions for sorting by author (or substitute),
% year, title}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% The ``classic'' versions are the ones with the von part
% treated a in ``Beethoven, L. van'', whereas the nonclassic ones
% have the new approach with the von part always before the last
@@ -19136,13 +19511,13 @@ FUNCTION {make.title.number}
FUNCTION {make.citeorder.number}
{ old.number #1 + 'cite.order :=
cite.order 'old.number :=
- cite.order conv.int.to.str citeorder.sort.label :=
+ cite.order conv.int.to.str 'citeorder.sort.label :=
}
% \end{macrocode}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \subsection{Name formatting}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% In order to support removal of spaces between the initials,
% we have to split the formatting of the constituent parts,
% because something like |"{ll}{, f{\BPBI }.}{ vv}{, jj}"| removes
@@ -20682,9 +21057,9 @@ FUNCTION {format.year.month.day.check}
% \end{macrocode}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \subsection{Title formatting}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \begin{macro}{format.atitle.no.dot}
% Title of article in journal or book, without finishing period.
% The field must be on top of stack (so \fieldname{englishtitle} can
@@ -21223,17 +21598,14 @@ FUNCTION { format.type.number }
if$
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% HOWPUBLISHED %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format howpublished if not empty,
- % for various entry types
- % call with
- % format.howpublished
- %
+% \end{macrocode}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \paragraph{Howpublished formatting functions}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% The third function is a cleaner version. The first one is used with
+% various entry types; the second one with \entryname{@misc}, the
+% third one in v6.03 only with theses.
+% \begin{macrocode}
FUNCTION {format.howpublished}
{ howpublished empty$
'skip$
@@ -21246,14 +21618,6 @@ FUNCTION {format.howpublished}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format howpublished if not empty,
- % for misc
- % call with
- % output.howpublished
- %
FUNCTION {output.howpublished}
{ howpublished empty$
'skip$
@@ -21262,12 +21626,20 @@ FUNCTION {output.howpublished}
}
if$
}
-
+FUNCTION {howpublished.block}
+{ howpublished empty$
+ 'skip$
+ { start.new.block
+ "\APAChowpublished {" howpublished * "}" *
+ output.dot.end.block
+ }
+ if$
+}
% \end{macrocode}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \subsection{URL formatting functions}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{URL and DOI formatting functions}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \begin{macro}{begin.end.url.env}
% Begin and end of a URL environment.
% \begin{macrocode}
@@ -21308,21 +21680,16 @@ FUNCTION {begin.end.msg.env}
{ "\begin{APACrefURLmsg} "
" \end{APACrefURLmsg} "
}
-
% \end{macrocode}
% \end{macro}
+% Format \fieldname{url} given that it is not empty.
% \begin{macrocode}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format url given that it is not empty,
- % for various entry types
- % call with
- % format.url
- %
FUNCTION {format.url}
-{ % First format begin and end of the enclosing environment.
- % With posted messages, a different environment is used.
- type.2 empty$
+% \end{macrocode}
+% First format begin and end of the enclosing environment.
+% With posted messages, a different environment is used.
+% \begin{macrocode}
+{ type.2 empty$
{ begin.end.url.env }
{ type.2 "\bibmessage" =
{ begin.end.msg.env }
@@ -21330,40 +21697,76 @@ FUNCTION {format.url}
if$
}
if$
- % The url string.
"\url{" url * "}" *
- % Enclose in begin and end environment
+% \end{macrocode}
+% Enclose url string in begin and end environment.
+% \begin{macrocode}
enclose.check
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format doi given that it is not empty,
- % for various entry types
- % call with
- % format.doi
- %
+% \end{macrocode}
+% Process a whole url block. Skip if a \fieldname{doi} is also present
+% because then \fieldname{doi} has precedence.
+% \begin{macrocode}
+FUNCTION {url.block}
+{ doi empty$
+ { url empty$
+ 'skip$
+ { start.new.block
+ format.url
+ output.end.block
+ }
+ if$
+ }
+ 'skip$
+ if$
+}
+% \end{macrocode}
+% Format \fieldname{doi} given that it is not empty.
+% \begin{macrocode}
FUNCTION {format.doi}
-{ % First format begin and end of the enclosing environment.
- begin.end.doi.env
- % The doi string.
+% \end{macrocode}
+% Format begin and end of the enclosing environment.
+% \begin{macrocode}
+{ begin.end.doi.env
"\doi{" doi * "}" *
- % Enclose in begin and end environment
+% \end{macrocode}
+% Enclose doi string in begin and end environment.
+% \begin{macrocode}
enclose.check
}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% NOTE FORMATTING FUNCTIONS %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % format optional note
- %
+% \end{macrocode}
+% Process a whole doi block.
+% \begin{macrocode}
+FUNCTION {doi.block}
+{ doi empty$
+ 'skip$
+ { start.new.block
+ format.doi
+ output.end.block
+ }
+ if$
+}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{Note formatting functions}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Format optional note.
+% \begin{macrocode}
FUNCTION {format.note}
{ "\APACrefnote{" "}" note enclose.check }
-
+% \end{macrocode}
+% Process a whole note block (only \fieldname{note}).
+% \begin{macrocode}
+FUNCTION {note.block}
+{ note empty$
+ 'skip$
+ { start.new.block
+ format.note
+ output.end.block
+ }
+ if$
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -21460,20 +21863,18 @@ FUNCTION {format.orig.note}
}
if$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % finish current entry
- % by writing what's left on the stack and starting a new line
- %
+% \end{macrocode}
+% Finish current entry by writing what's left on the stack and starting
+% a new line.
+% \begin{macrocode}
FUNCTION {fin.entry}
{ doi empty$
- { output.end.block }
+ 'skip$
{ output.new.block
format.doi
- output.end.block
}
if$
+ output.end.block
"\PrintBackRefs{\CurrentBib}" write$ newline$
test
{ "\vspace{\baselineskip}" write$ newline$ }
@@ -21507,11 +21908,50 @@ FUNCTION {fin.entry}
%</annotated>
}
% \end{macrocode}
+% Finish current entry: process \fieldname{doi}, back references, and
+% annotation if requested.
+% \begin{macrocode}
+FUNCTION {fin.entry.2}
+{ doi.block
+ "\PrintBackRefs{\CurrentBib}" write$ newline$
+ test
+ { "\vspace{\baselineskip}" write$ newline$ }
+ 'skip$
+ if$
+%<*annotated>
+% \end{macrocode}
+% According to TLC2, pp. 810--811, both \fieldname{annote} and
+% \fieldname{annotate} fields are known, so support them both, but do
+% not print them both, in case someone wants to make a \fname{.bib}
+% file that is compatible with both the \pkg{annotate} and
+% and \pkg{annotation} styles and thus duplicates the information.
+% Instead, we give \fieldname{annote} priority.
+% \begin{macrocode}
+ annote empty$
+ {% Try annotate
+ annotate empty$
+ 'skip$
+ { % add annotation
+ "\begin{APACrefannotation}" write$ newline$
+ annotate write$ newline$
+ "\end{APACrefannotation}" write$ newline$
+ }
+ if$
+ }
+ { % add annotation
+ "\begin{APACrefannotation}" write$ newline$
+ annote write$ newline$
+ "\end{APACrefannotation}" write$ newline$
+ }
+ if$
+%</annotated>
+}
+% \end{macrocode}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \subsection{Top-level and near-top level functions for formatting complete
% entries}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Article in periodical: \entryname{journal}, \entryname{magazine},
% \entryname{newspaper}. Call with
% \begin{verbatim}
@@ -21873,8 +22313,13 @@ FUNCTION {format.tr.title.number}
% warning if no institution
%
FUNCTION {format.address.institution.check}
-{ "institution" institution warning.if.empty
- "address" address warning.if.empty
+{ url empty$
+ doi empty$ and
+ { "institution" institution warning.if.empty
+ "address" address warning.if.empty
+ }
+ 'skip$
+ if$
institution empty$
address empty$
and
@@ -22136,139 +22581,183 @@ FUNCTION {lecture}
fin.entry
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% THESES %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % default thesis type is on top of stack
- % now, if type field is empty, this default is used
- % else default is removed and replaced by value of
- % type field
- %
-FUNCTION {format.type.school}
-{ type empty$
- 'skip$
- { pop$
- type "t" change.case$
- }
- if$
- school connect.with.comma.check
-}
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % phd theses, etc.
- % call with
- % "default.published.thesis" "default.unpublished.thesis" thesis
- %
-FUNCTION {thesis}
-{ author empty$
- { "author" author warning.if.empty }
- { format.authors start.new.block }
+% \end{macrocode}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \paragraph{Theses}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Format thesis title, with \fieldname{type} and \fieldname{school},
+% if necessary. Call with
+% \begin{verbatim}
+% "default.published.thesis" "default.unpublished.thesis" format.ttitle.type.school
+% \end{verbatim}
+% The type now needs to be done here, and the school as well if the
+% dissertation was retrieved from the internet, which we'll take to
+% be the same as \fieldname{url} non-empty. Note that \pkg{apacite}
+% cannot distinguish between institutional databases (ex.~41 in the
+% 6th ed.\ of the APA manual) and ordinary websites (ex.~42), so the
+% user should provide the \fieldname{school} if it's necessary but
+% not otherwise. If both \fieldname{url} and \fieldname{howpublished}
+% are empty, the type is taken to be the unpublished thesis type
+% (unless overridden by the \fieldname{type} field); otherwise, the
+% published type is used (unless overridden).
+% \begin{macrocode}
+FUNCTION {format.ttitle.type.school}
+{ doi empty$ not
+ url empty$ not or
+ howpublished empty$ not or
+ { pop$ }
+ { swap$ pop$ }
if$
- %
- % format year and check if year present
- %
- format.year.check output.dot.new.block
- %
- % format title and check if title present
- % journal empty => unpublished PhD thesis
- % journal not empty => published (e.g., Dissertation Abstracts Int.)
- %
- journal empty$
- { format.btitle.vol.edition output.dot.new.block
- %
- % pop default unpublished thesis, top is default published thesis
- %
- swap$ pop$
- format.type.school
- address connect.with.comma.check
- }
- %
- % pop default published thesis, top is default unpublished thesis
- %
- { pop$
- type empty$
- school empty$ and
- originalyear empty$ and
+% \end{macrocode}
+% Single out the situation in which |type = {\bibnotype}|, i.e.,
+% no type.
+% \begin{macrocode}
+ type empty$
+ 'skip$
+ { type "\bibnotype" =
{ pop$
""
}
- { format.type.school
- originalyear connect.with.comma.check
- parenthesize.check
+ { pop$
+ type
}
if$
- format.aetitle.check
- swap$ connect.with.space.check
- "title" title warning.if.empty
- title format.atitle.connect output.new.block
- pages format.journal.vol.num.pages.check
}
if$
- %
- % if not empty, insert howpublished.
- % (used if thesis is retrieved from the internet)
- %
- format.howpublished add.period$
- %
- % format url
- %
- url empty$
- 'skip$
- { % Clear the stack
- duplicate$ empty$
+% \end{macrocode}
+% The desired type is on top of the stack. Build \LaTeX{} command.
+% \begin{macrocode}
+ duplicate$ empty$
+ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ address empty$
+ school empty$ and or and
+ { 'pop$
+ title empty$ not
+ englishtitle empty$ not or
+ { start.new.block }
'skip$
- { output.new.block }
if$
- format.url
+ ""
+ }
+ { start.new.block
+ "\APACtypeAddressSchool {" swap$ * "}{" *
+% \end{macrocode}
+% If unpublished, school and location are listed in the next block.
+% \begin{macrocode}
+ doi empty$
+ url empty$ and
+ howpublished empty$ and
+ { "}{}" * }
+ { address "" connect.check "}{" *
+ school "" connect.check "}" *
+ }
+ if$
}
if$
- %
- % format optional note
- %
- note empty$
- 'skip$
- { % Clear the stack
- duplicate$ empty$
+% \end{macrocode}
+% Format english translation of title, if present, title itself, and
+% connect everything.
+% \begin{macrocode}
+ format.betitle.check swap$
+ connect.with.space.check
+ "title" title warning.if.empty
+ title format.btitle.connect
+}
+% \end{macrocode}
+% Block that indicates school and location for unpublished theses.
+% \begin{macrocode}
+FUNCTION {unpub.address.school.block}
+% \end{macrocode}
+% Determine whether this is an unpublished thesis (no \fieldname{url},
+% \fieldname{doi}, or \fieldname{howpublished}.
+% \begin{macrocode}
+{ doi empty$
+ url empty$ and
+ howpublished empty$ and
+% \end{macrocode}
+% If so, there should be a \fieldname{school}, so issue a warning if
+% it's empty.
+% \begin{macrocode}
+ { "school" school warning.if.empty
+ school empty$
+ address empty$ and
'skip$
- { output.new.block }
+ { start.new.block
+ "\APACaddressSchool {" address "" connect.check "}{" *
+ school "" connect.check "}" *
+ output.dot.end.block
+ }
if$
- format.note
}
+% \end{macrocode}
+% Do nothing if it's not an unpublished thesis.
+% \begin{macrocode}
+ 'skip$
if$
- fin.entry
}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % phd theses, etc.
- %
+% \end{macrocode}
+% Format theses. Call with
+% \begin{verbatim}
+% "default.published.thesis" "default.unpublished.thesis" thesis
+% \end{verbatim}
+% \begin{macrocode}
+FUNCTION {thesis}
+% \end{macrocode}
+% DAI and similar are now formatted purely as articles, so remove
+% the two default types on top of the stack and redirect to the
+% |article| function.
+% \begin{macrocode}
+{ journal empty$ not
+ { pop$ pop$
+ article
+ }
+ { author empty$
+ { "author" author warning.if.empty }
+ { format.authors start.new.block }
+ if$
+% \end{macrocode}
+% Check if \fieldname{year} is present and format year. Ditto for
+% \fieldname{title} with \fieldname{type} (and \fieldname{school}
+% if the dissertation was obtained from a website).
+% \begin{macrocode}
+ format.year.check output.dot.end.block
+ format.ttitle.type.school output.dot.end.block
+% \end{macrocode}
+% Put name of institution (\fieldname{school}) and its address here if
+% it's an unpublished thesis.
+% \begin{macrocode}
+ unpub.address.school.block
+% \end{macrocode}
+% If not empty, insert \fieldname{howpublished}. This is used if the
+% thesis was retrieved from a database.
+% \begin{macrocode}
+ howpublished.block
+% \end{macrocode}
+% Format \fieldname{url}, in case the thesis was downloaded from a
+% webpage, optional \fieldname{note}, and finalize with the standard
+% parts (\fieldname{doi}, back references).
+% \begin{macrocode}
+ url.block
+ note.block
+ fin.entry.2
+ }
+ if$
+}
+% \end{macrocode}
+% PhD theses and master's these, respectively. These set the default
+% published and unpublished thesis types and then call |thesis|.
+% \begin{macrocode}
FUNCTION {phdthesis}
{ "\BPhD" "\BUPhD" thesis }
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % master's theses, etc.
- %
FUNCTION {mastersthesis}
{ "\BMTh" "\BUMTh" thesis }
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% OTHER %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% title of something (used in unpublished and misc)
@@ -22550,16 +23039,6 @@ FUNCTION {manual}
misc
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %
- % following functions not used for APA Manual examples
- %
-
-
-
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% booklet
@@ -22606,62 +23085,54 @@ FUNCTION {proceedings}
FUNCTION {default.type}
{ misc }
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% INITIALIZATION FUNCTIONS %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+% \end{macrocode}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{Initialization functions}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This currently only defines the maximum number of names to be
+% formatted and this is not even used. This is something that I may
+% want to revisit in order to make it more flexible.
+% \begin{macrocode}
FUNCTION {initialize}
-{ %
- % Maximum number of names to be formatted .
+{
#6 'name.max :=
%% #250 'entry.max$ :=
%% #5000 'global.max$ :=
}
-
+% \end{macrocode}
+% For numbering the entries according to current sorting order.
+% \begin{macrocode}
FUNCTION {init.old.number}
-{ %
- % For numbering the entries according to current sorting order.
- #0 'old.number :=
-}
-
+{ #0 'old.number := }
+% \end{macrocode}
+% For comparing labels across entries.
+% \begin{macrocode}
FUNCTION {init.old.label}
-{ %
- % For comparing labels across entries .
- "zzzzzz" 'old.label :=
-}
-
+{ "zzzzzz" 'old.label := }
+% \end{macrocode}
+% For all entries, initialize flags whether initials must be cited and
+% whether an `a', `b', etc.\ needs to be added to the year. Both are
+% initialized as not needed.
+% \begin{macrocode}
FUNCTION {init.cite.initials.add.to.year}
-{ %
- % Initialize "cite initials" indicator for all entries.
- #0 'cite.initials :=
- %
- % Initialize "add to year", i.e., whether a, b, etc. must
- % be added to the year in citation, to "no".
+{ #0 'cite.initials :=
#0 'add.to.year :=
- %
}
-
+% \end{macrocode}
+% Functions that indicate whether we're moving forward (|ITERATE|) or
+% backward (|REVERSE|) through the entry list.
+% \begin{macrocode}
FUNCTION {move.forward}
-{ %
- % Indicates that we're moving forward (ITERATE) through the entry list .
- #1 'forward :=
-}
-
+{ #1 'forward := }
FUNCTION {move.backward}
-{ %
- % Indicates that we're moving backward (REVERSE) through the entry list .
- #0 'forward :=
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% BASIC BIBLIOGRAPHY OUTPUT FUNCTIONS %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Beginning of the thebibliography environment:
-% Write preamble if there is one, write \begin command
-
+{ #0 'forward := }
+% \end{macrocode}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{Basic bibliography output functions}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Beginning of the \envirname{thebibliography} environment: Write
+% preamble if there is one, write |\begin| command.
+% \begin{macrocode}
FUNCTION {begin.bib}
{ preamble$ empty$
'skip$
@@ -22669,128 +23140,101 @@ FUNCTION {begin.bib}
if$
"\begin{thebibliography}{}" write$ newline$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Write \end{thebibliography} command
-
+% \end{macrocode}
+% Write |\end{thebibliography}| command.
+% \begin{macrocode}
FUNCTION {end.bib}
{ newline$
"\end{thebibliography}" write$ newline$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Write the citation labels and reference list entry to
-% the .bbl file.
-
+% \end{macrocode}
+% Write the citation labels and reference list entry to the
+% \fname{.bbl} file.
+% \begin{macrocode}
FUNCTION {write.bbl.entry}
-{ %
- % Output \bibitem and \citeauthoryear command.
- %
+{
+% \end{macrocode}
+% Output \cmd{\bibitem} and \cmd{\citeauthoryear} commands.
+% \begin{macrocode}
make.cite.labels
- %
- % Format and output reference list entry.
- %
+% \end{macrocode}
+% Format and output reference list entry.
+% \begin{macrocode}
call.type$
}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% READ AND PROCESS ENTRIES, MAKE THEBIBLIOGRAPHY %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% Read entries .
-
+% \end{macrocode}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{Read and process entries and make the bibliography}
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Read citations from \fname{.aux} file and extract corresponding
+% entries from \fname{.bib} file.
+% \begin{macrocode}
READ
-
-% Write version info to .blg file
-
+% \end{macrocode}
+% Write version info to \fname{.blg} file.
+% \begin{macrocode}
EXECUTE { identify.apacite.version }
-
-% Some initializations .
-
+% \end{macrocode}
+% Some initializations.
+% \begin{macrocode}
EXECUTE { initialize }
-
+% \end{macrocode}
% Store the citation order in an integer variable, and a corresponding
% string variable that can be used for sorting.
-
+% \begin{macrocode}
EXECUTE { init.old.number }
-
ITERATE { make.citeorder.number }
-
-% Sort items by title in order to replace each title by
-% its number in later sorting .
-
+% \end{macrocode}
+% Sort items by title in order to replace each title by its number in
+% later sorting.
+% \begin{macrocode}
ITERATE { make.sort.title }
-
SORT
-
EXECUTE { init.old.number }
-
EXECUTE { init.old.label }
-
ITERATE { make.title.number }
-
-% Now generate some tentative author-year labels and do some
-% preprocessing for the later definitive author and year
-% labels.
-
+% \end{macrocode}
+% Generate some tentative author-year labels and do some
+% preprocessing for the later definitive author and year labels.
+% \begin{macrocode}
ITERATE { make.tentative.sort.label }
-
SORT
-
-% Now check whether initials must be added to first author,
-% how many authors must be formatted, whether an "a", "b",
-% etc., must be added to the year label.
-
+% \end{macrocode}
+% Check whether initials must be added to first author, how many
+% authors must be formatted, whether an `a', `b', etc., must be added
+% to the year label.
+% \begin{macrocode}
ITERATE { init.cite.initials.add.to.year }
-
EXECUTE { init.initials }
-
ITERATE { check.add.initials }
-
EXECUTE { init.initials }
-
REVERSE { check.add.initials }
-
ITERATE { tentative.cite.num.names }
-
EXECUTE { init.cite.num.names }
-
EXECUTE { move.forward }
-
ITERATE { definitive.cite.num.names }
-
EXECUTE { init.cite.num.names }
-
EXECUTE { move.backward }
-
REVERSE { definitive.cite.num.names }
-
-
-% Make final sorting label and do definitive sorting .
-
+% \end{macrocode}
+% Make final sorting label and do definitive sorting.
+% \begin{macrocode}
ITERATE { make.final.sort.key }
-
SORT
-
-% Write preamble and \begin{thebibliography}{} statement
-
+% \end{macrocode}
+% Write preamble and |\begin{thebibliography}{}| statement.
+% \begin{macrocode}
EXECUTE { begin.bib }
-
-% Make final cite labels, format reference list entry,
-% and write to .bbl file.
-
+% \end{macrocode}
+% Make final cite labels, format reference list entry, and write to
+% \fname{.bbl} file.
+% \begin{macrocode}
ITERATE { write.bbl.entry }
-
-
-% Write \end{thebibliography} statement
-
+% \end{macrocode}
+% Write |\end{thebibliography}| statement.
+% \begin{macrocode}
EXECUTE { end.bib }
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% DONE %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
%</bibstyle|xbibstyle>
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty
index a301b52d413..990c850f7dd 100644
--- a/Master/texmf-dist/tex/latex/apacite/apacdoc.sty
+++ b/Master/texmf-dist/tex/latex/apacite/apacdoc.sty
@@ -44,7 +44,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{apacdoc}
- [2013/07/04 v6.02 apacite documentation style]
+ [2013/07/21 v6.03 apacite documentation style]
%%
%% apacdoc.sty : Style package that is used for the apacite documentation.
%% Written by Erik Meijer
@@ -62,6 +62,20 @@
\newcommand{\SwapArgs}[2]{#2#1}
\newcommand{\bibreftext}[2]{#2}
\newcommand{\Dutchvon}[2]{#2}
+\DeclareRobustCommand\APACredefineOnce[2]{%
+ \global
+ \expandafter\let
+ \csname old#1\expandafter\endcsname
+ \csname #1\endcsname
+ \expandafter\gdef
+ \csname #1\expandafter\endcsname
+ {{#2}%
+ \global
+ \expandafter\let
+ \csname #1\expandafter\endcsname
+ \csname old#1\endcsname
+ }%
+}
\DeclareRobustCommand{\bibeditortype}[1]{\relax }%
\def\renewbibeditortype{%
\def\oldBED{}%
diff --git a/Master/texmf-dist/tex/latex/apacite/apacite.sty b/Master/texmf-dist/tex/latex/apacite/apacite.sty
index 710737939e0..11a4c757b78 100644
--- a/Master/texmf-dist/tex/latex/apacite/apacite.sty
+++ b/Master/texmf-dist/tex/latex/apacite/apacite.sty
@@ -44,7 +44,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{apacite}
- [2013/07/04 v6.02 APA citation]
+ [2013/07/21 v6.03 APA citation]
%%
%% apacite.sty : citation and reference list according to APA manual
%% Written by Erik Meijer
@@ -1287,7 +1287,7 @@
\unskip, {#4}% pages
\fi
}
-\newcommand{\APACaddressPublisher}[2]{%
+\DeclareRobustCommand{\APACaddressPublisher}[2]{%
\ifx\@empty#1\@empty
\ifx\@empty#2\@empty
\else
@@ -1302,6 +1302,52 @@
\fi
}
\let\APACaddressInstitution\APACaddressPublisher
+\DeclareRobustCommand{\APACaddressSchool}[2]{%
+ \ifx\@empty#2\@empty
+ \ifx\@empty#1\@empty
+ \else
+ {#1}% address
+ \fi
+ \else
+ {#2}% school
+ \ifx\@empty#1\@empty
+ \else
+ \unskip, {#1}% address
+ \fi
+ \fi
+}
+\DeclareRobustCommand{\APACtypeAddressSchool}[3]{%
+ \ifx\@empty#1\@empty
+ \ifx\@empty#3\@empty
+ \ifx\@empty#2\@empty
+ \else
+ ({#2})% address
+ \fi
+ \else
+ ({#3}% school
+ \ifx\@empty#2\@empty
+ \else
+ \unskip, {#2}% address
+ \fi
+ )%
+ \fi
+ \else
+ ({#1}% type
+ \ifx\@empty#3\@empty
+ \ifx\@empty#2\@empty
+ \else
+ \unskip, {#2}% address
+ \fi
+ \else
+ \unskip, {#3}% school
+ \ifx\@empty#2\@empty
+ \else
+ \unskip, {#2}% address
+ \fi
+ \fi
+ )%
+ \fi
+}
\newcommand{\APACaddressPublisherEqAuth}[2]{%
\ifx\@empty#1\@empty
{\BAuthor{}}% Publisher formatted as ``Author''
diff --git a/Master/texmf-dist/tex/latex/apacite/dutch.apc b/Master/texmf-dist/tex/latex/apacite/dutch.apc
index 6e66b9656e4..00e2ec21940 100644
--- a/Master/texmf-dist/tex/latex/apacite/dutch.apc
+++ b/Master/texmf-dist/tex/latex/apacite/dutch.apc
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{dutch.apc}
- [2013/07/04 v6.02 apacite language file]
+ [2013/07/21 v6.03 apacite language file]
%%
%% dutch.apc - dutch translation of apacite elements
%% Written by Erik Meijer
diff --git a/Master/texmf-dist/tex/latex/apacite/english.apc b/Master/texmf-dist/tex/latex/apacite/english.apc
index a9dc4fb84f2..ee8ff2148b6 100644
--- a/Master/texmf-dist/tex/latex/apacite/english.apc
+++ b/Master/texmf-dist/tex/latex/apacite/english.apc
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{english.apc}
- [2013/07/04 v6.02 apacite language file]
+ [2013/07/21 v6.03 apacite language file]
%%
%% english.apc - english version of apacite elements
%% Written by Erik Meijer
diff --git a/Master/texmf-dist/tex/latex/apacite/finnish.apc b/Master/texmf-dist/tex/latex/apacite/finnish.apc
index 628ea9185eb..343f4a047ef 100644
--- a/Master/texmf-dist/tex/latex/apacite/finnish.apc
+++ b/Master/texmf-dist/tex/latex/apacite/finnish.apc
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{finnish.apc}
- [2013/07/04 v6.02 apacite language file]
+ [2013/07/21 v6.03 apacite language file]
%%
%% finnish.apc - finnish version of apacite elements
%% Written by Kari Pyykk\"o, with some minor edits by Erik Meijer.
diff --git a/Master/texmf-dist/tex/latex/apacite/german.apc b/Master/texmf-dist/tex/latex/apacite/german.apc
index 9204ba23ead..fb053a0143c 100644
--- a/Master/texmf-dist/tex/latex/apacite/german.apc
+++ b/Master/texmf-dist/tex/latex/apacite/german.apc
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{german.apc}
- [2013/07/04 v6.02 apacite language file]
+ [2013/07/21 v6.03 apacite language file]
%%
%% german.apc - Deutsche Uebersetzung der Apacite-Elemente
%% (German version of apacite elements)
diff --git a/Master/texmf-dist/tex/latex/apacite/greek.apc b/Master/texmf-dist/tex/latex/apacite/greek.apc
index 47ba7984990..0ad81ee55b5 100644
--- a/Master/texmf-dist/tex/latex/apacite/greek.apc
+++ b/Master/texmf-dist/tex/latex/apacite/greek.apc
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{greek.apc}
- [2013/07/04 v6.02 apacite language file]
+ [2013/07/21 v6.03 apacite language file]
%%
%% greek.apc - Greek version of apacite elements
%% Greek translations by Athanassios Protopapas and Ioannis Dimakos
diff --git a/Master/texmf-dist/tex/latex/apacite/ngerman.apc b/Master/texmf-dist/tex/latex/apacite/ngerman.apc
index 73dc2536afd..bad625df5c7 100644
--- a/Master/texmf-dist/tex/latex/apacite/ngerman.apc
+++ b/Master/texmf-dist/tex/latex/apacite/ngerman.apc
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{ngerman.apc}
- [2013/07/04 v6.02 apacite language file]
+ [2013/07/21 v6.03 apacite language file]
%%
%% ngerman.apc - german translation of apacite elements (new orthography)
%% Written by Erik Meijer, based on instructions of Andreas Poege.
diff --git a/Master/texmf-dist/tex/latex/apacite/norsk.apc b/Master/texmf-dist/tex/latex/apacite/norsk.apc
index 96b0241fc48..227dd83b2d2 100644
--- a/Master/texmf-dist/tex/latex/apacite/norsk.apc
+++ b/Master/texmf-dist/tex/latex/apacite/norsk.apc
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{norsk.apc}
- [2013/07/04 v6.02 apacite language file]
+ [2013/07/21 v6.03 apacite language file]
%%
%% norsk.apc - Norwegian Bokmal & Nynorsk versions of apacite elements.
%% Version 1.1.
diff --git a/Master/texmf-dist/tex/latex/apacite/spanish.apc b/Master/texmf-dist/tex/latex/apacite/spanish.apc
index 5d746ef7386..63136b34b95 100644
--- a/Master/texmf-dist/tex/latex/apacite/spanish.apc
+++ b/Master/texmf-dist/tex/latex/apacite/spanish.apc
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{spanish.apc}
- [2013/07/04 v6.02 apacite language file]
+ [2013/07/21 v6.03 apacite language file]
%%
%% spanish.apc - Versi\'on espa\~nola de elementos en apacite
%% Escrito por Jorge L\'opez Puga
diff --git a/Master/texmf-dist/tex/latex/apacite/swedish.apc b/Master/texmf-dist/tex/latex/apacite/swedish.apc
index 10fed68e466..786c0beea82 100644
--- a/Master/texmf-dist/tex/latex/apacite/swedish.apc
+++ b/Master/texmf-dist/tex/latex/apacite/swedish.apc
@@ -43,7 +43,7 @@
%% the generated files.
%%
\ProvidesFile{swedish.apc}
- [2013/07/04 v6.02 apacite language file]
+ [2013/07/21 v6.03 apacite language file]
%%
%% swedish.apc - swedish translation of apacite elements
%% Written by Stefan Bjork.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 65f8d4275e1..16ce2040ac9 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -123,7 +123,7 @@ my @TLP_working = qw(
combelow combine combinedgraphics comfortaa comma commado commath comment
compactbib
complexity components-of-TeX comprehensive computational-complexity
- concepts concmath concmath-fonts concprog confproc constants conteq
+ concepts concmath concmath-fonts concprog concrete confproc constants conteq
context-account context-algorithmic context-bnf context-chromato
context-construction-plan context-cyrillicnumbers
context-degrade context-filter context-fixme
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 04798e72c5a..1d6684ff3f6 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -251,6 +251,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'computer-typesetting-using-latex', "die 'skipping, nosource'",
'concmath-fonts', "&MAKEflatten",
'concmath', "&MAKEnosymlinks",
+ 'concrete', "&MAKEflatten",
'conferences', "die 'skipping, container directory'",
'context-algorithmic', "&MAKEcopy",
'context-account', "&MAKEcopy",
@@ -1093,6 +1094,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'cals' => '&PREHOOK_cals',
'chess' => '&PREHOOK_chess',
'cm-super' => '&PREHOOK_cm_super',
+ 'concrete' => '&PREHOOK_concrete',
'download' => '&PREHOOK_savepdf',
'dynblocks' => '&PREHOOK_flatten1',
'fixme' => '&PREHOOK_fixme',
@@ -4649,6 +4651,18 @@ sub PREHOOK_cm_super {
&SYSTEM ("$RM -rf dvipdfm");
}
+sub PREHOOK_concrete {
+ print "PREHOOK_$package - instantiate symlinks from symlink\n";
+ # would be better done in tlpkginfo --prepare.
+ &xchdir ("mf");
+ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
+ for my $mf (glob ("*.mf")) {
+ &SYSTEM ("$CP $ctan_root/systems/knuth/local/cm/$mf ..");
+ }
+ &xchdir ("..");
+ # symlinks will get removed afterward by MAKEflatten.
+}
+
sub PREHOOK_fixme {
print "PREHOOK_$package - create dtx subdirs\n";
&xmkdir ("themes", "layouts", "layouts/env", "layouts/target");