refactor: stampbox measurement (#122)

sjtug · Sep 20, 2022 · d339f9e · d339f9e
1 parent e356e0a
commit d339f9e
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 84 deletions.
diff --git a/beamercolorthemesjtubeamer.sty b/beamercolorthemesjtubeamer.sty
diff --git a/beamerfontthemesjtubeamer.sty b/beamerfontthemesjtubeamer.sty
diff --git a/beamerinnerthemesjtubeamer.sty b/beamerinnerthemesjtubeamer.sty
diff --git a/beamerouterthemesjtubeamer.sty b/beamerouterthemesjtubeamer.sty
diff --git a/beamerthemesjtubeamer.sty b/beamerthemesjtubeamer.sty
diff --git a/sjtucover.sty b/sjtucover.sty
diff --git a/sjtuvi.sty b/sjtuvi.sty
diff --git a/src/source/beamercolorthemesjtubeamer.dtx b/src/source/beamercolorthemesjtubeamer.dtx
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthemesjtubeamer}[2022/09/11 v2.9.5 sjtubeamer color theme]
+\ProvidesPackage{beamercolorthemesjtubeamer}[2022/09/20 v2.9.6 sjtubeamer color theme]
 %</package>
 % \fi
 % \CheckSum{0}

diff --git a/src/source/beamerfontthemesjtubeamer.dtx b/src/source/beamerfontthemesjtubeamer.dtx
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthemesjtubeamer}[2022/09/11 v2.9.5 sjtubeamer font theme]
+\ProvidesPackage{beamerfontthemesjtubeamer}[2022/09/20 v2.9.6 sjtubeamer font theme]
 %</package>
 % \fi
 % \CheckSum{0}

diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthemesjtubeamer}[2022/09/11 v2.9.5 sjtubeamer inner theme]
+\ProvidesPackage{beamerinnerthemesjtubeamer}[2022/09/20 v2.9.6 sjtubeamer inner theme]
 %</package>
 % \fi
 % \CheckSum{0}
@@ -186,10 +186,10 @@
 % \subsubsection{Covers}
 %  This part set up title page, section page, part page, section page and subsection page for this cover based on the library \verb"sjtucover" loaded in section \ref{sec:innerload}.
 %
-%  Initialize sidebar width to 0pt as no sidebar required, which will be overwritten in outer theme.
+%  Initialize sidebar width to 0em as no sidebar required, which will be overwritten in outer theme.
 %    \begin{macrocode}
 \newdimen\beamer@sidebarwidth
-\beamer@sidebarwidth=0pt
+\beamer@sidebarwidth=0em
 %    \end{macrocode}
 %
 %  \begin{macro}{\coverpage}
@@ -202,13 +202,13 @@
 %    \begin{macrocode}
     \tikzset{external/export=false}
 %    \end{macrocode}
-%  Set the \verb"parindent" to 0pt to avoid unwanted shift if indent is set.
+%  Set the \verb"parindent" to 0em to avoid unwanted shift if indent is set.
 %    \begin{macrocode}
     \setlength{\parindent}{0em}
 %    \end{macrocode}
 %   Check if it is in sidebar mode to make necessary shift for cover pages.
 %    \begin{macrocode}
-    \ifdim\beamer@sidebarwidth=0pt %
+    \ifdim\beamer@sidebarwidth=0em %
       \usebeamertemplate*{#1}
     \else
       \hspace*{-0.5\beamer@sidebarwidth}\parbox[t]{\textwidth}{
@@ -281,14 +281,51 @@
 }
 %    \end{macrocode}
 %
+%
 % \subsubsection{Itemize Environments}
 %
 %   Set the item and enumerate style to circled one.
 %    \begin{macrocode}
 \setbeamertemplate{items}[circle]
 %    \end{macrocode}
 %
-%   Set the marker for section and subsection in TOC (Table of Contents) to \verb"stamp" style provided in \verb"sjtucover".
+%  Patch beamer on \verb"itemize",\verb"enumerate",\verb"description" on the left margin.
+%    \begin{macrocode}
+\setlength\leftmargini{1.4em}
+\setlength\leftmarginii{1.4em}
+\setlength\leftmarginiii{1.4em}
+\setbeamersize{description width=0.72em}
+%    \end{macrocode}
+%
+%   Define the \verb"stamp" TOC style for section in toc. Just use the structure color of marker to match the color like the style in \verb"circle" section in toc.
+%  This may mismatch with the definition of \verb"section page" of \verb"max" theme. But it surely the same color with \verb"part page". Reducing the number of the color used is a correct choice.
+%  Futhermore, the subsection doesn't even have a stamp marker so that the three-stage structure could not be formed to make use of all three-stage colors. Just all use one color to create a better look.
+%  At the end of this section block, a thin vspace is added to avoid the collision between the subsection and the stamptext.
+%  Some space before this section block is added, since there may be some users use \verb"multicols" environment in package \verb"multicol" to make a split list of TOC (which is not recommended by the way). this space will help to avoid the collision between the section and the previous subsection.
+%    \begin{macrocode}
+\defbeamertemplate{section in toc}{stamp}{
+  \vspace{2.5pt}\leavevmode\leftskip=8mm\stamptext[structure]{\inserttocsectionnumber}
+  \hspace{0.3em}\inserttocsection\par\vspace{0.5pt}
+}
+%    \end{macrocode}
+%  Define the \verb"stamp" TOC style for subsection in toc, notice that there is no \verb"\stamptext" in subsection, in order to fit the style of \verb"circle" subsection in toc style, only with the additional left margin to align with (slightly right of) section in toc. Add thin space at the start of every subsection in toc to add some line height.
+%    \begin{macrocode}
+\defbeamertemplate{subsection in toc}{stamp}{
+  \vspace{1.5pt}\leavevmode\hspace{36mm}\inserttocsubsection\par
+}
+%    \end{macrocode}
+%  Define the \verb"stamp" TOC style for subsubsection in toc. Like it is in section in toc, only additional left margin is added with adaptation of the font style of subsubsection in toc. And subsubsection should never be used in beamer class, since there is no configuration for subsubsection in beamer to show. To control the visibility of subsubsection in toc,
+%  \begin{verbatim}\tableofcontents[subsubsectionstyle=hide]\end{verbatim}
+%  will hide all subsubsection in toc, since there is NO \verb"hideallsubsubsections" in beamer.
+%  COPYRIGHT NOTICE: reference to beamer class code with LPPL 1.3c License.
+%    \begin{macrocode}
+\defbeamertemplate{subsubsection in toc}{stamp}{
+  \leavevmode\hspace{40mm}\normalsize\usebeamerfont{subsection in toc}%
+  \usebeamerfont{subsubsection in toc}%
+  \inserttocsubsubsection\par
+}
+%    \end{macrocode}
+%   Set the marker for section and subsection in TOC (Table of Contents) to \verb"stamp" style.
 %   NOTICE: the recommended setup to use the following in full TOC
 %   \begin{verbatim}\tableofcontents[hideallsubsections]\end{verbatim}
 %   use the following in \verb"\AtBeginSection"
@@ -303,14 +340,6 @@
 %  or load \verb"circles" inner theme.
 %  \begin{verbatim}\useinnertheme{circles}\end{verbatim}
 %
-%  Patch beamer on \verb"itemize",\verb"enumerate",\verb"description" on the left margin.
-%    \begin{macrocode}
-\setlength\leftmargini{1.4em}
-\setlength\leftmarginii{1.4em}
-\setlength\leftmarginiii{1.4em}
-\setbeamersize{description width=0.24cm}
-%    \end{macrocode}
-%
 % \begin{macro}{bibliolist}
 %    Create a bibliography list manually with \verb"\item" patched for \verb"\newblock". 
 %    You can just use \verb"\item" without \verb"\newblock" command, or you could use \verb"\newblock" with \verb"\articleitem", \verb"\bookitem", \verb"\onlineitem".
@@ -417,13 +446,13 @@
   frame empty,
   interior empty,
   sharp corners,
-  top=2pt,bottom=2pt,left=2pt,right=2pt,
-  borderline={4pt}{0pt}{
+  top=0.2em,bottom=0.2em,left=0.2em,right=0.2em,
+  borderline={0.4em}{0em}{
     #1,
-    line width=0.5pt,
+    line width=0.05em,
     decoration={
       stampline,
-      segment length=8pt,
+      segment length=0.8em,
       path has corners=true,
     },
     decorate
@@ -449,7 +478,7 @@
     {\leavevmode\centering\hskip-2em\bfseries%
     \stamptext[structure]{\insertstampnum}%
     \alert{\insertblocktitle}\par\vskip1ex}
-    {\usebeamercolor[fg]{structure}\hrule\@height.4pt}
+    {\usebeamercolor[fg]{structure}\hrule\@height.04em}
     \vskip1ex
 }
 \defbeamertemplate*{block stamp end}{sjtubeamer}{

diff --git a/src/source/beamerouterthemesjtubeamer.dtx b/src/source/beamerouterthemesjtubeamer.dtx
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthemesjtubeamer}[2022/09/11 v2.9.5 sjtubeamer outer theme]
+\ProvidesPackage{beamerouterthemesjtubeamer}[2022/09/20 v2.9.6 sjtubeamer outer theme]
 %</package>
 % \fi
 % \CheckSum{0}

diff --git a/src/source/beamerthemesjtubeamer.dtx b/src/source/beamerthemesjtubeamer.dtx
@@ -37,7 +37,7 @@
 % ------------------------------------------------------------------- \fi
 % \iffalse
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemesjtubeamer}[2022/09/11 v2.9.5 sjtubeamer parent theme]
+\ProvidesPackage{beamerthemesjtubeamer}[2022/09/20 v2.9.6 sjtubeamer parent theme]
 % \fi
 %
 % \subsection{Parent Theme}

diff --git a/src/source/sjtucover.dtx b/src/source/sjtucover.dtx
@@ -13,7 +13,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{sjtucover}[2022/09/11 v2.9.5 cover library for sjtubeamer]
+\ProvidesPackage{sjtucover}[2022/09/20 v2.9.6 cover library for sjtubeamer]
 %</package>
 % \fi
 % \CheckSum{0}
@@ -825,37 +825,6 @@
 %</my>
 %    \end{macrocode}
 %
-%   \subsubsection{Table of Contents Style}
-%  
-%   Define the \verb"stamp" TOC style for section in toc. Just use the structure color of marker to match the color like the style in \verb"circle" section in toc.
-%  This may mismatch with the definition of \verb"section page" of \verb"max" theme. But it surely the same color with \verb"part page". Reducing the number of the color used is a correct choice.
-%  Futhermore, the subsection doesn't even have a stamp marker so that the three-stage structure could not be formed to make use of all three-stage colors. Just all use one color to create a better look.
-%  At the end of this section block, a thin vspace is added to avoid the collision between the subsection and the stamptext.
-%  Some space before this section block is added, since there may be some users use \verb"multicols" environment in package \verb"multicol" to make a split list of TOC (which is not recommended by the way). this space will help to avoid the collision between the section and the previous subsection.
-%    \begin{macrocode}
-\defbeamertemplate{section in toc}{stamp}{
-  \vspace{2.5pt}\leavevmode\leftskip=8mm\stamptext[structure]{\inserttocsectionnumber}
-  \hspace{0.3em}\inserttocsection\par\vspace{0.5pt}
-}
-%    \end{macrocode}
-%  Define the \verb"stamp" TOC style for subsection in toc, notice that there is no \verb"\stamptext" in subsection, in order to fit the style of \verb"circle" subsection in toc style, only with the additional left margin to align with (slightly right of) section in toc. Add thin space at the start of every subsection in toc to add some line height.
-%    \begin{macrocode}
-\defbeamertemplate{subsection in toc}{stamp}{
-  \vspace{1.5pt}\leavevmode\hspace{36mm}\inserttocsubsection\par
-}
-%    \end{macrocode}
-%  Define the \verb"stamp" TOC style for subsubsection in toc. Like it is in section in toc, only additional left margin is added with adaptation of the font style of subsubsection in toc. And subsubsection should never be used in beamer class, since there is no configuration for subsubsection in beamer to show. To control the visibility of subsubsection in toc,
-%  \begin{verbatim}\tableofcontents[subsubsectionstyle=hide]\end{verbatim}
-%  will hide all subsubsection in toc, since there is NO \verb"hideallsubsubsections" in beamer.
-%  COPYRIGHT NOTICE: reference to beamer class code with LPPL 1.3c License.
-%    \begin{macrocode}
-\defbeamertemplate{subsubsection in toc}{stamp}{
-  \leavevmode\hspace{40mm}\normalsize\usebeamerfont{subsection in
-  toc}\usebeamerfont{subsubsection in toc}%
-  \inserttocsubsubsection\par
-}
-%    \end{macrocode}
-%
 % \iffalse
 %</package>
 % \fi

diff --git a/src/source/sjtuvi.dtx b/src/source/sjtuvi.dtx
@@ -13,7 +13,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{sjtuvi}[2022/09/11 v2.9.5 Visual Identity System library for sjtubeamer]
+\ProvidesPackage{sjtuvi}[2022/09/20 v2.9.6 Visual Identity System library for sjtubeamer]
 %</package>
 % \fi
 % \CheckSum{0}