diff --git a/README.md b/README.md index 4bb0a58f..e32c02ed 100644 --- a/README.md +++ b/README.md @@ -1219,6 +1219,10 @@ Substitution Description {closeparens} A close parentheses: ')' {openbracket} An open bracket: '[' {closebracket} A close bracket: ']' +{newline} A newline: '\n' +{lf} A line feed: '\n', alias for {newline} +{cr} A carriage return: '\r' +{crlf} a carriage return + line feed: '\r\n' The following substitutions may result in multiple values. Thus if specified for --directory these could result in multiple copies of a photo being being @@ -2893,6 +2897,10 @@ The following template field substitutions are availabe for use with `PhotoInfo. |{closeparens}|A close parentheses: ')'| |{openbracket}|An open bracket: '['| |{closebracket}|A close bracket: ']'| +|{newline}|A newline: '\n'| +|{lf}|A line feed: '\n', alias for {newline}| +|{cr}|A carriage return: '\r'| +|{crlf}|a carriage return + line feed: '\r\n'| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| |{keyword}|Keyword(s) assigned to photo| diff --git a/build.sh b/build.sh new file mode 100755 index 00000000..3ec2e1da --- /dev/null +++ b/build.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# script to help build osxphotos release +# this is unique to my own dev setup + +activate osxphotos +rm -rf dist; rm -rf build +python3 utils/update_readme.py +(cd docsrc && make github && make pdf) +python3 setup.py sdist bdist_wheel +./make_cli_exe.sh \ No newline at end of file diff --git a/docs/.buildinfo b/docs/.buildinfo index 880dba84..ada8362f 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: d8381561e4b55688141d3bad9c7d6dc7 +config: 2de28792352636d51e876bb33a863f93 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index 54a3eee3..1f8b0470 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code — osxphotos 0.42.2 documentation + Overview: module code — osxphotos 0.42.3 documentation diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index f855fdaf..5e91e8f7 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '0.42.2', + VERSION: '0.42.3', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index e0bb5f10..aeb6f8db 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -5,7 +5,7 @@ - osxphotos command line interface (CLI) — osxphotos 0.42.2 documentation + osxphotos command line interface (CLI) — osxphotos 0.42.3 documentation diff --git a/docs/genindex.html b/docs/genindex.html index 00b41c4d..45c7fd3e 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -5,7 +5,7 @@ - Index — osxphotos 0.42.2 documentation + Index — osxphotos 0.42.3 documentation diff --git a/docs/index.html b/docs/index.html index 224545ac..1aa65722 100644 --- a/docs/index.html +++ b/docs/index.html @@ -5,7 +5,7 @@ - Welcome to osxphotos’s documentation! — osxphotos 0.42.2 documentation + Welcome to osxphotos’s documentation! — osxphotos 0.42.3 documentation diff --git a/docs/modules.html b/docs/modules.html index 4480a154..d8d76b9e 100644 --- a/docs/modules.html +++ b/docs/modules.html @@ -5,7 +5,7 @@ - osxphotos — osxphotos 0.42.2 documentation + osxphotos — osxphotos 0.42.3 documentation diff --git a/docs/osxphotos.pdf b/docs/osxphotos.pdf index 08c79f13..55577098 100644 Binary files a/docs/osxphotos.pdf and b/docs/osxphotos.pdf differ diff --git a/docs/reference.html b/docs/reference.html index 7c41d46f..ab116889 100644 --- a/docs/reference.html +++ b/docs/reference.html @@ -5,7 +5,7 @@ - osxphotos package — osxphotos 0.42.2 documentation + osxphotos package — osxphotos 0.42.3 documentation diff --git a/docs/search.html b/docs/search.html index 6b76dc58..af8f97ad 100644 --- a/docs/search.html +++ b/docs/search.html @@ -5,7 +5,7 @@ - Search — osxphotos 0.42.2 documentation + Search — osxphotos 0.42.3 documentation