@@ -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 | ]; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | foreach ($node->attributes() as $attribute) { |
93 | 93 | switch ($attribute->getName()) { |
94 | 94 | case 'form': |
95 | - $this->form = (string)$attribute; |
|
95 | + $this->form = (string) $attribute; |
|
96 | 96 | break; |
97 | 97 | } |
98 | 98 | |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | cs:names element (taking into account the effects of et-al abbreviation and editor/translator collapsing), |
153 | 153 | which allows for advanced sorting. */ |
154 | 154 | if ($this->form == 'count') { |
155 | - return (int)count($resultNames); |
|
155 | + return (int) count($resultNames); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | return $text; |
@@ -505,8 +505,8 @@ discard block |
||
505 | 505 | |
506 | 506 | if (StringHelper::isLatinString(NameHelper::normalizeName($data)) || StringHelper::isCyrillicString(NameHelper::normalizeName($data))) { |
507 | 507 | if ($this->form === "long" && $nameAsSortOrder && |
508 | - ((string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::NEVER || |
|
509 | - (string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::SORT_ONLY) |
|
508 | + ((string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::NEVER || |
|
509 | + (string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::SORT_ONLY) |
|
510 | 510 | ) { |
511 | 511 | |
512 | 512 | // [La] [Fontaine], [Jean] [de], [III] |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | $text .= !empty($data->suffix) ? $this->sortSeparator . $data->suffix : ""; |
520 | 520 | } else if ($this->form === "long" && $nameAsSortOrder && |
521 | 521 | (is_null($demoteNonDroppingParticle) || |
522 | - (string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::DISPLAY_AND_SORT) |
|
522 | + (string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::DISPLAY_AND_SORT) |
|
523 | 523 | ) { |
524 | 524 | // [Fontaine], [Jean] [de] [La], [III] |
525 | 525 | |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | $text = !empty($given) ? $given . " " . $family : $family; |
550 | 550 | } |
551 | 551 | } else { |
552 | - $text = $this->form === "long" ? $data->family.$data->given : $data->family; |
|
552 | + $text = $this->form === "long" ? $data->family . $data->given : $data->family; |
|
553 | 553 | } |
554 | 554 | |
555 | 555 | return $text; |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
113 | - * @param array $name |
|
114 | 113 | * @param integer|null $citationNumber |
114 | + * @param \stdClass $data |
|
115 | 115 | * @return string |
116 | 116 | */ |
117 | 117 | public function render($data, $var, $citationNumber = null) |
@@ -571,7 +571,7 @@ discard block |
||
571 | 571 | } |
572 | 572 | |
573 | 573 | /** |
574 | - * @param $data |
|
574 | + * @param \stdClass $data |
|
575 | 575 | * @return array |
576 | 576 | */ |
577 | 577 | private function renderNameParts($data) |
@@ -9,7 +9,6 @@ |
||
9 | 9 | |
10 | 10 | namespace Seboettg\CiteProc\Rendering\Name; |
11 | 11 | use Seboettg\CiteProc\CiteProc; |
12 | -use Seboettg\CiteProc\Exception\CiteProcException; |
|
13 | 12 | use Seboettg\CiteProc\Rendering\HasParent; |
14 | 13 | use Seboettg\CiteProc\Rendering\Rendering; |
15 | 14 | use Seboettg\CiteProc\Style\InheritableNameAttributesTrait; |
@@ -186,7 +186,7 @@ |
||
186 | 186 | private function normalizeDateRange($page) |
187 | 187 | { |
188 | 188 | if (preg_match("/^(\d+)--(\d+)$/", trim($page), $matches)) { |
189 | - return $matches[1]."-".$matches[2]; |
|
189 | + return $matches[1] . "-" . $matches[2]; |
|
190 | 190 | } |
191 | 191 | return $page; |
192 | 192 | } |
@@ -247,6 +247,6 @@ |
||
247 | 247 | * @return mixed |
248 | 248 | */ |
249 | 249 | public static function removeBrackets($datePart) { |
250 | - return str_replace(["[","]", "(", ")", "{", "}"], "", $datePart); |
|
250 | + return str_replace(["[", "]", "(", ")", "{", "}"], "", $datePart); |
|
251 | 251 | } |
252 | 252 | } |
253 | 253 | \ No newline at end of file |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | /** |
33 | 33 | * Bibliography constructor. |
34 | 34 | * @param \SimpleXMLElement $node |
35 | - * @param Root $parent |
|
35 | + * @param \Seboettg\CiteProc\Root\Root $parent |
|
36 | 36 | */ |
37 | 37 | public function __construct(\SimpleXMLElement $node, $parent) |
38 | 38 | { |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
47 | - * @param array|DataList $data |
|
47 | + * @param DataList $data |
|
48 | 48 | * @param int|null $citationNumber |
49 | 49 | * @return string |
50 | 50 | */ |
@@ -228,7 +228,7 @@ |
||
228 | 228 | |
229 | 229 | |
230 | 230 | /** |
231 | - * @param $data |
|
231 | + * @param \stdClass $data |
|
232 | 232 | * @param $var |
233 | 233 | * @param $name |
234 | 234 | * @return string |
@@ -86,8 +86,7 @@ |
||
86 | 86 | } |
87 | 87 | |
88 | 88 | if (CiteProc::getContext()->isModeBibliography()) { |
89 | - foreach ($data as $citationNumber => $item) { |
|
90 | - ++self::$numberOfCitedItems; |
|
89 | + foreach ($data as $citationNumber => $item) {++self::$numberOfCitedItems; |
|
91 | 90 | CiteProc::getContext()->getResults()->append($this->wrapBibEntry($item, $this->renderSingle($item, $citationNumber))); |
92 | 91 | } |
93 | 92 | $ret .= implode($this->delimiter, CiteProc::getContext()->getResults()->toArray()); |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | |
185 | 185 | /** |
186 | 186 | * @param $data |
187 | - * @param $ret |
|
187 | + * @param string $ret |
|
188 | 188 | * @return string |
189 | 189 | */ |
190 | 190 | private function renderCitations($data, $ret) |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | /** |
203 | 203 | * @param DataList $data |
204 | 204 | * @param ArrayList $citationItems |
205 | - * @return mixed |
|
205 | + * @return DataList |
|
206 | 206 | */ |
207 | 207 | private function filterCitationItems($data, $citationItems) |
208 | 208 | { |
@@ -10,7 +10,6 @@ |
||
10 | 10 | namespace Seboettg\CiteProc\Rendering; |
11 | 11 | |
12 | 12 | use Seboettg\CiteProc\CiteProc; |
13 | -use Seboettg\CiteProc\Context; |
|
14 | 13 | use Seboettg\CiteProc\Data\DataList; |
15 | 14 | use Seboettg\CiteProc\RenderingState; |
16 | 15 | use Seboettg\CiteProc\Styles\AffixesTrait; |
@@ -95,12 +95,12 @@ |
||
95 | 95 | return '<a href="https://example.org/publication/' . $cslItem->id . '">' . $renderedText . '</a>'; |
96 | 96 | }, |
97 | 97 | "csl-entry" => function($cslItem, $renderedText) { |
98 | - return '<a id="' . $cslItem->id .'" href="#' . $cslItem->id .'"></a>' . $renderedText; |
|
98 | + return '<a id="' . $cslItem->id . '" href="#' . $cslItem->id . '"></a>' . $renderedText; |
|
99 | 99 | } |
100 | 100 | ], |
101 | 101 | "citation" => [ |
102 | 102 | "citation-number" => function($cslItem, $renderedText) { |
103 | - return '<a href="#' . $cslItem->id .'">'.$renderedText.'</a>'; |
|
103 | + return '<a href="#' . $cslItem->id . '">' . $renderedText . '</a>'; |
|
104 | 104 | } |
105 | 105 | ] |
106 | 106 | ]); |