Yifeng-J · lzcapp · Jun 2, 2022 · Jun 2, 2022 · Jun 2, 2022 · Jun 2, 2022
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+**/.idea/**
+**/build/**
+**/dist/**
+index.spec
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "js/ASpace"]
+	path = js/ASpace
+	url = https://github.com/DIYgod/ASpace
diff --git a/.run/OHHC.run.xml b/.run/OHHC.run.xml
@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="OHHC" type="PythonConfigurationType" factoryName="Python">
+    <module name="OHHC-Python" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="SDK_NAME" value="Python 3.13 (OHHC-Python)" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/index.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/ASpace.js b/ASpace.js
diff --git a/Calendar-2021.pdf b/Calendar-2021.pdf
diff --git a/Calendar-2022.html b/Calendar-2022.html
diff --git a/Calendar-2022.pdf b/Calendar-2022.pdf
diff --git a/Calendar-2023.html b/Calendar-2023.html
diff --git a/Calendar-2023.pdf b/Calendar-2023.pdf
diff --git a/Calendar-2024.html b/Calendar-2024.html
diff --git a/Calendar-2024.pdf b/Calendar-2024.pdf
diff --git a/Calendar-2025.html b/Calendar-2025.html
diff --git a/Calendar-2025.pdf b/Calendar-2025.pdf
diff --git a/Calendar-2021.html → Calendar-2026.html b/Calendar-2021.html → Calendar-2026.html
diff --git a/Calendar-2026.pdf b/Calendar-2026.pdf
diff --git a/README.md b/README.md
@@ -3,26 +3,52 @@
 
 ## 结果展示
 
-HTML样式展示：[link](./Calendar-2021.html)
+HTML样式展示：
 
-PDF样式展示：[link](./Calendar-2021.pdf)
+- [2022](https://github.lzc.app/OHHC-Python/Calendar-2022.html)
+- [2023](https://github.lzc.app/OHHC-Python/Calendar-2023.html)
+- [2024](https://github.lzc.app/OHHC-Python/Calendar-2024.html)
+- [2025](https://github.lzc.app/OHHC-Python/Calendar-2025.html)
+- [2026](https://github.lzc.app/OHHC-Python/Calendar-2026.html)
+
+PDF样式展示：
+
+- [2022](https://github.lzc.app/OHHC-Python/Calendar-2022.pdf)
+- [2023](https://github.lzc.app/OHHC-Python/Calendar-2023.pdf)
+- [2024](https://github.lzc.app/OHHC-Python/Calendar-2024.pdf)
+- [2025](https://github.lzc.app/OHHC-Python/Calendar-2025.pdf)
+- [2026](https://github.lzc.app/OHHC-Python/Calendar-2026.pdf)
 
 ## 环境依赖
 
 Python 3 (Python 3.9.1)
 
 本项目使用了以下几个Python第三方库（加粗者为需要另行安装）：
 
-- json
-- **jsonpath**
-- **lunar_python** (一个阴历/阳历转换库：[lunar](http://6tail.cn/calendar/api.html#overview.html))
-- html
-- **requests**
+- `json`
+- **`jsonpath`**
+- **`lunar_python`** (一个阴历/阳历转换库：[lunar](http://6tail.cn/calendar/api.html#overview.html))
+- `html`
+- **`requests`**
 
-在测试过程中发现：需要电脑安装openssl。
+在测试过程中发现：需要电脑安装`openssl`。
 
 除此之外，因为项目需要爬取维基百科中对编程语言的介绍，所以需要可以访问维基百科。
 
+如遇`Caused by SSLError`错误，是urllib3版本的问题，可以换用`1.25.11`或者其他低版本，在原环境中重装低版本`urllib3`：
+
+```python
+pip install urllib3==1.25.11
+```
+
+Prism库：[下载](https://prismjs.com/download#themes=prism&languages=markup+css+clike+javascript+abap+actionscript+ada+apacheconf+apl+applescript+arduino+asciidoc+aspnet+autohotkey+autoit+bash+basic+batch+bison+brainfuck+bro+c+csharp+cpp+coffeescript+crystal+css-extras+d+dart+diff+django+docker+eiffel+elixir+erlang+fsharp+flow+fortran+gherkin+git+glsl+go+graphql+groovy+haml+handlebars+haskell+haxe+http+icon+inform7+ini+j+java+jolie+json+julia+keyman+kotlin+latex+less+livescript+lolcode+lua+makefile+markdown+markup-templating+matlab+mel+mizar+monkey+n4js+nasm+nginx+nim+nix+nsis+objectivec+ocaml+opencl+oz+parigp+parser+pascal+perl+php+php-extras+powershell+processing+prolog+properties+protobuf+pug+puppet+pure+python+q+qore+r+jsx+reason+renpy+rest+rip+roboconf+ruby+rust+sas+sass+scss+scala+scheme+smalltalk+smarty+sql+stylus+swift+tcl+textile+twig+typescript+vbnet+verilog+vhdl+vim+wiki+xojo+yaml)
+
+ASpace：
+
+```shell
+git submodule update --init --recursive
+```
+
 ## 配置文件
 
 在`config.json`中有以下参数可以配置：
@@ -34,6 +60,6 @@ Python 3 (Python 3.9.1)
 
 ## 运行
 
-下载程序→安装好环境→运行index.py
+下载程序 → 安装好环境 → 运行index.py
 
-输出为类似`Calendar-2021.html`的文件
+输出为`Calendar-[YYYY].html`，您可以用“打印”的方式将其转换为PDF格式文件。
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
diff --git a/cal.css b/cal.css
@@ -6,11 +6,23 @@
 }
 
 body {
-    font-family: 'Space Mono', monospace, 'Noto Serif SC', 'Noto Sans SC Sliced';
+    font-family: 'JetBrains Mono', 'JetBrains Mono';
     font-feature-settings: "liga" 0;
     font-size: 5mm;
 }
 
+.description {
+    font-family: 'JetBrains Mono', sans-serif;
+}
+
+.lunar {
+    font-family: 'JetBrains Mono', sans-serif;
+}
+
+.main-lunar {
+    font-family: 'JetBrains Mono', sans-serif;
+}
+
 .monthly h1 {
     text-align: center;
 }
@@ -159,7 +171,7 @@ body {
 .page .description {
     position: absolute;
     width: 130mm;
-    bottom: 70mm;
+    bottom: 90mm;
     color: #666;
     text-align: justify;
     font-size: 0.8em;
@@ -190,7 +202,7 @@ body {
 
 .page ul.date {
     width: 174.5mm;
-    height: 41mm;
+    height: 50mm;
     position: absolute;
     display: table;
     left: 17.5mm;
@@ -211,6 +223,7 @@ body {
     list-style: none;
     display: table-cell;
     height: 40mm;
+    width: 30mm;
     border-left: 0.5mm dotted gray;
     box-sizing: border-box;
     vertical-align: top;

diff --git a/cal.html b/cal.html
@@ -1,21 +1,19 @@
 <!doctype html>
-<html>
+<html lang="zh-CN">
 <head>
-    <link rel="stylesheet" href="cal.css">
-    <link rel="stylesheet"
-          href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/atom-one-light.min.css">
-    <link href="prism.css" rel="stylesheet"/>
+    <link rel="stylesheet" href="cal.css"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.11.1/styles/atom-one-light.min.css" integrity="sha512-o5v54Kh5PH0dgnf9ei0L+vMRsbm5fvIvnR/XkrZZjN4mqdaeH7PW66tumBoQVIaKNVrLCZiBEfHzRY4JJSMK/Q==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link href="./css/prism.css" rel="stylesheet"/>
     <title>Calendar</title>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.11.1/highlight.min.js" integrity="sha512-EBLzUL8XLl+va/zAsmXwS7Z2B1F9HUHkZwyS/VKwh3S7T/U0nF4BaU29EP/ZSf6zgiIxYAnKLu6bJ8dqpmX5uw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 </head>
 <body>
 {{page}}
-<script src="ASpace.js"></script>
+<script src="./js/ASpace/ASpace.min.js"></script>
 <script>aSpace(document.getElementsByClassName('description'));</script>
 <script>
     hljs.initHighlightingOnLoad();
-    var prism = document.createElement('script');
-    prism.src = 'prism.js';
+    let prism = document.createElement('script');
+    prism.src = './js/prism.js';
     document.body.appendChild(prism);
 </script>
 </body>

diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
-    "year": 2021,
-    "qr": true,
+    "year": 2026,
+    "qr": false,
     "punched": false,
     "monthly": true
 }
diff --git a/css/prism.css b/css/prism.css