Merge branch 'master' into PimpCodeexamples

.travis.yml

@@ -31,8 +31,9 @@ matrix:
     script:
     - cd doc/generic/pgf/version-for-luatex/en
     - make latex="lualatex --interaction=nonstopmode"
-    after_script:
+    after_success:
     - cp pgfmanual.pdf ../../
+    - cp pgfmanual.pdf $TRAVIS_BUILD_DIR/../
     - cd ../../../../../
     - bash ci/update_tlcontrib.sh
     before_deploy:
@@ -44,7 +45,7 @@ matrix:
     - cd doc/generic/pgf/version-for-dvisvgm/en
     - touch pgfmanual.toc
     - make latex="lualatex --output-format=dvi --interaction=nonstopmode"
-    after_script:
+    after_success:
     - bash ../../../../../ci/update_website.sh
 
   - env: version=dvipdfm
@@ -77,28 +78,13 @@ matrix:
     - cd doc/generic/pgf/version-for-xetex/en
     - make latex="xelatex --no-pdf --interaction=nonstopmode"
 
-  - if: repo = pgf-tikz/pgf AND type != pull_request
-    env: update=sourceforge
-    before_install:
-    - openssl aes-256-cbc -K $encrypted_fd6ed174e9a3_key -iv $encrypted_fd6ed174e9a3_iv
-      -in ci/deploy_key.enc -out ci/deploy_key -d
-    install:
-    - git clone --mirror https://github.com/pgf-tikz/pgf.git pgf-git-mirror
-    - cd pgf-git-mirror
-    before_script:
-    - eval "$(ssh-agent -s)"
-    - chmod 600 ../ci/deploy_key
-    - echo -e "Host git.code.sf.net\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-    - ssh-add ../ci/deploy_key
-    script:
-    - git remote add sf ssh://[email protected]/p/pgf/git
-    - git push --mirror --force sf
-
 deploy:
   provider: releases
   api_key: $GH_TOKEN
   file_glob: true
-  file: $TRAVIS_BUILD_DIR/../pgf_*.zip
+  file:
+  - $TRAVIS_BUILD_DIR/../pgf_*.zip
+  - $TRAVIS_BUILD_DIR/../pgfmanual.pdf
   skip_cleanup: true
   overwrite: true
   on:

README.md

@@ -8,12 +8,14 @@ backend drivers, including `pdftex` and `dvips`. It comes with a
 user-friendly syntax layer called Ti*k*Z.
 
 See the directory `doc/generic/pgf` for more information. See the file
-`doc/generic/pgf/pgfmanual.pdf` for a manual. This
+`doc/generic/pgf/pgfmanual.pdf` (also available from 
+https://pgf-tikz.github.io/pgf/pgfmanual.pdf) for a manual. This
 documentation also explains the installation.  See the file
 `doc/generic/pgf/license/LICENSE` for license details.
 
-Please go to https://github.com/pgf-tikz/pgf
-to submit bug reports, request new features, etc.
+Please go to the official repository at https://github.com/pgf-tikz/pgf or the
+official mailing list at https://tug.org/mailman/listinfo/pgf-tikz to submit
+bug reports, request new features, etc.
 
 ## Installation
 

ci/update_tlcontrib.sh

@@ -37,6 +37,16 @@ if ! git diff --quiet HEAD -- && [ "$1" != "-f" ]; then
     exit 1
 fi
 
+CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+function cleanup {
+    echo "Cleaning up changes"
+    git reset --hard "${CURRENT_BRANCH}"
+    git checkout "${CURRENT_BRANCH}"
+}
+trap cleanup EXIT
+
+# Switch to a new branch
+git checkout -f -B tlcontrib
 
 # Prepare sources for tlpkg
 mkdir -p texmf-dist/web2c
@@ -46,7 +56,7 @@ done
 touch texmf-dist/doc/generic/pgf/pgfmanual.pdf # In case you forgot to move it
 git add texmf-dist/doc/generic/pgf/pgfmanual.pdf
 git add texmf-dist/tex/generic/pgf/pgf.revision.tex # This file HAS to exist!
-git commit --no-gpg-sign --quiet -m "Move files"
+git commit --no-gpg-sign --quiet --amend --no-edit
 
 # Prepare tlpkg
 mkdir -p /tmp/tlpkg/tlpsrc
@@ -72,8 +82,12 @@ mkdir -p tlcontrib/tlnet/
 perl /tmp/tlpkg/bin/tl-update-tlpdb -from-git -master "${PWD}"
 perl /tmp/tlpkg/bin/tl-update-containers -master "${PWD}" -location "${PWD}/tlcontrib/tlnet" -all -recreate -no-sign
 
-# Reset git to previous state
-git reset --hard HEAD~1
+# Copy pgfmanual.pdf to tlcontrib
+cp texmf-dist/doc/generic/pgf/pgfmanual.pdf tlcontrib/
+
+# Clear trap and cleanup
+trap - EXIT
+cleanup
 
 # Deploy the tree
 cd tlcontrib/

doc/generic/pgf/ChangeLog

@@ -1,3 +1,243 @@
+2019-07-12 Henri Menke
+
+    - Release 3.1.4
+
+2019-07-12 Henri Menke
+
+    - after_script runs after deploy
+
+2019-07-11 Henri Menke
+
+    - Add pgfmanual to release files
+
+2019-07-11 johannesborgstrom
+
+    - Add URL of the pdf manual to the README.md file
+
+2019-07-11 Henri Menke
+
+    - Goodbye SourceForge
+
+2019-07-11 Henri Menke
+
+    - Clear trap before deploy
+
+2019-07-11 Henri Menke
+
+    - Switch to a new branch for tlcontrib
+
+2019-07-10 Henri Menke
+
+    - Stretchable dash patterns #629
+
+2019-07-09 Henri Menke
+
+    - Try protected@edef in pgfmathparse
+
+2019-07-05 Henri Menke
+
+    - Hardening patterns.meta a little
+
+2019-07-04 Henri Menke
+
+    - \pgfmathrandominteger didn't handle expressions as input
+
+2019-07-04 Henri Menke
+
+    - extract.lua: all extracted files are tex
+
+2019-07-04 Henri Menke
+
+    - extract.lua: recurse into subdirectories, ignore remember picture
+
+2019-07-03 Henri Menke
+
+    - Describe \pgfdeclarepattern and \tikzdeclarepattern
+
+2019-07-03 Henri Menke
+
+    - Add patterns.meta to the manual
+
+2019-06-27 Henri Menke
+
+    - /pgf/foreach/count is unscoped #702
+
+2019-04-22 Henri Menke
+
+    - On the way to more configurable patterns
+
+2019-06-27 Henri Menke
+
+    - Add mailing list to the README
+
+2019-06-26 Henri Menke
+
+    - Missed stripping pt on dimensions #701
+
+2019-06-26 Henri Menke
+
+    - Bend angle need not be integer #700
+
+2019-06-26 Henri Menke
+
+    - No dedicated options for libraries (for now)
+
+2019-06-26 Henri Menke
+
+    - Add option to hide code
+
+2019-06-26 Henri Menke
+
+    - Stripping comments was too greedy
+
+2019-06-26 Henri Menke
+
+    - Small fix to the grammar
+
+2019-06-25 Henri Menke
+
+    - Typos in luamath
+
+2019-06-24 Henri Menke
+
+    - Functionality to print libraries in code listings
+
+2019-06-23 Stefan Pinnow
+
+    - - fixed some typos
+
+2019-06-22 Stefan Pinnow
+
+    - - fixed regression   (accidentally duplicated part of code)
+
+2019-06-21 Henri Menke
+
+    - \pgf@nodecallback might be called twice #693
+
+2019-06-21 Henri Menke
+
+    - Default implementation of \pgfsys@hboxsynced doesn't work for dvips #690
+
+2019-06-21 Henri Menke
+
+    - Fix position tracking for XeTeX #353
+
+2019-06-06 Henri Menke
+
+    - Wrong order in definition of \translate #689
+
+2019-06-05 Henri Menke
+
+    - FILES is generated
+
+2019-06-05 Henri Menke
+
+    - Change priority of Travis jobs
+
+2019-06-05 Henri Menke
+
+    - Load imakeidx before hyperref
+
+2019-06-05 Henri Menke
+
+    - Remove user config from deploy script
+
+2019-06-03 Henri Menke
+
+    - Revert "Missing spaces in error messages #679"
+
+2019-05-31 cfeuersaenger
+
+    - Restored lost functionality in intersections / fillbetween feature
+
+2019-05-30 Christian Feuersaenger
+
+    - Revert 00f4e8d4154dcb3133ed4a106b6254b8faf874e2
+
+2019-05-30 Christian Feuersaenger
+
+    - Fixed regression: the merge cc191ed4ae5bd11df9ce42595102caa4e1f141b4 accidentally deleted a feature
+
+2019-05-24 Henri Menke
+
+    - Use imakeidx for automatic index creation
+
+2019-05-23 Henri Menke
+
+    - Looks like I got tex4ht working
+
+2019-05-23 Henri Menke
+
+    - Use T1 for DVI output for now, see also https://github.com/mgieseki/dvisvgm/issues/2
+
+2019-05-23 Henri Menke
+
+    - luaotfload was missing this whole time
+
+2019-05-23 Henri Menke
+
+    - Merge remote-tracking branch 'loopspace/master'
+
+2019-05-23 Henri Menke
+
+    - Disable T1 encoding for LuaTeX
+
+2019-05-21 Andrew Stacey
+
+    - Extended the higher-level save of the last moveto so that it also works with nodes.
+
+2019-05-21 Andrew Stacey
+
+    - Added dimensions for saving the last moveto coordinates so that -- cycle works with nodes.  The existing method uses the coordinates stored from the last soft path move to, but this has an extra transformation applied to it meaning that when it gets used in node placement the transformation is applied twice.
+
+2019-05-20 Henri Menke
+
+    - Missing spaces in error messages #679
+
+2019-05-17 Henri Menke
+
+    - Move tlcontrib to tlnet folder to make room for possible future MikTeX contrib
+
+2019-05-17 Henri Menke
+
+    - Typo in alternate angles #676
+
+2019-05-15 Henri Menke
+
+    - Missing xcolor definitions for Plain and ConTeXt #675
+
+2019-05-13 Henri Menke
+
+    - Typo
+
+2019-05-13 Henri Menke
+
+    - Some more fixes for the tex4ht manual
+
+2019-05-13 Henri Menke
+
+    - Merge remote-tracking branch 'Mo-Gul/master'
+
+2019-05-13 Henri Menke
+
+    - Revert all but the useful changes of 98829b450a96a6790570aba11949cd9834e49e2c
+
+2019-05-13 Henri Menke
+
+    - Some more cleanup before deploy
+
+2019-05-10 Henri Menke
+
+    - Fix .lastretry #672
+
+2019-05-13 Henri Menke
+
+    - Deploy TDS and CTAN zip
+
+2019-05-13 Henri Menke
+
+    - Get git tag in Makefile
+
 2019-05-09 Henri Menke
 
     - Release 3.1.3

doc/generic/pgf/README

@@ -5,8 +5,6 @@ doc/generic/pgf/pgfmanual.pdf for a manual. This
 documentation also explains the installation.  See the file
 doc/generic/pgf/license/LICENSE for license details.
 
-Please go to https://github.com/pgf-tikz/pgf
+Please go to the official repository at https://github.com/pgf-tikz/pgf
+or the official mailing list at https://tug.org/mailman/listinfo/pgf-tikz
 to submit bug reports, request new features, etc.
-
-
-

doc/generic/pgf/extract.lua

@@ -161,6 +161,7 @@ local function walk(sourcedir, targetdir)
                     examplefile:write(options["preamble"] and options["preamble"] .. "\n" or "")
                     examplefile:write"\\begin{document}\n"
 --                    examplefile:write"\\makeatletter\n" -- TODO: this has to go
+
                     local pre = options["pre"] or ""
                     pre = pre:gsub("##", "#")
                     examplefile:write(pre .. "\n")

doc/generic/pgf/text-en/pgfmanual-en-introduction.tex

@@ -238,7 +238,7 @@ \subsection{Getting Help}
     \item Read the manual, at least the part that has to do with your
         problem.
     \item If that does not solve the problem, try having a look at the
-        sourceforge development page for \pgfname\ and \tikzname\ (see the
+        GitHub development page for \pgfname\ and \tikzname\ (see the
         title of this document). Perhaps someone has already reported a
         similar problem and someone has found a solution.
     \item On the website you will find numerous forums for getting help.