Merge pull request #35 from glatavento/master

refactor: 重构 njulogo 宏包为 njuvisual 宏包

chapters/FigTabCode.tex

@@ -22,9 +22,9 @@
 % \subsection{文字环绕图像}
 % % wrapfigure后面不能有空行
 % \begin{wrapfigure}{r}{0cm}
-%     % \label{fig:njulogo}
-%     % \includegraphics[width=.15\textwidth]{njulogo}
-%     \resizebox{.15\textwidth}{!}{\input{njulogo.tikz}}
+%     % \label{fig:njuemblem}
+%     % \includegraphics[width=.15\textwidth]{njuemblem}
+%     \resizebox{.15\textwidth}{!}{\input{njuemblem.tikz}}
 %     \caption{校徽}
 % \end{wrapfigure}
 % \zhlipsum[3][name=xiangyu]
@@ -32,23 +32,23 @@
 % \begin{figure}[htbp]
 %     \begin{subfigure}{.32\textwidth}
 %         \centering
-%         % \includegraphics[width=\textwidth]{njulogo} 
-%         \resizebox{\textwidth}{!}{\input{njulogo.tikz}} 
+%         % \includegraphics[width=\textwidth]{njuemblem} 
+%         \resizebox{\textwidth}{!}{\input{njuemblem.tikz}} 
 %         \caption{logo1}
 %     \end{subfigure}
 %     \begin{subfigure}{.32\textwidth}
 %         \centering
-%         % \includegraphics[width=\textwidth]{njulogo}  
-%         \resizebox{\textwidth}{!}{\input{njulogo.tikz}} 
+%         % \includegraphics[width=\textwidth]{njuemblem}  
+%         \resizebox{\textwidth}{!}{\input{njuemblem.tikz}} 
 %         \caption{logo2}
 %     \end{subfigure}
 %     \begin{subfigure}{.32\textwidth}
 %         \centering
-%         % \includegraphics[width=\textwidth]{njulogo}  
-%         \resizebox{\textwidth}{!}{\input{njulogo.tikz}} 
+%         % \includegraphics[width=\textwidth]{njuemblem}  
+%         \resizebox{\textwidth}{!}{\input{njuemblem.tikz}} 
 %         \caption{logo3}
 %     \end{subfigure}
-%     \caption{njulogos}
+%     \caption{njuemblems}
 % \end{figure}
     
 

njuthesis.dtx

@@ -60,8 +60,9 @@ through XeTeX.
 \generate{
   \usedir{tex/latex/njuthesis}
     \file{\jobname.cls}        {\from{\jobname.dtx}{class}}
-    \file{njulogo.sty}         {\from{\jobname.dtx}{logo}
-                                \from{\jobname-logos.dtx}{logo}}
+    \file{njuvisual.sty}
+                               {\from{\jobname.dtx}{visual}
+                                \from{njuvisual.dtx}{visual}}
 %</install>
 %<*internal>
   \usedir{source/latex/njuthesis}
@@ -78,10 +79,9 @@ through XeTeX.
 \Msg{*                                                           *}
 \Msg{* The recommended directory is TDS:tex/latex/njuthesis      *}
 \Msg{*                                                           *}
-\Msg{*     njulogo.sty                                          *}
+\Msg{*     njuvisual.sty                                         *}
 \Msg{*     njuthesis.cls                                         *}
 \Msg{*     njuthesis.ins                                         *}
-\Msg{*     README.md                                             *}
 \Msg{*                                                           *}
 \Msg{* To produce the documentation, run the file njuthesis.dtx  *}
 \Msg{* through XeLaTeX.                                          *}
@@ -97,13 +97,13 @@ through XeTeX.
 \fi
 %</internal>
 %
-%<class|logo>\NeedsTeXFormat{LaTeX2e}
-%<class|logo>\RequirePackage{expl3}
+%<class|visual>\NeedsTeXFormat{LaTeX2e}
+%<class|visual>\RequirePackage{expl3}
 %<!(readme-zh|readme-en)> \GetIdInfo  $Id: njuthesis.dtx 0.9.4 2021-09-22 18:30:00 +0800  NJU LUG <nju.lug@yaoge123.cn> $
 %<class>  { Thesis template for Nanjing University }
-%<logo>  { LaTeX3 Package for NJU Visual Identity }
+%<visual>  { LaTeX3 Package for NJU Visual Identity }
 %<class>\ProvidesExplClass{njuthesis}
-%<logo>\ProvidesExplPackage{njulogo}
+%<visual>\ProvidesExplPackage{njuvisual}
 %<!(readme-zh|readme-en)> {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 %
 %<*driver>
@@ -120,7 +120,7 @@ through XeTeX.
 \definecolor{njuyellow}{cmyk}{0,0.3,1,0}
 \begin{document}
   \DocInput{njuthesis.dtx}  
-  \DocInput{njuthesis-logos.dtx}
+  \DocInput{njuvisual.dtx}
   \PrintIndex
 \end{document}
 %</driver>
@@ -2149,7 +2149,7 @@ through XeTeX.
 %
 % 
 %    \begin{macrocode}
-\RequirePackage{njulogo}
+\RequirePackage{njuvisual}
 %    \end{macrocode}
 % \begin{macro}{\@@_print_cover_ug:}
 % 本科封面
@@ -2162,7 +2162,7 @@ through XeTeX.
   \pdfbookmark{封面}{cover} % 将封面插入pdf书签
   \begin{spacing}{1.25}
   \null\hspace{-10mm}
-  \njulogo{!}{3cm}\smallskip 
+  \njuemblem{!}{3cm}\smallskip 
   \begin{center}
     \njuname{!}{3.35cm}
     \vskip 10mm 
@@ -2197,7 +2197,7 @@ through XeTeX.
   \begin{spacing}{1.25}
   \begin{center}
     \null\vskip 5mm
-    \njulogo{!}{1.9cm}
+    \njuemblem{!}{1.9cm}
     \vskip 10mm 
     \njuname{4.4cm}{!}
     \vskip 15mm 
@@ -2271,7 +2271,7 @@ through XeTeX.
       {\l_@@_major_en_tl}
     }
     \vskip\stretch{2}
-    \njulogo{2.5cm}{!}\par
+    \njuemblem{2.5cm}{!}\par
     \vskip 3mm
     \normalfont\l_@@_info_dept_en_tl\\
     {Nanjing~University}