texlive[53061] Master/texmf-dist: elegantnote (8dec19)
commits+karl at tug.org
commits+karl at tug.org
Sun Dec 8 23:48:48 CET 2019
Revision: 53061
http://tug.org/svn/texlive?view=revision&revision=53061
Author: karl
Date: 2019-12-08 23:48:47 +0100 (Sun, 08 Dec 2019)
Log Message:
-----------
elegantnote (8dec19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/elegantnote/README.md
trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.pdf
trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.tex
trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.pdf
trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.tex
trunk/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/elegantnote/License
trunk/Master/texmf-dist/doc/latex/elegantnote/image/donate.jpg
trunk/Master/texmf-dist/doc/latex/elegantnote/image/logo-blue.png
trunk/Master/texmf-dist/doc/latex/elegantnote/image/star.png
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/elegantnote/image/logo.pdf
Added: trunk/Master/texmf-dist/doc/latex/elegantnote/License
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantnote/License (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/elegantnote/License 2019-12-08 22:48:47 UTC (rev 53061)
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2005 M. Y. Name
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % http://www.latex-project.org/lppl.txt
+ % and version 1.3 or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status `maintained'.
+ %
+ % The Current Maintainer of this work is M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
+
Modified: trunk/Master/texmf-dist/doc/latex/elegantnote/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantnote/README.md 2019-12-08 00:54:11 UTC (rev 53060)
+++ trunk/Master/texmf-dist/doc/latex/elegantnote/README.md 2019-12-08 22:48:47 UTC (rev 53061)
@@ -1,13 +1,21 @@
-<!-- Author: ddswhu -->
+<!-- Author: Dongsheng Deng -->
<!-- Email: ddswhu at outlook.com -->
-<!-- Homepage: https://ddswhu.me/ -->
-<!-- Program Email: elegantlatex2e at gmail.com -->
-# Introduction
+# ElegantNote
-ElegantNote is designed for Notes. Just enjoy it! If you have any questions, suggestions or bug reports, you can visit [ElegantNote/issues](https://github.com/ElegantLaTeX/ElegantNote/issues). Looking for other templates designed by ElegantLaTeX Group? Please visit: [https://github.com/ElegantLaTeX](https://github.com/ElegantLaTeX).
+[Homepage](https://elegantlatex.org/) | [Github](https://github.com/ElegantLaTeX/ElegantNote) | [CTAN](https://ctan.org/pkg/elegantnote) | [Download](https://github.com/ElegantLaTeX/ElegantNote/releases) | [Wiki](https://github.com/ElegantLaTeX/ElegantNote/wiki) | [Weibo](https://weibo.com/elegantlatex)
+
+
+
+
-如果你有其他问题、建议或者报告 bug，可以在 [ElegantNote/issues](https://github.com/ElegantLaTeX/ElegantNote/issues) 留言。如果你想了解更多由 ElegantLaTeX 项目组设计的模板，请访问 [https://github.com/ElegantLaTeX](https://github.com/ElegantLaTeX)。
+ElegantNote is designed for Notes. Just enjoy it! If you have any questions, suggestions or bug reports, you can create issues, pull requests or email us at elegantlatex2e at gmail.com.
+设计 ElegantNote 是为了方便记录笔记和阅读笔记。如果你有其他问题、建议或者报告 bug，可以提交 issues 或者给我们发邮件：elegantlatex2e at gmail.com。最近我们新建了一个 QQ 用户交流群（Q 群：692108391），欢迎加入。
+
+# License
+
This work is released under the LaTeX Project Public License, v1.3c or later.
+
+本模板发布遵循 LaTeX 项目公共许可证 1.3 c 或更高版本。
Modified: trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.tex 2019-12-08 00:54:11 UTC (rev 53060)
+++ trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.tex 2019-12-08 22:48:47 UTC (rev 53061)
@@ -1,98 +1,123 @@
%!TEX program = xelatex
-\documentclass[geye,green,pad,cn]{elegantnote}
+\documentclass[cn,hazy,blue,screen,14pt]{elegantnote}
\title{ElegantNote：一个优美的 \LaTeX{} 笔记模板}
-\author{\href{https://ddswhu.me/}{邓东升}}
-\institute{\href{https://elegantlatex.org/}{Elegant\LaTeX{} Program}}
-\version{2.10}
-\date{2019 年 2 月 3 日}
+\author{邓东升}
+\institute{Elegant\LaTeX{} Program}
+
+\version{2.20}
+\date{\zhtoday}
+
\begin{document}
+
\maketitle
-% logo
-\centerline{\includegraphics[width=0.25\textwidth]{logo.pdf}}
-\section{模板设计}
-此模板设计的初衷是为了记录笔记，在 2013 年开始构想，初版我们设计了非常美观的定理环境，并设计了 3 套不同的颜色主题。但我们发现在实际记笔记的时候，过多的定理区块使得整个文章并不是非常美观，所以我们把 ElegantNote 更新为 ElegantBook 模板，在后面被用户熟知。而 ElegantNote 的设计自此停止。
+\centerline{
+ \includegraphics[width=0.2\textwidth]{logo-blue.png}
+}
-2018 年，在被一些用户“催更”之后，ElegantBook 迎来重大更新，原先浮动的定理环境用 tcolorbox 全部改写。时至今日，ElegantBook 版本为 3.05。之后，我们便想把 ElegantNote 也彻底更新下，放弃 ElegantBook 中的定理环境设计，改用更为紧凑，更加朴素的定理环境，设计更适合笔记记录和笔记阅读的 \LaTeX{} 模板。
-在一些朋友的建议和启发下，我们基于标准的 \LaTeX{} 文类 article 重新设计了新版 ElegantNote 模板，在此特别感谢！新模板有下面几个特性：
+\section{ElegantNote 使用说明}
+
+新版 ElegantNote 是基于标准的 \LaTeX{} 文类 article 重新设计的，格式更加简化的笔记模板！本模板支持两种编译方式，\hologo{pdfLaTeX} 和 \hologo{XeLaTeX}\footnote{模板测试环境为 Win10 + \TeX{} Live 2019。}，英文模式下请使用 \hologo{pdfLaTeX} 进行编译，中文模式下推荐使用 \hologo{XeLaTeX}。
+
+新模板有下面几个特性：
\begin{itemize}
-\item 添加护眼模式，颜色为绿豆沙颜色，默认为白色背景；
-\item 适配不同设备，包括 Pad（默认），Kindle，PC（双页），通用（A4）；
-\item 5 套颜色主题，分别是：\textcolor{egreen}{green}（默认），\textcolor{ecyan}{cyan}， \textcolor{eblue}{blue}， \textcolor{sakura}{sakura}， \textcolor{black}{black}；
-\item 语言模式支持：中文（默认），英文；
-\item 支持 \lstinline{PDFLaTeX} 和 \lstinline{XeLaTeX} 编译；
-\item 更加美观的图表标题格式，列表环境，数学字体等。
+ \item 纸张模式：朦胧模式（hazy）和护眼模式（geye）；
+ \item 适配不同设备，包括 Pad（默认），Screen\footnote{\textcolor{red}{本次更新新增内容。}}（幻灯片），Kindle，PC（双页），通用（A4 纸张）；
+ \item 5 套颜色主题，分别是：\textcolor{eblue}{blue}（默认）、\textcolor{egreen}{green}、\textcolor{ecyan}{cyan}、 \textcolor{sakura}{sakura} 和 \textcolor{black}{black}；
+ \item 语言支持：中文（默认），英文；
+ \item 支持 \hologo{pdfLaTeX} 和 \hologo{XeLaTeX} 编译；
+ \item 更加美观的图表标题格式，列表环境，数学字体等；
+ \item 全局字体大小支持：8pt, 9pt, 10pt, 11pt, 12pt, 14pt, 17pt, 和 20pt。
\end{itemize}
-\subsection{护眼模式}
-本模板增加了护眼模式，默认为不开启，开启的方法如下：
+
+\subsection{模板模式}
+
+本模板增加了模式选项，分别有护眼模式（\lstinline{mode=geye}）和朦胧模式（\lstinline{mode=hazy}）。其中护眼模式设置纸张底色为绿豆沙颜色，而朦胧模式为淡蓝色，开启的方法如下：
\begin{lstlisting}[frame=none]
-\documentclass[geye]{elegantnote} % 或者
-\documentclass[mode=geye]{elegantnote}
+ \documentclass[geye]{elegantnote} % or
+ \documentclass[mode=geye]{elegantnote}
+ \documentclass[hazy]{elegantnote} % or
+ \documentclass[mode=hazy]{elegantnote}
\end{lstlisting}
\begin{remark}
-此次更新只添加了护眼模式（绿豆沙色背景），如果您有希望增加其他颜色，可以在 \href{https://github.com/ElegantLaTeX/ElegantNote}{Github/ElegantNote} 创建 issues 或者提交 pull request。
+ 如果你想为自己的文档添加底色，可以在导言区添加下面设置：
+ \begin{lstlisting}
+ \definecolor{geyecolor}{RGB}{199,237,204}
+ \pagecolor{geyecolor}
+ \end{lstlisting}
\end{remark}
+
\subsection{设备选择}
-为了让笔记方便在不同设备上阅读，免去切边，缩放等操作，本模板适配不同的屏幕大小，分别为 Pad，Kindle，PC，A4。不同屏幕的选择为
+
+为了让笔记方便在不同设备上阅读，免去切边，缩放等操作，本模板适配不同的设备，分别为 Pad（默认），Kindle，PC，A4。
+
+\textcolor{red}{\kaishu 新增}：为了方便展示笔记，2.40 版本新增了 \lstinline{device=screen} 设备选项，大小为 MS Powerpoint 的纸张大小，比例为 4:3（2019/12/06）。
+
+不同屏幕的选择为
\begin{lstlisting}[frame=none]
-\documentclass[device=pad]{elegantnote}
-\documentclass[device=kindle]{elegantnote}
-\documentclass[device=pc]{elegantnote}
-\documentclass[device=normal]{elegantnote}
+ \documentclass[device=pad]{elegantnote} % ipad screen size
+ \documentclass[device=kindle]{elegantnote} % kindle screen size
+ \documentclass[device=pc]{elegantnote} % double pages for pc
+ \documentclass[device=normal]{elegantnote} % a4 normal page
+ \documentclass[device=screen]{elegantnote} % 4:3 PPT size
\end{lstlisting}
\begin{note}
也可以采取直接赋值的方法选择屏幕，比如：
\end{note}
-
\begin{lstlisting}[frame=none]
-\documentclass[pad]{elegantnote}
-\documentclass[kindle]{elegantnote}
-\documentclass[pc]{elegantnote}
-\documentclass[normal]{elegantnote}
+ \documentclass[pad]{elegantnote}
+ \documentclass[kindle]{elegantnote}
+ \documentclass[pc]{elegantnote}
+ \documentclass[normal]{elegantnote}
+ \documentclass[screen]{elegantnote}
\end{lstlisting}
\begin{note}
-如果想要得到普通的 A4 纸张大小的 PDF，需要选择 \lstinline{device=normal}，而不是选择 \lstinline{device=pc}，因为 \lstinline{device=pc} 实际上设置的是电脑双页模式。
+ 如果想要正常的 A4 大小的 PDF，需要选择 \lstinline{device=normal}。
\end{note}
-\subsection{颜色主题}
-本模板内置 5 套颜色主题，分别是 \textcolor{egreen}{green}，\textcolor{ecyan}{cyan}， \textcolor{eblue}{blue}， \textcolor{sakura}{sakura}， \textcolor{black}{black}。其中 green 为默认颜色主题，如果用户不需要彩色，可以选择 black 主题。颜色主题的启用方法和之前一样：
+
+
+\subsection[颜色主题]{颜色主题\footnote{测试章节脚注。}}
+
+本模板内置 5 套颜色主题，分别是 \textcolor{eblue}{blue}（默认），\textcolor{egreen}{green}， \textcolor{ecyan}{cyan}， \textcolor{sakura}{sakura}， \textcolor{black}{black}。如果不需要颜色，可以选择黑色（black）主题。颜色主题的设置方法：
\begin{lstlisting}[frame=none]
-\documentclass[green]{elegantnote}
-\documentclass[color=green]{elegantnote}
-...
-\documentclass[black]{elegantnote}
-\documentclass[color=black]{elegantnote}
+ \documentclass[green]{elegantnote}
+ \documentclass[color=green]{elegantnote}
+ ...
+ \documentclass[black]{elegantnote}
+ \documentclass[color=black]{elegantnote}
\end{lstlisting}
+
\subsection{语言模式}
+
本模板内含两套语言环境，改变语言环境会改变图表标题的引导词（图，表），文章结构词（比如目录，参考文献等），以及定理环境中的引导词（比如定理，引理等）。不同语言模式的启用如下：
\begin{lstlisting}[frame=none]
-\documentclass[cn]{elegantnote} % 中文模式
-\documentclass[lang=cn]{elegantnote}
-\documentclass[en]{elegantnote} % 英文模式
-\documentclass[lang=en]{elegantnote}
+ \documentclass[cn]{elegantnote}
+ \documentclass[lang=cn]{elegantnote}
+ \documentclass[en]{elegantnote}
+ \documentclass[lang=en]{elegantnote}
\end{lstlisting}
+
\begin{note}
-不管选用中文环境还是英文环境均可输入中文。另外如果在笔记中使用了抄录环境（\lstinline{lstlisting}），并且其中包括了中文，请务必使用 \lstinline{XeLaTeX} 编译。本说明文档也只能通过 \lstinline{XeLaTeX} 编译。
+只有中文模式才可输入中文，如果需要在英文模式下输入中文，可以自行添加 \lstinline{ctex} 宏包\footnote{需要使用 \lstinline{scheme=plain} 选项才不会把标题改为中文。}或者使用 \lstinline{xeCJK} 宏包设置字体。另外如果在笔记中使用了抄录环境（\lstinline{lstlisting}），并且里面有中文字符，请务必使用 \hologo{XeLaTeX} 编译。
\end{note}
-\subsection{编译方式}
-本模板支持两种编译方式，\lstinline{PDFLaTeX} 和 \lstinline{XeLaTeX}，选用 \lstinline{PDFLaTeX} 编译的话，如果用到了中文，则会调用 \lstinline{ctex} 宏包，而如果选用 \lstinline{XeLaTeX} 编译的话，则会调用 \lstinline{xeCJK} 宏包。模板测试环境为 Win10 + \TeX{} Live 2018，设定的字体为 Windows 中的宋体、楷体、黑体、微软雅黑等。如果你的电脑是 Mac/Linux 系统，而且采用 \lstinline{XeLaTeX} 编译的话，请把 \lstinline{elegantnote.cls} 中字体改为自己系统的字体。
+\subsection{定理类环境}
-\subsection{定理类环境}
此模板采用了 \lstinline{amsthm} 中的定理样式，使用了 4 类定理样式，所包含的环境分别为
\begin{itemize}
-\item \textbf{定理类}：theorem，lemma，proposition，corollary；
-\item \textbf{定义类}：definition，conjecture，example；
-\item \textbf{备注类}：remark，note，case；
-\item \textbf{证明类}：proof。
+ \item \textbf{定理类}：theorem，lemma，proposition，corollary；
+ \item \textbf{定义类}：definition，conjecture，example；
+ \item \textbf{备注类}：remark，note，case；
+ \item \textbf{证明类}：proof。
\end{itemize}
\begin{remark}
@@ -99,12 +124,13 @@
在选用 \lstinline{lang=cn} 时，定理类环境的引导词全部会改为中文。
\end{remark}
+
\section{写作示例}
我们将通过三个步骤定义可测函数的积分。首先定义非负简单函数的积分。以下设 $E$ 是 $\mathcal{R}^n$ 中的可测集。
\begin{definition}[可积性]
-设 $ f(x)=\sum\limits_{i=1}^{k} a_i \chi_{A_i}(x)$ 是 $E$ 上的非负简单函数，其中 $\{A_1,A_2,\ldots,A_k\}$ 是 $E$ 上的一个可测分割，$a_1,a_2,\ldots,a_k$ 是非负实数。定义 $f$ 在 $E$ 上的积分为
+设 $ f(x)=\sum\limits_{i=1}^{k} a_i \chi_{A_i}(x)$ 是 $E$ 上的非负简单函数，其中 $\{A_1,A_2,\ldots$, $A_k\}$ 是 $E$ 上的一个可测分割，$a_1,a_2,\ldots,a_k$ 是非负实数。定义 $f$ 在 $E$ 上的积分为
\begin{equation}
\label{inter}
\int_{E} f dx = \sum_{i=1}^k a_i m(A_i).
@@ -113,17 +139,36 @@
\end{definition}
一个自然的问题是，Lebesgue 积分与我们所熟悉的 Riemann 积分有什么联系和区别？之后我们将详细讨论 Riemann 积分与 Lebesgue 积分的关系。这里只看一个简单的例子。设 $D(x)$ 是区间 $[0,1]$ 上的 Dirichlet 函数。即 $D(x)=\chi_{Q_0}(x)$，其中 $Q_0$ 表示 $[0,1]$ 中的有理数的全体。根据非负简单函数积分的定义，$D(x)$ 在 $[0,1]$ 上的 Lebesgue 积分为
-\begin{equation}
- \label{inter2}
- \int_0^1 D(x)dx = \int_0^1 \chi_{Q_0} (x) dx = m(Q_0) = 0
+\begin{equation}\label{inter2}
+ \int_0^1 D(x)dx = \int_0^1 \chi_{Q_0} (x) dx = m(Q_0) = 0
\end{equation}
即 $D(x)$ 在 $[0,1]$ 上是 Lebesgue 可积的并且积分值为零。但 $D(x)$ 在 $[0,1]$ 上不是 Riemann 可积的。
+\begin{table}[htbp]
+ \centering
+ \small
+ \caption{燃油效率与汽车价格}
+ \begin{tabular}{lcc}
+ \toprule
+ & (1) & (2) \\
+ \midrule
+ 燃油效率 & -238.90*** & -49.51 \\
+ & (53.08) & (86.16) \\
+ 汽车重量 & & 1.75*** \\
+ & & (0.641) \\
+ 常数项 & 11253.00*** & 1946.00 \\
+ & (1171.00) & (3597.00) \\
+ 观测数 & 74 & 74 \\
+ $R^2$ & 0.220 & 0.293 \\
+ \bottomrule
+ \end{tabular}%
+ \label{tab:reg}%
+\end{table}%
+
\begin{theorem}[Fubini 定理]\label{thm:fubi}
若 $f(x,y)$ 是 $\mathcal{R}^p\times\mathcal{R}^q$ 上的非负可测函数，则对几乎处处的 $x\in \mathcal{R}^p$，$f(x,y)$ 作为 $y$ 的函数是 $\mathcal{R}^q$ 上的非负可测函数，$g(x)=\int_{\mathcal{R}^q}f(x,y) dy$ 是 $\mathcal{R}^p$ 上的非负可测函数。并且
-\begin{equation}
- \label{eq:461}
- \int_{\mathcal{R}^p\times\mathcal{R}^q} f(x,y) dxdy=\int_{\mathcal{R}^p}\left(\int_{\mathcal{R}^q}f(x,y)dy\right)dx.
+\begin{equation}\label{eq:461}
+ \int_{\mathcal{R}^p\times\mathcal{R}^q} f(x,y) dxdy=\int_{\mathcal{R}^p}\left(\int_{\mathcal{R}^q}f(x,y)dy\right)dx.
\end{equation}
\end{theorem}
@@ -131,67 +176,108 @@
Let $z$ be some element of $xH \cap yH$. Then $z = xa$ for some $a \in H$, and $z = yb$ for some $b \in H$. If $h$ is any element of $H$ then $ah \in H$ and $a^{-1}h \in H$, since $H$ is a subgroup of $G$. But $zh = x(ah)$ and $xh = z(a^{-1}h)$ for all $h \in H$. Therefore $zH \subset xH$ and $xH \subset zH$, and thus $xH = zH$. Similarly $yH = zH$, and thus $xH = yH$, as required.
\end{proof}
-\begin{figure}[!htbp]
- \centering
- \includegraphics[width=0.6\textwidth]{scatter.pdf}
- \caption{Matplotlib: Scatter Plot Example\label{fig:mpg}}
+
+回归分析（regression analysis) 是确定两种或两种以上变量间相互依赖的定量关系的一种统计分析方法。根据定理~\ref{thm:fubi}，其运用十分广泛，回归分析按照涉及的变量的多少，分为一元回归和多元回归分析；按照因变量的多少，可分为简单回归分析和多重回归分析；按照自变量和因变量之间的关系类型，可分为线性回归分析和非线性回归分析。
+
+
+\section{协作人员招募}
+
+招募 Elegant\LaTeX{} 的协作人员，没有工资。工作内容：翻译 Elegant\LaTeX{} 系列模板相关的文稿（中翻英），维护模板的 wiki（主要涉及 Markdown），如果有公众号文稿写作经历的话，也可以帮忙写微信稿。本公告长期有效。
+
+目前 ElegantLaTeX 共有 4 名协作人员，分别是
+\begin{itemize}
+ \item 官方文档翻译: \href{https://github.com/peggy2006xzyz}{YPY};
+ \item Github 维基维护: \href{https://github.com/izinngo}{Ingo Zinngo}、\href{https://github.com/xiaohao890809}{追寻原风景};
+ \item QQ 群管理员: \href{https://github.com/sikouhjw}{Sikouhjw}.
+\end{itemize}
+
+在此感谢他们无私的奉献！
+
+
+\section{致谢}
+
+截止到 2019 年 12 月 08 日，ElegantNote 2.40 版本发布，ElegantNote 模板在 Github 上的收藏数（star）达到了 176。在此特别感谢 China\TeX{} 以及 \href{http://www.latexstudio.net/}{\LaTeX{} 工作室}对于本系列模板的大力宣传与推广。
+
+如果你喜欢我们的模板，你可以在 Github 上收藏（Star）我们的模板。
+\begin{figure}[htbp]
+ \centering
+ \includegraphics[width=\textwidth]{star.png}
+ \caption{一键三连求赞}
\end{figure}
-回归分析（regression analysis) 是确定两种或两种以上变量间相互依赖的定量关系的一种统计分析方法。根据定理~ \ref{thm:fubi}，其运用十分广泛，回归分析按照涉及的变量的多少，分为一元回归和多元回归分析；按照因变量的多少，可分为简单回归分析和多重回归分析；按照自变量和因变量之间的关系类型，可分为线性回归分析和非线性回归分析。
-但是由于绝对值不易作解析运算，因此，进一步用残差平方和函数来度量总偏差。偏差的平方和最小可以保证每个偏差都不会很大。于是问题归结为确定拟合函数中的常数和使残差平方和函数最小。
-
+\section{捐赠}
+如果您非常喜爱我们的模板，你还可以选择捐赠以表达您对我们模板和我的支持！
+
+\begin{figure}[htbp]
+ \centering
+ \includegraphics[width=0.4\textwidth]{donate.jpg}
+\end{figure}
+
+\textbf{赞赏费用的使用解释权归 Elegant\LaTeX{} 所有，并且不接受监督，请自愿理性打赏}。10 元以上的赞赏，我们将列入捐赠榜，并且发放捐赠纪念证（全部），谢谢各位金主！
+
\begin{table}[htbp]
- \small
\centering
- \caption{燃油效率与汽车价格}
- \begin{tabular}{lcc}
+ \caption{Elegant\LaTeX{} 系列模板捐赠榜}
+ \begin{tabular}{cccccccc}
\toprule
- & (1) & (2) \\
+ \textbf{捐赠者} & \textbf{金额} & \textbf{时间} & \textbf{渠道} & \textbf{捐赠者} & \textbf{金额} & \textbf{时间} & \textbf{渠道} \\
\midrule
- 燃油效率 & -238.90*** & -49.51 \\
- & (53.08) & (86.16) \\
- 汽车重量 & & 1.75*** \\
- & & (0.641) \\
- 常数项 & 11,253*** & 1,946 \\
- & (1,171) & (3,597) \\
- 观测数 & 74 & 74 \\
- $R^2$ & 0.220 & 0.293 \\
+ Lerh & 10 RMB & 2019/5/15 & 微信 & 刘志阔 & 99.99 RMB & 2019/10/15 & 支付宝 \\
+ 越过地平线 & 10 RMB & 2019/5/15 & 微信 & *涛 & 16 RMB & 2019/10/17 & 微信 \\
+ 银桑 & 20 RMB & 2019/5/27 & 微信 & 赤霓 & 12 RMB & 2019/10/17 & 支付宝 \\
+ *空 & 10 RMB & 2019/5/30 & 微信 & 追寻原风景 & 10 RMB & 2019/10/28 & 微信 \\
+ latexstudio.net & 666 RMB & 2019/6/5 & 支付宝 & 郭德良 & 88 RMB & 2019/11/3 & 微信 \\
+ Cassis & 11 RMB & 2019/6/30 & 微信 & 自强不息 & 20 RMB & 2019/11/4 & 支付宝 \\
+ *君 & 10 RMB & 2019/7/23 & 微信 & 读书之虫 & 20 RMB & 2019/11/18 & 微信 \\
+ P*u & 50 RMB & 2019/7/30 & 微信 & *等 & 10 RMB & 2019/11/18 & 微信 \\
+ *萌 & 19 RMB & 2019/8/28 & 微信 & *哲 & 20 RMB & 2019/11/18 & 微信 \\
+ 曲豆豆 & 10 RMB & 2019/8/28 & 微信 & 佚名 & 10 RMB & 2019/11/24 & 微信 \\
+ 李博 & 100 RMB & 2019/10/6 & 微信 & Jiye Qian & 66 RMB & 2019/12/4 & 微信 \\
+ Njustsll & 10 RMB & 2019/10/11 & 微信 & 阳仔 & 20 RMB & 2019/12/5 & 微信 \\
\bottomrule
- \multicolumn{3}{l}{\scriptsize 括号内为标准误} \\
- \multicolumn{3}{l}{\scriptsize *** p<0.01, ** p<0.05, * p<0.1} \\
\end{tabular}%
- \label{tab:reg}%
+ \label{tab:donation}%
\end{table}%
-\begin{itemize}[noitemsep]
- \item Routing and resource discovery;
- \begin{itemize}
- \item Language Models
- \item Vector Space Models
- \end{itemize}
- \item Resilient and scalable computer networks;
- \item Distributed storage and search.
-\end{itemize}
+\section{常见问题 FAQ}
+
+\begin{enumerate}[label=\arabic*).]
+ \item \textit{如何删除版本信息？}\\
+ 导言区不写 \lstinline|\version{x.xx}| 即可。
+ \item \textit{如何删除日期？}\\
+ 需要注意的是，与版本 \lstinline{\version} 不同的是，导言区不写或注释 \lstinline{\date} 的话，仍然会打印出当日日期，原因是 \lstinline{\date} 有默认参数。如果不需要日期的话，日期可以留空即可，也即 \lstinline|\date{}|。
+ \item \textit{如何获得中文日期？}\\
+ 为了获得中文日期，必须在中文模式下\footnote{英文模式下，由于未加载中文宏包，无法输入中文。}，使用 \lstinline|\date{\zhdate{2019/10/11}}|，如果需要当天的汉化日期，可以使用 \lstinline|\date{\zhtoday}|，这两个命令都来源于 \href{https://ctan.org/pkg/zhnumber}{\lstinline{zhnumber}} 宏包。
+ \item \textit{如何添加多个作者？}\\
+ 在 \lstinline{\author} 里面使用 \lstinline{\and}，作者单位可以用 \lstinline{\\} 换行。
+ \begin{lstlisting}
+ \author{author 1\\ org. 1 \and author 2 \\ org. 2 }
+ \end{lstlisting}
+\end{enumerate}
+
+
\section{示例}
-\begin{lstlisting}[frame=single]
-\documentclass[geye,green,pad,cn]{elegantnote}
-\title{一个笔记示例}
+\begin{lstlisting}
+\documentclass[cn,hazy,blue,screen,14pt]{elegantnote}
+
+\title{ElegantNote Example}
\author{ddswhu}
-\institute{Elegant\LaTeX{} 项目组}
-\version{1.00}
-\date{2019 年 2 月 3 日}
+\institute{Elegant\LaTeX{} Program}
+% \version{1.00}
+\date{}
\begin{document}
\maketitle
-\section{介绍}
-介绍部分内容。
+\section{Introduction}
+The content of Introduction.
+
\end{document}
\end{lstlisting}
Modified: trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.tex 2019-12-08 00:54:11 UTC (rev 53060)
+++ trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.tex 2019-12-08 22:48:47 UTC (rev 53061)
@@ -1,105 +1,119 @@
-\documentclass[geye,green,pad,en]{elegantnote}
+\documentclass[en,hazy,screen,blue,14pt]{elegantnote}
\title{ElegantNote: An Elegant \LaTeX{} Template for Notes}
-\author{\href{https://ddswhu.me/}{Dongsheng Deng}}
-\institute{\href{https://elegantlatex.org/}{Elegant\LaTeX{} Program}}
-\version{2.10}
-\date{February 3, 2019}
+\author{Dongsheng Deng}
+\institute{Elegant\LaTeX{} Program}
+\version{2.20}
+\date{\today}
+
\begin{document}
\maketitle
% logo
-\centerline{\includegraphics[width=0.25\textwidth]{logo.pdf}}
+\centerline{\includegraphics[width=0.2\textwidth]{logo-blue}}
-\section{Features Overview}
-This template was originally designed to take notes and was conceived in 2013. In the first version, we designed a series of beautiful theorem environments and introduced 3 different color themes. But when taking notes using this template, we found there were so many theorem blocks which makes the notes not pretty. So we decided to update the ElegantNote to the ElegantBook template. The design of ElegantNote stopped there.
+\section{ElegantNote Instructions}
+\thispagestyle{empty}
+The brand new ElegantNote is redesigned on the basis of \LaTeX{} article, a more elegant note template! You can use either \hologo{pdfLaTeX} or \hologo{XeLaTeX} to compile\footnote{The test environment is Win10 + \TeX{} Live 2019.}. It is recommended that \hologo{pdfLaTeX} be used for notes in English while \hologo{XeLaTeX} be used for notes in Chinese.
-In 2018, after being "urged" by some users, ElegantBook received a major update, the original floating theorem environments are rewritten with tcolorbox package. After that, we want to completely redesign the ElegantNote template. We are in favor of more compact, simpler theorem environments, and aim to design an Elegant \LaTeX{} template which is more suitable for note taking and note reading.
-
-With the advice and inspiration of some friends, we redesigned the new ElegantNote template based on the Standard \LaTeX{} article class! The new template has the following features:
-
+The new template has the following features:
\begin{itemize}
-\item good for eye mode: with green page color;
-\item different devices: Pad (default), Kindle, PC (double-page) and normal (A4);
-\item 5 color themes: \textcolor{egreen}{green} (default), \textcolor{ecyan}{cyan}, \textcolor{eblue}{blue}, \textcolor{sakura}{sakura}, \textcolor{black}{black};
-\item languages support: Chinese (default), English;
-\item support \lstinline{PDFLaTeX} and \lstinline{XeLaTeX};
-\item prettier captions, list environments, and unified fonts.
+ \item two modes: good for eye mode (geye) and hazy mode;
+ \item different devices: Pad (default), Screen(beamer size), Kindle, PC (double-page) and normal (A4);
+ \item 5 color themes: \textcolor{eblue}{blue} (default), \textcolor{egreen}{green}, \textcolor{ecyan}{cyan}, \textcolor{sakura}{sakura} and \textcolor{black}{black};
+ \item languages support: Chinese (default), English;
+ \item support \hologo{pdfLaTeX} and \hologo{XeLaTeX};
+ \item prettier captions, list environments, and unified fonts;
+ \item custmized global font size: 8pt, 9pt, 10pt, 11pt, 12pt, 14pt, 17pt and 20pt.
\end{itemize}
-\subsection{Good for Eye Mode}
-This template added good for eye mode (geye), the default is none, you can switch to good eye mode using:
+
+\subsection{Optional Modes}
+
+This template provides optional modes: good for eye mode (geye) and hazy mode, while the paper color is green for the former and light blue for the latter. you can use the following code to activate the desired mode:
\begin{lstlisting}[frame=none]
-\documentclass[geye]{elegantnote} % or
-\documentclass[mode=geye]{elegantnote}
+ \documentclass[geye]{elegantnote} % or
+ \documentclass[mode=geye]{elegantnote}
+ \documentclass[hazy]{elegantnote} % or
+ \documentclass[mode=hazy]{elegantnote}
\end{lstlisting}
\begin{remark}
-In this version, only one background color is added. If you are expected to add other colors, you can create issues or pull requests at \href{https://github.com/ElegantLaTeX/ElegantNote}{Github/ElegantNote}.
+ If you are expected to customize background, use:
+ \begin{lstlisting}
+ \definecolor{geyecolor}{RGB}{199,237,204}
+ \pagecolor{geyecolor}
+ \end{lstlisting}
\end{remark}
+
\subsection{Device Options}
-To make the notes more comfortable to read, we designed four output options (of different sizes) that correspond to different reading devices: Pad, Kindle, PC and A4paper. The options of output for different devices are
+To make the notes more comfortable to read, we designed four output options (of different sizes) that correspond to different reading devices: Pad (default), Kindle, PC and A4paper.
+
+\textcolor{red}{New}: For the convenience of notes presentation, version 2.20 offers a new option for device, i.e. \lstinline{device=screen}, which is similar to the size of MS Powerpoint with ratio aspect of 4:3 (2019/12/06).
+
+The options of output for different devices are
\begin{lstlisting}[frame=none]
-\documentclass[device=pad]{elegantnote}
-\documentclass[device=kindle]{elegantnote}
-\documentclass[device=pc]{elegantnote}
-\documentclass[device=normal]{elegantnote}
+ \documentclass[device=pad]{elegantnote} % ipad screen size
+ \documentclass[device=kindle]{elegantnote} % kindle screen size
+ \documentclass[device=pc]{elegantnote} % double pages for pc
+ \documentclass[device=normal]{elegantnote} % a4 normal page
+ \documentclass[device=screen]{elegantnote} % 4:3 PPT size
\end{lstlisting}
+
\begin{note}
You can also select the device by using a direct assignment method, such as:
\end{note}
+
\begin{lstlisting}[frame=none]
-\documentclass[pad]{elegantnote}
-\documentclass[kindle]{elegantnote}
-\documentclass[pc]{elegantnote}
-\documentclass[normal]{elegantnote}
+ \documentclass[pad]{elegantnote}
+ \documentclass[kindle]{elegantnote}
+ \documentclass[pc]{elegantnote}
+ \documentclass[normal]{elegantnote}
+ \documentclass[screen]{elegantnote}
\end{lstlisting}
\begin{note}
-Note that if you want a normal A4paper size PDF, you need to select \lstinline{device=normal} instead of \lstinline{device=pc} , because \lstinline{device=pc} is actually set to double page mode on your computer.
+To get a normal A4paper size PDF, please select \lstinline{device=normal}.
\end{note}
-\subsection{Color Themes}
-This template contains 5 color themes, \textcolor{egreen}{green}, \textcolor{ecyan}{cyan}, \textcolor{eblue}{blue}, \textcolor{sakura}{sakura}, \textcolor{black}{black}. Where green is the default color theme, if you don't need color, you can choose black theme. The color theme is enabled in the same way as before:
+
+\subsection[Color Themes]{Color Themes\footnote{Test for chapter footnote.}}
+
+This template contains 5 color themes, \textcolor{egreen}{green}, \textcolor{ecyan}{cyan}, \textcolor{eblue}{blue}(default), \textcolor{sakura}{sakura} and \textcolor{black}{black}. If you don't need color, you can choose black theme. The color theme is enabled in the same way as before:
\begin{lstlisting}[frame=none]
-\documentclass[green]{elegantnote}
-\documentclass[color=green]{elegantnote}
-....
-\documentclass[black]{elegantnote}
-\documentclass[color=black]{elegantnote}
+ \documentclass[green]{elegantnote}
+ \documentclass[color=green]{elegantnote}
+ ....
+ \documentclass[black]{elegantnote}
+ \documentclass[color=black]{elegantnote}
\end{lstlisting}
+
\subsection{Languages}
+
This template contains two sets of language environments, changing the language environment will change the title of table/figure (figure, table), article structure words (such as the table of contents, references, etc.), and the environment Introductory words (such as Theorem, Lemma, etc.). The different language modes are enabled as follows:
\begin{lstlisting}[frame=none]
-\documentclass[cn]{elegantnote}
-\documentclass[lang=cn]{elegantnote}
-\documentclass[en]{elegantnote}
-\documentclass[lang=en]{elegantnote}
+ \documentclass[cn]{elegantnote}
+ \documentclass[lang=cn]{elegantnote}
+ \documentclass[en]{elegantnote}
+ \documentclass[lang=en]{elegantnote}
\end{lstlisting}
+
\begin{note}
-You can input Chinese Character in either environment.
+Chinese characters are allowed in Chinese mode only. To type in Chinese characters in English mode, please include \lstinline{ctex}\footnote{Please use \lstinline{scheme=plain} to retain headlines in English.} or \lstinline{xeCJK} package.
\end{note}
-\subsection{Compilation Methods}
-You can use \lstinline{PDFLaTeX} or \lstinline{XeLaTeX} to process your notes. If you are using \lstinline{PDFLaTeX}, \lstinline{ctex} package is used, and if you are using \lstinline{XeLaTeX}, \lstinline{xeCJK} package is called when processing Chinese characters.
+\subsection{Theorem Class Environments}
-The test environment is Win10 + \TeX{} Live 2018. If you are using a Mac/Linux system and compiled with \lstinline{XeLaTeX}, please change the font in \lstinline{elegantnote.cls} with your system font.
-
-\begin{note}
-If you are using \lstinline{PDFLaTeX}, you do not need to change the font settings.
-\end{note}
-
-\subsection{Theorem Class Environments}
This template used the \lstinline{amsthm} to create theorems, there are 4 types of theorem environments
\begin{itemize}
-\item \textbf{Theorem-Class}: theorem, lemma, proposition, corollary;
-\item \textbf{Definition-Class}: definition, conjecture, example;
-\item \textbf{Remark-Class}: remark, note, case;
-\item \textbf{Proof-Class}: proof.
+ \item \textbf{Theorem-Class}: theorem, lemma, proposition, corollary;
+ \item \textbf{Definition-Class}: definition, conjecture, example;
+ \item \textbf{Remark-Class}: remark, note, case;
+ \item \textbf{Proof-Class}: proof.
\end{itemize}
\begin{remark}
@@ -106,6 +120,7 @@
With the option \lstinline{lang=cn} , the introductory words of the theorem class environments will be changed to Chinese.
\end{remark}
+
\section{Writing Sample}
We will define the integral of a measurable function in three steps. First, we define the integral of a nonnegative simple function. Let $E$ be the measurable set in $\mathcal{R}^N$.
@@ -142,7 +157,6 @@
Let's continue using our application training example. In this case, we'd want to measure the historical levels of satisfaction with the events from the past three years or so, as well as any information possible in regards to the independent variables.
-
\begin{table}[htbp]
\small
\centering
@@ -167,25 +181,98 @@
\begin{itemize}[noitemsep]
- \item Routing and resource discovery;
- \begin{itemize}
- \item Language Models
- \item Vector Space Models
- \end{itemize}
- \item Resilient and scalable computer networks;
- \item Distributed storage and search.
+ \item Routing and resource discovery;
+ \begin{itemize}
+ \item Language Models
+ \item Vector Space Models
+ \end{itemize}
+ \item Resilient and scalable computer networks;
+ \item Distributed storage and search.
\end{itemize}
+
+\section{Recruit Support Members}
+
+Recruit support members for Elegant\LaTeX{} to translate template official guide, maintain wiki entries, update Wechat articles. No deadline for this recruitment.
+
+So far, Elegant\LaTeX{} has four support members:
+\begin{itemize}
+ \item OG Translator: \href{https://github.com/peggy2006xzyz}{YPY};
+ \item Wiki Maintainer: \href{https://github.com/izinngo}{Ingo Zinngo}, \href{https://github.com/xiaohao890809}{Xiaohao890809};
+ \item QQ Group Manager: \href{https://github.com/sikouhjw}{Sikouhjw}.
+\end{itemize}
+
+Thank them all!!!
+
+\section{Acknowledgement}
+The number of stars on Github for ElegantPaper reached 176 on Dec. 8, 2019 at the release of ElegantNote v2.40.
+Thank China\TeX{} and \href{http://www.latexstudio.net/}{\LaTeX{} studio} for their promotion.
+
+If you like our templates, star on Github.
+\begin{figure}[!ht]
+ \centering
+ \includegraphics[width=\textwidth]{star.png}
+ \caption{Twinkle, Twinkle, Little Star}
+\end{figure}
+
+\section{Donation}
+To express your love for our templates and/or our developers, please do not hesitate to tip us.
+\begin{figure}[!htbp]
+ \centering
+ \includegraphics[width=0.4\textwidth]{donate.jpg}
+\end{figure}
+
+\textbf{The explanation right of the tip usage belongs to Elegant\LaTeX{} with no supervision. Feel free to tip us.} Those who donate more than 10 RMB will be recorded in the donation list and will receive a donation certificate. Thank all the tippers!
+
+\begin{table}[htbp]
+ \centering
+ \caption{Donation List}
+ \begin{tabular}{cccccccc}
+ \toprule
+ \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} & \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} \\
+ \midrule
+ Lerh & 10 RMB & 2019/5/15 & Wechat & LIU ZhiKuo & 100 RMB & 2019/10/15 & Alipay \\
+ DiPingXian & 10 RMB & 2019/5/15 & Wechat & * Tao & 16 RMB & 2019/10/17 & Wechat \\
+ YinSang & 20 RMB & 2019/5/27 & Wechat & ChiHong & 12 RMB & 2019/10/17 & Alipay \\
+ * Kong & 10 RMB & 2019/5/30 & Wechat & YuanFengJing & 10 RMB & 2019/10/28 & Wechat \\
+ latexstudio.net & 666 RMB & 2019/6/05 & Alipay & GUO DeLiang & 88 RMB & 2019/11/03 & Wechat \\
+ Cassis & 11 RMB & 2019/6/30 & Wechat & ZiQiangBuXi & 20 RMB & 2019/11/03 & Alipay \\
+ * Jun & 10 RMB & 2019/7/23 & Wechat & DuShuZhiChong & 20 RMB & 2019/11/18 & Wechat \\
+ P*u & 50 RMB & 2019/7/30 & Wechat & * Deng & 10 RMB & 2019/11/18 & Wechat \\
+ * Meng & 19 RMB & 2019/8/28 & Wechat & * Zhe & 20 RMB & 2019/11/18 & Wechat \\
+ QuDouDou & 10 RMB & 2019/8/28 & Wechat & anonymous & 10 RMB & 2019/11/24 & Wechat \\
+ LI Bo & 100 RMB & 2019/10/06 & Wechat & Jiye Qian & 66 RMB & 2019/12/04 & Wechat \\
+ Njustsll & 10 RMB & 2019/10/11 & Wechat & Boy Yang & 20 RMB & 2019/12/05 & Wechat \\
+\bottomrule
+\end{tabular}%
+ \label{tab:donation}%
+\end{table}%
+
+
+\section{FAQ}
+
+\begin{enumerate}[label=\arabic*).]
+ \item \textit{How to remove the information of version?}\\
+ Please comment \lstinline|\version{x.xx}|.
+ \item \textit{How to remove the information of date?}\\
+ Please type in \lstinline|\date{}|.
+ \item \textit{How to add several authors?}\\
+ Use \lstinline{\and} in \lstinline{\author} and use \lstinline{\\} to start a new line.
+ \begin{lstlisting}
+ \author{author 1\\ org. 1 \and author 2 \\ org. 2 }
+ \end{lstlisting}
+\end{enumerate}
+
\section{A Minimal Example}
-\begin{lstlisting}[frame=single]
-\documentclass[geye,green,pad,en]{elegantnote}
-\title{A Note Example}
+\begin{lstlisting}
+\documentclass[en,hazy,blue,screen,14pt]{elegantnote}
+\title{ElegantNote Example}
\author{ddswhu}
\institute{Elegant\LaTeX{} Program}
-\version{1.00}
-\date{\today}
+% \version{1.00}
+\date{}
\begin{document}
@@ -192,8 +279,10 @@
\maketitle
\section{Introduction}
-Example Text.
+The content of Introduction.
+
\end{document}
\end{lstlisting}
+
\end{document}
Added: trunk/Master/texmf-dist/doc/latex/elegantnote/image/donate.jpg
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/elegantnote/image/donate.jpg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantnote/image/donate.jpg 2019-12-08 00:54:11 UTC (rev 53060)
+++ trunk/Master/texmf-dist/doc/latex/elegantnote/image/donate.jpg 2019-12-08 22:48:47 UTC (rev 53061)
Property changes on: trunk/Master/texmf-dist/doc/latex/elegantnote/image/donate.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/elegantnote/image/logo-blue.png
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/elegantnote/image/logo-blue.png
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantnote/image/logo-blue.png 2019-12-08 00:54:11 UTC (rev 53060)
+++ trunk/Master/texmf-dist/doc/latex/elegantnote/image/logo-blue.png 2019-12-08 22:48:47 UTC (rev 53061)
Property changes on: trunk/Master/texmf-dist/doc/latex/elegantnote/image/logo-blue.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/elegantnote/image/logo.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/elegantnote/image/star.png
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/elegantnote/image/star.png
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantnote/image/star.png 2019-12-08 00:54:11 UTC (rev 53060)
+++ trunk/Master/texmf-dist/doc/latex/elegantnote/image/star.png 2019-12-08 22:48:47 UTC (rev 53061)
Property changes on: trunk/Master/texmf-dist/doc/latex/elegantnote/image/star.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls 2019-12-08 00:54:11 UTC (rev 53060)
+++ trunk/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls 2019-12-08 22:48:47 UTC (rev 53061)
@@ -1,6 +1,11 @@
+% Author: Dongsheng Deng
+% Homepage: https://ddswhu.me/
+% Email: elegantlatex2e at gmail.com
+% Lastest Version: https://github.com/ElegantLaTeX/ElegantNote
+
+% --- Class structure: identification part
+\ProvidesClass{elegantnote}[2018/12/09 ElegantNote v2.20 class]
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elegantnote}[2018/01/06 ElegantNote v2.00 class]
-\LoadClass[12pt,final]{article}
\RequirePackage{kvoptions}
\RequirePackage{ifthen}
@@ -7,102 +12,117 @@
\RequirePackage{ifxetex}
\RequirePackage{etoolbox}
\RequirePackage{calc}
-\AtEndOfClass{\RequirePackage{microtype}}
+\SetupKeyvalOptions{
+ family=ELEGANT,
+ prefix=ELEGANT@,
+ setkeys=\kvsetkeys}
-\SetupKeyvalOptions{family=ELEGANT, prefix=ELEGANT@, setkeys=\kvsetkeys}
\newcommand{\ekv}[1]{\kvsetkeys{ELEGANT}{#1}}
% ----- Colors -----
-\DeclareStringOption[green]{color}
+\DeclareStringOption[blue]{color}
\DeclareStringOption[pad]{device}
\DeclareStringOption[cn]{lang}
\DeclareStringOption{mode}
% ----- backward compatibility
-\DeclareVoidOption{green}{\ekv{color = green}}
-\DeclareVoidOption{cyan}{\ekv{color = cyan}}
-\DeclareVoidOption{blue}{\ekv{color = blue}}
-\DeclareVoidOption{sakura}{\ekv{color = sakura}}
-\DeclareVoidOption{black}{\ekv{color = black}}
+\DeclareVoidOption{green}{\ekv{color=green}}
+\DeclareVoidOption{cyan}{\ekv{color=cyan}}
+\DeclareVoidOption{blue}{\ekv{color=blue}}
+\DeclareVoidOption{sakura}{\ekv{color=sakura}}
+\DeclareVoidOption{black}{\ekv{color=black}}
-\DeclareVoidOption{pc}{\ekv{device = pc}}
-\DeclareVoidOption{pad}{\ekv{device = pad}}
-\DeclareVoidOption{kindle}{\ekv{device = kindle}}
-\DeclareVoidOption{normal}{\ekv{device = normal}}
-\DeclareVoidOption{cn}{\ekv{lang = cn}}
-\DeclareVoidOption{en}{\ekv{lang = en}}
+\DeclareVoidOption{pc}{\ekv{device=pc}}
+\DeclareVoidOption{pad}{\ekv{device=pad}}
+\DeclareVoidOption{kindle}{\ekv{device=kindle}}
+\DeclareVoidOption{normal}{\ekv{device=normal}}
+\DeclareVoidOption{screen}{\ekv{device=screen}}
-\DeclareVoidOption{geye}{\ekv{mode = geye}}
+\DeclareVoidOption{cn}{\ekv{lang=cn}}
+\DeclareVoidOption{en}{\ekv{lang=en}}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-%\ExecuteOptions{12pt}
+\DeclareVoidOption{geye}{\ekv{mode=geye}}
+\DeclareVoidOption{hazy}{\ekv{mode=hazy}}
+
+\DeclareStringOption[numbers]{cite}
+\DeclareVoidOption{numbers}{\ekv{cite=numbers}}
+\DeclareVoidOption{authoryear}{\ekv{cite=authoryear}}
+\DeclareVoidOption{super}{\ekv{cite=super}}
+
+\DeclareStringOption[11pt]{fontsize}
+\DeclareVoidOption{10pt}{\ekv{fontsize=10pt}}
+\DeclareVoidOption{11pt}{\ekv{fontsize=11pt}}
+\DeclareVoidOption{12pt}{\ekv{fontsize=12pt}}
+
+\DeclareDefaultOption{
+ \PassOptionsToClass{\CurrentOption}{article}
+ }
\ProcessKeyvalOptions*\relax
-\ProcessOptions*
+\LoadClass{article}
-% fontsetting
-\RequirePackage{ifxetex}
-\ifxetex
- \RequirePackage{fontenc}
- \RequirePackage[no-math]{fontspec}
- \setmainfont{Times New Roman}[NFSSFamily=ntxtlf]
- \setsansfont{Arial}
- %\setmonofont[Scale=0.9]{Courier New}
- \RequirePackage{xeCJK}
- \RequirePackage{xunicode}
- \setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
- \setCJKsansfont[BoldFont={SimHei},ItalicFont={KaiTi}]{KaiTi}
- \setCJKmonofont[BoldFont={SimHei},ItalicFont={KaiTi},Scale=0.9]{Microsoft YaHei}
- \XeTeXlinebreaklocale "zh"
- \XeTeXlinebreakskip = 0pt plus 1pt minus 0.1pt
- \RequirePackage{newtxmath}
- %\DeclareSymbolFont{operators}{OT1}{ntxtlf}{m}{n}
- %\SetSymbolFont{operators}{bold}{OT1}{ntxtlf}{b}{n}
- \setCJKfamilyfont{zhsong}{SimSun}
- \setCJKfamilyfont{zhhei}{SimHei}
- \setCJKfamilyfont{zhkai}{KaiTi}
- \setCJKfamilyfont{zhfs}{FangSong}
- \newcommand*{\songti}{\CJKfamily{zhsong}}
- \newcommand*{\heiti}{\CJKfamily{zhhei}}
- \newcommand*{\kaishu}{\CJKfamily{zhkai}}
- \newcommand*{\fangsong}{\CJKfamily{zhfs}}
-\else
- \RequirePackage{fontenc}
- \RequirePackage{newtxtext}
- \RequirePackage{newtxmath}
- \RequirePackage[UTF8, scheme=plain]{ctex}
-\fi
-\RequirePackage[scale=0.8]{FiraMono}
+\RequirePackage{amsmath,amsthm}
+\PassOptionsToPackage{no-math}{fontspec}
+\ifdefstring{\ELEGANT at lang}{cn}{%
+ \RequirePackage[
+ UTF8,
+ scheme=plain,
+ punct=kaiming]{ctex}
+ }{\relax}
-% 常用宏包
+
+% newtxtext and newtxmath pkg
+\RequirePackage{newtxtext}
+\RequirePackage{newtxmath}
+\RequirePackage{esint}
+
+%%% use yhmath pkg, uncomment following code
+% \let\oldwidering\widering
+% \let\widering\undefined
+% \RequirePackage{yhmath}
+% \let\widering\oldwidering
+
+%%% use esvect pkg, uncomment following code
+% \RequirePackage{esvect}
+
+\DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}
+\let\sumop\relax\let\prodop\relax
+\DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
+\DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
+
\RequirePackage{indentfirst}
\RequirePackage{anyfontsize}
-\RequirePackage{amsmath}
+
\RequirePackage{graphicx}
\RequirePackage{booktabs}
\let\openbox\relax
-\RequirePackage{amsthm}
+
\RequirePackage{xcolor}
+\definecolor{winered}{rgb}{0.5,0,0}
+\definecolor{epubblue}{RGB}{1,126,218}
+
\RequirePackage{hyperref}
\RequirePackage{xpatch}
-\definecolor{winered}{rgb}{0.5,0,0}
-
\hypersetup{%
- pdfborder = {0 0 0},
- colorlinks,
- citecolor=ecolor,
- filecolor=ecolor,
- linkcolor=ecolor,
- urlcolor=ecolor
+ pdfborder={0 0 0},
+ colorlinks,
+ citecolor=ecolor,
+ filecolor=ecolor,
+ linkcolor=ecolor,
+ urlcolor=ecolor
}
+
+\RequirePackage{hologo}
+
% 行距设置
\linespread{1.3}
\setlength{\parskip}{3mm}
\setlength{\parindent}{2em}
-% 定义护眼模式 geye = true
+% 定义护眼模式 geye=true
\RequirePackage{xcolor}
+\RequirePackage{silence}
% good for eye color
\ifdefstring{\ELEGANT at mode}{geye}{
@@ -109,31 +129,70 @@
\definecolor{geyecolor}{RGB}{199,237,204}%
\pagecolor{geyecolor}
}{\relax}
+\ifdefstring{\ELEGANT at mode}{hazy}{
+ \definecolor{geyecolor}{RGB}{251,250,248}%
+ \pagecolor{geyecolor}
+}{\relax}
+
% graphics path
-\graphicspath{{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}
+\graphicspath{
+ {./figure/}
+ {./figures/}
+ {./image/}
+ {./images/}
+ {./graphics/}
+ {./graphic/}
+ {./pictures/}
+ {./picture/}
+}
\let\openbox\relax
-\newtheoremstyle{plain}{3pt}{3pt}{\itshape}{}{\color{ecolor}\bfseries}{}{0.5em}{\thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}}
-\newtheoremstyle{definition}{3pt}{3pt}{\itshape}{}{\color{ecolor}\bfseries}{}{0.5em}{}
-\newtheoremstyle{remark}{3pt}{3pt}{\itshape}{}{\color{ecolor}\bfseries}{}{0.5em}{}
+\newtheoremstyle{plain}{3pt}{3pt}{%
+ \ifdefstring{\ELEGANT at lang}{en}{%
+ \itshape}{%
+ \kaishu}}{}{%
+ \color{ecolor}\bfseries}{}{%
+ 0.5em}{%
+ \thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}}
+\newtheoremstyle{definition}{3pt}{3pt}{%
+ \ifdefstring{\ELEGANT at lang}{en}{%
+ \itshape}{%
+ \kaishu}}{}{%
+ \color{ecolor}\bfseries}{}{%
+ 0.5em}{}
+\newtheoremstyle{remark}{3pt}{3pt}{
+ \ifdefstring{\ELEGANT at lang}{en}{
+ \itshape}{
+ \kaishu}}{}{
+ \color{ecolor}\bfseries}{}{
+ 0.5em}{}
+
+
% caption settings
-\RequirePackage[font=small,labelfont={bf,color=ecolor}]{caption}
+\RequirePackage{caption}
+\captionsetup{
+ labelfont={bf,color=ecolor}}
\captionsetup[table]{skip=3pt}
\captionsetup[figure]{skip=3pt}
% list/itemize/enumerate setting
-\RequirePackage[shortlabels]{enumitem}
+\RequirePackage[shortlabels,inline]{enumitem}
\setlist{nolistsep}
+\RequirePackage[sort&compress]{natbib}
+\setlength{\bibsep}{0.0pt}
+\def\bibfont{\footnotesize}
+
+
% headings
\RequirePackage{fancyhdr}
\fancyhf{}
\pagestyle{fancy}
-\cfoot{\footnotesize\textcolor{gray}{\thepage}}
+\rfoot{\footnotesize\textcolor{gray}{\thepage}}
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}
@@ -140,24 +199,25 @@
\fancypagestyle{plain}{%
\renewcommand{\headrulewidth}{0pt}%
\fancyhf{}%
- \fancyfoot[C]{\footnotesize \textcolor{gray}{\thepage}}%
-}
+ \fancyfoot[R]{
+ \footnotesize \textcolor{gray}{\thepage}}}
-% bib-settings
-\RequirePackage{natbib}
-\setlength{\bibsep}{0.0pt}
-\def\bibfont{\footnotesize}
+\RequirePackage[flushmargin,stable]{footmisc}
+\setlength{\footnotesep}{12pt}
-\RequirePackage{sectsty}
+\RequirePackage{titlesec}
+\titleformat*{\section}{\normalfont\Large\bfseries\color{ecolor}}
+\titleformat*{\subsection}{\normalfont\large\bfseries\color{ecolor}}
+\titleformat*{\subsubsection}{\normalfont\normalsize\bfseries\color{ecolor}}
\ifdefstring{\ELEGANT at color}{green}{
- \definecolor{ecolor}{RGB}{0,120,2}%
+ \definecolor{ecolor}{RGB}{0,120,2}%
}{\relax}
\ifdefstring{\ELEGANT at color}{cyan}{
- \definecolor{ecolor}{RGB}{0,175,152}%
+ \definecolor{ecolor}{RGB}{31,186,190}%
}{\relax}
\ifdefstring{\ELEGANT at color}{blue}{
- \definecolor{ecolor}{RGB}{20,50,104}%
+ \definecolor{ecolor}{RGB}{1,126,218}%
}{\relax}
\ifdefstring{\ELEGANT at color}{sakura}{
\definecolor{ecolor}{RGB}{255,183,197}%
@@ -173,80 +233,120 @@
% \definecolor{black}{RGB}{255,183,197}
%% device settings
-%% default = pad
+%% default=pad
+
+\RequirePackage{geometry}
+\WarningsOff
+\RequirePackage[\ELEGANT at fontsize]{extsizes}
+\WarningsOn
+
+\ifdefstring{\ELEGANT at device}{pad}{%
+ \geometry{
+ paperwidth=6in,
+ paperheight=8in,
+ includefoot,
+ margin=8mm}}{%
+ \relax}
+
\ifdefstring{\ELEGANT at device}{pc}{
- \RequirePackage[margin=8mm, paperwidth=6.2in, paperheight=6in,includefoot]{geometry}
-}{\relax}
-\ifdefstring{\ELEGANT at device}{pad}{
- \RequirePackage[margin=8mm, paperwidth=6in, paperheight=8in,includefoot]{geometry}
- %197mm*148mm
-}{\relax}
-\ifdefstring{\ELEGANT at device}{kindle}{
- \RequirePackage[margin=8mm, paperwidth=3.68in, paperheight=4.92in]{geometry}
- % 160mm*115mm
-}{\relax}
-\ifdefstring{\ELEGANT at device}{normal}{
- \RequirePackage[margin=1in, a4paper]{geometry}
-}{\relax}
+ \geometry{%
+ margin=8mm,
+ paperwidth=6.2in,
+ paperheight=6in,
+ includefoot}}{%
+ \relax}
-\allsectionsfont{\color{ecolor}}
-%\sectionfont{\color{ecolor}}
-%\subsectionfont{\color{ecolor}}
+\ifdefstring{\ELEGANT at device}{kindle}{%
+ \geometry{
+ margin=8mm,
+ paperwidth=3.68in,
+ paperheight=4.92in}}{%
+ \relax}
-\ifdefstring{\ELEGANT at lang}{cn}{
+\ifdefstring{\ELEGANT at device}{normal}{%
+ \geometry{
+ margin=1in,
+ a4paper}}{%
+ \relax}
+
+\ifdefstring{\ELEGANT at device}{screen}{%
+ \geometry{
+ screen,
+ paperwidth=25.4cm,
+ paperheight=19.05cm,
+ margin=1.6cm,
+ headheight=2.17cm,
+ footskip=0.6cm}}{%
+ \relax}
+
+
+\ifdefstring{\ELEGANT at lang}{cn}{%
\theoremstyle{plain}% default
- \newtheorem{theorem}{定理}[section] %
- \newtheorem{lemma}[theorem]{引理} %
- \newtheorem{proposition}[theorem]{性质} %
- \newtheorem*{corollary}{推论} %
- \theoremstyle{definition} %
- \newtheorem{definition}{定义}[section] %
- \newtheorem{conjecture}{猜想}[section] %
- \newtheorem{example}{例}[section] %
- \theoremstyle{remark} %
- \newtheorem*{remark}{\normalfont\bfseries 评论} %
- \newtheorem*{note}{\normalfont\bfseries 注} %
- \newtheorem{case}{\normalfont\bfseries 案例} %
- \renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}证明} %
- \renewcommand\contentsname{\color{ecolor}目录}
- \renewcommand\refname{\color{ecolor}参考文献} %
- \renewcommand\figurename{图} %
- \renewcommand\tablename{表}
- \newcommand\versiontext{版本：}%
- \newcommand\updatetext{更新：}%
- \setlength{\parindent}{2em}
- \newcommand{\keywords}[1]{\vskip2ex\par\noindent\normalfont{\bfseries 关键词: } #1}
-
-}{\relax}
+ \newtheorem{theorem}{定理}[section] %
+ \newtheorem{lemma}[theorem]{引理} %
+ \newtheorem{proposition}[theorem]{性质} %
+ \newtheorem*{corollary}{推论} %
+ \theoremstyle{definition} %
+ \newtheorem{definition}{定义}[section] %
+ \newtheorem{conjecture}{猜想}[section] %
+ \newtheorem{example}{例}[section] %
+ \theoremstyle{remark} %
+ \newtheorem*{remark}{\normalfont\bfseries 评论} %
+ \newtheorem*{note}{\normalfont\bfseries 注} %
+ \newtheorem{case}{\normalfont\bfseries 案例} %
+ \renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}证明} %
+ \renewcommand\contentsname{\color{ecolor}目录}
+ \renewcommand\refname{\color{ecolor}参考文献} %
+ \renewcommand\figurename{图} %
+ \renewcommand\tablename{表}
+ \newcommand\versiontext{版本：}%
+ \newcommand\updatetext{更新：}%
+ \setlength{\parindent}{2em}
+ \newcommand{\keywords}[1]{%
+ \vskip2ex\par\noindent\normalfont{\bfseries 关键词: } #1}
+ \RequirePackage[\ELEGANT at cite]{gbt7714}}{%
+ \relax}
+
\ifdefstring{\ELEGANT at lang}{en}{
\theoremstyle{plain}% default
- \newtheorem{theorem}{Theorem}[section] %
- \newtheorem{lemma}[theorem]{Lemma} %
- \newtheorem{proposition}[theorem]{Proposition} %
- \newtheorem*{corollary}{Corollary} %
- \theoremstyle{definition} %
- \newtheorem{definition}{Definition}[section] %
- \newtheorem{conjecture}{Conjecture}[section] %
- \newtheorem{example}{Example}[section] %
- \theoremstyle{remark} %
- \newtheorem*{remark}{Remark} %
- \newtheorem*{note}{Note} %
- \newtheorem{case}{Case}
- \renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}Proof}
- \newcommand\versiontext{Version: }%
- \newcommand\updatetext{Update: }%
-}{\relax}
+ \newtheorem{theorem}{Theorem}[section] %
+ \newtheorem{lemma}[theorem]{Lemma} %
+ \newtheorem{proposition}[theorem]{Proposition} %
+ \newtheorem*{corollary}{Corollary} %
+ \theoremstyle{definition} %
+ \newtheorem{definition}{Definition}[section] %
+ \newtheorem{conjecture}{Conjecture}[section] %
+ \newtheorem{example}{Example}[section] %
+ \theoremstyle{remark} %
+ \newtheorem*{remark}{Remark} %
+ \newtheorem*{note}{Note} %
+ \newtheorem{case}{Case}
+ \renewcommand*{\proofname}{%
+ \normalfont\bfseries\color{ecolor} Proof}
+ \newcommand\versiontext{Version: }%
+ \newcommand\updatetext{Update: }%
+ \bibliographystyle{aer}}{%
+ \relax}
+
+\def\IfEmpty#1{%
+ \edef\1{\the#1}
+ \ifx\1\empty}
+
\newtoks\version
\newtoks\institute
+\def \ifempty#1{
+ \def\temp{#1}
+ \ifx\temp\empty}
+
\renewcommand\maketitle{\par
\begingroup
\renewcommand\thefootnote{\@fnsymbol\c at footnote}%
\def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hb at xt@1.8em{%
- \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+ \hb at xt@1.8em{%
+ \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
\if at twocolumn
\ifnum \col at number=\@ne
\@maketitle
@@ -255,10 +355,10 @@
\fi
\else
\newpage
- \global\@topnum\z@ % Prevents figures from going at top of page.
+ \global\@topnum\z@ % Prevents figures from going at top of page.
\@maketitle
\fi
- \thispagestyle{plain}\@thanks
+ \thispagestyle{empty}\@thanks
\endgroup
\setcounter{footnote}{0}%
\global\let\thanks\relax
@@ -266,6 +366,7 @@
\global\let\@maketitle\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
+ \global\let\@ELEGANT at version\@empty
\global\let\@date\@empty
\global\let\@title\@empty
\global\let\title\relax
@@ -272,69 +373,139 @@
\global\let\author\relax
\global\let\date\relax
\global\let\and\relax
-}
+ \global\let\ELEGANT at version\relax}
+
\def\@maketitle{%
- \newpage
\color{ecolor}
\null
\vskip 2em%
\begin{center}%
- \let \footnote \thanks
- {\LARGE\bfseries \@title \par}%
- \vskip 1.5em%
- {\large
+ \let \footnote \thanks{%
+ \LARGE\bfseries \@title \par}%
+ \vskip 1.5em {%
+ \large
\lineskip .5em%
\begin{tabular}[t]{c}%
- \kaishu \@author\\
+ \@author\\
\the\institute
\end{tabular}\par}%
- \vskip 1.5em%
- {\small\itshape \versiontext \the\version}%
- \vskip -.5em%
- {\small\itshape \updatetext \@date}%
+
+ \IfEmpty\version
+ \else
+ {\normalfont\ifdefstring{\ELEGANT at lang}{en}{
+ \itshape}{%
+ \kaishu}
+ \versiontext\the\version \\}
+ \fi
+ \ifx\@date\empty
+ \else
+ {\normalfont\ifdefstring{\ELEGANT at lang}{en}{
+ \itshape}{%
+ \kaishu}
+ \updatetext\@date}%
+ \fi
\end{center}%
- \par
- \vskip 1.5em}
-
+ \par}
+
\RequirePackage{tikz}
\usetikzlibrary{shadows}
-\newcommand*{\eBall}{\tikz \draw [baseline, ball color=ecolor, draw=ecolor] circle (2pt);}
-\newcommand*{\eShadow}{\tikz \draw [baseline, fill=ecolor,draw=ecolor,circular drop shadow] circle (2pt);}
-\setlist[enumerate,1]{label=\color{ecolor}(\arabic*).}
-\setlist[enumerate,2]{label=\color{ecolor}(\Roman*).}
-\setlist[enumerate,3]{label=\color{ecolor}(\Alph*).}
-\setlist[enumerate,4]{label=\color{ecolor}(\roman*).}
-\setlist[itemize,1]{label={\eBall}}
-\setlist[itemize,2]{label={\eShadow}}
-%source1: https://tex.stackexchange.com/questions/41408/a-five-level-deep-list
-%source2: https://tex.stackexchange.com/questions/318199/change-color-of-itemize-bullet
+\newcommand*{\eitemi}{
+ \tikz\draw[baseline, ball color=ecolor, draw=none] circle (2pt);}
+\newcommand*{\eitemii}{
+ \tikz\draw[baseline, fill=ecolor,draw=none,circular drop shadow] circle (2pt);}
+\newcommand*{\eitemiii}{%
+ \tikz\draw[baseline,fill=ecolor,draw=none] circle (2pt);}
-\DeclareSymbolFont{cmlargesymbols}{OMX}{cmex}{m}{n}
-\DeclareMathSymbol{\intop}{\mathop}{cmlargesymbols}{"5A}
- \def\int{\intop\nolimits}
-\DeclareMathSymbol{\ointop}{\mathop}{cmlargesymbols}{"49}
- \def\oint{\ointop\nolimits}
-\DeclareMathSymbol{\sumop}{\mathop}{cmlargesymbols}{"58}
- \let\sum\sumop
-\DeclareMathSymbol{\prodop}{\mathop}{cmlargesymbols}{"59}
- \let\prod\prodop
+\setlist[enumerate,1]{label=\color{ecolor}\arabic*.}
+\setlist[enumerate,2]{label=\color{ecolor}(\alph*).}
+\setlist[enumerate,3]{label=\color{ecolor}\Roman*.}
+\setlist[enumerate,4]{label=\color{ecolor}\Alph*.}
+\setlist[itemize,1]{label={\eitemi}}
+\setlist[itemize,2]{label={\eitemii}}
+\setlist[itemize,3]{label={\eitemiii}}
+% source1: https://tex.stackexchange.com/questions/41408/a-five-level-deep-list
+% source2: https://tex.stackexchange.com/questions/318199/change-color-of-itemize-bullet
-\RequirePackage{listings}
+\RequirePackage{listings,lstautogobble}
+\renewcommand{\ttdefault}{cmtt}
+
+\lstdefinestyle{estyle}{
+ basicstyle=%
+ \ttfamily
+ \lst at ifdisplaystyle\footnotesize\fi}
+
+% \lstset{
+% basicstyle=\scriptsize\ttfamily,
+% style=estyle}
+
\definecolor{lightgrey}{rgb}{0.9,0.9,0.9}
\definecolor{frenchplum}{RGB}{190,20,83}
\lstset{language=[LaTeX]TeX,
- texcsstyle=*\bf\color{winered}\ttfamily,
- basicstyle=\footnotesize\ttfamily,
- numbers=none,
- breaklines=true,
- keywordstyle=\bf\color{winered}\ttfamily,
- commentstyle=\color{gray},
- emph={elegantpaper,fontenc,fontspec,xeCJK,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,newtx,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm},
- emphstyle={\color{frenchplum}},
- morekeywords={DeclareSymbolFont,SetSymbolFont,toprule,midrule,bottomrule,institute,version,includegraphics,setmainfont,setsansfont,setmonofont ,setCJKmainfont,setCJKsansfont,setCJKmonofont,RequirePackage,figref,tabref,email,maketitle,keywords},
- frame=none,
- tabsize=2,
- rulecolor=\color{ecolor},
-}
+ style=estyle,
+ autogobble=true,
+ texcsstyle=*\color{winered},
+ numbers=none,
+ breaklines=true,
+ keywordstyle=\color{winered},
+ commentstyle=\color{gray},
+ emph={%
+ elegantpaper,
+ fontenc,
+ fontspec,
+ xeCJK,
+ FiraMono,
+ xunicode,
+ newtxmath,
+ figure,
+ fig,
+ image,
+ img,
+ table,
+ itemize,
+ enumerate,
+ newtxtext,
+ newtxtt,
+ ctex,
+ microtype,
+ description,
+ times,
+ newtx,
+ booktabs,
+ tabular,
+ PDFLaTeX,
+ XeLaTeX,
+ type1cm,
+ BibTeX,
+ device,
+ color,
+ mode,
+ lang,
+ amsthm},
+ emphstyle={\color{frenchplum}},
+ morekeywords={%
+ DeclareSymbolFont,
+ SetSymbolFont,
+ toprule,
+ midrule,
+ bottomrule,
+ institute,
+ version,
+ includegraphics,
+ setmainfont,
+ setsansfont,
+ setmonofont ,
+ setCJKmainfont,
+ setCJKsansfont,
+ setCJKmonofont,
+ RequirePackage,
+ figref,
+ pagecolor,
+ definecolor,
+ tabref,
+ email,
+ maketitle,
+ keywords},
+ frame=none,
+ tabsize=2}
More information about the tex-live-commits
mailing list