From 2eb672e380ea452bb22f5381711217c65fad0556 Mon Sep 17 00:00:00 2001 From: Dianne Skoll Date: Sat, 12 Mar 2022 09:33:16 -0500 Subject: [PATCH] Add LRM marks in UTF-8 locales. --- src/calendar.c | 21 ++++- tests/test-rem | 3 +- tests/test.cmp | 244 ++++++++++++++++++++++++------------------------- 3 files changed, 143 insertions(+), 125 deletions(-) diff --git a/src/calendar.c b/src/calendar.c index 0eb48c32..daeed104 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -26,6 +27,10 @@ #include #endif +#ifdef HAVE_LANGINFO_H +#include +#endif + #include "types.h" #include "protos.h" #include "expr.h" @@ -75,6 +80,8 @@ static struct line_drawing VT100Drawing = { "\x6c", "\x74", "\x6a", "\x71" }; +static int encoding_is_utf8 = 0; + static struct line_drawing UTF8Drawing = { "", "", "\xe2\x94\xb4", @@ -587,6 +594,14 @@ void ProduceCalendar(void) { int y, m, d; + /* Check if current locale is UTF-8, if we have langinfo.h */ +#ifdef HAVE_LANGINFO_H + char const *encoding = nl_langinfo(CODESET); + if (!strcasecmp(encoding, "utf-8")) { + encoding_is_utf8 = 1; + } + +#endif if (UseUTF8Chars) { linestruct = &UTF8Drawing; } else if (UseVTChars) { @@ -1196,8 +1211,10 @@ static int WriteOneColLine(int col) printf("%s", Decolorize(e->r, e->g, e->b)); } - /* Send a lrm control sequence if UseUTF8Chars is enabled */ - if (UseUTF8Chars) { + /* Send a lrm control sequence if UseUTF8Chars is enabled + or char encoding is UTF-8 + */ + if (UseUTF8Chars || encoding_is_utf8) { printf("\xE2\x80\x8E"); } /* Flesh out the rest of the column */ diff --git a/tests/test-rem b/tests/test-rem index 6ab9f782..7b15faf1 100644 --- a/tests/test-rem +++ b/tests/test-rem @@ -321,7 +321,8 @@ if test -z "$LC_ALL" ; then fi if test "$OK" = 0 ; then - export LC_ALL=en_US.utf-8 + export LC_ALL=C.UTF-8 + export LANG=C.UTF-8 fi ../src/remind -w128 -c ../tests/utf-8.rem 1 Nov 2019 >> ../tests/test.out diff --git a/tests/test.cmp b/tests/test.cmp index 5131f7d3..b9b8158d 100644 --- a/tests/test.cmp +++ b/tests/test.cmp @@ -5205,42 +5205,42 @@ Color Test (0tqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqnqqqqqqqqqqu(B (0x(B26 (0x(B27 (0x(B28 (0x(B29 (0x(B30 (0x(B31 (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BBlack (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BBlack‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BDim Red (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BDim Red‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BDim Green (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BDim Green‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BDim Blue (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BDim Blue‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BDim Cyan (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BDim Cyan‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BDim (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BMagenta (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BDim‎ (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BMagenta‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BDim Yellow(0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BDim Yellow‎(0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BDim White (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BDim White‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BBright Red(0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BBright Red‎(0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BBright (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BGreen (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BBright‎ (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BGreen‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BBright (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BBlue (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BBright‎ (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BBlue‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BBright (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BCyan (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BBright‎ (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BCyan‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BBright (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BMagenta (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BBright‎ (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BMagenta‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BBright (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BYellow (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BBright‎ (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BYellow‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BBright (0x(B (0x(B (0x(B (0x(B (0x(B -(0x(B (0x(B (0x(BWhite (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BBright‎ (0x(B (0x(B (0x(B (0x(B (0x(B +(0x(B (0x(B (0x(BWhite‎ (0x(B (0x(B (0x(B (0x(B (0x(B (0mqqqqqqqqqqvqqqqqqqqqqvqqqqqqqqqqvqqqqqqqqqqvqqqqqqqqqqvqqqqqqqqqqvqqqqqqqqqqj(B MON WKDAY DAY across year test -(1): Trig = Monday, 3 January, 2000 @@ -7668,18 +7668,18 @@ February 29 | Sunday | Monday | Tuesday |Wednesday | Thursday | Friday | Saturday | +----------+----------+----------+----------+----------+----------+----------+ | | | |1 |2 |3 |4 | -| | | |BLACK |BLUE |GREEN |CYAN | +| | | |BLACK‎ |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | -|-@0 | | |BLACK |BRIGHT |BRIGHT |BRIGHT | -| | | | |BLUE |GREEN |CYAN | +|-@0‎ | | |BLACK‎ |BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |12 |13 |14 |15 |16 |17 |18 | -| | | |RED |MAGENTA |YELLOW |WHITE | +| | | |RED‎ |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |19 |20 |21 |22 |23 |24 |25 | -| | | |BRIGHT RED|BRIGHT |BRIGHT |BRIGHT | -| | | | |MAGENTA |YELLOW |WHITE | +| | | |BRIGHT RED‎|BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | | | | | | | | | @@ -7690,18 +7690,18 @@ February 29 | Sunday | Monday | Tuesday |Wednesday | Thursday | Friday | Saturday | +----------+----------+----------+----------+----------+----------+----------+ | | | |1 |2 |3 |4 | -| | | |BLACK |BLUE |GREEN |CYAN | +| | | |BLACK‎ |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | -|-@0,0 | | |BLACK |BRIGHT |BRIGHT |BRIGHT | -| | | | |BLUE |GREEN |CYAN | +|-@0,0‎ | | |BLACK‎ |BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |12 |13 |14 |15 |16 |17 |18 | -| | | |RED |MAGENTA |YELLOW |WHITE | +| | | |RED‎ |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |19 |20 |21 |22 |23 |24 |25 | -| | | |BRIGHT RED|BRIGHT |BRIGHT |BRIGHT | -| | | | |MAGENTA |YELLOW |WHITE | +| | | |BRIGHT RED‎|BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | | | | | | | | | @@ -7712,18 +7712,18 @@ February 29 | Sunday | Monday | Tuesday |Wednesday | Thursday | Friday | Saturday | +----------+----------+----------+----------+----------+----------+----------+ | | | |1 |2 |3 |4 | -| | | |BLACK |BLUE |GREEN |CYAN | +| | | |BLACK‎ |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | -|-@0,1 | | |BLACK |BRIGHT |BRIGHT |BRIGHT | -| | | | |BLUE |GREEN |CYAN | +|-@0,1‎ | | |BLACK‎ |BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |12 |13 |14 |15 |16 |17 |18 | -| | | |RED |MAGENTA |YELLOW |WHITE | +| | | |RED‎ |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |19 |20 |21 |22 |23 |24 |25 | -| | | |BRIGHT RED|BRIGHT |BRIGHT |BRIGHT | -| | | | |MAGENTA |YELLOW |WHITE | +| | | |BRIGHT RED‎|BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | | | | | | | | | @@ -7734,18 +7734,18 @@ February 29 | Sunday | Monday | Tuesday |Wednesday | Thursday | Friday | Saturday | +----------+----------+----------+----------+----------+----------+----------+ | | | |1 |2 |3 |4 | -| | | |BLACK |BLUE |GREEN |CYAN | +| | | |BLACK‎ |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | -|-@1 | | |BLACK |BRIGHT |BRIGHT |BRIGHT | -| | | | |BLUE |GREEN |CYAN | +|-@1‎ | | |BLACK‎ |BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |12 |13 |14 |15 |16 |17 |18 | -| | | |RED |MAGENTA |YELLOW |WHITE | +| | | |RED‎ |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |19 |20 |21 |22 |23 |24 |25 | -| | | |BRIGHT RED|BRIGHT |BRIGHT |BRIGHT | -| | | | |MAGENTA |YELLOW |WHITE | +| | | |BRIGHT RED‎|BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | | | | | | | | | @@ -7756,18 +7756,18 @@ February 29 | Sunday | Monday | Tuesday |Wednesday | Thursday | Friday | Saturday | +----------+----------+----------+----------+----------+----------+----------+ | | | |1 |2 |3 |4 | -| | | |BLACK |BLUE |GREEN |CYAN | +| | | |BLACK‎ |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | -|-@1,0 | | |BLACK |BRIGHT |BRIGHT |BRIGHT | -| | | | |BLUE |GREEN |CYAN | +|-@1,0‎ | | |BLACK‎ |BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |12 |13 |14 |15 |16 |17 |18 | -| | | |RED |MAGENTA |YELLOW |WHITE | +| | | |RED‎ |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |19 |20 |21 |22 |23 |24 |25 | -| | | |BRIGHT RED|BRIGHT |BRIGHT |BRIGHT | -| | | | |MAGENTA |YELLOW |WHITE | +| | | |BRIGHT RED‎|BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | | | | | | | | | @@ -7778,18 +7778,18 @@ February 29 | Sunday | Monday | Tuesday |Wednesday | Thursday | Friday | Saturday | +----------+----------+----------+----------+----------+----------+----------+ | | | |1 |2 |3 |4 | -| | | |BLACK |BLUE |GREEN |CYAN | +| | | |BLACK‎ |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | -|-@1,1 | | |BLACK |BRIGHT |BRIGHT |BRIGHT | -| | | | |BLUE |GREEN |CYAN | +|-@1,1‎ | | |BLACK‎ |BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |12 |13 |14 |15 |16 |17 |18 | -| | | |RED |MAGENTA |YELLOW |WHITE | +| | | |RED‎ |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |19 |20 |21 |22 |23 |24 |25 | -| | | |BRIGHT RED|BRIGHT |BRIGHT |BRIGHT | -| | | | |MAGENTA |YELLOW |WHITE | +| | | |BRIGHT RED‎|BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | | | | | | | | | @@ -7800,18 +7800,18 @@ February 29 | Sunday | Monday | Tuesday |Wednesday | Thursday | Friday | Saturday | +----------+----------+----------+----------+----------+----------+----------+ | | | |1 |2 |3 |4 | -| | | |BLACK |BLUE |GREEN |CYAN | +| | | |BLACK‎ |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | -|-@2 | | |BLACK |BRIGHT |BRIGHT |BRIGHT | -| | | | |BLUE |GREEN |CYAN | +|-@2‎ | | |BLACK‎ |BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |12 |13 |14 |15 |16 |17 |18 | -| | | |RED |MAGENTA |YELLOW |WHITE | +| | | |RED‎ |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |19 |20 |21 |22 |23 |24 |25 | -| | | |BRIGHT RED|BRIGHT |BRIGHT |BRIGHT | -| | | | |MAGENTA |YELLOW |WHITE | +| | | |BRIGHT RED‎|BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | | | | | | | | | @@ -7822,18 +7822,18 @@ February 29 | Sunday | Monday | Tuesday |Wednesday | Thursday | Friday | Saturday | +----------+----------+----------+----------+----------+----------+----------+ | | | |1 |2 |3 |4 | -| | | |BLACK |BLUE |GREEN |CYAN | +| | | |BLACK‎ |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | -|-@2,0 | | |BLACK |BRIGHT |BRIGHT |BRIGHT | -| | | | |BLUE |GREEN |CYAN | +|-@2,0‎ | | |BLACK‎ |BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |12 |13 |14 |15 |16 |17 |18 | -| | | |RED |MAGENTA |YELLOW |WHITE | +| | | |RED‎ |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |19 |20 |21 |22 |23 |24 |25 | -| | | |BRIGHT RED|BRIGHT |BRIGHT |BRIGHT | -| | | | |MAGENTA |YELLOW |WHITE | +| | | |BRIGHT RED‎|BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | | | | | | | | | @@ -7844,18 +7844,18 @@ February 29 | Sunday | Monday | Tuesday |Wednesday | Thursday | Friday | Saturday | +----------+----------+----------+----------+----------+----------+----------+ | | | |1 |2 |3 |4 | -| | | |BLACK |BLUE |GREEN |CYAN | +| | | |BLACK‎ |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | -|-@2,1 | | |BLACK |BRIGHT |BRIGHT |BRIGHT | -| | | | |BLUE |GREEN |CYAN | +|-@2,1‎ | | |BLACK‎ |BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |BLUE‎ |GREEN‎ |CYAN‎ | +----------+----------+----------+----------+----------+----------+----------+ |12 |13 |14 |15 |16 |17 |18 | -| | | |RED |MAGENTA |YELLOW |WHITE | +| | | |RED‎ |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |19 |20 |21 |22 |23 |24 |25 | -| | | |BRIGHT RED|BRIGHT |BRIGHT |BRIGHT | -| | | | |MAGENTA |YELLOW |WHITE | +| | | |BRIGHT RED‎|BRIGHT‎ |BRIGHT‎ |BRIGHT‎ | +| | | | |MAGENTA‎ |YELLOW‎ |WHITE‎ | +----------+----------+----------+----------+----------+----------+----------+ |26 |27 |28 |29 |30 |31 | | | | | | | | | | @@ -7867,70 +7867,70 @@ February 29 +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+ | | | | | |1 |2 | | | | | | | | | -| | | | | |ру́сский ру́сский |ру́сский ру́сский | -| | | | | |ру́сский ру́сский |ру́сский ру́сский | -| | | | | |ру́сский ру́сский |ру́сский ру́сский | -| | | | | |ру́сский ру́сский |ру́сский ру́сский | +| | | | | |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +| | | | | |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +| | | | | |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +| | | | | |ру́сский ру́сский‎ |ру́сский ру́сский‎ | | | | | | | | | -| | | | | |עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| -| | | | | |עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| -| | | | | |עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| +| | | | | |עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +| | | | | |עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +| | | | | |עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+ |3 |4 |5 |6 |7 |8 |9 | | | | | | | | | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | | | | | | | | | -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| | | | | | | | | -| | | |With tabs and | | | | -| | | |spaces | | | | +| | | |With tabs and ‎ | | | | +| | | |spaces‎ | | | | +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+ |10 |11 |12 |13 |14 |15 |16 | | | | | | | | | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | | | | | | | | | -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| | | | | | | | | -| | | |With tabs and | | | | -| | | |spaces | | | | +| | | |With tabs and ‎ | | | | +| | | |spaces‎ | | | | +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+ |17 |18 |19 |20 |21 |22 |23 | | | | | | | | | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | | | | | | | | | -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| | | | | | | | | -| | | |With tabs and | | | | -| | | |spaces | | | | +| | | |With tabs and ‎ | | | | +| | | |spaces‎ | | | | +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+ |24 |25 |26 |27 |28 |29 |30 | | | | | | | | | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | -|ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский |ру́сский ру́сский | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | +|ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ |ру́сский ру́сский‎ | | | | | | | | | -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| -|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית|עִבְרִית עִבְרִית עִבְרִית| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| +|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎|עִבְרִית עִבְרִית עִבְרִית‎| | | | | | | | | -| | | |With tabs and | | | | -| | | |spaces | | | | +| | | |With tabs and ‎ | | | | +| | | |spaces‎ | | | | +-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+ +----------------------------------------------------------------------------+ | September 2021 | @@ -7947,9 +7947,9 @@ February 29 +----------+----------+----------+----------+----------+----------+----------+ |5 |6 |7 |8 |9 |10 |11 | | | | | | | | | -| |Labour Day|Should be | | | | | -| | |bumped to | | | | | -| | |Tuesday | | | | | +| |Labour Day‎|Should be‎ | | | | | +| | |bumped to‎ | | | | | +| | |Tuesday‎ | | | | | | | | | | | | | | | | | | | | | +----------+----------+----------+----------+----------+----------+----------+