Skip to content

Commit e0a414a

Browse files
committed
It is 2025
1 parent 98d8b25 commit e0a414a

19 files changed

+64
-60
lines changed

CSV_XS.pm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package Text::CSV_XS;
22

3-
# Copyright (c) 2007-2024 H.Merijn Brand. All rights reserved.
3+
# Copyright (c) 2007-2025 H.Merijn Brand. All rights reserved.
44
# Copyright (c) 1998-2001 Jochen Wiedmann. All rights reserved.
55
# Copyright (c) 1997 Alan Citterman. All rights reserved.
66
#
@@ -5330,7 +5330,7 @@ L</csv> function. See ChangeLog releases 0.25 and on.
53305330
53315331
=head1 COPYRIGHT AND LICENSE
53325332
5333-
Copyright (C) 2007-2024 H.Merijn Brand. All rights reserved.
5333+
Copyright (C) 2007-2025 H.Merijn Brand. All rights reserved.
53345334
Copyright (C) 1998-2001 Jochen Wiedmann. All rights reserved.
53355335
Copyright (C) 1997 Alan Citterman. All rights reserved.
53365336

CSV_XS.xs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2007-2024 H.Merijn Brand. All rights reserved.
1+
/* Copyright (c) 2007-2025 H.Merijn Brand. All rights reserved.
22
* Copyright (c) 1998-2001 Jochen Wiedmann. All rights reserved.
33
* This program is free software; you can redistribute it and/or
44
* modify it under the same terms as Perl itself.

ChangeLog

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
1.59 - 2025-01-03, H.Merijn Brand
22
* Fixed EOL test for Windows with crnl layer
3+
* It is 2025
34

45
1.58 - 2024-12-30, H.Merijn Brand
56
* Add strict_eol (warnings default in csv ())
@@ -21,7 +22,7 @@
2122

2223
1.54 - 2024-04-18, H.Merijn Brand
2324
* Fix doc (Jean Forget, RT#150757)
24-
* It's 2024
25+
* It is 2024
2526
* Fix comment_str with strict
2627
* Doc fixup (RT#151546)
2728

Makefile.PL

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/perl
22

3-
# Copyright PROCURA B.V. (c) 2006-2024 H.Merijn Brand
3+
# Copyright PROCURA B.V. (c) 2006-2025 H.Merijn Brand
44

55
require 5.006001; # <- also see postamble at the bottom for META.yml
66
use strict;

README

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Description:
1919
That process is described in the documentation.
2020

2121
Copying:
22-
Copyright (c) 2007-2024 H.Merijn Brand. All rights reserved.
22+
Copyright (c) 2007-2025 H.Merijn Brand. All rights reserved.
2323
Copyright (c) 1998-2001 Jochen Wiedmann. All rights reserved.
2424
Portions Copyright (c) 1997 Alan Citterman. All rights reserved.
2525

doc/CSV_XS.3

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
.\" ========================================================================
5959
.\"
6060
.IX Title "STDIN 1"
61-
.TH STDIN 1 2024-12-27 "perl v5.40.0" "User Contributed Perl Documentation"
61+
.TH STDIN 1 2025-01-03 "perl v5.40.0" "User Contributed Perl Documentation"
6262
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
6363
.\" way too many mistakes in technical documents.
6464
.if n .ad l
@@ -4073,7 +4073,7 @@ the documentation, fixed most RT bugs, added all the allow flags and the
40734073
.SH "COPYRIGHT AND LICENSE"
40744074
.IX Header "COPYRIGHT AND LICENSE"
40754075
.Vb 3
4076-
\& Copyright (C) 2007\-2024 H.Merijn Brand. All rights reserved.
4076+
\& Copyright (C) 2007\-2025 H.Merijn Brand. All rights reserved.
40774077
\& Copyright (C) 1998\-2001 Jochen Wiedmann. All rights reserved.
40784078
\& Copyright (C) 1997 Alan Citterman. All rights reserved.
40794079
.Ve

doc/CSV_XS.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3277,7 +3277,7 @@ <h1 id="AUTHOR">AUTHOR</h1>
32773277

32783278
<h1 id="COPYRIGHT-AND-LICENSE">COPYRIGHT AND LICENSE</h1>
32793279

3280-
<pre><code>Copyright (C) 2007-2024 H.Merijn Brand. All rights reserved.
3280+
<pre><code>Copyright (C) 2007-2025 H.Merijn Brand. All rights reserved.
32813281
Copyright (C) 1998-2001 Jochen Wiedmann. All rights reserved.
32823282
Copyright (C) 1997 Alan Citterman. All rights reserved.</code></pre>
32833283

doc/CSV_XS.man

+2-2
Original file line numberDiff line numberDiff line change
@@ -3287,11 +3287,11 @@ AUTHOR
32873287
"csv" function. See ChangeLog releases 0.25 and on.
32883288

32893289
COPYRIGHT AND LICENSE
3290-
Copyright (C) 2007-2024 H.Merijn Brand. All rights reserved.
3290+
Copyright (C) 2007-2025 H.Merijn Brand. All rights reserved.
32913291
Copyright (C) 1998-2001 Jochen Wiedmann. All rights reserved.
32923292
Copyright (C) 1997 Alan Citterman. All rights reserved.
32933293

32943294
This library is free software; you can redistribute and/or modify it
32953295
under the same terms as Perl itself.
32963296

3297-
perl v5.40.0 2024-12-27 STDIN(1)
3297+
perl v5.40.0 2025-01-03 STDIN(1)

doc/CSV_XS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3487,7 +3487,7 @@ the documentation, fixed most RT bugs, added all the allow flags and the
34873487

34883488
# COPYRIGHT AND LICENSE
34893489

3490-
Copyright (C) 2007-2024 H.Merijn Brand. All rights reserved.
3490+
Copyright (C) 2007-2025 H.Merijn Brand. All rights reserved.
34913491
Copyright (C) 1998-2001 Jochen Wiedmann. All rights reserved.
34923492
Copyright (C) 1997 Alan Citterman. All rights reserved.
34933493

doc/csv2xlsx.3

+22-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" -*- mode: troff; coding: utf-8 -*-
2-
.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.45)
2+
.\" Automatically generated by Pod::Man v6.0.2 (Pod::Simple 3.45)
33
.\"
44
.\" Standard preamble:
55
.\" ========================================================================
@@ -52,10 +52,13 @@
5252
. \}
5353
.\}
5454
.rr rF
55+
.\"
56+
.\" Required to disable full justification in groff 1.23.0.
57+
.if n .ds AD l
5558
.\" ========================================================================
5659
.\"
5760
.IX Title "STDIN 1"
58-
.TH STDIN 1 2024-04-11 "perl v5.38.2" "User Contributed Perl Documentation"
61+
.TH STDIN 1 2025-01-03 "perl v5.40.0" "User Contributed Perl Documentation"
5962
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
6063
.\" way too many mistakes in technical documents.
6164
.if n .ad l
@@ -86,7 +89,7 @@ The tool supports encoding, formula handle, date conversion and some more.
8689
.IP \-\-sep=S 2
8790
.IX Item "--sep=S"
8891
.PD
89-
use \f(CW\*(C`S\*(C'\fR as separator character, auto-detect, default = \f(CW\*(C`,\*(C'\fR.
92+
use \f(CW\*(C`S\*(C'\fR as separator character, auto\-detect, default = \f(CW\*(C`,\*(C'\fR.
9093
.Sp
9194
The literal string \f(CW\*(C`tab\*(C'\fR is allowed.
9295
.IP "\-q Q" 2
@@ -95,7 +98,7 @@ The literal string \f(CW\*(C`tab\*(C'\fR is allowed.
9598
.IP \-\-quo=Q 2
9699
.IX Item "--quo=Q"
97100
.PD
98-
use \f(CW\*(C`Q\*(C'\fR as quotation character, auto-detect, default = \f(CW\*(C`"\*(C'\fR.
101+
use \f(CW\*(C`Q\*(C'\fR as quotation character, auto\-detect, default = \f(CW\*(C`"\*(C'\fR.
99102
.Sp
100103
The literal string \f(CW\*(C`undef\*(C'\fR is allowed to disable quotation.
101104
.IP "\-e E" 2
@@ -104,7 +107,7 @@ The literal string \f(CW\*(C`undef\*(C'\fR is allowed to disable quotation.
104107
.IP \-\-esc=E 2
105108
.IX Item "--esc=E"
106109
.PD
107-
use \f(CW\*(C`E\*(C'\fR as escape character, auto-detect, default = \f(CW\*(C`"\*(C'\fR.
110+
use \f(CW\*(C`E\*(C'\fR as escape character, auto\-detect, default = \f(CW\*(C`"\*(C'\fR.
108111
.Sp
109112
The literal string \f(CW\*(C`undef\*(C'\fR is allowed to disable escapes.
110113
.IP "\-w W" 2
@@ -113,7 +116,7 @@ The literal string \f(CW\*(C`undef\*(C'\fR is allowed to disable escapes.
113116
.IP \-\-width=W 2
114117
.IX Item "--width=W"
115118
.PD
116-
Set column width. Default is to auto-size per column per sheet with a
119+
Set column width. Default is to auto\-size per column per sheet with a
117120
minimum width of \f(CW4\fR.
118121
.IP "\-o FILE.xlsx" 2
119122
.IX Item "-o FILE.xlsx"
@@ -123,7 +126,7 @@ minimum width of \f(CW4\fR.
123126
.IP \-\-out=FILE.xlsx 2
124127
.IX Item "--out=FILE.xlsx"
125128
.PD
126-
Specify the output filename. Default it the same name as the input-file
129+
Specify the output filename. Default it the same name as the input\-file
127130
where the trailing \f(CW\*(C`.csv\*(C'\fR will be replaced with \f(CW\*(C`.xlsx\*(C'\fR.
128131
.Sp
129132
If a filename can not be automatically generated, it will default to
@@ -190,7 +193,7 @@ Setting the font to \f(CW\*(C`mono\*(C'\fR, \f(CW\*(C`DejaVu Sans\*(C'\fR, or \f
190193
.IP \-\-font\-size=10 2
191194
.IX Item "--font-size=10"
192195
.PD
193-
Optional set the default font-size to anything other than the default 10.
196+
Optional set the default font\-size to anything other than the default 10.
194197
Must be a positive integer. No checks.
195198
.IP \-f 2
196199
.IX Item "-f"
@@ -205,7 +208,7 @@ Force usage of the output file if it already exists (unlink before use).
205208
.IP \-\-formulas 2
206209
.IX Item "--formulas"
207210
.PD
208-
Allow formula's. Otherwise fields starting with an equal sign \f(CW\*(C`=\*(C'\fR are
211+
Allow formula\*(Aqs. Otherwise fields starting with an equal sign \f(CW\*(C`=\*(C'\fR are
209212
forced to string type.
210213
.Sp
211214
There are several shortcuts here to specify different behavior:
@@ -215,22 +218,22 @@ There are several shortcuts here to specify different behavior:
215218
Define formula action: \f(CW\*(C`none\*(C'\fR/\f(CW\*(C`die\*(C'\fR/\f(CW\*(C`croak\*(C'\fR/\f(CW\*(C`diag\*(C'\fR/\f(CW\*(C`empty\*(C'\fR/\f(CW\*(C`undef\*(C'\fR
216219
.IP \-\-Ft 2
217220
.IX Item "--Ft"
218-
Formula's will be stored as text (formula actions: none)
221+
Formula\*(Aqs will be stored as text (formula actions: none)
219222
.IP \-\-Fd 2
220223
.IX Item "--Fd"
221-
Formula's will cause a die
224+
Formula\*(Aqs will cause a die
222225
.IP \-\-Fc 2
223226
.IX Item "--Fc"
224-
Formula's will cause a croak
227+
Formula\*(Aqs will cause a croak
225228
.IP \-\-FD 2
226229
.IX Item "--FD"
227-
Formula's will cause a warning (this is the default)
230+
Formula\*(Aqs will cause a warning (this is the default)
228231
.IP \-\-Fe 2
229232
.IX Item "--Fe"
230-
Formula's will be replaced by the empty string
233+
Formula\*(Aqs will be replaced by the empty string
231234
.IP \-\-Fu 2
232235
.IX Item "--Fu"
233-
Formula's will be replaced with an undefined cell
236+
Formula\*(Aqs will be replaced with an undefined cell
234237
.RE
235238
.RS 2
236239
.RE
@@ -242,22 +245,22 @@ Formula's will be replaced with an undefined cell
242245
.IP \-\-utf8 2
243246
.IX Item "--utf8"
244247
.PD
245-
CSV is UTF\-8 encoded. Likely not needed, as most is auto-detected.
248+
CSV is UTF\-8 encoded. Likely not needed, as most is auto\-detected.
246249
.IP \-\-de 2
247250
.IX Item "--de"
248251
.PD 0
249252
.IP \-\-fix\-utf8 2
250253
.IX Item "--fix-utf8"
251254
.PD
252-
Attempt to fix double-encoded UTF\-8. e.g. \f(CW\*(C`\ex{00c3}\ex{00ab}\*(C'\fR should have
255+
Attempt to fix double\-encoded UTF\-8. e.g. \f(CW\*(C`\ex{00c3}\ex{00ab}\*(C'\fR should have
253256
been \f(CW\*(C`\ex0100}\*(C'\fR. YMMV.
254257
.IP \-m 2
255258
.IX Item "-m"
256259
.PD 0
257260
.IP \-\-merge 2
258261
.IX Item "--merge"
259262
.PD
260-
Merge multiple CSV's into a single Excel (separate sheets).
263+
Merge multiple CSV\*(Aqs into a single Excel (separate sheets).
261264
.Sp
262265
With this option, the option \f(CW\*(C`\-o\*(C'\fR is required. All arguments should be
263266
existing files. Piping is not supported.
@@ -342,7 +345,7 @@ holds digits, do a numeric compare, otherwise do a string compare.
342345
.IP P 2
343346
.IX Item "P"
344347
pattern or literal string. Quotation might be required differing per OS and
345-
shell-environment.
348+
shell\-environment.
346349
.RE
347350
.RS 2
348351
.RE

doc/csv2xlsx.man

+21-21
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ OPTIONS
4545
-o FILE.xlsx
4646
-x FILE.xlsx
4747
--out=FILE.xlsx
48-
Specify the output filename. Default it the same name as the input-
49-
file where the trailing ".csv" will be replaced with ".xlsx".
48+
Specify the output filename. Default it the same name as the
49+
input-file where the trailing ".csv" will be replaced with ".xlsx".
5050

51-
If a filename can not be automatically generated, it will default to
51+
If a filename can not be automatically generated, it will default to
5252
"csv2xlsx.xlsx".
5353

5454
-d format
@@ -59,10 +59,10 @@ OPTIONS
5959
--date-col=range
6060
Only convert dates in columns "range". Default is everywhere.
6161

62-
Ranges are numeric, where the first column has index 1. A range is a
63-
definition of sections joined by ","s. A section is either a single
64-
column or a start/finish-pair joined with a dash. A missing finish
65-
index on the last segment is an open range (till the end of the
62+
Ranges are numeric, where the first column has index 1. A range is a
63+
definition of sections joined by ","s. A section is either a single
64+
column or a start/finish-pair joined with a dash. A missing finish
65+
index on the last segment is an open range (till the end of the
6666
line).
6767

6868
If the range is 0, date conversion is disabled.
@@ -78,7 +78,7 @@ OPTIONS
7878
-C '$:### ### ##0.00'
7979

8080
--font=Calibri
81-
You can set the default font. The XLSX writer used sets the default
81+
You can set the default font. The XLSX writer used sets the default
8282
font face to "Calibri".
8383

8484
--font=Arial
@@ -98,7 +98,7 @@ OPTIONS
9898

9999
-f
100100
--force
101-
Force usage of the output file if it already exists (unlink before
101+
Force usage of the output file if it already exists (unlink before
102102
use).
103103

104104
-F
@@ -136,14 +136,14 @@ OPTIONS
136136

137137
--de
138138
--fix-utf8
139-
Attempt to fix double-encoded UTF-8. e.g. "\x{00c3}\x{00ab}" should
139+
Attempt to fix double-encoded UTF-8. e.g. "\x{00c3}\x{00ab}" should
140140
have been "\x0100}". YMMV.
141141

142142
-m
143143
--merge
144144
Merge multiple CSV's into a single Excel (separate sheets).
145145

146-
With this option, the option "-o" is required. All arguments should
146+
With this option, the option "-o" is required. All arguments should
147147
be existing files. Piping is not supported.
148148

149149
--skip-empty
@@ -156,12 +156,12 @@ OPTIONS
156156

157157
-S CxP
158158
--split=CxP
159-
When dealing with big CSV datasets, this option enables you to split
160-
the data over several sheets. When all the "-S" options match in a
161-
single row, that row will be the first row of a new sheet. (see also
159+
When dealing with big CSV datasets, this option enables you to split
160+
the data over several sheets. When all the "-S" options match in a
161+
single row, that row will be the first row of a new sheet. (see also
162162
"--sl=C")
163163

164-
C The column that should be examined. "A" = 1. If lower case, the
164+
C The column that should be examined. "A" = 1. If lower case, the
165165
value of that column is matched case insensitive when appropriate.
166166

167167
-S 7=ab Column G is literal "ab"
@@ -192,8 +192,8 @@ OPTIONS
192192
-S G/. Column G is defined and not empty
193193

194194
< >
195-
Compare. If the value in the column is defined compare. If the
196-
values only holds digits, do a numeric compare, otherwise do a
195+
Compare. If the value in the column is defined compare. If the
196+
values only holds digits, do a numeric compare, otherwise do a
197197
string compare.
198198

199199
-S G<42 Column G is defined and less than 42 (numeric)
@@ -202,12 +202,12 @@ OPTIONS
202202
-S G>42 Column G is defined and greater than 42 (numeric)
203203
-S G>ab Column G is defined and greater than 42 (string)
204204

205-
P pattern or literal string. Quotation might be required differing
205+
P pattern or literal string. Quotation might be required differing
206206
per OS and shell-environment.
207207

208208
--sl=C
209209
When splitting with "-S" / "--split", if all criteria match and a new
210-
sheet is to be created, use the value in column "C" of the matching
210+
sheet is to be created, use the value in column "C" of the matching
211211
row as the new sheet label.
212212

213213
-v [V]
@@ -223,7 +223,7 @@ AUTHOR
223223
COPYRIGHT AND LICENSE
224224
Copyright (C) 2016-2023 H.Merijn Brand. All rights reserved.
225225

226-
This library is free software; you can redistribute and/or modify it
226+
This library is free software; you can redistribute and/or modify it
227227
under the same terms as Perl itself.
228228

229-
perl v5.38.2 2024-04-11 STDIN(1)
229+
perl v5.40.0 2025-01-03 STDIN(1)

examples/csv-check

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/pro/bin/perl
22

33
# csv-check: Check validity of CSV file and report
4-
# (m)'20 [21 May 2020] Copyright H.M.Brand 2007-2024
4+
# (m)'20 [21 May 2020] Copyright H.M.Brand 2007-2025
55

66
# This code requires the defined-or feature and PerlIO
77

examples/csv2xls

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/pro/bin/perl
22

33
# csv2xls: Convert csv to xls
4-
# (m)'23 [14 Nov 2023] Copyright H.M.Brand 2007-2024
4+
# (m)'23 [14 Nov 2023] Copyright H.M.Brand 2007-2025
55

66
use 5.012000;
77
use warnings;

examples/csv2xlsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/pro/bin/perl
22

33
# csv2xlsx: Convert csv to xlsx
4-
# (m)'23 Copyright H.M.Brand 2007-2024
4+
# (m)'23 Copyright H.M.Brand 2007-2025
55

66
use 5.014000;
77
use warnings;

0 commit comments

Comments
 (0)