texlive[60636] Master/texmf-dist: bxjaholiday (28sep21)

[commits+karl at tug.org]

Revision: 60636
          http://tug.org/svn/texlive?view=revision&revision=60636
Author:   karl
Date:     2021-09-28 22:40:39 +0200 (Tue, 28 Sep 2021)
Log Message:
-----------
bxjaholiday (28sep21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/bxjaholiday/LICENSE
    trunk/Master/texmf-dist/doc/latex/bxjaholiday/README.md
    trunk/Master/texmf-dist/doc/latex/bxjaholiday/bxjaholiday-ja.pdf
    trunk/Master/texmf-dist/doc/latex/bxjaholiday/bxjaholiday.pdf
    trunk/Master/texmf-dist/tex/latex/bxjaholiday/bxjaholiday.sty

Modified: trunk/Master/texmf-dist/doc/latex/bxjaholiday/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bxjaholiday/LICENSE	2021-09-28 20:40:23 UTC (rev 60635)
+++ trunk/Master/texmf-dist/doc/latex/bxjaholiday/LICENSE	2021-09-28 20:40:39 UTC (rev 60636)
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2018-2020 Takuto ASAKURA (wtsnjp)
+Copyright 2018-2021 Takuto ASAKURA (wtsnjp)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Modified: trunk/Master/texmf-dist/doc/latex/bxjaholiday/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bxjaholiday/README.md	2021-09-28 20:40:23 UTC (rev 60635)
+++ trunk/Master/texmf-dist/doc/latex/bxjaholiday/README.md	2021-09-28 20:40:39 UTC (rev 60636)
@@ -26,19 +26,19 @@
 * Installing the package to TEXMFHOME
 
 ```
-$ ./build.lua install --full
+$ l3build install --full
 ```
 
 * Typesetting documentation
 
 ```
-$ ./build.lua doc
+$ l3build doc
 ```
 
 * Running tests
 
 ```
-$ ./build.lua check
+$ l3build check
 ```
 
 ## License
@@ -47,17 +47,19 @@
 
 ## Revision History
 
-* Version 1.1.0  ‹2020/11/28›
+* Version 1.1.1  ‹2021-09-28›
+  * A bug fix
+* Version 1.1.0  ‹2020-11-28›
   * Add Japanese documentation
   * Support special cases in 2021
-* Version 1.0.0  ‹2019/02/03›
+* Version 1.0.0  ‹2019-02-03›
   * Add documentation
   * Rename `\g_bxjh_sport_tl` -> `\g_bxjh_sports_tl`
-* Version 0.2.0  ‹2019/01/27›
+* Version 0.2.0  ‹2019-01-27›
   * Support special holidays in 2019
   * Add new expl3 interface `\bxjh_apply_(next|prev)_day:Nnnn`
   * Fix a potential bug
-* Version 0.1.0  ‹2018/12/03›
+* Version 0.1.0  ‹2018-12-03›
   * The first public version
 
 ---

Modified: trunk/Master/texmf-dist/doc/latex/bxjaholiday/bxjaholiday-ja.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/bxjaholiday/bxjaholiday.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/tex/latex/bxjaholiday/bxjaholiday.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjaholiday/bxjaholiday.sty	2021-09-28 20:40:23 UTC (rev 60635)
+++ trunk/Master/texmf-dist/tex/latex/bxjaholiday/bxjaholiday.sty	2021-09-28 20:40:39 UTC (rev 60636)
@@ -1,7 +1,7 @@
 %%
 %% This is file 'bxjaholiday.sty'.
 %%
-%% Copyright 2018-2020 Takuto ASAKURA (wtsnjp)
+%% Copyright 2018-2021 Takuto ASAKURA (wtsnjp)
 %%   GitHub:   https://github.com/wtsnjp
 %%   Twitter:  @wtsnjp
 %%
@@ -13,7 +13,7 @@
 % -------------------------------------------------- declarations
 
 \RequirePackage{expl3}
-\ProvidesExplPackage {bxjaholiday} {2020/11/28} {1.1.0}
+\ProvidesExplPackage {bxjaholiday} {2021-09-28} {1.1.1}
   {Support for Japanese holidays}
 
 % -------------------------------------------------- utilities
@@ -850,7 +850,7 @@
 
             { 10 } % October
             {
-              \int_compare:nNnTF { #1 } > { 2020 }
+              \int_compare:nNnTF { #1 } > { 2021 }
                 {
                   \__bxjh_int_compare_and:nnT % second Monday
                     { \int_div_truncate:nn { #3 - 1 } { 7 } = 1 }
@@ -861,7 +861,9 @@
                     { \g_bxjh_sports_tl }
                 }
                 {
-                  \int_compare:nNnTF { #1 } = { 2020 }
+                  \bool_lazy_or:nnTF
+                    { \int_compare_p:n { #1 = 2020 } }
+                    { \int_compare_p:n { #1 = 2021 } }
                     {
                       % pass because of 2020 Tokyo Olympic
                     }