njurepo (20mar19)

git-svn-id: svn://tug.org/texlive/trunk@50492 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 41 insertions, 36 deletions

diff --git a/Master/texmf-dist/tex/latex/njurepo/njurepo.cls b/Master/texmf-dist/tex/latex/njurepo/njurepo.cls
index cdf1614e074..b1c3bdf3467 100644
--- a/Master/texmf-dist/tex/latex/njurepo/njurepo.cls
+++ b/Master/texmf-dist/tex/latex/njurepo/njurepo.cls
@@ -19,12 +19,13 @@
 %% version 2005/12/01 or later.
 %% 
 
+  % \input{parts/examples/appendix01}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{njurepo}[2019/01/25 1.0.0 Nanjing University Report Template]
 \hyphenation{NJU-repo}
 \def\njurepo{\textsc{NJU}\-\textsc{repo}}
 \def\thuthesis{\textsc{Thu}\-\textsc{Thesis}}
-\def\version{1.0.1}
+\def\version{1.1.2}
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
     family=nju,
@@ -36,7 +37,6 @@
 \DeclareBoolOption{wide}
 \DeclareBoolOption{color}
 \DeclareBoolOption{draft}
-\DeclareBoolOption{awesomefont}
 \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{ctexbook}}
 
 \ProcessKeyvalOptions*
@@ -58,19 +58,18 @@
 \RequirePackage{ifxetex}
 \RequirePackage{xparse}
 \RequirePackage{graphicx}
-\graphicspath{{figs/}}
-\graphicspath{{figs/logo/}}
+\graphicspath{{resources/}}
+\graphicspath{{resources/logo/}}
 \RequirePackage[labelformat=simple]{subcaption}
 \RequirePackage{pdfpages}
 \includepdfset{fitpaper=true}
-\RequirePackage{tikz,tikzducks}
+\RequirePackage{tikz}
 \usetikzlibrary{decorations.pathmorphing,graphs,calc}
 \RequirePackage{dirtree}
 \RequirePackage{array}
 \RequirePackage{longtable}
 \RequirePackage{booktabs}
 \RequirePackage{multirow}
-\RequirePackage{bbding,stmaryrd}
 \RequirePackage{tabularx}
 \RequirePackage{diagbox}
 \RequirePackage{makecell}
@@ -79,6 +78,7 @@
 \RequirePackage{amsmath}
 \RequirePackage[amsmath, thmmarks, hyperref]{ntheorem}
 \RequirePackage{physics}
+\RequirePackage{bbding,stmaryrd}
 \RequirePackage[sort&compress]{natbib}
 \RequirePackage{hyperref}
 \ifxetex
@@ -340,10 +340,10 @@
 \theoremheaderfont{\normalfont\heiti}
 \theoremsymbol{\ensuremath{\square}}
 \newtheorem*{proof}{证明}
-\theoremstyle{plain}
 \theoremsymbol{}
 \theoremseparator{：}
 \ifnju@chinese
+  \theoremstyle{plain}
   \newcommand\nju@assumption@name{假设}
   \newcommand\nju@definition@name{定义}
   \newcommand\nju@proposition@name{命题}
@@ -354,10 +354,12 @@
   \newcommand\nju@exercise@name{练习}
   \newcommand\nju@example@name{例}
   \newcommand\nju@remark@name{注释}
-  \newcommand\nju@problem@name{问题}
   \newcommand\nju@conjecture@name{猜想}
+  \theoremstyle{break}
+  \newcommand\nju@problem@name{问题}
   \newcommand\nju@solution@name{解}
 \else
+  \theoremstyle{plain}
   \newcommand\nju@assumption@name{Assumption}
   \newcommand\nju@definition@name{Definition}
   \newcommand\nju@proposition@name{Proposition}
@@ -368,48 +370,45 @@
   \newcommand\nju@exercise@name{Exercise}
   \newcommand\nju@example@name{Example}
   \newcommand\nju@remark@name{Remark}
-  \newcommand\nju@problem@name{Problem}
   \newcommand\nju@conjecture@name{Conjecture}
+  \theoremstyle{break}
+  \newcommand\nju@problem@name{Problem}
   \newcommand\nju@solution@name{Solution}
 \fi
 \theoremheaderfont{\bfseries}
-\newtheorem{assumption}{\nju@assumption@name}[chapter]
-\newtheorem{definition}{\nju@definition@name}[chapter]
-\newtheorem{proposition}{\nju@proposition@name}[chapter]
-\newtheorem{lemma}{\nju@lemma@name}[chapter]
-\newtheorem{theorem}{\nju@theorem@name}[chapter]
-\newtheorem{axiom}{\nju@axiom@name}[chapter]
-\newtheorem{corollary}{\nju@corollary@name}[chapter]
-\newtheorem{exercise}{\nju@exercise@name}[chapter]
-\newtheorem{example}{\nju@example@name}[chapter]
-\newtheorem{remark}{\nju@remark@name}[chapter]
-\newtheorem{problem}{\nju@problem@name}[chapter]
-\newtheorem{conjecture}{\nju@conjecture@name}[chapter]
-\newtheorem{solution}{\nju@solution@name}[chapter]
+\newtheorem{assumption}{\nju@assumption@name}[section]
+\newtheorem{definition}{\nju@definition@name}[section]
+\newtheorem{proposition}{\nju@proposition@name}[section]
+\newtheorem{lemma}{\nju@lemma@name}[section]
+\newtheorem{theorem}{\nju@theorem@name}[section]
+\newtheorem{axiom}{\nju@axiom@name}[section]
+\newtheorem{corollary}{\nju@corollary@name}[section]
+\newtheorem{exercise}{\nju@exercise@name}[section]
+\newtheorem{example}{\nju@example@name}[section]
+\newtheorem{remark}{\nju@remark@name}[section]
+\newtheorem{problem}{\nju@problem@name}[section]
+\newtheorem{conjecture}{\nju@conjecture@name}[section]
+\newtheorem{solution}{\nju@solution@name}[section]
 
 \ifnju@chinese
 \newcommand{\promisewords}{请独立完成作业，不得抄袭。\\若参考了其它资料，请给出引用。\\鼓励讨论，但需独立书写解题过程。}
 \else
 \newcommand{\promisewords}{I promise this work is done on my own with no plagiarism.}
 \fi
-\newcommand{\pshw}{\section*{\scshape Part I\ \ \ Homework}}
-\newcommand{\pscr}{\section*{\scshape Part II\ \ \ Correction}}
-\newcommand{\psfb}{\section*{\scshape Part III\ \ \ Feedback}}
 \newcommand{\Hrule}{\noindent\rule{\linewidth}{0.5mm}}
 
-\ifnju@awesomefont
-\RequirePackage{awesomefont}
-\fi
-
 \theorempostwork{\vspace{-0.5cm}\Hrule}
-\newtheorem*{pssolution}{\ifnju@awesomefont\faPencilSquareO\ \fi\nju@solution@name}
+\newtheorem*{csolution}{\PencilRightDown\nju@solution@name}
+\newtheorem*{nsolution}{\PencilRightDown\nju@solution@name}
 \RequirePackage[listings]{tcolorbox}
 \newtcolorbox{ps@problem}[1]{fonttitle=\bfseries,title=#1,before skip=0.5cm, after skip=-0.5cm}
-\newenvironment{psproblem}[1][]{
-    \begin{ps@problem}{\ifnju@awesomefont\faQuestionCircle\ \fi\nju@problem@name\ #1}
+\newenvironment{cproblem}[1][]{
+    \begin{ps@problem}{\Checkmark\ \nju@problem@name\ #1}
 }{
     \end{ps@problem}
 }
+\theoremstyle{plain}
+\newtheorem*{nproblem}{\Checkmark\nju@problem@name}[section]
 \setlength{\floatsep}{20bp \@plus4pt \@minus1pt}
 \setlength{\intextsep}{20bp \@plus4pt \@minus2pt}
 \setlength{\textfloatsep}{20bp \@plus4pt \@minus2pt}
@@ -711,7 +710,8 @@
     \parbox[b][2.4cm][t]{\textwidth}{%
       \rule{1cm}{0cm}}
       \vskip0.65cm
-      \par\vskip2cm
+      {\includegraphics[width=0.3\textwidth]{njuname0.pdf}}
+      \par\vskip1.5cm
       {\xiaochu\heiti\ziju{0.5}\textbf\nju@csubtitle}
       \vskip2.2cm\hskip0.8cm
       \noindent\heiti\xiaoer\nju@title@pre
@@ -1131,7 +1131,7 @@ stepnumber=1,
 \lstnewenvironment{verilog}{\lstset{style=lstStyleverilog}}{}
 \lstnewenvironment{python}{\lstset{style=lstStylepython}}{}
 \lstnewenvironment{cpseudo}{\lstset{style=lstStylecpseudo}}{}
-\newcommand{\figpf}[2]{
+\newcommand{\figoptadd}[2]{
 \begin{figure}[H]
 \centering
 \includegraphics[#1]{figs/#2}
@@ -1139,8 +1139,8 @@ stepnumber=1,
 }
 
 %%%%%%%%%%%%%%%%%%%%
-\newcommand{\figpfc}[3]{
-\begin{figure}[htbp]
+\newcommand{\figoptaddcap}[3]{
+\begin{figure}[H]
 \centering
 \includegraphics[#1]{figs/#2}
 \caption{#3}
@@ -1200,6 +1200,11 @@ stepnumber=1,
   }
 }
 \fi
+\renewcommand{\thesection}{\arabic{section}}
+\newcommand{\nchapter}[1]{
+  {\let\clearpage\relax\par\vspace{1cm} \chapter*{\LARGE#1}}
+}
+\newcommand*{\rom}[1]{\expandafter\@slowromancap\romannumeral #1@}
 
 \newcommand{\blankpage}{
 \clearpage