Skip to content

Commit 477ff61

Browse files
authored
Merge pull request #533 from unidoc-build/prep-rc-v2.1.0
2 parents f70a935 + c068052 commit 477ff61

File tree

67 files changed

+64951
-64956
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+64951
-64956
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ DOCX/XLSX/PPTX.
4949

5050
## Installation ##
5151

52-
go get github.com/unidoc/unioffice/
52+
go get github.com/unidoc/unioffice/v2
5353

5454
## License key
5555
This software package (unioffice) is a commercial product and requires a license code to operate.

algo/algo.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
// Use of this source code is governed by the UniDoc End User License Agreement
1010
// terms that can be accessed at https://unidoc.io/eula/
1111

12-
package algo ;import _f "strconv";func _e (_c byte )bool {return _c >='0'&&_c <='9'};
12+
package algo ;import _g "strconv";func _ae (_b byte )bool {return _b >='0'&&_b <='9'};func RepeatString (s string ,cnt int )string {if cnt <=0{return "";};_aec :=make ([]byte ,len (s )*cnt );_bcb :=[]byte (s );for _ea :=0;_ea < cnt ;_ea ++{copy (_aec [_ea :],_bcb );
13+
};return string (_aec );};
1314

1415
// NaturalLess compares two strings in a human manner so rId2 sorts less than rId10
15-
func NaturalLess (lhs ,rhs string )bool {_b ,_fe :=0,0;for _b < len (lhs )&&_fe < len (rhs ){_a :=lhs [_b ];_ae :=rhs [_fe ];_fc :=_e (_a );_ca :=_e (_ae );switch {case _fc &&!_ca :return true ;case !_fc &&_ca :return false ;case !_fc &&!_ca :if _a !=_ae {return _a < _ae ;
16-
};_b ++;_fe ++;default:_fca :=_b +1;_ce :=_fe +1;for _fca < len (lhs )&&_e (lhs [_fca ]){_fca ++;};for _ce < len (rhs )&&_e (rhs [_ce ]){_ce ++;};_ad ,_ :=_f .ParseUint (lhs [_b :_fca ],10,64);_eg ,_ :=_f .ParseUint (rhs [_b :_ce ],10,64);if _ad !=_eg {return _ad < _eg ;
17-
};_b =_fca ;_fe =_ce ;};};return len (lhs )< len (rhs );};func RepeatString (s string ,cnt int )string {if cnt <=0{return "";};_ea :=make ([]byte ,len (s )*cnt );_ff :=[]byte (s );for _eae :=0;_eae < cnt ;_eae ++{copy (_ea [_eae :],_ff );};return string (_ea );
18-
};
16+
func NaturalLess (lhs ,rhs string )bool {_e ,_ac :=0,0;for _e < len (lhs )&&_ac < len (rhs ){_c :=lhs [_e ];_ab :=rhs [_ac ];_f :=_ae (_c );_ad :=_ae (_ab );switch {case _f &&!_ad :return true ;case !_f &&_ad :return false ;case !_f &&!_ad :if _c !=_ab {return _c < _ab ;
17+
};_e ++;_ac ++;default:_bf :=_e +1;_fg :=_ac +1;for _bf < len (lhs )&&_ae (lhs [_bf ]){_bf ++;};for _fg < len (rhs )&&_ae (rhs [_fg ]){_fg ++;};_gb ,_ :=_g .ParseUint (lhs [_e :_bf ],10,64);_bc ,_ :=_g .ParseUint (rhs [_e :_fg ],10,64);if _gb !=_bc {return _gb < _bc ;
18+
};_e =_bf ;_ac =_fg ;};};return len (lhs )< len (rhs );};

chart/chart.go

Lines changed: 450 additions & 445 deletions
Large diffs are not rendered by default.

color/color.go

Lines changed: 43 additions & 43 deletions
Large diffs are not rendered by default.

common/axcontrol/axcontrol.go

Lines changed: 350 additions & 353 deletions
Large diffs are not rendered by default.

common/common.go

Lines changed: 360 additions & 363 deletions
Large diffs are not rendered by default.

common/license/license.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,40 @@
1111

1212
// Package license helps manage commercial licenses and check if they
1313
// are valid for the version of UniOffice used.
14-
package license ;import _b "github.com/unidoc/unioffice/v2/internal/license";
14+
package license ;import _g "github.com/unidoc/unioffice/v2/internal/license";
1515

16-
// LicenseKey represents a loaded license key.
17-
type LicenseKey =_b .LicenseKey ;
18-
19-
// SetLicenseKey sets and validates the license key.
20-
func SetLicenseKey (content string ,customerName string )error {return _b .SetLicenseKey (content ,customerName );};
16+
// SetMeteredKey sets the metered License API key required for SaaS operation.
17+
// Document usage is reported periodically for the product to function correctly.
18+
func SetMeteredKey (apiKey string )error {return _g .SetMeteredKey (apiKey )};
2119

2220
// GetLicenseKey returns the currently loaded license key.
23-
func GetLicenseKey ()*LicenseKey {return _b .GetLicenseKey ()};const (LicenseTierUnlicensed =_b .LicenseTierUnlicensed ;LicenseTierCommunity =_b .LicenseTierCommunity ;LicenseTierIndividual =_b .LicenseTierIndividual ;LicenseTierBusiness =_b .LicenseTierBusiness ;
24-
);
21+
func GetLicenseKey ()*LicenseKey {return _g .GetLicenseKey ()};
2522

26-
// LegacyLicenseType is the type of license
27-
type LegacyLicenseType =_b .LegacyLicenseType ;
23+
// SetMeteredKeyUsageLogVerboseMode sets the metered License API Key usage log verbose mode.
24+
// Default value `false`, set to `true` will log the credit usages and print out to console with log level INFO.
25+
func SetMeteredKeyUsageLogVerboseMode (val bool ){_g .SetMeteredKeyUsageLogVerboseMode (val )};
2826

29-
// MakeUnlicensedKey returns a default key.
30-
func MakeUnlicensedKey ()*LicenseKey {return _b .MakeUnlicensedKey ()};
27+
// LicenseKey represents a loaded license key.
28+
type LicenseKey =_g .LicenseKey ;
3129

32-
// SetMeteredKey sets the metered License API key required for SaaS operation.
33-
// Document usage is reported periodically for the product to function correctly.
34-
func SetMeteredKey (apiKey string )error {return _b .SetMeteredKey (apiKey )};
30+
// LegacyLicenseType is the type of license
31+
type LegacyLicenseType =_g .LegacyLicenseType ;
3532

3633
// SetMeteredKeyPersistentCache sets the metered License API Key persistent cache.
3734
// Default value `true`, set to `false` will report the usage immediately to license server,
3835
// this can be used when there's no access to persistent data storage.
39-
func SetMeteredKeyPersistentCache (val bool ){_b .SetMeteredKeyPersistentCache (val )};
36+
func SetMeteredKeyPersistentCache (val bool ){_g .SetMeteredKeyPersistentCache (val )};
4037

41-
// SetMeteredKeyUsageLogVerboseMode sets the metered License API Key usage log verbose mode.
42-
// Default value `false`, set to `true` will log the credit usages and print out to console with log level INFO.
43-
func SetMeteredKeyUsageLogVerboseMode (val bool ){_b .SetMeteredKeyUsageLogVerboseMode (val )};
38+
// SetLicenseKey sets and validates the license key.
39+
func SetLicenseKey (content string ,customerName string )error {return _g .SetLicenseKey (content ,customerName );};
40+
41+
// MakeUnlicensedKey returns a default key.
42+
func MakeUnlicensedKey ()*LicenseKey {return _g .MakeUnlicensedKey ()};
4443

4544
// GetMeteredState checks the currently used metered document usage status,
4645
// documents used and credits available.
47-
func GetMeteredState ()(_b .MeteredStatus ,error ){return _b .GetMeteredState ()};
46+
func GetMeteredState ()(_g .MeteredStatus ,error ){return _g .GetMeteredState ()};const (LicenseTierUnlicensed =_g .LicenseTierUnlicensed ;LicenseTierCommunity =_g .LicenseTierCommunity ;LicenseTierIndividual =_g .LicenseTierIndividual ;LicenseTierBusiness =_g .LicenseTierBusiness ;
47+
);
4848

4949
// LegacyLicense holds the old-style unioffice license information.
50-
type LegacyLicense =_b .LegacyLicense ;
50+
type LegacyLicense =_g .LegacyLicense ;

common/logger/logger.go

Lines changed: 59 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -9,96 +9,97 @@
99
// Use of this source code is governed by the UniDoc End User License Agreement
1010
// terms that can be accessed at https://unidoc.io/eula/
1111

12-
package logger ;import (_f "fmt";_cb "io";_d "os";_b "path/filepath";_c "runtime";);func _ddg (_bc _cb .Writer ,_bca string ,_ecf string ,_geg ...interface{}){_ ,_eca ,_eag ,_ggd :=_c .Caller (3);if !_ggd {_eca ="\u003f\u003f\u003f";_eag =0;}else {_eca =_b .Base (_eca );
13-
};_ag :=_f .Sprintf ("\u0025s\u0020\u0025\u0073\u003a\u0025\u0064 ",_bca ,_eca ,_eag )+_ecf +"\u000a";_f .Fprintf (_bc ,_ag ,_geg ...);};
12+
package logger ;import (_g "fmt";_ag "io";_ce "os";_c "path/filepath";_ae "runtime";);const (LogLevelTrace LogLevel =5;LogLevelDebug LogLevel =4;LogLevelInfo LogLevel =3;LogLevelNotice LogLevel =2;LogLevelWarning LogLevel =1;LogLevelError LogLevel =0;);
1413

15-
// IsLogLevel returns true from dummy logger.
16-
func (DummyLogger )IsLogLevel (level LogLevel )bool {return true };
17-
18-
// Notice does nothing for dummy logger.
19-
func (DummyLogger )Notice (format string ,args ...interface{}){};
20-
21-
// Trace logs trace message.
22-
func (_df ConsoleLogger )Trace (format string ,args ...interface{}){if _df .LogLevel >=LogLevelTrace {_ab :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_df .output (_d .Stdout ,_ab ,format ,args ...);};};
23-
24-
// Error logs error message.
25-
func (_a ConsoleLogger )Error (format string ,args ...interface{}){if _a .LogLevel >=LogLevelError {_ce :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_a .output (_d .Stdout ,_ce ,format ,args ...);};};
2614

2715
// Warning does nothing for dummy logger.
2816
func (DummyLogger )Warning (format string ,args ...interface{}){};
2917

30-
// Notice logs notice message.
31-
func (_dgf ConsoleLogger )Notice (format string ,args ...interface{}){if _dgf .LogLevel >=LogLevelNotice {_gbc :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_dgf .output (_d .Stdout ,_gbc ,format ,args ...);};};
32-
3318
// ConsoleLogger is a logger that writes logs to the 'os.Stdout'
3419
type ConsoleLogger struct{LogLevel LogLevel ;};
3520

36-
// Debug logs debug message.
37-
func (_dde ConsoleLogger )Debug (format string ,args ...interface{}){if _dde .LogLevel >=LogLevelDebug {_aa :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_dde .output (_d .Stdout ,_aa ,format ,args ...);};};
21+
// NewWriterLogger creates new 'writer' logger.
22+
func NewWriterLogger (logLevel LogLevel ,writer _ag .Writer )*WriterLogger {logger :=WriterLogger {Output :writer ,LogLevel :logLevel };return &logger ;};
3823

39-
// NewConsoleLogger creates new console logger.
40-
func NewConsoleLogger (logLevel LogLevel )*ConsoleLogger {return &ConsoleLogger {LogLevel :logLevel }};
24+
// Error logs error message.
25+
func (_gb ConsoleLogger )Error (format string ,args ...interface{}){if _gb .LogLevel >=LogLevelError {_ddc :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_gb .output (_ce .Stdout ,_ddc ,format ,args ...);};};
4126

42-
// Trace does nothing for dummy logger.
43-
func (DummyLogger )Trace (format string ,args ...interface{}){};var Log Logger =DummyLogger {};
27+
// LogLevel is the verbosity level for logging.
28+
type LogLevel int ;
29+
30+
// Notice does nothing for dummy logger.
31+
func (DummyLogger )Notice (format string ,args ...interface{}){};
32+
33+
// Warning logs warning message.
34+
func (_gbg WriterLogger )Warning (format string ,args ...interface{}){if _gbg .LogLevel >=LogLevelWarning {_bd :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_gbg .logToWriter (_gbg .Output ,_bd ,format ,args ...);};};
35+
36+
// Info logs info message.
37+
func (_ea WriterLogger )Info (format string ,args ...interface{}){if _ea .LogLevel >=LogLevelInfo {_ceb :="\u005bI\u004e\u0046\u004f\u005d\u0020";_ea .logToWriter (_ea .Output ,_ceb ,format ,args ...);};};
4438

4539
// DummyLogger does nothing.
4640
type DummyLogger struct{};
4741

48-
// NewWriterLogger creates new 'writer' logger.
49-
func NewWriterLogger (logLevel LogLevel ,writer _cb .Writer )*WriterLogger {logger :=WriterLogger {Output :writer ,LogLevel :logLevel };return &logger ;};
42+
// Debug logs debug message.
43+
func (_db ConsoleLogger )Debug (format string ,args ...interface{}){if _db .LogLevel >=LogLevelDebug {_ac :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_db .output (_ce .Stdout ,_ac ,format ,args ...);};};
5044

51-
// Warning logs warning message.
52-
func (_ac ConsoleLogger )Warning (format string ,args ...interface{}){if _ac .LogLevel >=LogLevelWarning {_bf :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_ac .output (_d .Stdout ,_bf ,format ,args ...);};};
45+
// IsLogLevel returns true from dummy logger.
46+
func (DummyLogger )IsLogLevel (level LogLevel )bool {return true };
5347

54-
// Error does nothing for dummy logger.
55-
func (DummyLogger )Error (format string ,args ...interface{}){};func (_fc ConsoleLogger )output (_fd _cb .Writer ,_fe string ,_bg string ,_fa ...interface{}){_ddg (_fd ,_fe ,_bg ,_fa ...);};
48+
// Debug does nothing for dummy logger.
49+
func (DummyLogger )Debug (format string ,args ...interface{}){};
5650

57-
// Error logs error message.
58-
func (_ae WriterLogger )Error (format string ,args ...interface{}){if _ae .LogLevel >=LogLevelError {_ee :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_ae .logToWriter (_ae .Output ,_ee ,format ,args ...);};};
51+
// Info logs info message.
52+
func (_f ConsoleLogger )Info (format string ,args ...interface{}){if _f .LogLevel >=LogLevelInfo {_cad :="\u005bI\u004e\u0046\u004f\u005d\u0020";_f .output (_ce .Stdout ,_cad ,format ,args ...);};};func (_cg WriterLogger )logToWriter (_dac _ag .Writer ,_ff string ,_gg string ,_eb ...interface{}){_abc (_dac ,_ff ,_gg ,_eb );
53+
};
5954

6055
// IsLogLevel returns true if log level is greater or equal than `level`.
6156
// Can be used to avoid resource intensive calls to loggers.
62-
func (_gea ConsoleLogger )IsLogLevel (level LogLevel )bool {return _gea .LogLevel >=level };
57+
func (_bfa ConsoleLogger )IsLogLevel (level LogLevel )bool {return _bfa .LogLevel >=level };
6358

64-
// WriterLogger is the logger that writes data to the Output writer
65-
type WriterLogger struct{LogLevel LogLevel ;Output _cb .Writer ;};
66-
67-
// LogLevel is the verbosity level for logging.
68-
type LogLevel int ;func (_bd WriterLogger )logToWriter (_dda _cb .Writer ,_cf string ,_gd string ,_faf ...interface{}){_ddg (_dda ,_cf ,_gd ,_faf );};
59+
// Debug logs debug message.
60+
func (_bfcd WriterLogger )Debug (format string ,args ...interface{}){if _bfcd .LogLevel >=LogLevelDebug {_ba :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_bfcd .logToWriter (_bfcd .Output ,_ba ,format ,args ...);};};func _abc (_cga _ag .Writer ,_dbd string ,_aee string ,_eg ...interface{}){_ ,_gdf ,_gea ,_fd :=_ae .Caller (3);
61+
if !_fd {_gdf ="\u003f\u003f\u003f";_gea =0;}else {_gdf =_c .Base (_gdf );};_ec :=_g .Sprintf ("\u0025s\u0020\u0025\u0073\u003a\u0025\u0064 ",_dbd ,_gdf ,_gea )+_aee +"\u000a";_g .Fprintf (_cga ,_ec ,_eg ...);};
6962

7063
// Notice logs notice message.
71-
func (_fb WriterLogger )Notice (format string ,args ...interface{}){if _fb .LogLevel >=LogLevelNotice {_gg :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_fb .logToWriter (_fb .Output ,_gg ,format ,args ...);};};
64+
func (_bfc ConsoleLogger )Notice (format string ,args ...interface{}){if _bfc .LogLevel >=LogLevelNotice {_cec :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_bfc .output (_ce .Stdout ,_cec ,format ,args ...);};};
7265

73-
// Info logs info message.
74-
func (_cd ConsoleLogger )Info (format string ,args ...interface{}){if _cd .LogLevel >=LogLevelInfo {_dgfa :="\u005bI\u004e\u0046\u004f\u005d\u0020";_cd .output (_d .Stdout ,_dgfa ,format ,args ...);};};
66+
// Info does nothing for dummy logger.
67+
func (DummyLogger )Info (format string ,args ...interface{}){};
7568

76-
// Trace logs trace message.
77-
func (_fec WriterLogger )Trace (format string ,args ...interface{}){if _fec .LogLevel >=LogLevelTrace {_cc :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_fec .logToWriter (_fec .Output ,_cc ,format ,args ...);};};
69+
// Error logs error message.
70+
func (_cd WriterLogger )Error (format string ,args ...interface{}){if _cd .LogLevel >=LogLevelError {_fc :="\u005b\u0045\u0052\u0052\u004f\u0052\u005d\u0020";_cd .logToWriter (_cd .Output ,_fc ,format ,args ...);};};
7871

79-
// Info logs info message.
80-
func (_fba WriterLogger )Info (format string ,args ...interface{}){if _fba .LogLevel >=LogLevelInfo {_abf :="\u005bI\u004e\u0046\u004f\u005d\u0020";_fba .logToWriter (_fba .Output ,_abf ,format ,args ...);};};const (LogLevelTrace LogLevel =5;LogLevelDebug LogLevel =4;
81-
LogLevelInfo LogLevel =3;LogLevelNotice LogLevel =2;LogLevelWarning LogLevel =1;LogLevelError LogLevel =0;);
72+
// NewConsoleLogger creates new console logger.
73+
func NewConsoleLogger (logLevel LogLevel )*ConsoleLogger {return &ConsoleLogger {LogLevel :logLevel }};
8274

83-
// Debug logs debug message.
84-
func (_be WriterLogger )Debug (format string ,args ...interface{}){if _be .LogLevel >=LogLevelDebug {_ed :="\u005b\u0044\u0045\u0042\u0055\u0047\u005d\u0020";_be .logToWriter (_be .Output ,_ed ,format ,args ...);};};
75+
// Warning logs warning message.
76+
func (_dc ConsoleLogger )Warning (format string ,args ...interface{}){if _dc .LogLevel >=LogLevelWarning {_e :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_dc .output (_ce .Stdout ,_e ,format ,args ...);};};
8577

86-
// Debug does nothing for dummy logger.
87-
func (DummyLogger )Debug (format string ,args ...interface{}){};
78+
// Error does nothing for dummy logger.
79+
func (DummyLogger )Error (format string ,args ...interface{}){};
80+
81+
// Trace logs trace message.
82+
func (_afd ConsoleLogger )Trace (format string ,args ...interface{}){if _afd .LogLevel >=LogLevelTrace {_ee :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_afd .output (_ce .Stdout ,_ee ,format ,args ...);};};
83+
84+
// IsLogLevel returns true if log level is greater or equal than `level`.
85+
// Can be used to avoid resource intensive calls to loggers.
86+
func (_ga WriterLogger )IsLogLevel (level LogLevel )bool {return _ga .LogLevel >=level };func (_fg ConsoleLogger )output (_dae _ag .Writer ,_bb string ,_agb string ,_bg ...interface{}){_abc (_dae ,_bb ,_agb ,_bg ...);};
87+
88+
// Trace does nothing for dummy logger.
89+
func (DummyLogger )Trace (format string ,args ...interface{}){};var Log Logger =DummyLogger {};
8890

8991
// SetLogger sets 'logger' to be used by the unidoc unipdf library.
9092
func SetLogger (logger Logger ){Log =logger };
9193

92-
// Info does nothing for dummy logger.
93-
func (DummyLogger )Info (format string ,args ...interface{}){};
94+
// Trace logs trace message.
95+
func (_ge WriterLogger )Trace (format string ,args ...interface{}){if _ge .LogLevel >=LogLevelTrace {_ab :="\u005b\u0054\u0052\u0041\u0043\u0045\u005d\u0020";_ge .logToWriter (_ge .Output ,_ab ,format ,args ...);};};
9496

95-
// Logger is the interface used for logging in the unipdf package.
96-
type Logger interface{Error (_dd string ,_ge ...interface{});Warning (_gec string ,_da ...interface{});Notice (_e string ,_gef ...interface{});Info (_ea string ,_de ...interface{});Debug (_dg string ,_gb ...interface{});Trace (_eg string ,_ba ...interface{});
97-
IsLogLevel (_fg LogLevel )bool ;};
97+
// Notice logs notice message.
98+
func (_ddb WriterLogger )Notice (format string ,args ...interface{}){if _ddb .LogLevel >=LogLevelNotice {_dde :="\u005bN\u004f\u0054\u0049\u0043\u0045\u005d ";_ddb .logToWriter (_ddb .Output ,_dde ,format ,args ...);};};
9899

99-
// IsLogLevel returns true if log level is greater or equal than `level`.
100-
// Can be used to avoid resource intensive calls to loggers.
101-
func (_ec WriterLogger )IsLogLevel (level LogLevel )bool {return _ec .LogLevel >=level };
100+
// Logger is the interface used for logging in the unipdf package.
101+
type Logger interface{Error (_ca string ,_d ...interface{});Warning (_af string ,_cb ...interface{});Notice (_cf string ,_cbb ...interface{});Info (_b string ,_gd ...interface{});Debug (_da string ,_be ...interface{});Trace (_de string ,_bf ...interface{});
102+
IsLogLevel (_dd LogLevel )bool ;};
102103

103-
// Warning logs warning message.
104-
func (_ad WriterLogger )Warning (format string ,args ...interface{}){if _ad .LogLevel >=LogLevelWarning {_dad :="\u005b\u0057\u0041\u0052\u004e\u0049\u004e\u0047\u005d\u0020";_ad .logToWriter (_ad .Output ,_dad ,format ,args ...);};};
104+
// WriterLogger is the logger that writes data to the Output writer
105+
type WriterLogger struct{LogLevel LogLevel ;Output _ag .Writer ;};

0 commit comments

Comments
 (0)