@@ -14,103 +14,103 @@ |
||
14 | 14 | { |
15 | 15 | |
16 | 16 | const NAME_VARIABLES = [ |
17 | - 'author', //author |
|
18 | - 'collection-editor', //editor of the collection holding the item (e.g. the series editor for a book) |
|
19 | - 'composer', //composer (e.g. of a musical score) |
|
20 | - 'container-author', //author of the container holding the item (e.g. the book author for a book chapter) |
|
21 | - 'director', //director (e.g. of a film) |
|
22 | - 'editor', //editor |
|
23 | - 'editorial-director', //managing editor (“Directeur de la Publication” in French) |
|
24 | - 'illustrator', //illustrator (e.g. of a children’s book) |
|
25 | - 'interviewer', //interviewer (e.g. of an interview) |
|
26 | - 'original-author', // |
|
27 | - 'recipient', //recipient (e.g. of a letter) |
|
17 | + 'author', //author |
|
18 | + 'collection-editor', //editor of the collection holding the item (e.g. the series editor for a book) |
|
19 | + 'composer', //composer (e.g. of a musical score) |
|
20 | + 'container-author', //author of the container holding the item (e.g. the book author for a book chapter) |
|
21 | + 'director', //director (e.g. of a film) |
|
22 | + 'editor', //editor |
|
23 | + 'editorial-director', //managing editor (“Directeur de la Publication” in French) |
|
24 | + 'illustrator', //illustrator (e.g. of a children’s book) |
|
25 | + 'interviewer', //interviewer (e.g. of an interview) |
|
26 | + 'original-author', // |
|
27 | + 'recipient', //recipient (e.g. of a letter) |
|
28 | 28 | 'reviewed-author' //author of the item reviewed by the current item |
29 | 29 | ]; |
30 | 30 | |
31 | 31 | const NUMBER_VARIABLES = [ |
32 | - 'chapter-number', //chapter number |
|
33 | - 'collection-number', //number identifying the collection holding the item (e.g. the series number for a book) |
|
34 | - 'edition', //(container) edition holding the item (e.g. “3” when citing a chapter in the third |
|
32 | + 'chapter-number', //chapter number |
|
33 | + 'collection-number', //number identifying the collection holding the item (e.g. the series number for a book) |
|
34 | + 'edition', //(container) edition holding the item (e.g. “3” when citing a chapter in the third |
|
35 | 35 | //edition of a book) |
36 | - 'issue', //(container) issue holding the item (e.g. “5” when citing a journal article from |
|
36 | + 'issue', //(container) issue holding the item (e.g. “5” when citing a journal article from |
|
37 | 37 | //journal volume 2, issue 5) |
38 | - 'number', //number identifying the item (e.g. a report number) |
|
39 | - 'number-of-pages', //total number of pages of the cited item |
|
40 | - 'number-of-volumes', //total number of volumes, usable for citing multi-volume books and such |
|
38 | + 'number', //number identifying the item (e.g. a report number) |
|
39 | + 'number-of-pages', //total number of pages of the cited item |
|
40 | + 'number-of-volumes', //total number of volumes, usable for citing multi-volume books and such |
|
41 | 41 | 'volume' //(container) volume holding the item (e.g. “2” when citing a chapter from book volume 2) |
42 | 42 | ]; |
43 | 43 | |
44 | 44 | const DATE_VARIABLES = [ |
45 | - 'accessed', //date the item has been accessed |
|
45 | + 'accessed', //date the item has been accessed |
|
46 | 46 | 'container', |
47 | - 'event-date', //date the related event took place |
|
48 | - 'issued', //date the item was issued/published |
|
49 | - 'original-date', //(issue) date of the original version |
|
47 | + 'event-date', //date the related event took place |
|
48 | + 'issued', //date the item was issued/published |
|
49 | + 'original-date', //(issue) date of the original version |
|
50 | 50 | 'submitted' //date the item (e.g. a manuscript) has been submitted for publication |
51 | 51 | ]; |
52 | 52 | |
53 | 53 | const STANDARD_VARIABLE = [ |
54 | - 'abstract', //abstract of the item (e.g. the abstract of a journal article) |
|
55 | - 'annote', //reader’s notes about the item content |
|
56 | - 'archive', //archive storing the item |
|
57 | - 'archive-location', //storage location within an archive (e.g. a box and folder number) |
|
58 | - 'archive-place', //geographic location of the archive |
|
59 | - 'authority', //issuing or judicial authority (e.g. “USPTO” for a patent, “Fairfax Circuit Court” for |
|
54 | + 'abstract', //abstract of the item (e.g. the abstract of a journal article) |
|
55 | + 'annote', //reader’s notes about the item content |
|
56 | + 'archive', //archive storing the item |
|
57 | + 'archive-location', //storage location within an archive (e.g. a box and folder number) |
|
58 | + 'archive-place', //geographic location of the archive |
|
59 | + 'authority', //issuing or judicial authority (e.g. “USPTO” for a patent, “Fairfax Circuit Court” for |
|
60 | 60 | //a legal case) |
61 | - 'call-number', //call number (to locate the item in a library) |
|
62 | - 'citation-label', //label identifying the item in in-text citations of label styles (e.g. “Ferr78”). May |
|
61 | + 'call-number', //call number (to locate the item in a library) |
|
62 | + 'citation-label', //label identifying the item in in-text citations of label styles (e.g. “Ferr78”). May |
|
63 | 63 | //be assigned by the CSL processor based on item metadata. |
64 | - 'citation-number', //index (starting at 1) of the cited reference in the bibliography (generated by the CSL |
|
64 | + 'citation-number', //index (starting at 1) of the cited reference in the bibliography (generated by the CSL |
|
65 | 65 | //processor) |
66 | - 'collection-title', //title of the collection holding the item (e.g. the series title for a book) |
|
67 | - 'container-title', //title of the container holding the item (e.g. the book title for a book chapter, the |
|
66 | + 'collection-title', //title of the collection holding the item (e.g. the series title for a book) |
|
67 | + 'container-title', //title of the container holding the item (e.g. the book title for a book chapter, the |
|
68 | 68 | //journal title for a journal article) |
69 | - 'container-title-short',//short/abbreviated form of “container-title” (also accessible through the “short” form |
|
69 | + 'container-title-short', //short/abbreviated form of “container-title” (also accessible through the “short” form |
|
70 | 70 | //of the “container-title” variable) |
71 | - 'dimensions', //physical (e.g. size) or temporal (e.g. running time) dimensions of the item |
|
72 | - 'DOI', //Digital Object Identifier (e.g. “10.1128/AEM.02591-07”) |
|
73 | - 'event', //name of the related event (e.g. the conference name when citing a conference paper) |
|
74 | - 'event-place', //geographic location of the related event (e.g. “Amsterdam, the Netherlands”) |
|
71 | + 'dimensions', //physical (e.g. size) or temporal (e.g. running time) dimensions of the item |
|
72 | + 'DOI', //Digital Object Identifier (e.g. “10.1128/AEM.02591-07”) |
|
73 | + 'event', //name of the related event (e.g. the conference name when citing a conference paper) |
|
74 | + 'event-place', //geographic location of the related event (e.g. “Amsterdam, the Netherlands”) |
|
75 | 75 | 'first-reference-note-number', //number of a preceding note containing the first reference to the item. Assigned |
76 | 76 | // by the CSL processor. The variable holds no value for non-note-based styles, or when |
77 | 77 | // the item hasn’t been cited in any preceding notes. |
78 | - 'genre', //class, type or genre of the item (e.g. “adventure” for an adventure movie, |
|
78 | + 'genre', //class, type or genre of the item (e.g. “adventure” for an adventure movie, |
|
79 | 79 | //“PhD dissertation” for a PhD thesis), |
80 | - 'ISBN', //International Standard Book Number |
|
81 | - 'ISSN', //International Standard Serial Number |
|
82 | - 'jurisdiction', //geographic scope of relevance (e.g. “US” for a US patent) |
|
83 | - 'keyword', //keyword(s) or tag(s) attached to the item |
|
84 | - 'locator', //a cite-specific pinpointer within the item (e.g. a page number within a book, or a |
|
80 | + 'ISBN', //International Standard Book Number |
|
81 | + 'ISSN', //International Standard Serial Number |
|
82 | + 'jurisdiction', //geographic scope of relevance (e.g. “US” for a US patent) |
|
83 | + 'keyword', //keyword(s) or tag(s) attached to the item |
|
84 | + 'locator', //a cite-specific pinpointer within the item (e.g. a page number within a book, or a |
|
85 | 85 | //volume in a multi-volume work). Must be accompanied in the input data by a label |
86 | 86 | //indicating the locator type (see the Locators term list), which determines which term |
87 | 87 | //is rendered by cs:label when the “locator” variable is selected. |
88 | - 'medium', //medium description (e.g. “CD”, “DVD”, etc.) |
|
89 | - 'note', //(short) inline note giving additional item details (e.g. a concise summary or commentary) |
|
90 | - 'original-publisher', //original publisher, for items that have been republished by a different publisher |
|
88 | + 'medium', //medium description (e.g. “CD”, “DVD”, etc.) |
|
89 | + 'note', //(short) inline note giving additional item details (e.g. a concise summary or commentary) |
|
90 | + 'original-publisher', //original publisher, for items that have been republished by a different publisher |
|
91 | 91 | 'original-publisher-place', //geographic location of the original publisher (e.g. “London, UK”) |
92 | - 'original-title', //title of the original version (e.g. “Война и мир”, the untranslated Russian title of |
|
92 | + 'original-title', //title of the original version (e.g. “Война и мир”, the untranslated Russian title of |
|
93 | 93 | // “War and Peace”) |
94 | - 'page', //range of pages the item (e.g. a journal article) covers in a container (e.g. a journal |
|
94 | + 'page', //range of pages the item (e.g. a journal article) covers in a container (e.g. a journal |
|
95 | 95 | // issue) |
96 | - 'page-first', //first page of the range of pages the item (e.g. a journal article) covers in a |
|
96 | + 'page-first', //first page of the range of pages the item (e.g. a journal article) covers in a |
|
97 | 97 | //container (e.g. a journal issue) |
98 | - 'PMCID', //PubMed Central reference number |
|
99 | - 'PMID', //PubMed reference number |
|
100 | - 'publisher', //publisher |
|
101 | - 'publisher-place', //geographic location of the publisher |
|
102 | - 'references', //resources related to the procedural history of a legal case |
|
103 | - 'reviewed-title', //title of the item reviewed by the current item |
|
104 | - 'scale', //scale of e.g. a map |
|
105 | - 'section', //container section holding the item (e.g. “politics” for a newspaper article) |
|
106 | - 'source', //from whence the item originates (e.g. a library catalog or database) |
|
107 | - 'status', //(publication) status of the item (e.g. “forthcoming”) |
|
108 | - 'title', //primary title of the item |
|
109 | - 'title-short', //short/abbreviated form of “title” (also accessible through the “short” form of the |
|
98 | + 'PMCID', //PubMed Central reference number |
|
99 | + 'PMID', //PubMed reference number |
|
100 | + 'publisher', //publisher |
|
101 | + 'publisher-place', //geographic location of the publisher |
|
102 | + 'references', //resources related to the procedural history of a legal case |
|
103 | + 'reviewed-title', //title of the item reviewed by the current item |
|
104 | + 'scale', //scale of e.g. a map |
|
105 | + 'section', //container section holding the item (e.g. “politics” for a newspaper article) |
|
106 | + 'source', //from whence the item originates (e.g. a library catalog or database) |
|
107 | + 'status', //(publication) status of the item (e.g. “forthcoming”) |
|
108 | + 'title', //primary title of the item |
|
109 | + 'title-short', //short/abbreviated form of “title” (also accessible through the “short” form of the |
|
110 | 110 | //“title” variable) |
111 | - 'URL', //Uniform Resource Locator (e.g. “http://aem.asm.org/cgi/content/full/74/9/2766”) |
|
112 | - 'version', //version of the item (e.g. “2.0.9” for a software program) |
|
113 | - 'year-suffix', //disambiguating year suffix in author-date styles (e.g. “a” in “Doe, 1999a”) |
|
111 | + 'URL', //Uniform Resource Locator (e.g. “http://aem.asm.org/cgi/content/full/74/9/2766”) |
|
112 | + 'version', //version of the item (e.g. “2.0.9” for a software program) |
|
113 | + 'year-suffix', //disambiguating year suffix in author-date styles (e.g. “a” in “Doe, 1999a”) |
|
114 | 114 | |
115 | 115 | |
116 | 116 | ]; |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | } |
230 | 230 | |
231 | 231 | /** |
232 | - * @param $differentParts |
|
232 | + * @param integer $differentParts |
|
233 | 233 | * @param DateTime $from |
234 | 234 | * @param DateTime $to |
235 | 235 | * @param $delim |
@@ -469,6 +469,9 @@ discard block |
||
469 | 469 | } |
470 | 470 | } |
471 | 471 | |
472 | + /** |
|
473 | + * @param string $form |
|
474 | + */ |
|
472 | 475 | private function prepareDatePartsChildren($dateParts, $form) |
473 | 476 | { |
474 | 477 | /* Localized date formats are selected with the optional form attribute, which must set to either “numeric” |
@@ -84,8 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | if (CiteProc::getContext()->isModeBibliography()) { |
86 | 86 | if ($data instanceof DataList) { |
87 | - foreach ($data as $citationNumber => $item) { |
|
88 | - ++self::$numberOfCitedItems; |
|
87 | + foreach ($data as $citationNumber => $item) {++self::$numberOfCitedItems; |
|
89 | 88 | CiteProc::getContext()->getResults()->append($this->wrapBibEntry($this->renderSingle($item, $citationNumber))); |
90 | 89 | } |
91 | 90 | $ret .= implode($this->delimiter, CiteProc::getContext()->getResults()->toArray()); |
@@ -93,7 +92,7 @@ discard block |
||
93 | 92 | $ret .= $this->wrapBibEntry($this->renderSingle($data, $citationNumber)); |
94 | 93 | } |
95 | 94 | $ret = StringHelper::clearApostrophes($ret); |
96 | - return "<div class=\"csl-bib-body\">".$ret."\n</div>"; |
|
95 | + return "<div class=\"csl-bib-body\">" . $ret . "\n</div>"; |
|
97 | 96 | |
98 | 97 | } else if (CiteProc::getContext()->isModeCitation()) { |
99 | 98 | if (is_array($data) || $data instanceof DataList) { |
@@ -55,7 +55,7 @@ |
||
55 | 55 | } else { |
56 | 56 | $lastChar = substr($text, -1); |
57 | 57 | if (preg_match("/[,\.;]/", $text)) { |
58 | - $subStr = substr($text, 0,strlen($text)-1); |
|
58 | + $subStr = substr($text, 0, strlen($text) - 1); |
|
59 | 59 | return $openQuote . $subStr . $closeQuote . $lastChar; |
60 | 60 | } |
61 | 61 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | if (!in_array($this->display, self::$allowedValues)) { |
56 | 56 | return $text; |
57 | 57 | } |
58 | - $divStyle = "class=\"csl-".$this->display."\""; |
|
58 | + $divStyle = "class=\"csl-" . $this->display . "\""; |
|
59 | 59 | return "<div $divStyle>$text</div>"; |
60 | 60 | } |
61 | 61 | } |
62 | 62 | \ No newline at end of file |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | } |
327 | 327 | |
328 | 328 | /** |
329 | - * @param $name |
|
329 | + * @param \stdClass $name |
|
330 | 330 | * @return \stdClass |
331 | 331 | */ |
332 | 332 | private function cloneNamePOSC($name) |
@@ -561,7 +561,7 @@ discard block |
||
561 | 561 | } |
562 | 562 | |
563 | 563 | /** |
564 | - * @return mixed |
|
564 | + * @return string |
|
565 | 565 | */ |
566 | 566 | public function getDelimiter() |
567 | 567 | { |