Regular update '2024-06-02T23:01:53+00:00'

nekostein · Jun 2, 2024 · edcaf55 · edcaf55
1 parent 080182e
commit edcaf55
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 34 deletions.
diff --git a/latexlib/ns-letter.tex b/latexlib/ns-letter.tex
@@ -1,14 +1,14 @@
 % Ver 2024-04-20T20:15:31+00:00
 \documentclass[a4paper,10pt]{article}
-\usepackage[textwidth=30em,rmargin=25mm,tmargin=90mm,bmargin=37mm]{geometry}
+\usepackage[textwidth=31em,rmargin=25mm,tmargin=90mm,bmargin=37mm]{geometry}
 \usepackage{calc,fontspec,tocloft,longtable,tabu,booktabs,xcolor,datetime2,paralist,enumitem,hyphenat,graphicx,eso-pic}
 \usepackage{amssymb,amsmath,multicol,fancyhdr,adjustbox}
 \usepackage[hidelinks]{hyperref}
 \usepackage{xeCJK,xeCJKfntef}
 \xeCJKsetup{PunctStyle=plain,RubberPunctSkip=false,CJKglue=\hskip 0pt,CJKecglue=\hskip 0.35em plus 5em minus 0.09em}
 \setmainfont{XCharter}
 \setromanfont{XCharter}
-\setsansfont{Inter}
+\setsansfont{TeX Gyre Heros}
 \setmonofont{JetBrains Mono NL}
 \setCJKmainfont{Noto Serif CJK SC}
 \setCJKromanfont{Noto Serif CJK SC}
@@ -27,15 +27,21 @@
 \allsectionsfont{\sffamily\raggedright}
 
 \pagestyle{fancy}
+\fancyhead[L]{}
+\fancyhead[C]{}
+\fancyhead[R]{}
 \fancyfoot[C]{}
 \fancyfoot[R]{}
 \renewcommand{\headrulewidth}{0pt}
 \setlength{\headheight}{15pt}
 
 
+
+\newlength{\sendtoareaextraraise}
+\setlength{\sendtoareaextraraise}{0pt}
 \newcommand{\sendto}[1]{
 	\AddToShipoutPictureFG*{
-		\put(25mm,54mm){%
+		\put(25mm,55mm+\sendtoareaextraraise){%
 			\noindent\begin{minipage}[b][150mm][t]{43mm}%
 				\footnotesize\sffamily\noindent#1%
 			\end{minipage}%
@@ -44,16 +50,21 @@
 }
 
 \newcommand{\emailheading}[1]{
+    \toparea{
+        \vfill\tabcolsep=0pt
+        \small\sffamily\mdseries
+        \begin{tabu}{lX}
+            {\hspace{6em}} & {} \\
+            #1
+            \hline
+        \end{tabu}
+    }
+}
+\newcommand{\toparea}[1]{
     \AddToShipoutPictureFG*{
         \put(\paperwidth-\textwidth-25mm,307mm){%
             \begin{minipage}[t][90mm][t]{\textwidth}%
-                \vfill\tabcolsep=0pt
-                \small\sffamily\mdseries
-                \begin{tabu}{lX}
-                    {\hspace{6em}} & {}          \\
-                    #1
-                    \hline
-                \end{tabu}
+                \vfill#1
             \end{minipage}
         }
     }
@@ -68,8 +79,11 @@
 }
 
 
+\newcommand{\footercontentleft}[0]{NEKOSTEIN HQ}
 \newcommand{\footercontentright}[0]{\thepage}
 
+
+
 \newcommand{\setupdecorations}[0]{
 	\AddToShipoutPictureBG{
 		\put(25mm,265mm){%
@@ -88,10 +102,10 @@
 		\put(25mm,23mm){%
 			\parbox{\paperwidth-50mm}{%
 				\footnotesize%
-				\sffamily\noindent%
-                \vphantom{1IQfgqa\"A}%
-				Nekostein HQ
-				\hfill
+				\rmfamily\noindent%
+                \strut%
+                \footercontentleft%
+				\hfill%
 				\footercontentright%
 			}
 		}

diff --git a/latexlib/ns-report.tex b/latexlib/ns-report.tex
@@ -5,8 +5,8 @@
 \usepackage[hidelinks]{hyperref}
 \usepackage{xeCJK,xeCJKfntef}
 \xeCJKsetup{PunctStyle=plain,RubberPunctSkip=false,CJKglue=\hskip 0pt,CJKecglue=\hskip 0.35em plus 5em minus 0.09em}
-\setmainfont{Brygada 1918}
-\setromanfont{Brygada 1918}
+\setmainfont{XCharter}
+\setromanfont{XCharter}
 \setsansfont{TeX Gyre Heros}
 \setmonofont{JetBrains Mono NL}
 \setCJKmainfont{Noto Serif CJK SC}
@@ -47,23 +47,23 @@
 		% \Huge
 		\fontsize{31pt}{37pt}\selectfont
         \raggedright
-		#3
+		\strut#3
 
 		\vfill
 
 		% \Large
         \fontspec[Numbers=Monospaced]{Inter Tight Medium}
         \fontsize{14pt}{18pt}\selectfont
-		\vphantom{1Ahjp}{#2}\par
-		\vphantom{1Ahjp}{#1}\par
+		\strut#2\par
+		\strut#1\par
 		\vskip 80pt
 
         \flushleft
 		% \normalsize
         \fontsize{10.95pt}{13pt}\selectfont
         \mdseries
-		\vphantom{1Ahjp}{#4}\hfill%
-		\vphantom{1Ahjp}{#5}\par
+		\strut#4\hfill%
+		\strut#5\par
 	\end{titlepage}
     \restoregeometry
     \pagecolor{white}

diff --git a/make.sh b/make.sh
@@ -33,6 +33,10 @@ case $1 in
         echo "url:  https://github.com/nekostein/nekostein-vi/releases/new"
         echo "zip:  $(realpath _pkg/Nekostein-VI.zip)"
         ;;
+    local)
+        bash sh/000-prepare.sh
+        nekostein-installvilib.sh --local
+        ;;
     fast)
         bash sh/000-prepare.sh
         bash "$0" zip

diff --git a/misc/nekostein-installvilib.sh b/misc/nekostein-installvilib.sh
@@ -5,9 +5,9 @@ mkdir -p _dist/{libvi,libvitmp}
 rm -rf _dist/{libvi,libvitmp}
 mkdir -p _dist/{libvi,libvitmp}
 
-if [[ "$1" == '--local' ]]; then
-    USE_LOCAL=y
-fi
+### Command parameters
+[[ "$1" == '--local' ]] && USE_LOCAL=y
+[[ "$1" == '-l' ]] && USE_LOCAL=y
 
 
 function download_fonts() {

diff --git a/patterns/js/p02.js b/patterns/js/p02.js
@@ -1,10 +1,9 @@
 const fs = require('fs');
 const svgplotlib = require('../svgplotlib.js');
 
-const COLOR_DECO = '#C8D5B1';
-// const COLOR_DECO = '#E8ECD4';
-const COLOR1 = `#E8ECD4`;
-const COLOR2 = `#E8ECD4`;
+const COLOR_DECO = '#2F9831';
+const COLOR1 = `#C8D5B1`;
+const COLOR2 = `#C8D5B1`;
 
 
 // Some specific config variables

diff --git a/patterns/svg/p02.svg b/patterns/svg/p02.svg