widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

Thanks for proofreading :)

I'm not font of the blue either, can you please try something like 6699ff? The problem wasn't the hue, but the saturation.

Diff comments:

> 
> === modified file 'src/graphic/text/rt_parse.cc'
> --- src/graphic/text/rt_parse.cc	2017-12-09 06:29:26 +0000
> +++ src/graphic/text/rt_parse.cc	2018-02-24 11:18:33 +0000
> @@ -194,30 +247,92 @@
>  		tc.has_closing_tag = true;
>  		tag_constraints_["rt"] = tc;
>  	}
> -	{  // br tag
> +	{
> +		/* RST
> +.. _rt_tags_div:
> +
> +Division -- <div>
> +-----------------
> +
> +This tag defines a rectangle and an be used as a layout control.
> +
> +Attributes
> +^^^^^^^^^^
> +
> +The same attributes as :ref:`rt_tags_rt`, plus the following:
> +
> +* **margin**: Shrink all contents to leave a margin towards the outer edge of this tag's rectangle
> +* **float**: To be implemented. Allowed values are ``left``,  ``right``
> +* **valign**: Align the contents vertically. Allowed values are ``top`` (default), ``center`` = ``middle``, ``bottom``.

Good idea, but I don't want to change this right now. It would mean retesting all the scenarios.

> +* **width**: The width of this element, as a pixel amount, or as a percentage.
> +  The last ``div`` in a row can be expanded automatically by using ``*``.
> +
> +Sub-tags
> +^^^^^^^^
> +
> +* :ref:`rt_tags_div`
> +* :ref:`rt_tags_font`
> +* :ref:`rt_tags_p`
> +* :ref:`rt_tags_vspace`
> +
> +:ref:`Return to tag index<rt_tags>`
> +		*/
> +		TagConstraint tc;
> +		tc.allowed_attrs.insert("padding");
> +		tc.allowed_attrs.insert("padding_r");
> +		tc.allowed_attrs.insert("padding_l");
> +		tc.allowed_attrs.insert("padding_b");
> +		tc.allowed_attrs.insert("padding_t");
> +		tc.allowed_attrs.insert("margin");
> +		tc.allowed_attrs.insert("float");
> +		tc.allowed_attrs.insert("valign");
> +		tc.allowed_attrs.insert("background");
> +		tc.allowed_attrs.insert("width");
> +
> +		tc.allowed_children.insert("p");
> +		tc.allowed_children.insert("vspace");
> +		tc.allowed_children.insert("font");
> +		tc.allowed_children.insert("div");
> +
> +		tc.text_allowed = false;
> +		tc.has_closing_tag = true;
> +		tag_constraints_["div"] = tc;
> +	}
> +	{
> +		/* RST
> +.. _rt_tags_br:
> +
> +Line Break -- <br>
> +------------------
> +
> +A single line break. Use sparingly for things like poetry stanzas.
> +If you are starting a new paragraph, use :ref:`rt_tags_p` instead.
> +
> +:ref:`Return to tag index<rt_tags>`
> +		*/
>  		TagConstraint tc;
>  		tc.text_allowed = false;
>  		tc.has_closing_tag = false;
>  		tag_constraints_["br"] = tc;
>  	}
> -	{  // img tag
> -		TagConstraint tc;
> -		tc.allowed_attrs.insert("src");
> -		tc.allowed_attrs.insert("ref");
> -		tc.allowed_attrs.insert("color");
> -		tc.allowed_attrs.insert("width");
> -		tc.text_allowed = false;
> -		tc.has_closing_tag = false;
> -		tag_constraints_["img"] = tc;
> -	}
> -	{  // vspace tag
> -		TagConstraint tc;
> -		tc.allowed_attrs.insert("gap");
> -		tc.text_allowed = false;
> -		tc.has_closing_tag = false;
> -		tag_constraints_["vspace"] = tc;
> -	}
> -	{  // space tag
> +	{
> +		/* RST
> +.. _rt_tags_space:
> +
> +Horizontal Space -- <space>
> +---------------------------
> +
> +Inserts a horizontal gap between the previous and the following text.
> +This space can be filled with a character of your choice.
> +
> +Attributes
> +^^^^^^^^^^
> +
> +* **gap**: The size of the gap as a pixel amount
> +* **fill**: A character to fill the gap with
> +
> +:ref:`Return to tag index<rt_tags>`
> +		*/
>  		TagConstraint tc;
>  		tc.allowed_attrs.insert("gap");
>  		tc.allowed_attrs.insert("fill");


-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1-documentation/+merge/337545
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-documentation.