Let wgText look more like the actual IS PDF

ChangeLog: * wg21.sty: Use latinmodernroman as rm font and LatinModernMono as code font. Adjust Scale and FakeStretch. * wg21macros.sty: Adjust font size of section headings and use bold font.
mattkretz · Sep 13, 2024 · 5bb27dd · 5bb27dd
1 parent 2807273
commit 5bb27dd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/wg21.sty b/wg21.sty
@@ -424,8 +424,9 @@
 \linespread{1.09}
 \renewcommand{\familydefault}{\sfdefault}
 
-\setmainfont{TeXGyreTermes}[
+\setmainfont{latinmodernroman}[
   Ligatures=TeX,
+  Scale=0.90,
   SmallCapsFeatures={Numbers={Monospaced,OldStyle}}
 ]
 \setsansfont{LatoLight}[
@@ -444,11 +445,11 @@
   SmallCapsFont={LatinModernMonoCaps},
   SmallCapsFeatures={Scale=0.90,Numbers={Proportional}}
 ]
-\newfontfamily\wgCodeFont{LatinModernMonoLight}[
+\newfontfamily\wgCodeFont{LatinModernMono}[
   NFSSFamily=wgCodeFont,
   Ligatures=NoCommon,
-  Scale=0.89,
-  FakeStretch=0.95
+  Scale=0.90,
+  FakeStretch=0.96
 ]
 
 % Math fonts:

diff --git a/wg21macros.sty b/wg21macros.sty
@@ -246,7 +246,7 @@
     \addcontentsline{toc}{#1}{%
       \theWGClause{} #2 [#3] (\thesubsection{})%
     }%
-    {\noindent\wgOrigSection{#1}\larger[2]\arabic{WGClause} #2\label{sec:\wgLabelPrefix#3}\hfill[#3]}\\%
+    {\noindent\wgOrigSection{#1}\larger[2]\textbf{\arabic{WGClause} #2\label{sec:\wgLabelPrefix#3}\hfill[#3]}}\\%
     \noindent%
 }
 \newcommand\wgSubsection[3][subsubsection]{%
@@ -264,7 +264,7 @@
     \addcontentsline{toc}{#1}{%
       \theWGSubSection{} #2 [#3] (\thesubsubsection{})%
     }%
-    {\noindent\wgOrigSection{#1}\larger[1]\theWGSubSection{} #2\label{sec:\wgLabelPrefix#3}\hfill[#3]}\\%
+    {\noindent\wgOrigSection{#1}\larger[1]\textbf{\theWGSubSection{} #2\label{sec:\wgLabelPrefix#3}\hfill[#3]}}\\%
     \noindent%
 }
 \newcommand\wgSubsubsection[3][paragraph]{%
@@ -281,7 +281,7 @@
     \addcontentsline{toc}{#1}{%
       \theWGSubSubSection{} #2 [#3] (\theparagraph{})%
     }%
-    {\noindent\wgOrigSection{#1}\theWGSubSubSection{} #2\label{sec:\wgLabelPrefix#3}\hfill[#3]}\\%
+    {\noindent\wgOrigSection{#1}\larger[1]\textbf{\theWGSubSubSection{} #2\label{sec:\wgLabelPrefix#3}\hfill[#3]}}\\%
     \noindent%
 }
 \newcommand\wgSubsubsubsection[3][subparagraph]{%
@@ -297,7 +297,7 @@
     \addcontentsline{toc}{#1}{%
       \theWGSubSubSubSection{} #2 [#3] (\thesubparagraph{})%
     }%
-    {\noindent\wgOrigSection{#1}\theWGSubSubSubSection{} #2\label{sec:\wgLabelPrefix#3}\hfill[#3]}\\%
+    {\noindent\wgOrigSection{#1}\larger[1]\textbf{\theWGSubSubSubSection{} #2\label{sec:\wgLabelPrefix#3}\hfill[#3]}}\\%
     \noindent%
 }
 \makeatother