diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx index 19a54940c6..4fab47b0f4 100644 --- a/l3kernel/l3msg.dtx +++ b/l3kernel/l3msg.dtx @@ -2097,7 +2097,7 @@ \__kernel_msg_new:nnn { prop } { prop-keyval } { Missing/extra~'='~in~'#1'~(in~'..._keyval:Nn') } \__kernel_msg_new:nnn { kernel } { unknown-comparison } - { Relation~'#1'~not~among~=,~<,~>,~==,~!=,~<=,~>=. } + { Relation~'#1'~not~among~=,<,>,==,!=,<=,>=. } \__kernel_msg_new:nnn { kernel } { zero-step } { Zero~step~size~for~function~#1. } \cs_if_exist:NF \tex_expanded:D diff --git a/l3kernel/testfiles/m3compare001.luatex.tlg b/l3kernel/testfiles/m3compare001.luatex.tlg deleted file mode 100644 index bc45ab0b8a..0000000000 --- a/l3kernel/testfiles/m3compare001.luatex.tlg +++ /dev/null @@ -1,525 +0,0 @@ -This is a generated file for the LaTeX (2e + expl3) validation system. -Don't change this file in any respect. -Author: LaTeX3 Project -============================================================ -TEST 1: Comparing integers -============================================================ -1 and 1 -= |TRUE|TRUE|TRUE| -> |FALSE|FALSE||FALSE -< |FALSE|FALSE||FALSE -==|TRUE|TRUE|TRUE| -!=|FALSE|FALSE||FALSE -<=|TRUE|TRUE|TRUE| ->=|TRUE|TRUE|TRUE| --1 and -1 -= |TRUE|TRUE|TRUE| -> |FALSE|FALSE||FALSE -< |FALSE|FALSE||FALSE -==|TRUE|TRUE|TRUE| -!=|FALSE|FALSE||FALSE -<=|TRUE|TRUE|TRUE| ->=|TRUE|TRUE|TRUE| -1 and 2 -= |FALSE|FALSE||FALSE -> |FALSE|FALSE||FALSE -< |TRUE|TRUE|TRUE| -==|FALSE|FALSE||FALSE -!=|TRUE|TRUE|TRUE| -<=|TRUE|TRUE|TRUE| ->=|FALSE|FALSE||FALSE --1 and -2 -= |FALSE|FALSE||FALSE -> |TRUE|TRUE|TRUE| -< |FALSE|FALSE||FALSE -==|FALSE|FALSE||FALSE -!=|TRUE|TRUE|TRUE| -<=|FALSE|FALSE||FALSE ->=|TRUE|TRUE|TRUE| --14 and -3 -= |FALSE|FALSE||FALSE -> |FALSE|FALSE||FALSE -< |TRUE|TRUE|TRUE| -==|FALSE|FALSE||FALSE -!=|TRUE|TRUE|TRUE| -<=|TRUE|TRUE|TRUE| ->=|FALSE|FALSE||FALSE -============================================================ -============================================================ -TEST 2: Erroneous integer comparisons -============================================================ -! Missing ) inserted for expression. - -\__int_eval_end: -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -= -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -= -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -= -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -= -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -> -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -> -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -> -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -> -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -< -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -< -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -< -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -< -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -= -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -= -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -= -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -= -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -! -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -! -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -! -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -! -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -< -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -< -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -< -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -< -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -> -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -> -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -> -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing ) inserted for expression. - -> -l. ... } -I was expecting to see `+', `-', `*', `/', or `)'. Didn't. -! Missing number, treated as zero. - -\__int_eval_end: -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -= -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -= -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -= -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -= -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -> -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -> -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -> -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -> -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -< -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -< -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -< -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -< -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -= -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -= -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -= -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -= -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -! -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -! -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -! -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -! -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -< -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -< -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -< -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -< -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -> -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -> -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -> -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Missing number, treated as zero. - -> -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -3 and 3 -= |TRUE|TRUE|TRUE| -> |FALSE|FALSE||FALSE -< |FALSE|FALSE||FALSE -==|TRUE|TRUE|TRUE| -!=|FALSE|FALSE||FALSE -<=|TRUE|TRUE|TRUE| ->=|TRUE|TRUE|TRUE| -0 and 7 -= |FALSE|FALSE||FALSE -> |FALSE|FALSE||FALSE -< |TRUE|TRUE|TRUE| -==|FALSE|FALSE||FALSE -!=|TRUE|TRUE|TRUE| -<=|TRUE|TRUE|TRUE| ->=|FALSE|FALSE||FALSE -============================================================ -============================================================ -TEST 3: Some more erroneous comparisons -============================================================ -! Use of \??? doesn't match its definition. - \??? - ! LaTeX3 Error: Relation ':' not among =, <, >, ==, !=, <=, >=. -l. ... } -If you say, e.g., `\def\a1{...}', then you must always -put `1' after `\a', since control sequence names are -made up of letters only. The macro here has not been -followed by the required stuff, so I'm ignoring it. -! Use of \??? doesn't match its definition. - \??? - ! LaTeX3 Error: Relation ':' not among =, <, >, ==, !=, <=, >=. -l. ... } -If you say, e.g., `\def\a1{...}', then you must always -put `1' after `\a', since control sequence names are -made up of letters only. The macro here has not been -followed by the required stuff, so I'm ignoring it. -! Use of \??? doesn't match its definition. - \??? - ! LaTeX3 Error: Relation '\?' not among =, <, >, ==, !=, <=, >=. -l. ... } -If you say, e.g., `\def\a1{...}', then you must always -put `1' after `\a', since control sequence names are -made up of letters only. The macro here has not been -followed by the required stuff, so I'm ignoring it. -FALSEFALSEFALSE -============================================================ -============================================================ -TEST 4: Comparing more integers -============================================================ -TFTTFFTTF -============================================================ -============================================================ -TEST 5: Comparing dimensions -============================================================ -28.45274pt and 28.45274pt -= |TRUE|TRUE|TRUE| -> |FALSE|FALSE||FALSE -< |FALSE|FALSE||FALSE -==|TRUE|TRUE|TRUE| -!=|FALSE|FALSE||FALSE -<=|TRUE|TRUE|TRUE| ->=|TRUE|TRUE|TRUE| --28.45274pt and -28.45276pt -= |FALSE|FALSE||FALSE -> |TRUE|TRUE|TRUE| -< |FALSE|FALSE||FALSE -==|FALSE|FALSE||FALSE -!=|TRUE|TRUE|TRUE| -<=|FALSE|FALSE||FALSE ->=|TRUE|TRUE|TRUE| -72.26999pt and 85.35826pt -= |FALSE|FALSE||FALSE -> |FALSE|FALSE||FALSE -< |TRUE|TRUE|TRUE| -==|FALSE|FALSE||FALSE -!=|TRUE|TRUE|TRUE| -<=|TRUE|TRUE|TRUE| ->=|FALSE|FALSE||FALSE --28.45274pt and -144.54pt -= |FALSE|FALSE||FALSE -> |TRUE|TRUE|TRUE| -< |FALSE|FALSE||FALSE -==|FALSE|FALSE||FALSE -!=|TRUE|TRUE|TRUE| -<=|FALSE|FALSE||FALSE ->=|TRUE|TRUE|TRUE| --12.04503pt and -12.0pt -= |FALSE|FALSE||FALSE -> |FALSE|FALSE||FALSE -< |TRUE|TRUE|TRUE| -==|FALSE|FALSE||FALSE -!=|TRUE|TRUE|TRUE| -<=|TRUE|TRUE|TRUE| ->=|FALSE|FALSE||FALSE -============================================================ -============================================================ -TEST 6: Erroneous dimension comparisons -============================================================ -! Missing = inserted for \ifdim. - -: -l. ... } -I was expecting to see `<', `=', or `>'. Didn't. -! Missing number, treated as zero. - -: -l. ... } -A number should have been here; I inserted `0'. -(If you can't figure out why I needed to see a number, -look up `weird error' in the index to The TeXbook.) -! Illegal unit of measure (pt inserted). - -: -l. ... } -Dimensions can be in units of em, ex, in, pt, pc, -cm, mm, dd, cc, nd, nc, bp, or sp; but yours is a new one! -I'll assume that you meant to say pt, for printer's points. -To recover gracefully from this error, it's best to -delete the erroneous units; e.g., type `2' to delete -two letters. (See Chapter 27 of The TeXbook.) -:56.9055pt\exp_stop_f: FALSE28.45274pt\exp_stop_f: FALSE -============================================================ -============================================================ -TEST 7: Comparing more dimensions -============================================================ -TFFTTFTTF -============================================================ diff --git a/l3kernel/testfiles/m3compare001.tlg b/l3kernel/testfiles/m3compare001.tlg index 0b458c3bcf..e679a544ba 100644 --- a/l3kernel/testfiles/m3compare001.tlg +++ b/l3kernel/testfiles/m3compare001.tlg @@ -418,7 +418,7 @@ TEST 3: Some more erroneous comparisons ============================================================ ! Use of \??? doesn't match its definition. \??? - ! LaTeX3 Error: Relation ':' not among =, <, >, ==, !=, <=,... + ! LaTeX3 Error: Relation ':' not among =,<,>,==,!=,<=,>=. l. ... } If you say, e.g., `\def\a1{...}', then you must always put `1' after `\a', since control sequence names are @@ -426,7 +426,7 @@ made up of letters only. The macro here has not been followed by the required stuff, so I'm ignoring it. ! Use of \??? doesn't match its definition. \??? - ! LaTeX3 Error: Relation ':' not among =, <, >, ==, !=, <=,... + ! LaTeX3 Error: Relation ':' not among =,<,>,==,!=,<=,>=. l. ... } If you say, e.g., `\def\a1{...}', then you must always put `1' after `\a', since control sequence names are @@ -434,7 +434,7 @@ made up of letters only. The macro here has not been followed by the required stuff, so I'm ignoring it. ! Use of \??? doesn't match its definition. \??? - ! LaTeX3 Error: Relation '\?' not among =, <, >, ==, !=, <=... + ! LaTeX3 Error: Relation '\?' not among =,<,>,==,!=,<=,>=. l. ... } If you say, e.g., `\def\a1{...}', then you must always put `1' after `\a', since control sequence names are