Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make: numerically compare the major version of pandoc to be greater then or equal to 2 #7047

Merged
merged 2 commits into from Feb 14, 2024

Conversation

t-nil
Copy link
Contributor

@t-nil t-nil commented May 14, 2023

IMPORTANT: PRs without the template will be CLOSED

Fix man page being built without smart-markdown, because pandoc versions greater 2 are not detected properly

The makefile had a hardcoded major version check of pandoc against 2. In my pandoc 3 installation the check failed and smart-markdown was not used, even though it is available. That caused double dashes to be rendered as single, long dashes.

This fix causes make to numerically compare the major version to be greater then or equal to 2.

Fixes #7046

Template

Before submitting a pull request make sure you have:

In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under Unlicense. Check all of the following options that apply:

  • I am the original author of this code and I am willing to release it under Unlicense

What is the purpose of your pull request?

  • Core bug fix/improvement

@pukkandan pukkandan added the docs/meta/cleanup related to docs, code cleanup, templates, devscripts etc label May 14, 2023
@pukkandan
Copy link
Member

Have you tested the resulting file with pandoc 3 is correct? You can try diffing with pandoc 2 result.

@pukkandan pukkandan force-pushed the master branch 2 times, most recently from ee280c7 to 7aeda6c Compare May 24, 2023 18:09
@t-nil
Copy link
Contributor Author

t-nil commented Sep 2, 2023

Have you tested the resulting file with pandoc 3 is correct? You can try diffing with pandoc 2 result.

> pandoc -v
pandoc 3.1.2
Features: +server +lua
Scripting engine: Lua 5.4
User data directory: /home/ra1n/.local/share/pandoc
Copyright (C) 2006-2023 John MacFarlane. Web:  https://pandoc.org
This is free software; see the source for copying conditions. There is no
warranty, not even for merchantability or fitness for a particular purpose.
> pandoc2 -v
pandoc2 2.19.2
Compiled with pandoc-types 1.22.2.1, texmath 0.12.5.2, skylighting 0.13,
citeproc 0.8.0.1, ipynb 0.2, hslua 2.2.1
Scripting engine: Lua 5.4
User data directory: /home/ra1n/.local/share/pandoc
Copyright (C) 2006-2022 John MacFarlane. Web:  https://pandoc.org
This is free software; see the source for copying conditions. There is no
warranty, not even for merchantability or fitness for a particular purpose.
pandoc -s -f markdown-smart -t man yt-dlp.1.temp.md -o yt-dlp.1
pandoc2 -s -f markdown-smart -t man yt-dlp.1.temp.md -o yt-dlp.1_pandoc2
diff yt-dlp.1*

With the commands displayed above, the diff is empty on my side. I think the change can be pushed.

@bashonly bashonly mentioned this pull request Oct 31, 2023
9 tasks
@elig0n
Copy link

elig0n commented Feb 13, 2024

@pukkandan Why has this not been merged until now ?

@bashonly bashonly merged commit fb44020 into yt-dlp:master Feb 14, 2024
13 checks passed
aalsuwaidi pushed a commit to aalsuwaidi/yt-dlp that referenced this pull request Apr 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs/meta/cleanup related to docs, code cleanup, templates, devscripts etc
Projects
None yet
4 participants