summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md22
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex54
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdfbin2454501 -> 1884407 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex5
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015-gbk.def1
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx61
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx115
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx29
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx95
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx2
-rw-r--r--macros/latex/contrib/chhaya/README.txt18
-rw-r--r--macros/latex/contrib/chhaya/chhaya.dtx230
-rw-r--r--macros/latex/contrib/chhaya/chhaya.ins56
-rw-r--r--macros/latex/contrib/chhaya/chhaya.pdfbin0 -> 45752 bytes
-rw-r--r--macros/latex/contrib/chhaya/ref.bib5
-rw-r--r--macros/latex/contrib/chhaya/sankshep.tex33
-rw-r--r--macros/latex/contrib/elteikthesis/README.md17
-rw-r--r--macros/latex/contrib/elteikthesis/README.pdfbin151924 -> 152282 bytes
-rw-r--r--macros/latex/contrib/elteikthesis/README_hu.md16
-rw-r--r--macros/latex/contrib/elteikthesis/README_hu.pdfbin156393 -> 156453 bytes
-rw-r--r--macros/latex/contrib/elteikthesis/elteikthesis.bib (renamed from macros/latex/contrib/elteikthesis/thesis.bib)0
-rw-r--r--macros/latex/contrib/elteikthesis/elteikthesis.cls20
-rw-r--r--macros/latex/contrib/elteikthesis/elteikthesis.pdf (renamed from macros/latex/contrib/elteikthesis/thesis.pdf)bin461186 -> 461186 bytes
-rw-r--r--macros/latex/contrib/elteikthesis/elteikthesis.tex (renamed from macros/latex/contrib/elteikthesis/thesis.tex)4
27 files changed, 680 insertions, 109 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
index c3f3656ea0..086d623f8e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
@@ -1,4 +1,4 @@
-<b>Date of last change: 2020-03-04 to version v1.0t</b>
+<b>Date of last change: 2020-07-21 to version v1.0v</b>
# biblatex-gb7714-2015: a biblatex style package
@@ -47,16 +47,21 @@ biblatex-gb7714-2015 宏包是中文参考文献著录/标注标准 `GB/T 7714-2
* [SJTUThesis(上海交通大学学位论文模板)](https://github.com/sjtug/SJTUThesis)(母校的论文模板,不得不说缘分真的很神奇)
* [fduthesis(复旦大学论文模板)](https://github.com/Stone-Zeng/fduthesis)
-* [ECNU-Undergraduate-LaTeX(华东师范大学本科毕业论文模板)](https://github.com/YijunYuan/ECNU-Undergraduate-LaTeX)
-* [UCASthesis(中国科学院大学学位论文模板**国科大新版标准**)](https://github.com/xiaoyao9933/UCASthesis)
-* [Study-LaTeX(LaTeX学习笔记)](https://github.com/Zousiyu/Study-LaTeX)
* [Zhejiang University thesis(浙江大学毕业设计/论文模板)](https://github.com/TheNetAdmin/zjuthesis)
+* [UCASthesis(中国科学院大学学位论文模板**国科大新版标准**)](https://github.com/xiaoyao9933/UCASthesis)
+* [UCASthesis(ucasthesis 国科大学位论文 LaTeX 模板 [最新样式])](https://github.com/mohuangrui/ucasthesis)
+* [TongjiThesis(同济大学硕博士论文LaTeX模板)](https://github.com/marquistj13/TongjiThesis)
+* [neuthesis(东北大学博士学位论文Latex模板)](https://github.com/mervin0502/neuthesis)
+* [nwafuthesis(西北农林科技大学学位论文LaTeX文档类)](https://github.com/registor/nwafuthesis)
+* [nudtpaper(nudt学位论文模板)](https://github.com/liubenyuan/nudtpaper)
+* [ECNU-Undergraduate-LaTeX(华东师范大学本科毕业论文模板)](https://github.com/YijunYuan/ECNU-Undergraduate-LaTeX)
* [fjnu-bathesis (福建师范大学本科毕业论文LaTeX 模板)](https://github.com/fjnuer/fjnu-bathesis)
* [Thesis-Template-for-XJTU (西安交大毕业设计模板)](https://github.com/DXie123/Thesis-Template-for-XJTU)
* [CAUTemplate(中国农业大学课程论文模板)](https://github.com/Cdmium/CAUTemplate)
* [Yet anoter BUPT Thesis LaTeX class (北邮研究生学位设计的LaTeX文档类)](https://github.com/qcts33/BUPTthesis-ctex)
-* [neuthesis (东北大学博士学位论文Latex模板)](https://github.com/mervin0502/neuthesis)
-* [nwafuthesis (西北农林科技大学学位论文LaTeX文档类)](https://github.com/registor/nwafuthesis)
+* [Study-LaTeX(LaTeX学习笔记)](https://github.com/Zousiyu/Study-LaTeX)
+* [ElegantBook](https://github.com/ElegantLaTeX/ElegantBook)
+* [《经济研究》杂志 LaTeX 论文模板)](https://github.com/EthanDeng/Chinese-ERJ)
* [...]
@@ -851,6 +856,8 @@ biblatex中处理顺序数字编码压缩的代码默认从3个连续编码开
\global\undef\cbx@lastprefix}
```
+反之,从两个开始压缩改成3个连续压缩,方法是类似的,就是将中的0改回1。
+
* <b>在正文中的某一部分,希望取消顺序编码标签中的压缩,而其他部分保持这种压缩,该怎么处理?</b>
@@ -1161,6 +1168,9 @@ please see the file 'biblatex-gb7714-2015.pdf' for further information!
* 2019/03/29 v1.0rm,rename erj to chinese-erj,ctan
* 2019/08/28 v1.0s
* 2020/03/04 v1.0t,ctan
+* 2020/03/30 v1.0u
+* 2020/07/21 v1.0v,ctan
+
---------------------------------------------------------
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
index e5ff2178e6..89a481574e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
@@ -51,36 +51,36 @@
\deflength{\ruleraised}{\headsep+\textheight}
\usepackage{fancyhdr}
\fancyhf{}
-\fancyhead[LO]{%
-\raisebox{-\skipheadrule}{%
-\raisebox{-\headsep}[0pt][0pt]{\makebox[0pt][l]{\ruler{rightup}{\linewidth}}}%
-\raisebox{-\ruleraised}[0pt][0pt]{\makebox[0pt][r]{\ruler{upleft}{\ruletotalen}}}%
-}%HEAD LEFT%
-}
-\fancyhead[LE]{%
-\raisebox{-\skipheadrule}{%
-\raisebox{-\headsep}[0pt][0pt]{\makebox[0pt][l]{\ruler{rightup}{\linewidth}}}%
-\raisebox{-\ruleraised}[0pt][0pt]{\makebox[0pt][r]{\ruler{upleft}{\ruletotalen}}}%
-}\leftmark%HEAD LEFT%
-}
-\fancyhead[RO]{%
-%HEAD RIGHT%
-\raisebox{-\skipheadrule}{%
-\hfill\makebox[0pt][l]{\raisebox{-\ruleraised}[0pt][0pt]{\ruler{downright}{\ruletotalen}}\hss}%
-}}
-\fancyhead[RE]{%
-\rightmark%HEAD RIGHT%
-\raisebox{-\skipheadrule}{%
-\hfill\makebox[0pt][l]{\raisebox{-\ruleraised}[0pt][0pt]{\ruler{downright}{\ruletotalen}}\hss}%
-}}
+%\fancyhead[LO]{%
+%\raisebox{-\skipheadrule}{%
+%\raisebox{-\headsep}[0pt][0pt]{\makebox[0pt][l]{\ruler{rightup}{\linewidth}}}%
+%\raisebox{-\ruleraised}[0pt][0pt]{\makebox[0pt][r]{\ruler{upleft}{\ruletotalen}}}%
+%}%HEAD LEFT%
+%}
+%\fancyhead[LE]{%
+%\raisebox{-\skipheadrule}{%
+%\raisebox{-\headsep}[0pt][0pt]{\makebox[0pt][l]{\ruler{rightup}{\linewidth}}}%
+%\raisebox{-\ruleraised}[0pt][0pt]{\makebox[0pt][r]{\ruler{upleft}{\ruletotalen}}}%
+%}\leftmark%HEAD LEFT%
+%}
+%\fancyhead[RO]{%
+%%HEAD RIGHT%
+%\raisebox{-\skipheadrule}{%
+%\hfill\makebox[0pt][l]{\raisebox{-\ruleraised}[0pt][0pt]{\ruler{downright}{\ruletotalen}}\hss}%
+%}}
+%\fancyhead[RE]{%
+%\rightmark%HEAD RIGHT%
+%\raisebox{-\skipheadrule}{%
+%\hfill\makebox[0pt][l]{\raisebox{-\ruleraised}[0pt][0pt]{\ruler{downright}{\ruletotalen}}\hss}%
+%}}
\fancyhead[CO]{%
符合GB/T 7714-2015标准的biblatex参考文献样式%HEAD CENTER
}
-\fancyfoot[L]{%
-\raisebox{-\skipfootrule}{%
-\raisebox{\footskip}[0pt][0pt]{\makebox[0pt][l]{\ruler{rightdown}{\linewidth}}}
-}%FOOT LEFT
-}
+%\fancyfoot[L]{%
+%\raisebox{-\skipfootrule}{%
+%\raisebox{\footskip}[0pt][0pt]{\makebox[0pt][l]{\ruler{rightdown}{\linewidth}}}
+%}%FOOT LEFT
+%}
\fancyfoot[C]{%
\thepage%FOOT CENTER
}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
index c6a841b307..b152087039 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
index dc81acdede..2702ae168e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
@@ -1251,13 +1251,14 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\end{texlist}
\end{example}
-文献表的水平缩进控制,两种编制方式下是不同的。对于著者-出版年制文献表,bibitemindent表示一条文献中第一行相对后面各行的缩进,bibhang 表示页边到文献各行起始位置的距离。因此要调整缩进就是要设置这两尺寸。
+文献表的水平缩进控制,两种编制方式下是不同的。对于著者-出版年制文献表,bibitemindent表示
+\emph{一条文献中第一行相对后面各行的缩进},bibhang 表示\emph{页边到文献各行起始位置的距离}。因此要调整缩进就是要设置这两尺寸。
对于顺序编码制文献表,由于存在数字标签,且其宽度与参考文献数量相关,所以这个宽度是动态变的,无能提前设定的,而是在文献表生成时给出,所以调整缩进需要在文献表输出环境中调整。由于顺序编码样式使用了两类输出环境,所以需要根据设定的选项区分处理:
一是采用list环境的文献表,即设置gbalign=left、right、center时(即顺序编码标签是左对齐、右对齐和居中对齐的情况),在重定义的文献表环境中,调整bibitemindent和bibhang两个尺寸,默认情况下bibhang+labelnumberwidth的长度是页边到各行起始位置的距离。当采用某些字体导致计算计算的标签宽度不足时,可以设置biblabelextend尺寸,来增加labelnumberwidth的宽度,避免缩进格式产生问题,默认情况下biblabelextend尺寸为0pt。
-二是采用正常段落环境的文献表,即设置gbalign=gb7714-2015时(即项对齐情况,就是各条文献是自身对齐的情况),在重定义的命令中通过调整lengthid尺寸来设置每条参考文献第二行开始的缩进距离。
+二是采用正常段落环境的文献表,即设置gbalign=gb7714-2015时(即项对齐情况,就是各条文献是自身对齐的情况),在重定义的命令中通过调整lengthid尺寸来设置\emph{每条参考文献第二行开始的缩进距离}。
调整方法见例\ref{eg:biblist:hspace}。
\begin{example}{文献表水平缩进控制}{eg:biblist:hspace}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015-gbk.def b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015-gbk.def
index 50b9a5c39c..b2dc830eb6 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015-gbk.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015-gbk.def
@@ -12,6 +12,7 @@
\def\str@references{ο}
\def\str@bytranslator{}
\def\str@andotherscn{}
+ \def\str@andcn{}
\def\str@backrefpage{ҳ}
\def\str@backrefpages{ҳ}
\def\str@noaddress{ز}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
index f7aee9c42c..ea6357c25e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
@@ -11,7 +11,7 @@
%
% 版本和时间信息
%
-\def\versionofgbtstyle{2020/03/20 v1.0u}
+\def\versionofgbtstyle{2020/07/21 v1.0v}
\def\versionofbiblatex{\abx@version}
\ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求
@@ -454,6 +454,7 @@
\def\str@references{参考文献}
\def\str@bytranslator{译}
\def\str@andotherscn{等}
+ \def\str@andcn{和}
\def\str@backrefpage{引用页}
\def\str@backrefpages{引用页}
\def\str@noaddress{出版地不详}
@@ -522,6 +523,11 @@
}
}{}}
+ %
+ % 增加一个处理佚名或noauthor的控制选项
+ %
+ % 原理方法:在顺序编码制中不需要使用,为与作者年制的兼容性考虑,这里也增加避免报错
+ \DeclareBibliographyOption{gbnoauthor}[true]{}%
%
@@ -556,11 +562,7 @@
\ExecuteBibliographyOptions{gbpunctin}
- %
- % 增加一个处理佚名或noauthor的控制选项
- %
- % 原理方法:在顺序编码制中不需要使用,为与作者年制的兼容性考虑,这里也增加避免报错
- \DeclareBibliographyOption{gbnoauthor}[true]{}%
+
%
@@ -850,7 +852,7 @@
bytranslator= {\str@bytranslator},%\addperiod,%将trans. by 改成 译\addcomma\
and = {\addcomma},%将第2和3人名间的and符号改成逗号,用\finalnamedelim命令也可以定义,参见3.9.1节
andcn = {\addcomma},%and本地化字符串的中文对应词
- andincitecn = {\addcomma},%将标注中的分开,便于与文献表中的区分
+ andincitecn = {\str@andcn},%将标注中的分开,便于与文献表中的区分
andincite = {\addcomma},
%andothers = {et al.},%将超过3个人名的省略,et al.改成为 等
andotherscn = {\str@andotherscn},%将超过3个人名的省略,et al.改成为 等
@@ -1283,6 +1285,8 @@
\step[fieldset=userd,origfieldval]
}
\map{%当文献给出language域时,设置文献要使用的本地化字符串的语言
+ %biblatex 3.11及以下版本仅有match是区分大小写的,而3.12版开始用matchi来区分大小,而match不区分
+ %这里为兼容3.11及以下版本,所以用一个复杂一点的正则表达式
\step[fieldsource=language,match=\regexp{(e|E)(n|N)(g|G)(l|L)(i|I)(s|S)(h|H)},final]
\step[fieldset=langid,fieldvalue={english}]
\step[fieldset=lansortorder,fieldvalue=\lanenorder]
@@ -2257,7 +2261,6 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
}}
-%
% 修改省略作者后的本地化字符串,比如et al.
% v1.0o,20190103,hzz
%
@@ -2266,6 +2269,26 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
% 首先设置全局的,然后设置文献表中的,这一等价于将所有的cite命令环境都设置过了
% 而不用对每一个引用命令单独设置,比如cite,parancite,textcite都设置
\DeclareDelimFormat{strandothersdelim}{%
+ \edef\userfieldabcde{userd}%这里使用\iffieldequalstr{labelnamesource}替代ifcurrentname因为标注中使用ifcurrentname无效
+ \iffieldequalstr{labelnamesource}{translator}{\edef\userfieldabcde{usere}}{}%
+ \iffieldequalstr{labelnamesource}{editor}{\edef\userfieldabcde{userc}}{}%
+ \iffieldequalstr{labelnamesource}{author}{\edef\userfieldabcde{userf}}{}%
+ \iffieldequalstr{labelnamesource}{bookauthor}{\edef\userfieldabcde{userb}}{}%
+ \ifcase\value{gbcitelocalcase}%
+ \iffieldequalstr{\userfieldabcde}{chinese}{\ifbibstring{andothersincitecn}{\bibstring{andothersincitecn}}{\bibstring{andothers}}}{}%中文已经通过english本地化字符串定义
+ \iffieldequalstr{\userfieldabcde}{korean}{\ifbibstring{andotherskr}{\bibstring{andotherskr}}{\bibstring{andothers}}}{}%韩语未定义,所以与bib中一致
+ \iffieldequalstr{\userfieldabcde}{japanese}{\ifbibstring{andothersjp}{\bibstring{andothersjp}}{\bibstring{andothers}}}{}%日与同韩语
+ \iffieldequalstr{\userfieldabcde}{english}{\ifbibstring{andothersincite}{\bibstring{andothersincite}}{\bibstring{andothers}}}{}%英语已定义
+ \iffieldequalstr{\userfieldabcde}{french}{\bibstring{andothers}}{}%法语未定义,若要定义需要针对french本地化字符串定义
+ \iffieldequalstr{\userfieldabcde}{russian}{\bibstring{andothers}}{}%俄语未定义,若要定义需要针对russian本地化字符串定义
+ \or%
+ \bibstring{andothersincitecn}%
+ \or%
+ \bibstring{andothersincite}%
+ \fi}
+
+
+\DeclareDelimFormat[bib,biblist]{strandothersdelim}{%
\edef\userfieldabcde{userd}%
\ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}%
\ifcurrentname{editor}{\edef\userfieldabcde{userc}}{}%
@@ -2294,6 +2317,28 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
% 而不用对每一个引用命令单独设置,比如cite,parancite,textcite都设置
\DeclareDelimFormat{finalnamedelim}{%
\ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
+% \addspace%
+ \edef\userfieldabcde{userd}%
+ \ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}%
+ \ifcurrentname{editor}{\edef\userfieldabcde{userc}}{}%
+ \ifcurrentname{author}{\edef\userfieldabcde{userf}}{}%
+ \ifcurrentname{bookauthor}{\edef\userfieldabcde{userb}}{}%
+ \ifcase\value{gbcitelocalcase}%
+ \iffieldequalstr{\userfieldabcde}{chinese}{\bibstring{andincitecn}}{}%
+ \iffieldequalstr{\userfieldabcde}{korean}{\bibstring{andkr}}{}%
+ \iffieldequalstr{\userfieldabcde}{japanese}{\bibstring{andjp}}{}%
+ \iffieldequalstr{\userfieldabcde}{english}{\space\bibstring{andincite}\space}{}%
+ \iffieldequalstr{\userfieldabcde}{french}{\space\bibstring{and}\space}{}%
+ \iffieldequalstr{\userfieldabcde}{russian}{\space\bibstring{and}\space}{}%
+%\space%
+ \or%
+ \bibstring{andincitecn}%\space%
+ \or%
+\space\bibstring{andincite}\space%
+ \fi}
+
+\DeclareDelimFormat[bib,biblist]{finalnamedelim}{%
+ \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
\addspace%
\edef\userfieldabcde{userd}%
\ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
index 740b23d9a1..43705f28cc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
@@ -7,7 +7,7 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% ---------------------------------------------------------------
%%
-\def\versionofgbtstyle{2020/03/20 v1.0u}
+\def\versionofgbtstyle{2020/07/21 v1.0v}
\ProvidesFile{gb7714-2015.cbx}[\versionofgbtstyle biblatex citation style]
%
@@ -31,6 +31,27 @@
%\DeclareDelimFormat[textcite]{andothersdelim}{\addspace}%
%
+%将连续3篇文献压缩改为连续2篇文献压缩
+%
+%该宏的目的是抛弃压缩内部的编号,而仅输出最后一个编号,主要通过cbx@tempcnta来控制
+%一般情况下cbx@tempcnta为0,所以该宏不输出任何内容。当cbx@tempcnta在cite:comp:comp宏中更改变大后
+%说明开始进入需要压缩的范围,当到压缩终点时,cbx@tempcnta必然大于1,则输出内容。
+%修改第二行的数字1为0即可将默认的3个开始压缩变为2个开始压缩。
+\renewbibmacro*{cite:dump}{%
+ \ifnumgreater{\value{cbx@tempcnta}}{0}%
+ {\ifnumgreater{\value{cbx@tempcnta}}{0}%1改为0,可以将压缩起始3个编号改为2个编号
+ {\bibrangedash}%
+ {\multicitedelim}%
+ \bibhyperref[\cbx@lastkey]{%
+ \ifdef\cbx@lastprefix%
+ {\printtext[labelprefix]{\cbx@lastprefix}}%
+ {}%
+ \printtext[labelnumber]{\cbx@lastnumber}}}%
+ {}%
+ \setcounter{cbx@tempcnta}{0}%
+ \global\undef\cbx@lastprefix}
+
+%
% 定义一个上标方括号wrapper
%
\newcommand*\mkbibsuperbracket[1]{%
@@ -159,14 +180,90 @@
% 20190409,v1.0r,hzz
% 方法:利用newcommand或newrobustcmd命令进行定义
% 注意\citet和\citep命令之所以不用newrobustcmd,是为避免加载natbib模块后产生冲突
-\DeclareCiteCommand{\citet}%
- {\usebibmacro{prenote}}
- {\iffieldequalstr{userf}{cn}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace
- {\renewcommand*{\andothersdelim}{\addspace}}%
- \printnames{labelname}\mkbibsuperscript{\mkbibbrackets{\usebibmacro{citeindex}%
- \usebibmacro{cite}}}}
- {\multicitedelim}
- {\mkbibsuperscript{\printfield{postnote}}}
+%\DeclareCiteCommand{\citet}%
+% {\usebibmacro{prenote}}
+% {\iffieldequalstr{userf}{cn}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace
+% {\renewcommand*{\andothersdelim}{\addspace}}%
+% \printnames{labelname}\mkbibsuperscript{\mkbibbrackets{\usebibmacro{citeindex}%
+% \usebibmacro{cite}}}}
+% {\multicitedelim}
+% {\mkbibsuperscript{\printfield{postnote}}}
+
+%
+% 重定义citet,因为前面与\authornumcite同定义的命令无法正确处理多个bibtexkey同时给出的压缩情况
+% 20200721,v1.0v,hzz
+% 方法:利用textcite命令进行定义
+% 基本利用textcite命令来写citet,仅利用bool{cbx:incitet}做判断,进而处理不同的上标和页码形式
+\newbool{cbx:incitet}
+\global\booltrue{cbx:incitet}
+
+\newbibmacro*{citet}{%
+ \iffieldequals{namehash}{\cbx@lasthash}%
+ {\usebibmacro{cite:comp}}%
+ {\usebibmacro{cite:dump}%
+ \ifbool{cbx:parens}%
+ {\mkbibsuperscript{\printtext{\bibclosebracket}}\global\boolfalse{cbx:parens}}%
+ {}%
+ \iffirstcitekey
+ {}
+ {\textcitedelim}%
+ \usebibmacro{cite:init}%
+ \ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}%
+ \setunit*{\printdelim{namelabeldelim}}%
+ \mkbibsuperscript{\printtext{\bibopenbracket}\global\booltrue{cbx:parens}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}%
+ {}%
+ \usebibmacro{cite:comp}%
+ \stepcounter{textcitecount}%
+ \savefield{namehash}{\cbx@lasthash}}}}
+
+\DeclareCiteCommand{\cbx@textcite}%
+ {\usebibmacro{cite:init}}%
+ {\usebibmacro{citeindex}%
+ \ifbool{cbx:incitet}{\usebibmacro{citet}}{\usebibmacro{textcite}}%
+ }%
+ {}%
+ {\ifbool{cbx:incitet}{\mkbibsuperscript{\usebibmacro{cite:dump}\usebibmacro{postnote}}}%
+ {\usebibmacro{cite:dump}\usebibmacro{postnote}}%
+ \ifbool{cbx:parens}%
+ {\ifbool{cbx:incitet}{\mkbibsuperscript{\bibclosebracket}}{\bibclosebracket}%
+ \global\boolfalse{cbx:parens}}%
+ {}}
+
+ \newrobustcmd{\cbx@citet@init}[2]{%
+ \global\booltrue{cbx:incitet}%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+ \renewrobustcmd{\cbx@textcite@init}[2]{%
+ \global\boolfalse{cbx:incitet}%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareCiteCommand{\citet}[\cbx@citet@init\cbx@textcite]
+ {\gdef\cbx@savedkeys{}%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \DeferNextCitekeyHook%
+ \usebibmacro{cite:init}}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+ \global\clearfield{multipostnote}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\stepcounter{textcitetotal}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {\protected@xappto\cbx@savedcites{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
\DeclareCiteCommand{\citep}[\mkbibsuperscript]%利用mkbibsuperbracket添加方括号
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
index 2e54a40149..a600997104 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
@@ -10,7 +10,7 @@
%
% 版本和时间信息
%
-\def\versionofgbtstyle{2020/03/20 v1.0u}
+\def\versionofgbtstyle{2020/07/21 v1.0v}
\def\versionofbiblatex{\abx@version}
\ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求
@@ -448,6 +448,7 @@
\def\str@references{参考文献}
\def\str@bytranslator{译}
\def\str@andotherscn{等}
+ \def\str@andcn{和}
\def\str@backrefpage{引用页}
\def\str@backrefpages{引用页}
\def\str@noaddress{出版地不详}
@@ -823,7 +824,7 @@
bytranslator= {\str@bytranslator\adddot}, %将trans. by 改成 译
and = {\addcomma},%将第2和3人名见的and符号改成 逗号,用\finalnamedelim命令也可以定义,参见3.9.1节
andcn = {\addcomma},%\str@andcn\ and本地化字符串的中文对应词
- andincitecn = {\addcomma},%将标注中的分开,便于与文献表中的区分
+ andincitecn = {\str@andcn},%将标注中的分开,便于与文献表中的区分
andincite = {\addcomma},
%andothers = {et al.}, %将超过3个人名的省略,et al.改成为 等
andotherscn = {\str@andotherscn},%将超过3个人名的省略,et al.改成为 等
@@ -896,7 +897,7 @@
% incollection和inproceedings基本与inbook类似,因此做inbook驱动别名处理
% 3. 专利类型有其特殊性,考虑patent类型
% 4. 电子资源类型有其特殊性,考虑online类型
-% 5. 报告类型与book有点类似,出版项处理与book一样,但有时又要有修改和更细日期
+% 5. 报告类型与book有点类似,出版项处理与book一样,但有时又要有修改和更新日期
% 因此考虑用一种类型来输出,使用report类型
% 6. 手册/学位论文等类型与book有点类似,但对于出版项处理时,有缺省时,直接省略,
% 同时有version和edition的区别,因此考虑用一种类型来输出,使用manual类型
@@ -917,7 +918,7 @@
% modifydate 用于更新或修改日期,输出到日,且用()包围,数据源为date或enddate或eventdate
\DeclareSourcemap{
-\maps[datatype=bibtex]{
+\maps[datatype=bibtex]{%
\map{%当没有作者时将editor转成author
\pernottype{inbook}%因为in系列中editor可能用来表示bookauthor,所以排除
\pernottype{inproceedings}
@@ -1042,7 +1043,7 @@
\pertype{inproceedings}
\pertype{conference}%兼容老的conference类型
\step[fieldset=usera, fieldvalue={C}]
- \step[fieldsource=institution]%有时会把publisher和institution混淆,处理后使用institution
+ \step[fieldsource=institution]%有时会把publisher和institution混淆,处理后使用publisher
\step[fieldset=publisher, origfieldval]
}
\map{
@@ -1054,7 +1055,7 @@
\map{
\pertype{incollection}
\step[fieldset=usera, fieldvalue={G}]
- \step[fieldsource=institution]%有时会把publisher和institution混淆,处理后使用institution
+ \step[fieldsource=institution]%有时会把publisher和institution混淆,处理后使用publisher
\step[fieldset=publisher, origfieldval]
}
\map{
@@ -1516,7 +1517,8 @@
\DeclareBibliographyAlias{database}{manual}
\DeclareBibliographyAlias{dataset}{manual}
\DeclareBibliographyAlias{software}{manual}
-
+\DeclareBibliographyAlias{map}{manual}
+\DeclareBibliographyAlias{archive}{manual}
%=====================================================================
% 设置排序格式
@@ -1866,8 +1868,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
%
% 原理方法:set方法可以参考3.11.5 Entry Sets,4.11.1 Entry Sets
% 这里调整一下两种语言参考文献的间隔,源来自biblatex.def
-\renewcommand*{\entrysetpunct}{\adddot\par\nobreak}
-\renewcommand*{\bibpagespunct}{\addcolon\addthinspace}%页码引用格式的修改%修改为用冒号
+\renewcommand*{\entrysetpunct}{\adddot\par\nobreak}%ay样式用par也可以,因为没有悬挂对齐问题
+\renewcommand*{\bibpagespunct}{\addcolon\addthinspace}%%页码引用格式的修改,修改为用冒号
%\renewcommand{\relateddelim}{}%\par
%=====================================================================
@@ -1941,6 +1943,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
{title}{#1}%\nopunct\unspace
\DeclareFieldFormat{url}{\url{#1}} %url域修改如本行%url相关输出,源来自biblatex.def
\def\UrlFont{\rmfamily}%设置url字体为roman字体%\ttfamily
+%\urlstyle{rm} %使用这句也一样
\setcounter{biburlnumpenalty}{100} %让url可以在数字后断行
\setcounter{biburlucpenalty}{100} %让url可以在大写字母后断行
\setcounter{biburllcpenalty}{100} %让url可以在小写字母后断行
@@ -2004,7 +2007,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
% 修改译者位置格式
%
% 原理方法:修改来自biblatex.def文件的bytranslator+others宏的格式
-\renewbibmacro*{bytranslator+others}{%
+\renewbibmacro*{bytranslator+others}{\bibauthorfont%
\ifnameundef{translator}
{}
{%\usebibmacro{bytranslator+othersstrg}
@@ -2027,7 +2030,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
%
% 原理方法:判断作者或译者是否中文,若中文用字符等,否则用et al. 。
% \printnames由start-stop控制项数,默认是1和maxnames/minnames
-\renewbibmacro*{name:andothers}{%
+\renewbibmacro*{name:andothers}{\bibauthorfont%
\ifboolexpr{
test {\ifnumequal{\value{listcount}}{\value{liststop}}}
and
@@ -2853,7 +2856,7 @@ incollection,proceedings,inproceedings]{number}{%
%
% 对edition版本信息格式做出修改
%
-\DeclareFieldFormat{edition}{%源来自biblatex.DEF
+\DeclareFieldFormat{edition}{\bibtitlefont%源来自biblatex.DEF
\testCJKfirst{userd}%
\iftoggle{ifCJKforgbt}%
{\ifinteger{#1}%
@@ -2866,7 +2869,7 @@ incollection,proceedings,inproceedings]{number}{%
%
% 对version的版本信息做出修改
%
-\DeclareFieldFormat{version}{%源来自biblatex.DEF
+\DeclareFieldFormat{version}{\bibtitlefont%源来自biblatex.DEF
\testCJKfirst{userd}%
\ifinteger{#1}%
{\iftoggle{ifCJKforgbt}{\printtext{#1\str@edition}}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
index 11fa65d16e..868af8c863 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
@@ -7,7 +7,7 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% ---------------------------------------------------------------
%%
-\def\versionofgbtstyle{2020/03/20 v1.0u}
+\def\versionofgbtstyle{2020/07/21 v1.0v}
\ProvidesFile{gb7714-2015ay.cbx}[\versionofgbtstyle biblatex citation style]
%
@@ -181,7 +181,7 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
% 20180427,v1.0k,增加,hzz
% 20190409,v1.0r,hzz
% 为与顺序编码制兼容,增加了命令,定义与citet相同
-\newbibmacro*{citet}{%
+\newbibmacro*{citeta}{%
\iffieldundef{shorthand}
{\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
{\usebibmacro{cite:label}%
@@ -213,7 +213,7 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
{\thefield{postnote}}}%
\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
- \usebibmacro{citet}}
+ \usebibmacro{citeta}}
{}
{\mkbibsuperscript{\usebibmacro{postnote}}%\usebibmacro{postnote}
}
@@ -225,18 +225,87 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
% 注意\citet和\citep命令之所以不用newrobustcmd,是为避免加载natbib模块后产生冲突
%同\authornumcite
-\DeclareCiteCommand{\citet}%
- {\usebibmacro{cite:init}%
- \renewbibmacro*{postnote}{%
- \iffieldundef{postnote}%
- {}%
- {\thefield{postnote}}}%
- \usebibmacro{prenote}}%
+%\DeclareCiteCommand{\citet}%
+% {\usebibmacro{cite:init}%
+% \renewbibmacro*{postnote}{%
+% \iffieldundef{postnote}%
+% {}%
+% {\thefield{postnote}}}%
+% \usebibmacro{prenote}}%
+% {\usebibmacro{citeindex}%
+% \usebibmacro{citet}}
+% {}
+% {%(
+% )\mkbibsuperscript{\usebibmacro{postnote}}%\usebibmacro{postnote}
+% }
+
+
+%
+% 重定义citet,因为前面与\authornumcite同定义的命令无法正确处理多个bibtexkey同时给出的压缩情况
+% 20200721,v1.0v,hzz
+% 方法:利用textcite命令进行定义
+% 基本利用textcite命令来写citet,仅利用bool{cbx:incitet}做判断,进而处理不同的页码形式
+\newbool{cbx:incitet}
+\newbibmacro*{citet:postnote}{%
+ \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+ {\setunit{}%
+ \printtext{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
+ {\setunit{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \textcitedelim}}%
+ \renewbibmacro*{postnote}{%
+ \iffieldundef{postnote}%
+ {}%
+ {\thefield{postnote}}}%
+ \mkbibsuperscript{\usebibmacro{postnote}}%
+ }
+
+\DeclareCiteCommand{\cbx@textcite}
+ {\usebibmacro{cite:init}}
{\usebibmacro{citeindex}%
- \usebibmacro{citet}}
+ \usebibmacro{textcite}}
{}
- {\mkbibsuperscript{\usebibmacro{postnote}}%\usebibmacro{postnote}
- }
+ {\ifbool{cbx:incitet}{\usebibmacro{citet:postnote}}{\usebibmacro{textcite:postnote}}}
+
+ \newrobustcmd{\cbx@citet@init}[2]{%
+ \global\booltrue{cbx:incitet}%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+ \renewrobustcmd{\cbx@textcite@init}[2]{%
+ \global\boolfalse{cbx:incitet}%
+ \setcounter{textcitetotal}{0}%
+ \setcounter{textcitecount}{0}%
+ \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareCiteCommand{\citet}[\cbx@citet@init\cbx@textcite]
+ {\gdef\cbx@savedkeys{}%
+ \citetrackerfalse%
+ \pagetrackerfalse%
+ \DeferNextCitekeyHook%
+ \usebibmacro{cite:init}}
+ {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+ {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+ \global\clearfield{multipostnote}}
+ {}%
+ \xappto\cbx@savedkeys{\thefield{entrykey},}%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {}
+ {\stepcounter{textcitetotal}%
+ \savefield{namehash}{\cbx@lasthash}}}
+ {}
+ {\protected@xappto\cbx@savedcites{%
+ [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\let\cbx@citets@init\cbx@citet@init
+\pretocmd{\cbx@citets@init}{\UseNextMultiCiteHook}{}{}
+\DeclareMultiCiteCommand{\citets}[\cbx@citets@init\cbx@textcites]{\citet}{}
%同cite
\DeclareCiteCommand{\citep}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
index 012a468c0b..3747757004 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
@@ -11,7 +11,7 @@
%
% 版本和时间信息
%
-\def\versionofgbtstyle{2020/03/20 v1.0u}
+\def\versionofgbtstyle{2020/07/21 v1.0v}
\def\versionofbiblatex{\abx@version}
\ProvidesFile{gb7714-2015ms.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
index cb2f092213..e339e22c5c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
@@ -7,7 +7,7 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% ---------------------------------------------------------------
%%
-\def\versionofgbtstyle{2020/03/20 v1.0u}
+\def\versionofgbtstyle{2020/07/21 v1.0v}
\ProvidesFile{gb7714-2015ms.cbx}[\versionofgbtstyle biblatex citation style]
%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
index 0ff11167a2..2efd24b091 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
@@ -11,7 +11,7 @@
%
% 版本和时间信息
%
-\def\versionofgbtstyle{2020/03/20 v1.0u}
+\def\versionofgbtstyle{2020/07/21 v1.0v}
\def\versionofbiblatex{\abx@version}
\ProvidesFile{gb7714-2015mx.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显式指定用biber后端,当用bibtex时会报错,但其实不会影响编译,只是采用bibtex后无法达成格式需求
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
index ab1dfcb1b9..d1d882e4df 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
@@ -7,7 +7,7 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% ---------------------------------------------------------------
%%
-\def\versionofgbtstyle{2020/03/20 v1.0u}
+\def\versionofgbtstyle{2020/07/21 v1.0v}
\ProvidesFile{gb7714-2015mx.cbx}[\versionofgbtstyle biblatex citation style]
%
diff --git a/macros/latex/contrib/chhaya/README.txt b/macros/latex/contrib/chhaya/README.txt
new file mode 100644
index 0000000000..3d6f4c4a4d
--- /dev/null
+++ b/macros/latex/contrib/chhaya/README.txt
@@ -0,0 +1,18 @@
+आज्ञासंच: chhaya
+लेखक: निरंजन
+आवृत्ती: ०.१ (जुलै, २०२०)
+माहिती: भाषावैज्ञानिक छायांगांचे संक्षेप पुरवणारा आज्ञासंच
+दुवा: https://gitlab.com/niranjanvikastambe/chhaya
+अडचणी: https://gitlab.com/niranjanvikastambe/chhaya/-/issues
+परवाना: लाटेक् प्रकल्प परवाना. आवृत्ती १.३सी किंवा त्यापुढील.
+
+अधिक माहितीकरिता chhaya.dtx ही बीजधारिका पाहा.
+--------------------------------------------------------------------------
+Package: chhaya
+Author: Niranjan
+Version: 0.1 (July, 2020)
+Description: For linguistic glossing in Marathi language.
+Repository: https://gitlab.com/niranjanvikastambe/chhaya
+Bug tracker: https://gitlab.com/niranjanvikastambe/chhaya/-/issues
+License: The LaTeX Project Public License v1.3c or later.
+--------------------------------------------------------------------------
diff --git a/macros/latex/contrib/chhaya/chhaya.dtx b/macros/latex/contrib/chhaya/chhaya.dtx
new file mode 100644
index 0000000000..ed86532f48
--- /dev/null
+++ b/macros/latex/contrib/chhaya/chhaya.dtx
@@ -0,0 +1,230 @@
+% \iffalse meta-comment
+%
+% File: chhaya.dtx
+% ---------------------------------------------------------------------------
+% आज्ञासंच: chhaya
+% लेखक: निरंजन
+% माहिती: भाषावैज्ञानिक छायांगांचे संक्षेप पुरवणारा आज्ञासंच
+% दुवा: https://gitlab.com/niranjanvikastambe/chhaya
+% अडचणी: https://gitlab.com/niranjanvikastambe/chhaya/-/issues
+% परवाना: लाटेक् प्रकल्प परवाना. आवृत्ती १.३सी किंवा त्यापुढील.
+% ---------------------------------------------------------------------------
+% हे काम लाटेक् प्रकल्प परवान्याच्या अटींचे पालन करून वितरित केले जाऊ शकते
+% तसेच सुधारले जाऊ शकते.
+%
+% ह्या परवान्याची नवीनतम आवृत्ती पुढील संकेतस्थळावरून मिळवता येऊ शकते.
+%
+% http://www.latex-project.org/lppl.txt.
+%
+% हा आज्ञासंचाची लाटेक् प्रकल्पाच्या नियमांनुसार देखरेख केली जात आहे.
+%
+% ह्या आज्ञासंचाचा लेखक व पालक निरंजन आहे.
+%
+% ह्या कामात chhaya.dtx, chhaya.ins तसेच त्यांपासून निर्माण केलेली
+% chhaya.sty ही धारिका समाविष्ट आहे.
+% ---------------------------------------------------------------------------
+%
+% \fi
+% \iffalse
+%<*internal>
+\iffalse
+%</internal>
+%<*readme>
+आज्ञासंच: chhaya
+लेखक: निरंजन
+आवृत्ती: ०.१ (जुलै, २०२०)
+माहिती: भाषावैज्ञानिक छायांगांचे संक्षेप पुरवणारा आज्ञासंच
+दुवा: https://gitlab.com/niranjanvikastambe/chhaya
+अडचणी: https://gitlab.com/niranjanvikastambe/chhaya/-/issues
+परवाना: लाटेक् प्रकल्प परवाना. आवृत्ती १.३सी किंवा त्यापुढील.
+
+अधिक माहितीकरिता chhaya.dtx ही बीजधारिका पाहा.
+--------------------------------------------------------------------------
+Package: chhaya
+Author: Niranjan
+Version: 0.1 (July, 2020)
+Description: For linguistic glossing in Marathi language.
+Repository: https://gitlab.com/niranjanvikastambe/chhaya
+Bug tracker: https://gitlab.com/niranjanvikastambe/chhaya/-/issues
+License: The LaTeX Project Public License v1.3c or later.
+--------------------------------------------------------------------------
+%</readme>
+%<*internal>
+\fi
+%</internal>
+%<*driver|package>
+\def\chhayaPackageName{chhaya}
+\def\chhayaPackageVersion{०.१}
+\def\chhayaPackageDate{जुलै, २०२०}
+\def\chhayaPackageDescription{भाषावैज्ञानिक छायांगांचे संक्षेप पुरवणारा आज्ञासंच}
+%</driver|package>
+%<*driver>
+\documentclass[10pt]{l3doc}
+\usepackage{xltxtra}
+\usepackage{marathi}
+\usepackage{xcolor}
+\usepackage{hyperref}
+\hypersetup{
+ colorlinks,
+ linkcolor={red!50!black},
+ citecolor={blue!50!black},
+ urlcolor={blue!80!black}
+}
+\usepackage{capt-of}
+\renewcommand{\tablename}{कोष्टक}
+\usepackage{standalone}
+\makeatletter
+\RequirePackage{devanagaridigits}
+\def\@arabic#1{\expandafter\devanagaridigits\expandafter{\number#1}}
+\makeatother
+\renewcommand{\theCodelineNo}{{\scriptsize\arabic{CodelineNo}}\quad}
+\setmonofont[Script=Devanagari]{Mukta}
+\newfontfamily{\mukta}[Script=Devanagari]{Mukta}
+\newfontfamily{\sho}{Shobhika}
+\usepackage{minted}
+\usemintedstyle{bw}
+\usepackage{fontawesome5}
+\renewcommand{\abstractname}{सारांश}
+\renewcommand{\contentsname}{अनुक्रमणिका}
+\usepackage[sort=use,nonumberlist]{glossaries}
+\usepackage{biblatex}
+\addbibresource{ref.bib}
+\usepackage{longtable}
+\usepackage{standalone}
+\makenoidxglossaries
+\usepackage{setspace}
+\sloppy
+\hyphenpenalty=10000
+\exhyphenpenalty=1000
+
+\RecordChanges
+\begin{document}
+\setstretch{1.5}
+\DocInput{\chhayaPackageName.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+%
+%
+% \title{छाया}
+% \author{निरंजन}
+% \date^^A
+% {^^A
+% आवृत्ती \chhayaPackageVersion\ \textemdash\ \chhayaPackageDate\\[1ex]^^A
+% {\small\faIcon{gitlab}\quad\url{https://gitlab.com/niranjanvikastambe/chhaya}}^^A
+% }
+%
+% \maketitle
+%
+% \begin{abstract}
+% भाषावैज्ञानिक लेखनात अपरिचित भाषांतील उदाहरणांची छाया देणे ही एक अनिवार्य गोष्ट आहे. त्यासाठीच्या संक्षेपांचा संग्रह ह्या आज्ञासंचात करण्यात आला आहे. इंग्रजी छायांगांचे संक्षेप \href{https://ctan.org/pkg/leipzig?lang=en}{leipzig} ह्या आज्ञासंचामार्फत पुरवले जातात. लायप्चिश् विद्यापीठाच्या नियमावलीनुसार लागणाऱ्या अनेक निकषांची पूर्तता ह्या आज्ञासंचातर्फे केली जाते. मराठी भाषावैज्ञानिक लेखनाकरिता छायांगलेखनाचे नवे नियम मुंबई विद्यापीठाच्या संकेतस्थळावर \href{https://www.mumbailinguisticcircle.com/resources/}{येथे} देण्यात आले आहेत \cite{मुंबई}. त्यांचा विचार करून हा आज्ञासंच घडवण्यात आला आहे. ह्या आज्ञासंचात काही छायांगांच्या तयार आज्ञा आहेतच, शिवाय लेखकांना गरजेनुसार नवी छायांगे निर्माण करण्यासाठी एक आज्ञादेखील आहे. \href{https://ctan.org/pkg/hyperref?lang=en}{hyperref} हा आज्ञासंच वापरत असाल, तर छाया हा आज्ञासंच त्यानंतर वापरा.
+% \end{abstract}
+% \tableofcontents
+% \clearpage\pagebreak
+% \begin{documentation}
+% \begin{function}{\छायांग}
+% \begin{syntax}
+% \cs{छायांग}\marg{संक्षिप्त रूप}\marg{विस्तृत वर्णन}
+% \end{syntax}
+% ह्या आज्ञेचा पहिला कार्यघटक छायांगाचे संक्षिप्त रूप हा आहे व दुसरा कार्यघटक त्या छायांगाचे स्पष्टीकरणात्मक वर्णन. उदा. एकवचनासाठीचे \textbf{एव} हे छायांग पुढीलप्रमाणे घडवता येते.
+%
+% \noindent\verb|\छायांग{एव}{एकवचन}|
+% \end{function}
+% \begin{function}{\छायांगसूची}
+% ही आज्ञा वापरल्यास दस्तऐवजातील सर्व छायांगांची यादी छापली जाते. आज्ञासंचातर्फे ह्या यादीचे नाव छायांगसूची असे ठेवले आहे.
+% \end{function}
+% \begin{function}{समरेखा}
+% छायालेखनाच्या नियमावलीतील तिसऱ्या नियमानुसार मजकूर पारंपरिक टंकात असेल, तर छायांगांकरिता समरेखा टंक वापरण्यात यावेत व मजकूर समरेखा टंकात असेल, तर छायांगांकरिता पारंपरिक टंक वापरावेत. पारंपरिक टंक देवनागरी लिहिताना जास्त वापरले जात असल्यामुळे ह्या आज्ञासंचाद्वारे मुक्त हा समरेखा टंक छायांगांसाठी निवडण्यात आला आहे. हा टंक तुमच्याकडे नसेल, तर \href{https://ctan.org/pkg/ektype-tanka}{एक-टाईप टंक} हा आज्ञासंच तुमच्या संगणकावर बसवून घ्या. मजकूर समरेखा टंकात लिहीत असाल, तर आज्ञासंचासह \textbf{समरेखा} हे प्राचल वापरा. त्यामुळे छायांगांकरिता शोभिका हा पारंपरिक टंक निवडला जाईल. ह्या प्राचलास किंमत देता येते. \verb|समरेखा = <टंकाचे नाव>| अशा प्रकारे हे प्राचल लिहिल्यास छायांगांचा टंक आपल्या पसंतीनुसार निवडता येतो.
+% \end{function}
+% \bigskip
+% \noindent\textbf{महत्त्वाची सूचना} - दोन छायांगांमध्ये मोकळी जागा हवी असल्यास छायांगानंतर महिरपी कंस टाकण्यात यावेत. उदा. \verb|\एव{}|.
+% \section{आज्ञासंचातील छायांगे {\small (आ ०.१)}}
+%\begin{longtable}{lll}
+% \hline
+% छायांग & वर्णन \\
+% \hline
+% पुं & पुल्लिंग\\
+% स्त्री & स्त्रीलिंग\\
+% नपुं & नपुंसकलिंग\\
+% १ & प्रथम व्यक्ती\\
+% २ & द्वितीय व्यक्ती\\
+% ३ & तृतीय व्यक्ती\\
+% एव & एकवचन\\
+% द्विव & द्विवचन\\
+% त्रिव & त्रिव\\
+% अव & अल्पवचन\\
+% बव & बहुवचन\\
+% अवि & अभिधानपर विभक्ती\\
+% कर्मवि & कर्मपर विभक्ती\\
+% सा & साधनपर विभक्ती\\
+% दावि & दानपर विभक्ती\\
+% वियो & वियोगपर विभक्ती\\
+% संयो & संबंधयोजक विभक्ती\\
+% अधि & अधिकरण विभक्ती\\
+% संबो & संबोधन विभक्ती\\
+% साह & साहचर्यदर्शक विभक्ती\\
+% कवि & कर्तृत्वपर विभक्ती\\
+% आवि & आगत विभक्ती\\
+% साक्रि & साहाय्यक क्रियापद\\
+% गणक & गणक\\
+% भूत & भूतकाळ\\
+% वर्त & वर्तमान काळ\\
+% भवि & भविष्यकाळ\\
+% पू & पूर्ण\\
+% अपू & अपूर्ण\\
+% नि & नित्य\\
+% अखं & अखंडित\\
+% क्र & क्रमिक\\
+% अक्र & अक्रमिक\\
+% \end{longtable}
+% \end{documentation}
+% \begin{implementation}
+% \section{आज्ञासंचाची घडण}
+% आज्ञासंचाकरिता आवश्यक सामग्री पुढील आज्ञांद्वारे पुरवली आहे.
+% \begin{macrocode}
+%<*package>
+\ProvidesPackage{chhaya}
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{fontspec}
+\RequirePackage[acronym]{glossaries}
+% \end{macrocode}
+% समरेखा हे प्राचल पुढील आज्ञावलीमार्फत पुरवले जाते.
+% \begin{macrocode}
+\pgfkeys{
+ chhaya/.is family,
+ chhaya/.cd,
+ समरेखा/.code={\setfontfamily\test@acronymfont[Script=Devanagari,Mapping=devanagarinumerals]{#1}},
+ समरेखा=Mukta,
+ समरेखा/.default=Shobhika,
+}
+\DeclareTextFontCommand{\textacronym}{\test@acronymfont}
+\def\chhaya@setkey#1{\pgfkeys{chhaya/.cd,#1}}
+\DeclareOption*{\expandafter\chhaya@setkey\expandafter{\CurrentOption}}
+\ProcessOptions
+% \end{macrocode}
+% नव्या छायांगांकरिता आज्ञेची निर्मिती पुढील आज्ञेने होते.
+% \begin{macrocode}
+\newcommand{\छायांग}[2]
+{
+ \newacronym{#1}{\textacronym{#1}}{#2}
+ \expandafter\newcommand\csname#1\endcsname{\acrshort{#1}}
+}
+% \end{macrocode}
+% \verb|sankshep.tex| ह्या धारिकेत काही छायांगे पुरवली आहेत. त्यांना पुढील आज्ञांमुळे वापरता येते.
+% \begin{macrocode}
+\makeglossaries
+\input{sankshep.tex}
+% \end{macrocode}
+% छायांगसूची छापण्यासाठी पुढील आज्ञा समाविष्ट केली आहे.
+% \begin{macrocode}
+\providecommand{\छायांगसूची}{
+ \printglossary[type=\acronymtype,title={छायांगसूची}]
+}
+% \end{macrocode}
+% \begin{macrocode}
+%</package>
+% \end{macrocode}
+% \end{implementation}
+% \printbibliography
+% \Finale \ No newline at end of file
diff --git a/macros/latex/contrib/chhaya/chhaya.ins b/macros/latex/contrib/chhaya/chhaya.ins
new file mode 100644
index 0000000000..a067ae9924
--- /dev/null
+++ b/macros/latex/contrib/chhaya/chhaya.ins
@@ -0,0 +1,56 @@
+% File: chhaya.ins
+\input l3docstrip.tex
+
+\keepsilent
+\askforoverwritefalse
+
+\preamble
+
+-------------------------------------------------------------------------
+आज्ञासंच: chhaya
+लेखक: निरंजन
+आवृत्ती: ०.१ (जुलै, २०२०)
+माहिती: भाषावैज्ञानिक छायांगांचे संक्षेप पुरवणारा आज्ञासंच
+दुवा: https://gitlab.com/niranjanvikastambe/chhaya
+अडचणी: https://gitlab.com/niranjanvikastambe/chhaya/-/issues
+परवाना: लाटेक् प्रकल्प परवाना. आवृत्ती १.३सी किंवा त्यापुढील.
+
+अधिक माहितीकरिता chhaya.dtx ही बीज-धारिका पाहा.
+---------------------------------------------------------------------------
+हे काम लाटेक् प्रकल्प परवान्याच्या (१.३सी अथवा त्यापुढील) अटींचे पालन करून वितरित केले जाऊ शकते
+तसेच सुधारले जाऊ शकते.
+
+ह्या परवान्याची नवीनतम प्रत खालील दुव्यावर उपलब्ध आहे.
+
+http://www.latex-project.org/lppl.txt.
+
+हा आज्ञासंचाची लाटेक् प्रकल्पाच्या नियमांनुसार देखरेख केली जात आहे.
+
+ह्या आज्ञासंचाचा लेखक व पालक निरंजन आहे.
+
+ह्या कामात chhaya.dtx, chhaya.ins तसेच त्यांपासून निर्माण केलेली
+chhaya.sty ही धारिका समाविष्ट आहे.
+--------------------------------------------------------------------------
+Package: chhaya
+Author: Niranjan
+Version: 0.1 (July, 2020)
+Description: For linguistic glossing in Marathi language.
+Repository: https://gitlab.com/niranjanvikastambe/chhaya
+Bug tracker: https://gitlab.com/niranjanvikastambe/chhaya/-/issues
+License: The LaTeX Project Public License v1.3c or later.
+---------------------------------------------------------------------------
+
+\endpreamble
+
+\usedir{tex/latex/\jobname}
+\generate{
+ \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+
+\nopreamble\nopostamble
+\usedir{doc/latex/\jobname}
+\generate{
+ \file{README.txt}{\from{\jobname.dtx}{readme}}
+}
+
+\endbatchfile \ No newline at end of file
diff --git a/macros/latex/contrib/chhaya/chhaya.pdf b/macros/latex/contrib/chhaya/chhaya.pdf
new file mode 100644
index 0000000000..a3a7a1dceb
--- /dev/null
+++ b/macros/latex/contrib/chhaya/chhaya.pdf
Binary files differ
diff --git a/macros/latex/contrib/chhaya/ref.bib b/macros/latex/contrib/chhaya/ref.bib
new file mode 100644
index 0000000000..8212e7abe7
--- /dev/null
+++ b/macros/latex/contrib/chhaya/ref.bib
@@ -0,0 +1,5 @@
+@Misc{मुंबई,
+ title={\href{https://www.mumbailinguisticcircle.com/resources/}{छायालेखनाची नियमावली}},
+ author={मुंबई विद्यापीठ},
+ year={२०२०},
+} \ No newline at end of file
diff --git a/macros/latex/contrib/chhaya/sankshep.tex b/macros/latex/contrib/chhaya/sankshep.tex
new file mode 100644
index 0000000000..ca75616e5f
--- /dev/null
+++ b/macros/latex/contrib/chhaya/sankshep.tex
@@ -0,0 +1,33 @@
+\छायांग{पुं}{पुल्लिंग} % Masculine
+\छायांग{स्त्री}{स्त्रीलिंग} % Feminine
+\छायांग{नपुं}{नपुंसकलिंग} % Neuter
+\छायांग{१}{प्रथम व्यक्ती} % First person
+\छायांग{२}{द्वितीय व्यक्ती} % Second person
+\छायांग{३}{तृतीय व्यक्ती} % Third person
+\छायांग{एव}{एकवचन} % Singular
+\छायांग{द्विव}{द्विवचन} % Dual
+\छायांग{त्रिव}{त्रिव} % Trial
+\छायांग{अव}{अल्पवचन} % Paucal
+\छायांग{बव}{बहुवचन} % Plural
+\छायांग{उवि}{उद्देश्य विभक्ती} % Nominative
+\छायांग{निवि}{निर्देशक विभक्ती} % Accusative
+\छायांग{सा}{साधक विभक्ती} % Instrumental
+\छायांग{दावि}{दानपर विभक्ती} % Dative
+\छायांग{वियो}{वियोजक विभक्ती} % Ablative
+\छायांग{संयो}{संबंधयोजक विभक्ती} % Genitive
+\छायांग{अधि}{अधिकरण विभक्ती} % Locative
+\छायांग{संबो}{संबोधन विभक्ती} % Vocative
+\छायांग{साह}{साहचर्यदर्शक विभक्ती} % Associative
+\छायांग{कवि}{कर्तृत्वपर विभक्ती} % Ergative
+\छायांग{आवि}{आगत विभक्ती} % Oblique
+\छायांग{साक्रि}{साहाय्यक क्रियापद} % Auxiliary
+\छायांग{गणक}{गणक} % Counter
+\छायांग{भूत}{भूतकाळ} % Past
+\छायांग{वर्त}{वर्तमान काळ} % Present
+\छायांग{भवि}{भविष्यकाळ} % Future
+\छायांग{पू}{पूर्ण} % Perfective
+\छायांग{अपू}{अपूर्ण} % Imperfective
+\छायांग{नि}{नित्य} % Habitual
+\छायांग{अखं}{अखंडित} % Continuous
+\छायांग{क्र}{क्रमिक} % Progressive
+\छायांग{अक्र}{अक्रमिक} % Non-progressive \ No newline at end of file
diff --git a/macros/latex/contrib/elteikthesis/README.md b/macros/latex/contrib/elteikthesis/README.md
index 4e4158b89f..fc0e06a1c4 100644
--- a/macros/latex/contrib/elteikthesis/README.md
+++ b/macros/latex/contrib/elteikthesis/README.md
@@ -1,6 +1,6 @@
# ELTE FI bachelor and master thesis template
-The [thesis.tex](thesis.tex) and the produced [thesis.pdf](thesis.pdf) serves as an example of usage.
+The [elteikthesis.tex](elteikthesis.tex) and the produced [elteikthesis.pdf](elteikthesis.pdf) serves as an example of usage.
This class template enforces the required formatting rules for bachelor and master theses and generates the cover page given on the provided metadata. The chapters of the example document follows the typical structure of a BSc thesis.
The formatting rules are defined to meet the requirements for theses submitted at the Eötvös Loránd University, Faculty of Informatics (Budapest, Hungary). However with sufficient modifications the template should be usable at other universities, too.
@@ -10,15 +10,17 @@ The template supports producing both Hungarian and English theses, which can be
## Compilation
```bash
-# Generate thesis.aux file (PDF file contains incorrect references yet)
-pdflatex thesis.tex
+# Generate elteikthesis.aux file
+# (PDF file contains incorrect references yet)
+pdflatex elteikthesis.tex
# Generate bibliography
-bibtex thesis
+bibtex elteikthesis
# Generate nomenclature (optional)
-makeindex -s nomencl.ist -t thesis.nlg -o thesis.nls thesis.nlo
+makeindex -s nomencl.ist -t elteikthesis.nlg -o elteikthesis.nls \
+ elteikthesis.nlo
# Generate final PDF file
-pdflatex thesis.tex
-pdflatex thesis.tex
+pdflatex elteikthesis.tex
+pdflatex elteikthesis.tex
```
**Note:** in case the bibliography changes, executing `bibtex`, then `pdflatex` _twice_ is required to generate to correct references in the PDF output.
@@ -40,7 +42,6 @@ Compilation might be carried out through a preferred IDE (e.g. [TexStudio](https
* Vertical positioning of cells: [array](https://ctan.org/pkg/array)
* Multiline cells (line breaks): [makecell](https://ctan.org/pkg/makecell)
-\pagebreak
**Lists:**
* Lists with narrow spacing: [paralist](https://ctan.org/pkg/paralist)
diff --git a/macros/latex/contrib/elteikthesis/README.pdf b/macros/latex/contrib/elteikthesis/README.pdf
index d4324f8bd6..4392582e6e 100644
--- a/macros/latex/contrib/elteikthesis/README.pdf
+++ b/macros/latex/contrib/elteikthesis/README.pdf
Binary files differ
diff --git a/macros/latex/contrib/elteikthesis/README_hu.md b/macros/latex/contrib/elteikthesis/README_hu.md
index 66ceb24830..3e39384717 100644
--- a/macros/latex/contrib/elteikthesis/README_hu.md
+++ b/macros/latex/contrib/elteikthesis/README_hu.md
@@ -1,6 +1,6 @@
# ELTE IK szakdolgozat és diplomamunka sablon
-A [thesis.tex](thesis.tex) és a belőle előálló [thesis.pdf](thesis.pdf) szolgál kiindulási példaként.
+A [elteikthesis.tex](elteikthesis.tex) és a belőle előálló [elteikthesis.pdf](elteikthesis.pdf) szolgál kiindulási példaként.
A sablon alkalmazza a szakdolgozatra / diplomamunkára vonatkozó formai előírásokat, valamint elkészíti a megadott metaadatok alapján a címlapot. A példa dokumentum tartalmi fejezetei a BSc szakdolgozat tipikus felépítését tükrözik.
A formai megkötések az ELTE Informatikai Kar szabályzatában rögzítetteknek felelnek meg, de általánosan (a megfelelő módosításokkal) alkalmazható más egyetemek dolgozataihoz is.
@@ -10,15 +10,17 @@ A sablon magyar és angol nyelvű dokumentumok elkészítését is támogatja (l
## Fordítás
```bash
-# thesis.aux fájl generálása (PDF fájl még hibás hivatkozásokat fog tartalmazni)
-pdflatex thesis.tex
+# elteikthesis.aux fájl generálása
+# (PDF fájl még hibás hivatkozásokat fog tartalmazni)
+pdflatex elteikthesis.tex
# Irodalomjegyzék generálása
-bibtex thesis
+bibtex elteikthesis
# Jelölésjegyzék generálása (ha szükséges)
-makeindex -s nomencl.ist -t thesis.nlg -o thesis.nls thesis.nlo
+makeindex -s nomencl.ist -t elteikthesis.nlg -o elteikthesis.nls \
+ elteikthesis.nlo
# Végleges PDF fájl generálása
-pdflatex thesis.tex
-pdflatex thesis.tex
+pdflatex elteikthesis.tex
+pdflatex elteikthesis.tex
```
**Megjegyzés:** az irodalomjegyzék változása esetén a `bibtex`, majd a `pdflatex` _kétszeri_ futtatása szükséges a helyes hivatkozások előállításához.
diff --git a/macros/latex/contrib/elteikthesis/README_hu.pdf b/macros/latex/contrib/elteikthesis/README_hu.pdf
index f4d1e795c6..d1f7c5f38e 100644
--- a/macros/latex/contrib/elteikthesis/README_hu.pdf
+++ b/macros/latex/contrib/elteikthesis/README_hu.pdf
Binary files differ
diff --git a/macros/latex/contrib/elteikthesis/thesis.bib b/macros/latex/contrib/elteikthesis/elteikthesis.bib
index 1e0ae403e3..1e0ae403e3 100644
--- a/macros/latex/contrib/elteikthesis/thesis.bib
+++ b/macros/latex/contrib/elteikthesis/elteikthesis.bib
diff --git a/macros/latex/contrib/elteikthesis/elteikthesis.cls b/macros/latex/contrib/elteikthesis/elteikthesis.cls
index bd2c634837..347404ee8f 100644
--- a/macros/latex/contrib/elteikthesis/elteikthesis.cls
+++ b/macros/latex/contrib/elteikthesis/elteikthesis.cls
@@ -1,6 +1,6 @@
%% MIT License
%%
-%% Version 2.0, 2020/02/26
+%% Version 2.1, 2020/05/15
%% Copyright (c) 2013-2020 Máté Cserép <mcserep@inf.elte.hu>, Bálint Bognár
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -29,7 +29,7 @@
%% to the original package.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elteikthesis}[2020/02/26 ELTE FI bachelor and master thesis template]
+\ProvidesClass{elteikthesis}[2020/05/15 ELTE FI bachelor and master thesis template]
% LaTeX programozói eszközök
\RequirePackage{etoolbox}
@@ -59,6 +59,14 @@
% ------------------------------
% ------------------------------
+% Karakterkódolás, nyelv
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
+\RequirePackage[english,magyar]{babel}
+\RequirePackage{indentfirst}
+% ------------------------------
+
+% ------------------------------
% Metaadatok
\DeclareDocumentCommand{\author}{m}{\newcommand{\authorname}{#1}\renewcommand{\@author}{#1}}
\NewDocumentCommand{\degree}{m}{\newcommand{\degreename}{#1}}
@@ -187,14 +195,6 @@
% ------------------------------
% ------------------------------
-% Karakterkódolás, nyelv
-\RequirePackage[utf8]{inputenc}
-\RequirePackage[T1]{fontenc}
-\RequirePackage[english,magyar]{babel}
-\RequirePackage{indentfirst}
-% ------------------------------
-
-% ------------------------------
% Grafika
\RequirePackage{graphicx}
\RequirePackage{float}
diff --git a/macros/latex/contrib/elteikthesis/thesis.pdf b/macros/latex/contrib/elteikthesis/elteikthesis.pdf
index e32c01d10a..58ec02b7cf 100644
--- a/macros/latex/contrib/elteikthesis/thesis.pdf
+++ b/macros/latex/contrib/elteikthesis/elteikthesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/elteikthesis/thesis.tex b/macros/latex/contrib/elteikthesis/elteikthesis.tex
index 13d5af8c64..162ce58e7c 100644
--- a/macros/latex/contrib/elteikthesis/thesis.tex
+++ b/macros/latex/contrib/elteikthesis/elteikthesis.tex
@@ -4,7 +4,7 @@
%nohyp, % Szavak sorvégi elválasztásának tiltása / No hyphenation of words
%twoside, % Kétoldalas nyomtatás / Double sided format
%final, % Teendők elrejtése / Set final to hide todos
-]{elteikthesis}[2019/06/10]
+]{elteikthesis}[2020/05/15]
% Dolgozat metaadatai
% Document's metadata
@@ -33,7 +33,7 @@
% Irodalomjegyzék hozzáadása
% Add bibliography file
-\addbibresource{thesis.bib}
+\addbibresource{elteikthesis.bib}
% A dolgozat
% The document