texlive[68149] Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls:

[commits+karl at tug.org]

Revision: 68149
          http://tug.org/svn/texlive?view=revision&revision=68149
Author:   karl
Date:     2023-09-02 22:07:59 +0200 (Sat, 02 Sep 2023)
Log Message:
-----------
jwjournal (2sep23)

Modified Paths:
--------------
    trunk/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls

Modified: trunk/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls	2023-09-02 20:07:46 UTC (rev 68148)
+++ trunk/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls	2023-09-02 20:07:59 UTC (rev 68149)
@@ -12,7 +12,7 @@
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
 \ProvidesExplClass
   {jwjournal}
-  {2023/08/31} {}
+  {2023/09/01} {}
   {JW's journal class}
 
 \keys_define:nn { jwjournal }
@@ -105,6 +105,9 @@
 
 \RequirePackage { enumitem }
 \setlist [ description ] { font = \normalfont\sffamily, leftmargin = 3em, topsep = 0pt, labelsep = 1em }
+\dim_new:N \l_jwjournal_labelsep_dim
+\dim_set:Nn \l_jwjournal_labelsep_dim { \labelsep }
+\setlist [ 2 ] { labelsep = \l_jwjournal_labelsep_dim, labelwidth = !}
 \RenewDocumentCommand \descriptionlabel { m }
   {
     \makebox[\maxof{\width}{2em}][l]{
@@ -115,10 +118,10 @@
       left = .1em, right = .1em, top = .05em, bottom = .05em] { #1 }
     }
   }
-\NewDocumentCommand \JWJournalItem { m }
+\NewDocumentCommand \JWJournalItem { m m }
   {
     \begin{description}
-      \item #1
+      \item[#1] #2
     \end{description}
   }
 
@@ -341,20 +344,20 @@
 
         \regex_replace_all:nnN
           { \*\*\* (.*?) \*\*\* }
-          { \c{textbf}\{ \c{emph}\{ \1 \} \} }
+          { \c{textbf} { \c{emph} {\1} } }
           \l_jwjournal_tmp_tl
         \regex_replace_all:nnN
           { \*\* (.*?) \*\* }
-          { \c{textbf}\{ \1 \} }
+          { \c{textbf} {\1} }
           \l_jwjournal_tmp_tl
         \regex_replace_all:nnN
           { \* (.*?) \* }
-          { \c{emph}\{ \1 \} }
+          { \c{emph} {\1} }
           \l_jwjournal_tmp_tl
 
         \regex_replace_once:nnN
           { >>> \ *? (.*) }
-          { \c{JWJournalNote}\{\1\} }
+          { \c{JWJournalNote} {\1} }
           \l_jwjournal_tmp_tl
         \regex_replace_all:nnN
           { \ *? >>> \ *? }
@@ -412,12 +415,12 @@
           \l_jwjournal_tmp_tl
 
         \regex_replace_once:nnN
-          { ❄️ \ *? (\[.*\] .*) }
-          { \c{JWJournalItem} {\1} }
+          { ❄️ \ *? \[(.*)\] (.*) }
+          { \c{JWJournalItem} {\1} {\2} }
           \l_jwjournal_tmp_tl
         \regex_replace_once:nnN
           { ❄️ \ *? 【(.*)】(.*) }
-          { \c{JWJournalItem} { \[\1\] \2 } }
+          { \c{JWJournalItem} {\1} {\2} }
           \l_jwjournal_tmp_tl
 
         \regex_replace_once:nnN { ❄️ } { } \l_jwjournal_tmp_tl