Skip to content

Commit 1e7104f

Browse files
POBrien333POBrien333
authored
Merge pull request #8122 from adunning/nlm-report
NLM: fix report number labelling
2 parents fac81f0 + f25316f commit 1e7104f

9 files changed

+198
-63
lines changed

‎nlm-citation-name.csl‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,17 @@
9999
</choose>
100100
</group>
101101
</macro>
102+
<macro name="label-number">
103+
<group delimiter=": ">
104+
<choose>
105+
<if type="standard"/>
106+
<else-if is-numeric="number" match="any" type="legislation patent regulation">
107+
<label form="short" variable="number"/>
108+
</else-if>
109+
</choose>
110+
<text variable="number"/>
111+
</group>
112+
</macro>
102113
<macro name="label-number-of-pages">
103114
<group delimiter=" ">
104115
<text variable="number-of-pages"/>
@@ -405,13 +416,17 @@
405416
</macro>
406417
<macro name="report-number">
407418
<choose>
408-
<if type="report">
409-
<group delimiter=": ">
410-
<group delimiter=" ">
411-
<text term="report" text-case="capitalize-first"/>
412-
<label form="short" text-case="capitalize-first" variable="number"/>
413-
</group>
414-
<text variable="number"/>
419+
<if type="report" variable="number">
420+
<group delimiter=" ">
421+
<choose>
422+
<if variable="genre">
423+
<text text-case="capitalize-first" variable="genre"/>
424+
</if>
425+
<else>
426+
<text term="report" text-case="capitalize-first"/>
427+
</else>
428+
</choose>
429+
<text macro="label-number"/>
415430
</group>
416431
</if>
417432
</choose>

‎nlm-citation-sequence-brackets-no-et-al.csl‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,17 @@
9999
</choose>
100100
</group>
101101
</macro>
102+
<macro name="label-number">
103+
<group delimiter=": ">
104+
<choose>
105+
<if type="standard"/>
106+
<else-if is-numeric="number" match="any" type="legislation patent regulation">
107+
<label form="short" variable="number"/>
108+
</else-if>
109+
</choose>
110+
<text variable="number"/>
111+
</group>
112+
</macro>
102113
<macro name="label-number-of-pages">
103114
<group delimiter=" ">
104115
<text variable="number-of-pages"/>
@@ -405,13 +416,17 @@
405416
</macro>
406417
<macro name="report-number">
407418
<choose>
408-
<if type="report">
409-
<group delimiter=": ">
410-
<group delimiter=" ">
411-
<text term="report" text-case="capitalize-first"/>
412-
<label form="short" text-case="capitalize-first" variable="number"/>
413-
</group>
414-
<text variable="number"/>
419+
<if type="report" variable="number">
420+
<group delimiter=" ">
421+
<choose>
422+
<if variable="genre">
423+
<text text-case="capitalize-first" variable="genre"/>
424+
</if>
425+
<else>
426+
<text term="report" text-case="capitalize-first"/>
427+
</else>
428+
</choose>
429+
<text macro="label-number"/>
415430
</group>
416431
</if>
417432
</choose>

‎nlm-citation-sequence-brackets-year-only-no-issue.csl‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,17 @@
9999
</choose>
100100
</group>
101101
</macro>
102+
<macro name="label-number">
103+
<group delimiter=": ">
104+
<choose>
105+
<if type="standard"/>
106+
<else-if is-numeric="number" match="any" type="legislation patent regulation">
107+
<label form="short" variable="number"/>
108+
</else-if>
109+
</choose>
110+
<text variable="number"/>
111+
</group>
112+
</macro>
102113
<macro name="label-number-of-pages">
103114
<group delimiter=" ">
104115
<text variable="number-of-pages"/>
@@ -405,13 +416,17 @@
405416
</macro>
406417
<macro name="report-number">
407418
<choose>
408-
<if type="report">
409-
<group delimiter=": ">
410-
<group delimiter=" ">
411-
<text term="report" text-case="capitalize-first"/>
412-
<label form="short" text-case="capitalize-first" variable="number"/>
413-
</group>
414-
<text variable="number"/>
419+
<if type="report" variable="number">
420+
<group delimiter=" ">
421+
<choose>
422+
<if variable="genre">
423+
<text text-case="capitalize-first" variable="genre"/>
424+
</if>
425+
<else>
426+
<text term="report" text-case="capitalize-first"/>
427+
</else>
428+
</choose>
429+
<text macro="label-number"/>
415430
</group>
416431
</if>
417432
</choose>

‎nlm-citation-sequence-brackets.csl‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,17 @@
9999
</choose>
100100
</group>
101101
</macro>
102+
<macro name="label-number">
103+
<group delimiter=": ">
104+
<choose>
105+
<if type="standard"/>
106+
<else-if is-numeric="number" match="any" type="legislation patent regulation">
107+
<label form="short" variable="number"/>
108+
</else-if>
109+
</choose>
110+
<text variable="number"/>
111+
</group>
112+
</macro>
102113
<macro name="label-number-of-pages">
103114
<group delimiter=" ">
104115
<text variable="number-of-pages"/>
@@ -405,13 +416,17 @@
405416
</macro>
406417
<macro name="report-number">
407418
<choose>
408-
<if type="report">
409-
<group delimiter=": ">
410-
<group delimiter=" ">
411-
<text term="report" text-case="capitalize-first"/>
412-
<label form="short" text-case="capitalize-first" variable="number"/>
413-
</group>
414-
<text variable="number"/>
419+
<if type="report" variable="number">
420+
<group delimiter=" ">
421+
<choose>
422+
<if variable="genre">
423+
<text text-case="capitalize-first" variable="genre"/>
424+
</if>
425+
<else>
426+
<text term="report" text-case="capitalize-first"/>
427+
</else>
428+
</choose>
429+
<text macro="label-number"/>
415430
</group>
416431
</if>
417432
</choose>

‎nlm-citation-sequence-superscript-brackets-year-only.csl‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,17 @@
9999
</choose>
100100
</group>
101101
</macro>
102+
<macro name="label-number">
103+
<group delimiter=": ">
104+
<choose>
105+
<if type="standard"/>
106+
<else-if is-numeric="number" match="any" type="legislation patent regulation">
107+
<label form="short" variable="number"/>
108+
</else-if>
109+
</choose>
110+
<text variable="number"/>
111+
</group>
112+
</macro>
102113
<macro name="label-number-of-pages">
103114
<group delimiter=" ">
104115
<text variable="number-of-pages"/>
@@ -405,13 +416,17 @@
405416
</macro>
406417
<macro name="report-number">
407418
<choose>
408-
<if type="report">
409-
<group delimiter=": ">
410-
<group delimiter=" ">
411-
<text term="report" text-case="capitalize-first"/>
412-
<label form="short" text-case="capitalize-first" variable="number"/>
413-
</group>
414-
<text variable="number"/>
419+
<if type="report" variable="number">
420+
<group delimiter=" ">
421+
<choose>
422+
<if variable="genre">
423+
<text text-case="capitalize-first" variable="genre"/>
424+
</if>
425+
<else>
426+
<text term="report" text-case="capitalize-first"/>
427+
</else>
428+
</choose>
429+
<text macro="label-number"/>
415430
</group>
416431
</if>
417432
</choose>

‎nlm-citation-sequence-superscript-year-only-no-issue.csl‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,17 @@
9999
</choose>
100100
</group>
101101
</macro>
102+
<macro name="label-number">
103+
<group delimiter=": ">
104+
<choose>
105+
<if type="standard"/>
106+
<else-if is-numeric="number" match="any" type="legislation patent regulation">
107+
<label form="short" variable="number"/>
108+
</else-if>
109+
</choose>
110+
<text variable="number"/>
111+
</group>
112+
</macro>
102113
<macro name="label-number-of-pages">
103114
<group delimiter=" ">
104115
<text variable="number-of-pages"/>
@@ -405,13 +416,17 @@
405416
</macro>
406417
<macro name="report-number">
407418
<choose>
408-
<if type="report">
409-
<group delimiter=": ">
410-
<group delimiter=" ">
411-
<text term="report" text-case="capitalize-first"/>
412-
<label form="short" text-case="capitalize-first" variable="number"/>
413-
</group>
414-
<text variable="number"/>
419+
<if type="report" variable="number">
420+
<group delimiter=" ">
421+
<choose>
422+
<if variable="genre">
423+
<text text-case="capitalize-first" variable="genre"/>
424+
</if>
425+
<else>
426+
<text term="report" text-case="capitalize-first"/>
427+
</else>
428+
</choose>
429+
<text macro="label-number"/>
415430
</group>
416431
</if>
417432
</choose>

‎nlm-citation-sequence-superscript.csl‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,17 @@
9999
</choose>
100100
</group>
101101
</macro>
102+
<macro name="label-number">
103+
<group delimiter=": ">
104+
<choose>
105+
<if type="standard"/>
106+
<else-if is-numeric="number" match="any" type="legislation patent regulation">
107+
<label form="short" variable="number"/>
108+
</else-if>
109+
</choose>
110+
<text variable="number"/>
111+
</group>
112+
</macro>
102113
<macro name="label-number-of-pages">
103114
<group delimiter=" ">
104115
<text variable="number-of-pages"/>
@@ -405,13 +416,17 @@
405416
</macro>
406417
<macro name="report-number">
407418
<choose>
408-
<if type="report">
409-
<group delimiter=": ">
410-
<group delimiter=" ">
411-
<text term="report" text-case="capitalize-first"/>
412-
<label form="short" text-case="capitalize-first" variable="number"/>
413-
</group>
414-
<text variable="number"/>
419+
<if type="report" variable="number">
420+
<group delimiter=" ">
421+
<choose>
422+
<if variable="genre">
423+
<text text-case="capitalize-first" variable="genre"/>
424+
</if>
425+
<else>
426+
<text term="report" text-case="capitalize-first"/>
427+
</else>
428+
</choose>
429+
<text macro="label-number"/>
415430
</group>
416431
</if>
417432
</choose>

‎nlm-citation-sequence.csl‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,17 @@
9898
</choose>
9999
</group>
100100
</macro>
101+
<macro name="label-number">
102+
<group delimiter=": ">
103+
<choose>
104+
<if type="standard"/>
105+
<else-if is-numeric="number" match="any" type="legislation patent regulation">
106+
<label form="short" variable="number"/>
107+
</else-if>
108+
</choose>
109+
<text variable="number"/>
110+
</group>
111+
</macro>
101112
<macro name="label-number-of-pages">
102113
<group delimiter=" ">
103114
<text variable="number-of-pages"/>
@@ -404,13 +415,17 @@
404415
</macro>
405416
<macro name="report-number">
406417
<choose>
407-
<if type="report">
408-
<group delimiter=": ">
409-
<group delimiter=" ">
410-
<text term="report" text-case="capitalize-first"/>
411-
<label form="short" text-case="capitalize-first" variable="number"/>
412-
</group>
413-
<text variable="number"/>
418+
<if type="report" variable="number">
419+
<group delimiter=" ">
420+
<choose>
421+
<if variable="genre">
422+
<text text-case="capitalize-first" variable="genre"/>
423+
</if>
424+
<else>
425+
<text term="report" text-case="capitalize-first"/>
426+
</else>
427+
</choose>
428+
<text macro="label-number"/>
414429
</group>
415430
</if>
416431
</choose>

‎nlm-name-year.csl‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,17 @@
105105
<text variable="locator"/>
106106
</group>
107107
</macro>
108+
<macro name="label-number">
109+
<group delimiter=": ">
110+
<choose>
111+
<if type="standard"/>
112+
<else-if is-numeric="number" match="any" type="legislation patent regulation">
113+
<label form="short" variable="number"/>
114+
</else-if>
115+
</choose>
116+
<text variable="number"/>
117+
</group>
118+
</macro>
108119
<macro name="label-number-of-pages">
109120
<group delimiter=" ">
110121
<text variable="number-of-pages"/>
@@ -430,13 +441,17 @@
430441
</macro>
431442
<macro name="report-number">
432443
<choose>
433-
<if type="report">
434-
<group delimiter=": ">
435-
<group delimiter=" ">
436-
<text term="report" text-case="capitalize-first"/>
437-
<label form="short" text-case="capitalize-first" variable="number"/>
438-
</group>
439-
<text variable="number"/>
444+
<if type="report" variable="number">
445+
<group delimiter=" ">
446+
<choose>
447+
<if variable="genre">
448+
<text text-case="capitalize-first" variable="genre"/>
449+
</if>
450+
<else>
451+
<text term="report" text-case="capitalize-first"/>
452+
</else>
453+
</choose>
454+
<text macro="label-number"/>
440455
</group>
441456
</if>
442457
</choose>

0 commit comments

Comments
 (0)