diff --git a/fonts/NotoEmoji/NotoEmoji-Bold.ttf b/fonts/NotoEmoji/NotoEmoji-Bold.ttf new file mode 100644 index 0000000..bd4224b Binary files /dev/null and b/fonts/NotoEmoji/NotoEmoji-Bold.ttf differ diff --git a/fonts/NotoEmoji/NotoEmoji-Light.ttf b/fonts/NotoEmoji/NotoEmoji-Light.ttf new file mode 100644 index 0000000..c47b3e0 Binary files /dev/null and b/fonts/NotoEmoji/NotoEmoji-Light.ttf differ diff --git a/fonts/NotoEmoji/NotoEmoji-Medium.ttf b/fonts/NotoEmoji/NotoEmoji-Medium.ttf new file mode 100644 index 0000000..7f2463b Binary files /dev/null and b/fonts/NotoEmoji/NotoEmoji-Medium.ttf differ diff --git a/fonts/NotoEmoji/NotoEmoji-Regular.ttf b/fonts/NotoEmoji/NotoEmoji-Regular.ttf new file mode 100644 index 0000000..5c902c0 Binary files /dev/null and b/fonts/NotoEmoji/NotoEmoji-Regular.ttf differ diff --git a/fonts/NotoEmoji/NotoEmoji-SemiBold.ttf b/fonts/NotoEmoji/NotoEmoji-SemiBold.ttf new file mode 100644 index 0000000..569e91a Binary files /dev/null and b/fonts/NotoEmoji/NotoEmoji-SemiBold.ttf differ diff --git a/packages/Boxout.sty b/packages/Boxout.sty index 33c8d6a..e2cc9c1 100644 --- a/packages/Boxout.sty +++ b/packages/Boxout.sty @@ -44,7 +44,7 @@ % #2: Tabularray colspec, passed to @boxout argument #2. O{colspec={X[l,h]}} % #3: Caption. - +m + m % #4: [Ww] for warning box. o % #5: Body, passed to @boxout. @@ -80,7 +80,7 @@ % #5: Tabularray colpec, passed to Boxout argument #2. O{X[l,h]} % #6: Caption, passed to Boxout argument #3. - +m + m % #7: [Ww] for warning box, if present passed to Boxout argument #4. o % #5: Body, passed to Boxout. @@ -108,7 +108,7 @@ O{3in} O{X[l,h]} >{\TrimSpaces}m - +m + m o +b }{% diff --git a/packages/Fonts.sty b/packages/Fonts.sty index 3c59091..f682343 100644 --- a/packages/Fonts.sty +++ b/packages/Fonts.sty @@ -48,16 +48,28 @@ BoldItalicFont = RobotoSerif/RobotoSerif-ExtraBoldItalic, ] + % Emoji font: Noto Emoji + \newfontfamily{\emfamily}{NotoEmoji}[ + Path = {\fontpath/}, + Extension = .ttf, + UprightFont = NotoEmoji/NotoEmoji-Regular, + BoldFont = NotoEmoji/NotoEmoji-Bold, + ItalicFont = NotoEmoji/NotoEmoji-Light, + ] + \NewDocumentCommand{\serif}{m}{\textrm{#1}} \NewDocumentCommand{\sans}{m}{\textsf{#1}} \NewDocumentCommand{\mono}{m}{\texttt{#1}} \NewDocumentCommand{\slab}{m}{{\sbfamily{}#1}} \NewDocumentCommand{\code}{m}{\mono{\small{}#1}} +\NewDocumentCommand{\emoji}{m}{{\emfamily{}#1}} \RequirePackage{amssymb} \RequirePackage[os=win]{menukeys} -\renewmenumacro{\directory}[,]{hyphenatepaths} +\renewmenumacro{\directory}[/]{hyphenatepaths} +\renewmenumacro{\keys}[+]{shadowedangularkeys} +\renewmenumacro{\menu}[>]{angularmenus} \RenewDocumentCommand{\ctrlname}{}{$\wedge$} \ No newline at end of file diff --git a/packages/Graphics.sty b/packages/Graphics.sty index f70e981..9a8adf4 100644 --- a/packages/Graphics.sty +++ b/packages/Graphics.sty @@ -8,7 +8,17 @@ \RequirePackage{wrapfig2} \providelength{\iconsize}[0.25in] -\providelength{\igh}[10pt] % igh = Inline Graphics Height. + +\providelength{\@InlineGraphicHeight}[12pt] +\providelength{\@InlineGraphicOffset}[-2pt] + +\NewDocumentCommand{\InlineGraphic}{ + O{\@InlineGraphicHeight} + m + O{\@InlineGraphicOffset} +}{% + \raisebox{#3}{\includegraphics[keepaspectratio,height=#1]{#2}}% +} % Shorthand command for \includegraphics. \NewDocumentCommand{\ig}{O{width=0.5in} m}{% @@ -96,15 +106,15 @@ % First label. >{\TrimSpaces}m % First caption. - m + >{\TrimSpaces}m % Second graphic file. m % Second label. >{\TrimSpaces}m % Second caption. - m + >{\TrimSpaces}m }{% - \begin{BigFloat}[generic][#1][#2][#3]% + \begin{BigFloat}[figure][#1][#2][#3]% \begin{tblr}{% colspec = {*{2}{Q[c,m,wd=\twinfigwidth]}},% hlines = {0pt}, diff --git a/packages/Layout.sty b/packages/Layout.sty index 9acd78a..b7f3277 100644 --- a/packages/Layout.sty +++ b/packages/Layout.sty @@ -4,6 +4,8 @@ % Suppress warning about \showhyphens being changed. \let\CheckCommand\providecommand +\RequirePackage{ifthen} + \NewDocumentCommand{\providelength}{m O{0pt}}{% \ifdeflength{#1}{% It is already defined! }{% Not defined, so define it! @@ -126,7 +128,7 @@ }{% \begin{#1}[#3]% float environment \begin{SmartAdjustWidth}{-#2}{-#2 * \real{#4}}% adjustwidth(*) - \begin{minipage}{\linewidth}%#2 * (#4 + 1) + \textwidth}% + \begin{minipage}{\linewidth}%{#2 * (#4 + 1) + \textwidth}% \ifthenelse{\boolean{isDraft}}{% {\color{layoutColor}\rule{\textwidth}{1pt}\zws}% #5% @@ -135,6 +137,6 @@ #5% }% \end{minipage}% - \end{#5}% + \end{SmartAdjustWidth}% \end{#1}% }{} \ No newline at end of file diff --git a/packages/Links.sty b/packages/Links.sty index 46f5d2c..1c69228 100644 --- a/packages/Links.sty +++ b/packages/Links.sty @@ -21,7 +21,7 @@ }{ \hypersetup{ allcolors = textColor, - pdfduplex = true, + pdfduplex = DuplexFlipLongEdge, pdfpagelayout = TwoPageRight, } }