summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-09-28 21:18:36 +0000
committerKarl Berry <karl@freefriends.org>2023-09-28 21:18:36 +0000
commit755d66cda858e523a28c32ff6486709d115cc51b (patch)
tree6cb09ab1f4d83a94fd9eb72193833eb45c7e281b /Master
parent4c935724290ce71e98c2430f17428246c1ca876f (diff)
jwjournal (28sep23)
git-svn-id: svn://tug.org/texlive/trunk@68390 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/jwjournal/README.md25
-rw-r--r--Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls17
2 files changed, 40 insertions, 2 deletions
diff --git a/Master/texmf-dist/doc/latex/jwjournal/README.md b/Master/texmf-dist/doc/latex/jwjournal/README.md
index 20f9f773071..26caffafbf7 100644
--- a/Master/texmf-dist/doc/latex/jwjournal/README.md
+++ b/Master/texmf-dist/doc/latex/jwjournal/README.md
@@ -118,6 +118,19 @@ With a few more for icing on the cake:
>> (Some remark)
>> (Another remark)
```
+- `~~`: If you use `>>` or `>>>` inside a Note block (i.e. lines start with `[...]`), then there would no way to get out of the centered or boxed area and then continue the indented text; in such cases, you may start a new paragraph that start with `~~`, this will continue the indented text block:
+ ```
+ [Test] Here is some text.
+ || {some-image} <.4>
+ >> (Centered text)
+
+ ~~
+ Some more text.
+ >>> Text in color box.
+
+ ~~
+ And more text.
+ ```
- `->` and `<-`: Skip or retrieve certain vertical space, by default half of `\baselineskip`. You may specify the exact spacing in the unit of `\baselineskip`: for example, `-> <0.3>` would be skipping `0.3\baselineskip`, while `<- <.75>` means retrieving `0.75\baselineskip`.
- `+++`: If a single sentence or a few words fall to the next page, you may write a `+++` before that entry to enlarge the current page by one line.
> You may write this `+++` several times if necessary, but do make sure that the number of the `+` sign is a multiple of 3.
@@ -168,6 +181,18 @@ Indentations are not important, but paragraphs need to be separated by a blank l
- With pdfLaTeX, the base class is `minimart`.
- With XeLaTeX or LuaLaTeX, the base class is `einfart`.
+### Regarding the fonts
+
+If you are using XeLaTeX or LuaLaTeX to compile your document, then the current document class requires the following open-source fonts that are not included in the standard TeX collection:
+
+- The Source Han font series at [Adobe Fonts](https://github.com/adobe-fonts). More specifically:
+ - Source Han Serif, [go to its Release page](https://github.com/adobe-fonts/source-han-serif/releases).
+ - Source Han Sans, [go to its Release page](https://github.com/adobe-fonts/source-han-sans/releases).
+ - Source Han Mono, [go to its Release page](https://github.com/adobe-fonts/source-han-mono/releases).
+ > It is recommended to download the Super-OTC version, so that the total download size would be smaller, and the installation would be easier.
+
+These are necessary if you wish to write your document in Chinese (either simplified or traditional) or Japanese. Also, without these fonts installed, the compilation speed might be much slower — the compilation would still passing, but the system shall spend (quite) some time verifying that the fonts are indeed missing before switching to the fallback fonts.
+
### Colors
The colors from Monday to Sunday have the internal names `jwjournal-color-1`, ..., `jwjournal-color-7`. Currently they are defined as:
```latex
diff --git a/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls b/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls
index 9b1e23804f0..9c208c88a89 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/09/01} {}
+ {2023/09/28} {}
{JW's journal class}
\keys_define:nn { jwjournal }
@@ -105,6 +105,8 @@
\RequirePackage { enumitem }
\setlist [ description ] { font = \normalfont\sffamily, leftmargin = 3em, topsep = 0pt, labelsep = 1em }
+\newlist { jwjournal-continued-text } { itemize } { 1 }
+\setlist [ jwjournal-continued-text ] { leftmargin = 3em, topsep = 0pt, label = {} }
\dim_new:N \l_jwjournal_labelsep_dim
\dim_set:Nn \l_jwjournal_labelsep_dim { \labelsep }
\setlist [ 2 ] { labelsep = \l_jwjournal_labelsep_dim, labelwidth = !}
@@ -124,6 +126,12 @@
\item[#1] #2
\end{description}
}
+\NewDocumentCommand \JWJournalContinue { m }
+ {
+ \begin{jwjournal-continued-text}
+ \item #1
+ \end{jwjournal-continued-text}
+ }
\NewDocumentCommand \JWJournalNote { m }
{
@@ -338,7 +346,7 @@
{ \c{hfill} }
\l_jwjournal_tmp_tl
\regex_replace_all:nnN
- { // }
+ { [^\:]// }
{ \c{c_jwjournal_new_line_with_skip_tl} }
\l_jwjournal_tmp_tl
@@ -423,6 +431,11 @@
{ \c{JWJournalItem} {\1} {\2} }
\l_jwjournal_tmp_tl
+ \regex_replace_once:nnN
+ { ❄️ \ *? \~\~ \ *? (.*) }
+ { \c{JWJournalContinue} {\1} }
+ \l_jwjournal_tmp_tl
+
\regex_replace_once:nnN { ❄️ } { } \l_jwjournal_tmp_tl
\tl_gput_right:NV \g_jwjournal_content_tl \l_jwjournal_tmp_tl