Skip to content

Commit cac8743

Browse files
committed
Update
1 parent ad0af16 commit cac8743

3 files changed

Lines changed: 67 additions & 24 deletions

File tree

‎htmlgen.patch‎

Lines changed: 65 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From b6624d55edabee325ca49e73ed81a62f2a152804 Mon Sep 17 00:00:00 2001
22
From: Eelis van der Weegen <eelis@eelis.net>
33
Date: Sun, 4 Oct 2020 05:12:13 +0200
4-
Subject: [PATCH 01/22] Use \defnadj more.
4+
Subject: [PATCH 01/23] Use \defnadj more.
55

66
---
77
source/lex.tex | 1 -
@@ -90,7 +90,7 @@ index d0235a3f..bdc1d812 100644
9090
From b171ab167b34898ce3962f8dd5a7cf2af74a9e20 Mon Sep 17 00:00:00 2001
9191
From: Eelis van der Weegen <eelis@eelis.net>
9292
Date: Sun, 4 Oct 2020 04:26:58 +0200
93-
Subject: [PATCH 02/22] [dcl.spec.auto] Add index entry for 'placeholder type'.
93+
Subject: [PATCH 02/23] [dcl.spec.auto] Add index entry for 'placeholder type'.
9494

9595
---
9696
source/declarations.tex | 2 +-
@@ -116,7 +116,7 @@ index d4302e71..0a99b11c 100644
116116
From 73762aae4636f957ed922d03c9433fa9d5c50177 Mon Sep 17 00:00:00 2001
117117
From: Eelis van der Weegen <eelis@eelis.net>
118118
Date: Wed, 5 Dec 2018 01:09:09 +0100
119-
Subject: [PATCH 03/22] Use \range where appropriate.
119+
Subject: [PATCH 03/23] Use \range where appropriate.
120120

121121
---
122122
source/strings.tex | 8 ++++----
@@ -203,7 +203,7 @@ index eb015cc6..28f7b075 100644
203203
From 23d789695b076c5a03cececc08cb28683ba19a8c Mon Sep 17 00:00:00 2001
204204
From: Eelis van der Weegen <eelis@eelis.net>
205205
Date: Sun, 26 Feb 2017 14:24:19 +0100
206-
Subject: [PATCH 04/22] [some.where] Replace \term with \placeholder.
206+
Subject: [PATCH 04/23] [some.where] Replace \term with \placeholder.
207207

208208
---
209209
source/expressions.tex | 2 +-
@@ -229,7 +229,7 @@ index f2e68f2f..b23916fb 100644
229229
From f052bde47a85e43973be1a1f5bd3954dea892ce3 Mon Sep 17 00:00:00 2001
230230
From: Eelis van der Weegen <eelis@eelis.net>
231231
Date: Wed, 1 Feb 2017 03:39:27 +0100
232-
Subject: [PATCH 05/22] Make references more precise.
232+
Subject: [PATCH 05/23] Make references more precise.
233233

234234
---
235235
source/statements.tex | 2 +-
@@ -255,7 +255,7 @@ index 4c8bef83..821b24e4 100644
255255
From ac5f84745204963eaae19d50be60aef31ca8b102 Mon Sep 17 00:00:00 2001
256256
From: Eelis van der Weegen <eelis@eelis.net>
257257
Date: Sat, 7 Jan 2017 01:59:05 +0100
258-
Subject: [PATCH 06/22] [rand.req.eng] Omit superfluous dollar-math wrapping
258+
Subject: [PATCH 06/23] [rand.req.eng] Omit superfluous dollar-math wrapping
259259
inside \bigoh. [rejected upstream: 1340]
260260

261261
---
@@ -329,7 +329,7 @@ index 655ad07d..523c41de 100644
329329
From bfa6b10126498fba6ba5661bd4cd58dad35a2680 Mon Sep 17 00:00:00 2001
330330
From: Eelis van der Weegen <eelis@eelis.net>
331331
Date: Mon, 23 Jan 2017 06:58:26 +0100
332-
Subject: [PATCH 07/22] Reduce excessive indentation of comments. Helps layout
332+
Subject: [PATCH 07/23] Reduce excessive indentation of comments. Helps layout
333333
on smaller (e.g. half-screen) window sizes.
334334

335335
---
@@ -406,7 +406,7 @@ index b23916fb..ed6fad13 100644
406406
From c7a03d50b0bffcb9bf26122b810134e5f237841d Mon Sep 17 00:00:00 2001
407407
From: Eelis van der Weegen <eelis@eelis.net>
408408
Date: Wed, 1 Feb 2017 03:24:29 +0100
409-
Subject: [PATCH 08/22] Use new link macros.
409+
Subject: [PATCH 08/23] Use new link macros.
410410

411411
---
412412
source/intro.tex | 19 +--
@@ -5574,7 +5574,7 @@ index 45010974..e3b67f5c 100644
55745574
From 1ff0eabe481ca7b3a41e07f3b589ed82046f6ba4 Mon Sep 17 00:00:00 2001
55755575
From: Eelis van der Weegen <eelis@eelis.net>
55765576
Date: Tue, 1 Aug 2017 14:38:23 +0200
5577-
Subject: [PATCH 09/22] Fix dubious \defnx that has see{} in it, and remove
5577+
Subject: [PATCH 09/23] Fix dubious \defnx that has see{} in it, and remove
55785578
range index entry with the same key.
55795579

55805580
---
@@ -5635,7 +5635,7 @@ index 5aac34f8..124f1edd 100644
56355635
From 9063191608df03f01dbe6c1b72a1ef036af0c949 Mon Sep 17 00:00:00 2001
56365636
From: Eelis van der Weegen <eelis@eelis.net>
56375637
Date: Sun, 11 Nov 2018 02:27:17 +0100
5638-
Subject: [PATCH 10/22] Replace more non-codeblocks with outputblocks.
5638+
Subject: [PATCH 10/23] Replace more non-codeblocks with outputblocks.
56395639

56405640
---
56415641
source/iostreams.tex | 12 ++++++------
@@ -5736,7 +5736,7 @@ index aea6e6b5..75beaa75 100644
57365736
From 0321055dfe3b93f80452e46c752d50fae6beb62d Mon Sep 17 00:00:00 2001
57375737
From: Eelis van der Weegen <eelis@eelis.net>
57385738
Date: Sun, 11 Nov 2018 02:48:33 +0100
5739-
Subject: [PATCH 11/22] Use cxxdraft-htmlgen macros to annotate non-C++ code
5739+
Subject: [PATCH 11/23] Use cxxdraft-htmlgen macros to annotate non-C++ code
57405740
and literal fragments.
57415741

57425742
---
@@ -7515,7 +7515,7 @@ index 35b1bdca..b7d57614 100644
75157515
From ce195a3763c98611e599b9978cb7fa5df12f6e58 Mon Sep 17 00:00:00 2001
75167516
From: Eelis van der Weegen <eelis@eelis.net>
75177517
Date: Sun, 11 Nov 2018 15:23:33 +0100
7518-
Subject: [PATCH 12/22] Use \textnormal{..} and \textit{..} instead of
7518+
Subject: [PATCH 12/23] Use \textnormal{..} and \textit{..} instead of
75197519
\normalfont and \itshape.
75207520

75217521
The stateful ones are harder to handle.
@@ -7547,7 +7547,7 @@ index 4488e2fe..b9d68567 100644
75477547
From 720e74b32aaf6155a847f2155b21dc889d75af07 Mon Sep 17 00:00:00 2001
75487548
From: Eelis van der Weegen <eelis@eelis.net>
75497549
Date: Wed, 13 Mar 2019 21:04:43 +0100
7550-
Subject: [PATCH 13/22] [temp.deduct.call] Make sure that when math superscript
7550+
Subject: [PATCH 13/23] [temp.deduct.call] Make sure that when math superscript
75517551
is suffixed to \texttt, the \texttt itself is included in the formula passed
75527552
to MathJax.
75537553

@@ -7577,7 +7577,7 @@ index 95ca3252..aea6a489 100644
75777577
From f8f28d07c8c603b081e4332b7e1ce2352d913f84 Mon Sep 17 00:00:00 2001
75787578
From: Eelis van der Weegen <eelis@eelis.net>
75797579
Date: Sun, 31 May 2020 23:23:45 +0200
7580-
Subject: [PATCH 14/22] Remove more inappropriate paragraph breaks.
7580+
Subject: [PATCH 14/23] Remove more inappropriate paragraph breaks.
75817581

75827582
---
75837583
source/lex.tex | 2 --
@@ -10010,7 +10010,7 @@ index e3b67f5c..ee8b969b 100644
1001010010
From 4c2eb45a5901fce0a24b70e05831671fabed2ab9 Mon Sep 17 00:00:00 2001
1001110011
From: Eelis van der Weegen <eelis@eelis.net>
1001210012
Date: Fri, 31 Jul 2020 05:10:44 +0200
10013-
Subject: [PATCH 15/22] Move index entry into the relevant paragraph.
10013+
Subject: [PATCH 15/23] Move index entry into the relevant paragraph.
1001410014

1001510015
---
1001610016
source/templates.tex | 2 +-
@@ -10038,7 +10038,7 @@ index f3a7bfeb..c04546e4 100644
1003810038
From 0c064d10041d4c53be033f76580126b283be25b6 Mon Sep 17 00:00:00 2001
1003910039
From: Eelis van der Weegen <eelis@eelis.net>
1004010040
Date: Sun, 30 Aug 2020 11:02:16 +0200
10041-
Subject: [PATCH 16/22] Remove duplicate index entry.
10041+
Subject: [PATCH 16/23] Remove duplicate index entry.
1004210042

1004310043
---
1004410044
source/utilities.tex | 1 -
@@ -10063,7 +10063,7 @@ index d96dcef6..e4f3c40d 100644
1006310063
From 5ace80b8c1278653caf7f35cc5b7db45a42fee94 Mon Sep 17 00:00:00 2001
1006410064
From: Eelis van der Weegen <eelis@eelis.net>
1006510065
Date: Thu, 17 Sep 2020 10:17:47 +0200
10066-
Subject: [PATCH 17/22] Use monospace font for code in figures.
10066+
Subject: [PATCH 17/23] Use monospace font for code in figures.
1006710067

1006810068
---
1006910069
source/assets/figdag.dot | 8 ++++----
@@ -10210,7 +10210,7 @@ index b3c04d48..1ab8e364 100644
1021010210
From d44180f3cdc8389b90a7f124e13df7a947e2b9fb Mon Sep 17 00:00:00 2001
1021110211
From: Eelis van der Weegen <eelis@eelis.net>
1021210212
Date: Wed, 23 Jun 2021 20:54:27 +0200
10213-
Subject: [PATCH 18/22] [uaxid] Mark code that's not to be highlighted.
10213+
Subject: [PATCH 18/23] [uaxid] Mark code that's not to be highlighted.
1021410214

1021510215
---
1021610216
source/uax31.tex | 8 ++++----
@@ -10248,7 +10248,7 @@ index 75beaa75..16480279 100644
1024810248
From 053f288251d27c978a6f43f5f7edff7875f66f88 Mon Sep 17 00:00:00 2001
1024910249
From: Eelis van der Weegen <eelis@eelis.net>
1025010250
Date: Sun, 27 Feb 2022 06:27:00 +0100
10251-
Subject: [PATCH 19/22] Don't use \- in index reference.
10251+
Subject: [PATCH 19/23] Don't use \- in index reference.
1025210252

1025310253
---
1025410254
source/compatibility.tex | 2 +-
@@ -10274,7 +10274,7 @@ index 17b2bc24..d274ebfc 100644
1027410274
From 04f3434ffc67e556cc00614939a7aa7777f2d839 Mon Sep 17 00:00:00 2001
1027510275
From: Eelis van der Weegen <eelis@eelis.net>
1027610276
Date: Thu, 18 Aug 2022 18:40:34 +0200
10277-
Subject: [PATCH 20/22] Avoid nested dollar math.
10277+
Subject: [PATCH 20/23] Avoid nested dollar math.
1027810278

1027910279
Because cxxdraft-htmlgen does not support it.
1028010280
---
@@ -10301,7 +10301,7 @@ index 5efbc19e..4ef9dec2 100644
1030110301
From 770dd3208c9bf70b53535f31bb2f2230f4b7302f Mon Sep 17 00:00:00 2001
1030210302
From: timsong-cpp <rs2740@gmail.com>
1030310303
Date: Tue, 15 Aug 2023 23:29:54 -0500
10304-
Subject: [PATCH 21/22] additional fixes
10304+
Subject: [PATCH 21/23] additional fixes
1030510305

1030610306
---
1030710307
source/containers.tex | 14 +++++++-------
@@ -10348,7 +10348,7 @@ index 4ef9dec2..f720b413 100644
1034810348
From 880e9838c8e9245b9d44b1af3f254b70bbebb6cd Mon Sep 17 00:00:00 2001
1034910349
From: timsong-cpp <rs2740@gmail.com>
1035010350
Date: Sat, 19 Aug 2023 16:23:57 -0500
10351-
Subject: [PATCH 22/22] directly include the text from examples
10351+
Subject: [PATCH 22/23] directly include the text from examples
1035210352

1035310353
---
1035410354
source/utilities.tex | 12 ++++++------
@@ -10402,3 +10402,46 @@ index e4f3c40d..f866edb0 100644
1040210402
--
1040310403
2.34.1
1040410404

10405+
10406+
From 865a6db97938b430f5c56b73e87a97bda18a6be1 Mon Sep 17 00:00:00 2001
10407+
From: timsong-cpp <rs2740@gmail.com>
10408+
Date: Sat, 19 Aug 2023 17:30:18 -0500
10409+
Subject: [PATCH 23/23] Fix clown count in example, try to improve alignment
10410+
10411+
---
10412+
source/utilities.tex | 6 +++---
10413+
1 file changed, 3 insertions(+), 3 deletions(-)
10414+
10415+
diff --git a/source/utilities.tex b/source/utilities.tex
10416+
index f866edb0..7f372099 100644
10417+
--- a/source/utilities.tex
10418+
+++ b/source/utilities.tex
10419+
@@ -15908,7 +15908,7 @@ [format.string.std]
10420+
string s9 = format("{:*<}", "12"); // value of \tcode{s9} is \tcode{"12"}
10421+
string sA = format("{:*<6}", "12345678"); // value of \tcode{sA} is \tcode{"12345678"}
10422+
string sB = format("{:🤡@\caret{}@6}", "x"); // value of \tcode{sB} is \tcode{"🤡🤡x🤡🤡🤡"}
10423+
-string sC = format("{:*@\caret{}@6}", "🤡"); // value of \tcode{sC} is \tcode{"🤡🤡🤡"}
10424+
+string sC = format("{:*@\caret{}@6}", "🤡🤡🤡"); // value of \tcode{sC} is \tcode{"🤡🤡🤡"}
10425+
\end{codeblock}
10426+
\end{example}
10427+
\begin{note}
10428+
@@ -17137,14 +17137,14 @@ [format.string.escaped]
10429+
\begin{codeblock}
10430+
string s0 = format("[{}]", "h\tllo"); // \tcode{s0} has value: \tcode{[h\ \ \ \ llo]}
10431+
string s1 = format("[{:?}]", "h\tllo"); // \tcode{s1} has value: \tcode{["h\textbackslash tllo"]}
10432+
-string s2 = format("[{:?}]", "Спасибо, Виктор ♥!"); @\kern1.25pt@// \tcode{s2} has value: \tcode{["Спасибо, Виктор ♥!"]}
10433+
+string s2 = format("[{:?}]", "Спасибо, Виктор ♥!"); // \tcode{s2} has value: \tcode{["Спасибо, Виктор ♥!"]}
10434+
string s3 = format("[{:?}, {:?}]", '\'', '"'); // \tcode{s3} has value: \tcode{['\textbackslash '', '"']}
10435+
10436+
// The following examples assume use of the UTF-8 encoding
10437+
string s4 = format("[{:?}]", string("\0 \n \t \x02 \x1b", 9));
10438+
// \tcode{s4} has value: \tcode{["\textbackslash u\{0\} \textbackslash n \textbackslash t \textbackslash u\{2\} \textbackslash u\{1b\}"]}
10439+
string s5 = format("[{:?}]", "\xc3\x28"); // invalid UTF-8, \tcode{s5} has value: \tcode{["\textbackslash x\{c3\}("]}
10440+
-string s6 = format("[{:?}]", "🤷🏻‍♂️"); @\kern0.75pt@// \tcode{s6} has value: \tcode{["🤷\textbackslash{u}\{200d\}♂\textbackslash{u}\{fe0f\}"]}
10441+
+string s6 = format("[{:?}]", "🤷🏻‍♂️"); // \tcode{s6} has value: \tcode{["🤷\textbackslash{u}\{200d\}♂\textbackslash{u}\{fe0f\}"]}
10442+
string s7 = format("[{:?}]", "\u0301"); // \tcode{s7} has value: \tcode{["\textbackslash u\{301\}"]}
10443+
string s8 = format("[{:?}]", "\\\u0301"); // \tcode{s8} has value: \tcode{["\textbackslash \textbackslash \textbackslash u\{301\}"]}
10444+
string s9 = format("[{:?}]", "e\u0301\u0323"); // \tcode{s9} has value: \tcode{["ẹ́"]}
10445+
--
10446+
2.34.1
10447+

‎lastbuild.sig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
htmlgen 1fc95acaaebf4b755b6df24e5bb72c2239a96465
22
draft a272b7cd04dc0be488250a0c6aaead160e778774
3-
60826543f158cbef8aef0f0eb77e2680a09c514c htmlgen.patch
3+
db80d290353fdcc47d516369efe5469ca640f6fe htmlgen.patch
44
eb481032a4c87b70e79de6b5b6c1d7f442f1eb35 htmlgen_code.patch

0 commit comments

Comments
 (0)