Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cours_prog
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
yassin.elhakoun
cours_prog
Commits
4995f843
Verified
Commit
4995f843
authored
3 years ago
by
orestis.malaspin
Browse files
Options
Downloads
Patches
Plain Diff
corrected problem with markdown merge
parent
ca2f6be7
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
slides/Makefile
+3
-3
3 additions, 3 deletions
slides/Makefile
slides/intro.md
+1
-1
1 addition, 1 deletion
slides/intro.md
slides/metadata.yaml
+2
-2
2 additions, 2 deletions
slides/metadata.yaml
with
6 additions
and
6 deletions
slides/Makefile
+
3
−
3
View file @
4995f843
...
...
@@ -33,10 +33,10 @@ markdown: $(MARKDOWN) # La markdown les cibles %.markdown
pandoc
-s
$(
OPTIONS
)
$(
REVEALOPTIONS
)
-o
$@
$^
%.markdown
:
metadata.yaml %.md yq
sed
'1 { /^---/ { :a N; /\n---/! ba; d} }'
$
<
>
no_header
grep
-v
-F
-x
-f
no_header
$
<
>
header.yaml
sed
'1 { /^---/ { :a N; /\n---/! ba; d} }'
$
(
shell
echo
$(
word 2,
$^
))
>
no_header
grep
-v
-F
-x
-f
no_header
$
(
shell
echo
$(
word 2,
$^
))
>
header.yaml
echo
"---"
>
tmp.yaml
./yq_linux_amd64 merge
metadata.yaml header
.yaml
>>
tmp.yaml
./yq_linux_amd64 merge
header.yaml metadata
.yaml
>>
tmp.yaml
cat
tmp.yaml no_header
>
$@
rm
no_header header.yaml tmp.yaml
...
...
This diff is collapsed.
Click to expand it.
slides/intro.md
+
1
−
1
View file @
4995f843
...
...
@@ -6,7 +6,7 @@ patat:
margins
:
left
:
10
right
:
10
...
---
# La hotline
...
...
This diff is collapsed.
Click to expand it.
slides/metadata.yaml
+
2
−
2
View file @
4995f843
---
subtitle
:
"
Programmation
séquentielle
en
C,
2021-2022"
author
:
"
Orestis
Malaspinas
(A401),
ISC,
HEPIA"
institute
:
Inspirés des slides de F. Glück
lang
:
fr-CH
institute
:
"
Inspirés
des
slides
de
F.
Glück
"
lang
:
"
fr-CH
"
revealjs-url
:
/reveal.js
mathjaxurl
:
"
https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS_HTML"
---
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment