From 52f9d99cc64c1642ed8dfae08ed4680a3114b138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stian=20=C3=98by=20Johansen?= <stian.oby@gmail.com>
Date: Tue, 15 Jun 2021 04:55:45 +0200
Subject: [PATCH] Improvements to
 norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl (#5507)

---
 ...andard-for-rettsvitenskapelige-tekster.csl | 95 ++++++++++++-------
 1 file changed, 60 insertions(+), 35 deletions(-)

diff --git a/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl b/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
index 076a40fb1e6a..d38634bc5e6e 100644
--- a/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
+++ b/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
@@ -28,12 +28,12 @@
       <term name="translator" form="verb-short">overs.</term>
       <term name="translator" form="short">overs.</term>
       <term name="editortranslator" form="verb-short">red. og overs.</term>
-      <term name="editortranslator" form="verb">Redigert og oversatt av</term>
+      <term name="editortranslator" form="verb">redigert og oversatt av</term>
       <term name="translator" form="short">overs.</term>
       <term name="and others">et al.</term>
       <term name="open-quote">«</term>
       <term name="close-quote">»</term>
-      <term name="accessed">sitert</term>
+      <term name="accessed">lest</term>
       <term name="no date">udatert</term>
       <term name="edition">utgave</term>
       <term name="edition" form="short">utg.</term>
@@ -94,9 +94,6 @@
       <else-if type="legislation">
         <text variable="title-short"/>
       </else-if>
-      <else-if type="legal_case">
-        <text variable="title"/>
-      </else-if>
       <else>
         <text font-style="italic" variable="title-short"/>
       </else>
@@ -107,7 +104,10 @@
       <if type="chapter article-journal article-newspaper article-magazine" match="any">
         <text quotes="true" variable="title"/>
       </if>
-      <else-if type="legal_case legislation" match="any">
+      <else-if type="legislation">
+        <text variable="container-title"/>
+        <text prefix=" " suffix=" " macro="issued-full-date"/>
+        <text prefix="nr. " suffix=" " variable="volume"/>
         <text variable="title"/>
       </else-if>
       <else>
@@ -159,23 +159,14 @@
     </choose>
   </macro>
   <macro name="accessed-date">
-    <choose>
-      <if type="personal_communication">
-        <text variable="genre" prefix=", " suffix=", "/>
-        <date variable="issued">
-          <date-part name="day" form="numeric" suffix=". "/>
-          <date-part name="month" form="long" suffix=" "/>
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else>
-        <date variable="accessed" prefix=" [Sitert " suffix="]">
-          <date-part name="day" form="numeric" suffix=". "/>
-          <date-part name="month" form="long" suffix=" "/>
-          <date-part name="year"/>
-        </date>
-      </else>
-    </choose>
+    <group prefix=" (" suffix=")">
+      <text term="accessed"/>
+      <date variable="accessed" prefix=" ">
+        <date-part name="day" form="numeric" suffix=". "/>
+        <date-part name="month" form="long" suffix=" "/>
+        <date-part name="year"/>
+      </date>
+    </group>
   </macro>
   <macro name="locator">
     <choose>
@@ -186,7 +177,7 @@
         </group>
       </if>
       <else-if locator="section paragraph" match="any">
-        <text variable="locator" prefix=" § "/>
+        <text variable="locator" prefix=" §&#160;"/>
       </else-if>
       <else>
         <group delimiter=" ">
@@ -218,13 +209,47 @@
       </else>
     </choose>
   </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=")" variable="title-short"/>
+      </if>
+      <else-if variable="number" match="any">
+        <text variable="number"/>
+        <text prefix=" (" suffix=")" variable="title-short"/>
+      </else-if>
+      <else>
+        <text suffix="s dom av " macro="author-full"/>
+        <text macro="issued-full-date"/>
+        <text prefix=" (" suffix=")" variable="title-short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="nor-legislation">
+    <choose>
+      <if position="first">
+        <text macro="title"/>
+        <text prefix=" (" suffix=")" variable="title-short"/>
+      </if>
+      <else-if variable="title-short" match="any">
+        <text macro="title-short"/>
+      </else-if>
+      <else>
+        <text variable="container-title"/>
+        <text prefix=" " variable="title"/>
+      </else>
+    </choose>
+  </macro>
   <citation disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" disambiguate-add-year-suffix="true" et-al-min="2" et-al-use-first="1">
     <sort>
       <key macro="author-short"/>
       <key macro="title-short"/>
       <key macro="issued"/>
     </sort>
-    <layout delimiter=", ">
+    <layout delimiter="; ">
       <group delimiter=" ">
         <choose>
           <if type="book thesis chapter article-journal article-newspaper article-magazine personal_communication" match="any">
@@ -232,10 +257,10 @@
             <text macro="issued"/>
           </if>
           <else-if type="legal_case">
-            <text macro="title"/>
+            <text macro="nor-case"/>
           </else-if>
           <else-if type="legislation">
-            <text macro="title-short"/>
+            <text macro="nor-legislation"/>
           </else-if>
           <else-if type="report">
             <text macro="author-short"/>
@@ -272,17 +297,18 @@
         <else-if type="article-newspaper article-magazine" match="any">
           <group suffix=".">
             <text macro="author-full"/>
-            <text prefix=". " macro="issued"/>
-            <text prefix=" " macro="title"/>
+            <text prefix=", " macro="title"/>
             <text prefix=", " font-style="italic" variable="container-title"/>
             <choose>
-              <if variable="URL" match="none">
+              <if variable="issued" match="any">
                 <text prefix=", " macro="issued-full-date"/>
               </if>
-              <else>
+            </choose>
+            <choose>
+              <if variable="URL" match="any">
                 <text prefix=", " variable="URL"/>
                 <text macro="accessed-date"/>
-              </else>
+              </if>
             </choose>
           </group>
         </else-if>
@@ -311,15 +337,14 @@
           </group>
         </else-if>
         <else-if type="legislation bill" match="any">
-          <text macro="issued-no-parenthesis"/>
           <text macro="title"/>
         </else-if>
         <else-if type="legal_case">
-          <text macro="title"/>
+          <text macro="nor-case"/>
         </else-if>
         <else-if type="personal_communication">
           <text macro="author-full"/>
-          <text macro="accessed-date"/>
+          <text prefix=" " macro="issued"/>
         </else-if>
         <else>
           <text variable="title"/>