diff --git a/bin/lessc b/bin/lessc index 11963cbc..9ee3609a 100755 --- a/bin/lessc +++ b/bin/lessc @@ -54,6 +54,7 @@ var checkBooleanArg = function(arg) { }; var warningMessages = ""; +var sourceMapFileInline = false; args = args.filter(function (arg) { var match; @@ -159,7 +160,11 @@ args = args.filter(function (arg) { options.sourceMapBasepath = match[2]; } break; - case 'source-map-inline': + case 'source-map-map-inline': + sourceMapFileInline = true; + options.sourceMap = true; + break; + case 'source-map-less-inline': options.outputSourceFiles = true; break; case 'rp': @@ -209,7 +214,7 @@ if (output) { options.sourceMapBasepath = options.sourceMapBasepath || (input ? path.dirname(input) : process.cwd()); if (options.sourceMap === true) { - if (!output) { + if (!output && !sourceMapFileInline) { console.log("the sourcemap option only has an optional filename if the css filename is given"); return; } @@ -247,7 +252,7 @@ if (options.depends) { sys.print(outputbase + ": "); } -if (options.sourceMap !== "inline") { +if (!sourceMapFileInline) { var writeSourceMap = function(output) { var filename = options.sourceMapFullFilename || options.sourceMap; ensureDirectory(filename); diff --git a/lib/less/lessc_helper.js b/lib/less/lessc_helper.js index bbbbf4d4..1581f3e8 100644 --- a/lib/less/lessc_helper.js +++ b/lib/less/lessc_helper.js @@ -26,42 +26,45 @@ var lessc_helper = { console.log("If source is set to `-' (dash or hyphen-minus), input is read from stdin."); console.log(""); console.log("options:"); - console.log(" -h, --help Print help (this message) and exit."); - console.log(" --include-path=PATHS Set include paths. Separated by `:'. Use `;' on Windows."); - console.log(" -M, --depends Output a makefile import dependency list to stdout"); - console.log(" --no-color Disable colorized output."); - console.log(" --no-ie-compat Disable IE compatibility checks."); - console.log(" --no-js Disable JavaScript in less files"); - console.log(" -l, --lint Syntax check only (lint)."); - console.log(" -s, --silent Suppress output of error messages."); - console.log(" --strict-imports Force evaluation of imports."); - console.log(" --insecure Allow imports from insecure https hosts."); - console.log(" --verbose Be verbose."); - console.log(" -v, --version Print version number and exit."); - console.log(" -x, --compress Compress output by removing some whitespaces."); - console.log(" --clean-css Compress output using clean-css"); - console.log(" -O0, -O1, -O2 Set the parser's optimization level. The lower"); - console.log(" the number, the less nodes it will create in the"); - console.log(" tree. This could matter for debugging, or if you"); - console.log(" want to access the individual nodes in the tree."); - console.log(" --line-numbers=TYPE Outputs filename and line numbers."); - console.log(" TYPE can be either 'comments', which will output"); - console.log(" the debug info within comments, 'mediaquery'"); - console.log(" that will output the information within a fake"); - console.log(" media query which is compatible with the SASS"); - console.log(" format, and 'all' which will do both."); - console.log(" --source-map[=FILENAME] Outputs a v3 sourcemap to the filename (or output filename.map)"); - console.log(" --source-map-rootpath=X adds this path onto the sourcemap filename and less file paths"); - console.log(" --source-map-basepath=X Sets sourcemap base path, defaults to current working directory."); - console.log(" --source-map-inline puts the less files into the map instead of referencing them"); - console.log(" -rp, --rootpath=URL Set rootpath for url rewriting in relative imports and urls."); - console.log(" Works with or without the relative-urls option."); - console.log(" -ru, --relative-urls re-write relative urls to the base less file."); - console.log(" -sm=on|off Turn on or off strict math, where in strict mode, math"); - console.log(" --strict-math=on|off requires brackets. This option may default to on and then"); - console.log(" be removed in the future."); - console.log(" -su=on|off Allow mixed units, e.g. 1px+1em or 1px*1px which have units"); - console.log(" --strict-units=on|off that cannot be represented."); + console.log(" -h, --help Print help (this message) and exit."); + console.log(" --include-path=PATHS Set include paths. Separated by `:'. Use `;' on Windows."); + console.log(" -M, --depends Output a makefile import dependency list to stdout"); + console.log(" --no-color Disable colorized output."); + console.log(" --no-ie-compat Disable IE compatibility checks."); + console.log(" --no-js Disable JavaScript in less files"); + console.log(" -l, --lint Syntax check only (lint)."); + console.log(" -s, --silent Suppress output of error messages."); + console.log(" --strict-imports Force evaluation of imports."); + console.log(" --insecure Allow imports from insecure https hosts."); + console.log(" -v, --version Print version number and exit."); + console.log(" -x, --compress Compress output by removing some whitespaces."); + console.log(" --clean-css Compress output using clean-css"); + console.log(" --source-map[=FILENAME] Outputs a v3 sourcemap to the filename (or output filename.map)"); + console.log(" --source-map-rootpath=X adds this path onto the sourcemap filename and less file paths"); + console.log(" --source-map-basepath=X Sets sourcemap base path, defaults to current working directory."); + console.log(" --source-map-less-inline puts the less files into the map instead of referencing them"); + console.log(" --source-map-map-inline puts the map (and any less files) into the output css file"); + console.log(" -rp, --rootpath=URL Set rootpath for url rewriting in relative imports and urls."); + console.log(" Works with or without the relative-urls option."); + console.log(" -ru, --relative-urls re-write relative urls to the base less file."); + console.log(" -sm=on|off Turn on or off strict math, where in strict mode, math"); + console.log(" --strict-math=on|off requires brackets. This option may default to on and then"); + console.log(" be removed in the future."); + console.log(" -su=on|off Allow mixed units, e.g. 1px+1em or 1px*1px which have units"); + console.log(" --strict-units=on|off that cannot be represented."); + console.log(""); + console.log("-------------------------- Deprecated ----------------"); + console.log(" -O0, -O1, -O2 Set the parser's optimization level. The lower"); + console.log(" the number, the less nodes it will create in the"); + console.log(" tree. This could matter for debugging, or if you"); + console.log(" want to access the individual nodes in the tree."); + console.log(" --line-numbers=TYPE Outputs filename and line numbers."); + console.log(" TYPE can be either 'comments', which will output"); + console.log(" the debug info within comments, 'mediaquery'"); + console.log(" that will output the information within a fake"); + console.log(" media query which is compatible with the SASS"); + console.log(" format, and 'all' which will do both."); + console.log(" --verbose Be verbose."); console.log(""); console.log("Report bugs to: http://github.com/less/less.js/issues"); console.log("Home page: ");