From d4dc67982f2d9dab60d1a1bffa38460910296730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stian=20=C3=98by=20Johansen?= <stian.oby@gmail.com>
Date: Mon, 5 Jul 2021 05:31:02 +0200
Subject: [PATCH] Further improvements to
 norsk-henvisningsstandad-for-rettsvitenskapelige-tekster.csl (#5539)

---
 ...andard-for-rettsvitenskapelige-tekster.csl | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl b/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
index 3a7888b29c61..da93a372169a 100644
--- a/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
+++ b/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
@@ -38,6 +38,8 @@
       <term name="edition">utgave</term>
       <term name="edition" form="short">utg.</term>
       <term name="volume">bind</term>
+      <term name="page">side</term>
+      <term name="page" form="short">s.</term>
     </terms>
   </locale>
   <macro name="type-sorting">
@@ -201,21 +203,15 @@
     </choose>
   </macro>
   <macro name="DOI">
-    <choose>
-      <if variable="DOI" match="none">
-        <text prefix=", " variable="URL"/>
-      </if>
-      <else>
-        <text prefix=". DOI: https://doi.org/" variable="DOI"/>
-      </else>
-    </choose>
+    <text prefix=". DOI: https://doi.org/" variable="DOI"/>
   </macro>
   <macro name="nor-case">
     <choose>
       <if variable="container-title" match="any">
         <text variable="container-title"/>
         <text prefix=" " variable="volume"/>
-        <text prefix=" s. " variable="page"/>
+        <text prefix=" " suffix=" " term="page" form="short"/>
+        <text variable="page"/>
         <text prefix=" (" suffix=")" variable="title-short"/>
       </if>
       <else-if variable="number" match="any">
@@ -290,7 +286,8 @@
             <text prefix=", " macro="title"/>
             <text prefix=" " font-style="italic" variable="container-title"/>
             <text prefix=" " macro="issued"/>
-            <text prefix=" s. " variable="page"/>
+            <text prefix=" " suffix=" " term="page" form="short"/>
+            <text variable="page"/>
             <text macro="DOI"/>
             <text prefix=" " macro="retrieved-from"/>
           </group>
@@ -321,6 +318,7 @@
             <text macro="edition-short"/>
             <text prefix=", " variable="publisher"/>
             <text prefix=" " macro="issued-no-parenthesis"/>
+            <text macro="DOI"/>
           </group>
         </else-if>
         <else-if type="chapter paper-conference" match="any">
@@ -333,8 +331,15 @@
             <text macro="edition-short"/>
             <text prefix=", " variable="publisher"/>
             <text prefix=" " macro="issued-no-parenthesis"/>
-            <text prefix=", " variable="URL"/>
-            <text prefix=" " macro="accessed-date"/>
+            <choose>
+              <if variable="DOI" match="any">
+                <text prefix=". DOI: https://doi.org/" variable="DOI"/>
+              </if>
+              <else-if variable="URL" match="any">
+                <text prefix=", " variable="URL"/>
+                <text macro="accessed-date"/>
+              </else-if>
+            </choose>
           </group>
         </else-if>
         <else-if type="legislation bill" match="any">