Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
git-seminar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Maximilian Konzack
git-seminar
Commits
587dd51b
Verified
Commit
587dd51b
authored
5 years ago
by
ck85nori
Browse files
Options
Downloads
Patches
Plain Diff
updates pandoc papers
parent
58db4c97
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
Makefile
+7
-5
7 additions, 5 deletions
Makefile
pandoc-papers.md
+191
-0
191 additions, 0 deletions
pandoc-papers.md
with
199 additions
and
5 deletions
.gitignore
+
1
−
0
View file @
587dd51b
...
@@ -6,3 +6,4 @@ img/git-remote-solo.svg
...
@@ -6,3 +6,4 @@ img/git-remote-solo.svg
img/license-chooser.svg
img/license-chooser.svg
img/motivation-throwaway-playground.svg
img/motivation-throwaway-playground.svg
img/staging-area.svg
img/staging-area.svg
*.pdf
This diff is collapsed.
Click to expand it.
Makefile
+
7
−
5
View file @
587dd51b
...
@@ -4,11 +4,13 @@ SUBDIRS = \
...
@@ -4,11 +4,13 @@ SUBDIRS = \
$(SUBDIRS)
:
$(SUBDIRS)
:
$(
MAKE
)
-C
$@
$(
MAKE
)
-C
$@
paper.html
:
paper.md
pandoc-papers.pdf
:
paper.md
pandoc
-t
revealjs
-s
paper.md
-o
paper.html
pandoc
\
-V
aspectratio
=
169
\
paper.pdf
:
paper.md
-V
institute
=
iDiv
\
pandoc
-s
paper.md
-o
paper.pdf
-V
theme
=
Frankfurt
\
-V
navigation
=
horizontal
\
-s
paper.md
-t
beamer
-o
pandoc-papers.pdf
all
:
subdirs
all
:
subdirs
...
...
This diff is collapsed.
Click to expand it.
paper.md
→
pandoc-
paper
s
.md
+
191
−
0
View file @
587dd51b
...
@@ -13,110 +13,120 @@
...
@@ -13,110 +13,120 @@
-
automated publishing
-
automated publishing
-
high quality typesetting
-
high quality typesetting
# tool
overview
# tool
s
## markdown
## pandoc
### source: markup
-
usually
**Markdown**
-
less powerful than LaTeX, but inline LaTeX can be used
### target**s**
-
high quality PDF via LaTeX
-
others: html, epub, docx, odt
### templates
-
different journals
-
iDiv branding
-
draft branding
## Markdown
### rendered
-
**easy to learn**
, read and write
-
**easy to learn**
, read and write
-
no distractions to
*procrastinate*
-
no distractions to
*procrastinate*
-
inline LaTeX if needed: $a^2 + b^2 = c^2$
-
inline LaTeX if needed: $a^2 + b^2 = c^2$
```
markdown
### source
```
- **easy to learn**, read and write
- **easy to learn**, read and write
- no distractions to *procrastinate*
- no distractions to *procrastinate*
-
no fiddling with
`WYSIWYG`
- inline LaTeX if needed: $a^2 + b^2 = c^2$
- inline LaTeX if needed: $a^2 + b^2 = c^2$
```
```
## git
## git & GitLab
### git
-
version control
-
version control
-
free backup
-
free backup
-
easy revert
## GitLab
##
#
GitLab
: [https://git.idiv.de](https://git.idiv.de)
-
self-hosted, full control
-
self-hosted, full
access
control
-
communication: discussion and reviews
-
communication: discussion and reviews
-
continuous deployment to e.g. cloud storage
-
continuous deployment to e.g. cloud storage
## pandoc #1
## visualization
-
render markup source ...
-
usually
**Markdown**
-
markup less powerful than LaTeX
-
but inline LaTeX can be used
-
... to high quality target
-
PDF via LaTeX
## pandoc #2
### supports templates
-
different journals
-
iDiv branding
-
draft branding
## make
-
automate build
-
use visualization tools
# optional tools
### Graphviz/dot
## Graphviz/dot
-
graph visualization language
-
graph visualization language
-
define flowcharts with code
-
define flowcharts with code
-
**dot**
handles rendering
-
**dot**
handles rendering
-
use
**make**
to build
-
use
**make**
to build
## R scripts
##
#
R scripts
-
CSV2charts
-
add results as CSV to repository
-
visualize data in CSV to charts
-
use
**make**
to build
-
use
**make**
to build
# branching model
## make
## multi master
-
paper with many journals, different paper text
-
one branch per journal
-
carefully
**cherry-pick**
additions to all masters
##
trunk based development
##
# simple build tool
-
same paper text
-
glues everything together
-
different themes for journals
-
automated build
-
journal-themes via sub-module
-
render images from
**dot**
and
**CSV**
sources
-
make themes reusable
-
build PDF
# workflow
# workflow
## workflow #1
## workflow #1
write paper in Markdown
### project
-
set up project in GitLab
-
use
**pandoc papers**
project template
-
project template is managed by our community
-
contains Makefile, README, themes, CD, etc.
-
add contributors / collaborators
### writing
-
start writing the main document in Markdown
-
use good text editor you're comfortable with
## workflow #2
## workflow #2
### discussion / reviews
-
issues
### communication
-
merge requests
-
commit comments
invite collaborators: send link to GitLab
-
use GitLab project as main communication platform
-
discuss and review in
-
commit comments
-
issues
-
merge requests
-
invite collaborators: send link to GitLab project
## workflow #3
## workflow #3
### continuous deployment
### continuous deployment
-
deploy PDF to cloud storage
-
deploy PDF to cloud storage
:
-
draft watermark template if commit not tagged
[
https://portal.idiv.de/nextcloud/
](
https://portal.idiv.de/nextcloud/
)
-
se
nd others link to PDF
i
n
c
loud stora
ge
-
u
se
template with
**DRAFT**
watermark
i
f
c
ommit not tag
ge
d
## workflow #4
### templates
### templates
-
write templates across teams
-
manage templates in our community
-
use git sub-modules to include
-
keep in separate git repository
-
use git sub-module to include
-
share with all@idiv / world
-
share with all@idiv / world
# misc
# misc
...
@@ -124,34 +134,58 @@ invite collaborators: send link to GitLab
...
@@ -124,34 +134,58 @@ invite collaborators: send link to GitLab
## helpful commands
## helpful commands
```
bash
```
bash
# better diff command for text
:
# better diff command for text
git diff
-w
--ignore-blank-lines
--word-diff
git diff
-w
--ignore-blank-lines
--word-diff
# watch source and build if changes
# watch source and build if changes
watchexec
-w
paper.md
--
make paper.pdf
watchexec
-w
paper.md
--
make paper.pdf
```
```
## unsolved problems
## community #1
### pandoc paper project template
-
`README.md`
with instructions how to build
-
`Makefile`
with general build instructions
-
include pandoc LaTeX themes via sub-module
-
CD pipeline instructions
-
`main.md`
with hello world document using includes for chapters
-
example
**dot**
file for flowchart
-
example
**CSV**
and
**R script**
to generate charts
-
`.gitignore`
with default products
## community #2
### prose diff tool
-
these issues might help:
[
gitlab-ce#25650
](
https://gitlab.com/gitlab-org/gitlab-ce/issues/25650
)
,
[
gitlab-ce#26804
](
https://gitlab.com/gitlab-org/gitlab-ce/issues/26804
)
-
[
https://github.blog/2014-02-14-rendered-prose-diffs/
](
https://github.blog/2014-02-14-rendered-prose-diffs/
)
### continuous deployment
-
to wrap or not to wrap
-
true paragraph-based diff
-
we don't have solid CD yet
-
we don't have solid CD yet
-
can CD deploy to nextcloud share?
-
can CD deploy to Nextcloud share?
-
review-able PDF template
-
link to join discussion at every paragraph
### others
-
repository with LaTeX templates for pandoc
-
**review-able**
PDF template with link to join discussion at every paragraph
# your turn
# your turn
## discussion
## discussion
-
what do you use today?
-
Which tools do you currently use?
-
what annoys you the most?
-
What are your workflows?
-
How do you communicate, collaborate and review?
-
What annoys you the most? (i.e. how can we improve)
## let's use it
## let's use it
-
install tools
-
install tools
-
install editor
-
set up git project
-
set up git project
-
convert existing
stuff
to
m
arkdown
-
convert existing
documents
to
M
arkdown
-
build with pandoc
-
build with pandoc
# EOF
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