From 28f70568798a5db468e356d63906a408d2f6ce5a Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Sun, 18 Apr 2021 01:05:58 +0800 Subject: [PATCH 1/7] Fix changelog misformat --- tools/news/template.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/news/template.rst b/tools/news/template.rst index 70d6ab75def..627bc333a3a 100644 --- a/tools/news/template.rst +++ b/tools/news/template.rst @@ -1,4 +1,4 @@ -{{ top_line -}} +{{ top_line }} {%- for section in sections %} {% set underline = "-" %} From 13529ee9b12098495f161dd5eca763c6c805ae36 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Sun, 18 Apr 2021 01:16:39 +0800 Subject: [PATCH 2/7] Manually add underline --- tools/news/template.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/news/template.rst b/tools/news/template.rst index 627bc333a3a..1e43d610510 100644 --- a/tools/news/template.rst +++ b/tools/news/template.rst @@ -1,6 +1,8 @@ -{{ top_line }} +{% set underline = "=" %} +{{ top_line -}} +{{ underline * top_line|length -}} -{%- for section in sections %} +{% for section in sections %} {% set underline = "-" %} {% if section %} {{ section }} From d6c7969aafa3da1274d49b5a4845aa0ded3ac8db Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Sun, 18 Apr 2021 01:20:45 +0800 Subject: [PATCH 3/7] Why can't I use newline control :( --- tools/news/template.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/news/template.rst b/tools/news/template.rst index 1e43d610510..eee3edd021d 100644 --- a/tools/news/template.rst +++ b/tools/news/template.rst @@ -1,6 +1,6 @@ {% set underline = "=" %} -{{ top_line -}} -{{ underline * top_line|length -}} +{{ top_line }} +{{ underline * top_line|length }} {% for section in sections %} {% set underline = "-" %} From eeec07656a6ce51bf1586cbbffdd60ee7fef6cd6 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Sun, 18 Apr 2021 01:24:08 +0800 Subject: [PATCH 4/7] This produces both good HTML and readable RsT --- tools/news/template.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/news/template.rst b/tools/news/template.rst index eee3edd021d..e34ecd25867 100644 --- a/tools/news/template.rst +++ b/tools/news/template.rst @@ -1,8 +1,8 @@ {% set underline = "=" %} {{ top_line }} -{{ underline * top_line|length }} +{{- underline * top_line|length }} -{% for section in sections %} +{%- for section in sections %} {% set underline = "-" %} {% if section %} {{ section }} From 060df5432032060491c8ee44e38b19f52b3aad2c Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Sun, 18 Apr 2021 01:27:13 +0800 Subject: [PATCH 5/7] Revert "This produces both good HTML and readable RsT" This reverts commit eeec07656a6ce51bf1586cbbffdd60ee7fef6cd6. --- tools/news/template.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/news/template.rst b/tools/news/template.rst index e34ecd25867..eee3edd021d 100644 --- a/tools/news/template.rst +++ b/tools/news/template.rst @@ -1,8 +1,8 @@ {% set underline = "=" %} {{ top_line }} -{{- underline * top_line|length }} +{{ underline * top_line|length }} -{%- for section in sections %} +{% for section in sections %} {% set underline = "-" %} {% if section %} {{ section }} From 187d9873ad8480321359754dba226973fb38b416 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Sun, 18 Apr 2021 01:33:00 +0800 Subject: [PATCH 6/7] Let's try this --- tools/news/template.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/news/template.rst b/tools/news/template.rst index eee3edd021d..aed2ac6e7f8 100644 --- a/tools/news/template.rst +++ b/tools/news/template.rst @@ -1,8 +1,7 @@ {% set underline = "=" %} {{ top_line }} -{{ underline * top_line|length }} - -{% for section in sections %} +{{- underline * top_line|length }} +{%- for section in sections %} {% set underline = "-" %} {% if section %} {{ section }} From b1550a11f2304b3af701545252b3fb935a20bc6e Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Sun, 18 Apr 2021 01:38:50 +0800 Subject: [PATCH 7/7] Best I can do --- tools/news/template.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/news/template.rst b/tools/news/template.rst index aed2ac6e7f8..cff0db4f6fb 100644 --- a/tools/news/template.rst +++ b/tools/news/template.rst @@ -1,7 +1,7 @@ {% set underline = "=" %} {{ top_line }} -{{- underline * top_line|length }} -{%- for section in sections %} +{{ underline * top_line|length }} +{% for section in sections %} {% set underline = "-" %} {% if section %} {{ section }}