Merge pull request #272 from rpgtex/master

Update v0.8.0 with latest changes.

Author: BrianCriswell

example.tex

@@ -266,7 +266,7 @@ \part{Customization}
 \chapter{Colors}
 
 \begin{table*}[b]
-  \caption{\DndFontTableTitle{}Colors Supported by this Package\label{tab:colors}}
+  \caption{\DndFontTableTitle{}Colors Supported by this Package}\label{tab:colors}
 
   \begin{tabularx}{\linewidth}{lX}
     \textbf{Color}                  & \textbf{Description} \\

lib/dndfonts.sty

@@ -5,6 +5,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \RequirePackage{lettrine}
 \RequirePackage{Royal}
+\RequirePackage[auto]{contour}
 
 \bool_if:NT \l__dnd_layout_bool
   {
@@ -22,19 +23,6 @@
       { \sffamily }
   }
 
-% Add the outlines
-  \NewDocumentCommand{\DndContour}{ O{} m }
-  {
-  \textpdfrender
-    {
-    TextRenderingMode = FillStroke,
-    StrokeColor =       contourgray,
-    LineWidth =         0.03ex,
-    RenderingIntent =   RelativeColorimetric,
-    #1
-    }{#2}
-  }
-
 \keys_define:nn { dnd / fonts }
   {
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -327,3 +315,24 @@
       {#2}
       {#3}
   }
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Contour that can break across lines. Can accept \newline to force a break.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\cs_new_protected:Npn \__dnd_contour_preserve_space:nn #1#2
+  {
+    \group_begin:
+    \seq_set_split:Nnn \l_tmpa_seq { ~ } { #2 }
+    \seq_set_map:NNn \l_tmpb_seq \l_tmpa_seq { \exp_not:n {\contour{#1}{##1}} }
+    \seq_use:Nn \l_tmpb_seq { ~ }
+    \group_end:
+  }
+
+\NewDocumentCommand{\DndContour}{ O{contourgray} m }
+  {
+    \group_begin:
+    \seq_set_split:Nnn \l_tmpa_seq { \newline } { #2 }
+    \seq_set_map:NNn \l_tmpb_seq \l_tmpa_seq { \exp_not:n {\__dnd_contour_preserve_space:nn{#1}{##1}} }
+    \seq_use:Nn \l_tmpb_seq { \newline }
+    \group_end:
+  }

lib/dndsections.sty

@@ -2,8 +2,6 @@
 
 \bool_if:NT \l__dnd_layout_bool
 {
-  \RequirePackage{pdfrender}
-
   % Change part numbering to Arabic numbers from Roman numerals
   \renewcommand{\thepart}{\arabic{part}}
 
@@ -23,15 +21,15 @@
     [display]
     { \centering \DndFontPart } % format
     { \DndContour{\partname\ \thepart} } % label
-    {2ex} % sep
+    { 2ex } % sep
     { \DndContour } % before-code
 
   % Chapter
   \titleformat {\chapter}
     { \DndFontChapter } % format
     { \DndContour{\chaptertitlename\ \thechapter :} } % label
     { \wordsep } % sep
-    {\DndContour} % before-code
+    { \DndContour } % before-code
 
   \titlespacing* {\chapter}
     { 0pt }  % left
@@ -47,7 +45,7 @@
 
   \titlespacing* { \section }
     { 0pt } % left
-  { 1.3ex plus .43ex minus .43ex } % before-sep
+    { 1.3ex plus .43ex minus .43ex } % before-sep
     { 0pt } % after-sep
 
   % Subsection
@@ -60,7 +58,7 @@
 
   \titlespacing*{ \subsection }
     { 0pt } % left
-  { 1.4ex plus .47ex minus .47ex } % before-sep
+    { 1.4ex plus .47ex minus .47ex } % before-sep
     { 1.2ex } % after-sep
 
   % Subsubsection

packages.txt

@@ -26,6 +26,7 @@ bookman
 cfr-initials
 cm
 colortbl
+contour
 courier
 ec
 enumitem