Skip to content

Commit

Permalink
Merge branch 'pgf-tikz:master' into GraphsStandardCodeExamples
Browse files Browse the repository at this point in the history
  • Loading branch information
Mo-Gul authored Jun 8, 2024
2 parents af40f01 + 12f1783 commit aea55fa
Show file tree
Hide file tree
Showing 65 changed files with 292 additions and 194 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:

- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
7 changes: 5 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ jobs:
image: registry.gitlab.com/islandoftex/images/texlive:latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Fixup Run actions/checkout
run: git config --global --add safe.directory '*'

- name: Generate the revision file
run: |
export tagname=$(git describe --abbrev=0 --tags)
Expand All @@ -28,7 +31,7 @@ jobs:
- name: Archive failed test output
if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: test-diff-files
path: build/test*/*.diff
2 changes: 1 addition & 1 deletion .github/workflows/dco.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
Expand Down
28 changes: 26 additions & 2 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ jobs:
image: registry.gitlab.com/islandoftex/images/texlive:latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Fixup Run actions/checkout
run: git config --global --add safe.directory '*'

- name: Generate the revision file
run: |
export tagname=$(git describe --abbrev=0 --tags)
Expand All @@ -26,11 +29,32 @@ jobs:
run: |
l3build doc -q
- uses: actions/upload-artifact@v2
- name: Analyze manual log
run: |
# set a notice message
# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions?tool=bash#setting-a-notice-message
# create multiline annotations by using URL-encoded newline "%0A"
# https://github.com/actions/toolkit/issues/193#issuecomment-605394935
OVERFULL_HBOX=$(
grep -r '^Overfull \\hbox' build/doc/pgfmanual.log |
awk 'BEGIN {RS=""}{gsub(/\n/,"%0A",$0); print $0}'
)
echo "::notice file=build/doc/pgfmanual.log,title=Overfull hbox(es)::$OVERFULL_HBOX"
- name: Upload manual
uses: actions/upload-artifact@v4
with:
name: pgfmanual
path: build/doc/pgfmanual.pdf

- name: Upload manual with aux
uses: actions/upload-artifact@v4
with:
name: pgfmanual-with-aux
path: |
build/doc/pgfmanual.*
!build/doc/pgfmanual.tex
- name: Deploy tlcontrib
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ jobs:
image: registry.gitlab.com/islandoftex/images/texlive:latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Fixup Run actions/checkout
run: git config --global --add safe.directory '*'

- name: Generate the revision file
run: |
export tagname=$(git describe --abbrev=0 --tags)
Expand Down Expand Up @@ -48,7 +51,7 @@ jobs:
run: |
l3build ctan
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: pgfmanual
path: build/doc/pgfmanual.pdf
Expand Down Expand Up @@ -86,7 +89,7 @@ jobs:
body_path: RELEASE_NOTES.md

- name: "Release: upload assets"
uses: actions/github-script@v5
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down Expand Up @@ -121,9 +124,13 @@ jobs:
- name: "CTAN: Validate"
run: |
l3build upload --dry-run --date "$tagdate" "$tagname"
# temp workaround for l3build 2022-11-10
# see https://github.com/latex3/l3build/issues/264
echo "n" | l3build upload --dry-run --date "$tagdate" "$tagname"
- name: "CTAN: Upload"
if: github.repository == 'pgf-tikz/pgf'
run: |
l3build upload --date "$tagdate" "$tagname"
# temp workaround for l3build 2022-11-10
# https://github.com/latex3/l3build/issues/265
echo "y" | l3build upload --date "$tagdate" "$tagname"
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
*.out
*.pdf
*.svg
*.synctex.gz
*.toc
*.zip
*.zip

build/*
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pgf – A Portable Graphic Format for TeX

![CI](https://github.com/pgf-tikz/pgf/workflows/CI/badge.svg)
![Test suite](https://github.com/pgf-tikz/pgf/actions/workflows/check.yml/badge.svg?branch=master)

PGF is a TeX macro package for generating graphics. It is platform-
and format-independent and works together with the most important TeX
Expand Down
19 changes: 2 additions & 17 deletions build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,13 @@ docfiledir = "./doc/generic/pgf"
docfiles =
{
"RELEASE_NOTES.md", "description.html", -- Part of the release script
"color.cfg", "pgfmanual.cfg", "images/*.jpg", "*.tex" -- Build the PDF
"color.cfg", "pgfmanual.cfg", "images", "plots", "*.tex" -- Build the manual
}
tdsroot = "generic"
typesetfiles = {"pgfmanual.tex"}
typesetexe = "lualatex"
flatten = false

-- To allow writing
function docinit_hook()
mkdir(typesetdir .. "/plots")
return 0
end

-- Set up to allow testing dvips, etc.
specialformats = specialformats or {}
specialformats["latex"] = specialformats["latex"] or
Expand All @@ -43,9 +37,6 @@ checkengines = {"pdftex", "latexdvips", "latexdvisvgm", "luatex", "xetex"}
-- Use multiple sets of tests
checkconfigs = { "build", "config-gd" }

--- Keep all \special data (may one day be the l3build default)
maxprintline = 9999

-- For release
ctanzip = "pgf.ctan.flatdir"
packtdszip = true
Expand All @@ -63,7 +54,7 @@ uploadconfig = {
ctanPath = "/graphics/pgf/base",
description = [[<p>PGF is a macro package for creating graphics. It is platform- and format-independent and works together with the most important TeX backend drivers, including pdfTeX and dvips. It comes with a user-friendly syntax layer called TikZ.<br></p><p>Its usage is similar to <a data-cke-saved-href="/pkg/pstricks-base" href="/pkg/pstricks-base">pstricks</a> and the standard picture environment. PGF works with plain (pdf-)TeX, (pdf-)LaTeX, and ConTeXt. Unlike <a data-cke-saved-href="/pkg/pstricks-base" href="/pkg/pstricks-base">pstricks</a>, it can produce either PostScript or PDF output.<br></p>]],
email = "[email protected]",
license = "fdl;gpl2;lppl1.3c",
license = { "fdl", "gpl2", "lppl1.3c" },
note_file = "CTAN_NOTES.md",
pkg = "pgf",
repository = "https://github.com/pgf-tikz/pgf",
Expand All @@ -89,9 +80,3 @@ function tag_hook(tagname, tagdate)
return 0
end

target_list = target_list or { }
target_list.revisionfile =
{
desc = "Create revision data file",
func = revisionfile
}
43 changes: 41 additions & 2 deletions doc/generic/pgf/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,44 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]
## Unreleased

### BREAKING CHANGES

### Added

- Add `RGB` and `gray` color model support for ConTeXt #1130

### Fixed

- Typo in animations `end on` key #1273
- Output bounding box adjustment in pgfsys-dvisvgm.def #1275
- Fix shadings under LuaMetaTeX
- Resolve missing `gnuplot` plots in manual #1238

### Changed

- Typo fixes in the manual
- Simplify short verb `|...|` or add required preamble for it
- Harden parser for math expressions against active chars
- Resolve overfull hboxes >=20pt in the manual
- Adapt `\graphicspath` setting for flattened doc tree #1191
- Promote warning "Plot data file \`...' not found" to error

### Contributors

- Andreas Deininger
- Joseph Wright
- Marcel Krüger
- Matthias Hetzenberger
- Qrrbrbirlbel
- quark67
- Rocky Zhang (@rockyzhz)
- Yukai Chou (@muzimuzhi)
- Alexander Grahn
- Max Chernoff

## [3.1.10] - 2023-01-13 Henri Menke

Even though this release is not too heavy on user-facing additions it has seen a
lot of contributed changes. Thanks to everyone who volunteered their time!
Expand Down Expand Up @@ -43,6 +80,7 @@ lot of contributed changes. Thanks to everyone who volunteered their time!
- Add Developer Certificate of Origin (DCO) to Pull Request template and enforce
- Add test set for `graphdrawing` (gd)
- pgfkeys gained support for loading libraries
- Add dependabot to keep GitHub Actions up to date

### Fixed

Expand Down Expand Up @@ -82,6 +120,7 @@ lot of contributed changes. Thanks to everyone who volunteered their time!
- pgfkeys was a bit too relaxed around `\relax` #1132
- Remove spurious spaces for `3d view` #1151
- Fix incorrectly placed matrix delimiters for implicitly positioned nodes #1102
- Use `/.append` to fix a wrong usage of `/.add` in pgfmanual #1201

### Changed

Expand Down Expand Up @@ -3293,7 +3332,7 @@ will be the stable version.
- Created ChangeLog
- Added pgfshade.sty

[Unreleased]: https://github.com/pgf-tikz/pgf/compare/3.1.9a...HEAD
[3.1.10]: https://github.com/pgf-tikz/pgf/compare/3.1.9a...3.1.10
[3.1.9a]: https://github.com/pgf-tikz/pgf/compare/3.1.9...3.1.9a
[3.1.9]: https://github.com/pgf-tikz/pgf/compare/3.1.8b...3.1.9
[3.1.8b]: https://github.com/pgf-tikz/pgf/compare/3.1.8a...3.1.8b
Expand Down
2 changes: 1 addition & 1 deletion doc/generic/pgf/pgfmanual-en-base-arrows.tex
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ \subsection{Declaring an Arrow Tip Kind}
these ways is use can be configured by setting \meta{mode} to
either |orthogonal| or to |polar|. It is best to try simply try out
both when designing an arrow tip to see which works better. Since
|orthogonal| is quicker and often gives good oder even better
|orthogonal| is quicker and often gives good or even better
results, it is the default. Some arrow tips, however, profit from
saying |bending mode=polar|.
\item \declare{|defaults|}|=|\meta{arrow keys}
Expand Down
2 changes: 1 addition & 1 deletion doc/generic/pgf/pgfmanual-en-base-quick.tex
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ \subsection{Quick Path Construction Commands}

\begin{command}{\pgfpathqcircle\marg{radius}}
Adds a radius around the origin of the given \meta{radius}. This command is
orders of magnitude faster than |\pgfcircle{\pgfpointorigin}{|\meta{radius}|}|.
orders of magnitude faster than |\pgfpathcircle{\pgfpointorigin}{|\meta{radius}|}|.
%
\begin{codeexample}[]
\colorlet{examplefill}{yellow!80!black}
Expand Down
2 changes: 1 addition & 1 deletion doc/generic/pgf/pgfmanual-en-base-scopes.tex
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ \subsubsection{The Main Environment}

Sometimes, you may need more fine-grained control over the size of the
bounding box. For example, the computed bounding box may be too large or
you intensionally wish the box to be ``too small''. In these cases, you can
you intentionally wish the box to be ``too small''. In these cases, you can
use the command |\pgfusepath{use as bounding box}|, as described in
Section~\ref{section-using-bb}.

Expand Down
Loading

0 comments on commit aea55fa

Please sign in to comment.