diff options
| -rwxr-xr-x | build-member.sh | 4 | ||||
| -rwxr-xr-x | build-programs.py | 2 | ||||
| -rw-r--r-- | en/legal.sh | 2 | ||||
| -rw-r--r-- | en/quartet.sh | 2 | ||||
| -rw-r--r-- | en/sitemap.sh | 2 | ||||
| -rw-r--r-- | légal.sh | 2 | ||||
| -rw-r--r-- | plan.sh | 2 | ||||
| -rw-r--r-- | quatuor.sh | 2 | ||||
| -rw-r--r-- | settings.sh | 2 |
9 files changed, 12 insertions, 8 deletions
diff --git a/build-member.sh b/build-member.sh index c980d1e..d171dbb 100755 --- a/build-member.sh +++ b/build-member.sh @@ -8,6 +8,8 @@ outdir=$3 uri=$4 output="${outdir}/${uri}" +. settings.sh + firstname () { local -r fullname=$1 @@ -32,7 +34,7 @@ EOF pandoc-inline () { - pandoc | sed -r 's,^<p>(.+)</p>$,\1,' + ${pandoc} | sed -r 's,^<p>(.+)</p>$,\1,' } generate-main () diff --git a/build-programs.py b/build-programs.py index fbf04ab..e914e66 100755 --- a/build-programs.py +++ b/build-programs.py @@ -46,7 +46,7 @@ def piece(p): def pandoc(md): return run( - ('pandoc',), + ('pandoc', '--wrap=none'), input=md, capture_output=True, text=True, check=True ).stdout diff --git a/en/legal.sh b/en/legal.sh index 9e2610f..03bf43b 100644 --- a/en/legal.sh +++ b/en/legal.sh @@ -1,7 +1,7 @@ add-legal () { sed -i \ - -e /'{LEGAL}'/'r '<(pandoc en/legal.md) \ + -e /'{LEGAL}'/'r '<(${pandoc} en/legal.md) \ -e /'{LEGAL}'/'c\' \ $1 } diff --git a/en/quartet.sh b/en/quartet.sh index c0f7762..555ec2f 100644 --- a/en/quartet.sh +++ b/en/quartet.sh @@ -1,7 +1,7 @@ add-bio () { sed -i \ - -e /'{BIO}'/'r '<(pandoc en/quartet.md) \ + -e /'{BIO}'/'r '<(${pandoc} en/quartet.md) \ -e /'{BIO}'/'c\' \ $1 } diff --git a/en/sitemap.sh b/en/sitemap.sh index 50d1746..a396f90 100644 --- a/en/sitemap.sh +++ b/en/sitemap.sh @@ -1,7 +1,7 @@ add-plan () { sed -i \ - -e /'{PLAN}'/'r '<(pandoc en/sitemap.md) \ + -e /'{PLAN}'/'r '<(${pandoc} en/sitemap.md) \ -e /'{PLAN}'/'c\' \ $1 } @@ -1,7 +1,7 @@ add-legal () { sed -i \ - -e /'{LEGAL}'/'r '<(pandoc légal.md) \ + -e /'{LEGAL}'/'r '<(${pandoc} légal.md) \ -e /'{LEGAL}'/'c\' \ $1 } @@ -1,7 +1,7 @@ add-plan () { sed -i \ - -e /'{PLAN}'/'r '<(pandoc plan.md) \ + -e /'{PLAN}'/'r '<(${pandoc} plan.md) \ -e /'{PLAN}'/'c\' \ $1 } @@ -1,7 +1,7 @@ add-bio () { sed -i \ - -e /'{BIO}'/'r '<(pandoc quatuor.md) \ + -e /'{BIO}'/'r '<(${pandoc} quatuor.md) \ -e /'{BIO}'/'c\' \ $1 } diff --git a/settings.sh b/settings.sh index 3aee6be..3d44e77 100644 --- a/settings.sh +++ b/settings.sh @@ -1 +1,3 @@ domain=quatuorbellefeuille.com + +pandoc='pandoc --wrap=none' |