diff --git a/UnicodePlot.html b/UnicodePlot.html index a2db652..8e79f62 100644 --- a/UnicodePlot.html +++ b/UnicodePlot.html @@ -241,7 +241,7 @@ diff --git a/YouPlot.html b/YouPlot.html index 3ccd0d4..489f06b 100644 --- a/YouPlot.html +++ b/YouPlot.html @@ -296,7 +296,7 @@ diff --git a/YouPlot/Backends.html b/YouPlot/Backends.html index c314d9e..5d76226 100644 --- a/YouPlot/Backends.html +++ b/YouPlot/Backends.html @@ -118,7 +118,7 @@ diff --git a/YouPlot/Backends/Processing.html b/YouPlot/Backends/Processing.html index 31c0340..8f9e760 100644 --- a/YouPlot/Backends/Processing.html +++ b/YouPlot/Backends/Processing.html @@ -208,7 +208,7 @@ diff --git a/YouPlot/Backends/UnicodePlot.html b/YouPlot/Backends/UnicodePlot.html index 85ab8f3..226b056 100644 --- a/YouPlot/Backends/UnicodePlot.html +++ b/YouPlot/Backends/UnicodePlot.html @@ -1070,7 +1070,7 @@ diff --git a/YouPlot/Backends/UnicodePlot/Error.html b/YouPlot/Backends/UnicodePlot/Error.html index 76b2490..f90df5b 100644 --- a/YouPlot/Backends/UnicodePlot/Error.html +++ b/YouPlot/Backends/UnicodePlot/Error.html @@ -114,7 +114,7 @@ diff --git a/YouPlot/Command.html b/YouPlot/Command.html index f77ac40..28a4ef3 100644 --- a/YouPlot/Command.html +++ b/YouPlot/Command.html @@ -767,7 +767,7 @@ diff --git a/YouPlot/DSV.html b/YouPlot/DSV.html index 8e1f839..28fb723 100644 --- a/YouPlot/DSV.html +++ b/YouPlot/DSV.html @@ -460,7 +460,7 @@ diff --git a/YouPlot/Data.html b/YouPlot/Data.html index 090ca50..98c7c0e 100644 --- a/YouPlot/Data.html +++ b/YouPlot/Data.html @@ -300,7 +300,7 @@ diff --git a/YouPlot/Options.html b/YouPlot/Options.html index 3cdd47b..1b130e8 100644 --- a/YouPlot/Options.html +++ b/YouPlot/Options.html @@ -1103,7 +1103,7 @@ diff --git a/YouPlot/Parameters.html b/YouPlot/Parameters.html index 1c67f53..68d8bcc 100644 --- a/YouPlot/Parameters.html +++ b/YouPlot/Parameters.html @@ -1881,7 +1881,7 @@ diff --git a/YouPlot/Parser.html b/YouPlot/Parser.html index 5aedaa2..d1af34d 100644 --- a/YouPlot/Parser.html +++ b/YouPlot/Parser.html @@ -1241,7 +1241,11 @@ 49 50 51 -52 +52 +53 +54 +55 +56 
# File 'lib/youplot/parser.rb', line 43
@@ -1252,8 +1256,12 @@
   paths << ENV['MYYOUPLOTRC'] if ENV['MYYOUPLOTRC']
   paths << '.youplot.yml'
   paths << '.youplotrc'
-  paths << File.join(ENV['HOME'], '.youplotrc') if ENV['HOME']
-  paths << File.join(ENV['HOME'], '.youplot.yml') if ENV['HOME']
+  if ENV['HOME']
+    paths << File.join(ENV['HOME'], '.youplotrc')
+    paths << File.join(ENV['HOME'], '.youplot.yml')
+    paths << File.join(ENV['HOME'], '.config', 'youplot', 'youplotrc')
+    paths << File.join(ENV['HOME'], '.config', 'youplot', 'youplot.yml')
+  end
   paths
 end
@@ -1276,10 +1284,6 @@ 
 
 
-71
-72
-73
-74
 75
 76
 77
@@ -1290,10 +1294,14 @@
 82
 83
 84
-85
+85 +86 +87 +88 +89 - 
# File 'lib/youplot/parser.rb', line 71
+      
# File 'lib/youplot/parser.rb', line 75
 
 def configure
   option_members = @options.members
@@ -1330,10 +1338,6 @@
       
 
 
-87
-88
-89
-90
 91
 92
 93
@@ -1409,10 +1413,14 @@
 163
 164
 165
-166

+166
+167
+168
+169
+170

     
     
-      
# File 'lib/youplot/parser.rb', line 87
+      
# File 'lib/youplot/parser.rb', line 91
 
 def create_base_parser
   OptionParser.new do |parser|
@@ -1514,10 +1522,6 @@
       
 
 
-168
-169
-170
-171
 172
 173
 174
@@ -1552,10 +1556,14 @@
 203
 204
 205
-206

+206
+207
+208
+209
+210

     
     
-      
# File 'lib/youplot/parser.rb', line 168
+      
# File 'lib/youplot/parser.rb', line 172
 
 def create_main_parser
   @main_parser = create_base_parser
@@ -1616,11 +1624,6 @@
       
 
 
-285
-286
-287
-288
-289
 290
 291
 292
@@ -1705,10 +1708,15 @@
 371
 372
 373
-374

+374
+375
+376
+377
+378
+379

     
     
-      
# File 'lib/youplot/parser.rb', line 285
+      
# File 'lib/youplot/parser.rb', line 290
 
 def create_sub_parser
   @sub_parser = create_base_parser
@@ -1820,20 +1828,20 @@
       
 
 
-54
-55
-56
-57
 58
 59
 60
 61
 62
 63
-64

+64
+65
+66
+67
+68

     
     
-      
# File 'lib/youplot/parser.rb', line 54
+      
# File 'lib/youplot/parser.rb', line 58
 
 def find_config_file
   config_file_candidate_paths.each do |file|
@@ -1866,11 +1874,6 @@
       
 
 
-376
-377
-378
-379
-380
 381
 382
 383
@@ -1882,10 +1885,15 @@
 389
 390
 391
-392

+392
+393
+394
+395
+396
+397

     
     
-      
# File 'lib/youplot/parser.rb', line 376
+      
# File 'lib/youplot/parser.rb', line 381
 
 def parse_options(argv = ARGV)
   begin
@@ -1924,13 +1932,13 @@
       
 
 
-66
-67
-68
-69

+70
+71
+72
+73

     
     
-      
# File 'lib/youplot/parser.rb', line 66
+      
# File 'lib/youplot/parser.rb', line 70
 
 def read_config_file
   require 'yaml'
@@ -1956,10 +1964,6 @@
       
 
 
-214
-215
-216
-217
 218
 219
 220
@@ -1971,10 +1975,15 @@
 226
 227
 228
-229

+229
+230
+231
+232
+233
+234

     
     
-      
# File 'lib/youplot/parser.rb', line 214
+      
# File 'lib/youplot/parser.rb', line 218
 
 def show_config_info
   if ENV['MYYOUPLOTRC']
@@ -1982,12 +1991,13 @@
     puts config.inspect
   else
     puts <<~EOS
-      You don't have a config file. The default config file paths are:
-      ./.youplot.yml, ./.youplotrc, ~/.youplot.yml, ~/.youplotrc
-      You can specify a config file with the environment variable MYYOUPLOTRC.
-      File format is YAML. For example:
-      width : 40
-      height : 20
+      Configuration file not found.
+      It should be a YAML file, like this example:
+        width : 40
+        height : 20
+      By default, YouPlot will look for the configuration file in these locations:
+      #{config_file_candidate_paths.map { |s| '  ' + s }.join("\n")}
+      If you have the file elsewhere, you can specify its location with the `MYYOUPLOTRC` environment variable..
     EOS
   end
   exit if YouPlot.run_as_executable?
@@ -2012,14 +2022,14 @@
       
 
 
-208
-209
-210
-211
-212

+212
+213
+214
+215
+216

     
     
-      
# File 'lib/youplot/parser.rb', line 208
+      
# File 'lib/youplot/parser.rb', line 212
 
 def show_main_help(out = $stdout)
   out.puts main_parser.banner
@@ -2046,15 +2056,15 @@
       
 
 
-244
-245
-246
-247
-248
-249

+249
+250
+251
+252
+253
+254

     
     
-      
# File 'lib/youplot/parser.rb', line 244
+      
# File 'lib/youplot/parser.rb', line 249
 
 def sub_parser_add_canvas
   canvas_types = UnicodePlot::Canvas::CANVAS_CLASS_MAP.keys.join(', ')
@@ -2082,16 +2092,16 @@
       
 
 
-269
-270
-271
-272
-273
 274
-275

+275
+276
+277
+278
+279
+280

     
     
-      
# File 'lib/youplot/parser.rb', line 269
+      
# File 'lib/youplot/parser.rb', line 274
 
 def sub_parser_add_fmt_xyxy
   sub_parser.on_head('--fmt STR', String,
@@ -2120,16 +2130,16 @@
       
 
 
-277
-278
-279
-280
-281
 282
-283

+283
+284
+285
+286
+287
+288

     
     
-      
# File 'lib/youplot/parser.rb', line 277
+      
# File 'lib/youplot/parser.rb', line 282
 
 def sub_parser_add_fmt_yx
   sub_parser.on_head('--fmt STR', String,
@@ -2158,14 +2168,14 @@
       
 
 
-263
-264
-265
-266
-267

+268
+269
+270
+271
+272

     
     
-      
# File 'lib/youplot/parser.rb', line 263
+      
# File 'lib/youplot/parser.rb', line 268
 
 def sub_parser_add_grid
   sub_parser.on_head('--[no-]grid', TrueClass, 'draws grid-lines at the origin') do |v|
@@ -2192,14 +2202,14 @@
       
 
 
-231
-232
-233
-234
-235

+236
+237
+238
+239
+240

     
     
-      
# File 'lib/youplot/parser.rb', line 231
+      
# File 'lib/youplot/parser.rb', line 236
 
 def sub_parser_add_symbol
   sub_parser.on_head('--symbol STR', String, 'character to be used to plot the bars') do |v|
@@ -2226,14 +2236,14 @@
       
 
 
-251
-252
-253
-254
-255

+256
+257
+258
+259
+260

     
     
-      
# File 'lib/youplot/parser.rb', line 251
+      
# File 'lib/youplot/parser.rb', line 256
 
 def sub_parser_add_xlim
   sub_parser.on_head('--xlim FLOAT,FLOAT', Array, 'plotting range for the x coordinate') do |v|
@@ -2260,15 +2270,15 @@
       
 
 
-237
-238
-239
-240
-241
-242

+242
+243
+244
+245
+246
+247

     
     
-      
# File 'lib/youplot/parser.rb', line 237
+      
# File 'lib/youplot/parser.rb', line 242
 
 def sub_parser_add_xscale
   xscale_options = UnicodePlot::ValueTransformer::PREDEFINED_TRANSFORM_FUNCTIONS.keys.join(', ')
@@ -2296,14 +2306,14 @@
       
 
 
-257
-258
-259
-260
-261

+262
+263
+264
+265
+266

     
     
-      
# File 'lib/youplot/parser.rb', line 257
+      
# File 'lib/youplot/parser.rb', line 262
 
 def sub_parser_add_ylim
   sub_parser.on_head('--ylim FLOAT,FLOAT', Array, 'plotting range for the y coordinate') do |v|
@@ -2320,7 +2330,7 @@
 
 
       
diff --git a/YouPlot/Parser/Error.html b/YouPlot/Parser/Error.html
index 847a492..af29fc8 100644
--- a/YouPlot/Parser/Error.html
+++ b/YouPlot/Parser/Error.html
@@ -114,7 +114,7 @@
 
 
       
diff --git a/_index.html b/_index.html
index 779f0a2..31dd5e1 100644
--- a/_index.html
+++ b/_index.html
@@ -238,7 +238,7 @@
 
 
       
diff --git a/file.README.html b/file.README.html
index f7e1535..81b6f3f 100644
--- a/file.README.html
+++ b/file.README.html
@@ -404,7 +404,7 @@ If so, please feel free to contact us.
 
 
       
diff --git a/index.html b/index.html
index a7af0c3..98d8aae 100644
--- a/index.html
+++ b/index.html
@@ -404,7 +404,7 @@ If so, please feel free to contact us.
 
 
       
diff --git a/top-level-namespace.html b/top-level-namespace.html
index 6aa5208..728319d 100644
--- a/top-level-namespace.html
+++ b/top-level-namespace.html
@@ -100,7 +100,7 @@