Mercurial > public > mercurial-scm > hg
diff tests/test-minirst.py.out @ 20654:af9d9b778550
minirst: create valid output when table data contains a newline
When table data contained a newline, the result of minirst.maketable
did not look nice plus it was not recognised by minirst.format:
== === ====
l1 1 one
l2 2 2
22
l3
== === ====
This problem occurred when the description of options had a very long
translation which was split by newlines. Do not bother a translator with
this detail.
The multiline translations for option descriptions have been fixed in
baf1600adfbe in it.po, de.po and ro.po. I manually did the same as this patch
does, I removed the newlines.
When a newline was in the description, this created unusable help output:
$ hg help somecommand
hg somecommand [option]...
with somecommand, you can...
options:
== =================== =======================================================
=================================== --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -n --norm
normal desc --newline VALUE line1 line2 == =================== ===============
===========================================================================
now this looks much nicer:
...
options:
--longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-n --norm normal desc
--newline VALUE line1 line2
author | Simon Heimberg <simohe@besonet.ch> |
---|---|
date | Wed, 19 Feb 2014 17:32:21 +0100 |
parents | 52b437586435 |
children | 58f8b29c37ff |
line wrap: on
line diff
--- a/tests/test-minirst.py.out Wed Mar 05 14:03:08 2014 +0100 +++ b/tests/test-minirst.py.out Wed Feb 19 17:32:21 2014 +0100 @@ -773,3 +773,34 @@ </table> ---------------------------------------------------------------------- + = ==== ====================================== + s long line goes on here + xy tried to fix here by indenting + = ==== ====================================== + +== table+nl == +60 column format: +---------------------------------------------------------------------- + s long line goes on here + xy tried to fix here by indenting +---------------------------------------------------------------------- + +30 column format: +---------------------------------------------------------------------- + s long line goes on here + xy tried to fix here by + indenting +---------------------------------------------------------------------- + +html format: +---------------------------------------------------------------------- +<table> +<tr><td>s</td> +<td>long</td> +<td>line goes on here</td></tr> +<tr><td></td> +<td>xy</td> +<td>tried to fix here by indenting</td></tr> +</table> +---------------------------------------------------------------------- +