new interface #434

xueruini · 2019-09-23T06:41:56Z

No description provided.

zepinglee · 2019-09-23T06:42:37Z

先不要 merge，还需要改

thusetup.tex

main.tex

thuthesis.dtx

thusetup.tex

xueruini · 2019-09-23T07:05:48Z

先不要 merge，还需要改

恩，这样好 comment，不会合并

zepinglee · 2019-09-23T13:27:51Z

我之前为了方便比对，把你原来的 commits squash 到前面的 commits 了，所以你需要

git checkout interface;
git reset --hard origin/interface;
git checkout dev;
git reset --hard origin/dev;

之后 merge 到 master 前也还需要再 rebase 一下

xueruini · 2019-09-23T13:30:44Z

我下午看到 dev 被强推了。我倒是觉得尽量本地 rebase，一旦推上来还是保持原样，哪怕乱一点都关系不大。所以我就合并了一下

你刚才强推的这个其实也不必，pull --rebase 不会有太多冲突，有也比较简单

实际上我在 dev 上提过一个小修改，清理了一个遗漏的 \changes

zepinglee · 2019-09-23T13:40:21Z

这几个改动比较大，我需要仔细比对一下 tlg 文件的变化，最好保持整齐，所以一直在反复修改 “add unit test” 和 “new \thusetup interface” 这两个 commits；

那我们约定一下，

master 分支禁止强推；
dev branch 只在 merge 到 master 前由你来 rebase 整理 commits；
topic branches 随意搞；

这个怎么样？

xueruini · 2019-09-23T13:54:49Z

master 分支禁止强推；

没问题

dev branch 只在 merge 到 master 前由你来 rebase 整理 commits；

我对 history 的整洁度没那么在意，只要最后 PR OK 了，直接 merge 就行

topic branches 随意搞；

实际上我倾向于一旦推上来了，就尽量避免 force push，虽然目前同一个 feature 分支协作的概率不大。

Cleanup unused macros.

zepinglee · 2019-09-29T12:38:13Z

现在基本差不多了，只剩下本科英文模板，感觉工程量比较大，之后再去搞。

@xueruini 你可以 make pdf然后跟官方模板比对一下。

xueruini

tlmgr update 到最新，newtx 冲突

(/usr/local/texlive/2019/texmf-dist/tex/latex/newpx/newpxmath.sty
`newpxmath' v1.401, 2019/10/02 Math macros based on pxfonts (msharpe)
(/usr/local/texlive/2019/texmf-dist/tex/latex/amsmath/amsmath.sty
For additional information on amsmath, use the `?' option.
(/usr/local/texlive/2019/texmf-dist/tex/latex/amsmath/amstext.sty
(/usr/local/texlive/2019/texmf-dist/tex/latex/amsmath/amsgen.sty))
(/usr/local/texlive/2019/texmf-dist/tex/latex/amsmath/amsbsy.sty)
(/usr/local/texlive/2019/texmf-dist/tex/latex/amsmath/amsopn.sty))
(/usr/local/texlive/2019/texmf-dist/tex/generic/kastrup/binhex.tex)
(/usr/local/texlive/2019/texmf-dist/tex/latex/oberdiek/centernot.sty)

/usr/local/texlive/2019/texmf-dist/tex/latex/newpx/newpxmath.sty:494: LaTeX Err
or: Command `\lvert' already defined.

See the LaTeX manual or LaTeX Companion for explanation.
Type  H <return>  for immediate help.
 ...

l.494 ...thopen}  {symbols}{106}{largesymbols}{12}

No pages of output.
Transcript written on thuthesis.log.
=== TeX engine is 'XeTeX'
Latexmk: Log file says no output from latex
Latexmk: For rule 'xelatex', no output was made
Latexmk: Errors, so I did not complete making targets
Collected error summary (may duplicate other messages):
  xelatex: Command for 'xelatex' gave return code 1
      Refer to 'thuthesis.log' for details
Latexmk: Use the -f option to force complete processing,
 unless error was exceeding maximum runs, or warnings treated as errors.
make: *** [thuthesis.pdf] Error 12

跟 ctex 加载顺序调整一下就 OK 了。应该是 ctex 加载的某个包更新后定义了。这种最烦人了

zepinglee · 2019-10-08T10:04:32Z

tlmgr update 到最新，newtx 冲突

跟 ctex 加载顺序调整一下就 OK 了。应该是 ctex 加载的某个包更新后定义了。这种最烦人了

把 \RequirePackage{newpxtext} \RequirePackage{newpxmath} 放到 \RequirePackage[UTF8,scheme=chinese]{ctex} 前面，西文字体就变成 latin modern 了

zepinglee · 2019-10-08T10:12:18Z

建议放弃 newtx/newpx，感觉这套 nfss 要跟 fonspec 兼容有太多坑了

xueruini · 2019-10-08T10:41:19Z

看起来是 amsmath 的更新所致

/usr/local/texlive/2019/texmf-dist/tex/latex/newpx/newpxmath.sty:\DeclareMathDelimiter{\lvert} {\mathopen}  {symbols}{106}{largesymbols}{12}
/usr/local/texlive/2019/texmf-dist/tex/latex/newpx/newpxmath.sty:\re@DeclareMathSymbol{\lvertneqq}{\mathrel}{AMSm}{0}
/usr/local/texlive/2019/texmf-dist/tex/latex/amsmath/amsmath.sty:  \xdef\lvert{\delimiter\number\@tempcnta\space }
/usr/local/texlive/2019/texmf-dist/tex/latex/amsmath/amsmath.sty:  \ifx\@@undefined\lvert
/usr/local/texlive/2019/texmf-dist/tex/latex/amsmath/amsmath.sty:    \DeclareMathDelimiter{\lvert}
/usr/local/texlive/2019/texmf-dist/tex/latex/amsmath/amsmath.sty:\newenvironment{vmatrix}{\left\lvert\env@matrix}{\endmatrix\right\rvert}

去掉吧，没啥必须要留的原因

zepinglee · 2019-10-08T11:05:02Z

去掉吧，没啥必须要留的原因

我记得以前模板转到 unicode-math 时保留了文档的 newpx 是因为它的等宽体比较好看，所以换成 Palatino + Helvetica + Menlo 怎么样？

thuthesis.dtx

xueruini · 2019-10-12T13:49:27Z

我记得以前模板转到 unicode-math 时保留了文档的 newpx 是因为它的等宽体比较好看，所以换成 Palatino + Helvetica + Menlo 怎么样？

newpx 是文档里的配置，其实无所谓。按照这里分析 ElegantLaTeX/ElegantBook#59 (comment) newpx 估计很快就要改过来

xueruini · 2019-12-28T07:54:59Z

日期和正文感觉挤在一起了

zepinglee · 2019-12-28T08:00:01Z

Word 示例里就这么点空间啊

…

On Dec 28, 2019, at 3:54 PM, Ruini Xue ***@***.***> wrote: 日期和正文感觉挤在一起了 <https://user-images.githubusercontent.com/1863/71540807-5b2b2000-298a-11ea-8964-079b5c201307.png> — You are receiving this because you commented. Reply to this email directly, view it on GitHub <https://github.com/xueruini/thuthesis/pull/434?email_source=notifications&email_token=AC5YWBXZS4XA2PPZHTMVWFLQ24A5HA5CNFSM4IZG54O2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEHYEYYQ#issuecomment-569396322>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AC5YWBWFXKPAAGFWR6IHDMLQ24A5HANCNFSM4IZG54OQ>.

xueruini · 2019-12-28T08:15:50Z

Word 示例里就这么点空间啊

ok，不记得了

xueruini · 2019-12-29T02:15:39Z

Word 示例里就这么点空间啊

这是修改前后的效果比对，感觉 geometry 变化不小

zepinglee · 2019-12-29T02:23:50Z

刚发现用邮件回复的图片显示不出来……

Word 示例里确实就这么点空间：

xueruini · 2019-12-29T02:26:10Z

刚才发现专业名字的样式变了，新的里面多了一行 in？

zepinglee · 2019-12-29T02:27:54Z

目前最新的这套 Word 示例是 2016 年改的

…

On Dec 29, 2019, at 10:26 AM, Ruini Xue ***@***.***> wrote: 刚才发现专业名字的样式变了，新的里面多了一行 in？ — You are receiving this because you commented. Reply to this email directly, view it on GitHub <https://github.com/xueruini/thuthesis/pull/434?email_source=notifications&email_token=AC5YWBWWWSPZTBCE4XA2GSTQ3ADEHA5CNFSM4IZG54O2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEHYWHKQ#issuecomment-569467818>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AC5YWBW2EI3IG3DTH3RU243Q3ADEHANCNFSM4IZG54OQ>.

zepinglee · 2019-12-29T02:31:17Z

你可以 make savepdf，然后把 testfiles/01-cover/*.pdf 跟学校的 word 模板去比对

zepinglee · 2019-12-29T02:33:12Z

我印象中，博士/硕士/学术型/专业型的 layout 有细微区别

zepinglee · 2019-12-29T09:15:45Z

两个问题：

237b44b 的本意是允许在导言区中设置 \thusetup{degree=xxx}，但是这样大大增加了代码的复杂度，而且容易造成 bug，建议回滚这个 commit；
本科生英语专业要求的“致谢”是“ACKNOWLEDGEMENTS”，我觉得不妨整个模板统一使用英式拼法。

thuthesis.dtx

xueruini

👍

The WORD version does not provide proper typesetting for joint supervisors. Let's just remove this and fix later if there is official instructions.

This reverts commit 237b44b.

thuthesis.dtx

xueruini commented Sep 23, 2019

View reviewed changes

thusetup.tex Outdated Show resolved Hide resolved

thusetup.tex Show resolved Hide resolved

main.tex Show resolved Hide resolved

thuthesis.dtx Show resolved Hide resolved

thuthesis.dtx Show resolved Hide resolved

thusetup.tex Outdated Show resolved Hide resolved

xueruini changed the title ~~Interface~~ [WIP] new interface Sep 23, 2019

zepinglee force-pushed the interface branch from 1c3bcfb to 28e40c3 Compare September 23, 2019 13:28

zepinglee force-pushed the dev branch from 4b37ccc to 4caaa1b Compare September 23, 2019 13:30

zepinglee added 3 commits September 26, 2019 20:14

add unit test

9e14596

new \thusetup interface

580b676

Cleanup unused macros.

reorganize title page commands

9e119e4

zepinglee force-pushed the interface branch from 1de4c11 to 0dee817 Compare September 27, 2019 14:22

refactor title page

aeeef04

zepinglee force-pushed the interface branch from 0dee817 to aeeef04 Compare September 29, 2019 06:17

omit entry type marks for non-online bib

e0928c1

zepinglee force-pushed the interface branch from 37af0db to e0928c1 Compare September 30, 2019 12:12

xueruini commented Oct 8, 2019

View reviewed changes

EthanDeng mentioned this pull request Oct 10, 2019

带cn参数后出现`\lvert' already defined等错误 ElegantLaTeX/ElegantBook#59

Closed

xueruini commented Oct 11, 2019

View reviewed changes

thuthesis.dtx Outdated Show resolved Hide resolved

xueruini commented Oct 11, 2019

View reviewed changes

thuthesis.dtx Show resolved Hide resolved

stone-zeng mentioned this pull request Oct 15, 2019

newtx 宏包 version 1.60 更新后与 ctex 冲突 CTeX-org/ctex-kit#454

Closed

3 tasks

format doc indent

15654b4

Polish the doc a bit.

2e5221d

Polish doc.

dff2f45

Add copyright page tests

db15b9f

zepinglee force-pushed the interface branch from e007b69 to db15b9f Compare December 28, 2019 16:31

Simplify code

a575673

xueruini commented Jan 2, 2020

View reviewed changes

thuthesis.dtx Show resolved Hide resolved

Fix \Matrix typo in math commands

c6e58ec

xueruini commented Jan 3, 2020

View reviewed changes

xueruini and others added 5 commits January 3, 2020 09:52

Remove not necessary example.

2e8cbb0

The WORD version does not provide proper typesetting for joint supervisors. Let's just remove this and fix later if there is official instructions.

Upgrade node packages.

b863e15

Revert "Allow degree setup in preamble"

ddfd163

This reverts commit 237b44b.

Rename to acknowledgements

e97bef2

Fix typo.

86dd693

zepinglee reviewed Jan 3, 2020

View reviewed changes

thuthesis.dtx Show resolved Hide resolved

xueruini mentioned this pull request Jan 3, 2020

至此主要的代码工作已经完成了，后续还需要： #448

Closed

xueruini changed the title ~~[WIP] new interface~~ new interface Jan 3, 2020

xueruini merged commit c657ae0 into dev Jan 4, 2020

xueruini deleted the interface branch January 4, 2020 08:57

xueruini mentioned this pull request Apr 27, 2020

本科生模板，日期与上方内容距离太近怎么办？ #522

Closed

AlexaraWu mentioned this pull request May 20, 2020

[feature] New interface sjtug/SJTUThesis#512

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

new interface #434

new interface #434

xueruini commented Sep 23, 2019

zepinglee commented Sep 23, 2019

xueruini commented Sep 23, 2019

zepinglee commented Sep 23, 2019

xueruini commented Sep 23, 2019 •

edited

Loading

zepinglee commented Sep 23, 2019

xueruini commented Sep 23, 2019

zepinglee commented Sep 29, 2019

xueruini left a comment •

edited

Loading

zepinglee commented Oct 8, 2019

zepinglee commented Oct 8, 2019

xueruini commented Oct 8, 2019

zepinglee commented Oct 8, 2019

xueruini commented Oct 12, 2019

xueruini commented Dec 28, 2019

zepinglee commented Dec 28, 2019 via email

xueruini commented Dec 28, 2019

xueruini commented Dec 29, 2019

zepinglee commented Dec 29, 2019

xueruini commented Dec 29, 2019

zepinglee commented Dec 29, 2019 via email

zepinglee commented Dec 29, 2019

zepinglee commented Dec 29, 2019

zepinglee commented Dec 29, 2019

xueruini left a comment

new interface #434

new interface #434

Conversation

xueruini commented Sep 23, 2019

zepinglee commented Sep 23, 2019

xueruini commented Sep 23, 2019

zepinglee commented Sep 23, 2019

xueruini commented Sep 23, 2019 • edited Loading

zepinglee commented Sep 23, 2019

xueruini commented Sep 23, 2019

zepinglee commented Sep 29, 2019

xueruini left a comment • edited Loading

Choose a reason for hiding this comment

zepinglee commented Oct 8, 2019

zepinglee commented Oct 8, 2019

xueruini commented Oct 8, 2019

zepinglee commented Oct 8, 2019

xueruini commented Oct 12, 2019

xueruini commented Dec 28, 2019

zepinglee commented Dec 28, 2019 via email

xueruini commented Dec 28, 2019

xueruini commented Dec 29, 2019

zepinglee commented Dec 29, 2019

xueruini commented Dec 29, 2019

zepinglee commented Dec 29, 2019 via email

zepinglee commented Dec 29, 2019

zepinglee commented Dec 29, 2019

zepinglee commented Dec 29, 2019

xueruini left a comment

Choose a reason for hiding this comment

xueruini commented Sep 23, 2019 •

edited

Loading

xueruini left a comment •

edited

Loading