switch to american spelling of 'color' (73a8d3d8) · Commits · github_fork / Clip

CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ add_library(plotfxlib STATIC
		common/plist/plist_parser.cc
		common/graphics/path.cc
		common/graphics/brush.cc
		common/graphics/colour.cc
		common/graphics/color.cc
		common/graphics/geometry.cc
		common/graphics/image.cc
		common/graphics/layer.cc

common/colour_scheme.h→common/color_scheme.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -29,14 +29,14 @@
		*/
		#pragma once
		#include <stdlib.h>
		#include "graphics/colour.h"
		#include "graphics/color.h"

		namespace plotfx {

		class ColourScheme {
		class ColorScheme {
		public:

		ColourScheme(
		ColorScheme(
		const std::vector<std::string>& colors = std::vector<std::string>{
		"#4572a7",
		"#aa4643",
		@@ -48,8 +48,8 @@ public:
		colors_(colors),
		color_index_(0) {}

		Colour next() {
		Colour c;
		Color next() {
		Color c;
		c.parse(colors_[color_index_++ % colors_.size()]);
		return c;
		}

common/config_helpers.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -135,9 +135,9 @@ ParserFn configure_multiprop(const std::vector<ParserFn>& parsers) {
		};
		}

		ReturnCode configure_colour(
		ReturnCode configure_color(
		const plist::Property& prop,
		Colour* value) {
		Color* value) {
		if (!plist::is_value(prop)) {
		return ReturnCode::errorf(
		"EARG",
		@@ -151,7 +151,7 @@ ReturnCode configure_colour(
		}
		}

		return ReturnCode::error("EARG", "invalid colour");
		return ReturnCode::error("EARG", "invalid color");
		}

		ReturnCode configure_float(

common/config_helpers.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@
		#include <optional>
		#include <plist/plist.h>
		#include <graphics/measure.h>
		#include <graphics/colour.h>
		#include <graphics/color.h>
		#include "utils/return_code.h"
		#include "common/series.h"

		@@ -97,9 +97,9 @@ ReturnCode configure_measure_rel(
		double font_size,
		Measure* value);

		ReturnCode configure_colour(
		ReturnCode configure_color(
		const plist::Property& prop,
		Colour* value);
		Color* value);

		ReturnCode configure_float(
		const plist::Property& prop,

common/document.cc

+11 −11

Original line number	Diff line number	Diff line
		@@ -43,9 +43,9 @@ namespace plotfx {
		Document::Document() :
		width(1200),
		height(480),
		background_colour(Colour::fromRGB(1,1,1)),
		text_colour(Colour::fromRGB(.2,.2,.2)),
		border_colour(Colour::fromRGB(.66,.66,.66)),
		background_color(Color::fromRGB(1,1,1)),
		text_color(Color::fromRGB(.2,.2,.2)),
		border_color(Color::fromRGB(.66,.66,.66)),
		dpi(96),
		font_size(from_pt(11, dpi)) {}

		@@ -71,16 +71,16 @@ ReturnCode document_load(
		static const ParserDefinitions pdefs = {
		{"width", std::bind(&configure_measure_rel, std::placeholders::_1, doc->dpi, doc->font_size, &doc->width)},
		{"height", std::bind(&configure_measure_rel, std::placeholders::_1, doc->dpi, doc->font_size, &doc->height)},
		{"background-colour", std::bind(&configure_colour, std::placeholders::_1, &doc->background_colour)},
		{"background-color", std::bind(&configure_color, std::placeholders::_1, &doc->background_color)},
		{
		"foreground-colour",
		"foreground-color",
		configure_multiprop({
		std::bind(&configure_colour, std::placeholders::_1, &doc->text_colour),
		std::bind(&configure_colour, std::placeholders::_1, &doc->border_colour),
		std::bind(&configure_color, std::placeholders::_1, &doc->text_color),
		std::bind(&configure_color, std::placeholders::_1, &doc->border_color),
		})
		},
		{"text-colour", std::bind(&configure_colour, std::placeholders::_1, &doc->text_colour)},
		{"border-colour", std::bind(&configure_colour, std::placeholders::_1, &doc->border_colour)},
		{"text-color", std::bind(&configure_color, std::placeholders::_1, &doc->text_color)},
		{"border-color", std::bind(&configure_color, std::placeholders::_1, &doc->border_color)},
		};

		if (auto rc = parseAll(plist, pdefs); !rc.isSuccess()) {
		@@ -162,7 +162,7 @@ ReturnCode document_render_svg(
		doc.height,
		doc.dpi,
		doc.font_size,
		doc.background_colour,
		doc.background_color,
		[filename] (auto svg) {
		FileUtil::write(filename, Buffer(svg.data(), svg.size()));
		return OK;
		@@ -190,7 +190,7 @@ ReturnCode document_render_png(
		doc.height,
		doc.dpi,
		doc.font_size,
		doc.background_colour,
		doc.background_color,
		[filename] (auto png) {
		FileUtil::write(filename, Buffer(png.data(), png.size()));
		return OK;

Admin message