summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-06 22:25:38 +0000
committerKarl Berry <karl@freefriends.org>2017-01-06 22:25:38 +0000
commitaedb262d5de1f2ab529ceb36ef4e025eefa6ba05 (patch)
treeb7692ab7a86ac7f4233ddd17be6ac43ef82e3c07 /Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
parentb8159c6a75c91906de45a470a0b30b80a854d7e4 (diff)
nwejm (6jan17)
git-svn-id: svn://tug.org/texlive/trunk@42884 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/nwejm/nwejmart.cls')
-rw-r--r--Master/texmf-dist/tex/latex/nwejm/nwejmart.cls330
1 files changed, 161 insertions, 169 deletions
diff --git a/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls b/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
index 40f4f720284..e2b54a0dac5 100644
--- a/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
+++ b/Master/texmf-dist/tex/latex/nwejm/nwejmart.cls
@@ -31,9 +31,16 @@
\msg_new:nnnn{nwejm}{Issue~number~needed}{Option~`#1'~needed!}
{Please~specify~`#1=<number>', ~otherwise~`<number>'~will~be~set~to
~`\int_use:N\c__nwejm_first_issue_number_int'.}%
-\msg_new:nnn{nwejm}{Wrong~main~file~name!}{The~ main~ file~ should~ be~ named~
- `\tl_use:N\c__nwejm_main_file_name_tl.tex',~ not~ `\jobname.tex'.~ Please~ rename~
+\msg_new:nnn{nwejm}{Wrong~issue's~main~file~name!}{The~ issue's~ main~ file~
+ should~ be~ named~ `\tl_use:N\c__nwejm_main_file_name_tl.tex',~ not~
+ `\c_sys_jobname_str.tex'.~ Please~ rename~ the~ current~ file~ accordingly.}%
+\msg_new:nnn{nwejm}{Wrong~cover's~main~file~name!}{The~ cover~ file~
+ should~ /not/~ be~ named~ as~ the~ issue's~ main~ file~
+ `\tl_use:N\c__nwejm_main_file_name_tl.tex'.~ Please~ rename~
the~ current~ file~ accordingly.}%
+\msg_new:nnn{nwejm}{Main~file~needs~to~be~compiled!}{The~ issue's~ main~ file~
+ (`\tl_use:N\c__nwejm_main_file_name_tl.tex')~ should~ be~ compiled~ at~ least~
+ once~ before~ the~ cover~ can~ be~ generated.}%
\msg_new:nnnn{nwejmart}{Unknown~choice}{Choice~`#3'~invalid!}
{Please~specify~#1=#2.}%
\msg_new:nnn{nwejmart}{Unknown~tag}{There~ isn't~ any~ affiliation~ tagged~
@@ -125,13 +132,8 @@
\bool_if:NF {\g__nwejm_language_specified_bool} {
\__nwejm_language:n {english}
}
-\RequirePackage{silence}
-\WarningFilter[nwejm]{kpfonts}{With 'easyscsl' option, don't fit together}
-\WarningFilter[nwejm]{etex}{Extended allocation already in use}
-\WarningFilter[nwejm]{etoc}{package tocvsec2 detected and its modification of}
-\ActivateWarningFilters[nwejm]
\RequirePackage[l2tabu,orthodox]{nag}
-\pdftex_if_engine:TF
+\sys_if_engine_pdftex:TF
{
\RequirePackage[utf8]{inputenc}
}{
@@ -145,7 +147,7 @@
\RequirePackage{xr}
\RequirePackage{currfile}
\RequirePackage[multiple]{footmisc}%
-\RequirePackage[svgnames]{xcolor}%
+\RequirePackage{xcolor}%
\RequirePackage{xspace}%
\RequirePackage[autostyle]{csquotes}%
\RequirePackage{array}
@@ -185,9 +187,9 @@
\int_new:N \g__nwejm_articles_int
\clist_new:N \g__nwejm_counters_to_be_reset_clist
\int_const:Nn \c__nwejm_first_issue_number_int { 1 }
-\int_const:Nn \c__nwejm_first_issue_year_int { 2016 }
+\int_const:Nn \c__nwejm_first_issue_year_int { 2015 }
\int_const:Nn \c__nwejm_first_issue_month_int { 1 }
-\int_const:Nn \c__nwejm_interval_in_months_int { 6 }
+\int_const:Nn \c__nwejm_interval_in_months_int { 12 }
\tl_const:Nn \c__nwejm_main_file_name_tl {issue}
\tl_const:Nn \c__nwejm_date_received_tl {received}
\tl_const:Nn \c__nwejm_date_accepted_tl {accepted}
@@ -200,6 +202,8 @@
bibliography~of~your~article~to~appear~in~the~next~issue~of~the
\c__nwejm_journal_title_string_tl.~The~current~layout~may~not~be~the~final~one.%
}
+\tl_const:Nn \c__nwejm_cover_background_image_tl {nwejm-cover-background.jpg}
+\definecolor{__nwejm_cover_background_color_tl}{rgb}{0.16,0.22,0.56}
\tl_const:Nn \c__nwejm_msc_string_tl {\textsc{msc}}
\tl_const:Nn \c__nwejm_colon_tl {
\ifcurrentbaselanguage{french}{\FBcolonspace}{}:
@@ -210,6 +214,7 @@
\tl_const:Nn \c__nwejm_issue_bib_file_suffix_string_tl {__nwejm}
\tl_const:Nn \c__nwejm_issue_bib_file_string_tl {\c_job_name_tl\c__nwejm_issue_bib_file_suffix_string_tl.bib}
\tl_const:Nn \c__nwejm_issue_bib_path_string_tl {\c__nwejm_issue_bib_file_string_tl}
+\tl_const:Nn \c__nwejm_issue_number_year_file_string_tl {\c__nwejm_main_file_name_tl.iny}
\tl_const:Nn \c__nwejm_issue_bib_key_tl {\int_use:N \g__nwejm_issue_number_int}
\tl_const:Nn \c__nwejm_journal_short_title_string_tl {\textsc{nwejm}}
\tl_const:Nn \c__nwejm_journal_title_string_tl {
@@ -230,24 +235,33 @@
\bool_new:N \g__nwejm_date_specified_bool
\dim_const:Nn \c__nwejm_layoutheight_dim { 240mm}
\dim_const:Nn \c__nwejm_layoutwidth_dim { 170mm}
-\dim_const:Nn \c__nwejm_printer_layoutoffset_dim { 5mm}
+\dim_const:Nn \c__nwejm_printer_layoutoffset_dim { 10mm }
\bool_if:NTF {\g__nwejm_for_printer_bool} {
\dim_const:Nn \c__nwejm_potential_layoutoffset_dim { \c__nwejm_printer_layoutoffset_dim}
}{
\dim_const:Nn \c__nwejm_potential_layoutoffset_dim {\c_zero_dim}
}
\bool_if:NTF {\g__nwejm_cover_bool} {
- \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \c__nwejm_printer_bindingoffset_dim }
+ \dim_compare:nTF {\g__nwejm_binding_dim > \c_zero_dim} {%
+ \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \g__nwejm_binding_dim }
+ }{
+ \dim_const:Nn \c__nwejm_potential_bindingoffset_dim { \c__nwejm_printer_bindingoffset_dim }
+ }
}{
\dim_const:Nn \c__nwejm_potential_bindingoffset_dim {\c_zero_dim}
}
-\dim_const:Nn \c__nwejm_paperheight_dim { \c__nwejm_layoutheight_dim+2\c__nwejm_potential_layoutoffset_dim}
+\dim_const:Nn \c__nwejm_paperheight_dim {
+ \c__nwejm_layoutheight_dim
+ +
+ 2\c__nwejm_potential_layoutoffset_dim
+}
\bool_if:NTF {\g__nwejm_cover_bool} {
\dim_const:Nn \c__nwejm_paperwidth_dim {
\c__nwejm_layoutwidth_dim
+
\c__nwejm_potential_layoutoffset_dim
- +\c__nwejm_potential_bindingoffset_dim
+ +
+ .5\c__nwejm_potential_bindingoffset_dim
}
}{
\dim_const:Nn \c__nwejm_paperwidth_dim {
@@ -261,11 +275,9 @@
\dim_const:Nn \c__nwejm_topmargin_dim { 20mm}
\dim_const:Nn \c__nwejm_topmargin_frontcover_dim {
\c__nwejm_topmargin_dim
- % + 30mm
}
\dim_const:Nn \c__nwejm_topmargin_inside_cover_dim {
\c__nwejm_topmargin_dim
- % +10mm
}
\dim_const:Nn \c__nwejm_topmargin_front_matter_dim {
\c__nwejm_topmargin_inside_cover_dim
@@ -273,8 +285,6 @@
\dim_const:Nn \c__nwejm_headsep_dim { 9.5mm}
\dim_const:Nn \c__nwejm_headsep_frontcover_dim {
\c__nwejm_headsep_dim
- % +31mm
- % -\c__nwejm_potential_layoutoffset_dim
}
\dim_const:Nn \c__nwejm_headsep_inside_frontcover_dim {
\c__nwejm_headsep_dim
@@ -292,16 +302,9 @@
\dim_const:Nn \c__nwejm_right_minipage_frontcover_dim { .6\linewidth }
\dim_const:Nn \c__nwejm_innermargin_dim { 23mm }
\dim_const:Nn \c__nwejm_outermargin_dim { 30mm }
-\dim_const:Nn \c__nwejm_inside_cover_box_width_dim { 150mm }%
-\dim_const:Nn \c__nwejm_innermargin_inside_cover_dim {
- (\c__nwejm_layoutwidth_dim - \c__nwejm_inside_cover_box_width_dim)/2
- - \c__nwejm_potential_bindingoffset_dim
- % + \c__nwejm_adjustmargin_dim
-}
-\dim_const:Nn \c__nwejm_outermargin_inside_cover_dim {
- (\c__nwejm_layoutwidth_dim - \c__nwejm_inside_cover_box_width_dim)/2
- % - \c__nwejm_adjustmargin_dim
-}
+\dim_const:Nn \c__nwejm_inside_cover_textwidth_dim { 145mm }%
+\dim_const:Nn \c__nwejm_outermargin_inside_frontcover_dim { 15mm }
+\dim_const:Nn \c__nwejm_outermargin_inside_backcover_dim { 10mm }
\dim_const:Nn \c__nwejm_innermargin_backcover_dim { 10mm }
\dim_const:Nn \c__nwejm_outermargin_backcover_dim { \c__nwejm_innermargin_backcover_dim }
\dim_const:Nn \c__nwejm_topmargin_backcover_dim { \c__nwejm_innermargin_backcover_dim }
@@ -309,9 +312,14 @@
\dim_const:Nn \c__nwejm_front_matter_extra_innermargin_dim { \c_zero_dim }
\dim_const:Nn \c__nwejm_front_matter_extra_outermargin_dim { \c_zero_dim }
\dim_const:Nn \c__nwejm_inside_cover_offset_dim { \c_zero_dim }%
+\dim_const:Nn \c__nwejm_logos_rectangle_thickness_dim { 3.1mm }
+\dim_const:Nn \c__nwejm_logos_rectangle_height_dim { 33mm }
\geometry{%
papersize={\c__nwejm_paperwidth_dim,\c__nwejm_paperheight_dim}
}
+\bool_if:NT {\g__nwejm_inside_pages_bool} {
+ \geometry{showcrop}
+}
\tl_const:Nn \c__nwejm_main_geometry_tl {%
,layoutsize={\c__nwejm_layoutwidth_dim,\c__nwejm_layoutheight_dim}
,layoutoffset=\c__nwejm_potential_layoutoffset_dim
@@ -431,7 +439,7 @@
{
number .int_gset:N = \g__nwejm_issue_number_int,
volume .int_gset:N = \g__nwejm_issue_volume_int,
- volume .value_required:,
+ volume .value_required:n = true,
volume .initial:n = 0,
}
\keys_define:nn { nwejm/dates }
@@ -448,9 +456,9 @@
\tl_gset:Nn \g__nwejm_online_date_tl {#1}
\bool_gset_true:N \g__nwejm_date_specified_bool
},
- received .value_required:,
- accepted .value_required:,
- online .value_required:,
+ received .value_required:n = true,
+ accepted .value_required:n = true,
+ online .value_required:n = true,
}
\quark_new:N \q__nwejm
\int_new:N \l_author_int
@@ -484,8 +492,8 @@
\msg_error:nnn{__nwejm}{Unknown~tag}{#1}
}
},
- affiliation .value_required:,
- affiliationtagged .value_required:,
+ affiliation .value_required:n = true,
+ affiliationtagged .value_required:n = true,
}
\tl_new:N \l__nwejm_newtheorem_style_tl
\keys_define:nn { nwejm / newtheorem }
@@ -495,11 +503,11 @@
title / english .tl_set:N = \l__nwejm_newtheorem_english_title_tl,
title / german .tl_set:N = \l__nwejm_newtheorem_german_title_tl,
title / dutch .tl_set:N = \l__nwejm_newtheorem_dutch_title_tl,
- title .value_required:,
- title / french .value_required:,
- title / english .value_required:,
- title / german .value_required:,
- title / dutch .value_required:,
+ title .value_required:n = true,
+ title / french .value_required:n = true,
+ title / english .value_required:n = true,
+ title / german .value_required:n = true,
+ title / dutch .value_required:n = true,
%
style .choice:,
style / theorem .code:n = {\__nwejm_theorem_style:n {theorem}},
@@ -542,14 +550,6 @@
\emph{\c__nwejm_journal_title_string_tl}
}%
}
-\tl_new:N \l__nwejm_pdftitle_string_tl
-\tl_new:N \l__nwejm_pdfauthor_string_tl
-\tl_set:Nn \l__nwejm_pdftile_string_tl {
- \c__nwejm_journal_title_string_tl\space--\space{}N^^c2^^b0\int_use:N\g__nwejm_issue_number_int
-}
-\tl_set:Nn \l__nwejm_pdfauthor_string_tl {
- \g__nwejm_nwejm_string_tl
-}
\cs_new_protected:Nn \__nwejm_email:n
{
\href{mailto:#1}{\nolinkurl{#1}}%
@@ -594,7 +594,7 @@
{
\tl_if_eq:NNF {\c__nwejm_date_received_tl} {#1} { \c__nwejm_dates_separator_tl }
\tl_mixed_case:n { \exp_args:No \GetTranslation{#1} }
- \c__nwejm_colon_tl\space
+ \c__nwejm_colon_tl\c_space_tl
\DTMdate{#2}%
}
}
@@ -609,34 +609,26 @@
\tl_gclear:N \g__nwejm_acception_date_tl
\tl_gclear:N \g__nwejm_online_date_tl
}
-\seq_new:N \l__nwejm_keywords_seq
-\tl_new:N \l__nwejm_keywords_tl
-\NewDocumentCommand \keywords { m } {
- \seq_clear:N \l__nwejm_keywords_seq
- \tl_clear:N \l__nwejm_keywords_tl
- \seq_set_from_clist:Nn \l_tmpa_seq {#1}
- \seq_set_map:NNn \l__nwejm_keywords_seq \l_tmpa_seq {
- ##1
+\tl_new:N \g__nwejm_keywords_tl
+\NewDocumentCommand \keywords { O{} m } {
+ \tl_gclear:N \g__nwejm_keywords_tl
+ \tl_clear:N \l_tmpb_clist
+ \clist_set:Nn \l_tmpb_clist {#2}
+ \tl_set:Nn \g__nwejm_keywords_tl { \clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ } }
+ \tl_if_empty:nTF {#1} {%
+ \hypersetup{pdfkeywords={\g__nwejm_keywords_tl}}
+ }{
+ \clist_set:Nn \l_tmpb_clist {#1}
+ \hypersetup{pdfkeywords={\clist_use:Nnnn \l_tmpb_clist { ,~ } { ,~ } { ,~ }}}
}
- \tl_set:Nn \l__nwejm_keywords_tl { \seq_use:Nn \l__nwejm_keywords_seq {,~} }
- \hypersetup{pdfkeywords=\l__nwejm_keywords_tl}
}
-\seq_new:N \l__nwejm_msc_seq
-\tl_new:N \l__nwejm_msc_tl
+\tl_new:N \g__nwejm_msc_tl
\NewDocumentCommand \msc { m } {
- \seq_clear:N \l__nwejm_msc_seq
- \tl_clear:N \l__nwejm_msc_tl
- %
- % does what the name suggests, set a sequence from the clist
- \seq_set_from_clist:Nn \l_tmpa_seq {#1}
- % applies final arg to each element of second seq and stores result in first seq
- \seq_set_map:NNn \l__nwejm_msc_seq \l_tmpa_seq {
- ##1
- }
- %
- % \seq_use puts the items from the seq back in the input with ",~" as a separator
- \tl_set:Nn \l__nwejm_msc_tl {\seq_use:Nn \l__nwejm_msc_seq {,~}}
-%%<class-article> \hypersetup{pdfmsc=\l_@@_msc_tl}
+ \tl_gclear:N \g__nwejm_msc_tl
+ \tl_clear:N \l_tmpa_clist
+ \clist_set:Nn \l_tmpa_clist {#1}
+ \tl_set:Nn \g__nwejm_msc_tl { \clist_use:Nnnn \l_tmpa_clist { ,~ } { ,~ } { ,~ } }
+%%<class-article> \hypersetup{pdfmsc=\g_@@_msc_tl}
}
\file_if_exist:nT { \c__nwejm_main_file_name_tl.aux }
@@ -812,7 +804,7 @@
\tl_gset:Nn \g__nwejm_citeauthor_tl {%
\DeclareNameAlias{labelname}{default}%
\group_begin:
- \togglefalse{blx@giveninits}%
+ \togglefalse{abx@bool@giveninits}%
\citeauthor{#1}
\group_end:
}%
@@ -833,7 +825,7 @@
\AtNextCitekey{\defcounter{maxnames}{100}}
\group_begin:
\DeclareNameAlias{labelname}{default}%
- \togglefalse{blx@giveninits}%
+ \togglefalse{abx@bool@giveninits}%
\citeauthor{#1}
\group_end:
\cs_set_eq:NN \multinamedelim \__nwejm_orig_multinamedelim
@@ -939,11 +931,11 @@
\c__nwejm_colon_tl
}
}
- \space\l__nwejm_keywords_tl.
+ \c_space_tl\g__nwejm_keywords_tl.
}
\tl_set:Nn \l__nwejm_msc_box_tl
{%
- \noindent\textbf{\c__nwejm_msc_string_tl}\c__nwejm_colon_tl\space\l__nwejm_msc_tl.
+ \noindent\textbf{\c__nwejm_msc_string_tl}\c__nwejm_colon_tl\c_space_tl\g__nwejm_msc_tl.
}
\tl_set:Nn \l__nwejm_abstract_box_tl
{%
@@ -973,7 +965,7 @@
}
\bool_if:nF { \tl_if_empty_p:N \g__nwejm_short_subtitle_tl }
{
- .\space\g__nwejm_short_subtitle_tl
+ .\c_space_tl\g__nwejm_short_subtitle_tl
}
}
\hypersetup{pdftitle=\g__nwejm_partial_title_for_toc_tl}
@@ -987,10 +979,10 @@
{
\texorpdfstring{%
\AtNextCitekey{\defcounter{maxnames}{100}}
- \space\textendash\space\citeauthor{\g__nwejm_article_bib_key_tl}
+ \c_space_tl\textendash\c_space_tl\citeauthor{\g__nwejm_article_bib_key_tl}
}{}
}{%
- \space\textendash\space\citeauthor{\g__nwejm_article_bib_key_tl}
+ \c_space_tl\textendash\c_space_tl\citeauthor{\g__nwejm_article_bib_key_tl}
}%
}
}
@@ -1020,14 +1012,14 @@
\thispagestyle{__nwejm_article_title_ps}%
\l__nwejm_abstract_box_tl%
\normalsize
-\tl_if_empty:NTF \l__nwejm_keywords_tl {
+\tl_if_empty:NTF \g__nwejm_keywords_tl {
\msg_warning:nn{nwejmart}{No~keyword}
}{
\l__nwejm_keywords_box_tl
\par%
\vskip .5em%
}
-\tl_if_empty:NTF \l__nwejm_msc_tl {
+\tl_if_empty:NTF \g__nwejm_msc_tl {
\msg_warning:nn{nwejmart}{No~MSC}
}{
\l__nwejm_msc_box_tl
@@ -1043,7 +1035,7 @@
\tl_gclear:N \g__nwejm_people_email_tl
\tl_clear:N \l__nwejm_people_first_last_names_tl%
}
-\DeclarePlainStyle{^^c2^^ab~}{~^^c2^^bb}{`}{'}
+\DeclarePlainStyle{«~}{~»}{`}{'}
\setcounter{topnumber}{3}
\renewcommand{\topfraction}{0.8}
\addtolength{\skip\footins}{.25\baselineskip}
@@ -1142,10 +1134,10 @@
}
\cs_new_protected:Nn \__nwejm_century_suffix:n
{
- \space{}
+ \c_space_tl{}
\GetTranslation{century}%
\int_compare:nNnT { #1 } < { 0 }{
- \space
+ \c_space_tl
\GetTranslation{before-christ}
}{
}
@@ -1245,7 +1237,6 @@
\cs_set_eq:NN \__nwejm_orig_newtheorem \newtheorem
\cs_new_protected:Nn \__nwejm_new_theorem:nnnnn
{
- \AtBeginDocument{%
\IfTranslation{English}{#1}{%
}{%
\DeclareTranslation{English}{#1}{\tl_mixed_case:n{#2}}%
@@ -1262,80 +1253,71 @@
}{%
\DeclareTranslation{Dutch}{#1}{\tl_mixed_case:n{#5}}%
}
- }
- \__nwejm_orig_newtheorem{#1}{\protect\tl_mixed_case:n{ \protect\GetTranslation{#1} }}
- \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
- \__nwejm_orig_newtheorem*{#1__nwejm_nonumbered}{\protect\tl_mixed_case:n{ \protect\GetTranslation{#1} }}
- }
+ \__nwejm_orig_newtheorem{#1}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
+ \__nwejm_orig_newtheorem*{#1__nwejm_nonumbered}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ }
}
\cs_generate_variant:Nn \__nwejm_new_theorem:nnnnn { nVVVV }
\RenewDocumentCommand \newtheorem { O{} m }
{
- \tl_clear:N \l__nwejm_newtheorem_style_tl
- \tl_clear:N \l__nwejm_newtheorem_title_tl
- \tl_clear:N \l__nwejm_newtheorem_french_title_tl
- \tl_clear:N \l__nwejm_newtheorem_english_title_tl
- \tl_clear:N \l__nwejm_newtheorem_german_title_tl
- \tl_clear:N \l__nwejm_newtheorem_dutch_title_tl
- %
- \tl_set:Nn \l__nwejm_newtheorem_english_title_tl {
- #2
- }
- \tl_set:Nf \l__nwejm_newtheorem_french_title_tl {
- \l__nwejm_newtheorem_english_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_german_title_tl {
- \l__nwejm_newtheorem_english_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl {
- \l__nwejm_newtheorem_english_title_tl
- }
- \tl_set:Nn \l__nwejm_newtheorem_style_tl {
- theorem
- }
- \__nwejm_theorem_style:n {theorem}
- \IfNoValueF {#1}
- {
- \keys_set:nn { nwejm / newtheorem } { #1 }
- \tl_if_empty:NF \l__nwejm_newtheorem_title_tl {%
- \tl_set:Nf \l__nwejm_newtheorem_english_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_french_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_german_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
- \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl
- {
- \l__nwejm_newtheorem_title_tl
- }
+ \AtBeginDocument{
+ \tl_clear:N \l__nwejm_newtheorem_style_tl
+ \tl_clear:N \l__nwejm_newtheorem_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_french_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_english_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_german_title_tl
+ \tl_clear:N \l__nwejm_newtheorem_dutch_title_tl
+ %
+ \tl_set:Nn \l__nwejm_newtheorem_english_title_tl {
+ #2
}
- }
- %
- \__nwejm_new_theorem:nVVVV
- {#2}
- {\l__nwejm_newtheorem_english_title_tl}
- {\l__nwejm_newtheorem_french_title_tl}
- {\l__nwejm_newtheorem_german_title_tl}
- {\l__nwejm_newtheorem_dutch_title_tl}
- \makesavenoteenv{#2}
- \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
- \ifcsmacro{#2*}{%
- \RenewDocumentEnvironment{#2*}{o}
- {
- \IfNoValueTF {##1}
- { \begin{#2__nwejm_nonumbered} }
- { \begin{#2__nwejm_nonumbered}[##1] }
- }{
- \end{#2__nwejm_nonumbered}
+ \tl_set:Nf \l__nwejm_newtheorem_french_title_tl {
+ \l__nwejm_newtheorem_english_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_german_title_tl {
+ \l__nwejm_newtheorem_english_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl {
+ \l__nwejm_newtheorem_english_title_tl
+ }
+ \tl_set:Nn \l__nwejm_newtheorem_style_tl {
+ theorem
+ }
+ \__nwejm_theorem_style:n {theorem}
+ \IfNoValueF {#1}
+ {
+ \keys_set:nn { nwejm / newtheorem } { #1 }
+ \tl_if_empty:NF \l__nwejm_newtheorem_title_tl {%
+ \tl_set:Nf \l__nwejm_newtheorem_english_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
}
- }{
- \NewDocumentEnvironment{#2*}{o}
+ \tl_set:Nf \l__nwejm_newtheorem_french_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_german_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
+ }
+ \tl_set:Nf \l__nwejm_newtheorem_dutch_title_tl
+ {
+ \l__nwejm_newtheorem_title_tl
+ }
+ }
+ }
+ %
+ \__nwejm_new_theorem:nVVVV
+ {#2}
+ {\l__nwejm_newtheorem_english_title_tl}
+ {\l__nwejm_newtheorem_french_title_tl}
+ {\l__nwejm_newtheorem_german_title_tl}
+ {\l__nwejm_newtheorem_dutch_title_tl}
+ \makesavenoteenv{#2}
+ \bool_if:NF {\g__nwejm_no_numbered_theorem_bool} {
+ \ifcsmacro{#2*}{%
+ \RenewDocumentEnvironment{#2*}{o}
{
\IfNoValueTF {##1}
{ \begin{#2__nwejm_nonumbered} }
@@ -1343,9 +1325,19 @@
}{
\end{#2__nwejm_nonumbered}
}
+ }{
+ \NewDocumentEnvironment{#2*}{o}
+ {
+ \IfNoValueTF {##1}
+ { \begin{#2__nwejm_nonumbered} }
+ { \begin{#2__nwejm_nonumbered}[##1] }
+ }{
+ \end{#2__nwejm_nonumbered}
+ }
+ }
}
- }
- \clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist {#2}
+ \clist_put_right:Nn \g__nwejm_counters_to_be_reset_clist {#2}
+ }
}
\newtheorem{theorem}
\newtheorem{corollary}
@@ -1626,12 +1618,6 @@
}
\bool_new:N \g__nwejm_grad_used_bool
\NewDocumentCommand \grad {} {%
- \bool_if:NTF \g__nwejm_gradient_nabla_bool {
- \operatorname{\nabla}
- }{
- \operatorname{grad}
- }%
- \peek_after:Nw \__nwejm_opx_check:
\bool_if:NTF \g__nwejm_grad_used_bool {
\bool_if:nT { (\g__nwejm_gradient_nabla_bool && !\g__nwejm_gradient_nabla_control_bool)
|| ( !\g__nwejm_gradient_nabla_bool && \g__nwejm_gradient_nabla_control_bool) } {
@@ -1641,6 +1627,12 @@
\bool_gset_eq:NN \g__nwejm_gradient_nabla_control_bool \g__nwejm_gradient_nabla_bool
\bool_gset_true:N \g__nwejm_grad_used_bool
}
+ \bool_if:NTF \g__nwejm_gradient_nabla_bool {
+ \operatorname{\nabla}
+ }{
+ \operatorname{grad}
+ }%
+ \peek_after:Nw \__nwejm_opx_check:
}
\DeclareMathOperator{\Div}{div}
\NewDocumentCommand \curl {} {%
@@ -1906,14 +1898,14 @@
{
\__nwejm_font_designer_text:n {#1}%
}
-\tl_new:N \g__nwejm_printer_text_tl%
-\cs_new_protected:Nn \__nwejm_printer_text:n
+\tl_new:N \g__nwejm_graphicdesign_text_tl%
+\cs_new_protected:Nn \__nwejm_graphicdesign_text:n
{
- \tl_gset:Nn \g__nwejm_printer_text_tl { #1 }
+ \tl_gset:Nn \g__nwejm_graphicdesign_text_tl { #1 }
}
-\NewDocumentCommand \printertext {m}
+\NewDocumentCommand \graphicdesigntext {m}
{
- \__nwejm_printer_text:n {#1}%
+ \__nwejm_graphicdesign_text:n {#1}%
}
\NewDocumentCommand \nwejm { s } {
\IfBooleanTF {#1}
@@ -1944,7 +1936,7 @@
{(0,0)\hfuzz=\maxdimen\begin}
{}{}
%%
-%% Copyright (C) 2015, 2016 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
+%% Copyright (C) 2015, 2016, 2017 by Denis Bitouze <denis.bitouze@lmpa.univ-littoral.fr>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either