The UFZ services GitLab and Mattermost will be unavailable on Monday, October 25 from 06:00 AM to 08:00 AM due to maintenance work.

Commit ce3dc08b authored by Martin Lange's avatar Martin Lange
Browse files

Merge branch 'feature/update-yarner-version' into 'master'

Upgrade to new yarner version, install yarner using cargo

See merge request !9
parents b8fbe53a f8383022
Pipeline #14760 passed with stage
in 15 seconds
image: openjdk:15-jdk image: openjdk:15-jdk
variables: variables:
YARNER_VERSION: 0.1.4 YARNER_VERSION: 0.2.0
before_script: before_script:
- curl -L -o- https://github.com/mlange-42/yarner/releases/download/${YARNER_VERSION}/yarner-${YARNER_VERSION}-linux.tar.gz | tar xz - curl -L -o- https://github.com/mlange-42/yarner/releases/download/${YARNER_VERSION}/yarner-${YARNER_VERSION}-linux.tar.gz | tar xz
......
...@@ -574,7 +574,7 @@ Grimm V, Berger U, DeAngelis DL, Polhill G, Giske J, Railsback SF. 2010. **The O ...@@ -574,7 +574,7 @@ Grimm V, Berger U, DeAngelis DL, Polhill G, Giske J, Railsback SF. 2010. **The O
## Appendix ## Appendix
The [Appendix](md/appendix.md) describes code that is not vital for understanding the model or the ECS concept. The @[Appendix](md/appendix.md) describes code that is not vital for understanding the model or the ECS concept.
* [Graphics](md/appendix.md#graphics) * [Graphics](md/appendix.md#graphics)
* [Utilities](md/appendix.md#utilities) * [Utilities](md/appendix.md#utilities)
......
[md] [parser]
# The sequence that identifies the start and end of a fenced code block # The sequence that identifies the start and end of a fenced code block
fence_sequence = "```" fence_sequence = "```"
...@@ -7,14 +7,12 @@ fence_sequence = "```" ...@@ -7,14 +7,12 @@ fence_sequence = "```"
# Allows for normal Markdown fences in code blocks # Allows for normal Markdown fences in code blocks
fence_sequence_alt = "~~~" fence_sequence_alt = "~~~"
# The sequence that separates the language from the name of the code block after the fence
block_name_start = " - "
# Parsed comments are stripped from the code and written to an `<aside></aside>` block after the code when printing. # Parsed comments are stripped from the code and written to an `<aside></aside>` block after the code when printing.
# If false, the comments are just written back into the code. # If false, the comments are just written back into the code.
comments_as_aside = false comments_as_aside = false
# The sequence to identify a comment which should be omitted from the compiled code, # The sequence to identify a comment which should be omitted from the compiled code,
# and may be rendered as an `<aside>` if `comments_as_aside` is set. # and may be rendered as an `<aside>` if `comments_as_aside` is set.
# Text after a comment in the first line of a code block gives the block's name
comment_start = "///" comment_start = "///"
# The sequence to identify the start of a meta variable interpolation. # The sequence to identify the start of a meta variable interpolation.
...@@ -23,7 +21,7 @@ interpolation_start = "@{" ...@@ -23,7 +21,7 @@ interpolation_start = "@{"
interpolation_end = "}" interpolation_end = "}"
# The sequence to identify the start of a macro invocation. # The sequence to identify the start of a macro invocation.
macro_start = "// ==> " macro_start = "// ==>"
# The sequence to identify the end of a macro invocation. # The sequence to identify the end of a macro invocation.
macro_end = "." macro_end = "."
...@@ -32,6 +30,10 @@ transclusion_start = "@{{" ...@@ -32,6 +30,10 @@ transclusion_start = "@{{"
# The sequence to identify the end of a transclusion. # The sequence to identify the end of a transclusion.
transclusion_end = "}}" transclusion_end = "}}"
# Prefix for links that should be followed during processing.
# Should be RegEx-compatible.
link_prefix = "@"
# The sequence to split variables into name and value. # The sequence to split variables into name and value.
variable_sep = ":" variable_sep = ":"
...@@ -45,16 +47,20 @@ hidden_prefix = "hidden:" ...@@ -45,16 +47,20 @@ hidden_prefix = "hidden:"
# default_language = "java" # default_language = "java"
[paths] [paths]
# Root directory. All paths are relative to this.
root = "."
# Code output path. # Code output path.
code = "code/" code = "code/"
# Docs output path. # Docs output path.
docs = "docs/" docs = "docs/"
# The input source file(s) as glob pattern(s). # The input source file(s) as glob pattern(s).
files = ["README.md"] files = ["README.md"]
# File(s) to include in code output (unprocessed), as glob pattern(s). # File(s) to include in code output (unprocessed), as glob pattern(s).
code_files = ["gradle/**/*"] code_files = ["gradle/**/*"]
# Allows to modify paths of copied code files. Replaces path components. Optional. # Allows to modify paths of copied code files. Replaces path components. Optional.
code_paths = ["-"] code_paths = ["-"]
## File(s) to include in docs output (unprocessed), as glob pattern(s). ## File(s) to include in docs output (unprocessed), as glob pattern(s).
# doc_files = ["**/*.png", "**/*.jpg"] # doc_files = ["**/*.png", "**/*.jpg"]
## Entrypoint block name. Optional. If not supplied, unnamed code blocks are used. ## Entrypoint block name. Optional. If not supplied, unnamed code blocks are used.
......
...@@ -54,7 +54,12 @@ cd ecs-tutorial ...@@ -54,7 +54,12 @@ cd ecs-tutorial
yarner yarner
``` ```
> This requires [Yarner](https://github.com/mlange-42/yarner) to be installed on your machine. Download Yarner [here](https://github.com/mlange-42/yarner/releases/). Yarner needs to be on the PATH, or you need use the full path to Yarner: > This requires [Yarner](https://github.com/mlange-42/yarner) to be installed on your machine. Download Yarner [here](https://github.com/mlange-42/yarner/releases/), or install using `cargo` if you have Rust installed:
> ```
> cargo install --git https://github.com/mlange-42/yarner yarner
> ```
>
> Yarner needs to be on the PATH, or you need use the full path to Yarner:
> >
> ``` > ```
> C:/path/to/yarner/yarner > C:/path/to/yarner/yarner
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment