bump version to v1.21.1, update changelog, update docs

ped7g · ped7g · commit 691a820fae94 · 2026-01-13T20:24:32.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,24 @@
 
+## [1.21.1](https://github.com/z00m128/sjasmplus/releases/tag/v1.21.1) - 16.1.2026
+- [`BPLIST`](https://z00m128.github.io/sjasmplus/documentation.html#po_bplist) supports now also MAME
+- [`SAVENEX CLOSE`](https://z00m128.github.io/sjasmplus/documentation.html#nex_close) can append multiple files
+- [numeric constants](https://z00m128.github.io/sjasmplus/documentation.html#s_numeric) can separate/group digits also by underscore
+- JR and DJNZ added to "smart" [SMC offset](https://z00m128.github.io/sjasmplus/documentation.html#s_labels) instructions: `abc+*: jr $`
+- [`SLDOPT`](https://z00m128.github.io/sjasmplus/documentation.html#po_sldopt) extended with swapon/swapoff command to adjust SLD files
+- Lua: version upgrade to 5.5.0 (from 5.4.7)
+- Lua: minor extensions and modifications to API
+- refactored: [temporary labels](https://z00m128.github.io/sjasmplus/documentation.html#s_temp_labels) must match flow only in last pass (earlier passes can differ)
+- refactored: macros now handle large amount of macros defined better (like 64ki of macros)
+- fix invalid BASIC line length in [`SAVETAP`](https://z00m128.github.io/sjasmplus/documentation.html#po_savetap) loader
+- fix local labels inside macros in modules
+- fix local-label struct name usage
+- warnings: added -Wfileorg when ORG is used to jump addresses while file output is active
+- docs: minor fixes/extensions
+
 ## [1.21.0](https://github.com/z00m128/sjasmplus/releases/tag/v1.21.0) - 15.3.2025
 - C++17 standard is now required minimum (to compile sjasmplus sources) (GCC9 for example)
 - [`INCBIN`](https://z00m128.github.io/sjasmplus/documentation.html#po_incbin), [`INCHOB`](https://z00m128.github.io/sjasmplus/documentation.html#po_inchob) and [`INCTRD`](https://z00m128.github.io/sjasmplus/documentation.html#po_inctrd) support now include paths priority (angle &lt;filename&gt; vs "filename")
-- also [`SAVENEX`](https://z00m128.github.io/sjasmplus/documentation.html#po_incbin) will respect include paths for source files (BMP, append)
+- also [`SAVENEX`](https://z00m128.github.io/sjasmplus/documentation.html#c_savenex) will respect include paths for source files (BMP, append)
 - include paths which can't be opened before assembling are now reported in error message
 - include paths which start with literal tilde '~' are reported in error message
 - include options [`-i, -I, --inc`](https://z00m128.github.io/sjasmplus/documentation.html#s_cli) can take path from next CLI argument (new recommended syntax)
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@
 EXE_BASE_NAME=sjasmplus
 
 # Set version, dir and src.tar.xz filename
-VERSION?=1.21.0
+VERSION?=1.21.1
 SRCTARFILE?=$(EXE_BASE_NAME)-$(VERSION)-src.tar.xz
 SRCTARDIR?=$(EXE_BASE_NAME)-$(VERSION)
 
diff --git a/docs/documentation.html b/docs/documentation.html
diff --git a/docs/documentation.xml b/docs/documentation.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <book id="sjasmplus_manual">
-  <title>SjASMPlus 1.21.0 Documentation [2025-03-15]</title>
+  <title>SjASMPlus 1.21.1 Documentation [2026-01-16]</title>
 
   <chapter id="introduction">
     <title>Introduction</title>
@@ -206,14 +206,14 @@
       <para><variablelist>
 
           <varlistentry>
-            <term>?.?.? - 1.21.1</term>
+            <term>16.1.2026 - 1.21.1</term>
             <listitem>
               <synopsis>
 - <link linkend="po_bplist">`BPLIST`</link> supports now also MAME
 - <link linkend="nex_close">`SAVENEX CLOSE`</link> can append multiple files
 - <link linkend="s_numeric">numeric constants</link> can separate/group digits also by underscore
 - JR and DJNZ added to "smart" <link linkend="s_labels">SMC offset</link> instructions: `abc+*: jr $`
-- <link linkend="po_sldopt">`SLDOPT`</link> extended with swapon/swapoff command to adjust SLD files.
+- <link linkend="po_sldopt">`SLDOPT`</link> extended with swapon/swapoff command to adjust SLD files
 - Lua: version upgrade to 5.5.0 (from 5.4.7)
 - Lua: minor extensions and modifications to API
 - refactored: <link linkend="s_temp_labels">temporary labels</link> must match flow only in last pass (earlier passes can differ)
@@ -223,7 +223,7 @@
 - fix local-label struct name usage
 - warnings: added -Wfileorg when ORG is used to jump addresses while file output is active
 - docs: minor fixes/extensions
-              </synopsis>
+</synopsis>
             </listitem>
           </varlistentry>
 
@@ -234,7 +234,7 @@
               <synopsis>
 - C++17 standard is now required minimum (to compile sjasmplus sources) (GCC9 for example)
 - <link linkend="po_incbin">`INCBIN`</link>, <link linkend="po_inchob">`INCHOB`</link> and <link linkend="po_inctrd">`INCTRD`</link> support now include paths priority (angle &lt;filename&gt; vs "filename")
-- also <link linkend="po_incbin">`SAVENEX`</link> will respect include paths for source files (BMP, append)
+- also <link linkend="c_savenex">`SAVENEX`</link> will respect include paths for source files (BMP, append)
 - include paths which can't be opened before assembling are now reported in error message
 - include paths which start with literal tilde '~' are reported in error message
 - include options <link linkend="s_cli">`-i, -I, --inc`</link> can take path from next CLI argument (new recommended syntax)
diff --git a/sjasm/sjdefs.h b/sjasm/sjdefs.h
@@ -30,8 +30,8 @@
 #define __SJDEFS
 
 // version string
-#define VERSION "1.21.0"
-#define VERSION_NUM "0x00011500"
+#define VERSION "1.21.1"
+#define VERSION_NUM "0x00011501"
 
 #define LASTPASS 3
 
diff --git a/tests/define/predefined_date_time.asm b/tests/define/predefined_date_time.asm
@@ -12,4 +12,4 @@
 ; 1.21.0 version check (needs update upon release)
     ASSERT 1 == (__SJASMPLUS__>>16)
     ASSERT 21 == ((__SJASMPLUS__>>8)&0xFF)
-    ASSERT 0 == (__SJASMPLUS__&0xFF)
+    ASSERT 1 == (__SJASMPLUS__&0xFF)
diff --git a/tests/test build script and options/opt version/option version.cli b/tests/test build script and options/opt version/option version.cli
@@ -3,7 +3,7 @@
 $MEMCHECK "$EXE" -Wno-behost -h | head -n 1 > help_line1.out &&\
 $MEMCHECK "$EXE" -Wno-behost --version 2> version.out &&\
 $MEMCHECK "$EXE" -Wno-behost --nologo --version 2> raw_version.out &&\
-echo "1.21.0" > raw.expected &&\
+echo "1.21.1" > raw.expected &&\
 diff -a --strip-trailing-cr help_line1.out version.out &&\
 diff -a --strip-trailing-cr raw.expected raw_version.out
 last_result=$?
