Merge pull request #249 from myhsia/master

规范一些用法

.gitattributes

@@ -0,0 +1,9 @@
+*              text=auto
+*.tex          text eol=lf
+.gitignore     text eol=lf
+LICENSE        text eol=lf
+*.md           text eol=lf
+.gitattributes text eol=lf
+*.cls          text eol=lf
+*.bib          text eol=lf
+build.lua      text eol=lf

.gitignore

@@ -11,6 +11,11 @@
 *.cb
 *.cb2
 .*.lb
+.DS_Store
+clean.bat
+elegant*-cn.pdf
+elegant*-en.pdf
+*.dates
 
 ## Intermediate documents:
 *.dvi
@@ -39,6 +44,9 @@
 *.synctex.gz
 *.synctex.gz(busy)
 *.pdfsync
+/build
+*.curlopt
+*.zip
 
 ## Auxiliary and intermediate files from other packages:
 # algorithms

README.md

@@ -1,23 +1,37 @@
-<!-- Author : Dongsheng Deng & Liam Huang-->
+<!-- Author : Dongsheng Deng & Liam Huang & Ran Wang-->
-<!-- Program Email: elegantlatex2e@gmail.com -->
+<!-- Program Email: elegantlatex2e@gmail.com (inactive) & ranwang.osbert@outlook.com -->
 
-# ElegantBook
+[Github](https://github.com/ElegantLaTeX/ElegantBook) | [CTAN](https://ctan.org/pkg/elegantbook) | [Download](https://github.com/ElegantLaTeX/ElegantBook/releases) | 
 
-[Homepage](https://elegantlatex.org/) | [Github](https://github.com/ElegantLaTeX/ElegantBook) | [CTAN](https://ctan.org/pkg/elegantbook) | [Download](https://github.com/ElegantLaTeX/ElegantBook/releases) | [Wiki](https://github.com/ElegantLaTeX/ElegantBook/wiki) | [Weibo](https://weibo.com/elegantlatex)
+![License](https://img.shields.io/ctan/l/elegantbook.svg) ![CTAN Version](https://img.shields.io/ctan/v/elegantbook.svg) ![Github Version](https://img.shields.io/github/release/ElegantLaTeX/ElegantBook.svg) ![Repo Size](https://img.shields.io/github/repo-size/ElegantLaTeX/ElegantBook.svg)
 
-![License](https://img.shields.io/ctan/l/elegantbook.svg)
+-------
-![CTAN Version](https://img.shields.io/ctan/v/elegantbook.svg)
-![Github Version](https://img.shields.io/github/release/ElegantLaTeX/ElegantBook.svg)
-![Repo Size](https://img.shields.io/github/repo-size/ElegantLaTeX/ElegantBook.svg)
 
-ElegantBook is designed for books. Just enjoy it! If you have any questions, suggestions or bug reports, you can create issues, pull requests or contact us at elegantlatex2e@gmail.com.
+# ElegantBook: 优美的 LaTeX 书籍模板 An Elegant LaTeX Template for Books 
 
-如果你有其他问题、建议或者报告 bug，可以提交 issues 或者给我们发邮件：elegantlatex2e@gmail.com。
+ElegantBook 是为 LaTeX 书籍写作而设计的模板，由 [Ethan Deng](https://github.com/EthanDeng) 和 [Liam Huang](https://github.com/Liam0205) 创立，而后由 [Ethan Deng](https://github.com/EthanDeng)、[乙醇](https://github.com/syvshc)和[死抠](https://github.com/sikouhjw)维护。自2026年起，由[啸行](https://github.com/OsbertWang)负责维护和发行。如果你有其他问题、建议或者报告 bug，可以提交 issues 或者加入我们的 QQ 用户交流群：692108391。
 
-**注意：** 由于新版本进行了重构，3.x 版本并不兼容 2.x 版本，如果你想把 2.x 版本的文件转为 3.x 版本，请查看[跨版本转换](https://github.com/ElegantLaTeX/ElegantBook/wiki/%E8%BD%AC%E6%8D%A2)。
+ElegantBook is a template designed for LaTeX book writing, created by [Ethan Deng](https://github.com/EthanDeng) and [Liam Huang](https://github.com/Liam0205), and later maintained by [Ethan Deng](https://github.com/EthanDeng), [ethanol](https://github.com/syvshc), and [sikouhjw](https://github.com/sikouhjw). Since 2026, [Osbert Wang](https://github.com/OsbertWang) has been responsible for its maintenance and distribution. If you have any questions, suggestions, or need to report bugs, feel free to submit issues or join our QQ user group: 692108391.
 
-# License
+**本模板自 2023 年 1 月 1 日起停止维护，并不建议使用，但鉴于用户群体庞大，自 2026 年起重新发布。为保证之前版本的用户仍能查阅说明文档，本说明文档保留了过往信息。**
 
-This work is released under the LaTeX Project Public License, v1.3c or later. 
+**This template was discontinued as of January 1, 2023, and its use was not recommended. However, due to its large user base, it has been re-released since 2026. To ensure that users of previous versions can still access the documentation, this documentation retains past information.**
+
+## 致谢 Acknowledgement
+
+特别感谢 [sikouhjw](https://github.com/sikouhjw) 和 [syvshc](https://github.com/syvshc) 长期以来对于 Github 上 issue 的快速回应，以及各个社区论坛对于 ElegantLaTeX 相关问题的回复。特别感谢 ChinaTeX 以及 [LaTeX 工作室](http://www.latexstudio.net/)对于本系列模板的大力宣传与推广。
+
+Thank [sikouhjw](https://github.com/sikouhjw) and [syvshc](https://github.com/syvshc) for their quick response to Github issues and continuously support work for ElegantLaTeX community. Thank ChinaTeX and [LaTeX Studio](http://www.latexstudio.net/) for their promotion. 
+
+## 协议 License
 
 本模板发布遵循 LaTeX 项目公共许可证 1.3 c 或更高版本。
+如果是衍生作品，请务必加入协议声明和模板信息（github、CTAN 地址）。
+
+This work is released under the LaTeX Project Public License, v1.3c or later.
+
+## 衍生品 Derivative Works
+
++ [ElegantBookdown](https://github.com/XiangyunHuang/ElegantBookdown)：[XiangyunHuang](https://github.com/XiangyunHuang) 开发并维护的基于 ElegantBook 的 Bookdown 模板。
++ [bookdownplus](https://github.com/pzhaonet/bookdownplus)：应网友要求，[pzhaonet](https://github.com/pzhaonet) 在 bookdownplus 收录了 ElegantPaper 模板，并为 Mac 做了字体适配。
++ [PanBook](https://github.com/annProg/PanBook)：[annProg](https://github.com/annProg) 开发并维护的基于 Markdown 写作的工作流，收录了 ElegantBook 和 ElegantPaper 模板。

build.lua

@@ -0,0 +1,102 @@
+--[==========================================[--
+          L3BUILD FILE FOR ELEGANTBOOK
+     Check PDF File & Directory After Build
+--]==========================================]--
+
+--[==========================================[--
+                Basic Information
+             Do Check Before Upload
+--]==========================================]--
+module           = "elegantbook"
+version          = "2.60"
+maintainer       = "Ran Wang"
+uploader         = maintainer
+maintainid       = "ElegantLaTeX"
+email            = "ranwang.osbert@outlook.com"
+repository       = "https://github.com/" .. maintainid .. "/" .. module
+announcement     = ""
+note             = ""
+summary          = "Elegant LaTeX Template for Books"
+description      = [[ElegantBook is designed for writing Books. This template is based on the standard LaTeX book class. The goal of this template is to make the writing process more elegant.]]
+
+--[==========================================[--
+         Build, Pack and Upload To CTAN
+         Do not Modify Unless Necessary
+--]==========================================]--
+ctanzip          = module
+excludefiles     = {"*~"}
+textfiles        = {"*.md", "LICENSE", "*.lua", "*.cls", "*.bib"}
+typesetexe       = "latexmk -pdf"
+typesetfiles     = {module .. "-cn.tex", module .. "-en.tex"}
+typesetopts      = "-interaction=nonstopmode"
+typesetruns      = 1
+typesetsuppfiles = {"*.cls", "*.bib"}
+imagesuppdir     = "image"
+figuresuppdir    = "figure"
+specialtypesetting = specialtypesetting or {}
+specialtypesetting[module .. "-cn.tex"] = {cmd = "latexmk -pdfxe"}
+
+uploadconfig = {
+  pkg          = module,
+  version      = version,
+  author       = maintainer,
+  uploader     = uploader,
+  email        = email,
+  summary      = summary,
+  description  = description,
+  announcement = announcement,
+  note         = note,
+  license      = "lppl1.3c",
+  ctanPath     = "/macros/latex/contrib/" .. module .. "/",
+  home         = repository,
+  support      = repository .. "/issues",
+  bugtracker   = repository .. "/issues",
+  repository   = repository,
+  development  = "https://github.com/" .. maintainid,
+  update       = true
+}
+
+function tex(file, dir, cmd)
+  dir = dir or "."
+  cmd = cmd or typesetexe .. " " .. typesetopts
+  return run(dir, cmd .. " " .. file)
+end
+
+-- Copy required files into the typeset build dir
+function docinit_hook()
+  -- Copy .cls, .bib support files
+  for _, glob in pairs(typesetsuppfiles) do
+    cp(glob, currentdir, typesetdir)
+  end
+  -- Copy image subdirectory
+  for _, subdir in pairs({imagesuppdir, figuresuppdir}) do
+    local dest = typesetdir .. "/" .. subdir
+    mkdir(dest)
+    cp("*", subdir, dest)
+  end
+  -- Copy tex source files
+  for _, texfile in pairs(typesetfiles) do
+    cp(texfile, currentdir, typesetdir)
+  end
+  return 0
+end
+
+-- Pack CTAN directory: cls, bib, tex sources, PDFs, and asset subdirs
+function copyctan()
+  local pkgdir = ctandir .. "/" .. ctanpkg
+  mkdir(pkgdir)
+  for _, glob in pairs(typesetsuppfiles) do
+    cp(glob, currentdir, pkgdir)
+  end
+  for _, texfile in pairs(typesetfiles) do
+    cp(texfile, currentdir, pkgdir)
+  end
+  for _, glob in pairs(pdffiles or {"*.pdf"}) do
+    cp(glob, typesetdir, pkgdir)
+  end
+  for _, subdir in pairs({imagesuppdir, figuresuppdir}) do
+    local dest = pkgdir .. "/" .. subdir
+    mkdir(dest)
+    cp("*", subdir, dest)
+  end
+end

delete-temp-files.bat

@@ -1,5 +0,0 @@
-@echo off
-del /q *.aux *.bbl *.blg *.log *.out *.toc *.bcf *.xml *.synctex *.nlo *.nls *.bak *.ind *.idx *.ilg *.lof *.lot *.ent-x *.tmp *.ltx *.los *.lol *.loc *.listing *.gz *.userbak *.nav *.snm *.vrb *.synctex(busy)
-
-
-del /q *.nav *.snm *.vrb *.fls *.xdv *.fdb_latexmk

image/scatter.py

@@ -1,27 +0,0 @@
-# This file is the source file of the scatter.pdf
-# source page: https://matplotlib.org/gallery/shapes_and_collections/scatter.html
-import numpy as np
-import matplotlib.pyplot as plt
-
-# Fixing random state for reproducibility
-np.random.seed(19680801)
-
-
-N = 50
-x = np.random.rand(N)
-y = np.random.rand(N)
-colors = np.random.rand(N)
-area = (30 * np.random.rand(N))**2  # 0 to 15 point radii
-
-ax = plt.subplot(111)
-ax.scatter(x, y, s=area, c=colors, alpha=0.5)
-
-# Hide the right and top spines
-ax.spines['right'].set_visible(False)
-ax.spines['top'].set_visible(False)
-
-# Only show ticks on the left and bottom spines
-ax.yaxis.set_ticks_position('left')
-ax.xaxis.set_ticks_position('bottom')
-
-plt.savefig('scatter.pdf', transparent=True)

reference.bib

@@ -34,6 +34,7 @@
 
 @article{cn1,
    author = {方军雄},
+   key = {fang1 jun1 xiong2},
    title = {{所有制、制度环境与信贷资金配置}},
    journal = {经济研究},
    number = {12},
@@ -45,6 +46,7 @@
 
 @article{cn2,
    author = {刘凤良 and 章潇萌 and 于泽},
+   key = {liu2 feng4 liang2 zhang1 xiao1 meng2 yu2 ze2},
    title = {{高投资、结构失衡与价格指数二元分化}},
    journal = {金融研究},
    number = {02},
@@ -56,6 +58,7 @@
 
 @article{cn3,
    author = {吕捷 and 王高望},
+   key = {lv3 jie2 wang2 gao1 wang4},
    title = {{CPI 与 PPI “背离”的结构性解释}},
    journal = {经济研究},
    volume = {50},