2023-05-05 18:39:00

5 files changed, 24 insertions, 16 deletions

diff --git a/source/luametatex/build.sh b/source/luametatex/build.sh
index a8a834a7c..612092e7a 100644
--- a/source/luametatex/build.sh
+++ b/source/luametatex/build.sh
@@ -20,9 +20,9 @@
 
 #NINJA=$(which ninja); 
 #if (NINJA) then
-#    NINJA="-G Ninja"

-#else

-    NINJA=""

+#    NINJA="-G Ninja"
+#else
+    NINJA=""
 #fi 
 
 if [ "$1" = "mingw-64" ] || [ "$1" = "mingw64" ] || [ "$1" = "mingw" ] || [ "$1" == "--mingw64" ]
diff --git a/source/luametatex/source/luacore/readme.txt b/source/luametatex/source/luacore/readme.txt
index 89d39cb6d..23eb77311 100644
--- a/source/luametatex/source/luacore/readme.txt
+++ b/source/luametatex/source/luacore/readme.txt
@@ -3,7 +3,7 @@ About luasocket and luasec:
 Till mid 2021 we had the luasec code in the source tree but it was not used yet. It requires
 openssl which is pretty large and we need a bunch of header files. In order to compile luasec
 we need openssl headers and unfortunately there are a few included files that one need to
-make. This create a depedency unless we make a few simple ones; after all we only need it for
+make. This create a dependency unless we make a few simple ones; after all we only need it for
 a few platforms. I couldn't locate a neutral header set so it never came to compilation (I
 started making a set myself but could not motivate myself to finish it). We could use it as
 optional library (which then demands a bit different interface). But, no matter what we
diff --git a/source/luametatex/source/luaoptional/lmtoptional.c b/source/luametatex/source/luaoptional/lmtoptional.c
index 0cfbd166c..819cfc3ea 100644
--- a/source/luametatex/source/luaoptional/lmtoptional.c
+++ b/source/luametatex/source/luaoptional/lmtoptional.c
@@ -7,7 +7,7 @@
 
 /*tex
 
-    We don't want the binary top explode and have depdencies that will kill this project in the
+    We don't want the binary to explode and have depdencies that will kill this project in the
     end. So, we provide optionals: these are loaded lazy and libraries need to be present in
     the tree. They are unofficial and not supported in the sense that ConTeXt doesn't depend on
     them.
diff --git a/source/luametatex/source/tex/texcommands.c b/source/luametatex/source/tex/texcommands.c
index 91e6d75b8..3529f24d2 100644
--- a/source/luametatex/source/tex/texcommands.c
+++ b/source/luametatex/source/tex/texcommands.c
@@ -313,16 +313,16 @@ void tex_initialize_commands(void)
 
         tex_primitive(tex_command,    "accent",                         accent_cmd,             normal_code,                              0);
 
-        /*tex These three can go in one cmd: */
+        /*tex These three times two can go in one cmd: */
 
         tex_primitive(tex_command,    "advance",                        arithmic_cmd,           advance_code,                             0);
         tex_primitive(tex_command,    "divide",                         arithmic_cmd,           divide_code,                              0);
         tex_primitive(tex_command,    "multiply",                       arithmic_cmd,           multiply_code,                            0);
-        tex_primitive(tex_command,    "advanceby",                      arithmic_cmd,           advance_by_code,                          0);
-        tex_primitive(tex_command,    "divideby",                       arithmic_cmd,           divide_by_code,                           0);
-        tex_primitive(tex_command,    "multiplyby",                     arithmic_cmd,           multiply_by_code,                         0);
-     /* tex_primitive(tex_command,    "advancebyplusone",               arithmic_cmd,           advance_by_plus_one_code,                 0); */
-     /* tex_primitive(tex_command,    "advancebyminusone",              arithmic_cmd,           advance_by_minus_one_code,                0); */
+        tex_primitive(luatex_command, "advanceby",                      arithmic_cmd,           advance_by_code,                          0);
+        tex_primitive(luatex_command, "divideby",                       arithmic_cmd,           divide_by_code,                           0);
+        tex_primitive(luatex_command, "multiplyby",                     arithmic_cmd,           multiply_by_code,                         0);
+     /* tex_primitive(luatex_command, "advancebyplusone",               arithmic_cmd,           advance_by_plus_one_code,                 0); */
+     /* tex_primitive(luatex_command, "advancebyminusone",              arithmic_cmd,           advance_by_minus_one_code,                0); */
 
         /*tex We combined the after thingies into one category:*/
 
diff --git a/source/luametatex/source/tex/texscanning.c b/source/luametatex/source/tex/texscanning.c
index 8ae7090cf..c4f9b0c56 100644
--- a/source/luametatex/source/tex/texscanning.c
+++ b/source/luametatex/source/tex/texscanning.c
@@ -2427,9 +2427,9 @@ static void tex_aux_scan_dimen_unknown_unit_error(void) {
     tex_handle_error(
         normal_error_type,
         "Illegal unit of measure (pt inserted)",
-        "Dimensions can be in units of em, ex, in, pt, pc, cm, mm, dd, cc, bp, dk, or\n"
-        "sp; but yours is a new one! I'll assume that you meant to say pt, for printer's\n"
-        "points. two letters."
+        "Dimensions can be in units of em, ex, sp, cm, mm, es, ts, pt, bp, dk, pc, dd\n"
+        "cc or in; but yours is a new one! I'll assume that you meant to say pt, for\n"
+        "printer's points: two letters."
     );
 }
 
@@ -2437,8 +2437,8 @@ static void tex_aux_scan_dimen_out_of_range_error(void) {
     tex_handle_error(
         normal_error_type,
         "Dimension too large",
-        "I can't work with sizes bigger than about 19 feet. Continue and I'll use the\n"
-        "largest value I can."
+        "I can't work with sizes bigger than about 575 cm (230 es). Continue and I'll\n"
+        "use the largest value I can (16383 pt)."
     );
 }
 
@@ -2482,6 +2482,14 @@ typedef enum scanned_unit {
     to Knuth, the basis of this new revolutionary system is the potrzebie, which equals the thickness
     of Mad issue 26, or 2.2633484517438173216473 mm [...].
 
+    We also provide alternatives for the inch: the |es| and |ts|, two units dedicated to women 
+    (Edith and Tove) that come close to the inch but are more metric. Their values have been 
+    carefully callibrated at the 2023 BachoTeX meeting and a report will be published in the
+    proceedings as well as TUGboat (medio 2023). 
+
+    An additional |eu| has been introduced as a multiplier for |ts| that defaults to 10 which makes 
+    one |eu| default to one |es|. 
+
 */
 
 static int tex_aux_scan_unit(halfword *num, halfword *denom, halfword *value, halfword *order)