From 913b204adeb78ecaec73d91e44c8d39d52236597 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 12:18:31 +0000 Subject: [PATCH 01/24] start at largeop --- _data/core.yml | 10 ++++++++++ intent-core-concepts/index.md | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/_data/core.yml b/_data/core.yml index 9bbf783d..70b9cfd2 100644 --- a/_data/core.yml +++ b/_data/core.yml @@ -210,6 +210,16 @@ defaultfixity: characters: [⁢U+2062] +largeop: + - concept: sum + characters: [∑,⅀] + - concept: product + characters: [∏,⨉] + - concept: union + characters: [⋃] + - concept: intersection + characters: [⋂] + concepts: ## From chapter 4 of MathML3 diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index f2e2adc5..ea1f743e 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -130,6 +130,39 @@ if c.link {% endfor %} +---- + +## Core Concept Default Large Operatorss + +Speech templates for "large" operators follow a similar pattern +and are often strongly associated with particur characters. +They are collected here to give a more convenient and compact +presentation. + +

+ +{%- for c in site.data.core.largeop -%} +{{c.concept}} +( +{%- for ch in c.characters -%} +{{ch}} +{%- unless forloop.last -%}, {% endunless -%} +{%- endfor -%} +) +{% unless forloop.last -%}, {% endunless -%} +{%- endfor %} +

+ + + ---- ## Core Concept Templates From 89cb2bf1464edf326d6e7dd854ce41d1a0a9bdcc Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 12:32:42 +0000 Subject: [PATCH 02/24] start at largeop 2 --- intent-core-concepts/index.md | 61 +++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index ea1f743e..2ee7a86a 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -135,12 +135,66 @@ if c.link ## Core Concept Default Large Operatorss Speech templates for "large" operators follow a similar pattern -and are often strongly associated with particur characters. +and are often strongly associated with particular characters. They are collected here to give a more convenient and compact presentation. -

+ + + + + + +{%- for language in site.data.languages -%} + +{%- endfor -%} + + + + +{%- for c in site.data.core.concepts.intents -%} +{%- if c.concept == "sum" %-} +{%- assign arityr = c.arity | replace: ">=", "⩾" -%} +{%- assign arityu = c.arity | replace: ">=", "GEQ" -%} +{%- assign propertyu = c.property | replace: "?", "Q" -%} + + + + +{%- for language in site.data.languages -%} + +{%- endfor -%} + + +{%- endif -%} +{%- endfor -} + + + +
+
Operators
+
{%- for c in site.data.core.largeop -%} +
+
From 13fab0037506b925c471573b1f9d909185059157 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 12:44:21 +0000 Subject: [PATCH 03/24] start at largeop 3 --- intent-core-concepts/index.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index 2ee7a86a..e1065484 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -152,8 +152,7 @@ presentation. -{%- for c in site.data.core.concepts.intents -%} -{%- if c.concept == "sum" %-} +{%- for c in site.data.core.concepts[3].intents | where: "concept", "sum" -%} {%- assign arityr = c.arity | replace: ">=", "⩾" -%} {%- assign arityu = c.arity | replace: ">=", "GEQ" -%} {%- assign propertyu = c.property | replace: "?", "Q" -%} @@ -186,8 +185,8 @@ presentation. {% endfor %} -{%- endif -%} {%- endfor -} +
ConceptArityPropertySpeech Template ({{language.language-code}})Comments
{{c.concept}}{{arityr}}{{c.property}}{%- unless c.default == false or c.arity == 0-%}*{%- endunless -%} +{%- if c[language.language-code] -%} +{%- for l in c[language.language-code] -%} +{{l}} {%- unless forloop.last -%}
{% endunless -%} +{% endfor %} +{%- else -%} +{%- for l in c.en -%} +{{l}} ({{language.language-code}}){%- unless forloop.last -%}
{% endunless -%} +{% endfor %} +{% endif %} +		 +{%- for com in c.comments -%} +{{com | markdownify | replace: "

", "" | replace: "

", "" }} +{%- unless forloop.last -%}
{% endunless -%} +{% endfor %} +{%- if c.comments and c.mathml -%}
{%- endif -%} +{%- for mml in c.mathml -%} +{{mml}} +{%- unless forloop.last -%}
{% endunless -%} +{% endfor %} +
From a1bd58a5f51e573dae676018f3f215529b4554de Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 12:50:00 +0000 Subject: [PATCH 04/24] start at largeop 4 --- intent-core-concepts/index.md | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index e1065484..5cf6daab 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -153,39 +153,10 @@ presentation. {%- for c in site.data.core.concepts[3].intents | where: "concept", "sum" -%} -{%- assign arityr = c.arity | replace: ">=", "⩾" -%} -{%- assign arityu = c.arity | replace: ">=", "GEQ" -%} -{%- assign propertyu = c.property | replace: "?", "Q" -%} - -{{c.concept}} -{{arityr}} -{{c.property}}{%- unless c.default == false or c.arity == 0-%}*{%- endunless -%} -{%- for language in site.data.languages -%} - -{%- if c[language.language-code] -%} -{%- for l in c[language.language-code] -%} -{{l}} {%- unless forloop.last -%}
{% endunless -%} -{% endfor %} -{%- else -%} -{%- for l in c.en -%} -{{l}} ({{language.language-code}}){%- unless forloop.last -%}
{% endunless -%} -{% endfor %} -{% endif %} - -{%- endfor -%} - -{%- for com in c.comments -%} -{{com | markdownify | replace: "

", "" | replace: "

", "" }} -{%- unless forloop.last -%}
{% endunless -%} -{% endfor %} -{%- if c.comments and c.mathml -%}
{%- endif -%} -{%- for mml in c.mathml -%} -{{mml}} -{%- unless forloop.last -%}
{% endunless -%} -{% endfor %} - + +sum -{%- endfor -} +{%- endfor -%} From b7b5f62d8ba22e89ddd0839e0e807274053454b6 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 12:54:39 +0000 Subject: [PATCH 05/24] start at largeop 5 --- intent-core-concepts/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index 5cf6daab..23fe82e1 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -154,9 +154,10 @@ presentation. {%- for c in site.data.core.concepts[3].intents | where: "concept", "sum" -%} -sum +suma: {{c.arity}}}p: {{c.property}} {%- endfor -%} + From 81e4a19b757dc220077746bb6082e5ef33dfad95 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 13:26:39 +0000 Subject: [PATCH 06/24] start at largeop 6 --- intent-core-concepts/index.md | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index 23fe82e1..bae36093 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -153,8 +153,37 @@ presentation. {%- for c in site.data.core.concepts[3].intents | where: "concept", "sum" -%} +{%- assign arityr = c.arity | replace: ">=", "⩾" -%} +{%- assign arityu = c.arity | replace: ">=", "GEQ" -%} +{%- assign propertyu = c.property | replace: "?", "Q" -%} -suma: {{c.arity}}}p: {{c.property}} +{{c.concept}} +{{c.arityu}}} +{{c.property}}{%- unless c.default == false or c.arity == 0-%}*{%- endunless -%} +{%- for language in site.data.languages -%} + +{%- if c[language.language-code] -%} +{%- for l in c[language.language-code] -%} +{{l}} {%- unless forloop.last -%}
{% endunless -%} +{% endfor %} +{%- else -%} +{%- for l in c.en -%} +{{l}} ({{language.language-code}}){%- unless forloop.last -%}
{% endunless -%} +{% endfor %} +{% endif %} + +{%- endfor -%} + +{%- for com in c.comments -%} +{{com | markdownify | replace: "

", "" | replace: "

", "" }} +{%- unless forloop.last -%}
{% endunless -%} +{% endfor %} +{%- if c.comments and c.mathml -%}
{%- endif -%} +{%- for mml in c.mathml -%} +{{mml}} +{%- unless forloop.last -%}
{% endunless -%} +{% endfor %} + {%- endfor -%} From f655523f551a94d2976f8fca93bed8d64d01867e Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 13:30:00 +0000 Subject: [PATCH 07/24] start at largeop 7 --- intent-core-concepts/index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index bae36093..346e547d 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -152,7 +152,8 @@ presentation. -{%- for c in site.data.core.concepts[3].intents | where: "concept", "sum" -%} +{%- for c in site.data.core.concepts[3].intents -%} +{%- if c.concept == "sum" -%} {%- assign arityr = c.arity | replace: ">=", "⩾" -%} {%- assign arityu = c.arity | replace: ">=", "GEQ" -%} {%- assign propertyu = c.property | replace: "?", "Q" -%} @@ -185,6 +186,7 @@ presentation. {% endfor %} +%- endif -%} {%- endfor -%} From ec2270248303d747f9f84a8b311bf350126e91d7 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 13:31:29 +0000 Subject: [PATCH 08/24] start at largeop 8 --- intent-core-concepts/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index 346e547d..954eb5e6 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -186,7 +186,7 @@ presentation. {% endfor %} -%- endif -%} +{%- endif -%} {%- endfor -%} From 354c29a5e318d4d7f7d50a0ad6eea5b4942c237e Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 13:37:59 +0000 Subject: [PATCH 09/24] start at largeop 9 --- _data/core.yml | 6 ++++++ intent-core-concepts/index.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/_data/core.yml b/_data/core.yml index 70b9cfd2..09b13275 100644 --- a/_data/core.yml +++ b/_data/core.yml @@ -219,6 +219,12 @@ largeop: characters: [⋃] - concept: intersection characters: [⋂] + - concept: integral + characters: [∫] + - concept: double-integral + characters: [∬] + - concept: contour-integral + characters: [∮] concepts: diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index 954eb5e6..c07d6999 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -159,7 +159,7 @@ presentation. {%- assign propertyu = c.property | replace: "?", "Q" -%} {{c.concept}} -{{c.arityu}}} +{{c.arityu}} {{c.property}}{%- unless c.default == false or c.arity == 0-%}*{%- endunless -%} {%- for language in site.data.languages -%} From adcad023e5f6f26cfab174e59e45e355c85f0c7c Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 13:39:53 +0000 Subject: [PATCH 10/24] start at largeop 10 --- intent-core-concepts/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index c07d6999..4a2cf19c 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -132,7 +132,7 @@ if c.link ---- -## Core Concept Default Large Operatorss +## Default Large Operator Concepts Speech templates for "large" operators follow a similar pattern and are often strongly associated with particular characters. From 49ca6aa503f4a3fa95e0e98d7f94b517d9c5235a Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 16:33:36 +0000 Subject: [PATCH 11/24] start at largeop fix arity display --- intent-core-concepts/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index 4a2cf19c..9eba7aa8 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -159,7 +159,7 @@ presentation. {%- assign propertyu = c.property | replace: "?", "Q" -%} {{c.concept}} -{{c.arityu}} +{{arityr}} {{c.property}}{%- unless c.default == false or c.arity == 0-%}*{%- endunless -%} {%- for language in site.data.languages -%} From fb5d1b95e9a6a27dbffa6b36f3022cd56b0ffa64 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 17 Nov 2024 18:26:46 +0000 Subject: [PATCH 12/24] start at largeop: mathml examples --- _data/core.yml | 4 ++++ intent-core-concepts/index.md | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/_data/core.yml b/_data/core.yml index 09b13275..ccdf8136 100644 --- a/_data/core.yml +++ b/_data/core.yml @@ -664,6 +664,7 @@ concepts: arity: 1 property: function en: "sum of $1" + - "∑f(i)" comments: - usually on `` @@ -671,6 +672,8 @@ concepts: arity: 2 property: function en: "sum over $1 of $2" + mathml: + - "∑i∈Xf(i)" comments: - usually on `` or `` @@ -678,6 +681,7 @@ concepts: arity: 3 property: function en: "sum from $1 to $2 of $3" + - "∑i=abf(i)" comments: - usually on `` or `` diff --git a/intent-core-concepts/index.md b/intent-core-concepts/index.md index 9eba7aa8..adb49809 100644 --- a/intent-core-concepts/index.md +++ b/intent-core-concepts/index.md @@ -32,14 +32,31 @@ title: Core Concept List p.langs {margin:1em; padding:1em;background-color: #EEE} tr:target >td:first-child {border-left:solid thick black} span.cb {margin-right: 2em; white-space:nowrap} +.markdown-body table {font-size:85%} .markdown-body table tr.row0, .markdown-body table th.row0 {background-color:#F6F8FA} .markdown-body table tr.row1 {background-color:#FEFFFE} a.link {font-weight:500} a.self {color: black; font-weight:500} + [arg] { background-color: #ddfafa;} + [arg]:hover {display:inline;background-color: #add8e6;} + [arg]:hover::after {display:inline;vertical-align: sub; font-size: 0.7em; } + [arg="a1"]:hover::after { content: " $1" ; } + [arg="a2"]:hover::after { content: " $2" ; } + [arg="a3"]:hover::after { content: " $3" ; } + [arg="a4"]:hover::after { content: " $4" ; } + [arg="a5"]:hover::after { content: " $5" ; } + [arg="a6"]:hover::after { content: " $6" ; } + [arg="a7"]:hover::after { content: " $7" ; } + [arg="a8"]:hover::after { content: " $8" ; } + [arg="a9"]:hover::after { content: " $9" ; } +math:not(:has(*[intent])) { + color: red; + } +div.mmlshow {display:inline-block;padding:1em;margin:.5em;border-radius:1em;font-family:monospace;background-color:#EEE;white-space:pre;}