diff options
| -rw-r--r-- | .circleci/config.yml | 130 | ||||
| -rw-r--r-- | .github/FUNDING.yml | 1 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE | 11 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 191 | ||||
| -rw-r--r-- | .github/workflows/commit-validation.yml | 38 | ||||
| -rw-r--r-- | .github/workflows/format-validation.yml | 88 | ||||
| -rw-r--r-- | .github/workflows/lint.yml | 30 | ||||
| -rw-r--r-- | .github/workflows/nightly.yml | 84 | ||||
| -rw-r--r-- | .github/workflows/release-candidate.yml | 84 | ||||
| -rw-r--r-- | .mailmap | 37 | ||||
| -rw-r--r-- | .travis.yml | 54 | ||||
| -rw-r--r-- | INSTALL.md | 412 | ||||
| -rw-r--r-- | Makefile | 108 | ||||
| -rw-r--r-- | hie.yaml | 37 | ||||
| -rw-r--r-- | stack.yaml | 33 | ||||
| -rw-r--r-- | test/lhs-test.html | 1 |
16 files changed, 8 insertions, 1331 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 08c09a575..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,130 +0,0 @@ -version: "2.1" - -env: &env - environment: - LC_ALL: "C.UTF-8" - docker: - - image: fpco/stack-build:lts-13 - -#----------------------------------------------------------------------------- -# Common utility stuff, not to be modified usually -#----------------------------------------------------------------------------- - -preinstall: &preinstall - run: | - echo 'export PATH=/opt/cabal/bin:/opt/ghc/bin:$PATH' >> $BASH_ENV - source $BASH_ENV - apt-get update - -restore: &restore - # Needs to happen after installing ca-certificates - restore_cache: - key: v1-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }} - -save: &save - save_cache: - key: v1-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }} - paths: - - ~/.cabal - - ~/.ghc - - ~/.local - - ~/.stack - -commands: - cabal_build: - parameters: - ghcversion: - type: string - steps: - - checkout - - *preinstall - - *restore - - run: - name: install cabal - command: apt-get install -y cabal-install-2.4 - - run: - name: install ghc - command: | - apt-get install -y ghc-<< parameters.ghcversion >> - - run: - name: build and test project - command: | - set -e - cabal v2-update - TMPDIR=`mktemp -d -t circleci.XXXXXXX` - cabal v2-sdist --output-dir=${TMPDIR} - cd ${TMPDIR} - tar xvzf *.tar.gz - cd * - cabal v2-build -w ghc-<< parameters.ghcversion >> -j2 --disable-optimization --dependencies-only --enable-tests --enable-benchmarks - cabal v2-build -w ghc-<< parameters.ghcversion >> -j2 --disable-optimization --enable-tests --enable-benchmarks 2>build.log - cat build.log - # fail if we had warnings in local build - # this is to work around the fact that cabal v2 doesn't allow - # us to use -Werror for just local build: - # https://github.com/haskell/cabal/issues/4247 - ! grep -q "[Ww]arning:" build.log - cabal v2-test -w ghc-<< parameters.ghcversion >> -j2 --disable-optimization --enable-tests - cabal v2-haddock -w ghc-<< parameters.ghcversion >> - cabal check - - *save - -#----------------------------------------------------------------------------- -# Build matrix -#----------------------------------------------------------------------------- - -jobs: - cabal-ghc-8_8_1: - <<: *env - steps: - - cabal_build: - ghcversion: 8.8.1 - - cabal-ghc-8_6_5: - <<: *env - steps: - - cabal_build: - ghcversion: 8.6.5 - - cabal-ghc-8_4_4: - <<: *env - steps: - - cabal_build: - ghcversion: 8.4.4 - - cabal-ghc-8_2_2: - <<: *env - steps: - - cabal_build: - ghcversion: 8.2.2 - - cabal-ghc-8_0_2: - <<: *env - steps: - - cabal_build: - ghcversion: 8.0.2 - - stack-ghc-8_6: - <<: *env - steps: - - checkout - - *preinstall - - *restore - - run: | - set -e - apt-get install -y ghc-8.6.5 - stack update - stack test --system-ghc --fast --ghc-options="-Werror" . - - *save - -workflows: - version: "2.1" - build: - jobs: - - cabal-ghc-8_6_5 - - cabal-ghc-8_4_4 - - cabal-ghc-8_2_2 - - cabal-ghc-8_0_2 - - stack-ghc-8_6 - # - cabal-ghc-8_8_1 - diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index f4ef3ba4b..000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -github: [jgm,tarleb] diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE deleted file mode 100644 index 83336e684..000000000 --- a/.github/ISSUE_TEMPLATE +++ /dev/null @@ -1,11 +0,0 @@ -Asking a question? -Please use the pandoc-discuss mailing list instead: -https://groups.google.com/forum/#!forum/pandoc-discuss -This tracker is for bug reports and enhancement requests. - -Reporting a bug? -Please include your pandoc version and an example that allows us -to reproduce the problem (complete input, exact command line -used, expected and actual output). The smaller the example, the -better. - diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 4debe1ebe..000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,191 +0,0 @@ -name: CI tests - -on: - push: - branches: - - '*' - - '!rc/*' - paths-ignore: - - 'doc/**' - - 'MANUAL.txt' - - '*.md' - - 'RELEASE_CHECKLIST' - - 'BUGS' - - 'changelog' - - 'README.template' - - 'appveyor.yml' - - 'tools/**' - - 'linux/**' - - 'macos/**' - - 'windows/**' - - 'man/**' - pull_request: - paths-ignore: - - 'doc/**' - - 'MANUAL.txt' - - '*.md' - - 'RELEASE_CHECKLIST' - - 'BUGS' - - 'changelog' - - 'README.template' - - 'appveyor.yml' - - 'tools/**' - - 'linux/**' - - 'macos/**' - - 'windows/**' - - 'man/**' - -jobs: - linux: - - runs-on: ubuntu-18.04 - strategy: - fail-fast: true - matrix: - versions: - - ghc: '8.0.2' - cabal: '2.4' - - ghc: '8.2.2' - cabal: '2.4' - - ghc: '8.4.4' - cabal: '2.4' - - ghc: '8.6.5' - cabal: '3.2' - - ghc: '8.8.4' - cabal: '3.2' - - ghc: '8.10.2' - cabal: '3.2' - steps: - - uses: actions/checkout@v2 - - # need to install older cabal/ghc versions from ppa repository - - - name: Install recent cabal/ghc - uses: actions/setup-haskell@v1.1.3 - with: - ghc-version: ${{ matrix.versions.ghc }} - cabal-version: ${{ matrix.versions.cabal }} - - # declare/restore cached things - # caching doesn't work for scheduled runs yet - # https://github.com/actions/cache/issues/63 - - - name: Cache cabal global package db - id: cabal-global - uses: actions/cache@v2 - with: - path: | - ~/.cabal - key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }} - - - name: Cache cabal work - id: cabal-local - uses: actions/cache@v2 - with: - path: | - dist-newstyle - key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local - - - name: Install dependencies - run: | - cabal v2-update - cabal v2-build --dependencies-only --enable-tests --disable-optimization - - name: Build and test - run: | - cabal v2-build --enable-tests --disable-optimization 2>&1 | tee build.log - # fail if warnings in local build - ! grep -q ": *[Ww]arning:" build.log || exit 1 - cabal v2-test --disable-optimization - - windows: - - runs-on: windows-2019 - - steps: - - uses: actions/checkout@v2 - - # We should have ghc 8.10, cabal, stack pre-installed - # - uses: actions/setup-haskell@v1.1.3 - # with: - # enable-stack: true - # stack-version: 'latest' - - # declare/restore cached things - # caching doesn't work for scheduled runs yet - # https://github.com/actions/cache/issues/63 - - - name: Cache stack global package db - id: stack-global-package-db - uses: actions/cache@v2 - with: - path: | - C:\Users\runneradmin\AppData\Roaming\stack\ - key: ${{ runner.os }}-appdata-roaming-stack-${{ hashFiles('stack.yaml') }} - - # stack's local package dbs for the project and each package - # - name: Cache .stack-work - # uses: actions/cache@v1 - # with: - # path: .stack-work - # key: ${{ runner.os }}-stack-work-${{ hashFiles('stack.yaml') }} - # restore-keys: ${{ runner.os }}-stack-work - - - name: Install dependencies - run: | - stack update - stack install happy - stack test --dependencies-only --fast - - name: Build and test - shell: cmd - run: | - stack test --fast --test-arguments=--hide-successes - - macos: - - runs-on: macOS-10.15 - strategy: - fail-fast: true - matrix: - versions: - - ghc: '8.8.4' - cabal: '3.2' - - steps: - - uses: actions/checkout@v2 - - - name: Install recent cabal/ghc - uses: actions/setup-haskell@v1.1.3 - with: - ghc-version: ${{ matrix.versions.ghc }} - cabal-version: ${{ matrix.versions.cabal }} - - # declare/restore cached things - # caching doesn't work for scheduled runs yet - # https://github.com/actions/cache/issues/63 - - - name: Cache cabal global package db - id: cabal-global - uses: actions/cache@v2 - with: - path: | - ~/.cabal - key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }} - - - name: Cache cabal work - id: cabal-local - uses: actions/cache@v2 - with: - path: | - dist-newstyle - key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local - - - name: Install dependencies - run: | - cabal v2-update - cabal v2-build --dependencies-only --enable-tests --disable-optimization - - name: Build and test - run: | - cabal v2-build --enable-tests --disable-optimization 2>&1 | tee build.log - # fail if warnings in local build - ! grep -q ": *[Ww]arning:" build.log || exit 1 - cabal v2-test --disable-optimization diff --git a/.github/workflows/commit-validation.yml b/.github/workflows/commit-validation.yml deleted file mode 100644 index 0b52e94e5..000000000 --- a/.github/workflows/commit-validation.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: commit-validation -on: [ push, pull_request ] - -jobs: - check-commit-msg-length: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Check commit message length - run: | - # Get last commit messages - if [ "${{github.event_name}}" = "push" ]; then - if [ "${{github.event.before}}" = "0000000000000000000000000000000000000000" ]; then - # We are on a new branch - current="$(echo '${{github.ref}}' | sed 's!^refs/heads!origin!')" - readarray -t other < <(git show-ref | awk -F' ' '{ sub(/^refs\/remotes\//,"",$NF); }($NF != "'"$current"'"){print "^" $NF;}') - LOG_RANGE=( "$current" "${other[@]}" ) - unset current other - else - # We are on existing branch - LOG_RANGE=( "${{github.event.before}}.." ) - fi - elif [ "${{github.event_name}}" = "pull_request" ]; then - LOG_RANGE=( "origin/${{github.base_ref}}.." ) - fi - if [[ -v LOG_RANGE ]]; then - if git log --no-merges --pretty=format:"%s" "${LOG_RANGE[@]}" -- | grep -qE "^[^#].{78}"; then - echo -e "Last commit log contains a line with more than 78 characters:\n" - git log --no-merges --pretty=format:"%h: %s" "${LOG_RANGE[@]}" -- | grep -E "^[^:]+: [^#].{78}" - echo - exit 1 - else - echo "Commit log looks good." - fi - unset LOG_RANGE - else - echo "Not checking commits on ${{github.event_name}}" - fi diff --git a/.github/workflows/format-validation.yml b/.github/workflows/format-validation.yml deleted file mode 100644 index a0a5b34b7..000000000 --- a/.github/workflows/format-validation.yml +++ /dev/null @@ -1,88 +0,0 @@ -name: Format validation - -on: - push: - branches: - - '*' - - '!rc/*' - paths: - - 'test/writer.jats_articleauthoring' - - 'test/writer.jats_publishing' - - 'test/writer.jats_archiving' - - 'test/tables.jats_archiving' - - 'test/tables/nordics.jats_archiving' - - 'test/tables/planets.jats_archiving' - - 'test/tables/students.jats_archiving' - pull_request: - branches: - - '*' - - '!rc/*' - paths: - - 'test/writer.jats_articleauthoring' - - 'test/writer.jats_publishing' - - 'test/writer.jats_archiving' - - 'test/tables.jats_archiving' - - 'test/tables/nordics.jats_archiving' - - 'test/tables/planets.jats_archiving' - - 'test/tables/students.jats_archiving' - -jobs: - jats: - name: JATS - runs-on: ubuntu-latest - env: - VALIDATOR_URL: "https://jats-validator.hubmed.org/dtd/" - strategy: - fail-fast: false - matrix: - tagset: - - articleauthoring - - publishing - - archiving - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Validate writer output - run: | - filename=test/writer.jats_${{ matrix.tagset }} - printf "Validating file %s\n" "$filename" - json="$(curl --form "xml=@${filename}" --silent "$VALIDATOR_URL")" - err_count="$(printf '%s' "$json" | jq '.errors | length')" - if [ "$err_count" -eq 0 ]; then - printf "File was validated successfully.\n" - exit 0 - else - printf "Validator report:\n%s" "$json" - exit 1 - fi - - - name: Validate tables - # Archiving has the simplest template, so we only check with that. - if: matrix.tagset == 'archiving' - run: | - tmpl="$(cat <<EOF - <?xml version="1.0" encoding="utf-8" ?> - <!DOCTYPE article PUBLIC "-//NLM//DTD JATS (Z39.96) Journal Archiving and Interchange DTD v1.2 20190208//EN" - "JATS-archivearticle1.dtd"> - <article xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink" dtd-version="1.2" article-type="other"> - <front><article-meta></article-meta></front> - <body>%s</body></article> - EOF - )" - jats_file="$(mktemp jats-tables.XXXXX)" - exit_code=0 - for f in tables tables/nordics tables/planets tables/students; do - filename=test/$f.jats_archiving - printf "Validating %s...\n" "$filename" - printf "$tmpl" "$(cat $filename)" > "$jats_file" - json="$(curl --form "xml=@${jats_file}" --silent "$VALIDATOR_URL")" - err_count="$(printf "%s" "$json" | jq '.errors | length')" - if [ "$err_count" -eq 0 ]; then - printf "Table output is valid when used as body content.\n" - else - printf "Validator report:\n%s" "$json" - exit_code=1 - fi - done - exit "$exit_code" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index d2f463ec7..000000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Lint - -# Trigger the workflow on push or pull request, but only for the -# master branch -on: - pull_request: - branch: [master] - push: - branch: [master] - paths-ignore: - - LICENSE - - README.md - - CHANGELOG.md - - stack.yaml - - .travis.yml - -jobs: - lint: - name: Lint - runs-on: ubuntu-latest - env: - hlint_script: https://raw.github.com/ndmitchell/hlint/master/misc/run.sh - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Download and run hlint - run: | - curl -sSL "${hlint_script}" | sh -s . diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml deleted file mode 100644 index 9f5b14adf..000000000 --- a/.github/workflows/nightly.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: Nightly - -on: - schedule: - - cron: '53 7 * * *' - -jobs: - linux: - - runs-on: ubuntu-18.04 - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: | - ghc --version - cabal --version - cabal v2-update - cabal v2-build --dependencies-only all - - name: Build - run: | - cabal v2-install all - strip $HOME/.cabal/bin/pandoc - - name: Install artifact - run: | - export ARTIFACTS=nightly-linux/pandoc-nightly-linux-$(date +%Y-%m-%d) - mkdir -p ${ARTIFACTS} - cp $HOME/.cabal/bin/pandoc ${ARTIFACTS}/ - cp COPYRIGHT ${ARTIFACTS}/ - echo "Built from ${GITHUB_SHA}" > ${ARTIFACTS}/README.nightly.txt - - uses: actions/upload-artifact@master - with: - name: nightly-linux - path: nightly-linux - - windows: - - runs-on: windows-2019 - - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: | - stack update - stack build --dependencies-only pandoc - - name: Build artifacts - shell: cmd - run: | - for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a - set ARTIFACTS=%CD%\nightly-windows\pandoc-nightly-windows-%THEDATE% - mkdir %ARTIFACTS% - stack build pandoc - forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C copy @path %%ARTIFACTS%%" - copy COPYRIGHT %ARTIFACTS% - ren %ARTIFACTS%\COPYRIGHT COPYRIGHT.txt - echo Built from %GITHUB_SHA% > %ARTIFACTS%\README.nightly.txt - - uses: actions/upload-artifact@master - with: - name: nightly-windows - path: nightly-windows - - macos: - - runs-on: macOS-10.15 - - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: | - stack update - stack build --dependencies-only pandoc - - name: Build artifacts - run: | - export ARTIFACTS=nightly-macos/pandoc-nightly-macos-$(date +%Y-%m-%d) - mkdir -p ${ARTIFACTS} - stack build pandoc - for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${ARTIFACTS}/; done - mv ${ARTIFACTS}/pandoc ${ARTIFACTS}/pandoc - cp COPYRIGHT ${ARTIFACTS}/ - echo "Built from ${GITHUB_SHA}" > ${ARTIFACTS}/README.nightly.txt - - uses: actions/upload-artifact@master - with: - name: nightly-macos - path: nightly-macos - diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml deleted file mode 100644 index 85ae96860..000000000 --- a/.github/workflows/release-candidate.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: Release candidate - -on: - push: - branches: - - 'rc/**' - -jobs: - linux: - - runs-on: ubuntu-18.04 - steps: - - uses: actions/checkout@v1 - - name: Create linux package - run: | - make debpkg - mkdir linux-release-candidate - cp linux/artifacts/*.deb linux-release-candidate/ - cp linux/artifacts/*.tar.gz linux-release-candidate/ - - uses: actions/upload-artifact@v2 - with: - name: linux-release-candidate - path: linux-release-candidate - - windows: - - runs-on: windows-2019 - strategy: - fail-fast: true - matrix: - versions: - - osarch: "windows-x86_64" - arch: "x64" - stack_opts: "-j1" - - steps: - - uses: actions/checkout@v1 - - name: Install dependencies - run: | - stack update - stack build ${{ matrix.versions.stack_opts }} --dependencies-only pandoc - - name: Create windows package - shell: cmd - run: | - for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a - stack build ${{ matrix.versions.stack_opts }} pandoc - for /f "tokens=1-2 delims= " %%a in ('stack exec pandoc -- --version') do ( - @set VERSION=%%b - goto :next - ) - :next - if "%VERSION%" == "" ( - echo Error: could not determine version number. - exit /b 1 - ) - echo Detected version %VERSION% - @set WINDOWS=%CD%\windows - @set RELEASE=%WINDOWS%\pandoc-%VERSION% - mkdir %RELEASE% - forfiles /P .\.stack-work\install /M pandoc.exe /S /C "cmd /C echo @path && echo %%WINDOWS%% && copy @path %%RELEASE%%" - stack exec pandoc -- -s --toc MANUAL.txt -o %RELEASE%\MANUAL.html - stack exec pandoc -- -s COPYING.md -t rtf -o %RELEASE%\COPYING.rtf - copy %RELEASE%\COPYING.rtf %WINDOWS% - copy COPYRIGHT %RELEASE%\COPYRIGHT.txt - cd windows - echo Creating msi... - dir - @set WIXBIN="c:\Program Files (x86)\WiX Toolset v3.11\bin" - @set WORKDIR=%CD% - echo Running candle... - %WIXBIN%\candle -arch ${{ matrix.versions.arch }} -dVERSION=%VERSION% -dBINPATH=%RELEASE% *.wxs -out wixobj\ - if %errorlevel% neq 0 exit /b %errorlevel% - echo Running light... - %WIXBIN%\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out %WORKDIR%\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi wixobj\*.wixobj - 7z a "pandoc-%VERSION%-${{ matrix.versions.osarch }}.zip" pandoc-%VERSION% - cd .. - mkdir windows-release-candidate - copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi windows-release-candidate - copy windows\pandoc-%VERSION%-${{ matrix.versions.osarch }}.zip windows-release-candidate - copy windows\Makefile windows-release-candidate - - uses: actions/upload-artifact@v2 - with: - name: windows-release-candidate - path: windows-release-candidate diff --git a/.mailmap b/.mailmap deleted file mode 100644 index c7bc2a06a..000000000 --- a/.mailmap +++ /dev/null @@ -1,37 +0,0 @@ -Adam Brandizzi <brandizzi@gmail.com> -Albert Krewinkel <albert@zeitkraut.de> <albert+github@zeitkraut.de> -Albert Krewinkel <albert@zeitkraut.de> <albert.krewinkel@tourstream.eu> -Albert Krewinkel <albert@zeitkraut.de> <tarleb@moltkeplatz.de> -Albert Krewinkel <albert@zeitkraut.de> <tarleb@zeitkraut.de> -Alexander Krotov <ilabdsf@gmail.com> -Alex Ivkin <alex@ivkin.net> -Alex Ivkin <alex@ivkin.net> <alexivkin@users.noreply.github.com> -Andrew Dunning <andunning@gmail.com> -Andrew Dunning <andunning@gmail.com> <adunning@users.noreply.github.com> -Andrew Newman <andrewfnewman@gmail.com> -Clare Macrae <clare.macrae@googlemail.com> <github@cfmacrae.fastmail.co.uk> -Hugo Roy <hugo@fsfe.org> -Hugo Roy <hugo@xps.ampoliros.net> -John MacFarlane <jgm@berkeley.edu> <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> -John MacFarlane <jgm@berkeley.edu> <fiddlosopher@gmail.com> -John MacFarlane <jgm@berkeley.edu> <jgm@Johns-MacBook-Pro.local> -Jose Luis Duran <jlduran@gmail.com> <jlduran@users.noreply.github.com> -Marc Schreiber <schrieveslaach@online.de> -Masayoshi Takahashi <maki@rubycolor.org> -Matthew Pickering <matthewtpickering@gmail.com> -Mauro Bieg <mauro.bieg@gmail.com> -Mauro Bieg <mauro.bieg@gmail.com> <maurobieg@Mauros-MacBook-Air.local> -Mauro Bieg <mauro.bieg@gmail.com> <mb21@server.fake> -Mauro Bieg <mauro.bieg@gmail.com> <mb21@users.noreply.github.com> -Mauro Bieg <mb21@users.noreply.github.com> -Nils Carlson <nils.carlson@ludd.ltu.se> -Nils Carlson <nils.carlson@ludd.ltu.se> <pyssling@ludd.ltu.se> -Robin Lambertz <robinlambertz+dev@gmail.com> -Roland Hieber <rohieb@rohieb.name> <rohieb@users.noreply.github.com> -Sebastian Talmon <35015406+stalmon@users.noreply.github.com> -Sergei Trofimovich <slyfox@gentoo.org> <siarheit@google.com> -Sergei Trofimovich <slyfox@gentoo.org> <slyfox@inbox.ru> -Stefan Björk <stefan.bjork@gmail.com> <stefan@airistotle.local> -Thomas Hodgson <hello@twshodgson.net> <twsh@users.noreply.github.com> -Timm Albers <timmm.albers@gmail.com> <timm.albers@open-xchange.com> -Yan Pashkovsky <yanpaso@gmail.com> <Yanpas@users.noreply.github.com> diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6855ddd75..000000000 --- a/.travis.yml +++ /dev/null @@ -1,54 +0,0 @@ -os: osx -language: generic -cache: - timeout: 1000 - directories: - - "$HOME/.stack/" - - ".stack-work/" -branches: - only: - - /rc\/.*/ -install: -- set -e -- ulimit -n 4096 -- brew install haskell-stack -- which stack -- stack --version -- stack setup -- stack exec -- ghc --version -- | - export VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}') - export BASEDIR=$(pwd) - export ARTIFACTS=${BASEDIR}/macos-release-candidate - export RESOURCES=${ARTIFACTS}/Resources - export ROOT=${ARTIFACTS}/pandoc - export DEST=${ROOT}/usr/local - export ME=$(whoami) - export BASE=pandoc-$VERSION - mkdir -p ${ARTIFACTS} - mkdir -p ${RESOURCES} - mkdir -p ${DEST}/bin - mkdir -p ${DEST}/share/man/man1 - stack build --dependencies-only pandoc - stack build pandoc - for f in $(find .stack-work/install -name 'pandoc' -perm +001 -type f); do cp $f ${DEST}/bin/; done - strip ${DEST}/bin/pandoc - cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1 - ${DEST}/bin/pandoc -t html5 -s COPYING.md -Vpagetitle=License \ - -o ${RESOURCES}/license.html - chown -R $ME:staff ${ROOT} - sed -e "s/PANDOCVERSION/${VERSION}/" macos/distribution.xml.in > ${ARTIFACTS}/distribution.xml - cp macos/Makefile ${ARTIFACTS}/ - echo ${VERSION} > ${ARTIFACTS}/version.txt -deploy: - on: - all_branches: true - provider: s3 - bucket: travis-jgm-pandoc - region: us-west-1 - edge: true - local_dir: macos-release-candidate - access_key_id: - secure: ohEst8EP8Z3r/bPMlYgPATo3B/ye48Z0aGp4W1pEhDZjqufLUVTFBIoicvPApCkTrbKMNTdG+KmasrO/leHpju0uFKYQHDtJmHZe3avIOIdbGnOqn97+mmLZBN5skiJWNtrxnN/TuAM+wlePz1dQpohPt6J3S70ct8DsOdZOaGI= - secret_access_key: - secure: qZ2RN4Bx4WRcVz9H8ae4S6a3AA85kcca0RdMimIREdGSx4ewMYa8lSdcKDvRbPwXRy8H3SeviqL2tTZw3+ej1jccAHowMj8Zvde5EJwX0+qO4Sr0zdWjnsvMeUmx9pO1oL3L/09KTWiMTT+d4XNpE8eqiY08qN8oMj0EPeR/AS4= diff --git a/INSTALL.md b/INSTALL.md deleted file mode 100644 index 721dc5d66..000000000 --- a/INSTALL.md +++ /dev/null @@ -1,412 +0,0 @@ -# Installing pandoc - -The simplest way to get the latest pandoc release is to use the installer. - -<a href="https://github.com/jgm/pandoc/releases/latest" - class="btn btn-primary" id="downloadInstallerBtn"> - Download the latest installer -</a> - -For alternative ways to install pandoc, see below -under the heading for your operating system. - -## Windows - -There is a package installer at pandoc's [download page]. -This will install pandoc, replacing older versions, and -update your path to include the directory where pandoc's -binaries are installed. - -If you prefer not to use the msi installer, we also provide -a zip file that contains pandoc's binaries and -documentation. Simply unzip this file and move the binaries -to a directory of your choice. - -Alternatively, you can install pandoc using -[Chocolatey](https://chocolatey.org): - - choco install pandoc - -Chocolatey can also install other software that integrates with Pandoc. -For example, to install `rsvg-convert` (from [librsvg], covering formats -without SVG support), [Python] (to use Pandoc filters), and -[MiKTeX] (to typeset PDFs with [LaTeX]): - - choco install rsvg-convert python miktex - -By default, Pandoc creates PDFs using LaTeX. -We recommend installing it via [MiKTeX]. - -## macOS - -There is a package installer at pandoc's [download page]. -If you later want to uninstall the package, you can do so -by downloading [this script][uninstaller] -and running it with `perl uninstall-pandoc.pl`. - -Alternatively, you can install pandoc using -[Homebrew](http://brew.sh): - - brew install pandoc - -Homebrew can also install other software that integrates with Pandoc. -For example, to install [librsvg] (its `rsvg-convert` covers formats -without SVG support), [Python] (to use Pandoc filters), and -[BasicTeX] (to typeset PDFs with [LaTeX]): - - brew install librsvg python homebrew/cask/basictex - -Note: On unsupported versions of macOS (more than three releases old), -Homebrew installs from source, which takes additional time and disk space -for the `ghc` compiler and dependent Haskell libraries. - -We also provide a zip file containing the binaries and man -pages, for those who prefer not to use the installer. Simply -unzip the file and move the binaries and man pages to -whatever directory you like. - -By default, Pandoc creates PDFs using LaTeX. Because a full [MacTeX] -installation uses four gigabytes of disk space, we recommend -[BasicTeX] or [TinyTeX](https://yihui.org/tinytex/) -and using the `tlmgr` tool to install additional packages -as needed. If you receive errors warning of fonts not found: - - tlmgr install collection-fontsrecommended - -## Linux - -Check whether the pandoc version in your package manager is -not outdated. Pandoc is in the [Debian], [Ubuntu], [Slackware], -[Arch], [Fedora], [NiXOS], [openSUSE], [gentoo] and [Void] repositories. - -To get the latest release, we provide a binary package for amd64 -architecture on the **[download page]**. - -The executable is statically linked and -has no dynamic dependencies or dependencies on external -data files. Note: because of the static -linking, the pandoc binary from this package cannot use lua -filters that require external lua modules written in C. - -Both a tarball and a deb installer are provided. To install the deb: - - sudo dpkg -i $DEB - -where `$DEB` is the path to the downloaded deb. This will -install the `pandoc` executable and man page. - -If you use an RPM-based distro, you may be able to install -the deb from our download page using `alien`. - -On any distro, you may install from the tarball into `$DEST` -(say, `/usr/local/` or `$HOME/.local`) by doing - - tar xvzf $TGZ --strip-components 1 -C $DEST - -where `$TGZ` is the path to the downloaded zipped tarball. -For Pandoc versions before 2.0, which don't provide -a tarball, try instead - - ar p $DEB data.tar.gz | tar xvz --strip-components 2 -C $DEST - -You can also install from source, using the -instructions below under [Compiling from source]. -Note that most distros have the Haskell platform in their -package repositories. For example, on Debian/Ubuntu, -you can install it with `apt-get install haskell-platform`. - -For PDF output, you'll need LaTeX. We recommend installing -[TeX Live](http://www.tug.org/texlive/) via your package -manager. (On Debian/Ubuntu, `apt-get install texlive`.) - -## Chrome OS - -On Chrome OS, pandoc can be installed using the -[chromebrew](https://github.com/skycocker/chromebrew) package manager -with the command: - -```sh -crew install pandoc -``` - -This will automatically build and configure pandoc for the specific -device you are using. - -## BSD - -Pandoc is in the [NetBSD] and [FreeBSD ports] repositories. - -## Docker - -The official Docker images for pandoc can be found at -<https://github.com/pandoc/dockerfiles> and at -[dockerhub](https://hub.docker.com/). - -The [pandoc/core](https://hub.docker.com/r/pandoc/core) -image contains `pandoc`. - -The [pandoc/latex](https://hub.docker.com/r/pandoc/latex) -image also contains the minimal LaTeX installation needed -to produce PDFs using pandoc. - -To run pandoc using Docker, converting `README.md` to `README.pdf`: - - docker run --rm --volume "`pwd`:/data" --user `id -u`:`id -g` pandoc/latex README.md -o README.pdf - -## GitHub Actions - -Pandoc can be run through -[GitHub Actions](https://github.com/features/actions). For some -examples, see <https://github.com/pandoc/pandoc-action-example>. - -## Compiling from source - -If for some reason a binary package is not available for your -platform, or if you want to hack on pandoc or use a non-released -version, you can install from source. - -### Getting the pandoc source code - -Source tarballs can be found at -<https://hackage.haskell.org/package/pandoc>. For example, to -fetch the source for version 1.17.0.3: - - wget https://hackage.haskell.org/package/pandoc-1.17.0.3/pandoc-1.17.0.3.tar.gz - tar xvzf pandoc-1.17.0.3.tar.gz - cd pandoc-1.17.0.3 - -Or you can fetch the development code by cloning the repository: - - git clone https://github.com/jgm/pandoc - cd pandoc - -Note: there may be times when the development code is broken -or depends on other libraries which must be installed -separately. Unless you really know what you're doing, install -the last released version. - -### Quick stack method - -The easiest way to build pandoc from source is to use [stack][stack]: - -1. Install [stack][stack]. Note that Pandoc requires stack >= 1.7.0. - -2. Change to the pandoc source directory and issue the following commands: - - stack setup - stack install - - `stack setup` will automatically download the ghc compiler - if you don't have it. `stack install` will install the - `pandoc` executable into `~/.local/bin`, which you should - add to your `PATH`. This process will take a while, and - will consume a considerable amount of disk space. - -### Quick cabal method - -1. Install the [Haskell platform]. This will give you [GHC] and - the [cabal-install] build tool. Note that pandoc requires - GHC >= 7.10 and cabal >= 2.0. - -2. Update your package database: - - cabal update - -3. Check your cabal version with - - cabal --version - - If you have a version less than 2.0, install the latest with: - - cabal install cabal-install - -4. Use `cabal` to install pandoc and its dependencies: - - cabal install pandoc - - This procedure will install the released version of pandoc, - which will be downloaded automatically from HackageDB. - - If you want to install a modified or development version - of pandoc instead, switch to the source directory and do - as above, but without the 'pandoc': - - cabal install - -5. Make sure the `$CABALDIR/bin` directory is in your path. You should - now be able to run `pandoc`: - - pandoc --help - - [Not sure where `$CABALDIR` is?](http://www.haskell.org/haskellwiki/Cabal-Install#The_cabal-install_configuration_file) - -5. By default `pandoc` uses the "i;unicode-casemap" method - to sort bibliography entries (RFC 5051). If you would like to - use the locale-sensitive unicode collation algorithm instead, - specify the `icu` flag (which affects the dependency `citeproc`): - - cabal install pandoc -ficu - - Note that this requires the `text-icu` library, which in turn - depends on the C library `icu4c`. Installation directions - vary by platform. Here is how it might work on macOS with Homebrew: - - brew install icu4c - stack install pandoc \ - --flag "citeproc:icu" \ - --extra-lib-dirs=/usr/local/opt/icu4c/lib \ - --extra-include-dirs=/usr/local/opt/icu4c/include - -6. The `pandoc.1` man page will be installed automatically. cabal shows - you where it is installed: you may need to set your `MANPATH` - accordingly. If `MANUAL.txt` has been modified, the man page can be - rebuilt: `make man/pandoc.1`. - - -### Custom cabal method - -This is a step-by-step procedure that offers maximal control -over the build and installation. Most users should use the -quick install, but this information may be of use to packagers. -For more details, see the [Cabal User's Guide]. These instructions -assume that the pandoc source directory is your working directory. -You will need cabal version 2.0 or higher. - -1. Install dependencies: in addition to the [Haskell platform], - you will need a number of additional libraries. You can install - them all with - - cabal update - cabal install --only-dependencies - -2. Configure: - - cabal configure --prefix=DIR --bindir=DIR --libdir=DIR \ - --datadir=DIR --libsubdir=DIR --datasubdir=DIR --docdir=DIR \ - --htmldir=DIR --program-prefix=PREFIX --program-suffix=SUFFIX \ - --mandir=DIR --flags=FLAGSPEC --enable-tests - - All of the options have sensible defaults that can be overridden - as needed. - - `FLAGSPEC` is a list of Cabal configuration flags, optionally - preceded by a `-` (to force the flag to `false`), and separated - by spaces. Pandoc's flags include: - - - `embed_data_files`: embed all data files into the binary (default no). - This is helpful if you want to create a relocatable binary. - - - `https`: enable support for downloading resources over https - (using the `http-client` and `http-client-tls` libraries). - -3. Build: - - cabal build - cabal test - -4. Build API documentation: - - cabal haddock --html-location=URL --hyperlink-source - -5. Copy the files: - - cabal copy --destdir=PATH - - The default destdir is `/`. - -6. Register pandoc as a GHC package: - - cabal register - - Package managers may want to use the `--gen-script` option to - generate a script that can be run to register the package at - install time. - -### Creating a relocatable binary - -It is possible to compile pandoc such that the data files -pandoc uses are embedded in the binary. The resulting binary -can be run from any directory and is completely self-contained. -With cabal, add `-fembed_data_files` to the `cabal configure` -or `cabal install` commands. - -With stack, use `--flag pandoc:embed_data_files`. - - - -### Running tests - -Pandoc comes with an automated test suite. -To run with cabal, `cabal test`; to run with stack, `stack -test`. - -To run particular tests (pattern-matching on their names), use -the `-p` option: - - cabal install pandoc --enable-tests - cabal test --test-options='-p markdown' - -Or with stack: - - stack test --test-arguments='-p markdown' - -It is often helpful to add `-j4` (run tests in parallel) -and `--hide-successes` (don't clutter output with successes) -to the test arguments as well. - -If you add a new feature to pandoc, please add tests as well, following -the pattern of the existing tests. The test suite code is in -`test/test-pandoc.hs`. If you are adding a new reader or writer, it is -probably easiest to add some data files to the `test` directory, and -modify `test/Tests/Old.hs`. Otherwise, it is better to modify the module -under the `test/Tests` hierarchy corresponding to the pandoc module you -are changing. - -### Running benchmarks - -To build and run the benchmarks: - - cabal configure --enable-benchmarks && cabal build - cabal bench - -or with stack: - - stack bench - -To use a smaller sample size so the benchmarks run faster: - - cabal bench --benchmark-options='-s 20' - -To run just the markdown benchmarks: - - cabal bench --benchmark-options='markdown' - - -[Arch]: https://www.archlinux.org/packages/community/x86_64/pandoc/ -[Cabal User's Guide]: http://www.haskell.org/cabal/release/latest/doc/users-guide/builders.html#setup-configure-paths -[Debian]: https://packages.debian.org/pandoc -[Fedora]: https://apps.fedoraproject.org/packages/pandoc -[FreeBSD ports]: http://www.freshports.org/textproc/hs-pandoc/ -[GHC]: http://www.haskell.org/ghc/ -[GPL]: http://www.gnu.org/copyleft/gpl.html -[Haskell platform]: http://hackage.haskell.org/platform/ -[MacPorts]: http://trac.macports.org/browser/trunk/dports/textproc/pandoc/Portfile -[MacTeX]: https://tug.org/mactex/ -[BasicTeX]: http://www.tug.org/mactex/morepackages.html -[LaTeX]: https://www.latex-project.org -[MiKTeX]: http://miktex.org/ -[librsvg]: https://wiki.gnome.org/Projects/LibRsvg -[Python]: https://www.python.org -[NetBSD]: http://pkgsrc.se/wip/pandoc -[NixOS]: https://nixos.org/nixos/packages.html -[Slackware]: https://www.slackbuilds.org/result/?search=pandoc&sv= -[Ubuntu]: https://packages.ubuntu.com/pandoc -[download page]: https://github.com/jgm/pandoc/releases/latest -[gentoo]: http://packages.gentoo.org/package/app-text/pandoc -[haskell repository]: https://wiki.archlinux.org/index.php/Haskell_Package_Guidelines#.5Bhaskell.5D -[openSUSE]: https://software.opensuse.org/package/pandoc -[source tarball]: http://hackage.haskell.org/package/pandoc -[stack]: https://docs.haskellstack.org/en/stable/install_and_upgrade.html -[cabal-install]: http://hackage.haskell.org/package/cabal-install -[Void]: https://voidlinux.org/ -[uninstaller]: https://raw.githubusercontent.com/jgm/pandoc/master/macos/uninstall-pandoc.pl @@ -1,85 +1,15 @@ -version?=$(shell grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}') -pandoc=$(shell find dist -name pandoc -type f -exec ls -t {} \; | head -1) -SOURCEFILES?=$(shell git ls-tree -r master --name-only | grep "\.hs$$") -BRANCH?=master -RESOLVER?=lts-13 -GHCOPTS=-fdiagnostics-color=always -WEBSITE=../../web/pandoc.org -REVISION?=1 +version ?= $(shell awk '/[Vv]ersion/ { print $$2; }' pandoc.cabal) -quick: - stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='-j +RTS -A64m -RTS' --test-arguments='-j4 --hide-successes $(TESTARGS)' - -quick-cabal: - cabal new-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests - cabal new-build . --disable-optimization - cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS) - -full-cabal: - cabal new-configure . --ghc-options '$(GHCOPTS)' --flags '+embed_data_files +trypandoc' --enable-tests --enable-benchmarks +.PHONY: test +test: + cabal new-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests $(ENABLE) cabal new-build . --disable-optimization cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS) -full: - stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 -j4 $(GHCOPTS)' - -ghci: - stack ghci --flag 'pandoc:embed_data_files' - -haddock: - stack haddock - -# Note: to accept current results of golden tests, -# make test TESTARGS='--accept' -test: - stack test --flag 'pandoc:embed_data_files' --fast --test-arguments='-j4 --hide-successes $(TESTARGS)' --ghc-options '$(GHCOPTS)' - -ghcid: - ghcid -c "stack repl --flag 'pandoc:embed_data_files'" - -bench: - stack bench --benchmark-arguments='$(BENCHARGS)' --ghc-options '$(GHCOPTS)' - -weigh: - stack build --ghc-options '$(GHCOPTS)' pandoc:weigh-pandoc && stack exec weigh-pandoc - -reformat: - for f in $(SOURCEFILES); do echo $$f; stylish-haskell -i $$f ; done -lint: hlint fix_spacing - -hlint: - for f in $(SOURCEFILES); do echo $$f; hlint --verbose --refactor --refactor-options='-s -o -' $$f; done - -fix_spacing: - # Fix trailing newlines and spaces at ends of lines - for f in $(SOURCEFILES); do printf '%s\n' "`cat $$f`" | sed -e 's/ *$$//' > $$f.tmp; mv $$f.tmp $$f; done - -changes_github: - pandoc --filter tools/extract-changes.hs changelog.md -t gfm --wrap=none --template tools/changes_template.html | sed -e 's/\\#/#/g' | pbcopy - -dist: man/pandoc.1 - cabal sdist - rm -rf "pandoc-${version}" - tar xvzf dist/pandoc-${version}.tar.gz - cd pandoc-${version} - stack setup && stack test && cd .. && rm -rf "pandoc-${version}" - -checkdocs: README.md - ! grep -n -e "\t" MANUAL.txt changelog - -debpkg: man/pandoc.1 - docker run -v `pwd`:/mnt \ - -v `pwd`/linux/artifacts:/artifacts \ - -e REVISION=$(REVISION) \ - -w /mnt \ - utdemir/ghc-musl:v12-libgmp-ghc8101 bash \ - /mnt/linux/make_artifacts.sh - -macospkg: - rm -rf macos-release-candidate - aws s3 sync s3://travis-jgm-pandoc macos-release-candidate - make -C macos-release-candidate +.PHONY: full +full: ENABLE = --enable-benchmarks +full: test man/pandoc.1: MANUAL.txt man/pandoc.1.before man/pandoc.1.after pandoc $< -f markdown -t man -s \ @@ -94,27 +24,3 @@ README.md: README.template MANUAL.txt tools/update-readme.lua pandoc --lua-filter tools/update-readme.lua \ --reference-location=section -t gfm $< -o $@ -download_stats: - curl https://api.github.com/repos/jgm/pandoc/releases | \ - jq -r '.[] | .assets | .[] | "\(.download_count)\t\(.name)"' - -pandoc-templates: - rm ../pandoc-templates/default.* ; \ - cp data/templates/* ../pandoc-templates/ ; \ - pushd ../pandoc-templates/ && \ - git add * && \ - git commit -m "Updated templates for pandoc $(version)" && \ - popd - -trypandoc: - ssh -t macfarlane 'cd src/pandoc && git pull && stack install --flag pandoc:trypandoc --flag pandoc:embed_data_files && cd trypandoc && sudo make install' - -update-website: - make -C $(WEBSITE) update - make -C $(WEBSITE) - make -C $(WEBSITE) upload - -clean: - stack clean - -.PHONY: deps quick full haddock install clean test bench changes_github macospkg dist prof download_stats reformat lint weigh doc/lua-filters.md pandoc-templates trypandoc update-website debpkg macospkg checkdocs ghcid ghci fix_spacing hlint diff --git a/hie.yaml b/hie.yaml deleted file mode 100644 index 8a0907410..000000000 --- a/hie.yaml +++ /dev/null @@ -1,37 +0,0 @@ -cradle: - cabal: - - path: "prelude" - component: "lib:pandoc" - - - path: "src" - component: "lib:pandoc" - - - path: "./pandoc.hs" - component: "pandoc:exe:pandoc" - - - path: "./Paths_pandoc.hs" - component: "pandoc:exe:pandoc" - - - path: "prelude/trypandoc.hs" - component: "pandoc:exe:trypandoc" - - - path: "prelude/Prelude.hs" - component: "pandoc:exe:trypandoc" - - - path: "prelude/weigh-pandoc.hs" - component: "pandoc:bench:weigh-pandoc" - - - path: "prelude/Prelude.hs" - component: "pandoc:bench:weigh-pandoc" - - - path: "test" - component: "pandoc:test:test-pandoc" - - - path: "prelude" - component: "pandoc:test:test-pandoc" - - - path: "prelude/benchmark-pandoc.hs" - component: "pandoc:bench:benchmark-pandoc" - - - path: "prelude/Prelude.hs" - component: "pandoc:bench:benchmark-pandoc" diff --git a/stack.yaml b/stack.yaml deleted file mode 100644 index 201d61ae0..000000000 --- a/stack.yaml +++ /dev/null @@ -1,33 +0,0 @@ -flags: - pandoc: - trypandoc: false - embed_data_files: true -packages: -- '.' -extra-deps: -- pandoc-types-1.22 -- texmath-0.12.0.3 -- rfc5051-0.2 -- haddock-library-1.9.0 -- skylighting-0.10.1 -- skylighting-core-0.10.1 -- doclayout-0.3 -- emojis-0.1 -- hslua-1.1.2 -- jira-wiki-markup-1.3.2 -- HsYAML-0.2.1.0 -- HsYAML-aeson-0.2.0.0 -- doctemplates-0.8.2 -- commonmark-0.1.1.2 -- commonmark-extensions-0.2.0.4 -- commonmark-pandoc-0.2.0.1 -#- citeproc-0.2 -- citeproc: - git: https://github.com/jgm/citeproc.git - commit: 42b1d154b02435229acbe98ae0f17d01b757ee93 -ghc-options: - "$locals": -fhide-source-paths -Wno-missing-home-modules -resolver: lts-14.6 -nix: - packages: [zlib] - diff --git a/test/lhs-test.html b/test/lhs-test.html index 38e0830f6..89b49913e 100644 --- a/test/lhs-test.html +++ b/test/lhs-test.html @@ -145,6 +145,7 @@ pre > code.sourceCode { white-space: pre; position: relative; } pre > code.sourceCode > span { display: inline-block; line-height: 1.25; } pre > code.sourceCode > span:empty { height: 1.2em; } + .sourceCode { overflow: visible; } code.sourceCode > span { color: inherit; text-decoration: inherit; } div.sourceCode { margin: 1em 0; } pre.sourceCode { margin: 0; } |