diff options
98 files changed, 2100 insertions, 3063 deletions
diff --git a/Documentation/TODO b/Documentation/TODO index 3067f8d28..921f20da9 100644 --- a/Documentation/TODO +++ b/Documentation/TODO @@ -24,13 +24,6 @@ lsblk btrfs specific code to provide a better output for FS based stacks. Not sure. https://bugzilla.redhat.com/show_bug.cgi?id=1084453 -cfdisk ------- - - (!) add auto-sort support (sort partitions automatically) and - --sort={auto,never,always} command line option. This feature should be - enabled by default for logical partitions if we created all container (extended - partition) in the current session. - agetty ----- - support default issue (/etc/issue) output for agetty to make it agetty @@ -132,9 +125,6 @@ libblkid - add FSSIZE value -- filesystem size (klibc requirement) - - (!) add support for Atari PT - https://github.com/karelzak/util-linux/issues/517 - - (!) add support for dasd PT (used for example on s390) libfdisk diff --git a/configure.ac b/configure.ac index 89afca602..a579c8eed 100644 --- a/configure.ac +++ b/configure.ac @@ -146,7 +146,7 @@ AC_ARG_ENABLE([asan], AS_HELP_STRING([--enable-asan], [compile with Address Sanitizer]), [], [enable_asan=no] ) -AS_IF([test "x$enable_asan" == xyes], [ +AS_IF([test "x$enable_asan" = xyes], [ UL_WARN_ADD([-fsanitize=address]) ]) @@ -1080,7 +1080,7 @@ AC_ARG_ENABLE([libmount-support-mtab], [], [enable_libmount_support_mtab=no] ) -AS_IF([test "x$enable_libmount_support_mtab" == xyes], [ +AS_IF([test "x$enable_libmount_support_mtab" = xyes], [ AC_DEFINE([USE_LIBMOUNT_SUPPORT_MTAB], [1], [Define to 1 if want to support mtab.]) ]) @@ -1202,7 +1202,7 @@ UL_BUILD_INIT([uuidd]) UL_REQUIRES_BUILD([uuidd], [libuuid]) UL_REQUIRES_HAVE([uuidd], [timer], [timer_create function]) UL_REQUIRES_HAVE([uuidd], [sys_signalfd_h], [sys/signalfd.h header]) -AS_IF([test "x$build_uuidd" = xyes || test "x$enable_libuuid_force_uuidd" == xyes ], [ +AS_IF([test "x$build_uuidd" = xyes || test "x$enable_libuuid_force_uuidd" = xyes], [ AC_DEFINE([HAVE_UUIDD], [1], [Define to 1 if you want to use uuid daemon.]) ]) AM_CONDITIONAL([BUILD_UUIDD], [test "x$build_uuidd" = xyes]) @@ -2281,7 +2281,7 @@ AC_ARG_ENABLE([usrdir-path], [], [enable_usrdir_path=no] ) -AS_IF([test "x$enable_usrdir_path" == xyes], [ +AS_IF([test "x$enable_usrdir_path" = xyes], [ AC_DEFINE([USE_USRDIR_PATHS_ONLY], [1], [Define to 1 to remove /bin and /sbin from PATH env.variable]) ]) diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c index b2a3cc153..2a4f75a8c 100644 --- a/disk-utils/fsck.cramfs.c +++ b/disk-utils/fsck.cramfs.c @@ -192,7 +192,7 @@ static void test_super(int *start, size_t * length) errx(FSCK_EX_ERROR, _("unsupported filesystem features")); /* What are valid superblock sizes? */ - if (super.size < sizeof(struct cramfs_super)) + if (super.size < *start + sizeof(struct cramfs_super)) errx(FSCK_EX_UNCORRECTED, _("superblock size (%d) too small"), super.size); @@ -220,24 +220,28 @@ static void test_crc(int start) crc = crc32(0L, NULL, 0); buf = - mmap(NULL, start + super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); if (buf == MAP_FAILED) { buf = - mmap(NULL, start + super.size, PROT_READ | PROT_WRITE, + mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (buf != MAP_FAILED) { - if (lseek(fd, start, SEEK_SET) == (off_t) -1) + ssize_t tmp; + if (lseek(fd, 0, SEEK_SET) == (off_t) -1) err(FSCK_EX_ERROR, _("seek on %s failed"), filename); - if (read(fd, (unsigned char *) buf + start, super.size) != - (ssize_t) super.size) + tmp = read(fd, buf, super.size); + if (tmp < 0) err(FSCK_EX_ERROR, _("cannot read %s"), filename); + if (tmp != (ssize_t) super.size) + errx(FSCK_EX_ERROR, _("failed to read %"PRIu32" bytes from file %s"), + super.size, filename); } } if (buf != MAP_FAILED) { ((struct cramfs_super *)((unsigned char *) buf + start))->fsid.crc = crc32(0L, NULL, 0); - crc = crc32(crc, (unsigned char *) buf + start, super.size); - munmap(buf, start + super.size); + crc = crc32(crc, (unsigned char *) buf + start, super.size - start); + munmap(buf, super.size); } else { int retval; size_t length = 0; diff --git a/misc-utils/cal.c b/misc-utils/cal.c index 438e7f09b..a110b1b8f 100644 --- a/misc-utils/cal.c +++ b/misc-utils/cal.c @@ -75,6 +75,10 @@ #include "strutils.h" #include "optutils.h" #include "timeutils.h" +#include "ttyutils.h" + +#define DOY_MONTH_WIDTH 27 /* -j month width */ +#define DOM_MONTH_WIDTH 20 /* month width */ static int has_term = 0; static const char *Senter = "", *Sexit = ""; /* enter and exit standout mode */ @@ -267,7 +271,6 @@ int main(int argc, char **argv) static struct cal_control ctl = { .reform_year = DEFAULT_REFORM_YEAR, .weekstart = SUNDAY, - .num_months = 1, /* default is "cal -1" */ .span_months = 0, .colormode = UL_COLORMODE_UNDEF, .weektype = WEEK_NUM_DISABLED, @@ -363,12 +366,11 @@ int main(int argc, char **argv) switch(ch) { case '1': - /* default */ + ctl.num_months = 1; break; case '3': ctl.num_months = 3; ctl.span_months = 1; - ctl.months_in_row = 3; break; case 's': ctl.weekstart = SUNDAY; /* default */ @@ -486,7 +488,8 @@ int main(int argc, char **argv) } if (!ctl.req.month && !ctl.req.week) { ctl.req.month = local_time->tm_mon + 1; - yflag = 1; + if (!ctl.num_months) + yflag = 1; } break; case 0: @@ -536,19 +539,32 @@ int main(int argc, char **argv) if (yflag || Yflag) { ctl.gutter_width = 3; - ctl.num_months = MONTHS_IN_YEAR; + if (!ctl.num_months) + ctl.num_months = MONTHS_IN_YEAR; if (yflag) { ctl.req.start_month = 1; /* start from Jan */ ctl.header_year = 1; /* print year number */ } } - if (ctl.num_months > 1 && ctl.months_in_row == 0) - ctl.months_in_row = ctl.julian ? MONTHS_IN_YEAR_ROW - 1 : - MONTHS_IN_YEAR_ROW; - else if (!ctl.months_in_row) + if (ctl.num_months > 1 && ctl.months_in_row == 0) { + ctl.months_in_row = MONTHS_IN_YEAR_ROW; /* default */ + + if (isatty(STDOUT_FILENO)) { + int w = get_terminal_width(STDOUT_FILENO); + int mw = ctl.julian ? DOY_MONTH_WIDTH : DOM_MONTH_WIDTH; + int extra = ((w / mw) - 1) * ctl.gutter_width; + int new_n = (w - extra) / mw; + + if (new_n < MONTHS_IN_YEAR_ROW) + ctl.months_in_row = new_n; + } + } else if (!ctl.months_in_row) ctl.months_in_row = 1; + if (!ctl.num_months) + ctl.num_months = 1; /* display at least one month */ + if (yflag || Yflag) yearly(&ctl); else @@ -796,11 +812,8 @@ static void cal_output_months(struct cal_month *month, const struct cal_control my_putstring(out); } } - if (i == NULL) { - int extra = ctl->num_months > 3 ? 0 : 1; - sprintf(out, "%*s\n", ctl->gutter_width - extra, ""); - my_putstring(out); - } + if (i == NULL) + my_putstring("\n"); } } @@ -866,9 +879,6 @@ static void yearly(const struct cal_control *ctl) my_putstring("\n\n"); } monthly(ctl); - - /* Is empty line at the end year output really needed? */ - my_putstring("\n"); } /* diff --git a/sys-utils/mount.8 b/sys-utils/mount.8 index 15aa5f1db..c5f7c1408 100644 --- a/sys-utils/mount.8 +++ b/sys-utils/mount.8 @@ -1206,6 +1206,14 @@ only for root users. The option is also supported as x-mount.mkdir, this notati is deprecated for mount.mkdir since v2.30. .SH "FILESYSTEM-SPECIFIC MOUNT OPTIONS" +You should consult the respective man page for the filesystem first. +If you want to know what options the ext4 filesystem supports, then check the +.BR ext4 (5) +man page. +If that doesn't exist, you can also check the corresponding mount page like +.BR mount.cifs (8). +Note that you might have to install the respective userland tools. +.sp The following options apply only to certain filesystems. We sort them by filesystem. They all follow the .B \-o @@ -1277,200 +1285,6 @@ These options are accepted but ignored. (However, quota utilities may react to such strings in .IR /etc/fstab .) -.SS "Mount options for btrfs" -Btrfs is a copy-on-write filesystem for Linux aimed at -implementing advanced features while focusing on fault tolerance, -repair, and easy administration. -.TP -.BI alloc_start= bytes -Debugging option to force all block allocations above a certain -byte threshold on each block device. The value is specified in -bytes, optionally with a K, M, or G suffix, case insensitive. -Default is 1MB. -.TP -.B autodefrag -Disable/enable auto defragmentation. -Auto defragmentation detects small random writes into files and queues -them up for the defrag process. Works best for small files; -not well-suited for large database workloads. -.TP -.BR check_int | check_int_data | check_int_print_mask =\fIvalue\fR -These debugging options control the behavior of the integrity checking -module(the BTRFS_FS_CHECK_INTEGRITY config option required). - -.B check_int -enables the integrity checker module, which examines all -block-write requests to ensure on-disk consistency, at a large -memory and CPU cost. - -.B check_int_data -includes extent data in the integrity checks, and -implies the check_int option. - -.B check_int_print_mask -takes a bitmask of BTRFSIC_PRINT_MASK_* values -as defined in fs/btrfs/check-integrity.c, to control the integrity -checker module behavior. - -See comments at the top of -.IR fs/btrfs/check-integrity.c -for more info. -.TP -.BI commit= seconds -Set the interval of periodic commit, 30 seconds by default. Higher -values defer data being synced to permanent storage, with obvious -consequences when the system crashes. The upper bound is not forced, -but a warning is printed if it's more than 300 seconds (5 minutes). -.TP -.BR compress | compress= \fItype\fR| compress-force | compress-force= \fItype\fR -Control BTRFS file data compression. Type may be specified as "zlib" -"lzo" or "no" (for no compression, used for remounting). If no type -is specified, zlib is used. If \fBcompress-force\fR is specified, -all files will be compressed, whether or not they compress well. -If compression is enabled, \fBnodatacow\fR and \fBnodatasum\fR are disabled. -.TP -.B degraded -Allow mounts to continue with missing devices. A read-write mount may -fail with too many devices missing, for example if a stripe member -is completely missing. -.TP -.BI device= devicepath -Specify a device during mount so that ioctls on the control device -can be avoided. Especially useful when trying to mount a multi-device -setup as root. May be specified multiple times for multiple devices. -.TP -.B discard -Disable/enable the discard mount option. -The discard function issues frequent commands to let the block device -reclaim space freed by the filesystem. -This is useful for SSD devices, thinly provisioned -LUNs and virtual machine images, but may have a significant -performance impact. (The \fBfstrim\fR command is also available to -initiate batch trims from userspace.) -.TP -.B enospc_debug -Disable/enable debugging option to be more verbose in some ENOSPC conditions. -.TP -.BI fatal_errors= action -Action to take when encountering a fatal error: - "bug" - BUG() on a fatal error. This is the default. - "panic" - panic() on a fatal error. -.TP -.B flushoncommit -The -.B flushoncommit -mount option forces any data dirtied by a write in a -prior transaction to commit as part of the current commit. This makes -the committed state a fully consistent view of the filesystem from the -application's perspective (i.e., it includes all completed filesystem -operations). This was previously the behavior only when a snapshot is -created. -.TP -.B inode_cache -Enable free inode number caching. Defaults to off due to an overflow -problem when the free space CRCs don't fit inside a single page. -.TP -.BI max_inline= bytes -Specify the maximum amount of space, in bytes, that can be inlined in -a metadata B-tree leaf. The value is specified in bytes, optionally -with a K, M, or G suffix, case insensitive. In practice, this value -is limited by the root sector size, with some space unavailable due -to leaf headers. For a 4k sectorsize, max inline data is ~3900 bytes. -.TP -.BI metadata_ratio= value -Specify that 1 metadata chunk should be allocated after every -.I value -data chunks. Off by default. -.TP -.B noacl -Enable/disable support for Posix Access Control Lists (ACLs). See the -.BR acl (5) -manual page for more information about ACLs. -.TP -.B nobarrier -Enable/disable the use of block-layer write barriers. Write barriers -ensure that certain IOs make it through the device cache and are on -persistent storage. If disabled on a device with a volatile -(non-battery-backed) write-back cache, the \fBnobarrier\fR option will -lead to filesystem corruption on a system crash or power loss. -.TP -.B nodatacow -Enable/disable data copy-on-write for newly created files. -This option implies \fBnodatasum\fR, and disables all compression. -.TP -.B nodatasum -Enable/disable data checksumming for newly created files. -This option implies \fBdatacow\fR. -.TP -.B notreelog -Enable/disable the tree logging used for fsync and O_SYNC writes. -.TP -.B recovery -Enable autorecovery attempts if a bad tree root is found at mount time. -Currently this scans a list of several previous tree roots and tries to -use the first readable. -.TP -.B rescan_uuid_tree -Force check and rebuild procedure of the UUID tree. This should not -normally be needed. -.TP -.B skip_balance -Skip automatic resume of an interrupted balance operation after mount. -May be resumed with "btrfs balance resume." -.TP -.B nospace_cache -Disable freespace cache loading without clearing the cache. -.TP -.B clear_cache -Force clearing and rebuilding of the disk space cache if something -has gone wrong. -.TP -.BR ssd | nossd | ssd_spread -Options to control ssd allocation schemes. By default, BTRFS will -enable or disable ssd allocation heuristics depending on whether a -rotational or non-rotational disk is in use. The \fBssd\fR and -\fBnossd\fR options can override this autodetection. - -The \fBssd_spread\fR mount option attempts to allocate into big chunks -of unused space, and may perform better on low-end ssds. \fBssd_spread\fR -implies \fBssd\fR, enabling all other ssd heuristics as well. -.TP -.BI subvol= path -Mount subvolume at -.IR path -rather than the root subvolume. The -.IR path -is relative to the top level subvolume. -.TP -.BI subvolid= ID -Mount subvolume specified by an ID number rather than the root subvolume. -This allows mounting of subvolumes which are not in the root of the mounted -filesystem. -You can use "btrfs subvolume list" to see subvolume ID numbers. -.TP -.BI subvolrootid= objectid " \fR(deprecated)" -Mount subvolume specified by -.IR objectid -rather than the root subvolume. -This allows mounting of subvolumes which are not in the root of the mounted -filesystem. -You can use "btrfs subvolume show " to see the object ID for a subvolume. -.TP -.BI thread_pool= number -The number of worker threads to allocate. The default number is equal -to the number of CPUs + 2, or 8, whichever is smaller. -.TP -.B user_subvol_rm_allowed -Allow subvolumes to be deleted by a non-root user. Use with caution. - -.SS "Mount options for cifs" -See the options section of the -.BR mount.cifs (8) -man page (cifs-utils package must be installed). - -.SS "Mount options for coherent" -None. - .SS "Mount options for debugfs" The debugfs filesystem is a pseudo filesystem, traditionally mounted on .IR /sys/kernel/debug . @@ -1565,9 +1379,6 @@ starting with 2.6.29. Further, this option is valid only if CONFIG_DEVPTS_MULTIPLE_INSTANCES is enabled in the kernel configuration. -.SS "Mount options for ext2, ext3 and ext4" -See the options section of the ext2(5), ext3(5) or ext4(5) man page (the e2fsprogs package must be installed). - .SS "Mount options for fat" (Note: .I fat @@ -1961,9 +1772,6 @@ or remount the filesystem read-only, or panic and halt the system.) .BR noquota | quota | usrquota | grpquota These options are accepted but ignored. -.SS "Mount options for minix" -None. - .SS "Mount options for msdos" See mount options for fat. If the @@ -1983,21 +1791,6 @@ and the current version of .B mount (2.12) does not know anything about ncpfs. -.SS "Mount options for nfs and nfs4" -See the options section of the -.BR nfs (5) -man page (the nfs-utils package must be installed). - -The -.IR nfs " and " nfs4 -implementation expects a binary argument (a -.IR "struct nfs_mount_data" ) -to the mount system call. This argument is constructed by -.BR mount.nfs (8) -and the current version of -.B mount -(2.13) does not know anything about nfs and nfs4. - .SS "Mount options for ntfs" .TP .BI iocharset= name @@ -2067,16 +1860,6 @@ The upperdir is normally on a writable filesystem. .BI workdir= directory The workdir needs to be an empty directory on the same filesystem as upperdir. -.SS "Mount options for proc" -See the options section of the -.BR proc (5) -man page. - -.SS "Mount options for ramfs" -Ramfs is a memory based filesystem. Mount it and you have it. Unmount it -and it is gone. -There are no mount options. - .SS "Mount options for reiserfs" Reiserfs is a journaling filesystem. .TP @@ -2178,100 +1961,6 @@ proper on-disk ordering of journal commits, making volatile disk write caches safe to use, at some performance penalty. If your disks are battery-backed in one way or another, disabling barriers may safely improve performance. -.SS "Mount options for romfs" -None. - -.SS "Mount options for squashfs" -None. - -.SS "Mount options for smbfs" -Just like -.IR nfs ", the " smbfs -implementation expects a binary argument (a -.IR "struct smb_mount_data" ) -to the mount system call. This argument is constructed by -.BR smbmount (8) -and the current version of -.B mount -(2.12) does not know anything about smbfs. - -.SS "Mount options for sysv" -None. - -.SS "Mount options for tmpfs" -.TP -.BI size= nbytes -Override default maximum size of the filesystem. -The size is given in bytes, and rounded up to entire pages. -The default is half of the memory. The size parameter also accepts a suffix % -to limit this tmpfs instance to that percentage of your physical RAM: -the default, when neither size nor nr_blocks is specified, is size=50% -.TP -.B nr_blocks= -The same as size, but in blocks of PAGE_CACHE_SIZE -.TP -.B nr_inodes= -The maximum number of inodes for this instance. The default -is half of the number of your physical RAM pages, or (on a -machine with highmem) the number of lowmem RAM pages, -whichever is the lower. -.PP -The tmpfs mount options for sizing (\c -.BR size , -.BR nr_blocks , -and -.BR nr_inodes ) -accept a suffix -.BR k , -.B m -or -.B g -for Ki, Mi, Gi (binary kilo (kibi), binary mega (mebi) and binary giga (gibi)) and can be changed on remount. - -.TP -.B mode= -Set initial permissions of the root directory. -.TP -.B uid= -The user id. -.TP -.B gid= -The group id. -.TP -.B mpol=[default|prefer:Node|bind:NodeList|interleave|interleave:NodeList] -Set the NUMA memory allocation policy for all files in that -instance (if the kernel CONFIG_NUMA is enabled) \(en which can be adjusted on the -fly via 'mount \-o remount \&...' -.RS -.TP -.B default -prefers to allocate memory from the local node -.TP -.B prefer:Node -prefers to allocate memory from the given Node -.TP -.B bind:NodeList -allocates memory only from nodes in NodeList -.TP -.B interleave -prefers to allocate from each node in turn -.TP -.B interleave:NodeList -allocates from each node of NodeList in turn. -.PP -The NodeList format is a comma-separated list of decimal numbers and ranges, a -range being two "hyphen-minus"-separated decimal numbers, the smallest and largest node -numbers in the range. For example, mpol=bind:0\(en3,5,7,9\(en15 - -Note that trying to mount a tmpfs with an mpol option will fail if the -running kernel does not support NUMA; and will fail if its nodelist -specifies a node which is not online. If your system relies on that -tmpfs being mounted, but from time to time runs a kernel built without -NUMA capability (perhaps a safe recovery kernel), or with fewer nodes -online, then it is advisable to omit the mpol option from automatic -mount options. It can be added later, when the tmpfs is already mounted -on MountPoint, by 'mount \-o remount,mpol=Policy:NodeList MountPoint'. - .SS "Mount options for ubifs" UBIFS is a flash filesystem which works on top of UBI volumes. Note that \fBatime\fR is not supported and is always turned off. @@ -2527,14 +2216,6 @@ Set the owner and group and mode of the file .I devices (default: uid=gid=0, mode=0444). The mode is given in octal. -.SS "Mount options for xenix" -None. - -.SS "Mount options for xfs" -See the options section of the -.BR xfs (5) -man page (the xfsprogs package must be installed). - .SH "THE LOOP DEVICE" One further possible type is a mount via the loop device. For example, the command diff --git a/sys-utils/rfkill.c b/sys-utils/rfkill.c index 75804ad41..031fe436f 100644 --- a/sys-utils/rfkill.c +++ b/sys-utils/rfkill.c @@ -45,7 +45,12 @@ * year 2009 (2.6.33) or older. */ #ifndef RFKILL_TYPE_NFC +# ifndef RFKILL_TYPE_FM +# define RFKILL_TYPE_FM RFKILL_TYPE_GPS + 1 +# endif # define RFKILL_TYPE_NFC RFKILL_TYPE_FM + 1 +# undef NUM_RFKILL_TYPES +# define NUM_RFKILL_TYPES RFKILL_TYPE_NFC + 1 #endif struct rfkill_type_str { diff --git a/sys-utils/zramctl.8 b/sys-utils/zramctl.8 index 9ca2983b9..679a8a175 100644 --- a/sys-utils/zramctl.8 +++ b/sys-utils/zramctl.8 @@ -44,7 +44,7 @@ query the status of used zram devices. If no option is given, all non-zero size zram devices are shown. .SH OPTIONS .TP -.BR \-a , " \-\-algorithm lzo" | lz4 +.BR \-a , " \-\-algorithm lzo" | lz4 | lz4hc | deflate | 842 Set the compression algorithm to be used for compressing data in the zram device. .TP .BR \-f , " \-\-find" diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c index fb64150d6..8da7b2ddb 100644 --- a/sys-utils/zramctl.c +++ b/sys-utils/zramctl.c @@ -422,16 +422,15 @@ static void fill_table_row(struct libscols_table *tb, struct zram *z) case COL_ALGORITHM: { char *alg = sysfs_strdup(sysfs, "comp_algorithm"); - if (!alg) - break; - if (strstr(alg, "[lzo]") == NULL) { - if (strstr(alg, "[lz4]") == NULL) - ; - else - str = xstrdup("lz4"); - } else - str = xstrdup("lzo"); - free(alg); + + if (alg != NULL) { + char* lbr = strrchr(alg, '['); + char* rbr = strrchr(alg, ']'); + + if (lbr != NULL && rbr != NULL && rbr - lbr > 1) + str = xstrndup(lbr + 1, rbr - lbr - 1); + free(alg); + } break; } case COL_MOUNTPOINT: @@ -539,7 +538,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Set up and control zram devices.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(_(" -a, --algorithm lzo|lz4 compression algorithm to use\n"), out); + fputs(_(" -a, --algorithm lzo|lz4|lz4hc|deflate|842 compression algorithm to use\n"), out); fputs(_(" -b, --bytes print sizes in bytes rather than in human readable format\n"), out); fputs(_(" -f, --find find a free device\n"), out); fputs(_(" -n, --noheadings don't print headings\n"), out); @@ -611,9 +610,6 @@ int main(int argc, char **argv) switch (c) { case 'a': - if (strcmp(optarg,"lzo") && strcmp(optarg,"lz4")) - errx(EXIT_FAILURE, _("unsupported algorithm: %s"), - optarg); algorithm = optarg; break; case 'b': diff --git a/tests/expected/cal/bigyear b/tests/expected/cal/bigyear index 922a81097..75bee2abc 100644 --- a/tests/expected/cal/bigyear +++ b/tests/expected/cal/bigyear @@ -2,248 +2,108 @@ Gregorian - Monday-based month December 2147483646 Mo Tu We Th Fr Sa Su - 1 2 - 3 4 5 6 7 8 9 -10 11 12 13 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 -31 + 1 2 + 3 4 5 6 7 8 9 +10 11 12 13 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 +31 Gregorian - Sunday-based month December 2147483646 Su Mo Tu We Th Fr Sa - 1 - 2 3 4 5 6 7 8 - 9 10 11 12 13 14 15 -16 17 18 19 20 21 22 -23 24 25 26 27 28 29 -30 31 + 1 + 2 3 4 5 6 7 8 + 9 10 11 12 13 14 15 +16 17 18 19 20 21 22 +23 24 25 26 27 28 29 +30 31 Julian - Monday-based month December 2147483646 Mon Tue Wed Thu Fri Sat Sun - 335 336 -337 338 339 340 341 342 343 -344 345 346 347 348 349 350 -351 352 353 354 355 356 357 -358 359 360 361 362 363 364 -365 + 335 336 +337 338 339 340 341 342 343 +344 345 346 347 348 349 350 +351 352 353 354 355 356 357 +358 359 360 361 362 363 364 +365 Julian - Sunday-based month December 2147483646 Sun Mon Tue Wed Thu Fri Sat - 335 -336 337 338 339 340 341 342 -343 344 345 346 347 348 349 -350 351 352 353 354 355 356 -357 358 359 360 361 362 363 -364 365 + 335 +336 337 338 339 340 341 342 +343 344 345 346 347 348 349 +350 351 352 353 354 355 356 +357 358 359 360 361 362 363 +364 365 Gregorian - Monday-based three months November 2147483646 December 2147483646 January 2147483647 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 2 3 4 1 2 1 2 3 4 5 6 - 5 6 7 8 9 10 11 3 4 5 6 7 8 9 7 8 9 10 11 12 13 -12 13 14 15 16 17 18 10 11 12 13 14 15 16 14 15 16 17 18 19 20 -19 20 21 22 23 24 25 17 18 19 20 21 22 23 21 22 23 24 25 26 27 -26 27 28 29 30 24 25 26 27 28 29 30 28 29 30 31 - 31 + 1 2 3 4 1 2 1 2 3 4 5 6 + 5 6 7 8 9 10 11 3 4 5 6 7 8 9 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 10 11 12 13 14 15 16 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 17 18 19 20 21 22 23 21 22 23 24 25 26 27 +26 27 28 29 30 24 25 26 27 28 29 30 28 29 30 31 + 31 Gregorian - Sunday-based three months November 2147483646 December 2147483646 January 2147483647 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 1 1 2 3 4 5 - 4 5 6 7 8 9 10 2 3 4 5 6 7 8 6 7 8 9 10 11 12 -11 12 13 14 15 16 17 9 10 11 12 13 14 15 13 14 15 16 17 18 19 -18 19 20 21 22 23 24 16 17 18 19 20 21 22 20 21 22 23 24 25 26 -25 26 27 28 29 30 23 24 25 26 27 28 29 27 28 29 30 31 - 30 31 + 1 2 3 1 1 2 3 4 5 + 4 5 6 7 8 9 10 2 3 4 5 6 7 8 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 9 10 11 12 13 14 15 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 16 17 18 19 20 21 22 20 21 22 23 24 25 26 +25 26 27 28 29 30 23 24 25 26 27 28 29 27 28 29 30 31 + 30 31 Julian - Monday-based three months November 2147483646 December 2147483646 January 2147483647 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 305 306 307 308 335 336 1 2 3 4 5 6 -309 310 311 312 313 314 315 337 338 339 340 341 342 343 7 8 9 10 11 12 13 -316 317 318 319 320 321 322 344 345 346 347 348 349 350 14 15 16 17 18 19 20 -323 324 325 326 327 328 329 351 352 353 354 355 356 357 21 22 23 24 25 26 27 -330 331 332 333 334 358 359 360 361 362 363 364 28 29 30 31 - 365 + 305 306 307 308 335 336 1 2 3 4 5 6 +309 310 311 312 313 314 315 337 338 339 340 341 342 343 7 8 9 10 11 12 13 +316 317 318 319 320 321 322 344 345 346 347 348 349 350 14 15 16 17 18 19 20 +323 324 325 326 327 328 329 351 352 353 354 355 356 357 21 22 23 24 25 26 27 +330 331 332 333 334 358 359 360 361 362 363 364 28 29 30 31 + 365 Julian - Sunday-based three months November 2147483646 December 2147483646 January 2147483647 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 305 306 307 335 1 2 3 4 5 -308 309 310 311 312 313 314 336 337 338 339 340 341 342 6 7 8 9 10 11 12 -315 316 317 318 319 320 321 343 344 345 346 347 348 349 13 14 15 16 17 18 19 -322 323 324 325 326 327 328 350 351 352 353 354 355 356 20 21 22 23 24 25 26 -329 330 331 332 333 334 357 358 359 360 361 362 363 27 28 29 30 31 - 364 365 + 305 306 307 335 1 2 3 4 5 +308 309 310 311 312 313 314 336 337 338 339 340 341 342 6 7 8 9 10 11 12 +315 316 317 318 319 320 321 343 344 345 346 347 348 349 13 14 15 16 17 18 19 +322 323 324 325 326 327 328 350 351 352 353 354 355 356 20 21 22 23 24 25 26 +329 330 331 332 333 334 357 358 359 360 361 362 363 27 28 29 30 31 + 364 365 Gregorian - Monday-based year - 2147483646 - - January February March -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 2 3 4 5 6 7 1 2 3 4 1 2 3 4 - 8 9 10 11 12 13 14 5 6 7 8 9 10 11 5 6 7 8 9 10 11 -15 16 17 18 19 20 21 12 13 14 15 16 17 18 12 13 14 15 16 17 18 -22 23 24 25 26 27 28 19 20 21 22 23 24 25 19 20 21 22 23 24 25 -29 30 31 26 27 28 26 27 28 29 30 31 - - April May June -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 6 1 2 3 - 2 3 4 5 6 7 8 7 8 9 10 11 12 13 4 5 6 7 8 9 10 - 9 10 11 12 13 14 15 14 15 16 17 18 19 20 11 12 13 14 15 16 17 -16 17 18 19 20 21 22 21 22 23 24 25 26 27 18 19 20 21 22 23 24 -23 24 25 26 27 28 29 28 29 30 31 25 26 27 28 29 30 -30 - July August September -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 1 2 - 2 3 4 5 6 7 8 6 7 8 9 10 11 12 3 4 5 6 7 8 9 - 9 10 11 12 13 14 15 13 14 15 16 17 18 19 10 11 12 13 14 15 16 -16 17 18 19 20 21 22 20 21 22 23 24 25 26 17 18 19 20 21 22 23 -23 24 25 26 27 28 29 27 28 29 30 31 24 25 26 27 28 29 30 -30 31 - October November December -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 2 3 4 5 6 7 1 2 3 4 1 2 - 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 -15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 -22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 -29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 - 31 - + January 2147483646 +Mo Tu We Th Fr Sa Su + 1 2 3 4 5 6 7 + 8 9 10 11 12 13 14 +15 16 17 18 19 20 21 +22 23 24 25 26 27 28 +29 30 31 + Gregorian - Sunday-based year - 2147483646 - - January February March -Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 5 6 1 2 3 1 2 3 - 7 8 9 10 11 12 13 4 5 6 7 8 9 10 4 5 6 7 8 9 10 -14 15 16 17 18 19 20 11 12 13 14 15 16 17 11 12 13 14 15 16 17 -21 22 23 24 25 26 27 18 19 20 21 22 23 24 18 19 20 21 22 23 24 -28 29 30 31 25 26 27 28 25 26 27 28 29 30 31 - - April May June -Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 5 6 7 1 2 3 4 5 1 2 - 8 9 10 11 12 13 14 6 7 8 9 10 11 12 3 4 5 6 7 8 9 -15 16 17 18 19 20 21 13 14 15 16 17 18 19 10 11 12 13 14 15 16 -22 23 24 25 26 27 28 20 21 22 23 24 25 26 17 18 19 20 21 22 23 -29 30 27 28 29 30 31 24 25 26 27 28 29 30 - - July August September -Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 5 6 7 1 2 3 4 1 - 8 9 10 11 12 13 14 5 6 7 8 9 10 11 2 3 4 5 6 7 8 -15 16 17 18 19 20 21 12 13 14 15 16 17 18 9 10 11 12 13 14 15 -22 23 24 25 26 27 28 19 20 21 22 23 24 25 16 17 18 19 20 21 22 -29 30 31 26 27 28 29 30 31 23 24 25 26 27 28 29 - 30 - October November December -Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 5 6 1 2 3 1 - 7 8 9 10 11 12 13 4 5 6 7 8 9 10 2 3 4 5 6 7 8 -14 15 16 17 18 19 20 11 12 13 14 15 16 17 9 10 11 12 13 14 15 -21 22 23 24 25 26 27 18 19 20 21 22 23 24 16 17 18 19 20 21 22 -28 29 30 31 25 26 27 28 29 30 23 24 25 26 27 28 29 - 30 31 - + January 2147483646 +Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 + 7 8 9 10 11 12 13 +14 15 16 17 18 19 20 +21 22 23 24 25 26 27 +28 29 30 31 + Julian - Monday-based year - 2147483646 - - January February -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 1 2 3 4 5 6 7 32 33 34 35 - 8 9 10 11 12 13 14 36 37 38 39 40 41 42 - 15 16 17 18 19 20 21 43 44 45 46 47 48 49 - 22 23 24 25 26 27 28 50 51 52 53 54 55 56 - 29 30 31 57 58 59 - - March April -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 60 61 62 63 91 - 64 65 66 67 68 69 70 92 93 94 95 96 97 98 - 71 72 73 74 75 76 77 99 100 101 102 103 104 105 - 78 79 80 81 82 83 84 106 107 108 109 110 111 112 - 85 86 87 88 89 90 113 114 115 116 117 118 119 - 120 - May June -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 121 122 123 124 125 126 152 153 154 -127 128 129 130 131 132 133 155 156 157 158 159 160 161 -134 135 136 137 138 139 140 162 163 164 165 166 167 168 -141 142 143 144 145 146 147 169 170 171 172 173 174 175 -148 149 150 151 176 177 178 179 180 181 - - July August -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 182 213 214 215 216 217 -183 184 185 186 187 188 189 218 219 220 221 222 223 224 -190 191 192 193 194 195 196 225 226 227 228 229 230 231 -197 198 199 200 201 202 203 232 233 234 235 236 237 238 -204 205 206 207 208 209 210 239 240 241 242 243 -211 212 - September October -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 244 245 274 275 276 277 278 279 280 -246 247 248 249 250 251 252 281 282 283 284 285 286 287 -253 254 255 256 257 258 259 288 289 290 291 292 293 294 -260 261 262 263 264 265 266 295 296 297 298 299 300 301 -267 268 269 270 271 272 273 302 303 304 - - November December -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 305 306 307 308 335 336 -309 310 311 312 313 314 315 337 338 339 340 341 342 343 -316 317 318 319 320 321 322 344 345 346 347 348 349 350 -323 324 325 326 327 328 329 351 352 353 354 355 356 357 -330 331 332 333 334 358 359 360 361 362 363 364 - 365 - + January 2147483646 +Mon Tue Wed Thu Fri Sat Sun + 1 2 3 4 5 6 7 + 8 9 10 11 12 13 14 + 15 16 17 18 19 20 21 + 22 23 24 25 26 27 28 + 29 30 31 + Julian - Sunday-based year - 2147483646 - - January February -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 2 3 4 5 6 32 33 34 - 7 8 9 10 11 12 13 35 36 37 38 39 40 41 - 14 15 16 17 18 19 20 42 43 44 45 46 47 48 - 21 22 23 24 25 26 27 49 50 51 52 53 54 55 - 28 29 30 31 56 57 58 59 - - March April -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 60 61 62 91 92 93 94 95 96 97 - 63 64 65 66 67 68 69 98 99 100 101 102 103 104 - 70 71 72 73 74 75 76 105 106 107 108 109 110 111 - 77 78 79 80 81 82 83 112 113 114 115 116 117 118 - 84 85 86 87 88 89 90 119 120 - - May June -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 121 122 123 124 125 152 153 -126 127 128 129 130 131 132 154 155 156 157 158 159 160 -133 134 135 136 137 138 139 161 162 163 164 165 166 167 -140 141 142 143 144 145 146 168 169 170 171 172 173 174 -147 148 149 150 151 175 176 177 178 179 180 181 - - July August -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -182 183 184 185 186 187 188 213 214 215 216 -189 190 191 192 193 194 195 217 218 219 220 221 222 223 -196 197 198 199 200 201 202 224 225 226 227 228 229 230 -203 204 205 206 207 208 209 231 232 233 234 235 236 237 -210 211 212 238 239 240 241 242 243 - - September October -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 244 274 275 276 277 278 279 -245 246 247 248 249 250 251 280 281 282 283 284 285 286 -252 253 254 255 256 257 258 287 288 289 290 291 292 293 -259 260 261 262 263 264 265 294 295 296 297 298 299 300 -266 267 268 269 270 271 272 301 302 303 304 -273 - November December -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 305 306 307 335 -308 309 310 311 312 313 314 336 337 338 339 340 341 342 -315 316 317 318 319 320 321 343 344 345 346 347 348 349 -322 323 324 325 326 327 328 350 351 352 353 354 355 356 -329 330 331 332 333 334 357 358 359 360 361 362 363 - 364 365 - + January 2147483646 +Sun Mon Tue Wed Thu Fri Sat + 1 2 3 4 5 6 + 7 8 9 10 11 12 13 + 14 15 16 17 18 19 20 + 21 22 23 24 25 26 27 + 28 29 30 31 + diff --git a/tests/expected/cal/bigyearw b/tests/expected/cal/bigyearw index daca5f1d1..9f0c06684 100644 --- a/tests/expected/cal/bigyearw +++ b/tests/expected/cal/bigyearw @@ -2,248 +2,108 @@ Gregorian - Monday-based month with week numbers December 2147483646 Mo Tu We Th Fr Sa Su -48 1 2 -49 3 4 5 6 7 8 9 -50 10 11 12 13 14 15 16 -51 17 18 19 20 21 22 23 -52 24 25 26 27 28 29 30 - 1 31 +48 1 2 +49 3 4 5 6 7 8 9 +50 10 11 12 13 14 15 16 +51 17 18 19 20 21 22 23 +52 24 25 26 27 28 29 30 + 1 31 Gregorian - Sunday-based month with week numbers December 2147483646 Su Mo Tu We Th Fr Sa -48 1 -49 2 3 4 5 6 7 8 -50 9 10 11 12 13 14 15 -51 16 17 18 19 20 21 22 -52 23 24 25 26 27 28 29 -53 30 31 +48 1 +49 2 3 4 5 6 7 8 +50 9 10 11 12 13 14 15 +51 16 17 18 19 20 21 22 +52 23 24 25 26 27 28 29 +53 30 31 Julian - Monday-based month with week numbers December 2147483646 Mon Tue Wed Thu Fri Sat Sun -48 335 336 -49 337 338 339 340 341 342 343 -50 344 345 346 347 348 349 350 -51 351 352 353 354 355 356 357 -52 358 359 360 361 362 363 364 - 1 365 +48 335 336 +49 337 338 339 340 341 342 343 +50 344 345 346 347 348 349 350 +51 351 352 353 354 355 356 357 +52 358 359 360 361 362 363 364 + 1 365 Julian - Sunday-based month with week numbers December 2147483646 Sun Mon Tue Wed Thu Fri Sat -48 335 -49 336 337 338 339 340 341 342 -50 343 344 345 346 347 348 349 -51 350 351 352 353 354 355 356 -52 357 358 359 360 361 362 363 -53 364 365 +48 335 +49 336 337 338 339 340 341 342 +50 343 344 345 346 347 348 349 +51 350 351 352 353 354 355 356 +52 357 358 359 360 361 362 363 +53 364 365 Gregorian - Monday-based three months with week numbers November 2147483646 December 2147483646 January 2147483647 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -44 1 2 3 4 48 1 2 1 1 2 3 4 5 6 -45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 -46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 -47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 -48 26 27 28 29 30 52 24 25 26 27 28 29 30 5 28 29 30 31 - 1 31 +44 1 2 3 4 48 1 2 1 1 2 3 4 5 6 +45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 +46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 +47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 +48 26 27 28 29 30 52 24 25 26 27 28 29 30 5 28 29 30 31 + 1 31 Gregorian - Sunday-based three months with week numbers November 2147483646 December 2147483646 January 2147483647 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -44 1 2 3 48 1 1 1 2 3 4 5 -45 4 5 6 7 8 9 10 49 2 3 4 5 6 7 8 2 6 7 8 9 10 11 12 -46 11 12 13 14 15 16 17 50 9 10 11 12 13 14 15 3 13 14 15 16 17 18 19 -47 18 19 20 21 22 23 24 51 16 17 18 19 20 21 22 4 20 21 22 23 24 25 26 -48 25 26 27 28 29 30 52 23 24 25 26 27 28 29 5 27 28 29 30 31 - 53 30 31 +44 1 2 3 48 1 1 1 2 3 4 5 +45 4 5 6 7 8 9 10 49 2 3 4 5 6 7 8 2 6 7 8 9 10 11 12 +46 11 12 13 14 15 16 17 50 9 10 11 12 13 14 15 3 13 14 15 16 17 18 19 +47 18 19 20 21 22 23 24 51 16 17 18 19 20 21 22 4 20 21 22 23 24 25 26 +48 25 26 27 28 29 30 52 23 24 25 26 27 28 29 5 27 28 29 30 31 + 53 30 31 Julian - Monday-based three months with week numbers November 2147483646 December 2147483646 January 2147483647 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 305 306 307 308 48 335 336 1 1 2 3 4 5 6 -45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 2 7 8 9 10 11 12 13 -46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 3 14 15 16 17 18 19 20 -47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 4 21 22 23 24 25 26 27 -48 330 331 332 333 334 52 358 359 360 361 362 363 364 5 28 29 30 31 - 1 365 +44 305 306 307 308 48 335 336 1 1 2 3 4 5 6 +45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 2 7 8 9 10 11 12 13 +46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 3 14 15 16 17 18 19 20 +47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 4 21 22 23 24 25 26 27 +48 330 331 332 333 334 52 358 359 360 361 362 363 364 5 28 29 30 31 + 1 365 Julian - Sunday-based three months with week numbers November 2147483646 December 2147483646 January 2147483647 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -44 305 306 307 48 335 1 1 2 3 4 5 -45 308 309 310 311 312 313 314 49 336 337 338 339 340 341 342 2 6 7 8 9 10 11 12 -46 315 316 317 318 319 320 321 50 343 344 345 346 347 348 349 3 13 14 15 16 17 18 19 -47 322 323 324 325 326 327 328 51 350 351 352 353 354 355 356 4 20 21 22 23 24 25 26 -48 329 330 331 332 333 334 52 357 358 359 360 361 362 363 5 27 28 29 30 31 - 53 364 365 +44 305 306 307 48 335 1 1 2 3 4 5 +45 308 309 310 311 312 313 314 49 336 337 338 339 340 341 342 2 6 7 8 9 10 11 12 +46 315 316 317 318 319 320 321 50 343 344 345 346 347 348 349 3 13 14 15 16 17 18 19 +47 322 323 324 325 326 327 328 51 350 351 352 353 354 355 356 4 20 21 22 23 24 25 26 +48 329 330 331 332 333 334 52 357 358 359 360 361 362 363 5 27 28 29 30 31 + 53 364 365 Gregorian - Monday-based year with week numbers - 2147483646 - - January February March - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 6 7 5 1 2 3 4 9 1 2 3 4 - 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 10 5 6 7 8 9 10 11 - 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 11 12 13 14 15 16 17 18 - 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 12 19 20 21 22 23 24 25 - 5 29 30 31 9 26 27 28 13 26 27 28 29 30 31 - - April May June - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -13 1 18 1 2 3 4 5 6 22 1 2 3 -14 2 3 4 5 6 7 8 19 7 8 9 10 11 12 13 23 4 5 6 7 8 9 10 -15 9 10 11 12 13 14 15 20 14 15 16 17 18 19 20 24 11 12 13 14 15 16 17 -16 16 17 18 19 20 21 22 21 21 22 23 24 25 26 27 25 18 19 20 21 22 23 24 -17 23 24 25 26 27 28 29 22 28 29 30 31 26 25 26 27 28 29 30 -18 30 - July August September - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -26 1 31 1 2 3 4 5 35 1 2 -27 2 3 4 5 6 7 8 32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 -28 9 10 11 12 13 14 15 33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 -29 16 17 18 19 20 21 22 34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 -30 23 24 25 26 27 28 29 35 27 28 29 30 31 39 24 25 26 27 28 29 30 -31 30 31 - October November December - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -40 1 2 3 4 5 6 7 44 1 2 3 4 48 1 2 -41 8 9 10 11 12 13 14 45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 -42 15 16 17 18 19 20 21 46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 -43 22 23 24 25 26 27 28 47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 -44 29 30 31 48 26 27 28 29 30 52 24 25 26 27 28 29 30 - 1 31 - + January 2147483646 + Mo Tu We Th Fr Sa Su + 1 1 2 3 4 5 6 7 + 2 8 9 10 11 12 13 14 + 3 15 16 17 18 19 20 21 + 4 22 23 24 25 26 27 28 + 5 29 30 31 + Gregorian - Sunday-based year with week numbers - 2147483646 - - January February March - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 4 5 6 5 1 2 3 9 1 2 3 - 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 10 4 5 6 7 8 9 10 - 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 11 11 12 13 14 15 16 17 - 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 12 18 19 20 21 22 23 24 - 5 28 29 30 31 9 25 26 27 28 13 25 26 27 28 29 30 31 - - April May June - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -14 1 2 3 4 5 6 7 18 1 2 3 4 5 22 1 2 -15 8 9 10 11 12 13 14 19 6 7 8 9 10 11 12 23 3 4 5 6 7 8 9 -16 15 16 17 18 19 20 21 20 13 14 15 16 17 18 19 24 10 11 12 13 14 15 16 -17 22 23 24 25 26 27 28 21 20 21 22 23 24 25 26 25 17 18 19 20 21 22 23 -18 29 30 22 27 28 29 30 31 26 24 25 26 27 28 29 30 - - July August September - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -27 1 2 3 4 5 6 7 31 1 2 3 4 35 1 -28 8 9 10 11 12 13 14 32 5 6 7 8 9 10 11 36 2 3 4 5 6 7 8 -29 15 16 17 18 19 20 21 33 12 13 14 15 16 17 18 37 9 10 11 12 13 14 15 -30 22 23 24 25 26 27 28 34 19 20 21 22 23 24 25 38 16 17 18 19 20 21 22 -31 29 30 31 35 26 27 28 29 30 31 39 23 24 25 26 27 28 29 - 40 30 - October November December - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -40 1 2 3 4 5 6 44 1 2 3 48 1 -41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10 49 2 3 4 5 6 7 8 -42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 50 9 10 11 12 13 14 15 -43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 51 16 17 18 19 20 21 22 -44 28 29 30 31 48 25 26 27 28 29 30 52 23 24 25 26 27 28 29 - 53 30 31 - + January 2147483646 + Su Mo Tu We Th Fr Sa + 1 1 2 3 4 5 6 + 2 7 8 9 10 11 12 13 + 3 14 15 16 17 18 19 20 + 4 21 22 23 24 25 26 27 + 5 28 29 30 31 + Julian - Monday-based year with week numbers - 2147483646 - - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 1 1 2 3 4 5 6 7 5 32 33 34 35 - 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 - 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 - 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 - 5 29 30 31 9 57 58 59 - - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 60 61 62 63 13 91 -10 64 65 66 67 68 69 70 14 92 93 94 95 96 97 98 -11 71 72 73 74 75 76 77 15 99 100 101 102 103 104 105 -12 78 79 80 81 82 83 84 16 106 107 108 109 110 111 112 -13 85 86 87 88 89 90 17 113 114 115 116 117 118 119 - 18 120 - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -18 121 122 123 124 125 126 22 152 153 154 -19 127 128 129 130 131 132 133 23 155 156 157 158 159 160 161 -20 134 135 136 137 138 139 140 24 162 163 164 165 166 167 168 -21 141 142 143 144 145 146 147 25 169 170 171 172 173 174 175 -22 148 149 150 151 26 176 177 178 179 180 181 - - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -26 182 31 213 214 215 216 217 -27 183 184 185 186 187 188 189 32 218 219 220 221 222 223 224 -28 190 191 192 193 194 195 196 33 225 226 227 228 229 230 231 -29 197 198 199 200 201 202 203 34 232 233 234 235 236 237 238 -30 204 205 206 207 208 209 210 35 239 240 241 242 243 -31 211 212 - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -35 244 245 40 274 275 276 277 278 279 280 -36 246 247 248 249 250 251 252 41 281 282 283 284 285 286 287 -37 253 254 255 256 257 258 259 42 288 289 290 291 292 293 294 -38 260 261 262 263 264 265 266 43 295 296 297 298 299 300 301 -39 267 268 269 270 271 272 273 44 302 303 304 - - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 305 306 307 308 48 335 336 -45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 -46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 -47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 -48 330 331 332 333 334 52 358 359 360 361 362 363 364 - 1 365 - + January 2147483646 + Mon Tue Wed Thu Fri Sat Sun + 1 1 2 3 4 5 6 7 + 2 8 9 10 11 12 13 14 + 3 15 16 17 18 19 20 21 + 4 22 23 24 25 26 27 28 + 5 29 30 31 + Julian - Sunday-based year with week numbers - 2147483646 - - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 3 4 5 6 5 32 33 34 - 2 7 8 9 10 11 12 13 6 35 36 37 38 39 40 41 - 3 14 15 16 17 18 19 20 7 42 43 44 45 46 47 48 - 4 21 22 23 24 25 26 27 8 49 50 51 52 53 54 55 - 5 28 29 30 31 9 56 57 58 59 - - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 9 60 61 62 14 91 92 93 94 95 96 97 -10 63 64 65 66 67 68 69 15 98 99 100 101 102 103 104 -11 70 71 72 73 74 75 76 16 105 106 107 108 109 110 111 -12 77 78 79 80 81 82 83 17 112 113 114 115 116 117 118 -13 84 85 86 87 88 89 90 18 119 120 - - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 121 122 123 124 125 22 152 153 -19 126 127 128 129 130 131 132 23 154 155 156 157 158 159 160 -20 133 134 135 136 137 138 139 24 161 162 163 164 165 166 167 -21 140 141 142 143 144 145 146 25 168 169 170 171 172 173 174 -22 147 148 149 150 151 26 175 176 177 178 179 180 181 - - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -27 182 183 184 185 186 187 188 31 213 214 215 216 -28 189 190 191 192 193 194 195 32 217 218 219 220 221 222 223 -29 196 197 198 199 200 201 202 33 224 225 226 227 228 229 230 -30 203 204 205 206 207 208 209 34 231 232 233 234 235 236 237 -31 210 211 212 35 238 239 240 241 242 243 - - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -35 244 40 274 275 276 277 278 279 -36 245 246 247 248 249 250 251 41 280 281 282 283 284 285 286 -37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 -38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 -39 266 267 268 269 270 271 272 44 301 302 303 304 -40 273 - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -44 305 306 307 48 335 -45 308 309 310 311 312 313 314 49 336 337 338 339 340 341 342 -46 315 316 317 318 319 320 321 50 343 344 345 346 347 348 349 -47 322 323 324 325 326 327 328 51 350 351 352 353 354 355 356 -48 329 330 331 332 333 334 52 357 358 359 360 361 362 363 - 53 364 365 - + January 2147483646 + Sun Mon Tue Wed Thu Fri Sat + 1 1 2 3 4 5 6 + 2 7 8 9 10 11 12 13 + 3 14 15 16 17 18 19 20 + 4 21 22 23 24 25 26 27 + 5 28 29 30 31 + diff --git a/tests/expected/cal/color b/tests/expected/cal/color index 1936ac2b8..7147ccaef 100644 --- a/tests/expected/cal/color +++ b/tests/expected/cal/color @@ -2,54 +2,54 @@ First day January 0001 Su Mo Tu We Th Fr Sa - [7m 1[27m - 2 3 4 5 6 7 8 - 9 10 11 12 13 14 15 -16 17 18 19 20 21 22 -23 24 25 26 27 28 29 -30 31 + [7m 1[27m + 2 3 4 5 6 7 8 + 9 10 11 12 13 14 15 +16 17 18 19 20 21 22 +23 24 25 26 27 28 29 +30 31 Reformation corner cases 1 September 1752 Su Mo Tu We Th Fr Sa - 1 [7m 2[27m 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - - - + 1 [7m 2[27m 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + + + Reformation corner cases 2 September 1752 Su Mo Tu We Th Fr Sa - 1 2 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - - - + 1 2 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + + + Reformation corner cases 3 September 1752 Su Mo Tu We Th Fr Sa - 1 2 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - - - + 1 2 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + + + Reformation corner cases 4 September 1752 Su Mo Tu We Th Fr Sa - 1 2 [7m14[27m 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - - - + 1 2 [7m14[27m 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + + + Last day November 9999 December 9999 January 10000 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 5 6 1 2 3 4 1 - 7 8 9 10 11 12 13 5 6 7 8 9 10 11 2 3 4 5 6 7 8 -14 15 16 17 18 19 20 12 13 14 15 16 17 18 9 10 11 12 13 14 15 -21 22 23 24 25 26 27 19 20 21 22 23 24 25 16 17 18 19 20 21 22 -28 29 30 26 27 28 29 30 [7m31[27m 23 24 25 26 27 28 29 - 30 31 + 1 2 3 4 5 6 1 2 3 4 1 + 7 8 9 10 11 12 13 5 6 7 8 9 10 11 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 12 13 14 15 16 17 18 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 19 20 21 22 23 24 25 16 17 18 19 20 21 22 +28 29 30 26 27 28 29 30 [7m31[27m 23 24 25 26 27 28 29 + 30 31 diff --git a/tests/expected/cal/colorw b/tests/expected/cal/colorw index fa0727c7d..5ecab6f82 100644 --- a/tests/expected/cal/colorw +++ b/tests/expected/cal/colorw @@ -2,54 +2,54 @@ First day with week numbers January 0001 Su Mo Tu We Th Fr Sa - 1 [7m 1[27m - 2 2 3 4 5 6 7 8 - 3 9 10 11 12 13 14 15 - 4 16 17 18 19 20 21 22 - 5 23 24 25 26 27 28 29 - 6 30 31 + 1 [7m 1[27m + 2 2 3 4 5 6 7 8 + 3 9 10 11 12 13 14 15 + 4 16 17 18 19 20 21 22 + 5 23 24 25 26 27 28 29 + 6 30 31 Reformation corner cases 1 with week numbers September 1752 Su Mo Tu We Th Fr Sa -36 1 [7m 2[27m 14 15 16 -37 17 18 19 20 21 22 23 -38 24 25 26 27 28 29 30 - - - +36 1 [7m 2[27m 14 15 16 +37 17 18 19 20 21 22 23 +38 24 25 26 27 28 29 30 + + + Reformation corner cases 2 with week numbers September 1752 Su Mo Tu We Th Fr Sa -36 1 2 14 15 16 -37 17 18 19 20 21 22 23 -38 24 25 26 27 28 29 30 - - - +36 1 2 14 15 16 +37 17 18 19 20 21 22 23 +38 24 25 26 27 28 29 30 + + + Reformation corner cases 3 with week numbers September 1752 Su Mo Tu We Th Fr Sa -36 1 2 14 15 16 -37 17 18 19 20 21 22 23 -38 24 25 26 27 28 29 30 - - - +36 1 2 14 15 16 +37 17 18 19 20 21 22 23 +38 24 25 26 27 28 29 30 + + + Reformation corner cases 4 with week numbers September 1752 Su Mo Tu We Th Fr Sa -36 1 2 [7m14[27m 15 16 -37 17 18 19 20 21 22 23 -38 24 25 26 27 28 29 30 - - - +36 1 2 [7m14[27m 15 16 +37 17 18 19 20 21 22 23 +38 24 25 26 27 28 29 30 + + + Last day with week numbers November 9999 December 9999 January 10000 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -45 1 2 3 4 5 6 49 1 2 3 4 1 1 -46 7 8 9 10 11 12 13 50 5 6 7 8 9 10 11 2 2 3 4 5 6 7 8 -47 14 15 16 17 18 19 20 51 12 13 14 15 16 17 18 3 9 10 11 12 13 14 15 -48 21 22 23 24 25 26 27 52 19 20 21 22 23 24 25 4 16 17 18 19 20 21 22 -49 28 29 30 53 26 27 28 29 30 [7m31[27m 5 23 24 25 26 27 28 29 - 6 30 31 +45 1 2 3 4 5 6 49 1 2 3 4 1 1 +46 7 8 9 10 11 12 13 50 5 6 7 8 9 10 11 2 2 3 4 5 6 7 8 +47 14 15 16 17 18 19 20 51 12 13 14 15 16 17 18 3 9 10 11 12 13 14 15 +48 21 22 23 24 25 26 27 52 19 20 21 22 23 24 25 4 16 17 18 19 20 21 22 +49 28 29 30 53 26 27 28 29 30 [7m31[27m 5 23 24 25 26 27 28 29 + 6 30 31 diff --git a/tests/expected/cal/jan1753-3w b/tests/expected/cal/jan1753-3w index 0db08a9ad..80d3d0109 100644 --- a/tests/expected/cal/jan1753-3w +++ b/tests/expected/cal/jan1753-3w @@ -1,9 +1,9 @@ Sunday-based 1753 week numbers December 1752 January 1753 February 1753 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -47 1 2 1 1 2 3 4 5 6 5 1 2 3 -48 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 -49 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 -50 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 -51 24 25 26 27 28 29 30 5 28 29 30 31 9 25 26 27 28 -52 31 +47 1 2 1 1 2 3 4 5 6 5 1 2 3 +48 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 +49 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 +50 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 +51 24 25 26 27 28 29 30 5 28 29 30 31 9 25 26 27 28 +52 31 diff --git a/tests/expected/cal/jan1753-m3w b/tests/expected/cal/jan1753-m3w index 98a9bd9bf..8de81feee 100644 --- a/tests/expected/cal/jan1753-m3w +++ b/tests/expected/cal/jan1753-m3w @@ -1,9 +1,9 @@ Monday-based 1753 week numbers December 1752 January 1753 February 1753 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -47 1 2 3 1 1 2 3 4 5 6 7 5 1 2 3 4 -48 4 5 6 7 8 9 10 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 -49 11 12 13 14 15 16 17 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 -50 18 19 20 21 22 23 24 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 -51 25 26 27 28 29 30 31 5 29 30 31 9 26 27 28 - +47 1 2 3 1 1 2 3 4 5 6 7 5 1 2 3 4 +48 4 5 6 7 8 9 10 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 +49 11 12 13 14 15 16 17 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 +50 18 19 20 21 22 23 24 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 +51 25 26 27 28 29 30 31 5 29 30 31 9 26 27 28 + diff --git a/tests/expected/cal/month-1m b/tests/expected/cal/month-1m index a74096338..58cc28a9a 100644 --- a/tests/expected/cal/month-1m +++ b/tests/expected/cal/month-1m @@ -1,9 +1,9 @@ Gregorian - Monday-based week September 2006 Mo Tu We Th Fr Sa Su - 1 2 3 - 4 5 6 7 8 9 10 -11 12 13 14 15 16 17 -18 19 20 21 22 23 24 -25 26 27 28 29 30 - + 1 2 3 + 4 5 6 7 8 9 10 +11 12 13 14 15 16 17 +18 19 20 21 22 23 24 +25 26 27 28 29 30 + diff --git a/tests/expected/cal/month-1mj b/tests/expected/cal/month-1mj index a6bc2fc7c..b415f9ae8 100644 --- a/tests/expected/cal/month-1mj +++ b/tests/expected/cal/month-1mj @@ -1,9 +1,9 @@ Julian - Monday-based week September 2006 Mon Tue Wed Thu Fri Sat Sun - 244 245 246 -247 248 249 250 251 252 253 -254 255 256 257 258 259 260 -261 262 263 264 265 266 267 -268 269 270 271 272 273 - + 244 245 246 +247 248 249 250 251 252 253 +254 255 256 257 258 259 260 +261 262 263 264 265 266 267 +268 269 270 271 272 273 + diff --git a/tests/expected/cal/month-1mjw b/tests/expected/cal/month-1mjw index f728e0a93..f44d2c074 100644 --- a/tests/expected/cal/month-1mjw +++ b/tests/expected/cal/month-1mjw @@ -1,9 +1,9 @@ Julian - Monday-based week with week numbers September 2006 Mon Tue Wed Thu Fri Sat Sun -35 244 245 246 -36 247 248 249 250 251 252 253 -37 254 255 256 257 258 259 260 -38 261 262 263 264 265 266 267 -39 268 269 270 271 272 273 - +35 244 245 246 +36 247 248 249 250 251 252 253 +37 254 255 256 257 258 259 260 +38 261 262 263 264 265 266 267 +39 268 269 270 271 272 273 + diff --git a/tests/expected/cal/month-1mw b/tests/expected/cal/month-1mw index 4424facdb..67e727c03 100644 --- a/tests/expected/cal/month-1mw +++ b/tests/expected/cal/month-1mw @@ -1,9 +1,9 @@ Gregorian - Monday-based week with week numbers September 2006 Mo Tu We Th Fr Sa Su -35 1 2 3 -36 4 5 6 7 8 9 10 -37 11 12 13 14 15 16 17 -38 18 19 20 21 22 23 24 -39 25 26 27 28 29 30 - +35 1 2 3 +36 4 5 6 7 8 9 10 +37 11 12 13 14 15 16 17 +38 18 19 20 21 22 23 24 +39 25 26 27 28 29 30 + diff --git a/tests/expected/cal/month-1s b/tests/expected/cal/month-1s index e5e2e1a85..f0aa3977c 100644 --- a/tests/expected/cal/month-1s +++ b/tests/expected/cal/month-1s @@ -1,9 +1,9 @@ Gregorian - Sunday-based week September 2006 Su Mo Tu We Th Fr Sa - 1 2 - 3 4 5 6 7 8 9 -10 11 12 13 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - + 1 2 + 3 4 5 6 7 8 9 +10 11 12 13 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + diff --git a/tests/expected/cal/month-1sj b/tests/expected/cal/month-1sj index 93bf73b12..3d48b4970 100644 --- a/tests/expected/cal/month-1sj +++ b/tests/expected/cal/month-1sj @@ -1,9 +1,9 @@ Julian - Sunday-based week September 2006 Sun Mon Tue Wed Thu Fri Sat - 244 245 -246 247 248 249 250 251 252 -253 254 255 256 257 258 259 -260 261 262 263 264 265 266 -267 268 269 270 271 272 273 - + 244 245 +246 247 248 249 250 251 252 +253 254 255 256 257 258 259 +260 261 262 263 264 265 266 +267 268 269 270 271 272 273 + diff --git a/tests/expected/cal/month-1sjw b/tests/expected/cal/month-1sjw index ad9bc5065..e85420bea 100644 --- a/tests/expected/cal/month-1sjw +++ b/tests/expected/cal/month-1sjw @@ -1,9 +1,9 @@ Julian - Sunday-based week with week numbers September 2006 Sun Mon Tue Wed Thu Fri Sat -35 244 245 -36 246 247 248 249 250 251 252 -37 253 254 255 256 257 258 259 -38 260 261 262 263 264 265 266 -39 267 268 269 270 271 272 273 - +35 244 245 +36 246 247 248 249 250 251 252 +37 253 254 255 256 257 258 259 +38 260 261 262 263 264 265 266 +39 267 268 269 270 271 272 273 + diff --git a/tests/expected/cal/month-1sw b/tests/expected/cal/month-1sw index c7e676bdb..0f6be3c0f 100644 --- a/tests/expected/cal/month-1sw +++ b/tests/expected/cal/month-1sw @@ -1,9 +1,9 @@ Gregorian - Sunday-based week with week numbers September 2006 Su Mo Tu We Th Fr Sa -35 1 2 -36 3 4 5 6 7 8 9 -37 10 11 12 13 14 15 16 -38 17 18 19 20 21 22 23 -39 24 25 26 27 28 29 30 - +35 1 2 +36 3 4 5 6 7 8 9 +37 10 11 12 13 14 15 16 +38 17 18 19 20 21 22 23 +39 24 25 26 27 28 29 30 + diff --git a/tests/expected/cal/month-3m b/tests/expected/cal/month-3m index bbeb923c3..3a299ba77 100644 --- a/tests/expected/cal/month-3m +++ b/tests/expected/cal/month-3m @@ -1,9 +1,9 @@ Gregorian - Monday-based week August 2006 September 2006 October 2006 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 2 3 4 5 6 1 2 3 1 - 7 8 9 10 11 12 13 4 5 6 7 8 9 10 2 3 4 5 6 7 8 -14 15 16 17 18 19 20 11 12 13 14 15 16 17 9 10 11 12 13 14 15 -21 22 23 24 25 26 27 18 19 20 21 22 23 24 16 17 18 19 20 21 22 -28 29 30 31 25 26 27 28 29 30 23 24 25 26 27 28 29 - 30 31 + 1 2 3 4 5 6 1 2 3 1 + 7 8 9 10 11 12 13 4 5 6 7 8 9 10 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 11 12 13 14 15 16 17 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 18 19 20 21 22 23 24 16 17 18 19 20 21 22 +28 29 30 31 25 26 27 28 29 30 23 24 25 26 27 28 29 + 30 31 diff --git a/tests/expected/cal/month-3mj b/tests/expected/cal/month-3mj index 73a787453..a1b7affab 100644 --- a/tests/expected/cal/month-3mj +++ b/tests/expected/cal/month-3mj @@ -1,9 +1,9 @@ Julian - Monday-based week December 2017 January 2018 February 2018 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 335 336 337 1 2 3 4 5 6 7 32 33 34 35 -338 339 340 341 342 343 344 8 9 10 11 12 13 14 36 37 38 39 40 41 42 -345 346 347 348 349 350 351 15 16 17 18 19 20 21 43 44 45 46 47 48 49 -352 353 354 355 356 357 358 22 23 24 25 26 27 28 50 51 52 53 54 55 56 -359 360 361 362 363 364 365 29 30 31 57 58 59 - + 335 336 337 1 2 3 4 5 6 7 32 33 34 35 +338 339 340 341 342 343 344 8 9 10 11 12 13 14 36 37 38 39 40 41 42 +345 346 347 348 349 350 351 15 16 17 18 19 20 21 43 44 45 46 47 48 49 +352 353 354 355 356 357 358 22 23 24 25 26 27 28 50 51 52 53 54 55 56 +359 360 361 362 363 364 365 29 30 31 57 58 59 + diff --git a/tests/expected/cal/month-3mjw b/tests/expected/cal/month-3mjw index 62e6eb8dc..0fdeb017c 100644 --- a/tests/expected/cal/month-3mjw +++ b/tests/expected/cal/month-3mjw @@ -1,9 +1,9 @@ Julian - Monday-based week with week numbers August 2006 September 2006 October 2006 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -31 213 214 215 216 217 218 35 244 245 246 39 274 -32 219 220 221 222 223 224 225 36 247 248 249 250 251 252 253 40 275 276 277 278 279 280 281 -33 226 227 228 229 230 231 232 37 254 255 256 257 258 259 260 41 282 283 284 285 286 287 288 -34 233 234 235 236 237 238 239 38 261 262 263 264 265 266 267 42 289 290 291 292 293 294 295 -35 240 241 242 243 39 268 269 270 271 272 273 43 296 297 298 299 300 301 302 - 44 303 304 +31 213 214 215 216 217 218 35 244 245 246 39 274 +32 219 220 221 222 223 224 225 36 247 248 249 250 251 252 253 40 275 276 277 278 279 280 281 +33 226 227 228 229 230 231 232 37 254 255 256 257 258 259 260 41 282 283 284 285 286 287 288 +34 233 234 235 236 237 238 239 38 261 262 263 264 265 266 267 42 289 290 291 292 293 294 295 +35 240 241 242 243 39 268 269 270 271 272 273 43 296 297 298 299 300 301 302 + 44 303 304 diff --git a/tests/expected/cal/month-3mw b/tests/expected/cal/month-3mw index 3074d6759..2309da8bf 100644 --- a/tests/expected/cal/month-3mw +++ b/tests/expected/cal/month-3mw @@ -1,9 +1,9 @@ Gregorian - Monday-based week with week numbers August 2006 September 2006 October 2006 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -31 1 2 3 4 5 6 35 1 2 3 39 1 -32 7 8 9 10 11 12 13 36 4 5 6 7 8 9 10 40 2 3 4 5 6 7 8 -33 14 15 16 17 18 19 20 37 11 12 13 14 15 16 17 41 9 10 11 12 13 14 15 -34 21 22 23 24 25 26 27 38 18 19 20 21 22 23 24 42 16 17 18 19 20 21 22 -35 28 29 30 31 39 25 26 27 28 29 30 43 23 24 25 26 27 28 29 - 44 30 31 +31 1 2 3 4 5 6 35 1 2 3 39 1 +32 7 8 9 10 11 12 13 36 4 5 6 7 8 9 10 40 2 3 4 5 6 7 8 +33 14 15 16 17 18 19 20 37 11 12 13 14 15 16 17 41 9 10 11 12 13 14 15 +34 21 22 23 24 25 26 27 38 18 19 20 21 22 23 24 42 16 17 18 19 20 21 22 +35 28 29 30 31 39 25 26 27 28 29 30 43 23 24 25 26 27 28 29 + 44 30 31 diff --git a/tests/expected/cal/month-3s b/tests/expected/cal/month-3s index f65fb83d4..4f67f1a0b 100644 --- a/tests/expected/cal/month-3s +++ b/tests/expected/cal/month-3s @@ -1,9 +1,9 @@ Gregorian - Sunday-based week August 2006 September 2006 October 2006 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 5 1 2 1 2 3 4 5 6 7 - 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 -13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 -20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 -27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 - + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + diff --git a/tests/expected/cal/month-3sj b/tests/expected/cal/month-3sj index 25ea57889..5d1b11a5a 100644 --- a/tests/expected/cal/month-3sj +++ b/tests/expected/cal/month-3sj @@ -1,9 +1,9 @@ Julian - Sunday-based week August 2006 September 2006 October 2006 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 213 214 215 216 217 244 245 274 275 276 277 278 279 280 -218 219 220 221 222 223 224 246 247 248 249 250 251 252 281 282 283 284 285 286 287 -225 226 227 228 229 230 231 253 254 255 256 257 258 259 288 289 290 291 292 293 294 -232 233 234 235 236 237 238 260 261 262 263 264 265 266 295 296 297 298 299 300 301 -239 240 241 242 243 267 268 269 270 271 272 273 302 303 304 - + 213 214 215 216 217 244 245 274 275 276 277 278 279 280 +218 219 220 221 222 223 224 246 247 248 249 250 251 252 281 282 283 284 285 286 287 +225 226 227 228 229 230 231 253 254 255 256 257 258 259 288 289 290 291 292 293 294 +232 233 234 235 236 237 238 260 261 262 263 264 265 266 295 296 297 298 299 300 301 +239 240 241 242 243 267 268 269 270 271 272 273 302 303 304 + diff --git a/tests/expected/cal/month-3sjw b/tests/expected/cal/month-3sjw index 2c0aa9222..f6e70ea50 100644 --- a/tests/expected/cal/month-3sjw +++ b/tests/expected/cal/month-3sjw @@ -1,9 +1,9 @@ Julian - Sunday-based week with week numbers August 2006 September 2006 October 2006 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -31 213 214 215 216 217 35 244 245 40 274 275 276 277 278 279 280 -32 218 219 220 221 222 223 224 36 246 247 248 249 250 251 252 41 281 282 283 284 285 286 287 -33 225 226 227 228 229 230 231 37 253 254 255 256 257 258 259 42 288 289 290 291 292 293 294 -34 232 233 234 235 236 237 238 38 260 261 262 263 264 265 266 43 295 296 297 298 299 300 301 -35 239 240 241 242 243 39 267 268 269 270 271 272 273 44 302 303 304 - +31 213 214 215 216 217 35 244 245 40 274 275 276 277 278 279 280 +32 218 219 220 221 222 223 224 36 246 247 248 249 250 251 252 41 281 282 283 284 285 286 287 +33 225 226 227 228 229 230 231 37 253 254 255 256 257 258 259 42 288 289 290 291 292 293 294 +34 232 233 234 235 236 237 238 38 260 261 262 263 264 265 266 43 295 296 297 298 299 300 301 +35 239 240 241 242 243 39 267 268 269 270 271 272 273 44 302 303 304 + diff --git a/tests/expected/cal/month-3sw b/tests/expected/cal/month-3sw index 67fe4cbf5..d6fccdcdf 100644 --- a/tests/expected/cal/month-3sw +++ b/tests/expected/cal/month-3sw @@ -1,9 +1,9 @@ Gregorian - Sunday-based week with week numbers August 2006 September 2006 October 2006 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -31 1 2 3 4 5 35 1 2 40 1 2 3 4 5 6 7 -32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 41 8 9 10 11 12 13 14 -33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 42 15 16 17 18 19 20 21 -34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 43 22 23 24 25 26 27 28 -35 27 28 29 30 31 39 24 25 26 27 28 29 30 44 29 30 31 - +31 1 2 3 4 5 35 1 2 40 1 2 3 4 5 6 7 +32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 41 8 9 10 11 12 13 14 +33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 42 15 16 17 18 19 20 21 +34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 43 22 23 24 25 26 27 28 +35 27 28 29 30 31 39 24 25 26 27 28 29 30 44 29 30 31 + diff --git a/tests/expected/cal/sep1752-1m-month b/tests/expected/cal/sep1752-1m-month index 9e27f687f..d2815bc23 100644 --- a/tests/expected/cal/sep1752-1m-month +++ b/tests/expected/cal/sep1752-1m-month @@ -1,9 +1,9 @@ Gregorian - Monday-based month September 1752 Mo Tu We Th Fr Sa Su - 1 2 14 15 16 17 -18 19 20 21 22 23 24 -25 26 27 28 29 30 - - - + 1 2 14 15 16 17 +18 19 20 21 22 23 24 +25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/sep1752-1m-year b/tests/expected/cal/sep1752-1m-year index cddb0df91..305a547fe 100644 --- a/tests/expected/cal/sep1752-1m-year +++ b/tests/expected/cal/sep1752-1m-year @@ -1,36 +1,9 @@ Gregorian - Monday-based year - 1752 - - January February March -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 2 3 4 5 1 2 1 - 6 7 8 9 10 11 12 3 4 5 6 7 8 9 2 3 4 5 6 7 8 -13 14 15 16 17 18 19 10 11 12 13 14 15 16 9 10 11 12 13 14 15 -20 21 22 23 24 25 26 17 18 19 20 21 22 23 16 17 18 19 20 21 22 -27 28 29 30 31 24 25 26 27 28 29 23 24 25 26 27 28 29 - 30 31 - April May June -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 2 3 4 5 1 2 3 1 2 3 4 5 6 7 - 6 7 8 9 10 11 12 4 5 6 7 8 9 10 8 9 10 11 12 13 14 -13 14 15 16 17 18 19 11 12 13 14 15 16 17 15 16 17 18 19 20 21 -20 21 22 23 24 25 26 18 19 20 21 22 23 24 22 23 24 25 26 27 28 -27 28 29 30 25 26 27 28 29 30 31 29 30 - - July August September -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 2 3 4 5 1 2 1 2 14 15 16 17 - 6 7 8 9 10 11 12 3 4 5 6 7 8 9 18 19 20 21 22 23 24 -13 14 15 16 17 18 19 10 11 12 13 14 15 16 25 26 27 28 29 30 -20 21 22 23 24 25 26 17 18 19 20 21 22 23 -27 28 29 30 31 24 25 26 27 28 29 30 - 31 - October November December -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 1 2 3 - 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10 - 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17 -16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24 -23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31 -30 31 - + January 1752 +Mo Tu We Th Fr Sa Su + 1 2 3 4 5 + 6 7 8 9 10 11 12 +13 14 15 16 17 18 19 +20 21 22 23 24 25 26 +27 28 29 30 31 + diff --git a/tests/expected/cal/sep1752-1mj-month b/tests/expected/cal/sep1752-1mj-month index 0b34f09b7..e62da4d0a 100644 --- a/tests/expected/cal/sep1752-1mj-month +++ b/tests/expected/cal/sep1752-1mj-month @@ -1,9 +1,9 @@ Julian - Monday-based month September 1752 Mon Tue Wed Thu Fri Sat Sun - 245 246 258 259 260 261 -262 263 264 265 266 267 268 -269 270 271 272 273 274 - - - + 245 246 258 259 260 261 +262 263 264 265 266 267 268 +269 270 271 272 273 274 + + + diff --git a/tests/expected/cal/sep1752-1mj-year b/tests/expected/cal/sep1752-1mj-year index 3e6965e8c..b107e423b 100644 --- a/tests/expected/cal/sep1752-1mj-year +++ b/tests/expected/cal/sep1752-1mj-year @@ -1,52 +1,9 @@ Julian - Monday-based year - 1752 - - January February -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 1 2 3 4 5 32 33 - 6 7 8 9 10 11 12 34 35 36 37 38 39 40 - 13 14 15 16 17 18 19 41 42 43 44 45 46 47 - 20 21 22 23 24 25 26 48 49 50 51 52 53 54 - 27 28 29 30 31 55 56 57 58 59 60 - - March April -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 61 92 93 94 95 96 - 62 63 64 65 66 67 68 97 98 99 100 101 102 103 - 69 70 71 72 73 74 75 104 105 106 107 108 109 110 - 76 77 78 79 80 81 82 111 112 113 114 115 116 117 - 83 84 85 86 87 88 89 118 119 120 121 - 90 91 - May June -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 122 123 124 153 154 155 156 157 158 159 -125 126 127 128 129 130 131 160 161 162 163 164 165 166 -132 133 134 135 136 137 138 167 168 169 170 171 172 173 -139 140 141 142 143 144 145 174 175 176 177 178 179 180 -146 147 148 149 150 151 152 181 182 - - July August -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 183 184 185 186 187 214 215 -188 189 190 191 192 193 194 216 217 218 219 220 221 222 -195 196 197 198 199 200 201 223 224 225 226 227 228 229 -202 203 204 205 206 207 208 230 231 232 233 234 235 236 -209 210 211 212 213 237 238 239 240 241 242 243 - 244 - September October -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 245 246 258 259 260 261 275 -262 263 264 265 266 267 268 276 277 278 279 280 281 282 -269 270 271 272 273 274 283 284 285 286 287 288 289 - 290 291 292 293 294 295 296 - 297 298 299 300 301 302 303 - 304 305 - November December -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 306 307 308 309 310 336 337 338 -311 312 313 314 315 316 317 339 340 341 342 343 344 345 -318 319 320 321 322 323 324 346 347 348 349 350 351 352 -325 326 327 328 329 330 331 353 354 355 356 357 358 359 -332 333 334 335 360 361 362 363 364 365 366 - - + January 1752 +Mon Tue Wed Thu Fri Sat Sun + 1 2 3 4 5 + 6 7 8 9 10 11 12 + 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 + 27 28 29 30 31 + diff --git a/tests/expected/cal/sep1752-1mjw-month b/tests/expected/cal/sep1752-1mjw-month index 3624288a2..e9bd0e9ae 100644 --- a/tests/expected/cal/sep1752-1mjw-month +++ b/tests/expected/cal/sep1752-1mjw-month @@ -1,9 +1,9 @@ Julian - Monday-based month with week numbers September 1752 Mon Tue Wed Thu Fri Sat Sun -36 245 246 258 259 260 261 -37 262 263 264 265 266 267 268 -38 269 270 271 272 273 274 - - - +36 245 246 258 259 260 261 +37 262 263 264 265 266 267 268 +38 269 270 271 272 273 274 + + + diff --git a/tests/expected/cal/sep1752-1mjw-year b/tests/expected/cal/sep1752-1mjw-year index a168451f7..bab6c78ea 100644 --- a/tests/expected/cal/sep1752-1mjw-year +++ b/tests/expected/cal/sep1752-1mjw-year @@ -1,52 +1,9 @@ Julian - Monday-based year with week numbers - 1752 - - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 1 1 2 3 4 5 5 32 33 - 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 - 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 - 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 - 5 27 28 29 30 31 9 55 56 57 58 59 60 - - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 61 14 92 93 94 95 96 -10 62 63 64 65 66 67 68 15 97 98 99 100 101 102 103 -11 69 70 71 72 73 74 75 16 104 105 106 107 108 109 110 -12 76 77 78 79 80 81 82 17 111 112 113 114 115 116 117 -13 83 84 85 86 87 88 89 18 118 119 120 121 -14 90 91 - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -18 122 123 124 23 153 154 155 156 157 158 159 -19 125 126 127 128 129 130 131 24 160 161 162 163 164 165 166 -20 132 133 134 135 136 137 138 25 167 168 169 170 171 172 173 -21 139 140 141 142 143 144 145 26 174 175 176 177 178 179 180 -22 146 147 148 149 150 151 152 27 181 182 - - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -27 183 184 185 186 187 31 214 215 -28 188 189 190 191 192 193 194 32 216 217 218 219 220 221 222 -29 195 196 197 198 199 200 201 33 223 224 225 226 227 228 229 -30 202 203 204 205 206 207 208 34 230 231 232 233 234 235 236 -31 209 210 211 212 213 35 237 238 239 240 241 242 243 - 36 244 - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -36 245 246 258 259 260 261 38 275 -37 262 263 264 265 266 267 268 39 276 277 278 279 280 281 282 -38 269 270 271 272 273 274 40 283 284 285 286 287 288 289 - 41 290 291 292 293 294 295 296 - 42 297 298 299 300 301 302 303 - 43 304 305 - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -43 306 307 308 309 310 47 336 337 338 -44 311 312 313 314 315 316 317 48 339 340 341 342 343 344 345 -45 318 319 320 321 322 323 324 49 346 347 348 349 350 351 352 -46 325 326 327 328 329 330 331 50 353 354 355 356 357 358 359 -47 332 333 334 335 51 360 361 362 363 364 365 366 - - + January 1752 + Mon Tue Wed Thu Fri Sat Sun + 1 1 2 3 4 5 + 2 6 7 8 9 10 11 12 + 3 13 14 15 16 17 18 19 + 4 20 21 22 23 24 25 26 + 5 27 28 29 30 31 + diff --git a/tests/expected/cal/sep1752-1mw-month b/tests/expected/cal/sep1752-1mw-month index cef2eb17a..3195ff063 100644 --- a/tests/expected/cal/sep1752-1mw-month +++ b/tests/expected/cal/sep1752-1mw-month @@ -1,9 +1,9 @@ Gregorian - Monday-based month with week numbers September 1752 Mo Tu We Th Fr Sa Su -36 1 2 14 15 16 17 -37 18 19 20 21 22 23 24 -38 25 26 27 28 29 30 - - - +36 1 2 14 15 16 17 +37 18 19 20 21 22 23 24 +38 25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/sep1752-1mw-year b/tests/expected/cal/sep1752-1mw-year index 3f5cd7fb3..a039ebce0 100644 --- a/tests/expected/cal/sep1752-1mw-year +++ b/tests/expected/cal/sep1752-1mw-year @@ -1,36 +1,9 @@ Gregorian - Monday-based year with week numbers - 1752 - - January February March - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 5 1 2 9 1 - 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 10 2 3 4 5 6 7 8 - 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 11 9 10 11 12 13 14 15 - 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 12 16 17 18 19 20 21 22 - 5 27 28 29 30 31 9 24 25 26 27 28 29 13 23 24 25 26 27 28 29 - 14 30 31 - April May June - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -14 1 2 3 4 5 18 1 2 3 23 1 2 3 4 5 6 7 -15 6 7 8 9 10 11 12 19 4 5 6 7 8 9 10 24 8 9 10 11 12 13 14 -16 13 14 15 16 17 18 19 20 11 12 13 14 15 16 17 25 15 16 17 18 19 20 21 -17 20 21 22 23 24 25 26 21 18 19 20 21 22 23 24 26 22 23 24 25 26 27 28 -18 27 28 29 30 22 25 26 27 28 29 30 31 27 29 30 - - July August September - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -27 1 2 3 4 5 31 1 2 36 1 2 14 15 16 17 -28 6 7 8 9 10 11 12 32 3 4 5 6 7 8 9 37 18 19 20 21 22 23 24 -29 13 14 15 16 17 18 19 33 10 11 12 13 14 15 16 38 25 26 27 28 29 30 -30 20 21 22 23 24 25 26 34 17 18 19 20 21 22 23 -31 27 28 29 30 31 35 24 25 26 27 28 29 30 - 36 31 - October November December - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -38 1 43 1 2 3 4 5 47 1 2 3 -39 2 3 4 5 6 7 8 44 6 7 8 9 10 11 12 48 4 5 6 7 8 9 10 -40 9 10 11 12 13 14 15 45 13 14 15 16 17 18 19 49 11 12 13 14 15 16 17 -41 16 17 18 19 20 21 22 46 20 21 22 23 24 25 26 50 18 19 20 21 22 23 24 -42 23 24 25 26 27 28 29 47 27 28 29 30 51 25 26 27 28 29 30 31 -43 30 31 - + January 1752 + Mo Tu We Th Fr Sa Su + 1 1 2 3 4 5 + 2 6 7 8 9 10 11 12 + 3 13 14 15 16 17 18 19 + 4 20 21 22 23 24 25 26 + 5 27 28 29 30 31 + diff --git a/tests/expected/cal/sep1752-1s-month b/tests/expected/cal/sep1752-1s-month index feaa16fad..07472ac82 100644 --- a/tests/expected/cal/sep1752-1s-month +++ b/tests/expected/cal/sep1752-1s-month @@ -1,9 +1,9 @@ Gregorian - Sunday-based month September 1752 Su Mo Tu We Th Fr Sa - 1 2 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - - - + 1 2 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/sep1752-1s-year b/tests/expected/cal/sep1752-1s-year index 818f1148b..e6a5da34a 100644 --- a/tests/expected/cal/sep1752-1s-year +++ b/tests/expected/cal/sep1752-1s-year @@ -1,36 +1,9 @@ Gregorian - Sunday-based year - 1752 - - January February March -Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 1 1 2 3 4 5 6 7 - 5 6 7 8 9 10 11 2 3 4 5 6 7 8 8 9 10 11 12 13 14 -12 13 14 15 16 17 18 9 10 11 12 13 14 15 15 16 17 18 19 20 21 -19 20 21 22 23 24 25 16 17 18 19 20 21 22 22 23 24 25 26 27 28 -26 27 28 29 30 31 23 24 25 26 27 28 29 29 30 31 - - April May June -Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 1 2 1 2 3 4 5 6 - 5 6 7 8 9 10 11 3 4 5 6 7 8 9 7 8 9 10 11 12 13 -12 13 14 15 16 17 18 10 11 12 13 14 15 16 14 15 16 17 18 19 20 -19 20 21 22 23 24 25 17 18 19 20 21 22 23 21 22 23 24 25 26 27 -26 27 28 29 30 24 25 26 27 28 29 30 28 29 30 - 31 - July August September -Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 1 1 2 14 15 16 - 5 6 7 8 9 10 11 2 3 4 5 6 7 8 17 18 19 20 21 22 23 -12 13 14 15 16 17 18 9 10 11 12 13 14 15 24 25 26 27 28 29 30 -19 20 21 22 23 24 25 16 17 18 19 20 21 22 -26 27 28 29 30 31 23 24 25 26 27 28 29 - 30 31 - October November December -Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 5 6 7 1 2 3 4 1 2 - 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 -15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 -22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 -29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 - 31 - + January 1752 +Su Mo Tu We Th Fr Sa + 1 2 3 4 + 5 6 7 8 9 10 11 +12 13 14 15 16 17 18 +19 20 21 22 23 24 25 +26 27 28 29 30 31 + diff --git a/tests/expected/cal/sep1752-1sj-month b/tests/expected/cal/sep1752-1sj-month index 252307dc6..b6fb6d950 100644 --- a/tests/expected/cal/sep1752-1sj-month +++ b/tests/expected/cal/sep1752-1sj-month @@ -1,9 +1,9 @@ Julian - Sunday-based month September 1752 Sun Mon Tue Wed Thu Fri Sat - 245 246 258 259 260 -261 262 263 264 265 266 267 -268 269 270 271 272 273 274 - - - + 245 246 258 259 260 +261 262 263 264 265 266 267 +268 269 270 271 272 273 274 + + + diff --git a/tests/expected/cal/sep1752-1sj-year b/tests/expected/cal/sep1752-1sj-year index 48e061abc..b932fe7d2 100644 --- a/tests/expected/cal/sep1752-1sj-year +++ b/tests/expected/cal/sep1752-1sj-year @@ -1,52 +1,9 @@ Julian - Sunday-based year - 1752 - - January February -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 2 3 4 32 - 5 6 7 8 9 10 11 33 34 35 36 37 38 39 - 12 13 14 15 16 17 18 40 41 42 43 44 45 46 - 19 20 21 22 23 24 25 47 48 49 50 51 52 53 - 26 27 28 29 30 31 54 55 56 57 58 59 60 - - March April -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 61 62 63 64 65 66 67 92 93 94 95 - 68 69 70 71 72 73 74 96 97 98 99 100 101 102 - 75 76 77 78 79 80 81 103 104 105 106 107 108 109 - 82 83 84 85 86 87 88 110 111 112 113 114 115 116 - 89 90 91 117 118 119 120 121 - - May June -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 122 123 153 154 155 156 157 158 -124 125 126 127 128 129 130 159 160 161 162 163 164 165 -131 132 133 134 135 136 137 166 167 168 169 170 171 172 -138 139 140 141 142 143 144 173 174 175 176 177 178 179 -145 146 147 148 149 150 151 180 181 182 -152 - July August -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 183 184 185 186 214 -187 188 189 190 191 192 193 215 216 217 218 219 220 221 -194 195 196 197 198 199 200 222 223 224 225 226 227 228 -201 202 203 204 205 206 207 229 230 231 232 233 234 235 -208 209 210 211 212 213 236 237 238 239 240 241 242 - 243 244 - September October -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 245 246 258 259 260 275 276 277 278 279 280 281 -261 262 263 264 265 266 267 282 283 284 285 286 287 288 -268 269 270 271 272 273 274 289 290 291 292 293 294 295 - 296 297 298 299 300 301 302 - 303 304 305 - - November December -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 306 307 308 309 336 337 -310 311 312 313 314 315 316 338 339 340 341 342 343 344 -317 318 319 320 321 322 323 345 346 347 348 349 350 351 -324 325 326 327 328 329 330 352 353 354 355 356 357 358 -331 332 333 334 335 359 360 361 362 363 364 365 - 366 - + January 1752 +Sun Mon Tue Wed Thu Fri Sat + 1 2 3 4 + 5 6 7 8 9 10 11 + 12 13 14 15 16 17 18 + 19 20 21 22 23 24 25 + 26 27 28 29 30 31 + diff --git a/tests/expected/cal/sep1752-1sjw-month b/tests/expected/cal/sep1752-1sjw-month index 0d3b2421c..45052d4e3 100644 --- a/tests/expected/cal/sep1752-1sjw-month +++ b/tests/expected/cal/sep1752-1sjw-month @@ -1,9 +1,9 @@ Julian - Sunday-based month with week numbers September 1752 Sun Mon Tue Wed Thu Fri Sat -36 245 246 258 259 260 -37 261 262 263 264 265 266 267 -38 268 269 270 271 272 273 274 - - - +36 245 246 258 259 260 +37 261 262 263 264 265 266 267 +38 268 269 270 271 272 273 274 + + + diff --git a/tests/expected/cal/sep1752-1sjw-year b/tests/expected/cal/sep1752-1sjw-year index 579ed69f4..fb598601a 100644 --- a/tests/expected/cal/sep1752-1sjw-year +++ b/tests/expected/cal/sep1752-1sjw-year @@ -1,52 +1,9 @@ Julian - Sunday-based year with week numbers - 1752 - - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 3 4 5 32 - 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 - 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 - 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 - 5 26 27 28 29 30 31 9 54 55 56 57 58 59 60 - - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -10 61 62 63 64 65 66 67 14 92 93 94 95 -11 68 69 70 71 72 73 74 15 96 97 98 99 100 101 102 -12 75 76 77 78 79 80 81 16 103 104 105 106 107 108 109 -13 82 83 84 85 86 87 88 17 110 111 112 113 114 115 116 -14 89 90 91 18 117 118 119 120 121 - - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 122 123 23 153 154 155 156 157 158 -19 124 125 126 127 128 129 130 24 159 160 161 162 163 164 165 -20 131 132 133 134 135 136 137 25 166 167 168 169 170 171 172 -21 138 139 140 141 142 143 144 26 173 174 175 176 177 178 179 -22 145 146 147 148 149 150 151 27 180 181 182 -23 152 - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -27 183 184 185 186 31 214 -28 187 188 189 190 191 192 193 32 215 216 217 218 219 220 221 -29 194 195 196 197 198 199 200 33 222 223 224 225 226 227 228 -30 201 202 203 204 205 206 207 34 229 230 231 232 233 234 235 -31 208 209 210 211 212 213 35 236 237 238 239 240 241 242 - 36 243 244 - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -36 245 246 258 259 260 39 275 276 277 278 279 280 281 -37 261 262 263 264 265 266 267 40 282 283 284 285 286 287 288 -38 268 269 270 271 272 273 274 41 289 290 291 292 293 294 295 - 42 296 297 298 299 300 301 302 - 43 303 304 305 - - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -43 306 307 308 309 47 336 337 -44 310 311 312 313 314 315 316 48 338 339 340 341 342 343 344 -45 317 318 319 320 321 322 323 49 345 346 347 348 349 350 351 -46 324 325 326 327 328 329 330 50 352 353 354 355 356 357 358 -47 331 332 333 334 335 51 359 360 361 362 363 364 365 - 52 366 - + January 1752 + Sun Mon Tue Wed Thu Fri Sat + 1 1 2 3 4 + 2 5 6 7 8 9 10 11 + 3 12 13 14 15 16 17 18 + 4 19 20 21 22 23 24 25 + 5 26 27 28 29 30 31 + diff --git a/tests/expected/cal/sep1752-1sw-month b/tests/expected/cal/sep1752-1sw-month index c6aabead7..24e3c063f 100644 --- a/tests/expected/cal/sep1752-1sw-month +++ b/tests/expected/cal/sep1752-1sw-month @@ -1,9 +1,9 @@ Gregorian - Sunday-based month with week numbers September 1752 Su Mo Tu We Th Fr Sa -36 1 2 14 15 16 -37 17 18 19 20 21 22 23 -38 24 25 26 27 28 29 30 - - - +36 1 2 14 15 16 +37 17 18 19 20 21 22 23 +38 24 25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/sep1752-1sw-year b/tests/expected/cal/sep1752-1sw-year index 3acd068a1..7583db380 100644 --- a/tests/expected/cal/sep1752-1sw-year +++ b/tests/expected/cal/sep1752-1sw-year @@ -1,36 +1,9 @@ Gregorian - Sunday-based year with week numbers - 1752 - - January February March - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 4 5 1 10 1 2 3 4 5 6 7 - 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 11 8 9 10 11 12 13 14 - 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 12 15 16 17 18 19 20 21 - 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 13 22 23 24 25 26 27 28 - 5 26 27 28 29 30 31 9 23 24 25 26 27 28 29 14 29 30 31 - - April May June - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -14 1 2 3 4 18 1 2 23 1 2 3 4 5 6 -15 5 6 7 8 9 10 11 19 3 4 5 6 7 8 9 24 7 8 9 10 11 12 13 -16 12 13 14 15 16 17 18 20 10 11 12 13 14 15 16 25 14 15 16 17 18 19 20 -17 19 20 21 22 23 24 25 21 17 18 19 20 21 22 23 26 21 22 23 24 25 26 27 -18 26 27 28 29 30 22 24 25 26 27 28 29 30 27 28 29 30 - 23 31 - July August September - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -27 1 2 3 4 31 1 36 1 2 14 15 16 -28 5 6 7 8 9 10 11 32 2 3 4 5 6 7 8 37 17 18 19 20 21 22 23 -29 12 13 14 15 16 17 18 33 9 10 11 12 13 14 15 38 24 25 26 27 28 29 30 -30 19 20 21 22 23 24 25 34 16 17 18 19 20 21 22 -31 26 27 28 29 30 31 35 23 24 25 26 27 28 29 - 36 30 31 - October November December - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -39 1 2 3 4 5 6 7 43 1 2 3 4 47 1 2 -40 8 9 10 11 12 13 14 44 5 6 7 8 9 10 11 48 3 4 5 6 7 8 9 -41 15 16 17 18 19 20 21 45 12 13 14 15 16 17 18 49 10 11 12 13 14 15 16 -42 22 23 24 25 26 27 28 46 19 20 21 22 23 24 25 50 17 18 19 20 21 22 23 -43 29 30 31 47 26 27 28 29 30 51 24 25 26 27 28 29 30 - 52 31 - + January 1752 + Su Mo Tu We Th Fr Sa + 1 1 2 3 4 + 2 5 6 7 8 9 10 11 + 3 12 13 14 15 16 17 18 + 4 19 20 21 22 23 24 25 + 5 26 27 28 29 30 31 + diff --git a/tests/expected/cal/sep1752-3m-month b/tests/expected/cal/sep1752-3m-month index eeb6e9ffa..67bfa649b 100644 --- a/tests/expected/cal/sep1752-3m-month +++ b/tests/expected/cal/sep1752-3m-month @@ -1,9 +1,9 @@ Gregorian - Monday-based three months August 1752 September 1752 October 1752 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 2 1 2 14 15 16 17 1 - 3 4 5 6 7 8 9 18 19 20 21 22 23 24 2 3 4 5 6 7 8 -10 11 12 13 14 15 16 25 26 27 28 29 30 9 10 11 12 13 14 15 -17 18 19 20 21 22 23 16 17 18 19 20 21 22 -24 25 26 27 28 29 30 23 24 25 26 27 28 29 -31 30 31 + 1 2 1 2 14 15 16 17 1 + 3 4 5 6 7 8 9 18 19 20 21 22 23 24 2 3 4 5 6 7 8 +10 11 12 13 14 15 16 25 26 27 28 29 30 9 10 11 12 13 14 15 +17 18 19 20 21 22 23 16 17 18 19 20 21 22 +24 25 26 27 28 29 30 23 24 25 26 27 28 29 +31 30 31 diff --git a/tests/expected/cal/sep1752-3mj-month b/tests/expected/cal/sep1752-3mj-month index 84cb50734..83b91eed6 100644 --- a/tests/expected/cal/sep1752-3mj-month +++ b/tests/expected/cal/sep1752-3mj-month @@ -1,9 +1,9 @@ Julian - Monday-based three months August 1752 September 1752 October 1752 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 214 215 245 246 258 259 260 261 275 -216 217 218 219 220 221 222 262 263 264 265 266 267 268 276 277 278 279 280 281 282 -223 224 225 226 227 228 229 269 270 271 272 273 274 283 284 285 286 287 288 289 -230 231 232 233 234 235 236 290 291 292 293 294 295 296 -237 238 239 240 241 242 243 297 298 299 300 301 302 303 -244 304 305 + 214 215 245 246 258 259 260 261 275 +216 217 218 219 220 221 222 262 263 264 265 266 267 268 276 277 278 279 280 281 282 +223 224 225 226 227 228 229 269 270 271 272 273 274 283 284 285 286 287 288 289 +230 231 232 233 234 235 236 290 291 292 293 294 295 296 +237 238 239 240 241 242 243 297 298 299 300 301 302 303 +244 304 305 diff --git a/tests/expected/cal/sep1752-3mjw-month b/tests/expected/cal/sep1752-3mjw-month index e3c54ac30..4ec9b93bd 100644 --- a/tests/expected/cal/sep1752-3mjw-month +++ b/tests/expected/cal/sep1752-3mjw-month @@ -1,9 +1,9 @@ Julian - Monday-based three months with week numbers August 1752 September 1752 October 1752 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -31 214 215 36 245 246 258 259 260 261 38 275 -32 216 217 218 219 220 221 222 37 262 263 264 265 266 267 268 39 276 277 278 279 280 281 282 -33 223 224 225 226 227 228 229 38 269 270 271 272 273 274 40 283 284 285 286 287 288 289 -34 230 231 232 233 234 235 236 41 290 291 292 293 294 295 296 -35 237 238 239 240 241 242 243 42 297 298 299 300 301 302 303 -36 244 43 304 305 +31 214 215 36 245 246 258 259 260 261 38 275 +32 216 217 218 219 220 221 222 37 262 263 264 265 266 267 268 39 276 277 278 279 280 281 282 +33 223 224 225 226 227 228 229 38 269 270 271 272 273 274 40 283 284 285 286 287 288 289 +34 230 231 232 233 234 235 236 41 290 291 292 293 294 295 296 +35 237 238 239 240 241 242 243 42 297 298 299 300 301 302 303 +36 244 43 304 305 diff --git a/tests/expected/cal/sep1752-3mw-month b/tests/expected/cal/sep1752-3mw-month index 88efe106f..0e5d84469 100644 --- a/tests/expected/cal/sep1752-3mw-month +++ b/tests/expected/cal/sep1752-3mw-month @@ -1,9 +1,9 @@ Gregorian - Monday-based three months with week numbers August 1752 September 1752 October 1752 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -31 1 2 36 1 2 14 15 16 17 38 1 -32 3 4 5 6 7 8 9 37 18 19 20 21 22 23 24 39 2 3 4 5 6 7 8 -33 10 11 12 13 14 15 16 38 25 26 27 28 29 30 40 9 10 11 12 13 14 15 -34 17 18 19 20 21 22 23 41 16 17 18 19 20 21 22 -35 24 25 26 27 28 29 30 42 23 24 25 26 27 28 29 -36 31 43 30 31 +31 1 2 36 1 2 14 15 16 17 38 1 +32 3 4 5 6 7 8 9 37 18 19 20 21 22 23 24 39 2 3 4 5 6 7 8 +33 10 11 12 13 14 15 16 38 25 26 27 28 29 30 40 9 10 11 12 13 14 15 +34 17 18 19 20 21 22 23 41 16 17 18 19 20 21 22 +35 24 25 26 27 28 29 30 42 23 24 25 26 27 28 29 +36 31 43 30 31 diff --git a/tests/expected/cal/sep1752-3s-month b/tests/expected/cal/sep1752-3s-month index 15fe8c9fb..cdf504b31 100644 --- a/tests/expected/cal/sep1752-3s-month +++ b/tests/expected/cal/sep1752-3s-month @@ -1,9 +1,9 @@ Gregorian - Sunday-based three months August 1752 September 1752 October 1752 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 14 15 16 1 2 3 4 5 6 7 - 2 3 4 5 6 7 8 17 18 19 20 21 22 23 8 9 10 11 12 13 14 - 9 10 11 12 13 14 15 24 25 26 27 28 29 30 15 16 17 18 19 20 21 -16 17 18 19 20 21 22 22 23 24 25 26 27 28 -23 24 25 26 27 28 29 29 30 31 -30 31 + 1 1 2 14 15 16 1 2 3 4 5 6 7 + 2 3 4 5 6 7 8 17 18 19 20 21 22 23 8 9 10 11 12 13 14 + 9 10 11 12 13 14 15 24 25 26 27 28 29 30 15 16 17 18 19 20 21 +16 17 18 19 20 21 22 22 23 24 25 26 27 28 +23 24 25 26 27 28 29 29 30 31 +30 31 diff --git a/tests/expected/cal/sep1752-3sj-month b/tests/expected/cal/sep1752-3sj-month index 633b2c31a..4171e581d 100644 --- a/tests/expected/cal/sep1752-3sj-month +++ b/tests/expected/cal/sep1752-3sj-month @@ -1,9 +1,9 @@ Julian - Sunday-based three months August 1752 September 1752 October 1752 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 214 245 246 258 259 260 275 276 277 278 279 280 281 -215 216 217 218 219 220 221 261 262 263 264 265 266 267 282 283 284 285 286 287 288 -222 223 224 225 226 227 228 268 269 270 271 272 273 274 289 290 291 292 293 294 295 -229 230 231 232 233 234 235 296 297 298 299 300 301 302 -236 237 238 239 240 241 242 303 304 305 -243 244 + 214 245 246 258 259 260 275 276 277 278 279 280 281 +215 216 217 218 219 220 221 261 262 263 264 265 266 267 282 283 284 285 286 287 288 +222 223 224 225 226 227 228 268 269 270 271 272 273 274 289 290 291 292 293 294 295 +229 230 231 232 233 234 235 296 297 298 299 300 301 302 +236 237 238 239 240 241 242 303 304 305 +243 244 diff --git a/tests/expected/cal/sep1752-3sjw-month b/tests/expected/cal/sep1752-3sjw-month index 32a321f0d..187d382ac 100644 --- a/tests/expected/cal/sep1752-3sjw-month +++ b/tests/expected/cal/sep1752-3sjw-month @@ -1,9 +1,9 @@ Julian - Sunday-based three months with week numbers August 1752 September 1752 October 1752 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -31 214 36 245 246 258 259 260 39 275 276 277 278 279 280 281 -32 215 216 217 218 219 220 221 37 261 262 263 264 265 266 267 40 282 283 284 285 286 287 288 -33 222 223 224 225 226 227 228 38 268 269 270 271 272 273 274 41 289 290 291 292 293 294 295 -34 229 230 231 232 233 234 235 42 296 297 298 299 300 301 302 -35 236 237 238 239 240 241 242 43 303 304 305 -36 243 244 +31 214 36 245 246 258 259 260 39 275 276 277 278 279 280 281 +32 215 216 217 218 219 220 221 37 261 262 263 264 265 266 267 40 282 283 284 285 286 287 288 +33 222 223 224 225 226 227 228 38 268 269 270 271 272 273 274 41 289 290 291 292 293 294 295 +34 229 230 231 232 233 234 235 42 296 297 298 299 300 301 302 +35 236 237 238 239 240 241 242 43 303 304 305 +36 243 244 diff --git a/tests/expected/cal/sep1752-3sw-month b/tests/expected/cal/sep1752-3sw-month index 60d6a16b6..c7c298666 100644 --- a/tests/expected/cal/sep1752-3sw-month +++ b/tests/expected/cal/sep1752-3sw-month @@ -1,9 +1,9 @@ Gregorian - Sunday-based three months with week numbers August 1752 September 1752 October 1752 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -31 1 36 1 2 14 15 16 39 1 2 3 4 5 6 7 -32 2 3 4 5 6 7 8 37 17 18 19 20 21 22 23 40 8 9 10 11 12 13 14 -33 9 10 11 12 13 14 15 38 24 25 26 27 28 29 30 41 15 16 17 18 19 20 21 -34 16 17 18 19 20 21 22 42 22 23 24 25 26 27 28 -35 23 24 25 26 27 28 29 43 29 30 31 -36 30 31 +31 1 36 1 2 14 15 16 39 1 2 3 4 5 6 7 +32 2 3 4 5 6 7 8 37 17 18 19 20 21 22 23 40 8 9 10 11 12 13 14 +33 9 10 11 12 13 14 15 38 24 25 26 27 28 29 30 41 15 16 17 18 19 20 21 +34 16 17 18 19 20 21 22 42 22 23 24 25 26 27 28 +35 23 24 25 26 27 28 29 43 29 30 31 +36 30 31 diff --git a/tests/expected/cal/sep1752-week-iso b/tests/expected/cal/sep1752-week-iso index 7a686911e..18d0160ad 100644 --- a/tests/expected/cal/sep1752-week-iso +++ b/tests/expected/cal/sep1752-week-iso @@ -1,9 +1,9 @@ Gregorian - address by week number September 1752 Su Mo Tu We Th Fr Sa -36 1 2 -37 3 4 5 6 7 8 9 -38 10 11 12 13 14 15 16 -39 17 18 19 20 21 22 23 -40 24 25 26 27 28 29 30 - +36 1 2 +37 3 4 5 6 7 8 9 +38 10 11 12 13 14 15 16 +39 17 18 19 20 21 22 23 +40 24 25 26 27 28 29 30 + diff --git a/tests/expected/cal/weekarg-1m-week53 b/tests/expected/cal/weekarg-1m-week53 index f9f7cf730..aeffd5ee8 100644 --- a/tests/expected/cal/weekarg-1m-week53 +++ b/tests/expected/cal/weekarg-1m-week53 @@ -1,9 +1,9 @@ Gregorian - Monday-based, week 53, 1 month January 2010 Mo Tu We Th Fr Sa Su -53 1 2 3 - 1 4 5 6 7 8 9 10 - 2 11 12 13 14 15 16 17 - 3 18 19 20 21 22 23 24 - 4 25 26 27 28 29 30 31 - +53 1 2 3 + 1 4 5 6 7 8 9 10 + 2 11 12 13 14 15 16 17 + 3 18 19 20 21 22 23 24 + 4 25 26 27 28 29 30 31 + diff --git a/tests/expected/cal/weekarg-1m-week53-color b/tests/expected/cal/weekarg-1m-week53-color index 8aff0b322..0e9edfb2a 100644 --- a/tests/expected/cal/weekarg-1m-week53-color +++ b/tests/expected/cal/weekarg-1m-week53-color @@ -1,9 +1,9 @@ Gregorian - Monday-based, week 53, 1 month January 2010 Mo Tu We Th Fr Sa Su -[7m53[27m 1 2 3 - 1 4 5 6 7 8 9 10 - 2 11 12 13 14 15 16 17 - 3 18 19 20 21 22 23 24 - 4 25 26 27 28 29 30 31 - +[7m53[27m 1 2 3 + 1 4 5 6 7 8 9 10 + 2 11 12 13 14 15 16 17 + 3 18 19 20 21 22 23 24 + 4 25 26 27 28 29 30 31 + diff --git a/tests/expected/cal/weekarg-1mj-week53 b/tests/expected/cal/weekarg-1mj-week53 index f00e95e1f..fd9cdfcd8 100644 --- a/tests/expected/cal/weekarg-1mj-week53 +++ b/tests/expected/cal/weekarg-1mj-week53 @@ -1,9 +1,9 @@ Julian - Monday-based, week 53, 1 month January 2010 Mon Tue Wed Thu Fri Sat Sun -53 1 2 3 - 1 4 5 6 7 8 9 10 - 2 11 12 13 14 15 16 17 - 3 18 19 20 21 22 23 24 - 4 25 26 27 28 29 30 31 - +53 1 2 3 + 1 4 5 6 7 8 9 10 + 2 11 12 13 14 15 16 17 + 3 18 19 20 21 22 23 24 + 4 25 26 27 28 29 30 31 + diff --git a/tests/expected/cal/weekarg-1mj-week53-color b/tests/expected/cal/weekarg-1mj-week53-color index 55c98e975..8f73100d2 100644 --- a/tests/expected/cal/weekarg-1mj-week53-color +++ b/tests/expected/cal/weekarg-1mj-week53-color @@ -1,9 +1,9 @@ Julian - Monday-based, week 53, 1 month January 2010 Mon Tue Wed Thu Fri Sat Sun -[7m53[27m 1 2 3 - 1 4 5 6 7 8 9 10 - 2 11 12 13 14 15 16 17 - 3 18 19 20 21 22 23 24 - 4 25 26 27 28 29 30 31 - +[7m53[27m 1 2 3 + 1 4 5 6 7 8 9 10 + 2 11 12 13 14 15 16 17 + 3 18 19 20 21 22 23 24 + 4 25 26 27 28 29 30 31 + diff --git a/tests/expected/cal/weekarg-3m-week40 b/tests/expected/cal/weekarg-3m-week40 index afc243d2c..e77bc7bf1 100644 --- a/tests/expected/cal/weekarg-3m-week40 +++ b/tests/expected/cal/weekarg-3m-week40 @@ -1,9 +1,9 @@ Gregorian - Monday-based, week 40, 3 month September 2013 October 2013 November 2013 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -35 1 40 1 2 3 4 5 6 44 1 2 3 -36 2 3 4 5 6 7 8 41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10 -37 9 10 11 12 13 14 15 42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 -38 16 17 18 19 20 21 22 43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 -39 23 24 25 26 27 28 29 44 28 29 30 31 48 25 26 27 28 29 30 -40 30 +35 1 40 1 2 3 4 5 6 44 1 2 3 +36 2 3 4 5 6 7 8 41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10 +37 9 10 11 12 13 14 15 42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 +38 16 17 18 19 20 21 22 43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 +39 23 24 25 26 27 28 29 44 28 29 30 31 48 25 26 27 28 29 30 +40 30 diff --git a/tests/expected/cal/weekarg-3m-week40-color b/tests/expected/cal/weekarg-3m-week40-color index be10602e6..8039f4498 100644 --- a/tests/expected/cal/weekarg-3m-week40-color +++ b/tests/expected/cal/weekarg-3m-week40-color @@ -1,9 +1,9 @@ Gregorian - Monday-based, week 40, 3 month September 2013 October 2013 November 2013 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -35 1 [7m40[27m 1 2 3 4 5 6 44 1 2 3 -36 2 3 4 5 6 7 8 41 [7m 7[27m 8 9 10 11 12 13 45 4 5 6 7 8 9 10 -37 9 10 11 12 13 14 15 42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 -38 16 17 18 19 20 21 22 43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 -39 23 24 25 26 27 28 29 44 28 29 30 31 48 25 26 27 28 29 30 -[7m40[27m 30 +35 1 [7m40[27m 1 2 3 4 5 6 44 1 2 3 +36 2 3 4 5 6 7 8 41 [7m 7[27m 8 9 10 11 12 13 45 4 5 6 7 8 9 10 +37 9 10 11 12 13 14 15 42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 +38 16 17 18 19 20 21 22 43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 +39 23 24 25 26 27 28 29 44 28 29 30 31 48 25 26 27 28 29 30 +[7m40[27m 30 diff --git a/tests/expected/cal/weekarg-3m-week52-color b/tests/expected/cal/weekarg-3m-week52-color index d51b95f87..f15faf1d2 100644 --- a/tests/expected/cal/weekarg-3m-week52-color +++ b/tests/expected/cal/weekarg-3m-week52-color @@ -1,9 +1,9 @@ Gregorian - Monday-based, week 52, 3 month November 2000 December 2000 January 2001 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -44 1 2 3 4 5 48 1 2 3 1 1 2 3 4 5 6 7 -45 6 7 8 9 10 11 12 49 4 5 6 7 8 9 10 2 8 9 10 11 12 13 14 -46 13 14 15 16 17 18 19 50 11 12 13 14 15 16 17 3 15 16 17 18 19 20 21 -47 20 21 22 23 24 25 26 51 18 19 20 21 22 23 24 4 22 23 24 25 26 27 28 -48 27 28 29 30 [7m52[27m 25 26 27 28 29 30 [7m31[27m 5 29 30 31 - +44 1 2 3 4 5 48 1 2 3 1 1 2 3 4 5 6 7 +45 6 7 8 9 10 11 12 49 4 5 6 7 8 9 10 2 8 9 10 11 12 13 14 +46 13 14 15 16 17 18 19 50 11 12 13 14 15 16 17 3 15 16 17 18 19 20 21 +47 20 21 22 23 24 25 26 51 18 19 20 21 22 23 24 4 22 23 24 25 26 27 28 +48 27 28 29 30 [7m52[27m 25 26 27 28 29 30 [7m31[27m 5 29 30 31 + diff --git a/tests/expected/cal/weekarg-3m-week53-color b/tests/expected/cal/weekarg-3m-week53-color index 86b97c237..b8c7abf7a 100644 --- a/tests/expected/cal/weekarg-3m-week53-color +++ b/tests/expected/cal/weekarg-3m-week53-color @@ -1,9 +1,9 @@ Gregorian - Monday-based, week 53, 3 month December 2009 January 2010 February 2010 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -49 1 2 3 4 5 6 [7m53[27m 1 2 3 5 1 2 3 4 5 6 7 -50 7 8 9 10 11 12 13 1 4 5 6 7 8 9 10 6 8 9 10 11 12 13 14 -51 14 15 16 17 18 19 20 2 11 12 13 14 15 16 17 7 15 16 17 18 19 20 21 -52 21 22 23 24 25 26 27 3 18 19 20 21 22 23 24 8 22 23 24 25 26 27 28 -[7m53[27m 28 29 30 31 4 25 26 27 28 29 30 31 - +49 1 2 3 4 5 6 [7m53[27m 1 2 3 5 1 2 3 4 5 6 7 +50 7 8 9 10 11 12 13 1 4 5 6 7 8 9 10 6 8 9 10 11 12 13 14 +51 14 15 16 17 18 19 20 2 11 12 13 14 15 16 17 7 15 16 17 18 19 20 21 +52 21 22 23 24 25 26 27 3 18 19 20 21 22 23 24 8 22 23 24 25 26 27 28 +[7m53[27m 28 29 30 31 4 25 26 27 28 29 30 31 + diff --git a/tests/expected/cal/weekarg-3mj-week40 b/tests/expected/cal/weekarg-3mj-week40 index e9c2272c5..9613d9d5d 100644 --- a/tests/expected/cal/weekarg-3mj-week40 +++ b/tests/expected/cal/weekarg-3mj-week40 @@ -1,9 +1,9 @@ Julian - Monday-based, week 40, 3 month September 2013 October 2013 November 2013 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -35 244 40 274 275 276 277 278 279 44 305 306 307 -36 245 246 247 248 249 250 251 41 280 281 282 283 284 285 286 45 308 309 310 311 312 313 314 -37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 46 315 316 317 318 319 320 321 -38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 47 322 323 324 325 326 327 328 -39 266 267 268 269 270 271 272 44 301 302 303 304 48 329 330 331 332 333 334 -40 273 +35 244 40 274 275 276 277 278 279 44 305 306 307 +36 245 246 247 248 249 250 251 41 280 281 282 283 284 285 286 45 308 309 310 311 312 313 314 +37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 46 315 316 317 318 319 320 321 +38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 47 322 323 324 325 326 327 328 +39 266 267 268 269 270 271 272 44 301 302 303 304 48 329 330 331 332 333 334 +40 273 diff --git a/tests/expected/cal/weekarg-3mj-week40-color b/tests/expected/cal/weekarg-3mj-week40-color index 80e095dcd..d377259b2 100644 --- a/tests/expected/cal/weekarg-3mj-week40-color +++ b/tests/expected/cal/weekarg-3mj-week40-color @@ -1,9 +1,9 @@ Julian - Monday-based, week 40, 3 month September 2013 October 2013 November 2013 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -35 244 [7m40[27m 274 275 276 277 278 279 44 305 306 307 -36 245 246 247 248 249 250 251 41 [7m280[27m 281 282 283 284 285 286 45 308 309 310 311 312 313 314 -37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 46 315 316 317 318 319 320 321 -38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 47 322 323 324 325 326 327 328 -39 266 267 268 269 270 271 272 44 301 302 303 304 48 329 330 331 332 333 334 -[7m40[27m 273 +35 244 [7m40[27m 274 275 276 277 278 279 44 305 306 307 +36 245 246 247 248 249 250 251 41 [7m280[27m 281 282 283 284 285 286 45 308 309 310 311 312 313 314 +37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 46 315 316 317 318 319 320 321 +38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 47 322 323 324 325 326 327 328 +39 266 267 268 269 270 271 272 44 301 302 303 304 48 329 330 331 332 333 334 +[7m40[27m 273 diff --git a/tests/expected/cal/weekarg-3s-week40 b/tests/expected/cal/weekarg-3s-week40 index a9dcfd86d..11f7c8475 100644 --- a/tests/expected/cal/weekarg-3s-week40 +++ b/tests/expected/cal/weekarg-3s-week40 @@ -1,9 +1,9 @@ Gregorian - Sunday-based, week 40, 3 month September 2013 October 2013 November 2013 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -36 1 2 3 4 5 6 7 40 1 2 3 4 5 44 1 2 -37 8 9 10 11 12 13 14 41 6 7 8 9 10 11 12 45 3 4 5 6 7 8 9 -38 15 16 17 18 19 20 21 42 13 14 15 16 17 18 19 46 10 11 12 13 14 15 16 -39 22 23 24 25 26 27 28 43 20 21 22 23 24 25 26 47 17 18 19 20 21 22 23 -40 29 30 44 27 28 29 30 31 48 24 25 26 27 28 29 30 - +36 1 2 3 4 5 6 7 40 1 2 3 4 5 44 1 2 +37 8 9 10 11 12 13 14 41 6 7 8 9 10 11 12 45 3 4 5 6 7 8 9 +38 15 16 17 18 19 20 21 42 13 14 15 16 17 18 19 46 10 11 12 13 14 15 16 +39 22 23 24 25 26 27 28 43 20 21 22 23 24 25 26 47 17 18 19 20 21 22 23 +40 29 30 44 27 28 29 30 31 48 24 25 26 27 28 29 30 + diff --git a/tests/expected/cal/weekarg-3s-week54-color b/tests/expected/cal/weekarg-3s-week54-color index d5af5f08c..8ecca4be3 100644 --- a/tests/expected/cal/weekarg-3s-week54-color +++ b/tests/expected/cal/weekarg-3s-week54-color @@ -1,9 +1,9 @@ Gregorian - Sunday-based, week 54, 3 month November 2000 December 2000 January 2001 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -45 1 2 3 4 49 1 2 1 1 2 3 4 5 6 -46 5 6 7 8 9 10 11 50 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 -47 12 13 14 15 16 17 18 51 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 -48 19 20 21 22 23 24 25 52 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 -49 26 27 28 29 30 53 24 25 26 27 28 29 30 5 28 29 30 31 - [7m54[27m [7m31[27m +45 1 2 3 4 49 1 2 1 1 2 3 4 5 6 +46 5 6 7 8 9 10 11 50 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 +47 12 13 14 15 16 17 18 51 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 +48 19 20 21 22 23 24 25 52 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 +49 26 27 28 29 30 53 24 25 26 27 28 29 30 5 28 29 30 31 + [7m54[27m [7m31[27m diff --git a/tests/expected/cal/weekarg-3sj-week40 b/tests/expected/cal/weekarg-3sj-week40 index e0866b7f7..a20ecb83f 100644 --- a/tests/expected/cal/weekarg-3sj-week40 +++ b/tests/expected/cal/weekarg-3sj-week40 @@ -1,9 +1,9 @@ Julian - Sunday-based, week 40, 3 month September 2013 October 2013 November 2013 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -36 244 245 246 247 248 249 250 40 274 275 276 277 278 44 305 306 -37 251 252 253 254 255 256 257 41 279 280 281 282 283 284 285 45 307 308 309 310 311 312 313 -38 258 259 260 261 262 263 264 42 286 287 288 289 290 291 292 46 314 315 316 317 318 319 320 -39 265 266 267 268 269 270 271 43 293 294 295 296 297 298 299 47 321 322 323 324 325 326 327 -40 272 273 44 300 301 302 303 304 48 328 329 330 331 332 333 334 - +36 244 245 246 247 248 249 250 40 274 275 276 277 278 44 305 306 +37 251 252 253 254 255 256 257 41 279 280 281 282 283 284 285 45 307 308 309 310 311 312 313 +38 258 259 260 261 262 263 264 42 286 287 288 289 290 291 292 46 314 315 316 317 318 319 320 +39 265 266 267 268 269 270 271 43 293 294 295 296 297 298 299 47 321 322 323 324 325 326 327 +40 272 273 44 300 301 302 303 304 48 328 329 330 331 332 333 334 + diff --git a/tests/expected/cal/weekarg-m-week40 b/tests/expected/cal/weekarg-m-week40 index a3129ac74..5361f86d6 100644 --- a/tests/expected/cal/weekarg-m-week40 +++ b/tests/expected/cal/weekarg-m-week40 @@ -1,9 +1,9 @@ Gregorian - Monday-based, week 40, 1 month October 2013 Mo Tu We Th Fr Sa Su -40 1 2 3 4 5 6 -41 7 8 9 10 11 12 13 -42 14 15 16 17 18 19 20 -43 21 22 23 24 25 26 27 -44 28 29 30 31 - +40 1 2 3 4 5 6 +41 7 8 9 10 11 12 13 +42 14 15 16 17 18 19 20 +43 21 22 23 24 25 26 27 +44 28 29 30 31 + diff --git a/tests/expected/cal/weekarg-mj-week40 b/tests/expected/cal/weekarg-mj-week40 index cd3d8b531..f526c30b2 100644 --- a/tests/expected/cal/weekarg-mj-week40 +++ b/tests/expected/cal/weekarg-mj-week40 @@ -1,9 +1,9 @@ Julian - Monday-based, week 40, 1 month October 2013 Mon Tue Wed Thu Fri Sat Sun -40 274 275 276 277 278 279 -41 280 281 282 283 284 285 286 -42 287 288 289 290 291 292 293 -43 294 295 296 297 298 299 300 -44 301 302 303 304 - +40 274 275 276 277 278 279 +41 280 281 282 283 284 285 286 +42 287 288 289 290 291 292 293 +43 294 295 296 297 298 299 300 +44 301 302 303 304 + diff --git a/tests/expected/cal/weekarg-s-week40 b/tests/expected/cal/weekarg-s-week40 index 6158f42c5..207db4507 100644 --- a/tests/expected/cal/weekarg-s-week40 +++ b/tests/expected/cal/weekarg-s-week40 @@ -1,9 +1,9 @@ Gregorian - Sunday-based, week 40, 1 month October 2013 Su Mo Tu We Th Fr Sa -40 1 2 3 4 5 -41 6 7 8 9 10 11 12 -42 13 14 15 16 17 18 19 -43 20 21 22 23 24 25 26 -44 27 28 29 30 31 - +40 1 2 3 4 5 +41 6 7 8 9 10 11 12 +42 13 14 15 16 17 18 19 +43 20 21 22 23 24 25 26 +44 27 28 29 30 31 + diff --git a/tests/expected/cal/weekarg-sj-week40 b/tests/expected/cal/weekarg-sj-week40 index 481a8a2e5..51ac788df 100644 --- a/tests/expected/cal/weekarg-sj-week40 +++ b/tests/expected/cal/weekarg-sj-week40 @@ -1,9 +1,9 @@ Julian - Sunday-based, week 40, 1 month October 2013 Sun Mon Tue Wed Thu Fri Sat -40 274 275 276 277 278 -41 279 280 281 282 283 284 285 -42 286 287 288 289 290 291 292 -43 293 294 295 296 297 298 299 -44 300 301 302 303 304 - +40 274 275 276 277 278 +41 279 280 281 282 283 284 285 +42 286 287 288 289 290 291 292 +43 293 294 295 296 297 298 299 +44 300 301 302 303 304 + diff --git a/tests/expected/cal/weeknum-3mjw b/tests/expected/cal/weeknum-3mjw index 3e91a1b9e..3c525c669 100644 --- a/tests/expected/cal/weeknum-3mjw +++ b/tests/expected/cal/weeknum-3mjw @@ -1,57 +1,57 @@ Julian - Monday-based week with week numbers - 3 month December 2000 January 2001 February 2001 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -48 336 337 338 1 1 2 3 4 5 6 7 5 32 33 34 35 -49 339 340 341 342 343 344 345 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 -50 346 347 348 349 350 351 352 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 -51 353 354 355 356 357 358 359 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 -52 360 361 362 363 364 365 366 5 29 30 31 9 57 58 59 - +48 336 337 338 1 1 2 3 4 5 6 7 5 32 33 34 35 +49 339 340 341 342 343 344 345 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 +50 346 347 348 349 350 351 352 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 +51 353 354 355 356 357 358 359 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 +52 360 361 362 363 364 365 366 5 29 30 31 9 57 58 59 + December 2001 January 2002 February 2002 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -48 335 336 1 1 2 3 4 5 6 5 32 33 34 -49 337 338 339 340 341 342 343 2 7 8 9 10 11 12 13 6 35 36 37 38 39 40 41 -50 344 345 346 347 348 349 350 3 14 15 16 17 18 19 20 7 42 43 44 45 46 47 48 -51 351 352 353 354 355 356 357 4 21 22 23 24 25 26 27 8 49 50 51 52 53 54 55 -52 358 359 360 361 362 363 364 5 28 29 30 31 9 56 57 58 59 - 1 365 +48 335 336 1 1 2 3 4 5 6 5 32 33 34 +49 337 338 339 340 341 342 343 2 7 8 9 10 11 12 13 6 35 36 37 38 39 40 41 +50 344 345 346 347 348 349 350 3 14 15 16 17 18 19 20 7 42 43 44 45 46 47 48 +51 351 352 353 354 355 356 357 4 21 22 23 24 25 26 27 8 49 50 51 52 53 54 55 +52 358 359 360 361 362 363 364 5 28 29 30 31 9 56 57 58 59 + 1 365 December 2002 January 2003 February 2003 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -48 335 1 1 2 3 4 5 5 32 33 -49 336 337 338 339 340 341 342 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 -50 343 344 345 346 347 348 349 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 -51 350 351 352 353 354 355 356 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 -52 357 358 359 360 361 362 363 5 27 28 29 30 31 9 55 56 57 58 59 - 1 364 365 +48 335 1 1 2 3 4 5 5 32 33 +49 336 337 338 339 340 341 342 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 +50 343 344 345 346 347 348 349 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 +51 350 351 352 353 354 355 356 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 +52 357 358 359 360 361 362 363 5 27 28 29 30 31 9 55 56 57 58 59 + 1 364 365 December 2008 January 2009 February 2009 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -49 336 337 338 339 340 341 342 1 1 2 3 4 5 32 -50 343 344 345 346 347 348 349 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 -51 350 351 352 353 354 355 356 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 -52 357 358 359 360 361 362 363 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 - 1 364 365 366 5 26 27 28 29 30 31 9 54 55 56 57 58 59 - +49 336 337 338 339 340 341 342 1 1 2 3 4 5 32 +50 343 344 345 346 347 348 349 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 +51 350 351 352 353 354 355 356 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 +52 357 358 359 360 361 362 363 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 + 1 364 365 366 5 26 27 28 29 30 31 9 54 55 56 57 58 59 + December 2009 January 2010 February 2010 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -49 335 336 337 338 339 340 53 1 2 3 5 32 33 34 35 36 37 38 -50 341 342 343 344 345 346 347 1 4 5 6 7 8 9 10 6 39 40 41 42 43 44 45 -51 348 349 350 351 352 353 354 2 11 12 13 14 15 16 17 7 46 47 48 49 50 51 52 -52 355 356 357 358 359 360 361 3 18 19 20 21 22 23 24 8 53 54 55 56 57 58 59 -53 362 363 364 365 4 25 26 27 28 29 30 31 - +49 335 336 337 338 339 340 53 1 2 3 5 32 33 34 35 36 37 38 +50 341 342 343 344 345 346 347 1 4 5 6 7 8 9 10 6 39 40 41 42 43 44 45 +51 348 349 350 351 352 353 354 2 11 12 13 14 15 16 17 7 46 47 48 49 50 51 52 +52 355 356 357 358 359 360 361 3 18 19 20 21 22 23 24 8 53 54 55 56 57 58 59 +53 362 363 364 365 4 25 26 27 28 29 30 31 + December 2010 January 2011 February 2011 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -48 335 336 337 338 339 52 1 2 5 32 33 34 35 36 37 -49 340 341 342 343 344 345 346 1 3 4 5 6 7 8 9 6 38 39 40 41 42 43 44 -50 347 348 349 350 351 352 353 2 10 11 12 13 14 15 16 7 45 46 47 48 49 50 51 -51 354 355 356 357 358 359 360 3 17 18 19 20 21 22 23 8 52 53 54 55 56 57 58 -52 361 362 363 364 365 4 24 25 26 27 28 29 30 9 59 - 5 31 +48 335 336 337 338 339 52 1 2 5 32 33 34 35 36 37 +49 340 341 342 343 344 345 346 1 3 4 5 6 7 8 9 6 38 39 40 41 42 43 44 +50 347 348 349 350 351 352 353 2 10 11 12 13 14 15 16 7 45 46 47 48 49 50 51 +51 354 355 356 357 358 359 360 3 17 18 19 20 21 22 23 8 52 53 54 55 56 57 58 +52 361 362 363 364 365 4 24 25 26 27 28 29 30 9 59 + 5 31 December 2011 January 2012 February 2012 Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -48 335 336 337 338 52 1 5 32 33 34 35 36 -49 339 340 341 342 343 344 345 1 2 3 4 5 6 7 8 6 37 38 39 40 41 42 43 -50 346 347 348 349 350 351 352 2 9 10 11 12 13 14 15 7 44 45 46 47 48 49 50 -51 353 354 355 356 357 358 359 3 16 17 18 19 20 21 22 8 51 52 53 54 55 56 57 -52 360 361 362 363 364 365 4 23 24 25 26 27 28 29 9 58 59 60 - 5 30 31 +48 335 336 337 338 52 1 5 32 33 34 35 36 +49 339 340 341 342 343 344 345 1 2 3 4 5 6 7 8 6 37 38 39 40 41 42 43 +50 346 347 348 349 350 351 352 2 9 10 11 12 13 14 15 7 44 45 46 47 48 49 50 +51 353 354 355 356 357 358 359 3 16 17 18 19 20 21 22 8 51 52 53 54 55 56 57 +52 360 361 362 363 364 365 4 23 24 25 26 27 28 29 9 58 59 60 + 5 30 31 diff --git a/tests/expected/cal/weeknum-3mw b/tests/expected/cal/weeknum-3mw index b03566889..92f1ab00d 100644 --- a/tests/expected/cal/weeknum-3mw +++ b/tests/expected/cal/weeknum-3mw @@ -1,57 +1,57 @@ Gregorian - Monday-based week with week number December 2000 January 2001 February 2001 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -48 1 2 3 1 1 2 3 4 5 6 7 5 1 2 3 4 -49 4 5 6 7 8 9 10 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 -50 11 12 13 14 15 16 17 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 -51 18 19 20 21 22 23 24 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 -52 25 26 27 28 29 30 31 5 29 30 31 9 26 27 28 - +48 1 2 3 1 1 2 3 4 5 6 7 5 1 2 3 4 +49 4 5 6 7 8 9 10 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 +50 11 12 13 14 15 16 17 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 +51 18 19 20 21 22 23 24 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 +52 25 26 27 28 29 30 31 5 29 30 31 9 26 27 28 + December 2001 January 2002 February 2002 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -48 1 2 1 1 2 3 4 5 6 5 1 2 3 -49 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 -50 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 -51 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 -52 24 25 26 27 28 29 30 5 28 29 30 31 9 25 26 27 28 - 1 31 +48 1 2 1 1 2 3 4 5 6 5 1 2 3 +49 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 +50 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 +51 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 +52 24 25 26 27 28 29 30 5 28 29 30 31 9 25 26 27 28 + 1 31 December 2002 January 2003 February 2003 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -48 1 1 1 2 3 4 5 5 1 2 -49 2 3 4 5 6 7 8 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 -50 9 10 11 12 13 14 15 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 -51 16 17 18 19 20 21 22 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 -52 23 24 25 26 27 28 29 5 27 28 29 30 31 9 24 25 26 27 28 - 1 30 31 +48 1 1 1 2 3 4 5 5 1 2 +49 2 3 4 5 6 7 8 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 +50 9 10 11 12 13 14 15 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 +51 16 17 18 19 20 21 22 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 +52 23 24 25 26 27 28 29 5 27 28 29 30 31 9 24 25 26 27 28 + 1 30 31 December 2008 January 2009 February 2009 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -49 1 2 3 4 5 6 7 1 1 2 3 4 5 1 -50 8 9 10 11 12 13 14 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 -51 15 16 17 18 19 20 21 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 -52 22 23 24 25 26 27 28 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 - 1 29 30 31 5 26 27 28 29 30 31 9 23 24 25 26 27 28 - +49 1 2 3 4 5 6 7 1 1 2 3 4 5 1 +50 8 9 10 11 12 13 14 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 +51 15 16 17 18 19 20 21 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 +52 22 23 24 25 26 27 28 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 + 1 29 30 31 5 26 27 28 29 30 31 9 23 24 25 26 27 28 + December 2009 January 2010 February 2010 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -49 1 2 3 4 5 6 53 1 2 3 5 1 2 3 4 5 6 7 -50 7 8 9 10 11 12 13 1 4 5 6 7 8 9 10 6 8 9 10 11 12 13 14 -51 14 15 16 17 18 19 20 2 11 12 13 14 15 16 17 7 15 16 17 18 19 20 21 -52 21 22 23 24 25 26 27 3 18 19 20 21 22 23 24 8 22 23 24 25 26 27 28 -53 28 29 30 31 4 25 26 27 28 29 30 31 - +49 1 2 3 4 5 6 53 1 2 3 5 1 2 3 4 5 6 7 +50 7 8 9 10 11 12 13 1 4 5 6 7 8 9 10 6 8 9 10 11 12 13 14 +51 14 15 16 17 18 19 20 2 11 12 13 14 15 16 17 7 15 16 17 18 19 20 21 +52 21 22 23 24 25 26 27 3 18 19 20 21 22 23 24 8 22 23 24 25 26 27 28 +53 28 29 30 31 4 25 26 27 28 29 30 31 + December 2010 January 2011 February 2011 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -48 1 2 3 4 5 52 1 2 5 1 2 3 4 5 6 -49 6 7 8 9 10 11 12 1 3 4 5 6 7 8 9 6 7 8 9 10 11 12 13 -50 13 14 15 16 17 18 19 2 10 11 12 13 14 15 16 7 14 15 16 17 18 19 20 -51 20 21 22 23 24 25 26 3 17 18 19 20 21 22 23 8 21 22 23 24 25 26 27 -52 27 28 29 30 31 4 24 25 26 27 28 29 30 9 28 - 5 31 +48 1 2 3 4 5 52 1 2 5 1 2 3 4 5 6 +49 6 7 8 9 10 11 12 1 3 4 5 6 7 8 9 6 7 8 9 10 11 12 13 +50 13 14 15 16 17 18 19 2 10 11 12 13 14 15 16 7 14 15 16 17 18 19 20 +51 20 21 22 23 24 25 26 3 17 18 19 20 21 22 23 8 21 22 23 24 25 26 27 +52 27 28 29 30 31 4 24 25 26 27 28 29 30 9 28 + 5 31 December 2011 January 2012 February 2012 Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -48 1 2 3 4 52 1 5 1 2 3 4 5 -49 5 6 7 8 9 10 11 1 2 3 4 5 6 7 8 6 6 7 8 9 10 11 12 -50 12 13 14 15 16 17 18 2 9 10 11 12 13 14 15 7 13 14 15 16 17 18 19 -51 19 20 21 22 23 24 25 3 16 17 18 19 20 21 22 8 20 21 22 23 24 25 26 -52 26 27 28 29 30 31 4 23 24 25 26 27 28 29 9 27 28 29 - 5 30 31 +48 1 2 3 4 52 1 5 1 2 3 4 5 +49 5 6 7 8 9 10 11 1 2 3 4 5 6 7 8 6 6 7 8 9 10 11 12 +50 12 13 14 15 16 17 18 2 9 10 11 12 13 14 15 7 13 14 15 16 17 18 19 +51 19 20 21 22 23 24 25 3 16 17 18 19 20 21 22 8 20 21 22 23 24 25 26 +52 26 27 28 29 30 31 4 23 24 25 26 27 28 29 9 27 28 29 + 5 30 31 diff --git a/tests/expected/cal/weeknum-3sjw b/tests/expected/cal/weeknum-3sjw index bb5a9ee67..787d25c8e 100644 --- a/tests/expected/cal/weeknum-3sjw +++ b/tests/expected/cal/weeknum-3sjw @@ -1,57 +1,57 @@ Julian - Sunday-based week with week numbers - 3 month December 2000 January 2001 February 2001 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -49 336 337 1 1 2 3 4 5 6 5 32 33 34 -50 338 339 340 341 342 343 344 2 7 8 9 10 11 12 13 6 35 36 37 38 39 40 41 -51 345 346 347 348 349 350 351 3 14 15 16 17 18 19 20 7 42 43 44 45 46 47 48 -52 352 353 354 355 356 357 358 4 21 22 23 24 25 26 27 8 49 50 51 52 53 54 55 -53 359 360 361 362 363 364 365 5 28 29 30 31 9 56 57 58 59 -54 366 +49 336 337 1 1 2 3 4 5 6 5 32 33 34 +50 338 339 340 341 342 343 344 2 7 8 9 10 11 12 13 6 35 36 37 38 39 40 41 +51 345 346 347 348 349 350 351 3 14 15 16 17 18 19 20 7 42 43 44 45 46 47 48 +52 352 353 354 355 356 357 358 4 21 22 23 24 25 26 27 8 49 50 51 52 53 54 55 +53 359 360 361 362 363 364 365 5 28 29 30 31 9 56 57 58 59 +54 366 December 2001 January 2002 February 2002 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -48 335 1 1 2 3 4 5 5 32 33 -49 336 337 338 339 340 341 342 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 -50 343 344 345 346 347 348 349 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 -51 350 351 352 353 354 355 356 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 -52 357 358 359 360 361 362 363 5 27 28 29 30 31 9 55 56 57 58 59 -53 364 365 +48 335 1 1 2 3 4 5 5 32 33 +49 336 337 338 339 340 341 342 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 +50 343 344 345 346 347 348 349 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 +51 350 351 352 353 354 355 356 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 +52 357 358 359 360 361 362 363 5 27 28 29 30 31 9 55 56 57 58 59 +53 364 365 December 2002 January 2003 February 2003 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -49 335 336 337 338 339 340 341 1 1 2 3 4 5 32 -50 342 343 344 345 346 347 348 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 -51 349 350 351 352 353 354 355 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 -52 356 357 358 359 360 361 362 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 -53 363 364 365 5 26 27 28 29 30 31 9 54 55 56 57 58 59 - +49 335 336 337 338 339 340 341 1 1 2 3 4 5 32 +50 342 343 344 345 346 347 348 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 +51 349 350 351 352 353 354 355 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 +52 356 357 358 359 360 361 362 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 +53 363 364 365 5 26 27 28 29 30 31 9 54 55 56 57 58 59 + December 2008 January 2009 February 2009 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -49 336 337 338 339 340 341 1 1 2 3 6 32 33 34 35 36 37 38 -50 342 343 344 345 346 347 348 2 4 5 6 7 8 9 10 7 39 40 41 42 43 44 45 -51 349 350 351 352 353 354 355 3 11 12 13 14 15 16 17 8 46 47 48 49 50 51 52 -52 356 357 358 359 360 361 362 4 18 19 20 21 22 23 24 9 53 54 55 56 57 58 59 -53 363 364 365 366 5 25 26 27 28 29 30 31 - +49 336 337 338 339 340 341 1 1 2 3 6 32 33 34 35 36 37 38 +50 342 343 344 345 346 347 348 2 4 5 6 7 8 9 10 7 39 40 41 42 43 44 45 +51 349 350 351 352 353 354 355 3 11 12 13 14 15 16 17 8 46 47 48 49 50 51 52 +52 356 357 358 359 360 361 362 4 18 19 20 21 22 23 24 9 53 54 55 56 57 58 59 +53 363 364 365 366 5 25 26 27 28 29 30 31 + December 2009 January 2010 February 2010 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -49 335 336 337 338 339 1 1 2 6 32 33 34 35 36 37 -50 340 341 342 343 344 345 346 2 3 4 5 6 7 8 9 7 38 39 40 41 42 43 44 -51 347 348 349 350 351 352 353 3 10 11 12 13 14 15 16 8 45 46 47 48 49 50 51 -52 354 355 356 357 358 359 360 4 17 18 19 20 21 22 23 9 52 53 54 55 56 57 58 -53 361 362 363 364 365 5 24 25 26 27 28 29 30 10 59 - 6 31 +49 335 336 337 338 339 1 1 2 6 32 33 34 35 36 37 +50 340 341 342 343 344 345 346 2 3 4 5 6 7 8 9 7 38 39 40 41 42 43 44 +51 347 348 349 350 351 352 353 3 10 11 12 13 14 15 16 8 45 46 47 48 49 50 51 +52 354 355 356 357 358 359 360 4 17 18 19 20 21 22 23 9 52 53 54 55 56 57 58 +53 361 362 363 364 365 5 24 25 26 27 28 29 30 10 59 + 6 31 December 2010 January 2011 February 2011 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -49 335 336 337 338 1 1 6 32 33 34 35 36 -50 339 340 341 342 343 344 345 2 2 3 4 5 6 7 8 7 37 38 39 40 41 42 43 -51 346 347 348 349 350 351 352 3 9 10 11 12 13 14 15 8 44 45 46 47 48 49 50 -52 353 354 355 356 357 358 359 4 16 17 18 19 20 21 22 9 51 52 53 54 55 56 57 -53 360 361 362 363 364 365 5 23 24 25 26 27 28 29 10 58 59 - 6 30 31 +49 335 336 337 338 1 1 6 32 33 34 35 36 +50 339 340 341 342 343 344 345 2 2 3 4 5 6 7 8 7 37 38 39 40 41 42 43 +51 346 347 348 349 350 351 352 3 9 10 11 12 13 14 15 8 44 45 46 47 48 49 50 +52 353 354 355 356 357 358 359 4 16 17 18 19 20 21 22 9 51 52 53 54 55 56 57 +53 360 361 362 363 364 365 5 23 24 25 26 27 28 29 10 58 59 + 6 30 31 December 2011 January 2012 February 2012 Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -49 335 336 337 1 1 2 3 4 5 6 7 5 32 33 34 35 -50 338 339 340 341 342 343 344 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 -51 345 346 347 348 349 350 351 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 -52 352 353 354 355 356 357 358 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 -53 359 360 361 362 363 364 365 5 29 30 31 9 57 58 59 60 - +49 335 336 337 1 1 2 3 4 5 6 7 5 32 33 34 35 +50 338 339 340 341 342 343 344 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 +51 345 346 347 348 349 350 351 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 +52 352 353 354 355 356 357 358 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 +53 359 360 361 362 363 364 365 5 29 30 31 9 57 58 59 60 + diff --git a/tests/expected/cal/weeknum-3sw b/tests/expected/cal/weeknum-3sw index 9dd7ffd0e..0b1c1b23b 100644 --- a/tests/expected/cal/weeknum-3sw +++ b/tests/expected/cal/weeknum-3sw @@ -1,57 +1,57 @@ Gregorian - Sunday-based week with week numbers - 3 month December 2000 January 2001 February 2001 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -49 1 2 1 1 2 3 4 5 6 5 1 2 3 -50 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 -51 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 -52 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 -53 24 25 26 27 28 29 30 5 28 29 30 31 9 25 26 27 28 -54 31 +49 1 2 1 1 2 3 4 5 6 5 1 2 3 +50 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 +51 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 +52 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 +53 24 25 26 27 28 29 30 5 28 29 30 31 9 25 26 27 28 +54 31 December 2001 January 2002 February 2002 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -48 1 1 1 2 3 4 5 5 1 2 -49 2 3 4 5 6 7 8 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 -50 9 10 11 12 13 14 15 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 -51 16 17 18 19 20 21 22 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 -52 23 24 25 26 27 28 29 5 27 28 29 30 31 9 24 25 26 27 28 -53 30 31 +48 1 1 1 2 3 4 5 5 1 2 +49 2 3 4 5 6 7 8 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 +50 9 10 11 12 13 14 15 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 +51 16 17 18 19 20 21 22 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 +52 23 24 25 26 27 28 29 5 27 28 29 30 31 9 24 25 26 27 28 +53 30 31 December 2002 January 2003 February 2003 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -49 1 2 3 4 5 6 7 1 1 2 3 4 5 1 -50 8 9 10 11 12 13 14 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 -51 15 16 17 18 19 20 21 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 -52 22 23 24 25 26 27 28 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 -53 29 30 31 5 26 27 28 29 30 31 9 23 24 25 26 27 28 - +49 1 2 3 4 5 6 7 1 1 2 3 4 5 1 +50 8 9 10 11 12 13 14 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 +51 15 16 17 18 19 20 21 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 +52 22 23 24 25 26 27 28 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 +53 29 30 31 5 26 27 28 29 30 31 9 23 24 25 26 27 28 + December 2008 January 2009 February 2009 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -49 1 2 3 4 5 6 1 1 2 3 6 1 2 3 4 5 6 7 -50 7 8 9 10 11 12 13 2 4 5 6 7 8 9 10 7 8 9 10 11 12 13 14 -51 14 15 16 17 18 19 20 3 11 12 13 14 15 16 17 8 15 16 17 18 19 20 21 -52 21 22 23 24 25 26 27 4 18 19 20 21 22 23 24 9 22 23 24 25 26 27 28 -53 28 29 30 31 5 25 26 27 28 29 30 31 - +49 1 2 3 4 5 6 1 1 2 3 6 1 2 3 4 5 6 7 +50 7 8 9 10 11 12 13 2 4 5 6 7 8 9 10 7 8 9 10 11 12 13 14 +51 14 15 16 17 18 19 20 3 11 12 13 14 15 16 17 8 15 16 17 18 19 20 21 +52 21 22 23 24 25 26 27 4 18 19 20 21 22 23 24 9 22 23 24 25 26 27 28 +53 28 29 30 31 5 25 26 27 28 29 30 31 + December 2009 January 2010 February 2010 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -49 1 2 3 4 5 1 1 2 6 1 2 3 4 5 6 -50 6 7 8 9 10 11 12 2 3 4 5 6 7 8 9 7 7 8 9 10 11 12 13 -51 13 14 15 16 17 18 19 3 10 11 12 13 14 15 16 8 14 15 16 17 18 19 20 -52 20 21 22 23 24 25 26 4 17 18 19 20 21 22 23 9 21 22 23 24 25 26 27 -53 27 28 29 30 31 5 24 25 26 27 28 29 30 10 28 - 6 31 +49 1 2 3 4 5 1 1 2 6 1 2 3 4 5 6 +50 6 7 8 9 10 11 12 2 3 4 5 6 7 8 9 7 7 8 9 10 11 12 13 +51 13 14 15 16 17 18 19 3 10 11 12 13 14 15 16 8 14 15 16 17 18 19 20 +52 20 21 22 23 24 25 26 4 17 18 19 20 21 22 23 9 21 22 23 24 25 26 27 +53 27 28 29 30 31 5 24 25 26 27 28 29 30 10 28 + 6 31 December 2010 January 2011 February 2011 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -49 1 2 3 4 1 1 6 1 2 3 4 5 -50 5 6 7 8 9 10 11 2 2 3 4 5 6 7 8 7 6 7 8 9 10 11 12 -51 12 13 14 15 16 17 18 3 9 10 11 12 13 14 15 8 13 14 15 16 17 18 19 -52 19 20 21 22 23 24 25 4 16 17 18 19 20 21 22 9 20 21 22 23 24 25 26 -53 26 27 28 29 30 31 5 23 24 25 26 27 28 29 10 27 28 - 6 30 31 +49 1 2 3 4 1 1 6 1 2 3 4 5 +50 5 6 7 8 9 10 11 2 2 3 4 5 6 7 8 7 6 7 8 9 10 11 12 +51 12 13 14 15 16 17 18 3 9 10 11 12 13 14 15 8 13 14 15 16 17 18 19 +52 19 20 21 22 23 24 25 4 16 17 18 19 20 21 22 9 20 21 22 23 24 25 26 +53 26 27 28 29 30 31 5 23 24 25 26 27 28 29 10 27 28 + 6 30 31 December 2011 January 2012 February 2012 Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -49 1 2 3 1 1 2 3 4 5 6 7 5 1 2 3 4 -50 4 5 6 7 8 9 10 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 -51 11 12 13 14 15 16 17 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 -52 18 19 20 21 22 23 24 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 -53 25 26 27 28 29 30 31 5 29 30 31 9 26 27 28 29 - +49 1 2 3 1 1 2 3 4 5 6 7 5 1 2 3 4 +50 4 5 6 7 8 9 10 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 +51 11 12 13 14 15 16 17 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 +52 18 19 20 21 22 23 24 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 +53 25 26 27 28 29 30 31 5 29 30 31 9 26 27 28 29 + diff --git a/tests/expected/cal/weeknum-ymjw b/tests/expected/cal/weeknum-ymjw index b413785d6..d4a1072b9 100644 --- a/tests/expected/cal/weeknum-ymjw +++ b/tests/expected/cal/weeknum-ymjw @@ -1,358 +1,239 @@ Julian - Monday-based week with week numbers 2001 - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 1 1 2 3 4 5 6 7 5 32 33 34 35 - 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 - 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 - 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 - 5 29 30 31 9 57 58 59 - - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 60 61 62 63 13 91 -10 64 65 66 67 68 69 70 14 92 93 94 95 96 97 98 -11 71 72 73 74 75 76 77 15 99 100 101 102 103 104 105 -12 78 79 80 81 82 83 84 16 106 107 108 109 110 111 112 -13 85 86 87 88 89 90 17 113 114 115 116 117 118 119 - 18 120 - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -18 121 122 123 124 125 126 22 152 153 154 -19 127 128 129 130 131 132 133 23 155 156 157 158 159 160 161 -20 134 135 136 137 138 139 140 24 162 163 164 165 166 167 168 -21 141 142 143 144 145 146 147 25 169 170 171 172 173 174 175 -22 148 149 150 151 26 176 177 178 179 180 181 - - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -26 182 31 213 214 215 216 217 -27 183 184 185 186 187 188 189 32 218 219 220 221 222 223 224 -28 190 191 192 193 194 195 196 33 225 226 227 228 229 230 231 -29 197 198 199 200 201 202 203 34 232 233 234 235 236 237 238 -30 204 205 206 207 208 209 210 35 239 240 241 242 243 -31 211 212 - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -35 244 245 40 274 275 276 277 278 279 280 -36 246 247 248 249 250 251 252 41 281 282 283 284 285 286 287 -37 253 254 255 256 257 258 259 42 288 289 290 291 292 293 294 -38 260 261 262 263 264 265 266 43 295 296 297 298 299 300 301 -39 267 268 269 270 271 272 273 44 302 303 304 - - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 305 306 307 308 48 335 336 -45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 -46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 -47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 -48 330 331 332 333 334 52 358 359 360 361 362 363 364 - 1 365 - + January February March + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 1 1 2 3 4 5 6 7 5 32 33 34 35 9 60 61 62 63 + 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 10 64 65 66 67 68 69 70 + 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 11 71 72 73 74 75 76 77 + 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 12 78 79 80 81 82 83 84 + 5 29 30 31 9 57 58 59 13 85 86 87 88 89 90 + + April May June + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +13 91 18 121 122 123 124 125 126 22 152 153 154 +14 92 93 94 95 96 97 98 19 127 128 129 130 131 132 133 23 155 156 157 158 159 160 161 +15 99 100 101 102 103 104 105 20 134 135 136 137 138 139 140 24 162 163 164 165 166 167 168 +16 106 107 108 109 110 111 112 21 141 142 143 144 145 146 147 25 169 170 171 172 173 174 175 +17 113 114 115 116 117 118 119 22 148 149 150 151 26 176 177 178 179 180 181 +18 120 + July August September + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +26 182 31 213 214 215 216 217 35 244 245 +27 183 184 185 186 187 188 189 32 218 219 220 221 222 223 224 36 246 247 248 249 250 251 252 +28 190 191 192 193 194 195 196 33 225 226 227 228 229 230 231 37 253 254 255 256 257 258 259 +29 197 198 199 200 201 202 203 34 232 233 234 235 236 237 238 38 260 261 262 263 264 265 266 +30 204 205 206 207 208 209 210 35 239 240 241 242 243 39 267 268 269 270 271 272 273 +31 211 212 + October November December + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +40 274 275 276 277 278 279 280 44 305 306 307 308 48 335 336 +41 281 282 283 284 285 286 287 45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 +42 288 289 290 291 292 293 294 46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 +43 295 296 297 298 299 300 301 47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 +44 302 303 304 48 330 331 332 333 334 52 358 359 360 361 362 363 364 + 1 365 2002 - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 1 1 2 3 4 5 6 5 32 33 34 - 2 7 8 9 10 11 12 13 6 35 36 37 38 39 40 41 - 3 14 15 16 17 18 19 20 7 42 43 44 45 46 47 48 - 4 21 22 23 24 25 26 27 8 49 50 51 52 53 54 55 - 5 28 29 30 31 9 56 57 58 59 - - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 60 61 62 14 91 92 93 94 95 96 97 -10 63 64 65 66 67 68 69 15 98 99 100 101 102 103 104 -11 70 71 72 73 74 75 76 16 105 106 107 108 109 110 111 -12 77 78 79 80 81 82 83 17 112 113 114 115 116 117 118 -13 84 85 86 87 88 89 90 18 119 120 - - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -18 121 122 123 124 125 22 152 153 -19 126 127 128 129 130 131 132 23 154 155 156 157 158 159 160 -20 133 134 135 136 137 138 139 24 161 162 163 164 165 166 167 -21 140 141 142 143 144 145 146 25 168 169 170 171 172 173 174 -22 147 148 149 150 151 26 175 176 177 178 179 180 181 - - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -27 182 183 184 185 186 187 188 31 213 214 215 216 -28 189 190 191 192 193 194 195 32 217 218 219 220 221 222 223 -29 196 197 198 199 200 201 202 33 224 225 226 227 228 229 230 -30 203 204 205 206 207 208 209 34 231 232 233 234 235 236 237 -31 210 211 212 35 238 239 240 241 242 243 - - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -35 244 40 274 275 276 277 278 279 -36 245 246 247 248 249 250 251 41 280 281 282 283 284 285 286 -37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 -38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 -39 266 267 268 269 270 271 272 44 301 302 303 304 -40 273 - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 305 306 307 48 335 -45 308 309 310 311 312 313 314 49 336 337 338 339 340 341 342 -46 315 316 317 318 319 320 321 50 343 344 345 346 347 348 349 -47 322 323 324 325 326 327 328 51 350 351 352 353 354 355 356 -48 329 330 331 332 333 334 52 357 358 359 360 361 362 363 - 1 364 365 - + January February March + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 1 1 2 3 4 5 6 5 32 33 34 9 60 61 62 + 2 7 8 9 10 11 12 13 6 35 36 37 38 39 40 41 10 63 64 65 66 67 68 69 + 3 14 15 16 17 18 19 20 7 42 43 44 45 46 47 48 11 70 71 72 73 74 75 76 + 4 21 22 23 24 25 26 27 8 49 50 51 52 53 54 55 12 77 78 79 80 81 82 83 + 5 28 29 30 31 9 56 57 58 59 13 84 85 86 87 88 89 90 + + April May June + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +14 91 92 93 94 95 96 97 18 121 122 123 124 125 22 152 153 +15 98 99 100 101 102 103 104 19 126 127 128 129 130 131 132 23 154 155 156 157 158 159 160 +16 105 106 107 108 109 110 111 20 133 134 135 136 137 138 139 24 161 162 163 164 165 166 167 +17 112 113 114 115 116 117 118 21 140 141 142 143 144 145 146 25 168 169 170 171 172 173 174 +18 119 120 22 147 148 149 150 151 26 175 176 177 178 179 180 181 + + July August September + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +27 182 183 184 185 186 187 188 31 213 214 215 216 35 244 +28 189 190 191 192 193 194 195 32 217 218 219 220 221 222 223 36 245 246 247 248 249 250 251 +29 196 197 198 199 200 201 202 33 224 225 226 227 228 229 230 37 252 253 254 255 256 257 258 +30 203 204 205 206 207 208 209 34 231 232 233 234 235 236 237 38 259 260 261 262 263 264 265 +31 210 211 212 35 238 239 240 241 242 243 39 266 267 268 269 270 271 272 + 40 273 + October November December + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +40 274 275 276 277 278 279 44 305 306 307 48 335 +41 280 281 282 283 284 285 286 45 308 309 310 311 312 313 314 49 336 337 338 339 340 341 342 +42 287 288 289 290 291 292 293 46 315 316 317 318 319 320 321 50 343 344 345 346 347 348 349 +43 294 295 296 297 298 299 300 47 322 323 324 325 326 327 328 51 350 351 352 353 354 355 356 +44 301 302 303 304 48 329 330 331 332 333 334 52 357 358 359 360 361 362 363 + 1 364 365 2003 - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 1 1 2 3 4 5 5 32 33 - 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 - 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 - 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 - 5 27 28 29 30 31 9 55 56 57 58 59 - - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 60 61 14 91 92 93 94 95 96 -10 62 63 64 65 66 67 68 15 97 98 99 100 101 102 103 -11 69 70 71 72 73 74 75 16 104 105 106 107 108 109 110 -12 76 77 78 79 80 81 82 17 111 112 113 114 115 116 117 -13 83 84 85 86 87 88 89 18 118 119 120 -14 90 - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -18 121 122 123 124 22 152 -19 125 126 127 128 129 130 131 23 153 154 155 156 157 158 159 -20 132 133 134 135 136 137 138 24 160 161 162 163 164 165 166 -21 139 140 141 142 143 144 145 25 167 168 169 170 171 172 173 -22 146 147 148 149 150 151 26 174 175 176 177 178 179 180 - 27 181 - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -27 182 183 184 185 186 187 31 213 214 215 -28 188 189 190 191 192 193 194 32 216 217 218 219 220 221 222 -29 195 196 197 198 199 200 201 33 223 224 225 226 227 228 229 -30 202 203 204 205 206 207 208 34 230 231 232 233 234 235 236 -31 209 210 211 212 35 237 238 239 240 241 242 243 - - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -36 244 245 246 247 248 249 250 40 274 275 276 277 278 -37 251 252 253 254 255 256 257 41 279 280 281 282 283 284 285 -38 258 259 260 261 262 263 264 42 286 287 288 289 290 291 292 -39 265 266 267 268 269 270 271 43 293 294 295 296 297 298 299 -40 272 273 44 300 301 302 303 304 - - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 305 306 49 335 336 337 338 339 340 341 -45 307 308 309 310 311 312 313 50 342 343 344 345 346 347 348 -46 314 315 316 317 318 319 320 51 349 350 351 352 353 354 355 -47 321 322 323 324 325 326 327 52 356 357 358 359 360 361 362 -48 328 329 330 331 332 333 334 1 363 364 365 - - + January February March + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 1 1 2 3 4 5 5 32 33 9 60 61 + 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 10 62 63 64 65 66 67 68 + 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 11 69 70 71 72 73 74 75 + 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 12 76 77 78 79 80 81 82 + 5 27 28 29 30 31 9 55 56 57 58 59 13 83 84 85 86 87 88 89 + 14 90 + April May June + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +14 91 92 93 94 95 96 18 121 122 123 124 22 152 +15 97 98 99 100 101 102 103 19 125 126 127 128 129 130 131 23 153 154 155 156 157 158 159 +16 104 105 106 107 108 109 110 20 132 133 134 135 136 137 138 24 160 161 162 163 164 165 166 +17 111 112 113 114 115 116 117 21 139 140 141 142 143 144 145 25 167 168 169 170 171 172 173 +18 118 119 120 22 146 147 148 149 150 151 26 174 175 176 177 178 179 180 + 27 181 + July August September + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +27 182 183 184 185 186 187 31 213 214 215 36 244 245 246 247 248 249 250 +28 188 189 190 191 192 193 194 32 216 217 218 219 220 221 222 37 251 252 253 254 255 256 257 +29 195 196 197 198 199 200 201 33 223 224 225 226 227 228 229 38 258 259 260 261 262 263 264 +30 202 203 204 205 206 207 208 34 230 231 232 233 234 235 236 39 265 266 267 268 269 270 271 +31 209 210 211 212 35 237 238 239 240 241 242 243 40 272 273 + + October November December + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +40 274 275 276 277 278 44 305 306 49 335 336 337 338 339 340 341 +41 279 280 281 282 283 284 285 45 307 308 309 310 311 312 313 50 342 343 344 345 346 347 348 +42 286 287 288 289 290 291 292 46 314 315 316 317 318 319 320 51 349 350 351 352 353 354 355 +43 293 294 295 296 297 298 299 47 321 322 323 324 325 326 327 52 356 357 358 359 360 361 362 +44 300 301 302 303 304 48 328 329 330 331 332 333 334 1 363 364 365 + 2009 - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 1 1 2 3 4 5 32 - 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 - 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 - 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 - 5 26 27 28 29 30 31 9 54 55 56 57 58 59 - - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 60 14 91 92 93 94 95 -10 61 62 63 64 65 66 67 15 96 97 98 99 100 101 102 -11 68 69 70 71 72 73 74 16 103 104 105 106 107 108 109 -12 75 76 77 78 79 80 81 17 110 111 112 113 114 115 116 -13 82 83 84 85 86 87 88 18 117 118 119 120 -14 89 90 - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -18 121 122 123 23 152 153 154 155 156 157 158 -19 124 125 126 127 128 129 130 24 159 160 161 162 163 164 165 -20 131 132 133 134 135 136 137 25 166 167 168 169 170 171 172 -21 138 139 140 141 142 143 144 26 173 174 175 176 177 178 179 -22 145 146 147 148 149 150 151 27 180 181 - - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -27 182 183 184 185 186 31 213 214 -28 187 188 189 190 191 192 193 32 215 216 217 218 219 220 221 -29 194 195 196 197 198 199 200 33 222 223 224 225 226 227 228 -30 201 202 203 204 205 206 207 34 229 230 231 232 233 234 235 -31 208 209 210 211 212 35 236 237 238 239 240 241 242 - 36 243 - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -36 244 245 246 247 248 249 40 274 275 276 277 -37 250 251 252 253 254 255 256 41 278 279 280 281 282 283 284 -38 257 258 259 260 261 262 263 42 285 286 287 288 289 290 291 -39 264 265 266 267 268 269 270 43 292 293 294 295 296 297 298 -40 271 272 273 44 299 300 301 302 303 304 - - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 305 49 335 336 337 338 339 340 -45 306 307 308 309 310 311 312 50 341 342 343 344 345 346 347 -46 313 314 315 316 317 318 319 51 348 349 350 351 352 353 354 -47 320 321 322 323 324 325 326 52 355 356 357 358 359 360 361 -48 327 328 329 330 331 332 333 53 362 363 364 365 -49 334 - + January February March + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 1 1 2 3 4 5 32 9 60 + 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 10 61 62 63 64 65 66 67 + 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 11 68 69 70 71 72 73 74 + 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 12 75 76 77 78 79 80 81 + 5 26 27 28 29 30 31 9 54 55 56 57 58 59 13 82 83 84 85 86 87 88 + 14 89 90 + April May June + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +14 91 92 93 94 95 18 121 122 123 23 152 153 154 155 156 157 158 +15 96 97 98 99 100 101 102 19 124 125 126 127 128 129 130 24 159 160 161 162 163 164 165 +16 103 104 105 106 107 108 109 20 131 132 133 134 135 136 137 25 166 167 168 169 170 171 172 +17 110 111 112 113 114 115 116 21 138 139 140 141 142 143 144 26 173 174 175 176 177 178 179 +18 117 118 119 120 22 145 146 147 148 149 150 151 27 180 181 + + July August September + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +27 182 183 184 185 186 31 213 214 36 244 245 246 247 248 249 +28 187 188 189 190 191 192 193 32 215 216 217 218 219 220 221 37 250 251 252 253 254 255 256 +29 194 195 196 197 198 199 200 33 222 223 224 225 226 227 228 38 257 258 259 260 261 262 263 +30 201 202 203 204 205 206 207 34 229 230 231 232 233 234 235 39 264 265 266 267 268 269 270 +31 208 209 210 211 212 35 236 237 238 239 240 241 242 40 271 272 273 + 36 243 + October November December + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +40 274 275 276 277 44 305 49 335 336 337 338 339 340 +41 278 279 280 281 282 283 284 45 306 307 308 309 310 311 312 50 341 342 343 344 345 346 347 +42 285 286 287 288 289 290 291 46 313 314 315 316 317 318 319 51 348 349 350 351 352 353 354 +43 292 293 294 295 296 297 298 47 320 321 322 323 324 325 326 52 355 356 357 358 359 360 361 +44 299 300 301 302 303 304 48 327 328 329 330 331 332 333 53 362 363 364 365 + 49 334 2010 - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -53 1 2 3 5 32 33 34 35 36 37 38 - 1 4 5 6 7 8 9 10 6 39 40 41 42 43 44 45 - 2 11 12 13 14 15 16 17 7 46 47 48 49 50 51 52 - 3 18 19 20 21 22 23 24 8 53 54 55 56 57 58 59 - 4 25 26 27 28 29 30 31 - - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 60 61 62 63 64 65 66 13 91 92 93 94 -10 67 68 69 70 71 72 73 14 95 96 97 98 99 100 101 -11 74 75 76 77 78 79 80 15 102 103 104 105 106 107 108 -12 81 82 83 84 85 86 87 16 109 110 111 112 113 114 115 -13 88 89 90 17 116 117 118 119 120 - - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -17 121 122 22 152 153 154 155 156 157 -18 123 124 125 126 127 128 129 23 158 159 160 161 162 163 164 -19 130 131 132 133 134 135 136 24 165 166 167 168 169 170 171 -20 137 138 139 140 141 142 143 25 172 173 174 175 176 177 178 -21 144 145 146 147 148 149 150 26 179 180 181 -22 151 - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -26 182 183 184 185 30 213 -27 186 187 188 189 190 191 192 31 214 215 216 217 218 219 220 -28 193 194 195 196 197 198 199 32 221 222 223 224 225 226 227 -29 200 201 202 203 204 205 206 33 228 229 230 231 232 233 234 -30 207 208 209 210 211 212 34 235 236 237 238 239 240 241 - 35 242 243 - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -35 244 245 246 247 248 39 274 275 276 -36 249 250 251 252 253 254 255 40 277 278 279 280 281 282 283 -37 256 257 258 259 260 261 262 41 284 285 286 287 288 289 290 -38 263 264 265 266 267 268 269 42 291 292 293 294 295 296 297 -39 270 271 272 273 43 298 299 300 301 302 303 304 - - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 305 306 307 308 309 310 311 48 335 336 337 338 339 -45 312 313 314 315 316 317 318 49 340 341 342 343 344 345 346 -46 319 320 321 322 323 324 325 50 347 348 349 350 351 352 353 -47 326 327 328 329 330 331 332 51 354 355 356 357 358 359 360 -48 333 334 52 361 362 363 364 365 - - + January February March + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +53 1 2 3 5 32 33 34 35 36 37 38 9 60 61 62 63 64 65 66 + 1 4 5 6 7 8 9 10 6 39 40 41 42 43 44 45 10 67 68 69 70 71 72 73 + 2 11 12 13 14 15 16 17 7 46 47 48 49 50 51 52 11 74 75 76 77 78 79 80 + 3 18 19 20 21 22 23 24 8 53 54 55 56 57 58 59 12 81 82 83 84 85 86 87 + 4 25 26 27 28 29 30 31 13 88 89 90 + + April May June + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +13 91 92 93 94 17 121 122 22 152 153 154 155 156 157 +14 95 96 97 98 99 100 101 18 123 124 125 126 127 128 129 23 158 159 160 161 162 163 164 +15 102 103 104 105 106 107 108 19 130 131 132 133 134 135 136 24 165 166 167 168 169 170 171 +16 109 110 111 112 113 114 115 20 137 138 139 140 141 142 143 25 172 173 174 175 176 177 178 +17 116 117 118 119 120 21 144 145 146 147 148 149 150 26 179 180 181 + 22 151 + July August September + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +26 182 183 184 185 30 213 35 244 245 246 247 248 +27 186 187 188 189 190 191 192 31 214 215 216 217 218 219 220 36 249 250 251 252 253 254 255 +28 193 194 195 196 197 198 199 32 221 222 223 224 225 226 227 37 256 257 258 259 260 261 262 +29 200 201 202 203 204 205 206 33 228 229 230 231 232 233 234 38 263 264 265 266 267 268 269 +30 207 208 209 210 211 212 34 235 236 237 238 239 240 241 39 270 271 272 273 + 35 242 243 + October November December + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +39 274 275 276 44 305 306 307 308 309 310 311 48 335 336 337 338 339 +40 277 278 279 280 281 282 283 45 312 313 314 315 316 317 318 49 340 341 342 343 344 345 346 +41 284 285 286 287 288 289 290 46 319 320 321 322 323 324 325 50 347 348 349 350 351 352 353 +42 291 292 293 294 295 296 297 47 326 327 328 329 330 331 332 51 354 355 356 357 358 359 360 +43 298 299 300 301 302 303 304 48 333 334 52 361 362 363 364 365 + 2011 - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -52 1 2 5 32 33 34 35 36 37 - 1 3 4 5 6 7 8 9 6 38 39 40 41 42 43 44 - 2 10 11 12 13 14 15 16 7 45 46 47 48 49 50 51 - 3 17 18 19 20 21 22 23 8 52 53 54 55 56 57 58 - 4 24 25 26 27 28 29 30 9 59 - 5 31 - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 60 61 62 63 64 65 13 91 92 93 -10 66 67 68 69 70 71 72 14 94 95 96 97 98 99 100 -11 73 74 75 76 77 78 79 15 101 102 103 104 105 106 107 -12 80 81 82 83 84 85 86 16 108 109 110 111 112 113 114 -13 87 88 89 90 17 115 116 117 118 119 120 - - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -17 121 22 152 153 154 155 156 -18 122 123 124 125 126 127 128 23 157 158 159 160 161 162 163 -19 129 130 131 132 133 134 135 24 164 165 166 167 168 169 170 -20 136 137 138 139 140 141 142 25 171 172 173 174 175 176 177 -21 143 144 145 146 147 148 149 26 178 179 180 181 -22 150 151 - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -26 182 183 184 31 213 214 215 216 217 218 219 -27 185 186 187 188 189 190 191 32 220 221 222 223 224 225 226 -28 192 193 194 195 196 197 198 33 227 228 229 230 231 232 233 -29 199 200 201 202 203 204 205 34 234 235 236 237 238 239 240 -30 206 207 208 209 210 211 212 35 241 242 243 - - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -35 244 245 246 247 39 274 275 -36 248 249 250 251 252 253 254 40 276 277 278 279 280 281 282 -37 255 256 257 258 259 260 261 41 283 284 285 286 287 288 289 -38 262 263 264 265 266 267 268 42 290 291 292 293 294 295 296 -39 269 270 271 272 273 43 297 298 299 300 301 302 303 - 44 304 - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 305 306 307 308 309 310 48 335 336 337 338 -45 311 312 313 314 315 316 317 49 339 340 341 342 343 344 345 -46 318 319 320 321 322 323 324 50 346 347 348 349 350 351 352 -47 325 326 327 328 329 330 331 51 353 354 355 356 357 358 359 -48 332 333 334 52 360 361 362 363 364 365 - - + January February March + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +52 1 2 5 32 33 34 35 36 37 9 60 61 62 63 64 65 + 1 3 4 5 6 7 8 9 6 38 39 40 41 42 43 44 10 66 67 68 69 70 71 72 + 2 10 11 12 13 14 15 16 7 45 46 47 48 49 50 51 11 73 74 75 76 77 78 79 + 3 17 18 19 20 21 22 23 8 52 53 54 55 56 57 58 12 80 81 82 83 84 85 86 + 4 24 25 26 27 28 29 30 9 59 13 87 88 89 90 + 5 31 + April May June + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +13 91 92 93 17 121 22 152 153 154 155 156 +14 94 95 96 97 98 99 100 18 122 123 124 125 126 127 128 23 157 158 159 160 161 162 163 +15 101 102 103 104 105 106 107 19 129 130 131 132 133 134 135 24 164 165 166 167 168 169 170 +16 108 109 110 111 112 113 114 20 136 137 138 139 140 141 142 25 171 172 173 174 175 176 177 +17 115 116 117 118 119 120 21 143 144 145 146 147 148 149 26 178 179 180 181 + 22 150 151 + July August September + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +26 182 183 184 31 213 214 215 216 217 218 219 35 244 245 246 247 +27 185 186 187 188 189 190 191 32 220 221 222 223 224 225 226 36 248 249 250 251 252 253 254 +28 192 193 194 195 196 197 198 33 227 228 229 230 231 232 233 37 255 256 257 258 259 260 261 +29 199 200 201 202 203 204 205 34 234 235 236 237 238 239 240 38 262 263 264 265 266 267 268 +30 206 207 208 209 210 211 212 35 241 242 243 39 269 270 271 272 273 + + October November December + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +39 274 275 44 305 306 307 308 309 310 48 335 336 337 338 +40 276 277 278 279 280 281 282 45 311 312 313 314 315 316 317 49 339 340 341 342 343 344 345 +41 283 284 285 286 287 288 289 46 318 319 320 321 322 323 324 50 346 347 348 349 350 351 352 +42 290 291 292 293 294 295 296 47 325 326 327 328 329 330 331 51 353 354 355 356 357 358 359 +43 297 298 299 300 301 302 303 48 332 333 334 52 360 361 362 363 364 365 +44 304 2012 - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -52 1 5 32 33 34 35 36 - 1 2 3 4 5 6 7 8 6 37 38 39 40 41 42 43 - 2 9 10 11 12 13 14 15 7 44 45 46 47 48 49 50 - 3 16 17 18 19 20 21 22 8 51 52 53 54 55 56 57 - 4 23 24 25 26 27 28 29 9 58 59 60 - 5 30 31 - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 61 62 63 64 13 92 -10 65 66 67 68 69 70 71 14 93 94 95 96 97 98 99 -11 72 73 74 75 76 77 78 15 100 101 102 103 104 105 106 -12 79 80 81 82 83 84 85 16 107 108 109 110 111 112 113 -13 86 87 88 89 90 91 17 114 115 116 117 118 119 120 - 18 121 - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -18 122 123 124 125 126 127 22 153 154 155 -19 128 129 130 131 132 133 134 23 156 157 158 159 160 161 162 -20 135 136 137 138 139 140 141 24 163 164 165 166 167 168 169 -21 142 143 144 145 146 147 148 25 170 171 172 173 174 175 176 -22 149 150 151 152 26 177 178 179 180 181 182 - - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -26 183 31 214 215 216 217 218 -27 184 185 186 187 188 189 190 32 219 220 221 222 223 224 225 -28 191 192 193 194 195 196 197 33 226 227 228 229 230 231 232 -29 198 199 200 201 202 203 204 34 233 234 235 236 237 238 239 -30 205 206 207 208 209 210 211 35 240 241 242 243 244 -31 212 213 - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -35 245 246 40 275 276 277 278 279 280 281 -36 247 248 249 250 251 252 253 41 282 283 284 285 286 287 288 -37 254 255 256 257 258 259 260 42 289 290 291 292 293 294 295 -38 261 262 263 264 265 266 267 43 296 297 298 299 300 301 302 -39 268 269 270 271 272 273 274 44 303 304 305 - - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 306 307 308 309 48 336 337 -45 310 311 312 313 314 315 316 49 338 339 340 341 342 343 344 -46 317 318 319 320 321 322 323 50 345 346 347 348 349 350 351 -47 324 325 326 327 328 329 330 51 352 353 354 355 356 357 358 -48 331 332 333 334 335 52 359 360 361 362 363 364 365 - 1 366 - + January February March + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +52 1 5 32 33 34 35 36 9 61 62 63 64 + 1 2 3 4 5 6 7 8 6 37 38 39 40 41 42 43 10 65 66 67 68 69 70 71 + 2 9 10 11 12 13 14 15 7 44 45 46 47 48 49 50 11 72 73 74 75 76 77 78 + 3 16 17 18 19 20 21 22 8 51 52 53 54 55 56 57 12 79 80 81 82 83 84 85 + 4 23 24 25 26 27 28 29 9 58 59 60 13 86 87 88 89 90 91 + 5 30 31 + April May June + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +13 92 18 122 123 124 125 126 127 22 153 154 155 +14 93 94 95 96 97 98 99 19 128 129 130 131 132 133 134 23 156 157 158 159 160 161 162 +15 100 101 102 103 104 105 106 20 135 136 137 138 139 140 141 24 163 164 165 166 167 168 169 +16 107 108 109 110 111 112 113 21 142 143 144 145 146 147 148 25 170 171 172 173 174 175 176 +17 114 115 116 117 118 119 120 22 149 150 151 152 26 177 178 179 180 181 182 +18 121 + July August September + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +26 183 31 214 215 216 217 218 35 245 246 +27 184 185 186 187 188 189 190 32 219 220 221 222 223 224 225 36 247 248 249 250 251 252 253 +28 191 192 193 194 195 196 197 33 226 227 228 229 230 231 232 37 254 255 256 257 258 259 260 +29 198 199 200 201 202 203 204 34 233 234 235 236 237 238 239 38 261 262 263 264 265 266 267 +30 205 206 207 208 209 210 211 35 240 241 242 243 244 39 268 269 270 271 272 273 274 +31 212 213 + October November December + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +40 275 276 277 278 279 280 281 44 306 307 308 309 48 336 337 +41 282 283 284 285 286 287 288 45 310 311 312 313 314 315 316 49 338 339 340 341 342 343 344 +42 289 290 291 292 293 294 295 46 317 318 319 320 321 322 323 50 345 346 347 348 349 350 351 +43 296 297 298 299 300 301 302 47 324 325 326 327 328 329 330 51 352 353 354 355 356 357 358 +44 303 304 305 48 331 332 333 334 335 52 359 360 361 362 363 364 365 + 1 366 diff --git a/tests/expected/cal/weeknum-ymw b/tests/expected/cal/weeknum-ymw index a6dfedb59..44c20d49c 100644 --- a/tests/expected/cal/weeknum-ymw +++ b/tests/expected/cal/weeknum-ymw @@ -3,244 +3,237 @@ Gregorian - Monday-based week with week numbers January February March Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 6 7 5 1 2 3 4 9 1 2 3 4 - 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 10 5 6 7 8 9 10 11 - 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 11 12 13 14 15 16 17 18 - 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 12 19 20 21 22 23 24 25 - 5 29 30 31 9 26 27 28 13 26 27 28 29 30 31 - + 1 1 2 3 4 5 6 7 5 1 2 3 4 9 1 2 3 4 + 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 10 5 6 7 8 9 10 11 + 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 11 12 13 14 15 16 17 18 + 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 12 19 20 21 22 23 24 25 + 5 29 30 31 9 26 27 28 13 26 27 28 29 30 31 + April May June Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -13 1 18 1 2 3 4 5 6 22 1 2 3 -14 2 3 4 5 6 7 8 19 7 8 9 10 11 12 13 23 4 5 6 7 8 9 10 -15 9 10 11 12 13 14 15 20 14 15 16 17 18 19 20 24 11 12 13 14 15 16 17 -16 16 17 18 19 20 21 22 21 21 22 23 24 25 26 27 25 18 19 20 21 22 23 24 -17 23 24 25 26 27 28 29 22 28 29 30 31 26 25 26 27 28 29 30 -18 30 +13 1 18 1 2 3 4 5 6 22 1 2 3 +14 2 3 4 5 6 7 8 19 7 8 9 10 11 12 13 23 4 5 6 7 8 9 10 +15 9 10 11 12 13 14 15 20 14 15 16 17 18 19 20 24 11 12 13 14 15 16 17 +16 16 17 18 19 20 21 22 21 21 22 23 24 25 26 27 25 18 19 20 21 22 23 24 +17 23 24 25 26 27 28 29 22 28 29 30 31 26 25 26 27 28 29 30 +18 30 July August September Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -26 1 31 1 2 3 4 5 35 1 2 -27 2 3 4 5 6 7 8 32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 -28 9 10 11 12 13 14 15 33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 -29 16 17 18 19 20 21 22 34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 -30 23 24 25 26 27 28 29 35 27 28 29 30 31 39 24 25 26 27 28 29 30 -31 30 31 +26 1 31 1 2 3 4 5 35 1 2 +27 2 3 4 5 6 7 8 32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 +28 9 10 11 12 13 14 15 33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 +29 16 17 18 19 20 21 22 34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 +30 23 24 25 26 27 28 29 35 27 28 29 30 31 39 24 25 26 27 28 29 30 +31 30 31 October November December Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -40 1 2 3 4 5 6 7 44 1 2 3 4 48 1 2 -41 8 9 10 11 12 13 14 45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 -42 15 16 17 18 19 20 21 46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 -43 22 23 24 25 26 27 28 47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 -44 29 30 31 48 26 27 28 29 30 52 24 25 26 27 28 29 30 - 1 31 - +40 1 2 3 4 5 6 7 44 1 2 3 4 48 1 2 +41 8 9 10 11 12 13 14 45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 +42 15 16 17 18 19 20 21 46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 +43 22 23 24 25 26 27 28 47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 +44 29 30 31 48 26 27 28 29 30 52 24 25 26 27 28 29 30 + 1 31 2002 January February March Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 6 5 1 2 3 9 1 2 3 - 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 10 4 5 6 7 8 9 10 - 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 11 11 12 13 14 15 16 17 - 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 12 18 19 20 21 22 23 24 - 5 28 29 30 31 9 25 26 27 28 13 25 26 27 28 29 30 31 - + 1 1 2 3 4 5 6 5 1 2 3 9 1 2 3 + 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 10 4 5 6 7 8 9 10 + 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 11 11 12 13 14 15 16 17 + 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 12 18 19 20 21 22 23 24 + 5 28 29 30 31 9 25 26 27 28 13 25 26 27 28 29 30 31 + April May June Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -14 1 2 3 4 5 6 7 18 1 2 3 4 5 22 1 2 -15 8 9 10 11 12 13 14 19 6 7 8 9 10 11 12 23 3 4 5 6 7 8 9 -16 15 16 17 18 19 20 21 20 13 14 15 16 17 18 19 24 10 11 12 13 14 15 16 -17 22 23 24 25 26 27 28 21 20 21 22 23 24 25 26 25 17 18 19 20 21 22 23 -18 29 30 22 27 28 29 30 31 26 24 25 26 27 28 29 30 - +14 1 2 3 4 5 6 7 18 1 2 3 4 5 22 1 2 +15 8 9 10 11 12 13 14 19 6 7 8 9 10 11 12 23 3 4 5 6 7 8 9 +16 15 16 17 18 19 20 21 20 13 14 15 16 17 18 19 24 10 11 12 13 14 15 16 +17 22 23 24 25 26 27 28 21 20 21 22 23 24 25 26 25 17 18 19 20 21 22 23 +18 29 30 22 27 28 29 30 31 26 24 25 26 27 28 29 30 + July August September Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -27 1 2 3 4 5 6 7 31 1 2 3 4 35 1 -28 8 9 10 11 12 13 14 32 5 6 7 8 9 10 11 36 2 3 4 5 6 7 8 -29 15 16 17 18 19 20 21 33 12 13 14 15 16 17 18 37 9 10 11 12 13 14 15 -30 22 23 24 25 26 27 28 34 19 20 21 22 23 24 25 38 16 17 18 19 20 21 22 -31 29 30 31 35 26 27 28 29 30 31 39 23 24 25 26 27 28 29 - 40 30 +27 1 2 3 4 5 6 7 31 1 2 3 4 35 1 +28 8 9 10 11 12 13 14 32 5 6 7 8 9 10 11 36 2 3 4 5 6 7 8 +29 15 16 17 18 19 20 21 33 12 13 14 15 16 17 18 37 9 10 11 12 13 14 15 +30 22 23 24 25 26 27 28 34 19 20 21 22 23 24 25 38 16 17 18 19 20 21 22 +31 29 30 31 35 26 27 28 29 30 31 39 23 24 25 26 27 28 29 + 40 30 October November December Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -40 1 2 3 4 5 6 44 1 2 3 48 1 -41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10 49 2 3 4 5 6 7 8 -42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 50 9 10 11 12 13 14 15 -43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 51 16 17 18 19 20 21 22 -44 28 29 30 31 48 25 26 27 28 29 30 52 23 24 25 26 27 28 29 - 1 30 31 - +40 1 2 3 4 5 6 44 1 2 3 48 1 +41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10 49 2 3 4 5 6 7 8 +42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 50 9 10 11 12 13 14 15 +43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 51 16 17 18 19 20 21 22 +44 28 29 30 31 48 25 26 27 28 29 30 52 23 24 25 26 27 28 29 + 1 30 31 2003 January February March Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 5 1 2 9 1 2 - 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 10 3 4 5 6 7 8 9 - 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 11 10 11 12 13 14 15 16 - 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 12 17 18 19 20 21 22 23 - 5 27 28 29 30 31 9 24 25 26 27 28 13 24 25 26 27 28 29 30 - 14 31 + 1 1 2 3 4 5 5 1 2 9 1 2 + 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 10 3 4 5 6 7 8 9 + 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 11 10 11 12 13 14 15 16 + 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 12 17 18 19 20 21 22 23 + 5 27 28 29 30 31 9 24 25 26 27 28 13 24 25 26 27 28 29 30 + 14 31 April May June Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -14 1 2 3 4 5 6 18 1 2 3 4 22 1 -15 7 8 9 10 11 12 13 19 5 6 7 8 9 10 11 23 2 3 4 5 6 7 8 -16 14 15 16 17 18 19 20 20 12 13 14 15 16 17 18 24 9 10 11 12 13 14 15 -17 21 22 23 24 25 26 27 21 19 20 21 22 23 24 25 25 16 17 18 19 20 21 22 -18 28 29 30 22 26 27 28 29 30 31 26 23 24 25 26 27 28 29 - 27 30 +14 1 2 3 4 5 6 18 1 2 3 4 22 1 +15 7 8 9 10 11 12 13 19 5 6 7 8 9 10 11 23 2 3 4 5 6 7 8 +16 14 15 16 17 18 19 20 20 12 13 14 15 16 17 18 24 9 10 11 12 13 14 15 +17 21 22 23 24 25 26 27 21 19 20 21 22 23 24 25 25 16 17 18 19 20 21 22 +18 28 29 30 22 26 27 28 29 30 31 26 23 24 25 26 27 28 29 + 27 30 July August September Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -27 1 2 3 4 5 6 31 1 2 3 36 1 2 3 4 5 6 7 -28 7 8 9 10 11 12 13 32 4 5 6 7 8 9 10 37 8 9 10 11 12 13 14 -29 14 15 16 17 18 19 20 33 11 12 13 14 15 16 17 38 15 16 17 18 19 20 21 -30 21 22 23 24 25 26 27 34 18 19 20 21 22 23 24 39 22 23 24 25 26 27 28 -31 28 29 30 31 35 25 26 27 28 29 30 31 40 29 30 - +27 1 2 3 4 5 6 31 1 2 3 36 1 2 3 4 5 6 7 +28 7 8 9 10 11 12 13 32 4 5 6 7 8 9 10 37 8 9 10 11 12 13 14 +29 14 15 16 17 18 19 20 33 11 12 13 14 15 16 17 38 15 16 17 18 19 20 21 +30 21 22 23 24 25 26 27 34 18 19 20 21 22 23 24 39 22 23 24 25 26 27 28 +31 28 29 30 31 35 25 26 27 28 29 30 31 40 29 30 + October November December Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -40 1 2 3 4 5 44 1 2 49 1 2 3 4 5 6 7 -41 6 7 8 9 10 11 12 45 3 4 5 6 7 8 9 50 8 9 10 11 12 13 14 -42 13 14 15 16 17 18 19 46 10 11 12 13 14 15 16 51 15 16 17 18 19 20 21 -43 20 21 22 23 24 25 26 47 17 18 19 20 21 22 23 52 22 23 24 25 26 27 28 -44 27 28 29 30 31 48 24 25 26 27 28 29 30 1 29 30 31 - - +40 1 2 3 4 5 44 1 2 49 1 2 3 4 5 6 7 +41 6 7 8 9 10 11 12 45 3 4 5 6 7 8 9 50 8 9 10 11 12 13 14 +42 13 14 15 16 17 18 19 46 10 11 12 13 14 15 16 51 15 16 17 18 19 20 21 +43 20 21 22 23 24 25 26 47 17 18 19 20 21 22 23 52 22 23 24 25 26 27 28 +44 27 28 29 30 31 48 24 25 26 27 28 29 30 1 29 30 31 + 2009 January February March Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 1 9 1 - 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 10 2 3 4 5 6 7 8 - 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 11 9 10 11 12 13 14 15 - 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 12 16 17 18 19 20 21 22 - 5 26 27 28 29 30 31 9 23 24 25 26 27 28 13 23 24 25 26 27 28 29 - 14 30 31 + 1 1 2 3 4 5 1 9 1 + 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 10 2 3 4 5 6 7 8 + 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 11 9 10 11 12 13 14 15 + 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 12 16 17 18 19 20 21 22 + 5 26 27 28 29 30 31 9 23 24 25 26 27 28 13 23 24 25 26 27 28 29 + 14 30 31 April May June Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -14 1 2 3 4 5 18 1 2 3 23 1 2 3 4 5 6 7 -15 6 7 8 9 10 11 12 19 4 5 6 7 8 9 10 24 8 9 10 11 12 13 14 -16 13 14 15 16 17 18 19 20 11 12 13 14 15 16 17 25 15 16 17 18 19 20 21 -17 20 21 22 23 24 25 26 21 18 19 20 21 22 23 24 26 22 23 24 25 26 27 28 -18 27 28 29 30 22 25 26 27 28 29 30 31 27 29 30 - +14 1 2 3 4 5 18 1 2 3 23 1 2 3 4 5 6 7 +15 6 7 8 9 10 11 12 19 4 5 6 7 8 9 10 24 8 9 10 11 12 13 14 +16 13 14 15 16 17 18 19 20 11 12 13 14 15 16 17 25 15 16 17 18 19 20 21 +17 20 21 22 23 24 25 26 21 18 19 20 21 22 23 24 26 22 23 24 25 26 27 28 +18 27 28 29 30 22 25 26 27 28 29 30 31 27 29 30 + July August September Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -27 1 2 3 4 5 31 1 2 36 1 2 3 4 5 6 -28 6 7 8 9 10 11 12 32 3 4 5 6 7 8 9 37 7 8 9 10 11 12 13 -29 13 14 15 16 17 18 19 33 10 11 12 13 14 15 16 38 14 15 16 17 18 19 20 -30 20 21 22 23 24 25 26 34 17 18 19 20 21 22 23 39 21 22 23 24 25 26 27 -31 27 28 29 30 31 35 24 25 26 27 28 29 30 40 28 29 30 - 36 31 +27 1 2 3 4 5 31 1 2 36 1 2 3 4 5 6 +28 6 7 8 9 10 11 12 32 3 4 5 6 7 8 9 37 7 8 9 10 11 12 13 +29 13 14 15 16 17 18 19 33 10 11 12 13 14 15 16 38 14 15 16 17 18 19 20 +30 20 21 22 23 24 25 26 34 17 18 19 20 21 22 23 39 21 22 23 24 25 26 27 +31 27 28 29 30 31 35 24 25 26 27 28 29 30 40 28 29 30 + 36 31 October November December Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -40 1 2 3 4 44 1 49 1 2 3 4 5 6 -41 5 6 7 8 9 10 11 45 2 3 4 5 6 7 8 50 7 8 9 10 11 12 13 -42 12 13 14 15 16 17 18 46 9 10 11 12 13 14 15 51 14 15 16 17 18 19 20 -43 19 20 21 22 23 24 25 47 16 17 18 19 20 21 22 52 21 22 23 24 25 26 27 -44 26 27 28 29 30 31 48 23 24 25 26 27 28 29 53 28 29 30 31 - 49 30 - +40 1 2 3 4 44 1 49 1 2 3 4 5 6 +41 5 6 7 8 9 10 11 45 2 3 4 5 6 7 8 50 7 8 9 10 11 12 13 +42 12 13 14 15 16 17 18 46 9 10 11 12 13 14 15 51 14 15 16 17 18 19 20 +43 19 20 21 22 23 24 25 47 16 17 18 19 20 21 22 52 21 22 23 24 25 26 27 +44 26 27 28 29 30 31 48 23 24 25 26 27 28 29 53 28 29 30 31 + 49 30 2010 January February March Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -53 1 2 3 5 1 2 3 4 5 6 7 9 1 2 3 4 5 6 7 - 1 4 5 6 7 8 9 10 6 8 9 10 11 12 13 14 10 8 9 10 11 12 13 14 - 2 11 12 13 14 15 16 17 7 15 16 17 18 19 20 21 11 15 16 17 18 19 20 21 - 3 18 19 20 21 22 23 24 8 22 23 24 25 26 27 28 12 22 23 24 25 26 27 28 - 4 25 26 27 28 29 30 31 13 29 30 31 - +53 1 2 3 5 1 2 3 4 5 6 7 9 1 2 3 4 5 6 7 + 1 4 5 6 7 8 9 10 6 8 9 10 11 12 13 14 10 8 9 10 11 12 13 14 + 2 11 12 13 14 15 16 17 7 15 16 17 18 19 20 21 11 15 16 17 18 19 20 21 + 3 18 19 20 21 22 23 24 8 22 23 24 25 26 27 28 12 22 23 24 25 26 27 28 + 4 25 26 27 28 29 30 31 13 29 30 31 + April May June Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -13 1 2 3 4 17 1 2 22 1 2 3 4 5 6 -14 5 6 7 8 9 10 11 18 3 4 5 6 7 8 9 23 7 8 9 10 11 12 13 -15 12 13 14 15 16 17 18 19 10 11 12 13 14 15 16 24 14 15 16 17 18 19 20 -16 19 20 21 22 23 24 25 20 17 18 19 20 21 22 23 25 21 22 23 24 25 26 27 -17 26 27 28 29 30 21 24 25 26 27 28 29 30 26 28 29 30 - 22 31 +13 1 2 3 4 17 1 2 22 1 2 3 4 5 6 +14 5 6 7 8 9 10 11 18 3 4 5 6 7 8 9 23 7 8 9 10 11 12 13 +15 12 13 14 15 16 17 18 19 10 11 12 13 14 15 16 24 14 15 16 17 18 19 20 +16 19 20 21 22 23 24 25 20 17 18 19 20 21 22 23 25 21 22 23 24 25 26 27 +17 26 27 28 29 30 21 24 25 26 27 28 29 30 26 28 29 30 + 22 31 July August September Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -26 1 2 3 4 30 1 35 1 2 3 4 5 -27 5 6 7 8 9 10 11 31 2 3 4 5 6 7 8 36 6 7 8 9 10 11 12 -28 12 13 14 15 16 17 18 32 9 10 11 12 13 14 15 37 13 14 15 16 17 18 19 -29 19 20 21 22 23 24 25 33 16 17 18 19 20 21 22 38 20 21 22 23 24 25 26 -30 26 27 28 29 30 31 34 23 24 25 26 27 28 29 39 27 28 29 30 - 35 30 31 +26 1 2 3 4 30 1 35 1 2 3 4 5 +27 5 6 7 8 9 10 11 31 2 3 4 5 6 7 8 36 6 7 8 9 10 11 12 +28 12 13 14 15 16 17 18 32 9 10 11 12 13 14 15 37 13 14 15 16 17 18 19 +29 19 20 21 22 23 24 25 33 16 17 18 19 20 21 22 38 20 21 22 23 24 25 26 +30 26 27 28 29 30 31 34 23 24 25 26 27 28 29 39 27 28 29 30 + 35 30 31 October November December Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -39 1 2 3 44 1 2 3 4 5 6 7 48 1 2 3 4 5 -40 4 5 6 7 8 9 10 45 8 9 10 11 12 13 14 49 6 7 8 9 10 11 12 -41 11 12 13 14 15 16 17 46 15 16 17 18 19 20 21 50 13 14 15 16 17 18 19 -42 18 19 20 21 22 23 24 47 22 23 24 25 26 27 28 51 20 21 22 23 24 25 26 -43 25 26 27 28 29 30 31 48 29 30 52 27 28 29 30 31 - - +39 1 2 3 44 1 2 3 4 5 6 7 48 1 2 3 4 5 +40 4 5 6 7 8 9 10 45 8 9 10 11 12 13 14 49 6 7 8 9 10 11 12 +41 11 12 13 14 15 16 17 46 15 16 17 18 19 20 21 50 13 14 15 16 17 18 19 +42 18 19 20 21 22 23 24 47 22 23 24 25 26 27 28 51 20 21 22 23 24 25 26 +43 25 26 27 28 29 30 31 48 29 30 52 27 28 29 30 31 + 2011 January February March Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -52 1 2 5 1 2 3 4 5 6 9 1 2 3 4 5 6 - 1 3 4 5 6 7 8 9 6 7 8 9 10 11 12 13 10 7 8 9 10 11 12 13 - 2 10 11 12 13 14 15 16 7 14 15 16 17 18 19 20 11 14 15 16 17 18 19 20 - 3 17 18 19 20 21 22 23 8 21 22 23 24 25 26 27 12 21 22 23 24 25 26 27 - 4 24 25 26 27 28 29 30 9 28 13 28 29 30 31 - 5 31 +52 1 2 5 1 2 3 4 5 6 9 1 2 3 4 5 6 + 1 3 4 5 6 7 8 9 6 7 8 9 10 11 12 13 10 7 8 9 10 11 12 13 + 2 10 11 12 13 14 15 16 7 14 15 16 17 18 19 20 11 14 15 16 17 18 19 20 + 3 17 18 19 20 21 22 23 8 21 22 23 24 25 26 27 12 21 22 23 24 25 26 27 + 4 24 25 26 27 28 29 30 9 28 13 28 29 30 31 + 5 31 April May June Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -13 1 2 3 17 1 22 1 2 3 4 5 -14 4 5 6 7 8 9 10 18 2 3 4 5 6 7 8 23 6 7 8 9 10 11 12 -15 11 12 13 14 15 16 17 19 9 10 11 12 13 14 15 24 13 14 15 16 17 18 19 -16 18 19 20 21 22 23 24 20 16 17 18 19 20 21 22 25 20 21 22 23 24 25 26 -17 25 26 27 28 29 30 21 23 24 25 26 27 28 29 26 27 28 29 30 - 22 30 31 +13 1 2 3 17 1 22 1 2 3 4 5 +14 4 5 6 7 8 9 10 18 2 3 4 5 6 7 8 23 6 7 8 9 10 11 12 +15 11 12 13 14 15 16 17 19 9 10 11 12 13 14 15 24 13 14 15 16 17 18 19 +16 18 19 20 21 22 23 24 20 16 17 18 19 20 21 22 25 20 21 22 23 24 25 26 +17 25 26 27 28 29 30 21 23 24 25 26 27 28 29 26 27 28 29 30 + 22 30 31 July August September Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -26 1 2 3 31 1 2 3 4 5 6 7 35 1 2 3 4 -27 4 5 6 7 8 9 10 32 8 9 10 11 12 13 14 36 5 6 7 8 9 10 11 -28 11 12 13 14 15 16 17 33 15 16 17 18 19 20 21 37 12 13 14 15 16 17 18 -29 18 19 20 21 22 23 24 34 22 23 24 25 26 27 28 38 19 20 21 22 23 24 25 -30 25 26 27 28 29 30 31 35 29 30 31 39 26 27 28 29 30 - +26 1 2 3 31 1 2 3 4 5 6 7 35 1 2 3 4 +27 4 5 6 7 8 9 10 32 8 9 10 11 12 13 14 36 5 6 7 8 9 10 11 +28 11 12 13 14 15 16 17 33 15 16 17 18 19 20 21 37 12 13 14 15 16 17 18 +29 18 19 20 21 22 23 24 34 22 23 24 25 26 27 28 38 19 20 21 22 23 24 25 +30 25 26 27 28 29 30 31 35 29 30 31 39 26 27 28 29 30 + October November December Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -39 1 2 44 1 2 3 4 5 6 48 1 2 3 4 -40 3 4 5 6 7 8 9 45 7 8 9 10 11 12 13 49 5 6 7 8 9 10 11 -41 10 11 12 13 14 15 16 46 14 15 16 17 18 19 20 50 12 13 14 15 16 17 18 -42 17 18 19 20 21 22 23 47 21 22 23 24 25 26 27 51 19 20 21 22 23 24 25 -43 24 25 26 27 28 29 30 48 28 29 30 52 26 27 28 29 30 31 -44 31 - +39 1 2 44 1 2 3 4 5 6 48 1 2 3 4 +40 3 4 5 6 7 8 9 45 7 8 9 10 11 12 13 49 5 6 7 8 9 10 11 +41 10 11 12 13 14 15 16 46 14 15 16 17 18 19 20 50 12 13 14 15 16 17 18 +42 17 18 19 20 21 22 23 47 21 22 23 24 25 26 27 51 19 20 21 22 23 24 25 +43 24 25 26 27 28 29 30 48 28 29 30 52 26 27 28 29 30 31 +44 31 2012 January February March Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -52 1 5 1 2 3 4 5 9 1 2 3 4 - 1 2 3 4 5 6 7 8 6 6 7 8 9 10 11 12 10 5 6 7 8 9 10 11 - 2 9 10 11 12 13 14 15 7 13 14 15 16 17 18 19 11 12 13 14 15 16 17 18 - 3 16 17 18 19 20 21 22 8 20 21 22 23 24 25 26 12 19 20 21 22 23 24 25 - 4 23 24 25 26 27 28 29 9 27 28 29 13 26 27 28 29 30 31 - 5 30 31 +52 1 5 1 2 3 4 5 9 1 2 3 4 + 1 2 3 4 5 6 7 8 6 6 7 8 9 10 11 12 10 5 6 7 8 9 10 11 + 2 9 10 11 12 13 14 15 7 13 14 15 16 17 18 19 11 12 13 14 15 16 17 18 + 3 16 17 18 19 20 21 22 8 20 21 22 23 24 25 26 12 19 20 21 22 23 24 25 + 4 23 24 25 26 27 28 29 9 27 28 29 13 26 27 28 29 30 31 + 5 30 31 April May June Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -13 1 18 1 2 3 4 5 6 22 1 2 3 -14 2 3 4 5 6 7 8 19 7 8 9 10 11 12 13 23 4 5 6 7 8 9 10 -15 9 10 11 12 13 14 15 20 14 15 16 17 18 19 20 24 11 12 13 14 15 16 17 -16 16 17 18 19 20 21 22 21 21 22 23 24 25 26 27 25 18 19 20 21 22 23 24 -17 23 24 25 26 27 28 29 22 28 29 30 31 26 25 26 27 28 29 30 -18 30 +13 1 18 1 2 3 4 5 6 22 1 2 3 +14 2 3 4 5 6 7 8 19 7 8 9 10 11 12 13 23 4 5 6 7 8 9 10 +15 9 10 11 12 13 14 15 20 14 15 16 17 18 19 20 24 11 12 13 14 15 16 17 +16 16 17 18 19 20 21 22 21 21 22 23 24 25 26 27 25 18 19 20 21 22 23 24 +17 23 24 25 26 27 28 29 22 28 29 30 31 26 25 26 27 28 29 30 +18 30 July August September Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -26 1 31 1 2 3 4 5 35 1 2 -27 2 3 4 5 6 7 8 32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 -28 9 10 11 12 13 14 15 33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 -29 16 17 18 19 20 21 22 34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 -30 23 24 25 26 27 28 29 35 27 28 29 30 31 39 24 25 26 27 28 29 30 -31 30 31 +26 1 31 1 2 3 4 5 35 1 2 +27 2 3 4 5 6 7 8 32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 +28 9 10 11 12 13 14 15 33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 +29 16 17 18 19 20 21 22 34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 +30 23 24 25 26 27 28 29 35 27 28 29 30 31 39 24 25 26 27 28 29 30 +31 30 31 October November December Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -40 1 2 3 4 5 6 7 44 1 2 3 4 48 1 2 -41 8 9 10 11 12 13 14 45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 -42 15 16 17 18 19 20 21 46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 -43 22 23 24 25 26 27 28 47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 -44 29 30 31 48 26 27 28 29 30 52 24 25 26 27 28 29 30 - 1 31 - +40 1 2 3 4 5 6 7 44 1 2 3 4 48 1 2 +41 8 9 10 11 12 13 14 45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 +42 15 16 17 18 19 20 21 46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 +43 22 23 24 25 26 27 28 47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 +44 29 30 31 48 26 27 28 29 30 52 24 25 26 27 28 29 30 + 1 31 diff --git a/tests/expected/cal/weeknum-ysjw b/tests/expected/cal/weeknum-ysjw index 4a2f9445b..16b91adc5 100644 --- a/tests/expected/cal/weeknum-ysjw +++ b/tests/expected/cal/weeknum-ysjw @@ -1,358 +1,239 @@ Julian - Sunday-based week with week numbers 2001 - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 3 4 5 6 5 32 33 34 - 2 7 8 9 10 11 12 13 6 35 36 37 38 39 40 41 - 3 14 15 16 17 18 19 20 7 42 43 44 45 46 47 48 - 4 21 22 23 24 25 26 27 8 49 50 51 52 53 54 55 - 5 28 29 30 31 9 56 57 58 59 - - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 9 60 61 62 14 91 92 93 94 95 96 97 -10 63 64 65 66 67 68 69 15 98 99 100 101 102 103 104 -11 70 71 72 73 74 75 76 16 105 106 107 108 109 110 111 -12 77 78 79 80 81 82 83 17 112 113 114 115 116 117 118 -13 84 85 86 87 88 89 90 18 119 120 - - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 121 122 123 124 125 22 152 153 -19 126 127 128 129 130 131 132 23 154 155 156 157 158 159 160 -20 133 134 135 136 137 138 139 24 161 162 163 164 165 166 167 -21 140 141 142 143 144 145 146 25 168 169 170 171 172 173 174 -22 147 148 149 150 151 26 175 176 177 178 179 180 181 - - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -27 182 183 184 185 186 187 188 31 213 214 215 216 -28 189 190 191 192 193 194 195 32 217 218 219 220 221 222 223 -29 196 197 198 199 200 201 202 33 224 225 226 227 228 229 230 -30 203 204 205 206 207 208 209 34 231 232 233 234 235 236 237 -31 210 211 212 35 238 239 240 241 242 243 - - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -35 244 40 274 275 276 277 278 279 -36 245 246 247 248 249 250 251 41 280 281 282 283 284 285 286 -37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 -38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 -39 266 267 268 269 270 271 272 44 301 302 303 304 -40 273 - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -44 305 306 307 48 335 -45 308 309 310 311 312 313 314 49 336 337 338 339 340 341 342 -46 315 316 317 318 319 320 321 50 343 344 345 346 347 348 349 -47 322 323 324 325 326 327 328 51 350 351 352 353 354 355 356 -48 329 330 331 332 333 334 52 357 358 359 360 361 362 363 - 53 364 365 - + January February March + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 1 2 3 4 5 6 5 32 33 34 9 60 61 62 + 2 7 8 9 10 11 12 13 6 35 36 37 38 39 40 41 10 63 64 65 66 67 68 69 + 3 14 15 16 17 18 19 20 7 42 43 44 45 46 47 48 11 70 71 72 73 74 75 76 + 4 21 22 23 24 25 26 27 8 49 50 51 52 53 54 55 12 77 78 79 80 81 82 83 + 5 28 29 30 31 9 56 57 58 59 13 84 85 86 87 88 89 90 + + April May June + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +14 91 92 93 94 95 96 97 18 121 122 123 124 125 22 152 153 +15 98 99 100 101 102 103 104 19 126 127 128 129 130 131 132 23 154 155 156 157 158 159 160 +16 105 106 107 108 109 110 111 20 133 134 135 136 137 138 139 24 161 162 163 164 165 166 167 +17 112 113 114 115 116 117 118 21 140 141 142 143 144 145 146 25 168 169 170 171 172 173 174 +18 119 120 22 147 148 149 150 151 26 175 176 177 178 179 180 181 + + July August September + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +27 182 183 184 185 186 187 188 31 213 214 215 216 35 244 +28 189 190 191 192 193 194 195 32 217 218 219 220 221 222 223 36 245 246 247 248 249 250 251 +29 196 197 198 199 200 201 202 33 224 225 226 227 228 229 230 37 252 253 254 255 256 257 258 +30 203 204 205 206 207 208 209 34 231 232 233 234 235 236 237 38 259 260 261 262 263 264 265 +31 210 211 212 35 238 239 240 241 242 243 39 266 267 268 269 270 271 272 + 40 273 + October November December + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +40 274 275 276 277 278 279 44 305 306 307 48 335 +41 280 281 282 283 284 285 286 45 308 309 310 311 312 313 314 49 336 337 338 339 340 341 342 +42 287 288 289 290 291 292 293 46 315 316 317 318 319 320 321 50 343 344 345 346 347 348 349 +43 294 295 296 297 298 299 300 47 322 323 324 325 326 327 328 51 350 351 352 353 354 355 356 +44 301 302 303 304 48 329 330 331 332 333 334 52 357 358 359 360 361 362 363 + 53 364 365 2002 - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 3 4 5 5 32 33 - 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 - 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 - 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 - 5 27 28 29 30 31 9 55 56 57 58 59 - - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 9 60 61 14 91 92 93 94 95 96 -10 62 63 64 65 66 67 68 15 97 98 99 100 101 102 103 -11 69 70 71 72 73 74 75 16 104 105 106 107 108 109 110 -12 76 77 78 79 80 81 82 17 111 112 113 114 115 116 117 -13 83 84 85 86 87 88 89 18 118 119 120 -14 90 - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 121 122 123 124 22 152 -19 125 126 127 128 129 130 131 23 153 154 155 156 157 158 159 -20 132 133 134 135 136 137 138 24 160 161 162 163 164 165 166 -21 139 140 141 142 143 144 145 25 167 168 169 170 171 172 173 -22 146 147 148 149 150 151 26 174 175 176 177 178 179 180 - 27 181 - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -27 182 183 184 185 186 187 31 213 214 215 -28 188 189 190 191 192 193 194 32 216 217 218 219 220 221 222 -29 195 196 197 198 199 200 201 33 223 224 225 226 227 228 229 -30 202 203 204 205 206 207 208 34 230 231 232 233 234 235 236 -31 209 210 211 212 35 237 238 239 240 241 242 243 - - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -36 244 245 246 247 248 249 250 40 274 275 276 277 278 -37 251 252 253 254 255 256 257 41 279 280 281 282 283 284 285 -38 258 259 260 261 262 263 264 42 286 287 288 289 290 291 292 -39 265 266 267 268 269 270 271 43 293 294 295 296 297 298 299 -40 272 273 44 300 301 302 303 304 - - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -44 305 306 49 335 336 337 338 339 340 341 -45 307 308 309 310 311 312 313 50 342 343 344 345 346 347 348 -46 314 315 316 317 318 319 320 51 349 350 351 352 353 354 355 -47 321 322 323 324 325 326 327 52 356 357 358 359 360 361 362 -48 328 329 330 331 332 333 334 53 363 364 365 - - + January February March + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 1 2 3 4 5 5 32 33 9 60 61 + 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 10 62 63 64 65 66 67 68 + 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 11 69 70 71 72 73 74 75 + 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 12 76 77 78 79 80 81 82 + 5 27 28 29 30 31 9 55 56 57 58 59 13 83 84 85 86 87 88 89 + 14 90 + April May June + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +14 91 92 93 94 95 96 18 121 122 123 124 22 152 +15 97 98 99 100 101 102 103 19 125 126 127 128 129 130 131 23 153 154 155 156 157 158 159 +16 104 105 106 107 108 109 110 20 132 133 134 135 136 137 138 24 160 161 162 163 164 165 166 +17 111 112 113 114 115 116 117 21 139 140 141 142 143 144 145 25 167 168 169 170 171 172 173 +18 118 119 120 22 146 147 148 149 150 151 26 174 175 176 177 178 179 180 + 27 181 + July August September + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +27 182 183 184 185 186 187 31 213 214 215 36 244 245 246 247 248 249 250 +28 188 189 190 191 192 193 194 32 216 217 218 219 220 221 222 37 251 252 253 254 255 256 257 +29 195 196 197 198 199 200 201 33 223 224 225 226 227 228 229 38 258 259 260 261 262 263 264 +30 202 203 204 205 206 207 208 34 230 231 232 233 234 235 236 39 265 266 267 268 269 270 271 +31 209 210 211 212 35 237 238 239 240 241 242 243 40 272 273 + + October November December + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +40 274 275 276 277 278 44 305 306 49 335 336 337 338 339 340 341 +41 279 280 281 282 283 284 285 45 307 308 309 310 311 312 313 50 342 343 344 345 346 347 348 +42 286 287 288 289 290 291 292 46 314 315 316 317 318 319 320 51 349 350 351 352 353 354 355 +43 293 294 295 296 297 298 299 47 321 322 323 324 325 326 327 52 356 357 358 359 360 361 362 +44 300 301 302 303 304 48 328 329 330 331 332 333 334 53 363 364 365 + 2003 - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 3 4 5 32 - 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 - 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 - 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 - 5 26 27 28 29 30 31 9 54 55 56 57 58 59 - - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 9 60 14 91 92 93 94 95 -10 61 62 63 64 65 66 67 15 96 97 98 99 100 101 102 -11 68 69 70 71 72 73 74 16 103 104 105 106 107 108 109 -12 75 76 77 78 79 80 81 17 110 111 112 113 114 115 116 -13 82 83 84 85 86 87 88 18 117 118 119 120 -14 89 90 - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 121 122 123 23 152 153 154 155 156 157 158 -19 124 125 126 127 128 129 130 24 159 160 161 162 163 164 165 -20 131 132 133 134 135 136 137 25 166 167 168 169 170 171 172 -21 138 139 140 141 142 143 144 26 173 174 175 176 177 178 179 -22 145 146 147 148 149 150 151 27 180 181 - - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -27 182 183 184 185 186 31 213 214 -28 187 188 189 190 191 192 193 32 215 216 217 218 219 220 221 -29 194 195 196 197 198 199 200 33 222 223 224 225 226 227 228 -30 201 202 203 204 205 206 207 34 229 230 231 232 233 234 235 -31 208 209 210 211 212 35 236 237 238 239 240 241 242 - 36 243 - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -36 244 245 246 247 248 249 40 274 275 276 277 -37 250 251 252 253 254 255 256 41 278 279 280 281 282 283 284 -38 257 258 259 260 261 262 263 42 285 286 287 288 289 290 291 -39 264 265 266 267 268 269 270 43 292 293 294 295 296 297 298 -40 271 272 273 44 299 300 301 302 303 304 - - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -44 305 49 335 336 337 338 339 340 -45 306 307 308 309 310 311 312 50 341 342 343 344 345 346 347 -46 313 314 315 316 317 318 319 51 348 349 350 351 352 353 354 -47 320 321 322 323 324 325 326 52 355 356 357 358 359 360 361 -48 327 328 329 330 331 332 333 53 362 363 364 365 -49 334 - + January February March + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 1 2 3 4 5 32 9 60 + 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 10 61 62 63 64 65 66 67 + 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 11 68 69 70 71 72 73 74 + 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 12 75 76 77 78 79 80 81 + 5 26 27 28 29 30 31 9 54 55 56 57 58 59 13 82 83 84 85 86 87 88 + 14 89 90 + April May June + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +14 91 92 93 94 95 18 121 122 123 23 152 153 154 155 156 157 158 +15 96 97 98 99 100 101 102 19 124 125 126 127 128 129 130 24 159 160 161 162 163 164 165 +16 103 104 105 106 107 108 109 20 131 132 133 134 135 136 137 25 166 167 168 169 170 171 172 +17 110 111 112 113 114 115 116 21 138 139 140 141 142 143 144 26 173 174 175 176 177 178 179 +18 117 118 119 120 22 145 146 147 148 149 150 151 27 180 181 + + July August September + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +27 182 183 184 185 186 31 213 214 36 244 245 246 247 248 249 +28 187 188 189 190 191 192 193 32 215 216 217 218 219 220 221 37 250 251 252 253 254 255 256 +29 194 195 196 197 198 199 200 33 222 223 224 225 226 227 228 38 257 258 259 260 261 262 263 +30 201 202 203 204 205 206 207 34 229 230 231 232 233 234 235 39 264 265 266 267 268 269 270 +31 208 209 210 211 212 35 236 237 238 239 240 241 242 40 271 272 273 + 36 243 + October November December + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +40 274 275 276 277 44 305 49 335 336 337 338 339 340 +41 278 279 280 281 282 283 284 45 306 307 308 309 310 311 312 50 341 342 343 344 345 346 347 +42 285 286 287 288 289 290 291 46 313 314 315 316 317 318 319 51 348 349 350 351 352 353 354 +43 292 293 294 295 296 297 298 47 320 321 322 323 324 325 326 52 355 356 357 358 359 360 361 +44 299 300 301 302 303 304 48 327 328 329 330 331 332 333 53 362 363 364 365 + 49 334 2009 - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 3 6 32 33 34 35 36 37 38 - 2 4 5 6 7 8 9 10 7 39 40 41 42 43 44 45 - 3 11 12 13 14 15 16 17 8 46 47 48 49 50 51 52 - 4 18 19 20 21 22 23 24 9 53 54 55 56 57 58 59 - 5 25 26 27 28 29 30 31 - - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -10 60 61 62 63 64 65 66 14 91 92 93 94 -11 67 68 69 70 71 72 73 15 95 96 97 98 99 100 101 -12 74 75 76 77 78 79 80 16 102 103 104 105 106 107 108 -13 81 82 83 84 85 86 87 17 109 110 111 112 113 114 115 -14 88 89 90 18 116 117 118 119 120 - - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 121 122 23 152 153 154 155 156 157 -19 123 124 125 126 127 128 129 24 158 159 160 161 162 163 164 -20 130 131 132 133 134 135 136 25 165 166 167 168 169 170 171 -21 137 138 139 140 141 142 143 26 172 173 174 175 176 177 178 -22 144 145 146 147 148 149 150 27 179 180 181 -23 151 - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -27 182 183 184 185 31 213 -28 186 187 188 189 190 191 192 32 214 215 216 217 218 219 220 -29 193 194 195 196 197 198 199 33 221 222 223 224 225 226 227 -30 200 201 202 203 204 205 206 34 228 229 230 231 232 233 234 -31 207 208 209 210 211 212 35 235 236 237 238 239 240 241 - 36 242 243 - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -36 244 245 246 247 248 40 274 275 276 -37 249 250 251 252 253 254 255 41 277 278 279 280 281 282 283 -38 256 257 258 259 260 261 262 42 284 285 286 287 288 289 290 -39 263 264 265 266 267 268 269 43 291 292 293 294 295 296 297 -40 270 271 272 273 44 298 299 300 301 302 303 304 - - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -45 305 306 307 308 309 310 311 49 335 336 337 338 339 -46 312 313 314 315 316 317 318 50 340 341 342 343 344 345 346 -47 319 320 321 322 323 324 325 51 347 348 349 350 351 352 353 -48 326 327 328 329 330 331 332 52 354 355 356 357 358 359 360 -49 333 334 53 361 362 363 364 365 - - + January February March + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 1 2 3 6 32 33 34 35 36 37 38 10 60 61 62 63 64 65 66 + 2 4 5 6 7 8 9 10 7 39 40 41 42 43 44 45 11 67 68 69 70 71 72 73 + 3 11 12 13 14 15 16 17 8 46 47 48 49 50 51 52 12 74 75 76 77 78 79 80 + 4 18 19 20 21 22 23 24 9 53 54 55 56 57 58 59 13 81 82 83 84 85 86 87 + 5 25 26 27 28 29 30 31 14 88 89 90 + + April May June + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +14 91 92 93 94 18 121 122 23 152 153 154 155 156 157 +15 95 96 97 98 99 100 101 19 123 124 125 126 127 128 129 24 158 159 160 161 162 163 164 +16 102 103 104 105 106 107 108 20 130 131 132 133 134 135 136 25 165 166 167 168 169 170 171 +17 109 110 111 112 113 114 115 21 137 138 139 140 141 142 143 26 172 173 174 175 176 177 178 +18 116 117 118 119 120 22 144 145 146 147 148 149 150 27 179 180 181 + 23 151 + July August September + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +27 182 183 184 185 31 213 36 244 245 246 247 248 +28 186 187 188 189 190 191 192 32 214 215 216 217 218 219 220 37 249 250 251 252 253 254 255 +29 193 194 195 196 197 198 199 33 221 222 223 224 225 226 227 38 256 257 258 259 260 261 262 +30 200 201 202 203 204 205 206 34 228 229 230 231 232 233 234 39 263 264 265 266 267 268 269 +31 207 208 209 210 211 212 35 235 236 237 238 239 240 241 40 270 271 272 273 + 36 242 243 + October November December + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +40 274 275 276 45 305 306 307 308 309 310 311 49 335 336 337 338 339 +41 277 278 279 280 281 282 283 46 312 313 314 315 316 317 318 50 340 341 342 343 344 345 346 +42 284 285 286 287 288 289 290 47 319 320 321 322 323 324 325 51 347 348 349 350 351 352 353 +43 291 292 293 294 295 296 297 48 326 327 328 329 330 331 332 52 354 355 356 357 358 359 360 +44 298 299 300 301 302 303 304 49 333 334 53 361 362 363 364 365 + 2010 - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 6 32 33 34 35 36 37 - 2 3 4 5 6 7 8 9 7 38 39 40 41 42 43 44 - 3 10 11 12 13 14 15 16 8 45 46 47 48 49 50 51 - 4 17 18 19 20 21 22 23 9 52 53 54 55 56 57 58 - 5 24 25 26 27 28 29 30 10 59 - 6 31 - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -10 60 61 62 63 64 65 14 91 92 93 -11 66 67 68 69 70 71 72 15 94 95 96 97 98 99 100 -12 73 74 75 76 77 78 79 16 101 102 103 104 105 106 107 -13 80 81 82 83 84 85 86 17 108 109 110 111 112 113 114 -14 87 88 89 90 18 115 116 117 118 119 120 - - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 121 23 152 153 154 155 156 -19 122 123 124 125 126 127 128 24 157 158 159 160 161 162 163 -20 129 130 131 132 133 134 135 25 164 165 166 167 168 169 170 -21 136 137 138 139 140 141 142 26 171 172 173 174 175 176 177 -22 143 144 145 146 147 148 149 27 178 179 180 181 -23 150 151 - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -27 182 183 184 32 213 214 215 216 217 218 219 -28 185 186 187 188 189 190 191 33 220 221 222 223 224 225 226 -29 192 193 194 195 196 197 198 34 227 228 229 230 231 232 233 -30 199 200 201 202 203 204 205 35 234 235 236 237 238 239 240 -31 206 207 208 209 210 211 212 36 241 242 243 - - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -36 244 245 246 247 40 274 275 -37 248 249 250 251 252 253 254 41 276 277 278 279 280 281 282 -38 255 256 257 258 259 260 261 42 283 284 285 286 287 288 289 -39 262 263 264 265 266 267 268 43 290 291 292 293 294 295 296 -40 269 270 271 272 273 44 297 298 299 300 301 302 303 - 45 304 - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -45 305 306 307 308 309 310 49 335 336 337 338 -46 311 312 313 314 315 316 317 50 339 340 341 342 343 344 345 -47 318 319 320 321 322 323 324 51 346 347 348 349 350 351 352 -48 325 326 327 328 329 330 331 52 353 354 355 356 357 358 359 -49 332 333 334 53 360 361 362 363 364 365 - - + January February March + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 1 2 6 32 33 34 35 36 37 10 60 61 62 63 64 65 + 2 3 4 5 6 7 8 9 7 38 39 40 41 42 43 44 11 66 67 68 69 70 71 72 + 3 10 11 12 13 14 15 16 8 45 46 47 48 49 50 51 12 73 74 75 76 77 78 79 + 4 17 18 19 20 21 22 23 9 52 53 54 55 56 57 58 13 80 81 82 83 84 85 86 + 5 24 25 26 27 28 29 30 10 59 14 87 88 89 90 + 6 31 + April May June + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +14 91 92 93 18 121 23 152 153 154 155 156 +15 94 95 96 97 98 99 100 19 122 123 124 125 126 127 128 24 157 158 159 160 161 162 163 +16 101 102 103 104 105 106 107 20 129 130 131 132 133 134 135 25 164 165 166 167 168 169 170 +17 108 109 110 111 112 113 114 21 136 137 138 139 140 141 142 26 171 172 173 174 175 176 177 +18 115 116 117 118 119 120 22 143 144 145 146 147 148 149 27 178 179 180 181 + 23 150 151 + July August September + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +27 182 183 184 32 213 214 215 216 217 218 219 36 244 245 246 247 +28 185 186 187 188 189 190 191 33 220 221 222 223 224 225 226 37 248 249 250 251 252 253 254 +29 192 193 194 195 196 197 198 34 227 228 229 230 231 232 233 38 255 256 257 258 259 260 261 +30 199 200 201 202 203 204 205 35 234 235 236 237 238 239 240 39 262 263 264 265 266 267 268 +31 206 207 208 209 210 211 212 36 241 242 243 40 269 270 271 272 273 + + October November December + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +40 274 275 45 305 306 307 308 309 310 49 335 336 337 338 +41 276 277 278 279 280 281 282 46 311 312 313 314 315 316 317 50 339 340 341 342 343 344 345 +42 283 284 285 286 287 288 289 47 318 319 320 321 322 323 324 51 346 347 348 349 350 351 352 +43 290 291 292 293 294 295 296 48 325 326 327 328 329 330 331 52 353 354 355 356 357 358 359 +44 297 298 299 300 301 302 303 49 332 333 334 53 360 361 362 363 364 365 +45 304 2011 - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 6 32 33 34 35 36 - 2 2 3 4 5 6 7 8 7 37 38 39 40 41 42 43 - 3 9 10 11 12 13 14 15 8 44 45 46 47 48 49 50 - 4 16 17 18 19 20 21 22 9 51 52 53 54 55 56 57 - 5 23 24 25 26 27 28 29 10 58 59 - 6 30 31 - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -10 60 61 62 63 64 14 91 92 -11 65 66 67 68 69 70 71 15 93 94 95 96 97 98 99 -12 72 73 74 75 76 77 78 16 100 101 102 103 104 105 106 -13 79 80 81 82 83 84 85 17 107 108 109 110 111 112 113 -14 86 87 88 89 90 18 114 115 116 117 118 119 120 - - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -19 121 122 123 124 125 126 127 23 152 153 154 155 -20 128 129 130 131 132 133 134 24 156 157 158 159 160 161 162 -21 135 136 137 138 139 140 141 25 163 164 165 166 167 168 169 -22 142 143 144 145 146 147 148 26 170 171 172 173 174 175 176 -23 149 150 151 27 177 178 179 180 181 - - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -27 182 183 32 213 214 215 216 217 218 -28 184 185 186 187 188 189 190 33 219 220 221 222 223 224 225 -29 191 192 193 194 195 196 197 34 226 227 228 229 230 231 232 -30 198 199 200 201 202 203 204 35 233 234 235 236 237 238 239 -31 205 206 207 208 209 210 211 36 240 241 242 243 -32 212 - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -36 244 245 246 40 274 -37 247 248 249 250 251 252 253 41 275 276 277 278 279 280 281 -38 254 255 256 257 258 259 260 42 282 283 284 285 286 287 288 -39 261 262 263 264 265 266 267 43 289 290 291 292 293 294 295 -40 268 269 270 271 272 273 44 296 297 298 299 300 301 302 - 45 303 304 - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -45 305 306 307 308 309 49 335 336 337 -46 310 311 312 313 314 315 316 50 338 339 340 341 342 343 344 -47 317 318 319 320 321 322 323 51 345 346 347 348 349 350 351 -48 324 325 326 327 328 329 330 52 352 353 354 355 356 357 358 -49 331 332 333 334 53 359 360 361 362 363 364 365 - - + January February March + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 1 6 32 33 34 35 36 10 60 61 62 63 64 + 2 2 3 4 5 6 7 8 7 37 38 39 40 41 42 43 11 65 66 67 68 69 70 71 + 3 9 10 11 12 13 14 15 8 44 45 46 47 48 49 50 12 72 73 74 75 76 77 78 + 4 16 17 18 19 20 21 22 9 51 52 53 54 55 56 57 13 79 80 81 82 83 84 85 + 5 23 24 25 26 27 28 29 10 58 59 14 86 87 88 89 90 + 6 30 31 + April May June + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +14 91 92 19 121 122 123 124 125 126 127 23 152 153 154 155 +15 93 94 95 96 97 98 99 20 128 129 130 131 132 133 134 24 156 157 158 159 160 161 162 +16 100 101 102 103 104 105 106 21 135 136 137 138 139 140 141 25 163 164 165 166 167 168 169 +17 107 108 109 110 111 112 113 22 142 143 144 145 146 147 148 26 170 171 172 173 174 175 176 +18 114 115 116 117 118 119 120 23 149 150 151 27 177 178 179 180 181 + + July August September + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +27 182 183 32 213 214 215 216 217 218 36 244 245 246 +28 184 185 186 187 188 189 190 33 219 220 221 222 223 224 225 37 247 248 249 250 251 252 253 +29 191 192 193 194 195 196 197 34 226 227 228 229 230 231 232 38 254 255 256 257 258 259 260 +30 198 199 200 201 202 203 204 35 233 234 235 236 237 238 239 39 261 262 263 264 265 266 267 +31 205 206 207 208 209 210 211 36 240 241 242 243 40 268 269 270 271 272 273 +32 212 + October November December + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +40 274 45 305 306 307 308 309 49 335 336 337 +41 275 276 277 278 279 280 281 46 310 311 312 313 314 315 316 50 338 339 340 341 342 343 344 +42 282 283 284 285 286 287 288 47 317 318 319 320 321 322 323 51 345 346 347 348 349 350 351 +43 289 290 291 292 293 294 295 48 324 325 326 327 328 329 330 52 352 353 354 355 356 357 358 +44 296 297 298 299 300 301 302 49 331 332 333 334 53 359 360 361 362 363 364 365 +45 303 304 2012 - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 3 4 5 6 7 5 32 33 34 35 - 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 - 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 - 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 - 5 29 30 31 9 57 58 59 60 - - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 9 61 62 63 14 92 93 94 95 96 97 98 -10 64 65 66 67 68 69 70 15 99 100 101 102 103 104 105 -11 71 72 73 74 75 76 77 16 106 107 108 109 110 111 112 -12 78 79 80 81 82 83 84 17 113 114 115 116 117 118 119 -13 85 86 87 88 89 90 91 18 120 121 - - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 122 123 124 125 126 22 153 154 -19 127 128 129 130 131 132 133 23 155 156 157 158 159 160 161 -20 134 135 136 137 138 139 140 24 162 163 164 165 166 167 168 -21 141 142 143 144 145 146 147 25 169 170 171 172 173 174 175 -22 148 149 150 151 152 26 176 177 178 179 180 181 182 - - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -27 183 184 185 186 187 188 189 31 214 215 216 217 -28 190 191 192 193 194 195 196 32 218 219 220 221 222 223 224 -29 197 198 199 200 201 202 203 33 225 226 227 228 229 230 231 -30 204 205 206 207 208 209 210 34 232 233 234 235 236 237 238 -31 211 212 213 35 239 240 241 242 243 244 - - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -35 245 40 275 276 277 278 279 280 -36 246 247 248 249 250 251 252 41 281 282 283 284 285 286 287 -37 253 254 255 256 257 258 259 42 288 289 290 291 292 293 294 -38 260 261 262 263 264 265 266 43 295 296 297 298 299 300 301 -39 267 268 269 270 271 272 273 44 302 303 304 305 -40 274 - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -44 306 307 308 48 336 -45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 -46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 -47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 -48 330 331 332 333 334 335 52 358 359 360 361 362 363 364 - 53 365 366 - + January February March + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 1 2 3 4 5 6 7 5 32 33 34 35 9 61 62 63 + 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 10 64 65 66 67 68 69 70 + 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 11 71 72 73 74 75 76 77 + 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 12 78 79 80 81 82 83 84 + 5 29 30 31 9 57 58 59 60 13 85 86 87 88 89 90 91 + + April May June + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +14 92 93 94 95 96 97 98 18 122 123 124 125 126 22 153 154 +15 99 100 101 102 103 104 105 19 127 128 129 130 131 132 133 23 155 156 157 158 159 160 161 +16 106 107 108 109 110 111 112 20 134 135 136 137 138 139 140 24 162 163 164 165 166 167 168 +17 113 114 115 116 117 118 119 21 141 142 143 144 145 146 147 25 169 170 171 172 173 174 175 +18 120 121 22 148 149 150 151 152 26 176 177 178 179 180 181 182 + + July August September + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +27 183 184 185 186 187 188 189 31 214 215 216 217 35 245 +28 190 191 192 193 194 195 196 32 218 219 220 221 222 223 224 36 246 247 248 249 250 251 252 +29 197 198 199 200 201 202 203 33 225 226 227 228 229 230 231 37 253 254 255 256 257 258 259 +30 204 205 206 207 208 209 210 34 232 233 234 235 236 237 238 38 260 261 262 263 264 265 266 +31 211 212 213 35 239 240 241 242 243 244 39 267 268 269 270 271 272 273 + 40 274 + October November December + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +40 275 276 277 278 279 280 44 306 307 308 48 336 +41 281 282 283 284 285 286 287 45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 +42 288 289 290 291 292 293 294 46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 +43 295 296 297 298 299 300 301 47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 +44 302 303 304 305 48 330 331 332 333 334 335 52 358 359 360 361 362 363 364 + 53 365 366 diff --git a/tests/expected/cal/weeknum-ysw b/tests/expected/cal/weeknum-ysw index 52f57194a..0c924ce30 100644 --- a/tests/expected/cal/weeknum-ysw +++ b/tests/expected/cal/weeknum-ysw @@ -3,244 +3,237 @@ Gregorian - Sunday-based week with week numbers January February March Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 4 5 6 5 1 2 3 9 1 2 3 - 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 10 4 5 6 7 8 9 10 - 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 11 11 12 13 14 15 16 17 - 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 12 18 19 20 21 22 23 24 - 5 28 29 30 31 9 25 26 27 28 13 25 26 27 28 29 30 31 - + 1 1 2 3 4 5 6 5 1 2 3 9 1 2 3 + 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 10 4 5 6 7 8 9 10 + 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 11 11 12 13 14 15 16 17 + 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 12 18 19 20 21 22 23 24 + 5 28 29 30 31 9 25 26 27 28 13 25 26 27 28 29 30 31 + April May June Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -14 1 2 3 4 5 6 7 18 1 2 3 4 5 22 1 2 -15 8 9 10 11 12 13 14 19 6 7 8 9 10 11 12 23 3 4 5 6 7 8 9 -16 15 16 17 18 19 20 21 20 13 14 15 16 17 18 19 24 10 11 12 13 14 15 16 -17 22 23 24 25 26 27 28 21 20 21 22 23 24 25 26 25 17 18 19 20 21 22 23 -18 29 30 22 27 28 29 30 31 26 24 25 26 27 28 29 30 - +14 1 2 3 4 5 6 7 18 1 2 3 4 5 22 1 2 +15 8 9 10 11 12 13 14 19 6 7 8 9 10 11 12 23 3 4 5 6 7 8 9 +16 15 16 17 18 19 20 21 20 13 14 15 16 17 18 19 24 10 11 12 13 14 15 16 +17 22 23 24 25 26 27 28 21 20 21 22 23 24 25 26 25 17 18 19 20 21 22 23 +18 29 30 22 27 28 29 30 31 26 24 25 26 27 28 29 30 + July August September Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -27 1 2 3 4 5 6 7 31 1 2 3 4 35 1 -28 8 9 10 11 12 13 14 32 5 6 7 8 9 10 11 36 2 3 4 5 6 7 8 -29 15 16 17 18 19 20 21 33 12 13 14 15 16 17 18 37 9 10 11 12 13 14 15 -30 22 23 24 25 26 27 28 34 19 20 21 22 23 24 25 38 16 17 18 19 20 21 22 -31 29 30 31 35 26 27 28 29 30 31 39 23 24 25 26 27 28 29 - 40 30 +27 1 2 3 4 5 6 7 31 1 2 3 4 35 1 +28 8 9 10 11 12 13 14 32 5 6 7 8 9 10 11 36 2 3 4 5 6 7 8 +29 15 16 17 18 19 20 21 33 12 13 14 15 16 17 18 37 9 10 11 12 13 14 15 +30 22 23 24 25 26 27 28 34 19 20 21 22 23 24 25 38 16 17 18 19 20 21 22 +31 29 30 31 35 26 27 28 29 30 31 39 23 24 25 26 27 28 29 + 40 30 October November December Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -40 1 2 3 4 5 6 44 1 2 3 48 1 -41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10 49 2 3 4 5 6 7 8 -42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 50 9 10 11 12 13 14 15 -43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 51 16 17 18 19 20 21 22 -44 28 29 30 31 48 25 26 27 28 29 30 52 23 24 25 26 27 28 29 - 53 30 31 - +40 1 2 3 4 5 6 44 1 2 3 48 1 +41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10 49 2 3 4 5 6 7 8 +42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 50 9 10 11 12 13 14 15 +43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 51 16 17 18 19 20 21 22 +44 28 29 30 31 48 25 26 27 28 29 30 52 23 24 25 26 27 28 29 + 53 30 31 2002 January February March Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 4 5 5 1 2 9 1 2 - 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 10 3 4 5 6 7 8 9 - 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 11 10 11 12 13 14 15 16 - 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 12 17 18 19 20 21 22 23 - 5 27 28 29 30 31 9 24 25 26 27 28 13 24 25 26 27 28 29 30 - 14 31 + 1 1 2 3 4 5 5 1 2 9 1 2 + 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 10 3 4 5 6 7 8 9 + 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 11 10 11 12 13 14 15 16 + 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 12 17 18 19 20 21 22 23 + 5 27 28 29 30 31 9 24 25 26 27 28 13 24 25 26 27 28 29 30 + 14 31 April May June Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -14 1 2 3 4 5 6 18 1 2 3 4 22 1 -15 7 8 9 10 11 12 13 19 5 6 7 8 9 10 11 23 2 3 4 5 6 7 8 -16 14 15 16 17 18 19 20 20 12 13 14 15 16 17 18 24 9 10 11 12 13 14 15 -17 21 22 23 24 25 26 27 21 19 20 21 22 23 24 25 25 16 17 18 19 20 21 22 -18 28 29 30 22 26 27 28 29 30 31 26 23 24 25 26 27 28 29 - 27 30 +14 1 2 3 4 5 6 18 1 2 3 4 22 1 +15 7 8 9 10 11 12 13 19 5 6 7 8 9 10 11 23 2 3 4 5 6 7 8 +16 14 15 16 17 18 19 20 20 12 13 14 15 16 17 18 24 9 10 11 12 13 14 15 +17 21 22 23 24 25 26 27 21 19 20 21 22 23 24 25 25 16 17 18 19 20 21 22 +18 28 29 30 22 26 27 28 29 30 31 26 23 24 25 26 27 28 29 + 27 30 July August September Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -27 1 2 3 4 5 6 31 1 2 3 36 1 2 3 4 5 6 7 -28 7 8 9 10 11 12 13 32 4 5 6 7 8 9 10 37 8 9 10 11 12 13 14 -29 14 15 16 17 18 19 20 33 11 12 13 14 15 16 17 38 15 16 17 18 19 20 21 -30 21 22 23 24 25 26 27 34 18 19 20 21 22 23 24 39 22 23 24 25 26 27 28 -31 28 29 30 31 35 25 26 27 28 29 30 31 40 29 30 - +27 1 2 3 4 5 6 31 1 2 3 36 1 2 3 4 5 6 7 +28 7 8 9 10 11 12 13 32 4 5 6 7 8 9 10 37 8 9 10 11 12 13 14 +29 14 15 16 17 18 19 20 33 11 12 13 14 15 16 17 38 15 16 17 18 19 20 21 +30 21 22 23 24 25 26 27 34 18 19 20 21 22 23 24 39 22 23 24 25 26 27 28 +31 28 29 30 31 35 25 26 27 28 29 30 31 40 29 30 + October November December Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -40 1 2 3 4 5 44 1 2 49 1 2 3 4 5 6 7 -41 6 7 8 9 10 11 12 45 3 4 5 6 7 8 9 50 8 9 10 11 12 13 14 -42 13 14 15 16 17 18 19 46 10 11 12 13 14 15 16 51 15 16 17 18 19 20 21 -43 20 21 22 23 24 25 26 47 17 18 19 20 21 22 23 52 22 23 24 25 26 27 28 -44 27 28 29 30 31 48 24 25 26 27 28 29 30 53 29 30 31 - - +40 1 2 3 4 5 44 1 2 49 1 2 3 4 5 6 7 +41 6 7 8 9 10 11 12 45 3 4 5 6 7 8 9 50 8 9 10 11 12 13 14 +42 13 14 15 16 17 18 19 46 10 11 12 13 14 15 16 51 15 16 17 18 19 20 21 +43 20 21 22 23 24 25 26 47 17 18 19 20 21 22 23 52 22 23 24 25 26 27 28 +44 27 28 29 30 31 48 24 25 26 27 28 29 30 53 29 30 31 + 2003 January February March Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 4 5 1 9 1 - 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 10 2 3 4 5 6 7 8 - 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 11 9 10 11 12 13 14 15 - 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 12 16 17 18 19 20 21 22 - 5 26 27 28 29 30 31 9 23 24 25 26 27 28 13 23 24 25 26 27 28 29 - 14 30 31 + 1 1 2 3 4 5 1 9 1 + 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 10 2 3 4 5 6 7 8 + 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 11 9 10 11 12 13 14 15 + 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 12 16 17 18 19 20 21 22 + 5 26 27 28 29 30 31 9 23 24 25 26 27 28 13 23 24 25 26 27 28 29 + 14 30 31 April May June Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -14 1 2 3 4 5 18 1 2 3 23 1 2 3 4 5 6 7 -15 6 7 8 9 10 11 12 19 4 5 6 7 8 9 10 24 8 9 10 11 12 13 14 -16 13 14 15 16 17 18 19 20 11 12 13 14 15 16 17 25 15 16 17 18 19 20 21 -17 20 21 22 23 24 25 26 21 18 19 20 21 22 23 24 26 22 23 24 25 26 27 28 -18 27 28 29 30 22 25 26 27 28 29 30 31 27 29 30 - +14 1 2 3 4 5 18 1 2 3 23 1 2 3 4 5 6 7 +15 6 7 8 9 10 11 12 19 4 5 6 7 8 9 10 24 8 9 10 11 12 13 14 +16 13 14 15 16 17 18 19 20 11 12 13 14 15 16 17 25 15 16 17 18 19 20 21 +17 20 21 22 23 24 25 26 21 18 19 20 21 22 23 24 26 22 23 24 25 26 27 28 +18 27 28 29 30 22 25 26 27 28 29 30 31 27 29 30 + July August September Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -27 1 2 3 4 5 31 1 2 36 1 2 3 4 5 6 -28 6 7 8 9 10 11 12 32 3 4 5 6 7 8 9 37 7 8 9 10 11 12 13 -29 13 14 15 16 17 18 19 33 10 11 12 13 14 15 16 38 14 15 16 17 18 19 20 -30 20 21 22 23 24 25 26 34 17 18 19 20 21 22 23 39 21 22 23 24 25 26 27 -31 27 28 29 30 31 35 24 25 26 27 28 29 30 40 28 29 30 - 36 31 +27 1 2 3 4 5 31 1 2 36 1 2 3 4 5 6 +28 6 7 8 9 10 11 12 32 3 4 5 6 7 8 9 37 7 8 9 10 11 12 13 +29 13 14 15 16 17 18 19 33 10 11 12 13 14 15 16 38 14 15 16 17 18 19 20 +30 20 21 22 23 24 25 26 34 17 18 19 20 21 22 23 39 21 22 23 24 25 26 27 +31 27 28 29 30 31 35 24 25 26 27 28 29 30 40 28 29 30 + 36 31 October November December Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -40 1 2 3 4 44 1 49 1 2 3 4 5 6 -41 5 6 7 8 9 10 11 45 2 3 4 5 6 7 8 50 7 8 9 10 11 12 13 -42 12 13 14 15 16 17 18 46 9 10 11 12 13 14 15 51 14 15 16 17 18 19 20 -43 19 20 21 22 23 24 25 47 16 17 18 19 20 21 22 52 21 22 23 24 25 26 27 -44 26 27 28 29 30 31 48 23 24 25 26 27 28 29 53 28 29 30 31 - 49 30 - +40 1 2 3 4 44 1 49 1 2 3 4 5 6 +41 5 6 7 8 9 10 11 45 2 3 4 5 6 7 8 50 7 8 9 10 11 12 13 +42 12 13 14 15 16 17 18 46 9 10 11 12 13 14 15 51 14 15 16 17 18 19 20 +43 19 20 21 22 23 24 25 47 16 17 18 19 20 21 22 52 21 22 23 24 25 26 27 +44 26 27 28 29 30 31 48 23 24 25 26 27 28 29 53 28 29 30 31 + 49 30 2009 January February March Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 6 1 2 3 4 5 6 7 10 1 2 3 4 5 6 7 - 2 4 5 6 7 8 9 10 7 8 9 10 11 12 13 14 11 8 9 10 11 12 13 14 - 3 11 12 13 14 15 16 17 8 15 16 17 18 19 20 21 12 15 16 17 18 19 20 21 - 4 18 19 20 21 22 23 24 9 22 23 24 25 26 27 28 13 22 23 24 25 26 27 28 - 5 25 26 27 28 29 30 31 14 29 30 31 - + 1 1 2 3 6 1 2 3 4 5 6 7 10 1 2 3 4 5 6 7 + 2 4 5 6 7 8 9 10 7 8 9 10 11 12 13 14 11 8 9 10 11 12 13 14 + 3 11 12 13 14 15 16 17 8 15 16 17 18 19 20 21 12 15 16 17 18 19 20 21 + 4 18 19 20 21 22 23 24 9 22 23 24 25 26 27 28 13 22 23 24 25 26 27 28 + 5 25 26 27 28 29 30 31 14 29 30 31 + April May June Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -14 1 2 3 4 18 1 2 23 1 2 3 4 5 6 -15 5 6 7 8 9 10 11 19 3 4 5 6 7 8 9 24 7 8 9 10 11 12 13 -16 12 13 14 15 16 17 18 20 10 11 12 13 14 15 16 25 14 15 16 17 18 19 20 -17 19 20 21 22 23 24 25 21 17 18 19 20 21 22 23 26 21 22 23 24 25 26 27 -18 26 27 28 29 30 22 24 25 26 27 28 29 30 27 28 29 30 - 23 31 +14 1 2 3 4 18 1 2 23 1 2 3 4 5 6 +15 5 6 7 8 9 10 11 19 3 4 5 6 7 8 9 24 7 8 9 10 11 12 13 +16 12 13 14 15 16 17 18 20 10 11 12 13 14 15 16 25 14 15 16 17 18 19 20 +17 19 20 21 22 23 24 25 21 17 18 19 20 21 22 23 26 21 22 23 24 25 26 27 +18 26 27 28 29 30 22 24 25 26 27 28 29 30 27 28 29 30 + 23 31 July August September Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -27 1 2 3 4 31 1 36 1 2 3 4 5 -28 5 6 7 8 9 10 11 32 2 3 4 5 6 7 8 37 6 7 8 9 10 11 12 -29 12 13 14 15 16 17 18 33 9 10 11 12 13 14 15 38 13 14 15 16 17 18 19 -30 19 20 21 22 23 24 25 34 16 17 18 19 20 21 22 39 20 21 22 23 24 25 26 -31 26 27 28 29 30 31 35 23 24 25 26 27 28 29 40 27 28 29 30 - 36 30 31 +27 1 2 3 4 31 1 36 1 2 3 4 5 +28 5 6 7 8 9 10 11 32 2 3 4 5 6 7 8 37 6 7 8 9 10 11 12 +29 12 13 14 15 16 17 18 33 9 10 11 12 13 14 15 38 13 14 15 16 17 18 19 +30 19 20 21 22 23 24 25 34 16 17 18 19 20 21 22 39 20 21 22 23 24 25 26 +31 26 27 28 29 30 31 35 23 24 25 26 27 28 29 40 27 28 29 30 + 36 30 31 October November December Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -40 1 2 3 45 1 2 3 4 5 6 7 49 1 2 3 4 5 -41 4 5 6 7 8 9 10 46 8 9 10 11 12 13 14 50 6 7 8 9 10 11 12 -42 11 12 13 14 15 16 17 47 15 16 17 18 19 20 21 51 13 14 15 16 17 18 19 -43 18 19 20 21 22 23 24 48 22 23 24 25 26 27 28 52 20 21 22 23 24 25 26 -44 25 26 27 28 29 30 31 49 29 30 53 27 28 29 30 31 - - +40 1 2 3 45 1 2 3 4 5 6 7 49 1 2 3 4 5 +41 4 5 6 7 8 9 10 46 8 9 10 11 12 13 14 50 6 7 8 9 10 11 12 +42 11 12 13 14 15 16 17 47 15 16 17 18 19 20 21 51 13 14 15 16 17 18 19 +43 18 19 20 21 22 23 24 48 22 23 24 25 26 27 28 52 20 21 22 23 24 25 26 +44 25 26 27 28 29 30 31 49 29 30 53 27 28 29 30 31 + 2010 January February March Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 6 1 2 3 4 5 6 10 1 2 3 4 5 6 - 2 3 4 5 6 7 8 9 7 7 8 9 10 11 12 13 11 7 8 9 10 11 12 13 - 3 10 11 12 13 14 15 16 8 14 15 16 17 18 19 20 12 14 15 16 17 18 19 20 - 4 17 18 19 20 21 22 23 9 21 22 23 24 25 26 27 13 21 22 23 24 25 26 27 - 5 24 25 26 27 28 29 30 10 28 14 28 29 30 31 - 6 31 + 1 1 2 6 1 2 3 4 5 6 10 1 2 3 4 5 6 + 2 3 4 5 6 7 8 9 7 7 8 9 10 11 12 13 11 7 8 9 10 11 12 13 + 3 10 11 12 13 14 15 16 8 14 15 16 17 18 19 20 12 14 15 16 17 18 19 20 + 4 17 18 19 20 21 22 23 9 21 22 23 24 25 26 27 13 21 22 23 24 25 26 27 + 5 24 25 26 27 28 29 30 10 28 14 28 29 30 31 + 6 31 April May June Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -14 1 2 3 18 1 23 1 2 3 4 5 -15 4 5 6 7 8 9 10 19 2 3 4 5 6 7 8 24 6 7 8 9 10 11 12 -16 11 12 13 14 15 16 17 20 9 10 11 12 13 14 15 25 13 14 15 16 17 18 19 -17 18 19 20 21 22 23 24 21 16 17 18 19 20 21 22 26 20 21 22 23 24 25 26 -18 25 26 27 28 29 30 22 23 24 25 26 27 28 29 27 27 28 29 30 - 23 30 31 +14 1 2 3 18 1 23 1 2 3 4 5 +15 4 5 6 7 8 9 10 19 2 3 4 5 6 7 8 24 6 7 8 9 10 11 12 +16 11 12 13 14 15 16 17 20 9 10 11 12 13 14 15 25 13 14 15 16 17 18 19 +17 18 19 20 21 22 23 24 21 16 17 18 19 20 21 22 26 20 21 22 23 24 25 26 +18 25 26 27 28 29 30 22 23 24 25 26 27 28 29 27 27 28 29 30 + 23 30 31 July August September Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -27 1 2 3 32 1 2 3 4 5 6 7 36 1 2 3 4 -28 4 5 6 7 8 9 10 33 8 9 10 11 12 13 14 37 5 6 7 8 9 10 11 -29 11 12 13 14 15 16 17 34 15 16 17 18 19 20 21 38 12 13 14 15 16 17 18 -30 18 19 20 21 22 23 24 35 22 23 24 25 26 27 28 39 19 20 21 22 23 24 25 -31 25 26 27 28 29 30 31 36 29 30 31 40 26 27 28 29 30 - +27 1 2 3 32 1 2 3 4 5 6 7 36 1 2 3 4 +28 4 5 6 7 8 9 10 33 8 9 10 11 12 13 14 37 5 6 7 8 9 10 11 +29 11 12 13 14 15 16 17 34 15 16 17 18 19 20 21 38 12 13 14 15 16 17 18 +30 18 19 20 21 22 23 24 35 22 23 24 25 26 27 28 39 19 20 21 22 23 24 25 +31 25 26 27 28 29 30 31 36 29 30 31 40 26 27 28 29 30 + October November December Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -40 1 2 45 1 2 3 4 5 6 49 1 2 3 4 -41 3 4 5 6 7 8 9 46 7 8 9 10 11 12 13 50 5 6 7 8 9 10 11 -42 10 11 12 13 14 15 16 47 14 15 16 17 18 19 20 51 12 13 14 15 16 17 18 -43 17 18 19 20 21 22 23 48 21 22 23 24 25 26 27 52 19 20 21 22 23 24 25 -44 24 25 26 27 28 29 30 49 28 29 30 53 26 27 28 29 30 31 -45 31 - +40 1 2 45 1 2 3 4 5 6 49 1 2 3 4 +41 3 4 5 6 7 8 9 46 7 8 9 10 11 12 13 50 5 6 7 8 9 10 11 +42 10 11 12 13 14 15 16 47 14 15 16 17 18 19 20 51 12 13 14 15 16 17 18 +43 17 18 19 20 21 22 23 48 21 22 23 24 25 26 27 52 19 20 21 22 23 24 25 +44 24 25 26 27 28 29 30 49 28 29 30 53 26 27 28 29 30 31 +45 31 2011 January February March Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 6 1 2 3 4 5 10 1 2 3 4 5 - 2 2 3 4 5 6 7 8 7 6 7 8 9 10 11 12 11 6 7 8 9 10 11 12 - 3 9 10 11 12 13 14 15 8 13 14 15 16 17 18 19 12 13 14 15 16 17 18 19 - 4 16 17 18 19 20 21 22 9 20 21 22 23 24 25 26 13 20 21 22 23 24 25 26 - 5 23 24 25 26 27 28 29 10 27 28 14 27 28 29 30 31 - 6 30 31 + 1 1 6 1 2 3 4 5 10 1 2 3 4 5 + 2 2 3 4 5 6 7 8 7 6 7 8 9 10 11 12 11 6 7 8 9 10 11 12 + 3 9 10 11 12 13 14 15 8 13 14 15 16 17 18 19 12 13 14 15 16 17 18 19 + 4 16 17 18 19 20 21 22 9 20 21 22 23 24 25 26 13 20 21 22 23 24 25 26 + 5 23 24 25 26 27 28 29 10 27 28 14 27 28 29 30 31 + 6 30 31 April May June Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -14 1 2 19 1 2 3 4 5 6 7 23 1 2 3 4 -15 3 4 5 6 7 8 9 20 8 9 10 11 12 13 14 24 5 6 7 8 9 10 11 -16 10 11 12 13 14 15 16 21 15 16 17 18 19 20 21 25 12 13 14 15 16 17 18 -17 17 18 19 20 21 22 23 22 22 23 24 25 26 27 28 26 19 20 21 22 23 24 25 -18 24 25 26 27 28 29 30 23 29 30 31 27 26 27 28 29 30 - +14 1 2 19 1 2 3 4 5 6 7 23 1 2 3 4 +15 3 4 5 6 7 8 9 20 8 9 10 11 12 13 14 24 5 6 7 8 9 10 11 +16 10 11 12 13 14 15 16 21 15 16 17 18 19 20 21 25 12 13 14 15 16 17 18 +17 17 18 19 20 21 22 23 22 22 23 24 25 26 27 28 26 19 20 21 22 23 24 25 +18 24 25 26 27 28 29 30 23 29 30 31 27 26 27 28 29 30 + July August September Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -27 1 2 32 1 2 3 4 5 6 36 1 2 3 -28 3 4 5 6 7 8 9 33 7 8 9 10 11 12 13 37 4 5 6 7 8 9 10 -29 10 11 12 13 14 15 16 34 14 15 16 17 18 19 20 38 11 12 13 14 15 16 17 -30 17 18 19 20 21 22 23 35 21 22 23 24 25 26 27 39 18 19 20 21 22 23 24 -31 24 25 26 27 28 29 30 36 28 29 30 31 40 25 26 27 28 29 30 -32 31 +27 1 2 32 1 2 3 4 5 6 36 1 2 3 +28 3 4 5 6 7 8 9 33 7 8 9 10 11 12 13 37 4 5 6 7 8 9 10 +29 10 11 12 13 14 15 16 34 14 15 16 17 18 19 20 38 11 12 13 14 15 16 17 +30 17 18 19 20 21 22 23 35 21 22 23 24 25 26 27 39 18 19 20 21 22 23 24 +31 24 25 26 27 28 29 30 36 28 29 30 31 40 25 26 27 28 29 30 +32 31 October November December Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -40 1 45 1 2 3 4 5 49 1 2 3 -41 2 3 4 5 6 7 8 46 6 7 8 9 10 11 12 50 4 5 6 7 8 9 10 -42 9 10 11 12 13 14 15 47 13 14 15 16 17 18 19 51 11 12 13 14 15 16 17 -43 16 17 18 19 20 21 22 48 20 21 22 23 24 25 26 52 18 19 20 21 22 23 24 -44 23 24 25 26 27 28 29 49 27 28 29 30 53 25 26 27 28 29 30 31 -45 30 31 - +40 1 45 1 2 3 4 5 49 1 2 3 +41 2 3 4 5 6 7 8 46 6 7 8 9 10 11 12 50 4 5 6 7 8 9 10 +42 9 10 11 12 13 14 15 47 13 14 15 16 17 18 19 51 11 12 13 14 15 16 17 +43 16 17 18 19 20 21 22 48 20 21 22 23 24 25 26 52 18 19 20 21 22 23 24 +44 23 24 25 26 27 28 29 49 27 28 29 30 53 25 26 27 28 29 30 31 +45 30 31 2012 January February March Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 4 5 6 7 5 1 2 3 4 9 1 2 3 - 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 10 4 5 6 7 8 9 10 - 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 11 11 12 13 14 15 16 17 - 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 12 18 19 20 21 22 23 24 - 5 29 30 31 9 26 27 28 29 13 25 26 27 28 29 30 31 - + 1 1 2 3 4 5 6 7 5 1 2 3 4 9 1 2 3 + 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 10 4 5 6 7 8 9 10 + 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 11 11 12 13 14 15 16 17 + 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 12 18 19 20 21 22 23 24 + 5 29 30 31 9 26 27 28 29 13 25 26 27 28 29 30 31 + April May June Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -14 1 2 3 4 5 6 7 18 1 2 3 4 5 22 1 2 -15 8 9 10 11 12 13 14 19 6 7 8 9 10 11 12 23 3 4 5 6 7 8 9 -16 15 16 17 18 19 20 21 20 13 14 15 16 17 18 19 24 10 11 12 13 14 15 16 -17 22 23 24 25 26 27 28 21 20 21 22 23 24 25 26 25 17 18 19 20 21 22 23 -18 29 30 22 27 28 29 30 31 26 24 25 26 27 28 29 30 - +14 1 2 3 4 5 6 7 18 1 2 3 4 5 22 1 2 +15 8 9 10 11 12 13 14 19 6 7 8 9 10 11 12 23 3 4 5 6 7 8 9 +16 15 16 17 18 19 20 21 20 13 14 15 16 17 18 19 24 10 11 12 13 14 15 16 +17 22 23 24 25 26 27 28 21 20 21 22 23 24 25 26 25 17 18 19 20 21 22 23 +18 29 30 22 27 28 29 30 31 26 24 25 26 27 28 29 30 + July August September Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -27 1 2 3 4 5 6 7 31 1 2 3 4 35 1 -28 8 9 10 11 12 13 14 32 5 6 7 8 9 10 11 36 2 3 4 5 6 7 8 -29 15 16 17 18 19 20 21 33 12 13 14 15 16 17 18 37 9 10 11 12 13 14 15 -30 22 23 24 25 26 27 28 34 19 20 21 22 23 24 25 38 16 17 18 19 20 21 22 -31 29 30 31 35 26 27 28 29 30 31 39 23 24 25 26 27 28 29 - 40 30 +27 1 2 3 4 5 6 7 31 1 2 3 4 35 1 +28 8 9 10 11 12 13 14 32 5 6 7 8 9 10 11 36 2 3 4 5 6 7 8 +29 15 16 17 18 19 20 21 33 12 13 14 15 16 17 18 37 9 10 11 12 13 14 15 +30 22 23 24 25 26 27 28 34 19 20 21 22 23 24 25 38 16 17 18 19 20 21 22 +31 29 30 31 35 26 27 28 29 30 31 39 23 24 25 26 27 28 29 + 40 30 October November December Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -40 1 2 3 4 5 6 44 1 2 3 48 1 -41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10 49 2 3 4 5 6 7 8 -42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 50 9 10 11 12 13 14 15 -43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 51 16 17 18 19 20 21 22 -44 28 29 30 31 48 25 26 27 28 29 30 52 23 24 25 26 27 28 29 - 53 30 31 - +40 1 2 3 4 5 6 44 1 2 3 48 1 +41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10 49 2 3 4 5 6 7 8 +42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17 50 9 10 11 12 13 14 15 +43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24 51 16 17 18 19 20 21 22 +44 28 29 30 31 48 25 26 27 28 29 30 52 23 24 25 26 27 28 29 + 53 30 31 diff --git a/tests/expected/cal/year-ym b/tests/expected/cal/year-ym index 7aa10faa7..60b1a6659 100644 --- a/tests/expected/cal/year-ym +++ b/tests/expected/cal/year-ym @@ -3,34 +3,33 @@ Gregorian - Monday-based week January February March Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 1 2 3 4 5 - 2 3 4 5 6 7 8 6 7 8 9 10 11 12 6 7 8 9 10 11 12 - 9 10 11 12 13 14 15 13 14 15 16 17 18 19 13 14 15 16 17 18 19 -16 17 18 19 20 21 22 20 21 22 23 24 25 26 20 21 22 23 24 25 26 -23 24 25 26 27 28 29 27 28 27 28 29 30 31 -30 31 + 1 1 2 3 4 5 1 2 3 4 5 + 2 3 4 5 6 7 8 6 7 8 9 10 11 12 6 7 8 9 10 11 12 + 9 10 11 12 13 14 15 13 14 15 16 17 18 19 13 14 15 16 17 18 19 +16 17 18 19 20 21 22 20 21 22 23 24 25 26 20 21 22 23 24 25 26 +23 24 25 26 27 28 29 27 28 27 28 29 30 31 +30 31 April May June Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 2 1 2 3 4 5 6 7 1 2 3 4 - 3 4 5 6 7 8 9 8 9 10 11 12 13 14 5 6 7 8 9 10 11 -10 11 12 13 14 15 16 15 16 17 18 19 20 21 12 13 14 15 16 17 18 -17 18 19 20 21 22 23 22 23 24 25 26 27 28 19 20 21 22 23 24 25 -24 25 26 27 28 29 30 29 30 31 26 27 28 29 30 - + 1 2 1 2 3 4 5 6 7 1 2 3 4 + 3 4 5 6 7 8 9 8 9 10 11 12 13 14 5 6 7 8 9 10 11 +10 11 12 13 14 15 16 15 16 17 18 19 20 21 12 13 14 15 16 17 18 +17 18 19 20 21 22 23 22 23 24 25 26 27 28 19 20 21 22 23 24 25 +24 25 26 27 28 29 30 29 30 31 26 27 28 29 30 + July August September Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 2 1 2 3 4 5 6 1 2 3 - 3 4 5 6 7 8 9 7 8 9 10 11 12 13 4 5 6 7 8 9 10 -10 11 12 13 14 15 16 14 15 16 17 18 19 20 11 12 13 14 15 16 17 -17 18 19 20 21 22 23 21 22 23 24 25 26 27 18 19 20 21 22 23 24 -24 25 26 27 28 29 30 28 29 30 31 25 26 27 28 29 30 -31 + 1 2 1 2 3 4 5 6 1 2 3 + 3 4 5 6 7 8 9 7 8 9 10 11 12 13 4 5 6 7 8 9 10 +10 11 12 13 14 15 16 14 15 16 17 18 19 20 11 12 13 14 15 16 17 +17 18 19 20 21 22 23 21 22 23 24 25 26 27 18 19 20 21 22 23 24 +24 25 26 27 28 29 30 28 29 30 31 25 26 27 28 29 30 +31 October November December Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 1 2 3 - 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10 - 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17 -16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24 -23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31 -30 31 - + 1 1 2 3 4 5 1 2 3 + 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31 +30 31 diff --git a/tests/expected/cal/year-ymj b/tests/expected/cal/year-ymj index 7f68e711c..caa3db01d 100644 --- a/tests/expected/cal/year-ymj +++ b/tests/expected/cal/year-ymj @@ -1,52 +1,35 @@ Julian - Monday-based week 2006 - January February -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 1 32 33 34 35 36 - 2 3 4 5 6 7 8 37 38 39 40 41 42 43 - 9 10 11 12 13 14 15 44 45 46 47 48 49 50 - 16 17 18 19 20 21 22 51 52 53 54 55 56 57 - 23 24 25 26 27 28 29 58 59 - 30 31 - March April -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 60 61 62 63 64 91 92 - 65 66 67 68 69 70 71 93 94 95 96 97 98 99 - 72 73 74 75 76 77 78 100 101 102 103 104 105 106 - 79 80 81 82 83 84 85 107 108 109 110 111 112 113 - 86 87 88 89 90 114 115 116 117 118 119 120 - - May June -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -121 122 123 124 125 126 127 152 153 154 155 -128 129 130 131 132 133 134 156 157 158 159 160 161 162 -135 136 137 138 139 140 141 163 164 165 166 167 168 169 -142 143 144 145 146 147 148 170 171 172 173 174 175 176 -149 150 151 177 178 179 180 181 - - July August -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 182 183 213 214 215 216 217 218 -184 185 186 187 188 189 190 219 220 221 222 223 224 225 -191 192 193 194 195 196 197 226 227 228 229 230 231 232 -198 199 200 201 202 203 204 233 234 235 236 237 238 239 -205 206 207 208 209 210 211 240 241 242 243 -212 - September October -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 244 245 246 274 -247 248 249 250 251 252 253 275 276 277 278 279 280 281 -254 255 256 257 258 259 260 282 283 284 285 286 287 288 -261 262 263 264 265 266 267 289 290 291 292 293 294 295 -268 269 270 271 272 273 296 297 298 299 300 301 302 - 303 304 - November December -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 305 306 307 308 309 335 336 337 -310 311 312 313 314 315 316 338 339 340 341 342 343 344 -317 318 319 320 321 322 323 345 346 347 348 349 350 351 -324 325 326 327 328 329 330 352 353 354 355 356 357 358 -331 332 333 334 359 360 361 362 363 364 365 - - + January February March +Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 1 32 33 34 35 36 60 61 62 63 64 + 2 3 4 5 6 7 8 37 38 39 40 41 42 43 65 66 67 68 69 70 71 + 9 10 11 12 13 14 15 44 45 46 47 48 49 50 72 73 74 75 76 77 78 + 16 17 18 19 20 21 22 51 52 53 54 55 56 57 79 80 81 82 83 84 85 + 23 24 25 26 27 28 29 58 59 86 87 88 89 90 + 30 31 + April May June +Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 91 92 121 122 123 124 125 126 127 152 153 154 155 + 93 94 95 96 97 98 99 128 129 130 131 132 133 134 156 157 158 159 160 161 162 +100 101 102 103 104 105 106 135 136 137 138 139 140 141 163 164 165 166 167 168 169 +107 108 109 110 111 112 113 142 143 144 145 146 147 148 170 171 172 173 174 175 176 +114 115 116 117 118 119 120 149 150 151 177 178 179 180 181 + + July August September +Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 182 183 213 214 215 216 217 218 244 245 246 +184 185 186 187 188 189 190 219 220 221 222 223 224 225 247 248 249 250 251 252 253 +191 192 193 194 195 196 197 226 227 228 229 230 231 232 254 255 256 257 258 259 260 +198 199 200 201 202 203 204 233 234 235 236 237 238 239 261 262 263 264 265 266 267 +205 206 207 208 209 210 211 240 241 242 243 268 269 270 271 272 273 +212 + October November December +Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 274 305 306 307 308 309 335 336 337 +275 276 277 278 279 280 281 310 311 312 313 314 315 316 338 339 340 341 342 343 344 +282 283 284 285 286 287 288 317 318 319 320 321 322 323 345 346 347 348 349 350 351 +289 290 291 292 293 294 295 324 325 326 327 328 329 330 352 353 354 355 356 357 358 +296 297 298 299 300 301 302 331 332 333 334 359 360 361 362 363 364 365 +303 304 diff --git a/tests/expected/cal/year-ymjw b/tests/expected/cal/year-ymjw index 70ad91a0f..b62e16703 100644 --- a/tests/expected/cal/year-ymjw +++ b/tests/expected/cal/year-ymjw @@ -1,52 +1,35 @@ Julian - Monday-based week with week numbers 2006 - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -52 1 5 32 33 34 35 36 - 1 2 3 4 5 6 7 8 6 37 38 39 40 41 42 43 - 2 9 10 11 12 13 14 15 7 44 45 46 47 48 49 50 - 3 16 17 18 19 20 21 22 8 51 52 53 54 55 56 57 - 4 23 24 25 26 27 28 29 9 58 59 - 5 30 31 - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 60 61 62 63 64 13 91 92 -10 65 66 67 68 69 70 71 14 93 94 95 96 97 98 99 -11 72 73 74 75 76 77 78 15 100 101 102 103 104 105 106 -12 79 80 81 82 83 84 85 16 107 108 109 110 111 112 113 -13 86 87 88 89 90 17 114 115 116 117 118 119 120 - - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -18 121 122 123 124 125 126 127 22 152 153 154 155 -19 128 129 130 131 132 133 134 23 156 157 158 159 160 161 162 -20 135 136 137 138 139 140 141 24 163 164 165 166 167 168 169 -21 142 143 144 145 146 147 148 25 170 171 172 173 174 175 176 -22 149 150 151 26 177 178 179 180 181 - - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -26 182 183 31 213 214 215 216 217 218 -27 184 185 186 187 188 189 190 32 219 220 221 222 223 224 225 -28 191 192 193 194 195 196 197 33 226 227 228 229 230 231 232 -29 198 199 200 201 202 203 204 34 233 234 235 236 237 238 239 -30 205 206 207 208 209 210 211 35 240 241 242 243 -31 212 - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -35 244 245 246 39 274 -36 247 248 249 250 251 252 253 40 275 276 277 278 279 280 281 -37 254 255 256 257 258 259 260 41 282 283 284 285 286 287 288 -38 261 262 263 264 265 266 267 42 289 290 291 292 293 294 295 -39 268 269 270 271 272 273 43 296 297 298 299 300 301 302 - 44 303 304 - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 305 306 307 308 309 48 335 336 337 -45 310 311 312 313 314 315 316 49 338 339 340 341 342 343 344 -46 317 318 319 320 321 322 323 50 345 346 347 348 349 350 351 -47 324 325 326 327 328 329 330 51 352 353 354 355 356 357 358 -48 331 332 333 334 52 359 360 361 362 363 364 365 - - + January February March + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +52 1 5 32 33 34 35 36 9 60 61 62 63 64 + 1 2 3 4 5 6 7 8 6 37 38 39 40 41 42 43 10 65 66 67 68 69 70 71 + 2 9 10 11 12 13 14 15 7 44 45 46 47 48 49 50 11 72 73 74 75 76 77 78 + 3 16 17 18 19 20 21 22 8 51 52 53 54 55 56 57 12 79 80 81 82 83 84 85 + 4 23 24 25 26 27 28 29 9 58 59 13 86 87 88 89 90 + 5 30 31 + April May June + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +13 91 92 18 121 122 123 124 125 126 127 22 152 153 154 155 +14 93 94 95 96 97 98 99 19 128 129 130 131 132 133 134 23 156 157 158 159 160 161 162 +15 100 101 102 103 104 105 106 20 135 136 137 138 139 140 141 24 163 164 165 166 167 168 169 +16 107 108 109 110 111 112 113 21 142 143 144 145 146 147 148 25 170 171 172 173 174 175 176 +17 114 115 116 117 118 119 120 22 149 150 151 26 177 178 179 180 181 + + July August September + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +26 182 183 31 213 214 215 216 217 218 35 244 245 246 +27 184 185 186 187 188 189 190 32 219 220 221 222 223 224 225 36 247 248 249 250 251 252 253 +28 191 192 193 194 195 196 197 33 226 227 228 229 230 231 232 37 254 255 256 257 258 259 260 +29 198 199 200 201 202 203 204 34 233 234 235 236 237 238 239 38 261 262 263 264 265 266 267 +30 205 206 207 208 209 210 211 35 240 241 242 243 39 268 269 270 271 272 273 +31 212 + October November December + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +39 274 44 305 306 307 308 309 48 335 336 337 +40 275 276 277 278 279 280 281 45 310 311 312 313 314 315 316 49 338 339 340 341 342 343 344 +41 282 283 284 285 286 287 288 46 317 318 319 320 321 322 323 50 345 346 347 348 349 350 351 +42 289 290 291 292 293 294 295 47 324 325 326 327 328 329 330 51 352 353 354 355 356 357 358 +43 296 297 298 299 300 301 302 48 331 332 333 334 52 359 360 361 362 363 364 365 +44 303 304 diff --git a/tests/expected/cal/year-ymw b/tests/expected/cal/year-ymw index 01d4364e7..6bb8aa48b 100644 --- a/tests/expected/cal/year-ymw +++ b/tests/expected/cal/year-ymw @@ -3,34 +3,33 @@ Gregorian - Monday-based week with week numbers January February March Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -52 1 5 1 2 3 4 5 9 1 2 3 4 5 - 1 2 3 4 5 6 7 8 6 6 7 8 9 10 11 12 10 6 7 8 9 10 11 12 - 2 9 10 11 12 13 14 15 7 13 14 15 16 17 18 19 11 13 14 15 16 17 18 19 - 3 16 17 18 19 20 21 22 8 20 21 22 23 24 25 26 12 20 21 22 23 24 25 26 - 4 23 24 25 26 27 28 29 9 27 28 13 27 28 29 30 31 - 5 30 31 +52 1 5 1 2 3 4 5 9 1 2 3 4 5 + 1 2 3 4 5 6 7 8 6 6 7 8 9 10 11 12 10 6 7 8 9 10 11 12 + 2 9 10 11 12 13 14 15 7 13 14 15 16 17 18 19 11 13 14 15 16 17 18 19 + 3 16 17 18 19 20 21 22 8 20 21 22 23 24 25 26 12 20 21 22 23 24 25 26 + 4 23 24 25 26 27 28 29 9 27 28 13 27 28 29 30 31 + 5 30 31 April May June Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -13 1 2 18 1 2 3 4 5 6 7 22 1 2 3 4 -14 3 4 5 6 7 8 9 19 8 9 10 11 12 13 14 23 5 6 7 8 9 10 11 -15 10 11 12 13 14 15 16 20 15 16 17 18 19 20 21 24 12 13 14 15 16 17 18 -16 17 18 19 20 21 22 23 21 22 23 24 25 26 27 28 25 19 20 21 22 23 24 25 -17 24 25 26 27 28 29 30 22 29 30 31 26 26 27 28 29 30 - +13 1 2 18 1 2 3 4 5 6 7 22 1 2 3 4 +14 3 4 5 6 7 8 9 19 8 9 10 11 12 13 14 23 5 6 7 8 9 10 11 +15 10 11 12 13 14 15 16 20 15 16 17 18 19 20 21 24 12 13 14 15 16 17 18 +16 17 18 19 20 21 22 23 21 22 23 24 25 26 27 28 25 19 20 21 22 23 24 25 +17 24 25 26 27 28 29 30 22 29 30 31 26 26 27 28 29 30 + July August September Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -26 1 2 31 1 2 3 4 5 6 35 1 2 3 -27 3 4 5 6 7 8 9 32 7 8 9 10 11 12 13 36 4 5 6 7 8 9 10 -28 10 11 12 13 14 15 16 33 14 15 16 17 18 19 20 37 11 12 13 14 15 16 17 -29 17 18 19 20 21 22 23 34 21 22 23 24 25 26 27 38 18 19 20 21 22 23 24 -30 24 25 26 27 28 29 30 35 28 29 30 31 39 25 26 27 28 29 30 -31 31 +26 1 2 31 1 2 3 4 5 6 35 1 2 3 +27 3 4 5 6 7 8 9 32 7 8 9 10 11 12 13 36 4 5 6 7 8 9 10 +28 10 11 12 13 14 15 16 33 14 15 16 17 18 19 20 37 11 12 13 14 15 16 17 +29 17 18 19 20 21 22 23 34 21 22 23 24 25 26 27 38 18 19 20 21 22 23 24 +30 24 25 26 27 28 29 30 35 28 29 30 31 39 25 26 27 28 29 30 +31 31 October November December Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -39 1 44 1 2 3 4 5 48 1 2 3 -40 2 3 4 5 6 7 8 45 6 7 8 9 10 11 12 49 4 5 6 7 8 9 10 -41 9 10 11 12 13 14 15 46 13 14 15 16 17 18 19 50 11 12 13 14 15 16 17 -42 16 17 18 19 20 21 22 47 20 21 22 23 24 25 26 51 18 19 20 21 22 23 24 -43 23 24 25 26 27 28 29 48 27 28 29 30 52 25 26 27 28 29 30 31 -44 30 31 - +39 1 44 1 2 3 4 5 48 1 2 3 +40 2 3 4 5 6 7 8 45 6 7 8 9 10 11 12 49 4 5 6 7 8 9 10 +41 9 10 11 12 13 14 15 46 13 14 15 16 17 18 19 50 11 12 13 14 15 16 17 +42 16 17 18 19 20 21 22 47 20 21 22 23 24 25 26 51 18 19 20 21 22 23 24 +43 23 24 25 26 27 28 29 48 27 28 29 30 52 25 26 27 28 29 30 31 +44 30 31 diff --git a/tests/expected/cal/year-ys b/tests/expected/cal/year-ys index 3505e80c7..7d372993d 100644 --- a/tests/expected/cal/year-ys +++ b/tests/expected/cal/year-ys @@ -3,34 +3,33 @@ Gregorian - Sunday-based week January February March Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 5 6 7 1 2 3 4 1 2 3 4 - 8 9 10 11 12 13 14 5 6 7 8 9 10 11 5 6 7 8 9 10 11 -15 16 17 18 19 20 21 12 13 14 15 16 17 18 12 13 14 15 16 17 18 -22 23 24 25 26 27 28 19 20 21 22 23 24 25 19 20 21 22 23 24 25 -29 30 31 26 27 28 26 27 28 29 30 31 - + 1 2 3 4 5 6 7 1 2 3 4 1 2 3 4 + 8 9 10 11 12 13 14 5 6 7 8 9 10 11 5 6 7 8 9 10 11 +15 16 17 18 19 20 21 12 13 14 15 16 17 18 12 13 14 15 16 17 18 +22 23 24 25 26 27 28 19 20 21 22 23 24 25 19 20 21 22 23 24 25 +29 30 31 26 27 28 26 27 28 29 30 31 + April May June Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 4 5 6 1 2 3 - 2 3 4 5 6 7 8 7 8 9 10 11 12 13 4 5 6 7 8 9 10 - 9 10 11 12 13 14 15 14 15 16 17 18 19 20 11 12 13 14 15 16 17 -16 17 18 19 20 21 22 21 22 23 24 25 26 27 18 19 20 21 22 23 24 -23 24 25 26 27 28 29 28 29 30 31 25 26 27 28 29 30 -30 + 1 1 2 3 4 5 6 1 2 3 + 2 3 4 5 6 7 8 7 8 9 10 11 12 13 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 14 15 16 17 18 19 20 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 21 22 23 24 25 26 27 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 28 29 30 31 25 26 27 28 29 30 +30 July August September Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 4 5 1 2 - 2 3 4 5 6 7 8 6 7 8 9 10 11 12 3 4 5 6 7 8 9 - 9 10 11 12 13 14 15 13 14 15 16 17 18 19 10 11 12 13 14 15 16 -16 17 18 19 20 21 22 20 21 22 23 24 25 26 17 18 19 20 21 22 23 -23 24 25 26 27 28 29 27 28 29 30 31 24 25 26 27 28 29 30 -30 31 + 1 1 2 3 4 5 1 2 + 2 3 4 5 6 7 8 6 7 8 9 10 11 12 3 4 5 6 7 8 9 + 9 10 11 12 13 14 15 13 14 15 16 17 18 19 10 11 12 13 14 15 16 +16 17 18 19 20 21 22 20 21 22 23 24 25 26 17 18 19 20 21 22 23 +23 24 25 26 27 28 29 27 28 29 30 31 24 25 26 27 28 29 30 +30 31 October November December Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 5 6 7 1 2 3 4 1 2 - 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 -15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 -22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 -29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 - 31 - + 1 2 3 4 5 6 7 1 2 3 4 1 2 + 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 +15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 +22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 +29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 + 31 diff --git a/tests/expected/cal/year-ysj b/tests/expected/cal/year-ysj index e3f13f9b8..080e2579a 100644 --- a/tests/expected/cal/year-ysj +++ b/tests/expected/cal/year-ysj @@ -1,52 +1,35 @@ Julian - Sunday-based week 2006 - January February -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 2 3 4 5 6 7 32 33 34 35 - 8 9 10 11 12 13 14 36 37 38 39 40 41 42 - 15 16 17 18 19 20 21 43 44 45 46 47 48 49 - 22 23 24 25 26 27 28 50 51 52 53 54 55 56 - 29 30 31 57 58 59 - - March April -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 60 61 62 63 91 - 64 65 66 67 68 69 70 92 93 94 95 96 97 98 - 71 72 73 74 75 76 77 99 100 101 102 103 104 105 - 78 79 80 81 82 83 84 106 107 108 109 110 111 112 - 85 86 87 88 89 90 113 114 115 116 117 118 119 - 120 - May June -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 121 122 123 124 125 126 152 153 154 -127 128 129 130 131 132 133 155 156 157 158 159 160 161 -134 135 136 137 138 139 140 162 163 164 165 166 167 168 -141 142 143 144 145 146 147 169 170 171 172 173 174 175 -148 149 150 151 176 177 178 179 180 181 - - July August -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 182 213 214 215 216 217 -183 184 185 186 187 188 189 218 219 220 221 222 223 224 -190 191 192 193 194 195 196 225 226 227 228 229 230 231 -197 198 199 200 201 202 203 232 233 234 235 236 237 238 -204 205 206 207 208 209 210 239 240 241 242 243 -211 212 - September October -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 244 245 274 275 276 277 278 279 280 -246 247 248 249 250 251 252 281 282 283 284 285 286 287 -253 254 255 256 257 258 259 288 289 290 291 292 293 294 -260 261 262 263 264 265 266 295 296 297 298 299 300 301 -267 268 269 270 271 272 273 302 303 304 - - November December -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 305 306 307 308 335 336 -309 310 311 312 313 314 315 337 338 339 340 341 342 343 -316 317 318 319 320 321 322 344 345 346 347 348 349 350 -323 324 325 326 327 328 329 351 352 353 354 355 356 357 -330 331 332 333 334 358 359 360 361 362 363 364 - 365 - + January February March +Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 2 3 4 5 6 7 32 33 34 35 60 61 62 63 + 8 9 10 11 12 13 14 36 37 38 39 40 41 42 64 65 66 67 68 69 70 + 15 16 17 18 19 20 21 43 44 45 46 47 48 49 71 72 73 74 75 76 77 + 22 23 24 25 26 27 28 50 51 52 53 54 55 56 78 79 80 81 82 83 84 + 29 30 31 57 58 59 85 86 87 88 89 90 + + April May June +Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 91 121 122 123 124 125 126 152 153 154 + 92 93 94 95 96 97 98 127 128 129 130 131 132 133 155 156 157 158 159 160 161 + 99 100 101 102 103 104 105 134 135 136 137 138 139 140 162 163 164 165 166 167 168 +106 107 108 109 110 111 112 141 142 143 144 145 146 147 169 170 171 172 173 174 175 +113 114 115 116 117 118 119 148 149 150 151 176 177 178 179 180 181 +120 + July August September +Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 182 213 214 215 216 217 244 245 +183 184 185 186 187 188 189 218 219 220 221 222 223 224 246 247 248 249 250 251 252 +190 191 192 193 194 195 196 225 226 227 228 229 230 231 253 254 255 256 257 258 259 +197 198 199 200 201 202 203 232 233 234 235 236 237 238 260 261 262 263 264 265 266 +204 205 206 207 208 209 210 239 240 241 242 243 267 268 269 270 271 272 273 +211 212 + October November December +Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +274 275 276 277 278 279 280 305 306 307 308 335 336 +281 282 283 284 285 286 287 309 310 311 312 313 314 315 337 338 339 340 341 342 343 +288 289 290 291 292 293 294 316 317 318 319 320 321 322 344 345 346 347 348 349 350 +295 296 297 298 299 300 301 323 324 325 326 327 328 329 351 352 353 354 355 356 357 +302 303 304 330 331 332 333 334 358 359 360 361 362 363 364 + 365 diff --git a/tests/expected/cal/year-ysjw b/tests/expected/cal/year-ysjw index 882453af8..69dbae3ad 100644 --- a/tests/expected/cal/year-ysjw +++ b/tests/expected/cal/year-ysjw @@ -1,52 +1,35 @@ Julian - Sunday-based week with week numbers 2006 - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 3 4 5 6 7 5 32 33 34 35 - 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 - 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 - 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 - 5 29 30 31 9 57 58 59 - - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 9 60 61 62 63 13 91 -10 64 65 66 67 68 69 70 14 92 93 94 95 96 97 98 -11 71 72 73 74 75 76 77 15 99 100 101 102 103 104 105 -12 78 79 80 81 82 83 84 16 106 107 108 109 110 111 112 -13 85 86 87 88 89 90 17 113 114 115 116 117 118 119 - 18 120 - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 121 122 123 124 125 126 22 152 153 154 -19 127 128 129 130 131 132 133 23 155 156 157 158 159 160 161 -20 134 135 136 137 138 139 140 24 162 163 164 165 166 167 168 -21 141 142 143 144 145 146 147 25 169 170 171 172 173 174 175 -22 148 149 150 151 26 176 177 178 179 180 181 - - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -26 182 31 213 214 215 216 217 -27 183 184 185 186 187 188 189 32 218 219 220 221 222 223 224 -28 190 191 192 193 194 195 196 33 225 226 227 228 229 230 231 -29 197 198 199 200 201 202 203 34 232 233 234 235 236 237 238 -30 204 205 206 207 208 209 210 35 239 240 241 242 243 -31 211 212 - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -35 244 245 40 274 275 276 277 278 279 280 -36 246 247 248 249 250 251 252 41 281 282 283 284 285 286 287 -37 253 254 255 256 257 258 259 42 288 289 290 291 292 293 294 -38 260 261 262 263 264 265 266 43 295 296 297 298 299 300 301 -39 267 268 269 270 271 272 273 44 302 303 304 - - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -44 305 306 307 308 48 335 336 -45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 -46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 -47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 -48 330 331 332 333 334 52 358 359 360 361 362 363 364 - 53 365 - + January February March + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 1 2 3 4 5 6 7 5 32 33 34 35 9 60 61 62 63 + 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 10 64 65 66 67 68 69 70 + 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 11 71 72 73 74 75 76 77 + 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 12 78 79 80 81 82 83 84 + 5 29 30 31 9 57 58 59 13 85 86 87 88 89 90 + + April May June + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +13 91 18 121 122 123 124 125 126 22 152 153 154 +14 92 93 94 95 96 97 98 19 127 128 129 130 131 132 133 23 155 156 157 158 159 160 161 +15 99 100 101 102 103 104 105 20 134 135 136 137 138 139 140 24 162 163 164 165 166 167 168 +16 106 107 108 109 110 111 112 21 141 142 143 144 145 146 147 25 169 170 171 172 173 174 175 +17 113 114 115 116 117 118 119 22 148 149 150 151 26 176 177 178 179 180 181 +18 120 + July August September + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +26 182 31 213 214 215 216 217 35 244 245 +27 183 184 185 186 187 188 189 32 218 219 220 221 222 223 224 36 246 247 248 249 250 251 252 +28 190 191 192 193 194 195 196 33 225 226 227 228 229 230 231 37 253 254 255 256 257 258 259 +29 197 198 199 200 201 202 203 34 232 233 234 235 236 237 238 38 260 261 262 263 264 265 266 +30 204 205 206 207 208 209 210 35 239 240 241 242 243 39 267 268 269 270 271 272 273 +31 211 212 + October November December + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +40 274 275 276 277 278 279 280 44 305 306 307 308 48 335 336 +41 281 282 283 284 285 286 287 45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 +42 288 289 290 291 292 293 294 46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 +43 295 296 297 298 299 300 301 47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 +44 302 303 304 48 330 331 332 333 334 52 358 359 360 361 362 363 364 + 53 365 diff --git a/tests/expected/cal/year-ysw b/tests/expected/cal/year-ysw index ea2cc6581..c61f77893 100644 --- a/tests/expected/cal/year-ysw +++ b/tests/expected/cal/year-ysw @@ -3,34 +3,33 @@ Gregorian - Sunday-based week with week numbers January February March Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 4 5 6 7 5 1 2 3 4 9 1 2 3 4 - 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 10 5 6 7 8 9 10 11 - 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 11 12 13 14 15 16 17 18 - 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 12 19 20 21 22 23 24 25 - 5 29 30 31 9 26 27 28 13 26 27 28 29 30 31 - + 1 1 2 3 4 5 6 7 5 1 2 3 4 9 1 2 3 4 + 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 10 5 6 7 8 9 10 11 + 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 11 12 13 14 15 16 17 18 + 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 12 19 20 21 22 23 24 25 + 5 29 30 31 9 26 27 28 13 26 27 28 29 30 31 + April May June Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -13 1 18 1 2 3 4 5 6 22 1 2 3 -14 2 3 4 5 6 7 8 19 7 8 9 10 11 12 13 23 4 5 6 7 8 9 10 -15 9 10 11 12 13 14 15 20 14 15 16 17 18 19 20 24 11 12 13 14 15 16 17 -16 16 17 18 19 20 21 22 21 21 22 23 24 25 26 27 25 18 19 20 21 22 23 24 -17 23 24 25 26 27 28 29 22 28 29 30 31 26 25 26 27 28 29 30 -18 30 +13 1 18 1 2 3 4 5 6 22 1 2 3 +14 2 3 4 5 6 7 8 19 7 8 9 10 11 12 13 23 4 5 6 7 8 9 10 +15 9 10 11 12 13 14 15 20 14 15 16 17 18 19 20 24 11 12 13 14 15 16 17 +16 16 17 18 19 20 21 22 21 21 22 23 24 25 26 27 25 18 19 20 21 22 23 24 +17 23 24 25 26 27 28 29 22 28 29 30 31 26 25 26 27 28 29 30 +18 30 July August September Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -26 1 31 1 2 3 4 5 35 1 2 -27 2 3 4 5 6 7 8 32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 -28 9 10 11 12 13 14 15 33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 -29 16 17 18 19 20 21 22 34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 -30 23 24 25 26 27 28 29 35 27 28 29 30 31 39 24 25 26 27 28 29 30 -31 30 31 +26 1 31 1 2 3 4 5 35 1 2 +27 2 3 4 5 6 7 8 32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 +28 9 10 11 12 13 14 15 33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 +29 16 17 18 19 20 21 22 34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 +30 23 24 25 26 27 28 29 35 27 28 29 30 31 39 24 25 26 27 28 29 30 +31 30 31 October November December Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -40 1 2 3 4 5 6 7 44 1 2 3 4 48 1 2 -41 8 9 10 11 12 13 14 45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 -42 15 16 17 18 19 20 21 46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 -43 22 23 24 25 26 27 28 47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 -44 29 30 31 48 26 27 28 29 30 52 24 25 26 27 28 29 30 - 53 31 - +40 1 2 3 4 5 6 7 44 1 2 3 4 48 1 2 +41 8 9 10 11 12 13 14 45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 +42 15 16 17 18 19 20 21 46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 +43 22 23 24 25 26 27 28 47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 +44 29 30 31 48 26 27 28 29 30 52 24 25 26 27 28 29 30 + 53 31 diff --git a/tests/expected/cramfs/fsck-bad-header b/tests/expected/cramfs/fsck-bad-header deleted file mode 100644 index ade8a9c3a..000000000 --- a/tests/expected/cramfs/fsck-bad-header +++ /dev/null @@ -1,2 +0,0 @@ -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error diff --git a/tests/expected/cramfs/fsck-bad-header-nopad-4K-be b/tests/expected/cramfs/fsck-bad-header-nopad-4K-be new file mode 100644 index 000000000..397d1ba29 --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-nopad-4K-be @@ -0,0 +1,29 @@ +## size: 0 +fsck.cramfs: superblock size (0) too small +ret: 4 + +## size: 75 +fsck.cramfs: superblock size (75) too small +ret: 4 + +## size: 76 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 4095 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 4096 +ret: 0 + +## size: 4097 +fsck.cramfs: file length too short +ret: 4 + +## size: 4294967295 +fsck.cramfs: file length too short +ret: 4 + diff --git a/tests/expected/cramfs/fsck-bad-header-nopad-4K-le b/tests/expected/cramfs/fsck-bad-header-nopad-4K-le new file mode 100644 index 000000000..397d1ba29 --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-nopad-4K-le @@ -0,0 +1,29 @@ +## size: 0 +fsck.cramfs: superblock size (0) too small +ret: 4 + +## size: 75 +fsck.cramfs: superblock size (75) too small +ret: 4 + +## size: 76 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 4095 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 4096 +ret: 0 + +## size: 4097 +fsck.cramfs: file length too short +ret: 4 + +## size: 4294967295 +fsck.cramfs: file length too short +ret: 4 + diff --git a/tests/expected/cramfs/fsck-bad-header-pad-4K-be b/tests/expected/cramfs/fsck-bad-header-pad-4K-be new file mode 100644 index 000000000..8e2316183 --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-pad-4K-be @@ -0,0 +1,29 @@ +## size: 76 +fsck.cramfs: superblock size (76) too small +ret: 4 + +## size: 587 +fsck.cramfs: superblock size (587) too small +ret: 4 + +## size: 588 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 4095 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 4096 +ret: 0 + +## size: 4097 +fsck.cramfs: file length too short +ret: 4 + +## size: 4294967295 +fsck.cramfs: file length too short +ret: 4 + diff --git a/tests/expected/cramfs/fsck-bad-header-pad-4K-le b/tests/expected/cramfs/fsck-bad-header-pad-4K-le new file mode 100644 index 000000000..8e2316183 --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-pad-4K-le @@ -0,0 +1,29 @@ +## size: 76 +fsck.cramfs: superblock size (76) too small +ret: 4 + +## size: 587 +fsck.cramfs: superblock size (587) too small +ret: 4 + +## size: 588 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 4095 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 4096 +ret: 0 + +## size: 4097 +fsck.cramfs: file length too short +ret: 4 + +## size: 4294967295 +fsck.cramfs: file length too short +ret: 4 + diff --git a/tests/expected/cramfs/fsck-bad-header-pad-64K-be b/tests/expected/cramfs/fsck-bad-header-pad-64K-be new file mode 100644 index 000000000..15d4ff190 --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-pad-64K-be @@ -0,0 +1,29 @@ +## size: 76 +fsck.cramfs: superblock size (76) too small +ret: 4 + +## size: 587 +fsck.cramfs: superblock size (587) too small +ret: 4 + +## size: 588 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 65535 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 65536 +ret: 0 + +## size: 65537 +fsck.cramfs: file length too short +ret: 4 + +## size: 4294967295 +fsck.cramfs: file length too short +ret: 4 + diff --git a/tests/expected/cramfs/fsck-bad-header-pad-64K-le b/tests/expected/cramfs/fsck-bad-header-pad-64K-le new file mode 100644 index 000000000..15d4ff190 --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-pad-64K-le @@ -0,0 +1,29 @@ +## size: 76 +fsck.cramfs: superblock size (76) too small +ret: 4 + +## size: 587 +fsck.cramfs: superblock size (587) too small +ret: 4 + +## size: 588 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 65535 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +ret: 4 + +## size: 65536 +ret: 0 + +## size: 65537 +fsck.cramfs: file length too short +ret: 4 + +## size: 4294967295 +fsck.cramfs: file length too short +ret: 4 + diff --git a/tests/functions.sh b/tests/functions.sh index ef11a893e..d1c97e0b6 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -635,7 +635,7 @@ function ts_fstab_open { function ts_fstab_close { echo "# -->" >> /etc/fstab - sync /etc/fstab + sync /etc/fstab 2>/dev/null } function ts_fstab_addline { @@ -669,7 +669,7 @@ function ts_fstab_clean { s/# <!-- util-linux.*-->//; /^$/d" /etc/fstab - sync /etc/fstab + sync /etc/fstab 2>/dev/null ts_unlock "fstab" } diff --git a/tests/ts/cramfs/fsck-bad-header b/tests/ts/cramfs/fsck-bad-header index 8d5309c35..c71782bde 100755 --- a/tests/ts/cramfs/fsck-bad-header +++ b/tests/ts/cramfs/fsck-bad-header @@ -16,7 +16,7 @@ # GNU General Public License for more details. # TS_TOPDIR="${0%/*}/../.." -TS_DESC="fsck endianness" +TS_DESC="fsck bad header" . $TS_TOPDIR/functions.sh ts_init "$*" @@ -25,14 +25,78 @@ ts_check_test_command "$TS_CMD_MKCRAMFS" ts_check_test_command "$TS_CMD_FSCKCRAMFS" ts_check_prog "dd" -IMAGE_SOURCE="$TS_OUTDIR/${TS_TESTNAME}-data/root" +function num2binary() +{ + local num=$1 + local endian=$2 + + test "$num" -ge 0 -a "$num" -le 4294967295 || return 1 + test "$endian" = "be" -o "$endian" = "le" || return 1 + + # how to do that easier? + if test "$endian" = "be"; then + echo -en "$(printf "%08x" "$1" | sed 's/\(..\)/\\x\1/g')" + else + echo -en "$(printf "%08x" "$1" | sed 's/^\(..\)\(..\)\(..\)\(..\)$/\\x\4\\x\3\\x\2\\x\1/')" + fi +} + +function fsck_loop_sizes() +{ + local endian=$1 # be, le + local seek=$2 # 4 for nopad, 516 for pad + shift 2 # the rest are sizes to loop over + + for size in "$@"; do + ts_log "## size: $size" + cp -a "$IMAGE_FILE" "$IMAGE_FILE.tmp" + num2binary "$size" $endian | + dd of="$IMAGE_FILE.tmp" bs=1 seek="$seek" count=4 conv=notrunc &> /dev/null + $TS_CMD_FSCKCRAMFS "$IMAGE_FILE.tmp" >> $TS_OUTPUT 2>&1 + ts_log "ret: $? +" + done + rm -f "$IMAGE_FILE" +} + + +IMAGE_SOURCE="$TS_OUTDIR/${TS_TESTNAME}-data" IMAGE_FILE="$TS_OUTDIR/${TS_TESTNAME}-cramfs.img" mkdir -p "${IMAGE_SOURCE}/subdir" &> /dev/null -$TS_CMD_MKCRAMFS -p -N big $IMAGE_SOURCE $IMAGE_FILE &> /dev/null -echo -ne \\00\\x4c | - dd of=$IMAGE_FILE bs=1 seek=518 count=2 conv=notrunc &> /dev/null -$TS_CMD_FSCKCRAMFS $IMAGE_FILE >> $TS_OUTPUT 2>&1 + +ts_init_subtest "nopad-4K-be" +$TS_CMD_MKCRAMFS -N big -b 4096 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null +fsck_loop_sizes be 4 0 75 76 4095 4096 4097 4294967295 +rm -f "$IMAGE_FILE" +ts_finalize_subtest + +ts_init_subtest "nopad-4K-le" +$TS_CMD_MKCRAMFS -N little -b 4096 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null +fsck_loop_sizes le 4 0 75 76 4095 4096 4097 4294967295 +ts_finalize_subtest + +ts_init_subtest "pad-4K-be" +$TS_CMD_MKCRAMFS -p -N big -b 4096 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null +fsck_loop_sizes be 516 76 587 588 4095 4096 4097 4294967295 +ts_finalize_subtest + +ts_init_subtest "pad-4K-le" +$TS_CMD_MKCRAMFS -p -N little -b 4096 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null +fsck_loop_sizes le 516 76 587 588 4095 4096 4097 4294967295 +ts_finalize_subtest + +ts_init_subtest "pad-64K-be" +$TS_CMD_MKCRAMFS -p -N big -b 65536 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null +fsck_loop_sizes be 516 76 587 588 65535 65536 65537 4294967295 +ts_finalize_subtest + +ts_init_subtest "pad-64K-le" +$TS_CMD_MKCRAMFS -p -N little -b 65536 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null +fsck_loop_sizes le 516 76 587 588 65535 65536 65537 4294967295 +ts_finalize_subtest + +rm -rf "$IMAGE_SOURCE" "$IMAGE_FILE.tmp" ts_finalize diff --git a/tests/ts/fincore/count b/tests/ts/fincore/count index c2dff7e34..46700a32e 100755 --- a/tests/ts/fincore/count +++ b/tests/ts/fincore/count @@ -3,15 +3,14 @@ TS_TOPDIR="${0%/*}/../.." TS_DESC="count file contents in core" -# Send patch if you know how to keep it portable and robust. Thanks. -TS_KNOWN_FAIL="yes" - - . $TS_TOPDIR/functions.sh ts_init "$*" ts_check_test_command "$TS_HELPER_SYSINFO" +# Send patch if you know how to keep it portable and robust. Thanks. +TS_KNOWN_FAIL="yes" + function header { echo "[" "$1" "]" |