let caselaw recognize page-range pincites

raindrum · Sep 27, 2024 · 4abb413 · 4abb413
1 parent 1ce5332
commit 4abb413
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 37 deletions.
diff --git a/citeurl/templates/caselaw.yaml b/citeurl/templates/caselaw.yaml
@@ -10,14 +10,17 @@ U.S. Caselaw (CAP):
           mandatory: no
     volume: {regex: \d+}
     page: {regex: \d+}
-    pincite: {regex: \d+}
+    pincite: {regex: '\d+(-\d+)?'}
     footnote: {regex: \d+}
   pattern: '{volume} {reporter} {page}(,?( at)? {pincite}(,? ((foot)?note|f?n\.?) ?{footnote})?\b(?! \w))?'
   shortform pattern: '{same volume} {same reporter},? at (p(age|p?\.) ?)?{pincite}(,? ((foot)?note|f?n\.?) ?{footnote})?\b(?! \w)'
   idform patterns:
     - '[Ii]d\.,?( at)? (p(ages? |p?\. ?))?{pincite}(,? ((foot)?note|f?n\.?) ?{footnote})?\b(?! \w)'
     - '[Ii]d\.,?( at)? ((foot)?note|f?n\.?) ?{footnote}\b(?! \w)'
   URL builder:
+    edits:
+      - token: pincite
+        sub: ['(, |-).+', '']
     parts:
       - https://cite.case.law/{reporter}/{volume}/{page}
       - '#p{pincite}'
@@ -41,7 +44,7 @@ U.S. Caselaw (CourtListener):
           mandatory: no
     volume: {regex: \d+}
     page: {regex: \d+}
-    pincite: {regex: \d+}
+    pincite: {regex: '\d+(-\d+)?'}
     footnote: {regex: \d+}
   URL builder:
     parts: ['https://www.courtlistener.com/c/{reporter}/{volume}/{page}']
@@ -56,7 +59,7 @@ National Labor Relations Board Decisions:
   tokens:
     volume: {regex: \d+}
     page: {regex: \d+}
-    pincite: {regex: \d+}
+    pincite: {regex: '\d+(-\d+)?'}
   pattern: '{volume} N\.? ?L\.? ?R\.? ?B\.? {page}(, {pincite})?'
   idform pattern: '[Ii]d\.,?( at)? {pincite}'
   shortform pattern: '{same volume} N\.? ?L\.? ?R\.? ?B\.? at {pincite}'

diff --git a/docs/404.html b/docs/404.html
@@ -12,15 +12,15 @@
 
 
       <link rel="icon" href="/assets/favicon.png">
-      <meta name="generator" content="mkdocs-1.6.0, mkdocs-material-9.5.34">
+      <meta name="generator" content="mkdocs-1.6.0, mkdocs-material-9.5.37">
 
 
 
         <title>CiteURL</title>
 
 
 
-      <link rel="stylesheet" href="/assets/stylesheets/main.35f28582.min.css">
+      <link rel="stylesheet" href="/assets/stylesheets/main.8c3ca2c6.min.css">
 
 
         <link rel="stylesheet" href="/assets/stylesheets/palette.06af60db.min.css">
@@ -354,10 +354,10 @@ <h1>404 - Not found</h1>
     </div>
 
 
-    <script id="__config" type="application/json">{"base": "/", "features": [], "search": "/assets/javascripts/workers/search.07f07601.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": "11.4.4"}</script>
+    <script id="__config" type="application/json">{"base": "/", "features": [], "search": "/assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": "11.5.0"}</script>
 
 
-      <script src="/assets/javascripts/bundle.56dfad97.min.js"></script>
+      <script src="/assets/javascripts/bundle.d6f25eb3.min.js"></script>
 
 
   </body>

diff --git a/...assets/javascripts/bundle.56dfad97.min.js → ...assets/javascripts/bundle.d6f25eb3.min.js b/...assets/javascripts/bundle.56dfad97.min.js → ...assets/javascripts/bundle.d6f25eb3.min.js
diff --git a/...ts/javascripts/bundle.56dfad97.min.js.map → ...ts/javascripts/bundle.d6f25eb3.min.js.map b/...ts/javascripts/bundle.56dfad97.min.js.map → ...ts/javascripts/bundle.d6f25eb3.min.js.map
diff --git a/...avascripts/workers/search.07f07601.min.js → ...avascripts/workers/search.6ce7567c.min.js b/...avascripts/workers/search.07f07601.min.js → ...avascripts/workers/search.6ce7567c.min.js
diff --git a/...cripts/workers/search.07f07601.min.js.map → ...cripts/workers/search.6ce7567c.min.js.map b/...cripts/workers/search.07f07601.min.js.map → ...cripts/workers/search.6ce7567c.min.js.map
diff --git a/docs/assets/stylesheets/main.35f28582.min.css b/docs/assets/stylesheets/main.35f28582.min.css
diff --git a/docs/assets/stylesheets/main.35f28582.min.css.map b/docs/assets/stylesheets/main.35f28582.min.css.map
diff --git a/docs/assets/stylesheets/main.8c3ca2c6.min.css b/docs/assets/stylesheets/main.8c3ca2c6.min.css
diff --git a/docs/assets/stylesheets/main.8c3ca2c6.min.css.map b/docs/assets/stylesheets/main.8c3ca2c6.min.css.map
diff --git a/docs/frontends/index.html b/docs/frontends/index.html
@@ -16,15 +16,15 @@
 
 
       <link rel="icon" href="../assets/favicon.png">
-      <meta name="generator" content="mkdocs-1.6.0, mkdocs-material-9.5.34">
+      <meta name="generator" content="mkdocs-1.6.0, mkdocs-material-9.5.37">
 
 
 
         <title>CiteURL Frontends - CiteURL</title>
 
 
 
-      <link rel="stylesheet" href="../assets/stylesheets/main.35f28582.min.css">
+      <link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
 
 
         <link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
@@ -534,10 +534,10 @@ <h2 id="gnome-shell-search-provider">GNOME Shell Search Provider</h2>
     </div>
 
 
-    <script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.07f07601.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": "11.4.4"}</script>
+    <script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": "11.5.0"}</script>
 
 
-      <script src="../assets/javascripts/bundle.56dfad97.min.js"></script>
+      <script src="../assets/javascripts/bundle.d6f25eb3.min.js"></script>
 
 
   </body>

diff --git a/docs/index.html b/docs/index.html
@@ -14,15 +14,15 @@
 
 
       <link rel="icon" href="assets/favicon.png">
-      <meta name="generator" content="mkdocs-1.6.0, mkdocs-material-9.5.34">
+      <meta name="generator" content="mkdocs-1.6.0, mkdocs-material-9.5.37">
 
 
 
         <title>CiteURL</title>
 
 
 
-      <link rel="stylesheet" href="assets/stylesheets/main.35f28582.min.css">
+      <link rel="stylesheet" href="assets/stylesheets/main.8c3ca2c6.min.css">
 
 
         <link rel="stylesheet" href="assets/stylesheets/palette.06af60db.min.css">
@@ -545,10 +545,10 @@ <h2 id="credits">Credits</h2>
     </div>
 
 
-    <script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.07f07601.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": "11.4.4"}</script>
+    <script id="__config" type="application/json">{"base": ".", "features": [], "search": "assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": "11.5.0"}</script>
 
 
-      <script src="assets/javascripts/bundle.56dfad97.min.js"></script>
+      <script src="assets/javascripts/bundle.d6f25eb3.min.js"></script>
 
 
   </body>

diff --git a/docs/library/index.html b/docs/library/index.html
@@ -16,15 +16,15 @@
 
 
       <link rel="icon" href="../assets/favicon.png">
-      <meta name="generator" content="mkdocs-1.6.0, mkdocs-material-9.5.34">
+      <meta name="generator" content="mkdocs-1.6.0, mkdocs-material-9.5.37">
 
 
 
         <title>Library Reference - CiteURL</title>
 
 
 
-      <link rel="stylesheet" href="../assets/stylesheets/main.35f28582.min.css">
+      <link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
 
 
         <link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
@@ -6965,10 +6965,10 @@ <h2 id="citeurl.StringBuilder.to_dict" class="doc doc-heading">
     </div>
 
 
-    <script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.07f07601.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": "11.4.4"}</script>
+    <script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": "11.5.0"}</script>
 
 
-      <script src="../assets/javascripts/bundle.56dfad97.min.js"></script>
+      <script src="../assets/javascripts/bundle.d6f25eb3.min.js"></script>
 
 
   </body>

diff --git a/docs/sitemap.xml.gz b/docs/sitemap.xml.gz
diff --git a/docs/template-yamls/index.html b/docs/template-yamls/index.html
@@ -14,15 +14,15 @@
 
 
       <link rel="icon" href="../assets/favicon.png">
-      <meta name="generator" content="mkdocs-1.6.0, mkdocs-material-9.5.34">
+      <meta name="generator" content="mkdocs-1.6.0, mkdocs-material-9.5.37">
 
 
 
         <title>Writing Your Own Templates - CiteURL</title>
 
 
 
-      <link rel="stylesheet" href="../assets/stylesheets/main.35f28582.min.css">
+      <link rel="stylesheet" href="../assets/stylesheets/main.8c3ca2c6.min.css">
 
 
         <link rel="stylesheet" href="../assets/stylesheets/palette.06af60db.min.css">
@@ -969,10 +969,10 @@ <h3 id="template-inheritance">Template Inheritance</h3>
     </div>
 
 
-    <script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.07f07601.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": "11.4.4"}</script>
+    <script id="__config" type="application/json">{"base": "..", "features": [], "search": "../assets/javascripts/workers/search.6ce7567c.min.js", "translations": {"clipboard.copied": "Copied to clipboard", "clipboard.copy": "Copy to clipboard", "search.result.more.one": "1 more on this page", "search.result.more.other": "# more on this page", "search.result.none": "No matching documents", "search.result.one": "1 matching document", "search.result.other": "# matching documents", "search.result.placeholder": "Type to start searching", "search.result.term.missing": "Missing", "select.version": "Select version"}, "version": "11.5.0"}</script>
 
 
-      <script src="../assets/javascripts/bundle.56dfad97.min.js"></script>
+      <script src="../assets/javascripts/bundle.d6f25eb3.min.js"></script>
 
 
   </body>

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -35,5 +35,5 @@ markdown_extensions:
   - pymdownx.superfences
 
 extra:
-  version: 11.4.4
+  version: 11.5.0
   history_buttons: false
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name = 'citeurl',
-    version = '11.4.4',
+    version = '11.5.0',
     description = 'an extensible tool to process legal citations in text',
     author = 'Simon Raindrum Sherred',
     author_email = 'simonraindrum@gmail.com',

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -32,7 +32,7 @@ def test_list_citations():
 def test_insert_links():
     citations = list_cites(TEXT)
     output = insert_links(TEXT)
-    assert output == """Federal law provides that courts should award prevailing civil rights plaintiffs reasonable attorneys fees, <a class="citation" href="https://www.law.cornell.edu/uscode/text/42/1988#b" title="42 U.S.C. § 1988(b)">42 USC § 1988(b)</a>, and, by discretion, expert fees, <a class="citation" href="https://www.law.cornell.edu/uscode/text/42/1988#c" title="42 U.S.C. § 1988(c)">id. at (c)</a>. This is because the importance of civil rights litigation cannot be measured by a damages judgment. See Riverside v. Rivera, <a class="citation" href="https://cite.case.law/us/477/561" title="477 U.S. 561">477 U.S. 561</a> (1986). But Evans v. Jeff D. upheld a settlement where the plaintiffs got everything they wanted, on condition that they waive attorneys\' fees. <a class="citation" href="https://cite.case.law/us/475/717" title="475 U.S. 717">475 U.S. 717</a> (1986). This ruling lets savvy defendants create a wedge between plaintiffs and their attorneys, discouraging civil rights suits and undermining the court\'s logic in Riverside, <a class="citation" href="https://cite.case.law/us/477/561#p574" title="477 U.S. 561, 574">477 U.S. at 574</a>-78."""
+    assert output == """Federal law provides that courts should award prevailing civil rights plaintiffs reasonable attorneys fees, <a class="citation" href="https://www.law.cornell.edu/uscode/text/42/1988#b" title="42 U.S.C. § 1988(b)">42 USC § 1988(b)</a>, and, by discretion, expert fees, <a class="citation" href="https://www.law.cornell.edu/uscode/text/42/1988#c" title="42 U.S.C. § 1988(c)">id. at (c)</a>. This is because the importance of civil rights litigation cannot be measured by a damages judgment. See Riverside v. Rivera, <a class="citation" href="https://cite.case.law/us/477/561" title="477 U.S. 561">477 U.S. 561</a> (1986). But Evans v. Jeff D. upheld a settlement where the plaintiffs got everything they wanted, on condition that they waive attorneys\' fees. <a class="citation" href="https://cite.case.law/us/475/717" title="475 U.S. 717">475 U.S. 717</a> (1986). This ruling lets savvy defendants create a wedge between plaintiffs and their attorneys, discouraging civil rights suits and undermining the court\'s logic in Riverside, <a class="citation" href="https://cite.case.law/us/477/561#p574" title="477 U.S. 561, 574-78">477 U.S. at 574-78</a>."""
 
 #def test_list_authorities():
 #    citations = Citator().list_cites(TEXT)