From 7cff78c3d1da35375fd8f349d1ee44bcc618cd32 Mon Sep 17 00:00:00 2001
From: iBug <git@ibugone.com>
Date: Sat, 1 Aug 2020 21:43:40 +0800
Subject: [PATCH 1/8] Add paginator-v2.html

---
 .../{paginator.html => paginator-v1.html}     |  0
 _includes/paginator-v2.html                   | 71 +++++++++++++++++++
 2 files changed, 71 insertions(+)
 rename _includes/{paginator.html => paginator-v1.html} (100%)
 create mode 100644 _includes/paginator-v2.html

diff --git a/_includes/paginator.html b/_includes/paginator-v1.html
similarity index 100%
rename from _includes/paginator.html
rename to _includes/paginator-v1.html
diff --git a/_includes/paginator-v2.html b/_includes/paginator-v2.html
new file mode 100644
index 000000000000..ad5696408e76
--- /dev/null
+++ b/_includes/paginator-v2.html
@@ -0,0 +1,71 @@
+{% if paginator.total_pages > 1 %}
+<nav class="pagination">
+  {% assign first_page_path = paginator.first_page_path | relative_url %}
+  <ul>
+    {% comment %} Link for previous page {% endcomment %}
+    {% if paginator.previous_page %}
+      {% if paginator.previous_page == 1 %}
+        <li><a href="{{ first_page_path }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
+      {% else %}
+        <li><a href="{{ paginator.previous_page_path | relative_url }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
+      {% endif %}
+    {% else %}
+      <li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</span></a></li>
+    {% endif %}
+
+    {% comment %} Determine whether the first page and the last page are already included in trail {% endcomment %}
+    {% for trail in paginator.page_trail %}
+      {% if trail.num == paginator.first_page %}
+        {% assign has_first_page = true %}
+      {% elsif trail.num == paginator.last_page %}
+        {% assign has_last_page = true %}
+      {% endif %}
+    {% endfor %}
+
+    {% comment %} First page {% endcomment %}
+    {% unless has_first_page %}
+      {% if paginator.page == 1 %}
+        <li><a href="#" class="disabled current">1</a></li>
+      {% else %}
+        <li><a href="{{ first_page_path }}">1</a></li>
+      {% endif %}
+    {% endunless %}
+
+    {% comment %} Ellipsis for truncated links {% endcomment %}
+    {% assign ellipsis_start = site.pagination.trail.before | plus: 2 %}
+    {% if paginator.page > ellipsis_start %}
+      <li><a href="#" class="disabled">&hellip;</a></li>
+    {% endif %}
+
+    {% comment %} Main pagination trail {% endcomment %}
+    {% for trail in paginator.page_trail %}
+      {% if paginator.page == trail.num %}
+        <li><a href="{{ trail.path | remove: 'index.html' | relative_url }}" class="disabled current">{{ trail.num }}</a></li>
+      {% else %}
+        <li><a href="{{ trail.path | remove: 'index.html' | relative_url }}">{{ trail.num }}</a></li>
+      {% endif %}
+    {% endfor %}
+
+    {% comment %} Ellipsis for truncated links {% endcomment %}
+    {% assign ellipsis_end = paginator.total_pages | minus: site.pagination.trail.after | minus: 1 %}
+    {% if paginator.page < ellipsis_end %}
+      <li><a href="#" class="disabled">&hellip;</a></li>
+    {% endif %}
+
+    {% unless has_last_page %}
+      {% if paginator.page == paginator.total_pages %}
+        <li><a href="#" class="disabled current">{{ paginator.page }}</a></li>
+      {% else %}
+        <li><a href="{{ paginator.last_page_path | remove: 'index.html' | relative_url }}">{{ paginator.total_pages }}</a></li>
+      {% endif %}
+    {% endunless %}
+
+    {% comment %} Link next page {% endcomment %}
+    {% if paginator.next_page %}
+      <li><a href="{{ paginator.next_page_path | remove: 'index.html' | relative_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
+    {% else %}
+      <li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
+    {% endif %}
+  </ul>
+</nav>
+{% endif %}

From 77bdbc20807ef3b7483c45632711cfabad8e6e94 Mon Sep 17 00:00:00 2001
From: iBug <git@ibugone.com>
Date: Sat, 1 Aug 2020 21:47:14 +0800
Subject: [PATCH 2/8] Create new v1/v2 selector, improve v1 code

---
 _includes/paginator-v1.html | 4 ++--
 _includes/paginator.html    | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 _includes/paginator.html

diff --git a/_includes/paginator-v1.html b/_includes/paginator-v1.html
index bffa0794678e..e997486c07ee 100644
--- a/_includes/paginator-v1.html
+++ b/_includes/paginator-v1.html
@@ -1,6 +1,6 @@
 {% if paginator.total_pages > 1 %}
 <nav class="pagination">
-  {% assign first_page_path = paginator.first_page_path | default: site.paginate_path | replace: 'page:num', '' | replace: '//', '/' | relative_url %}
+  {% assign first_page_path = site.paginate_path | remove: 'page:num' | remove: ':num' | replace: '//', '/' | relative_url %}
   <ul>
     {% comment %} Link for previous page {% endcomment %}
     {% if paginator.previous_page %}
@@ -60,7 +60,7 @@
 
     {% comment %} Link next page {% endcomment %}
     {% if paginator.next_page %}
-      <li><a href="{{ site.paginate_path | replace: ':num', paginator.next_page | replace: '//', '/' | relative_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
+      <li><a href="{{ paginator.next_page_path | relative_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
     {% else %}
       <li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
     {% endif %}
diff --git a/_includes/paginator.html b/_includes/paginator.html
new file mode 100644
index 000000000000..5ebd066638d4
--- /dev/null
+++ b/_includes/paginator.html
@@ -0,0 +1,5 @@
+{% if site.paginate %}
+  {% include paginator-v1.html %}
+{% elsif site.pagination.enabled %}
+  {% include paginator-v2.html %}
+{% endif %}

From 6d8a4792a16139797cd91efb2490861d3a2813d2 Mon Sep 17 00:00:00 2001
From: iBug <git@ibugone.com>
Date: Sat, 1 Aug 2020 21:49:32 +0800
Subject: [PATCH 3/8] Move pagination detection to common wrapper

---
 _includes/paginator-v1.html |  2 --
 _includes/paginator-v2.html |  7 ++-----
 _includes/paginator.html    | 10 ++++++----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/_includes/paginator-v1.html b/_includes/paginator-v1.html
index e997486c07ee..7a6515d09022 100644
--- a/_includes/paginator-v1.html
+++ b/_includes/paginator-v1.html
@@ -1,4 +1,3 @@
-{% if paginator.total_pages > 1 %}
 <nav class="pagination">
   {% assign first_page_path = site.paginate_path | remove: 'page:num' | remove: ':num' | replace: '//', '/' | relative_url %}
   <ul>
@@ -66,4 +65,3 @@
     {% endif %}
   </ul>
 </nav>
-{% endif %}
diff --git a/_includes/paginator-v2.html b/_includes/paginator-v2.html
index ad5696408e76..13d1c19c7aba 100644
--- a/_includes/paginator-v2.html
+++ b/_includes/paginator-v2.html
@@ -1,11 +1,9 @@
-{% if paginator.total_pages > 1 %}
 <nav class="pagination">
-  {% assign first_page_path = paginator.first_page_path | relative_url %}
   <ul>
     {% comment %} Link for previous page {% endcomment %}
     {% if paginator.previous_page %}
       {% if paginator.previous_page == 1 %}
-        <li><a href="{{ first_page_path }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
+        <li><a href="{{ paginator.first_page_path | relative_url }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
       {% else %}
         <li><a href="{{ paginator.previous_page_path | relative_url }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
       {% endif %}
@@ -27,7 +25,7 @@
       {% if paginator.page == 1 %}
         <li><a href="#" class="disabled current">1</a></li>
       {% else %}
-        <li><a href="{{ first_page_path }}">1</a></li>
+        <li><a href="{{ paginator.first_page_path | relative_url }}">1</a></li>
       {% endif %}
     {% endunless %}
 
@@ -68,4 +66,3 @@
     {% endif %}
   </ul>
 </nav>
-{% endif %}
diff --git a/_includes/paginator.html b/_includes/paginator.html
index 5ebd066638d4..c4ab29edf29b 100644
--- a/_includes/paginator.html
+++ b/_includes/paginator.html
@@ -1,5 +1,7 @@
-{% if site.paginate %}
-  {% include paginator-v1.html %}
-{% elsif site.pagination.enabled %}
-  {% include paginator-v2.html %}
+{% if paginator.total_pages > 1 %}
+  {% if site.paginate %}
+    {% include paginator-v1.html %}
+  {% elsif site.pagination.enabled %}
+    {% include paginator-v2.html %}
+  {% endif %}
 {% endif %}

From e7503000a2ef1936fe199b713a577b5dfbe77391 Mon Sep 17 00:00:00 2001
From: iBug <git@ibugone.com>
Date: Fri, 19 Feb 2021 01:09:58 +0800
Subject: [PATCH 4/8] Fix wrong ellipsis in page trails in corner cases

Jekyll Paginate V2 tries to keep the page trail length consistent for all pages,
making the first and last few pages have a longer after/before trail
than it normally would have.
This breaks the previous calculation-based approach for determining
the presense of an ellipsis.

The new approach just checks if there are missing numbers between 1 and
the first item in the page trail, and inserts an ellipsis if there is any.
It now works perfectly for these cases.
---
 _includes/paginator-v2.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/_includes/paginator-v2.html b/_includes/paginator-v2.html
index 13d1c19c7aba..a97b5a25de98 100644
--- a/_includes/paginator-v2.html
+++ b/_includes/paginator-v2.html
@@ -30,8 +30,8 @@
     {% endunless %}
 
     {% comment %} Ellipsis for truncated links {% endcomment %}
-    {% assign ellipsis_start = site.pagination.trail.before | plus: 2 %}
-    {% if paginator.page > ellipsis_start %}
+    {% assign ellipsis_start = paginator.first_page | plus: 1 %}
+    {% if paginator.trail.first.num > ellipsis_start %}
       <li><a href="#" class="disabled">&hellip;</a></li>
     {% endif %}
 
@@ -45,8 +45,8 @@
     {% endfor %}
 
     {% comment %} Ellipsis for truncated links {% endcomment %}
-    {% assign ellipsis_end = paginator.total_pages | minus: site.pagination.trail.after | minus: 1 %}
-    {% if paginator.page < ellipsis_end %}
+    {% assign ellipsis_end = paginator.last_page | minus: 1 %}
+    {% if paginator.trail.last.num < ellipsis_end %}
       <li><a href="#" class="disabled">&hellip;</a></li>
     {% endif %}
 

From 64474839d97baebc66cd48beb5c08362c0effe7e Mon Sep 17 00:00:00 2001
From: iBug <git@ibugone.com>
Date: Fri, 26 Feb 2021 00:24:53 +0800
Subject: [PATCH 5/8] Fix ellipsis not showing

---
 _includes/paginator-v2.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_includes/paginator-v2.html b/_includes/paginator-v2.html
index a97b5a25de98..ea5707d56965 100644
--- a/_includes/paginator-v2.html
+++ b/_includes/paginator-v2.html
@@ -31,7 +31,7 @@
 
     {% comment %} Ellipsis for truncated links {% endcomment %}
     {% assign ellipsis_start = paginator.first_page | plus: 1 %}
-    {% if paginator.trail.first.num > ellipsis_start %}
+    {% if paginator.page_trail.first.num > ellipsis_start %}
       <li><a href="#" class="disabled">&hellip;</a></li>
     {% endif %}
 
@@ -46,7 +46,7 @@
 
     {% comment %} Ellipsis for truncated links {% endcomment %}
     {% assign ellipsis_end = paginator.last_page | minus: 1 %}
-    {% if paginator.trail.last.num < ellipsis_end %}
+    {% if paginator.page_trail.last.num < ellipsis_end %}
       <li><a href="#" class="disabled">&hellip;</a></li>
     {% endif %}
 

From 3a065dcc59d8db687d26ee1407a93850ff12a81a Mon Sep 17 00:00:00 2001
From: iBug <git@ibugone.com>
Date: Sun, 1 Aug 2021 15:04:39 +0800
Subject: [PATCH 6/8] Update configuration docs for Paginate V2 support

---
 docs/_docs/05-configuration.md | 66 +++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/05-configuration.md b/docs/_docs/05-configuration.md
index 4ad70aaa30e8..d418a6ca039f 100644
--- a/docs/_docs/05-configuration.md
+++ b/docs/_docs/05-configuration.md
@@ -934,9 +934,73 @@ The paginator only works on files with name `index.html`. To use pagination in a
 paginate_path: /recent/page:num/
 ```
 
-**Please note:** When using Jekyll's default [pagination plugin](https://jekyllrb.com/docs/pagination/) `paginator.posts` can only be called once. If you're looking for something more powerful that can paginate category, tag, and collection pages I suggest [**jekyll-paginate-v2**](https://github.com/sverrirs/jekyll-paginate-v2).
+**Please note:** When using Jekyll's default [pagination plugin](https://jekyllrb.com/docs/pagination/) `paginator.posts` can only be called once. If you're looking for something more powerful that can paginate category, tag, and collection pages I suggest **[jekyll-paginate-v2][jekyll-paginate-v2]**.
 {: .notice--info}
 
+  [jekyll-paginate-v2]: (https://github.com/sverrirs/jekyll-paginate-v2)
+
+### Paginate V2
+
+If you're using [Jekyll Paginate V2][jekyll-paginate-v2], you can enjoy its powerful features by removing `paginate` and `paginate_path` and adding the following configuration to your `_config.yml`:
+
+```yaml
+pagination:
+  enabled: true
+  collection: 'posts'
+  per_page: 5
+  permalink: '/page/:num/'  # Pages are index.html inside this folder (default)
+  title: ':title - page :num'
+  limit: 0
+  sort_field: 'date'
+  sort_reverse: true
+  trail:
+    before: 2
+    after: 2
+```
+
+Then, create `/posts/index.html` with the following content:
+
+```html
+---
+title: "Posts"
+layout: home
+permalink: /posts/
+pagination:
+  enabled: true
+---
+```
+
+Your posts will be paginated at `/posts/`, `/posts/page/2/` and `/posts/page/3/` etc.
+
+Similarly, if you want to paginate a collection or a tag, you can create another `index.html` at an appropriate location, and add configuration to the `pagination` key in the front matter, like this:
+
+```html
+---
+title: "Lovely pets"
+layout: home
+permalink: /pets/
+pagination:
+  enabled: true
+  collection:
+    - cat
+    - dog
+---
+```
+
+**Note:** There are two more configuration options from Jekyll Paginate V2 that this theme doesn't support yet. Changing them may lead to unexpected results and you're on your own.
+
+```yaml
+pagination:
+
+  # Optional, the default file extension for generated pages (e.g html, json, xml).
+  # Internally this is set to html by default
+  extension: html
+
+  # Optional, the default name of the index file for generated pages (e.g. 'index.html')
+  # Without file extension
+  indexpage: 'index'
+```
+
 ### Timezone
 
 This sets the timezone environment variable, which Ruby uses to handle time and date creation and manipulation. Any entry from the [IANA Time Zone Database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) is valid. The default is the local time zone, as set by your operating system.

From 2ec278bfa1a4f214ad0c325c0474e4aed7bcc18c Mon Sep 17 00:00:00 2001
From: iBug <git@ibugone.com>
Date: Mon, 30 May 2022 03:06:36 +0800
Subject: [PATCH 7/8] Amend docs

---
 docs/_docs/05-configuration.md | 4 ++--
 docs/_docs/10-layouts.md       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_docs/05-configuration.md b/docs/_docs/05-configuration.md
index d418a6ca039f..859db172845e 100644
--- a/docs/_docs/05-configuration.md
+++ b/docs/_docs/05-configuration.md
@@ -937,7 +937,7 @@ paginate_path: /recent/page:num/
 **Please note:** When using Jekyll's default [pagination plugin](https://jekyllrb.com/docs/pagination/) `paginator.posts` can only be called once. If you're looking for something more powerful that can paginate category, tag, and collection pages I suggest **[jekyll-paginate-v2][jekyll-paginate-v2]**.
 {: .notice--info}
 
-  [jekyll-paginate-v2]: (https://github.com/sverrirs/jekyll-paginate-v2)
+  [jekyll-paginate-v2]: https://github.com/sverrirs/jekyll-paginate-v2
 
 ### Paginate V2
 
@@ -987,7 +987,7 @@ pagination:
 ---
 ```
 
-**Note:** There are two more configuration options from Jekyll Paginate V2 that this theme doesn't support yet. Changing them may lead to unexpected results and you're on your own.
+**Note:** There are two more configuration options from Jekyll Paginate V2 that this theme doesn't support yet. You should either leave them out or use their default values as shown below. Changing them may lead to unexpected results and you're on your own.
 
 ```yaml
 pagination:
diff --git a/docs/_docs/10-layouts.md b/docs/_docs/10-layouts.md
index 20d5be432123..0d8a2cc8730c 100644
--- a/docs/_docs/10-layouts.md
+++ b/docs/_docs/10-layouts.md
@@ -334,7 +334,7 @@ Then adjust the `paginate_path` in **_config.yml** to match.
 paginate_path: /blog/page:num
 ``` 
 
-**Note:** Jekyll can only paginate a single `index.html` file. If you'd like to paginate more pages (e.g. category indexes) you'll need the help of a custom plugin. For more pagination related settings check the [**Configuration**]({{ "/docs/configuration/#paginate" | relative_url }}) section.
+**Note:** The default Jekyll Paginate plugin can only paginate a single `index.html` file. If you'd like to paginate more pages (e.g. category indexes) you'll need the help of a custom plugin. For more pagination-related settings check the [**Configuration**]({{ "/docs/configuration/#paginate" | relative_url }}) section, including settings for [Jekyll Paginate V2](https://github.com/sverrirs/jekyll-paginate-v2).
 {: .notice--info}
 
 **Note:** By default, documents are shown in a list view. To change to a grid view add `entries_layout: grid` to the page's front matter. To increase the width of the main container, giving more space to the grid items also add `classes: wide` to the home page's YAML Front Matter.

From fb9ecedb46566ee49f446c0592d18590c9d7a7da Mon Sep 17 00:00:00 2001
From: iBug <git@ibugone.com>
Date: Tue, 23 Apr 2024 04:19:52 +0800
Subject: [PATCH 8/8] Merge v1 template from master, add config to _config.yml

---
 _config.yml                 | 26 +++++++++++++++++++++++++-
 _includes/paginator-v1.html |  7 +++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/_config.yml b/_config.yml
index 92e645cc2546..3506211fcf83 100644
--- a/_config.yml
+++ b/_config.yml
@@ -207,9 +207,33 @@ sass:
 
 # Outputting
 permalink: /:categories/:title/
+timezone: # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+
+
+# Pagination with jekyll-paginate
 paginate: 5 # amount of posts to show
 paginate_path: /page:num/
-timezone: # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+
+# Pagination with jekyll-paginate-v2
+# See https://github.com/sverrirs/jekyll-paginate-v2/blob/master/README-GENERATOR.md#site-configuration
+#   for configuration details
+pagination:
+  # Set enabled to true to use paginate v2
+  # enabled: true
+  debug: false
+  collection: 'posts'
+  per_page: 10
+  permalink: '/page/:num/'
+  title: ':title - page :num'
+  limit: 0
+  sort_field: 'date'
+  sort_reverse: true
+  category: 'posts'
+  tag: ''
+  locale: ''
+  trail:
+    before: 2
+    after: 2
 
 
 # Plugins (previously gems:)
diff --git a/_includes/paginator-v1.html b/_includes/paginator-v1.html
index 7a6515d09022..c24d4909f488 100644
--- a/_includes/paginator-v1.html
+++ b/_includes/paginator-v1.html
@@ -1,5 +1,7 @@
+{% if paginator.total_pages > 1 %}
 <nav class="pagination">
-  {% assign first_page_path = site.paginate_path | remove: 'page:num' | remove: ':num' | replace: '//', '/' | relative_url %}
+  {% assign paginate_path_last = site.paginate_path | split: '/' | last %}
+  {% assign first_page_path = paginator.first_page_path | default: site.paginate_path | replace: paginate_path_last, '' | replace: '//', '/' | relative_url %}
   <ul>
     {% comment %} Link for previous page {% endcomment %}
     {% if paginator.previous_page %}
@@ -59,9 +61,10 @@
 
     {% comment %} Link next page {% endcomment %}
     {% if paginator.next_page %}
-      <li><a href="{{ paginator.next_page_path | relative_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
+      <li><a href="{{ site.paginate_path | replace: ':num', paginator.next_page | replace: '//', '/' | relative_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
     {% else %}
       <li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
     {% endif %}
   </ul>
 </nav>
+{% endif %}