aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2025-05-26 11:00:33 +0200
committerJonas Smedegaard <dr@jones.dk>2025-05-26 11:40:24 +0200
commitb39149eae9a046dea7367ea0423fb7e7a27149a2 (patch)
tree89ffea26c8c359086b59b4f81a5158641411b652
parentbd8c87a53621a3e1e421c22caf30571a90db398c (diff)
rename syntax definitions: drop prefix def_
-rw-r--r--Makefile2
-rw-r--r--_markdown.qmd28
-rw-r--r--_syntax.qmd52
-rwxr-xr-xsyntax/AnnotatedWords.py (renamed from syntax/def_AnnotatedWords.py)0
-rwxr-xr-xsyntax/AnnotatedWordsX.py (renamed from syntax/def_AnnotatedWordsX.py)0
-rwxr-xr-xsyntax/Block.py (renamed from syntax/def_Block.py)0
-rwxr-xr-xsyntax/BlockX.py (renamed from syntax/def_BlockX.py)0
-rwxr-xr-xsyntax/Curie.py (renamed from syntax/def_Curie.py)0
-rwxr-xr-xsyntax/HardBreak.py (renamed from syntax/def_HardBreak.py)0
-rwxr-xr-xsyntax/Header.py (renamed from syntax/def_Header.py)0
-rwxr-xr-xsyntax/LinkDefinition.py (renamed from syntax/def_LinkDefinition.py)0
-rwxr-xr-xsyntax/LinkLabel.py (renamed from syntax/def_LinkLabel.py)0
-rwxr-xr-xsyntax/LinkTitle.py (renamed from syntax/def_LinkTitle.py)0
-rwxr-xr-xsyntax/LinkedWords.py (renamed from syntax/def_LinkedWords.py)0
-rwxr-xr-xsyntax/List.py (renamed from syntax/def_List.py)0
-rwxr-xr-xsyntax/Markdown.py (renamed from syntax/def_Markdown.py)0
-rwxr-xr-xsyntax/NEWLINE.py (renamed from syntax/def_NEWLINE.py)0
-rwxr-xr-xsyntax/PRINTABLES.py (renamed from syntax/def_PRINTABLES.py)0
-rwxr-xr-xsyntax/Paragraph.py (renamed from syntax/def_Paragraph.py)0
-rwxr-xr-xsyntax/PlainWords.py (renamed from syntax/def_PlainWords.py)0
-rwxr-xr-xsyntax/PrefixDefinition.py (renamed from syntax/def_PrefixDefinition.py)0
-rwxr-xr-xsyntax/SEMPREFIX.py (renamed from syntax/def_SEMPREFIX.py)0
-rwxr-xr-xsyntax/SPACE.py (renamed from syntax/def_SPACE.py)0
-rwxr-xr-xsyntax/SemWord.py (renamed from syntax/def_SemWord.py)0
-rwxr-xr-xsyntax/SemWords.py (renamed from syntax/def_SemWords.py)0
-rwxr-xr-xsyntax/StyledWords.py (renamed from syntax/def_StyledWords.py)0
-rwxr-xr-xsyntax/Uri.py (renamed from syntax/def_Uri.py)0
-rwxr-xr-xsyntax/Words.py (renamed from syntax/def_Words.py)0
-rwxr-xr-xsyntax/_.py (renamed from syntax/def__.py)0
29 files changed, 41 insertions, 41 deletions
diff --git a/Makefile b/Makefile
index 5797dd9..2fbdabc 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ DIFF = $(strip $(or \
PANDOC = pandoc --from commonmark
#PANDOC = quarto pandoc --from commonmark
-SYNTAX_DIAGRAMS := $(patsubst %.py,%.svg,$(wildcard syntax/def_*.py))
+SYNTAX_DIAGRAMS := $(patsubst %.py,%.svg,$(wildcard syntax/*.py))
WORKFLOW_DIAGRAMS := $(patsubst %.cwl,%.svg,$(wildcard workflow/phase*.cwl))
diff --git a/_markdown.qmd b/_markdown.qmd
index c78ba87..80edfc1 100644
--- a/_markdown.qmd
+++ b/_markdown.qmd
@@ -107,7 +107,7 @@ used onwards in this paper.
For example, the above example is visually described
as seen in @fig-def-Markdown.
-![Syntax of `Markdown`.](syntax/def_Markdown.svg){#fig-def-Markdown}
+![Syntax of `Markdown`.](syntax/Markdown.svg){#fig-def-Markdown}
The diagram describes the possible order of elements,
laid out like trains on rails.
@@ -154,11 +154,11 @@ See @fig-def-blocks for syntax diagrams for those block types.
::: {#fig-def-blocks}
-![](syntax/def_Block.svg)
+![](syntax/Block.svg)
-![](syntax/def_Header.svg)
+![](syntax/Header.svg)
-![](syntax/def_Paragraph.svg)
+![](syntax/Paragraph.svg)
Syntax of `Block`, `Header` and `Paragraph`.
@@ -175,13 +175,13 @@ See @fig-def-words for their syntax diagrams.
::: {#fig-def-words}
-![](syntax/def_StyledWords.svg)
+![](syntax/StyledWords.svg)
-![](syntax/def_LinkedWords.svg)
+![](syntax/LinkedWords.svg)
-![](syntax/def_AnnotatedWords.svg)
+![](syntax/AnnotatedWords.svg)
-![](syntax/def_PlainWords.svg)
+![](syntax/PlainWords.svg)
Syntax of `StyledWords`, `LinkedWords`, `AnnotatedWords` and `PlainWords`.
@@ -194,7 +194,7 @@ consisting of list items,
each containing a block
(@fig-def-List).
-![Syntax of `List`.](syntax/def_List.svg){#fig-def-List}
+![Syntax of `List`.](syntax/List.svg){#fig-def-List}
-->
@@ -224,7 +224,7 @@ is marked with a dotted frame.
::: {#fig-def-extensions}
-![](syntax/def_AnnotatedWordsX.svg)
+![](syntax/AnnotatedWordsX.svg)
Syntax of `AnnotatedWords` and `LinkedWords`, extended with `SemWords`.
@@ -240,13 +240,13 @@ See @fig-def-additions for their syntax diagrams.
::: {#fig-def-additions}
-![](syntax/def_SemWords.svg)
+![](syntax/SemWords.svg)
-![](syntax/def_SemWord.svg)
+![](syntax/SemWord.svg)
-![](syntax/def_Curie.svg)
+![](syntax/Curie.svg)
-![](syntax/def_SEMPREFIX.svg)
+![](syntax/SEMPREFIX.svg)
Syntax of `SemWords`, `SemWord`, `Curie` and `SEMPREFIX`.
diff --git a/_syntax.qmd b/_syntax.qmd
index e0bfb4e..1f20be0 100644
--- a/_syntax.qmd
+++ b/_syntax.qmd
@@ -2,54 +2,54 @@ Subsets of Markdown syntax structure expressed as syntax diagrams,
using prioritised order (left-to-right and top-to-bottom),
regular expressions and the negative predicate from PEG notation.
-![Markdown](syntax/def_Markdown.svg)
+![Markdown](syntax/Markdown.svg)
-![Block](syntax/def_Block.svg)
+![Block](syntax/Block.svg)
-![Block with Semantic Markdown](syntax/def_BlockX.svg)
+![Block with Semantic Markdown](syntax/BlockX.svg)
-![Header](syntax/def_Header.svg)
+![Header](syntax/Header.svg)
-![List](syntax/def_List.svg)
+![List](syntax/List.svg)
-![LinkDefinition](syntax/def_LinkDefinition.svg)
+![LinkDefinition](syntax/LinkDefinition.svg)
-![PrefixDefinition](syntax/def_PrefixDefinition.svg)
+![PrefixDefinition](syntax/PrefixDefinition.svg)
-![Paragraph](syntax/def_Paragraph.svg)
+![Paragraph](syntax/Paragraph.svg)
-![Words](syntax/def_Words.svg)
+![Words](syntax/Words.svg)
-![StyledWords](syntax/def_StyledWords.svg)
+![StyledWords](syntax/StyledWords.svg)
-![LinkedWords](syntax/def_LinkedWords.svg)
+![LinkedWords](syntax/LinkedWords.svg)
-![AnnotatedWords](syntax/def_AnnotatedWords.svg)
+![AnnotatedWords](syntax/AnnotatedWords.svg)
-![AnnotatedWords_sem](syntax/def_AnnotatedWordsX.svg)
+![AnnotatedWords_sem](syntax/AnnotatedWordsX.svg)
-![LinkLabel](syntax/def_LinkLabel.svg)
+![LinkLabel](syntax/LinkLabel.svg)
-![LinkTitle](syntax/def_LinkTitle.svg)
+![LinkTitle](syntax/LinkTitle.svg)
-![SemWords](syntax/def_SemWords.svg)
+![SemWords](syntax/SemWords.svg)
-![PlainWords](syntax/def_PlainWords.svg)
+![PlainWords](syntax/PlainWords.svg)
-![SemWord](syntax/def_SemWord.svg)
+![SemWord](syntax/SemWord.svg)
-![Curie](syntax/def_Curie.svg)
+![Curie](syntax/Curie.svg)
-![Url](syntax/def_Uri.svg)
+![Url](syntax/Uri.svg)
-![HardBreak](syntax/def_HardBreak.svg)
+![HardBreak](syntax/HardBreak.svg)
-![_](syntax/def__.svg)
+![_](syntax/_.svg)
-![PRINTABLES](syntax/def_PRINTABLES.svg)
+![PRINTABLES](syntax/PRINTABLES.svg)
-![SEMPREFIX](syntax/def_SEMPREFIX.svg)
+![SEMPREFIX](syntax/SEMPREFIX.svg)
-![SPACE](syntax/def_SPACE.svg)
+![SPACE](syntax/SPACE.svg)
-![NEWLINE](syntax/def_NEWLINE.svg)
+![NEWLINE](syntax/NEWLINE.svg)
diff --git a/syntax/def_AnnotatedWords.py b/syntax/AnnotatedWords.py
index 729411b..729411b 100755
--- a/syntax/def_AnnotatedWords.py
+++ b/syntax/AnnotatedWords.py
diff --git a/syntax/def_AnnotatedWordsX.py b/syntax/AnnotatedWordsX.py
index cd2b530..cd2b530 100755
--- a/syntax/def_AnnotatedWordsX.py
+++ b/syntax/AnnotatedWordsX.py
diff --git a/syntax/def_Block.py b/syntax/Block.py
index 8dc618c..8dc618c 100755
--- a/syntax/def_Block.py
+++ b/syntax/Block.py
diff --git a/syntax/def_BlockX.py b/syntax/BlockX.py
index a2f230f..a2f230f 100755
--- a/syntax/def_BlockX.py
+++ b/syntax/BlockX.py
diff --git a/syntax/def_Curie.py b/syntax/Curie.py
index a78815b..a78815b 100755
--- a/syntax/def_Curie.py
+++ b/syntax/Curie.py
diff --git a/syntax/def_HardBreak.py b/syntax/HardBreak.py
index 58d4b17..58d4b17 100755
--- a/syntax/def_HardBreak.py
+++ b/syntax/HardBreak.py
diff --git a/syntax/def_Header.py b/syntax/Header.py
index 9d4b351..9d4b351 100755
--- a/syntax/def_Header.py
+++ b/syntax/Header.py
diff --git a/syntax/def_LinkDefinition.py b/syntax/LinkDefinition.py
index e76a0e1..e76a0e1 100755
--- a/syntax/def_LinkDefinition.py
+++ b/syntax/LinkDefinition.py
diff --git a/syntax/def_LinkLabel.py b/syntax/LinkLabel.py
index 89ffd27..89ffd27 100755
--- a/syntax/def_LinkLabel.py
+++ b/syntax/LinkLabel.py
diff --git a/syntax/def_LinkTitle.py b/syntax/LinkTitle.py
index 0322450..0322450 100755
--- a/syntax/def_LinkTitle.py
+++ b/syntax/LinkTitle.py
diff --git a/syntax/def_LinkedWords.py b/syntax/LinkedWords.py
index 7c564d5..7c564d5 100755
--- a/syntax/def_LinkedWords.py
+++ b/syntax/LinkedWords.py
diff --git a/syntax/def_List.py b/syntax/List.py
index a6d8afc..a6d8afc 100755
--- a/syntax/def_List.py
+++ b/syntax/List.py
diff --git a/syntax/def_Markdown.py b/syntax/Markdown.py
index 485270c..485270c 100755
--- a/syntax/def_Markdown.py
+++ b/syntax/Markdown.py
diff --git a/syntax/def_NEWLINE.py b/syntax/NEWLINE.py
index d995861..d995861 100755
--- a/syntax/def_NEWLINE.py
+++ b/syntax/NEWLINE.py
diff --git a/syntax/def_PRINTABLES.py b/syntax/PRINTABLES.py
index 417b7f5..417b7f5 100755
--- a/syntax/def_PRINTABLES.py
+++ b/syntax/PRINTABLES.py
diff --git a/syntax/def_Paragraph.py b/syntax/Paragraph.py
index 24e77fe..24e77fe 100755
--- a/syntax/def_Paragraph.py
+++ b/syntax/Paragraph.py
diff --git a/syntax/def_PlainWords.py b/syntax/PlainWords.py
index 4af2d12..4af2d12 100755
--- a/syntax/def_PlainWords.py
+++ b/syntax/PlainWords.py
diff --git a/syntax/def_PrefixDefinition.py b/syntax/PrefixDefinition.py
index d838c6b..d838c6b 100755
--- a/syntax/def_PrefixDefinition.py
+++ b/syntax/PrefixDefinition.py
diff --git a/syntax/def_SEMPREFIX.py b/syntax/SEMPREFIX.py
index c1048f0..c1048f0 100755
--- a/syntax/def_SEMPREFIX.py
+++ b/syntax/SEMPREFIX.py
diff --git a/syntax/def_SPACE.py b/syntax/SPACE.py
index a08904f..a08904f 100755
--- a/syntax/def_SPACE.py
+++ b/syntax/SPACE.py
diff --git a/syntax/def_SemWord.py b/syntax/SemWord.py
index 243c707..243c707 100755
--- a/syntax/def_SemWord.py
+++ b/syntax/SemWord.py
diff --git a/syntax/def_SemWords.py b/syntax/SemWords.py
index 83867ef..83867ef 100755
--- a/syntax/def_SemWords.py
+++ b/syntax/SemWords.py
diff --git a/syntax/def_StyledWords.py b/syntax/StyledWords.py
index c387c1a..c387c1a 100755
--- a/syntax/def_StyledWords.py
+++ b/syntax/StyledWords.py
diff --git a/syntax/def_Uri.py b/syntax/Uri.py
index 028c3e1..028c3e1 100755
--- a/syntax/def_Uri.py
+++ b/syntax/Uri.py
diff --git a/syntax/def_Words.py b/syntax/Words.py
index 89aff20..89aff20 100755
--- a/syntax/def_Words.py
+++ b/syntax/Words.py
diff --git a/syntax/def__.py b/syntax/_.py
index a7ec2c1..a7ec2c1 100755
--- a/syntax/def__.py
+++ b/syntax/_.py