summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-09-02 20:07:59 +0000
committerKarl Berry <karl@freefriends.org>2023-09-02 20:07:59 +0000
commitc49825931d453d77ca429d3d53d836edd82da3a1 (patch)
treece67e43a160471d282ca39c15d0bc8fdc4b23461
parent020bf6deb3c4586bb3f1b994918a42e789816242 (diff)
jwjournal (2sep23)
git-svn-id: svn://tug.org/texlive/trunk@68149 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls23
1 files changed, 13 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls b/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls
index c178db4e59c..9b1e23804f0 100644
--- a/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls
+++ b/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls
@@ -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