summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/achemso/CHANGELOG.md536
-rw-r--r--macros/latex/contrib/achemso/achemso-demo.bib2
-rw-r--r--macros/latex/contrib/achemso/achemso-demo.pdfbin347883 -> 359125 bytes
-rw-r--r--macros/latex/contrib/achemso/achemso-demo.tex2
-rw-r--r--macros/latex/contrib/achemso/achemso.dtx468
-rw-r--r--macros/latex/contrib/achemso/achemso.ins149
-rw-r--r--macros/latex/contrib/achemso/achemso.pdfbin518408 -> 514491 bytes
-rw-r--r--macros/latex/contrib/animate/ChangeLog3
-rw-r--r--macros/latex/contrib/animate/animate.pdfbin3911070 -> 3887744 bytes
-rw-r--r--macros/latex/contrib/animate/animate.sty217
-rw-r--r--macros/latex/contrib/animate/animate.tex9
-rw-r--r--macros/latex/contrib/beamer/CHANGELOG.md17
-rw-r--r--macros/latex/contrib/beamer/base/beamer.cls2
-rw-r--r--macros/latex/contrib/beamer/base/beamerarticle.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseframe.sty3
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty23
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasenotes.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseoverlay.sty2
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemedefault.sty4
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty2
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty4
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty4
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdfbin148816 -> 149003 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdfbin353427 -> 353430 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdfbin324218 -> 316925 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-animations.tex4
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-color.tex2
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-installation.tex6
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-introduction.tex8
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-localstructure.tex10
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-macros.tex2
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex32
-rw-r--r--macros/latex/contrib/beamer/doc/beameruserguide.pdfbin1603631 -> 1629964 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beameruserguide.tex2
-rw-r--r--macros/latex/contrib/media9/ChangeLog8
-rw-r--r--macros/latex/contrib/media9/doc/media9.pdfbin3727327 -> 3727330 bytes
-rw-r--r--macros/latex/contrib/media9/media9.sty8
-rw-r--r--macros/latex/contrib/media9/pdfbase.sty76
38 files changed, 1115 insertions, 494 deletions
diff --git a/macros/latex/contrib/achemso/CHANGELOG.md b/macros/latex/contrib/achemso/CHANGELOG.md
new file mode 100644
index 0000000000..2dd0780d95
--- /dev/null
+++ b/macros/latex/contrib/achemso/CHANGELOG.md
@@ -0,0 +1,536 @@
+# Changelog
+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/).
+
+## [v3.13]
+### Added
+- Style for _ACT ES&T Eng._ (`aeecco`)
+- Style for _ACT ES&T Water_ (`aewcaa`)
+- Changelog as separate file
+
+### Changed
+- Split `.ins` file out from `.dtx`
+
+### Fixed
+- Corrected standard TOC height and width (see #30 and #34)
+
+## [v3.12a] - 2019-02-14
+### Added
+- Style for _ACS Mater. Lett._ (`amlcef`)
+
+### Changed
+- Print article titles in _J. Am. Chem. Soc._ bibliography style
+- Use ISO date formats throughout
+
+## [v3.12] - 2018-09-15
+### Added
+- Style for _ACS Appl. Electron. Mater._ (`aaembp`)
+- Style for _ACS Appl. Polym. Mater._ (`aapmcd`)
+
+### Fixed
+- Error if explicit `and others` is used in `.bib` file (issue #29)
+
+## [v3.11b] - 2018-07-12
+### Changed
+- Maximum number of authors printed in _ACS Nano_
+
+### Fixed
+- Print abstract text at full size
+- Spacing when `and others` is used in `.bib` file (issue #29)
+
+## [v3.11a] - 2018-02-05
+### Changed
+- Style changes for Supporting Information
+
+## [v3.11] - 2018-01-10
+### Added
+- Style for _ACS Appl. Energy Mater._ (`aaemcq`)
+- Style for _ACS Appl. Nano Mater._ (`aanmf6`)
+
+### Changed
+- Use `chemformula` in demo file
+- Remove redundant comments about e-TeX
+- Include article titles in all manuscript bibliographies
+
+## [v3.10i] - 2017-05-18
+### Changed
+- Updates for the _Biochemistry_ style
+- Updates for the _J. Org. Chem._ style
+- Updates for _Org. Lett._ style
+
+### Fixed
+- Issue printing DOI in bibliographuy
+
+## [v3.10h] - 2017-01-21
+### Added
+- Style for _ACS Earth Space Chem._ (`aesccq`)
+- Style for _ACS Sensors_ (`aidcbc`)
+- Style for _ACS Infect. Dis._ (`ascefj`)
+
+### Changed
+- Updates for the _J. Chem. Theory Comput._ style
+- Updated text used for Supplementary Information
+
+## [v3.10g] - 2017-01-14
+### Added
+- Style for _ACS Biomater. Sci._ (`abseba`)
+
+### Fixed
+- Issue in style for _Inorg. Chem._
+
+## [v3.10f] - 2016-09-07
+### Changed
+- Updated text for Supplementary Information
+- Updates for the _Macromolecules_ style
+
+## [v3.10e] - 2016-08-31
+### Changed
+- Updates for the _Macromolecules_ style
+
+## [v3.10d] - 2016-06-17
+### Changed
+- Improved DOI support
+
+## [v3.10c] - 2016-05-10
+### Added
+- Style for _ACS Omega_ (`acsodf`)
+- Style for _ACS Energy Lett._ (`aelccp`)
+
+### Changed
+- Added `achemso-` to all style configuration file names
+
+## [v3.10b] - 2016-01-20
+### Changed
+- Updated text for Supplementary Information
+- Split demonstration files from main source
+
+### Fixed
+- Define `\acs@tocentry@text` globally (issue #18)
+
+## [v3.10a]
+### Changed
+- Updates for the _Chem. Mater._ style
+- Updates for the _Chem. Rev._ style
+
+## [v3.10] - 2015-04-07
+### Changed
+- Print affiliation information in the title block
+
+### Fixed
+- Include `\section*` and `\subsection*` to TOC
+
+## [v3.9b] - 2015-03-23
+### Changed
+- Add T1 encoding to demo file (issue #14)
+- Superscript references for _J. Agric. Food Chem._ style (issue #16)
+
+### Fixed
+- Allow `super=true` to work after loading `natbib` (issue #15)
+
+## [v3.9a] - 2015-03-12
+### Changed
+- Print DOIs in all cases in _ACS Central Sci._ style
+
+## [v3.9] - 2015-02-01
+### Added
+- Option `doi`
+- Version information to BibTeX log
+
+## [v3.8n] - 2015-01-18
+### Added
+- Style for _ACS Central Sci._ (`acscii`)
+
+### Changed
+- Style changes for _ACS Nano_
+- Remove keywords from _J. Phys. Chem._ styles
+- TOC entry size for _J. Phys. Chem. Lett._
+
+## [v3.8l] - 2014-08-23
+### Changed
+- Allow for case where fax number is given with no phone number
+
+## [v3.8k] - 2014-08-18
+### Fixed
+- Format date correctly if given for `in press` BibTeX entries
+
+## [v3.8j] - 2014-06-12
+### Changed
+- Update article title and keyword requirements for all journals
+
+### Fixed
+- Configuration file name for _Biochemistry_ (`bichaw`)
+
+### Removed
+- Style for_Biotechnol. Prog._
+
+## [v3.8i] - 2014-05-14
+### Changed
+- Style update for _Chem. Res. Toxicol._
+- Include keywords for _ACS Appl. Mater. Interfaces_ style
+
+## [v3.8h] - 2014-03-31
+### Changed
+- Style updates for _Chem. Res. Toxicol._
+
+## [v3.8g] - 2014-03-06
+### Changed
+- Formatting for _J. Phys. Chem._ styles
+
+### Fixed
+- Ensure that `mciteplus` patch is safe even if package loading is bypassed
+
+## [v3.8f] - 2014-01-23
+### Changed
+- Update following `mciteplus` change
+
+## [v3.8e] - 2014-01-08
+### Changed
+- Change TOC entry size for _J. Med. Chem._
+- Include titles for article in _ACS Appl. Mater. Interfaces_ style
+
+## [v3.8d] - 2013-10-04
+### Fixed
+- Typo in keyword printing
+
+## [v3.8c] - 2013-09-20
+### Changed
+- Updated _ACS Photonics_ style
+
+## [v3.8b] - 2013-09-15
+### Changed
+- Alter TOC printing slightly
+- Update demo to reflect TOC changes
+
+### Fixed
+- Print abstract/TOC/keywords in correct order for _J. Phys. Chem. Lett._
+
+## [v3.8a] - 2013-09-08
+### Changed
+- Update bibliography style for _J. Phys. Chem._ derivatives
+
+### Fixed
+- Minor style fixes
+
+## [v3.8] - 2013-08-23
+### Added
+- Command `\latin`
+- Style for _ACS Applied Materials & Interfaces_
+- Style for _ACS Photon._ (`apchd5`)
+- Style for _ACS Sustainable Chem. Eng._ (`ascecg`)
+- Style for _ACS Synth. Biol._ (`asbcd6`)
+- Style for _Environ. Sci. Technol. Lett._ (`estlcu`)
+
+### Changed
+- Print keywords after abstract not after title
+- Drop loading any font files
+- Extend author symbols to 99 authors
+- Print keyword and abbreviations in sections
+
+### Fixed
+- Behaviour of `\citenum`
+- Minor style fixes
+
+## [v3.7h] - 2013-06-07
+### Fixed
+- Remove extraneous `*` in format.doi function (issue #13)
+
+## [v3.7g] - 2013-04-13
+### Changed
+- Update manuscript types for _ACS Macro Lett._
+- Print article title for _J. Phys. Chem._ papers
+
+### Fixed
+- Set TOC size for _ACS Macro Lett._ (issue #10)
+- Add DocStrip guards for _ACS Macro Lett._ (issue #11)
+
+## [v3.7f] - 2013-03-07
+### Changed
+- Load `mciteplus` after `natbib`
+
+### Fixed
+- `etalmode` option
+
+## [v3.7e] - 2013-02-13
+### Changed
+- Drop use of `mathptmx`
+
+## [v3.7d] - 2012-09-12
+### Fixed
+- Typo in the `.bst`
+
+## [v3.7c] - 2012-08-30
+### Changed
+- Update for _Ind. Eng. Chem. Res._ style
+
+## [v3.7b] - 2012-07-25
+### Changed
+- Update _J. Phys. Chem. Lett._ style to truncate author list
+
+### Fixed
+- Step version (issue #8)
+
+## [v3.7a] - 2012-05-08
+### Changed
+- Print article titles in _Langmuir_ style
+
+### Fixed
+- Relationship between `usetitle` and `articletitle`
+
+## [v3.7] - 2012-04-30
+### Added
+- Option `chaptertitle`
+- Style for _ACS Med. Chem. Lett._ (`amclct`)
+
+### Changed
+- Rename `usetitle` to `articletitle` (to match `biblatex` `chem-acs` style)
+
+### Fixed
+- No author truncation for _J. Chem. Theory Comput._ (issue #7)
+
+## [v3.6] - 2012-04-30
+### Changed
+- Drop `cleveref`
+
+## [v3.5k] - 2012-04-30
+* 8aca9c0 Various incredibly niggly things for J. Nat. Prod.
+
+## [v3.5j] -
+* 9a5cb7f Flexible size for TOC entry box
+
+## [v3.5i] -
+* 1649618 Print keywords for J. Phys. Chem. submissions
+
+## [v3.5h] -
+* 93811a3 Give schemes, etx. 'S' numbers
+* e8d62c8 Use 'S<num>' for SI refs.
+* 7478673 A slight improvement for SI
+* b34463a Formatting tweak for J. Chem. and Eng. Data.
+
+## [v3.5g] -
+* ee474b2 Another .bst typo
+
+## [v3.5f] -
+* 920dc5c One-token typo in .bst affecting 'and others' entries
+
+## [v3.5e] -
+* d44219d Checking new formats: minor adjustment
+* 5834bfb Settings for new journals (hopefully)
+* 83c9401 New ACS journals for 2011: - New docstrip guards Remove J. Comb. Chem.
+* 1be7600 Remove engine line (not really needed)
+
+## [v3.5d] -
+|\
+| * 6955482 Fix bug in make.ordinal
+* | 2431abf Added tag v3.5c for changeset beb648a09793
+* | 1da12a1 Resolve merge issues
+|\ \
+| |/
+|/|
+| * 9feff46 Resolve update issues
+| ## [v3.5a] -
+| * 73bbe01 Make \mciteSubRef work properly (fixes #6) Update Org. Lett. formatting (fixes #5) Bump version number
+* | 3513189 Added tag v3.5b for changeset 8ee4387af241
+* | bd472bb Bug fix for nalefd.cfg
+* | c84d4bf Added tag v3.5b for changeset 0b1acfd46340
+* | fae782e Added tag v3.5a for changeset 20b1bf86cfe9
+* | 166a701 Print abstract for JACS Communications (fixes #3)
+* | 6ff6c54 Merge changes
+|\ \
+| |/
+| * b44e931 Add keywords to Nano Lett. output
+| ## [v3.5] -
+| * 9df91e0 Note behaviour of booktitles/chapters
+| * 2c926dd Lots of improvements following the style guide
+* | 4e174ec Move biblabel stuff to end of class/package (fixes #4)
+|/
+* 4267fa3 Corrected formatting based on Style Guide: patents and techreports
+* 4cfd1f1 Use method for defining \endmcitethebibliography that is not caught out by LaTeX2e's \newcommand restriction on "\end..." functions
+* 1dae139 Step version number (for tomorrow)
+* 60b25c5 A couple of fixes from the style guideā‰ˆy
+* a67ff26 Clean up head (what is up?)
+|\
+| * 55e1aae Adjust position of that new test reference
+* | e7a81e7 Logic reversal in BibTeX stlyes => do the same in package/class code
+* | b90db69 Move position of year in Biochemistry-style articles
+* | db54abb Completely revised bst files: rewritten from scratch Still need to check versus ACS Style Guide
+* | 7c33384 Added 'patent' record to demo database
+|/
+* 97f4038 Add "inbook" reference to test doc (for testing updates to BibTeX style)
+* cb1920d Use natbib mechanism to alter \@biblabel
+
+## [v3.4g] -
+* 4815f00 Added ACS Chem. Neurosci. style
+
+## [v3.4f] -
+* 15cba28 Only define bibnote counter if not set up elsewhere Style file for J. Chem. Ed.
+
+## [v3.4e] -
+* 78dfe94 Biomacromolecule style improvements again
+
+## [v3.4d] -
+* a48eb33 Improved BibTeX style for reports
+
+## [v3.4c] -
+* ad71645 More improvements for Biomacromolecules
+
+## [v3.4b] -
+* 015b3fc Add hyperref option so things work properly with cleveref
+
+## [v3.4a] -
+* e0bf02e Better style file for Biomacromolecules
+
+## [v3.4] -
+* c7e9034 New advice on installation Switch from varioref to cleveref for \ref support New TOC printing routine Include fixes from new version of cite package in natmove
+
+## [v3.3g] -
+* a4871fe Advice on overriding class options added
+
+## [v3.3f] -
+* 68d0914 Style fix for Acc. Chem. Res.
+
+## [v3.3e] -
+* b221e15 Minor style fixes
+
+## [v3.3d] -
+* 8638068 Bug fix in meta data routines
+
+## [v3.3c] -
+* 1d50b41 Add advice on mismatching class and BibTeX style files REmove spurious comma when two author names given Add J. Phys. Chem. Lett. style
+
+## [v3.3b] -
+* d0f63c7 Bug fix for affiliation symbol printing
+
+## [v3.3a] -
+* 874a7b3 New options usetitle and etalmode for controlling bibliography
+
+## [v3.3] -
+* 457f0cb New layout option for two column printing Better logic for \altaffiliation to reduce duplicate printing Improve keyval code (use less xkeyval functions)
+
+## [v3.2f] -
+* 99425ef Better installation advice Move bibliography set up to correct bug with biochem style Improved footnote symbol macro
+
+## [v3.2e] -
+* e787692 Alteration to the method for printing the abstract, to allow delayed print
+
+## [v3.2d] -
+* 72b0817 Fix addition of star to lead author
+
+## [v3.2c] -
+* 537aa6f Fix bug with email option New \fax and \phone meta-data options Use optional argument for \title as running header suggestion
+
+## [v3.2b] -
+* 14963fd Added email option to set printing of e-mail address on first page
+
+## [v3.2a] -
+* b813cf6 Bug fix for duplicate institute test
+
+## [v3.2] -
+* ddd8fe8 New functions to alter formatting (sections, section numbers, abstract) Environment to format TOC entry added Some internal refactors
+
+## [v3.1a] -
+* b000d9f Bug fix for duplicate affiliation detection
+
+## [v3.1] -
+* f998e90 Produce print-like layout for JACS Communications Add \alsoaffiliation as a complement to \altaffiliation Convert \suppinfo and \acknowledgement to environments Package loading reordered Meta data system rearranged
+
+## [v3.0a] -
+* 5de99e0 Skip printing footnotes when only one institution is needed
+
+## [v3.0]
+### Changed
+- Second re-write, converting to a class and giving much tighter integration
+ with ACS submission system
+
+## [v2.0]
+### Changed
+- Re-write of package by Joseph Wright
+
+## [v1.0]
+### Added
+- Initial release of package by Mats Dahlgren
+
+[Unreleased]: https://github.com/josephwright/achemso/compare/v3.13...HEAD
+[v3.13]: https://github.com/josephwright/achemso/compare/v3.12a...v3.13
+[v3.12a]: https://github.com/josephwright/achemso/compare/v3.12...v3.12a
+[v3.12]: https://github.com/josephwright/achemso/compare/v3.11b...v3.12
+[v3.11b]: https://github.com/josephwright/achemso/compare/v3.11a...v3.11b
+[v3.11a]: https://github.com/josephwright/achemso/compare/v3.11...v3.11a
+[v3.11]: https://github.com/josephwright/achemso/compare/v3.10i...v3.11
+[v3.10i]: https://github.com/josephwright/achemso/compare/v3.10h...v3.10i
+[v3.10h]: https://github.com/josephwright/achemso/compare/v3.10g...v3.10h
+[v3.10g]: https://github.com/josephwright/achemso/compare/v3.10f...v3.10g
+[v3.10f]: https://github.com/josephwright/achemso/compare/v3.10e...v3.10f
+[v3.10e]: https://github.com/josephwright/achemso/compare/v3.10d...v3.10e
+[v3.10d]: https://github.com/josephwright/achemso/compare/v3.10c...v3.10d
+[v3.10d]: https://github.com/josephwright/achemso/compare/v3.10b...v3.10c
+[v3.10b]: https://github.com/josephwright/achemso/compare/v3.10a...v3.10b
+[v3.10a]: https://github.com/josephwright/achemso/compare/v3.10...v3.10a
+[v3.10]: https://github.com/josephwright/achemso/compare/v3.9b...v3.10
+[v3.9b]: https://github.com/josephwright/achemso/compare/v3.9a...v3.9b
+[v3.9a]: https://github.com/josephwright/achemso/compare/v3.9...v3.9a
+[v3.9]: https://github.com/josephwright/achemso/compare/v3.8n...v3.9
+[v3.8n]: https://github.com/josephwright/achemso/compare/v3.8m...v3.8n
+[v3.8m]: https://github.com/josephwright/achemso/compare/v3.8l...v3.8m
+[v3.8l]: https://github.com/josephwright/achemso/compare/v3.8k...v3.8l
+[v3.8k]: https://github.com/josephwright/achemso/compare/v3.8j...v3.8k
+[v3.8j]: https://github.com/josephwright/achemso/compare/v3.8i...v3.8j
+[v3.8i]: https://github.com/josephwright/achemso/compare/v3.8h...v3.8i
+[v3.8h]: https://github.com/josephwright/achemso/compare/v3.8g...v3.8h
+[v3.8g]: https://github.com/josephwright/achemso/compare/v3.8f...v3.8g
+[v3.8f]: https://github.com/josephwright/achemso/compare/v3.8e...v3.8f
+[v3.8e]: https://github.com/josephwright/achemso/compare/v3.8d...v3.8e
+[v3.8d]: https://github.com/josephwright/achemso/compare/v3.8c...v3.8d
+[v3.8c]: https://github.com/josephwright/achemso/compare/v3.8b...v3.8c
+[v3.8b]: https://github.com/josephwright/achemso/compare/v3.8a...v3.8b
+[v3.8a]: https://github.com/josephwright/achemso/compare/v3.8...v3.8a
+[v3.8]: https://github.com/josephwright/achemso/compare/v3.7h...v3.8
+[v3.7h]: https://github.com/josephwright/achemso/compare/v3.7g...v3.7h
+[v3.7g]: https://github.com/josephwright/achemso/compare/v3.7f...v3.7g
+[v3.7f]: https://github.com/josephwright/achemso/compare/v3.7e...v3.7f
+[v3.7e]: https://github.com/josephwright/achemso/compare/v3.7d...v3.7e
+[v3.7d]: https://github.com/josephwright/achemso/compare/v3.7c...v3.7d
+[v3.7c]: https://github.com/josephwright/achemso/compare/v3.7b...v3.7c
+[v3.7b]: https://github.com/josephwright/achemso/compare/v3.7a...v3.7b
+[v3.7a]: https://github.com/josephwright/achemso/compare/v3.7...v3.7a
+[v3.7]: https://github.com/josephwright/achemso/compare/v3.6...v3.7
+[v3.6]: https://github.com/josephwright/achemso/compare/v3.5k...v3.6
+[v3.5k]: https://github.com/josephwright/achemso/compare/v3.5j...v3.5k
+[v3.5j]: https://github.com/josephwright/achemso/compare/v3.5i...v3.5j
+[v3.5i]: https://github.com/josephwright/achemso/compare/v3.5h...v3.5i
+[v3.5h]: https://github.com/josephwright/achemso/compare/v3.5g...v3.5h
+[v3.5g]: https://github.com/josephwright/achemso/compare/v3.5f...v3.5g
+[v3.5f]: https://github.com/josephwright/achemso/compare/v3.5e...v3.5f
+[v3.5e]: https://github.com/josephwright/achemso/compare/v3.5d...v3.5e
+[v3.5d]: https://github.com/josephwright/achemso/compare/v3.5c...v3.5d
+[v3.5c]: https://github.com/josephwright/achemso/compare/v3.5b...v3.5c
+[v3.5b]: https://github.com/josephwright/achemso/compare/v3.5a...v3.5b
+[v3.5a]: https://github.com/josephwright/achemso/compare/v3.5...v3.5a
+[v3.5]: https://github.com/josephwright/achemso/compare/v3.4g...v3.5
+[v3.4g]: https://github.com/josephwright/achemso/compare/v3.4f...v3.4g
+[v3.4f]: https://github.com/josephwright/achemso/compare/v3.4e...v3.4f
+[v3.4e]: https://github.com/josephwright/achemso/compare/v3.4d...v3.4e
+[v3.4d]: https://github.com/josephwright/achemso/compare/v3.4c...v3.4d
+[v3.4c]: https://github.com/josephwright/achemso/compare/v3.4b...v3.4c
+[v3.4b]: https://github.com/josephwright/achemso/compare/v3.4a...v3.4b
+[v3.4a]: https://github.com/josephwright/achemso/compare/v3.4...v3.4a
+[v3.4]: https://github.com/josephwright/achemso/compare/v3.3g...v3.4
+[v3.3g]: https://github.com/josephwright/achemso/compare/v3.3f...v3.3g
+[v3.3f]: https://github.com/josephwright/achemso/compare/v3.3e...v3.3f
+[v3.3e]: https://github.com/josephwright/achemso/compare/v3.3d...v3.3e
+[v3.3d]: https://github.com/josephwright/achemso/compare/v3.3c...v3.3d
+[v3.3c]: https://github.com/josephwright/achemso/compare/v3.3b...v3.3c
+[v3.3b]: https://github.com/josephwright/achemso/compare/v3.3a...v3.3b
+[v3.3a]: https://github.com/josephwright/achemso/compare/v3.3...v3.3a
+[v3.3]: https://github.com/josephwright/achemso/compare/v3.2f...v3.3
+[v3.2f]: https://github.com/josephwright/achemso/compare/v3.2e...v3.2f
+[v3.2e]: https://github.com/josephwright/achemso/compare/v3.2d...v3.2e
+[v3.2d]: https://github.com/josephwright/achemso/compare/v3.2c...v3.2d
+[v3.2c]: https://github.com/josephwright/achemso/compare/v3.2b...v3.2c
+[v3.2b]: https://github.com/josephwright/achemso/compare/v3.2a...v3.2b
+[v3.2a]: https://github.com/josephwright/achemso/compare/v3.2...v3.2a
+[v3.2]: https://github.com/josephwright/achemso/compare/v3.1a...v3.2
+[v3.1a]: https://github.com/josephwright/achemso/compare/v3.1...v3.1a
+[v3.1]: https://github.com/josephwright/achemso/compare/v3.0a...v3.1
+[v3.0a]: https://github.com/josephwright/achemso/compare/v3.0...v3.0a
diff --git a/macros/latex/contrib/achemso/achemso-demo.bib b/macros/latex/contrib/achemso/achemso-demo.bib
index 7a71204086..7082b87b14 100644
--- a/macros/latex/contrib/achemso/achemso-demo.bib
+++ b/macros/latex/contrib/achemso/achemso-demo.bib
@@ -49,7 +49,7 @@
Crabtree, Robert H.},
title = {An anion-dependent switch in selectivity results from a
change of {C}---{H} activation mechanism in the reaction of an
- imidazolium salt with \ce{IrH5(PPh3)2}},
+ imidazolium salt with \ch{IrH5(PPh3)2}},
journal = {J.~Am.\ Chem. Soc.},
year = {2005},
volume = {127},
diff --git a/macros/latex/contrib/achemso/achemso-demo.pdf b/macros/latex/contrib/achemso/achemso-demo.pdf
index d2d25debd3..441d7fa772 100644
--- a/macros/latex/contrib/achemso/achemso-demo.pdf
+++ b/macros/latex/contrib/achemso/achemso-demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/achemso/achemso-demo.tex b/macros/latex/contrib/achemso/achemso-demo.tex
index 73781e0fad..77fe52c61f 100644
--- a/macros/latex/contrib/achemso/achemso-demo.tex
+++ b/macros/latex/contrib/achemso/achemso-demo.tex
@@ -300,7 +300,7 @@ method is to generate these using the basic
\end{table}
The example file also loads the optional \textsf{mhchem} package, so
-that formulas are easy to input: \texttt{\textbackslash ce\{H2SO4\}}
+that formulas are easy to input: \texttt{\textbackslash ch\{H2SO4\}}
gives \ch{H2SO4}. See the use in the bibliography file (when using
titles in the references section).
diff --git a/macros/latex/contrib/achemso/achemso.dtx b/macros/latex/contrib/achemso/achemso.dtx
index 5d3453b14a..ae31de48be 100644
--- a/macros/latex/contrib/achemso/achemso.dtx
+++ b/macros/latex/contrib/achemso/achemso.dtx
@@ -1,152 +1,29 @@
% \iffalse meta-comment
-%<*internal>
-\def\nameofplainTeX{plain}
-\ifx\fmtname\nameofplainTeX\else
- \expandafter\begingroup
-\fi
-%</internal>
-%<*install>
-\input docstrip.tex
-\keepsilent
-\askforoverwritefalse
-\preamble
-----------------------------------------------------------------
-achemso --- Support for submissions to American Chemical Society
- journals
-E-mail: joseph.wright@morningstar2.co.uk
-Released under the LaTeX Project Public License v1.3c or later
-See http://www.latex-project.org/lppl.txt
-----------------------------------------------------------------
-
-\endpreamble
-\postamble
-
-Originally developed by Mats Dahlgren
-Copyright (C) 1996-1998 by Mats Dahlgren
-Copyright (C) 2008-2019 by
- Joseph Wright <joseph.wright@morningstar2.co.uk>
-
-Part of this bundle is derived from cite.sty, to which the
-following license applies:
- Copyright (C) 1989-2009 by Donald Arseneau
- These macros may be freely transmitted, reproduced, or
- modified provided that this notice is left intact.
-
-It may be distributed and/or modified under the conditions of
-the LaTeX Project Public License (LPPL), either version 1.3c of
-this license or (at your option) any later version. The latest
-version of this license is in the file:
-
- http://www.latex-project.org/lppl.txt
-
-This work is "maintained" (as per LPPL maintenance status) by
- Joseph Wright.
-
-This work consists of the files achemso.dtx,
- achemso-demo.bib and
- achemso-demo.tex,
- and the derived files achemso.cls,
- achemso.ins,
- achemso.pdf,
- achemso.sty,
- natmove.sty and
- a number of configuration files.
-
-\endpostamble
-\usedir{tex/latex/achemso}
-\generate{
- \file{\jobname.cls}{\from{\jobname.dtx}{class}}
- \file{\jobname.sty}{\from{\jobname.dtx}{package}}
- \file{natmove.sty}{\from{\jobname.dtx}{natmove}}
-}
-\usedir{tex/latex/achemso/config}
-\generate{\file{achemso-aaembp.cfg}{\from{\jobname.dtx}{aaembp}}
- \file{achemso-aaemcq.cfg}{\from{\jobname.dtx}{aaemcq}}
- \file{achemso-aamick.cfg}{\from{\jobname.dtx}{aamick}}
- \file{achemso-aanmf6.cfg}{\from{\jobname.dtx}{aanmf6}}
- \file{achemso-aapmcd.cfg}{\from{\jobname.dtx}{aapmcd}}
- \file{achemso-abseba.cfg}{\from{\jobname.dtx}{abseba}}
- \file{achemso-accacs.cfg}{\from{\jobname.dtx}{accacs}}
- \file{achemso-achre4.cfg}{\from{\jobname.dtx}{achre4}}
-}
-\generate{\file{achemso-acscii.cfg}{\from{\jobname.dtx}{acscii}}
- \file{achemso-acbcct.cfg}{\from{\jobname.dtx}{acbcct}}
- \file{achemso-acncdm.cfg}{\from{\jobname.dtx}{acncdm}}
- \file{achemso-acsccc.cfg}{\from{\jobname.dtx}{acsccc}}
- \file{achemso-aesccq.cfg}{\from{\jobname.dtx}{aesccq}}
- \file{achemso-aelccp.cfg}{\from{\jobname.dtx}{aelccp}}
- \file{achemso-ascefj.cfg}{\from{\jobname.dtx}{ascefj}}
- \file{achemso-amlccd.cfg}{\from{\jobname.dtx}{amlccd}}
-}
-\generate{\file{achemso-amlcef.cfg}{\from{\jobname.dtx}{amlcef}}
- \file{achemso-amclct.cfg}{\from{\jobname.dtx}{amclct}}
- \file{achemso-ancac3.cfg}{\from{\jobname.dtx}{ancac3}}
- \file{achemso-acsodf.cfg}{\from{\jobname.dtx}{acsodf}}
- \file{achemso-apchd5.cfg}{\from{\jobname.dtx}{apchd5}}
- \file{achemso-aidcbc.cfg}{\from{\jobname.dtx}{aidcbc}}
- \file{achemso-ascecg.cfg}{\from{\jobname.dtx}{ascecg}}
- \file{achemso-asbcd6.cfg}{\from{\jobname.dtx}{asbcd6}}
-}
-\generate{\file{achemso-ancham.cfg}{\from{\jobname.dtx}{ancham}}
- \file{achemso-bichaw.cfg}{\from{\jobname.dtx}{bichaw}}
- \file{achemso-bcches.cfg}{\from{\jobname.dtx}{bcches}}
- \file{achemso-bomaf6.cfg}{\from{\jobname.dtx}{bomaf6}}
- \file{achemso-crtoec.cfg}{\from{\jobname.dtx}{crtoec}}
- \file{achemso-chreay.cfg}{\from{\jobname.dtx}{chreay}}
- \file{achemso-cmatex.cfg}{\from{\jobname.dtx}{cmatex}}
- \file{achemso-cgdefu.cfg}{\from{\jobname.dtx}{cgdefu}}
-}
-\generate{\file{achemso-enfuem.cfg}{\from{\jobname.dtx}{enfuem}}
- \file{achemso-esthag.cfg}{\from{\jobname.dtx}{esthag}}
- \file{achemso-estlcu.cfg}{\from{\jobname.dtx}{estlcu}}
- \file{achemso-iecred.cfg}{\from{\jobname.dtx}{iecred}}
- \file{achemso-inoraj.cfg}{\from{\jobname.dtx}{inoraj}}
- \file{achemso-jafcau.cfg}{\from{\jobname.dtx}{jafcau}}
- \file{achemso-jceda8.cfg}{\from{\jobname.dtx}{jceda8}}
- \file{achemso-jceaax.cfg}{\from{\jobname.dtx}{jceaax}}
-}
-\generate{\file{achemso-jcisd8.cfg}{\from{\jobname.dtx}{jcisd8}}
- \file{achemso-jctcce.cfg}{\from{\jobname.dtx}{jctcce}}
- \file{achemso-jmcmar.cfg}{\from{\jobname.dtx}{jmcmar}}
- \file{achemso-jnprdf.cfg}{\from{\jobname.dtx}{jnprdf}}
- \file{achemso-joceah.cfg}{\from{\jobname.dtx}{joceah}}
- \file{achemso-jpcafh.cfg}{\from{\jobname.dtx}{jpcafh}}
- \file{achemso-jpcbfk.cfg}{\from{\jobname.dtx}{jpcbfk}}
- \file{achemso-jpccck.cfg}{\from{\jobname.dtx}{jpccck}}
-}
-\generate{\file{achemso-jpclcd.cfg}{\from{\jobname.dtx}{jpclcd}}
- \file{achemso-jprobs.cfg}{\from{\jobname.dtx}{jprobs}}
- \file{achemso-jacsat.cfg}{\from{\jobname.dtx}{jacsat}}
- \file{achemso-langd5.cfg}{\from{\jobname.dtx}{langd5}}
- \file{achemso-mamobx.cfg}{\from{\jobname.dtx}{mamobx}}
- \file{achemso-mpohbp.cfg}{\from{\jobname.dtx}{mpohbp}}
- \file{achemso-nalefd.cfg}{\from{\jobname.dtx}{nalefd}}
- \file{achemso-orlef7.cfg}{\from{\jobname.dtx}{orlef7}}
-}
-\generate{\file{achemso-oprdfk.cfg}{\from{\jobname.dtx}{oprdfk}}
- \file{achemso-orgnd7.cfg}{\from{\jobname.dtx}{orgnd7}}
-}
-\usedir{bibtex/bst/achemso}
-\generate{
- \file{achemso.bst}{\from{\jobname.dtx}{bst}}
- \file{biochem.bst}{\from{\jobname.dtx}{bst,bio}}
-}
-%</install>
-%<install>\endbatchfile
-%<*internal>
-\usedir{source/latex/achemso}
-\generate{
- \file{\jobname.ins}{\from{\jobname.dtx}{install}}
-}
-\ifx\fmtname\nameofplainTeX
- \expandafter\endbatchfile
-\else
- \expandafter\endgroup
-\fi
-%</internal>
-%<*package|class|natmove>
-\NeedsTeXFormat{LaTeX2e}
-%</package|class|natmove>
+%
+% File: achemso.dtx Copyright (C) 2008-2020 Joseph Wright
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% https://www.latex-project.org/lppl.txt
+%
+% This file is part of the "achemso bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% The released version of this bundle is available from CTAN.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/josephwright/achemso
+%
+% for those people who are interested.
+%
+% -----------------------------------------------------------------------
+%
%<*driver>
\documentclass[a4paper]{ltxdoc}
\usepackage{achemso,array,booktabs,lmodern}
@@ -300,92 +177,6 @@ This work consists of the files achemso.dtx,
%
%\maketitle
%
-% \changes{v1.0}{1998/06/01}{Initial release of package by Mats Dahlgren}
-% \changes{v2.0}{2007/01/17}{Re-write of package by Joseph Wright}
-% \changes{v3.0}{2008/07/20}{^^A
-% Second re-write, converting to a class and giving much tighter
-% integration with \textsc{acs} submission system^^A
-% }
-% \changes{v3.1}{2009/04/21}{^^A
-% Re-ordered code to reduce or remove dependency on other packages^^A
-% }
-% \changes{v3.1}{2008/11/08}{Added \cs{alsoaffiliation} macro}
-% \changes{v3.2}{2009/04/20}{^^A
-% New functions \cs{SectionsOff}, \cs{SectionsOn},
-% \cs{SectionNumbersOff} and \cs{SectionNumbersOn}
-% }
-% \changes{v3.2}{2009/04/21}{New \texttt{tocentry} section}
-% \changes{v3.2}{2009/04/20}{^^A
-% New functions \cs{AbstractOff} and \cs{AbstractOn}^^A
-% }
-% \changes{v3.2c}{2009/05/29}{Added \cs{fax} macro}
-% \changes{v3.2c}{2009/05/29}{Added \cs{phone} macro}
-% \changes{v3.2b}{2009/05/05}{New \texttt{email} option}
-% \changes{v3.2c}{2009/05/28}{Fix so that \texttt{email} option is turned
-% on by default}
-% \changes{v3.3}{2008/08/28}{\cs{altaffiliation} macro checks for
-% duplicate entries and uses only one footnote}
-% \changes{v3.3}{2009/08/28}{New \texttt{layout} option}
-% \changes{v3.3a}{2009/09/01}{New \texttt{etalmode} option}
-% \changes{v3.4}{2010/01/15}{More detail on installation}
-% \changes{v3.5}{2010/06/25}{New \BibTeX{} style file}
-% \changes{v3.5a}{2010/08/05}{Modify JACS Communication to print
-% abstract}
-% \changes{v3.5c}{2010/10/11}{Update \emph{Org.~Lett.}\ style}
-% \changes{v3.5c}{2010/10/11}{Bug fix for \cs{mciteSubRef} macro}
-% \changes{v3.4}{2010/01/15}{Require \pkg{cleveref}, dropping
-% \pkg{varioref} use}
-% \changes{v3.6}{2012/01/11}{Drop \pkg{cleverref} use}
-% \changes{v3.7}{2012/04/30}{Rename \opt{usetitle} option to
-% \opt{articletitle}}
-% \changes{v3.7}{2012/04/30}{New \opt{chaptertitle} option for bibliography}
-% \changes{v3.8}{2013/08/23}{Extend journal list to current ACS range}
-% \changes{v3.8}{2013/08/16}{Introduce \cs{latin} command to support
-% \emph{ACS Nano} requirements}
-% \changes{v3.8a}{2013/09/04}{Minor style improvements for some
-% journals}
-% \changes{v3.8b}{2013/09/15}{Improve output ordering for \emph{J.~Phys.\
-% Chem.\ Lett.}}
-% \changes{v3.8c}{2013/09/20}{Improve \emph{ACS Photonics} style}
-% \changes{v3.8d}{2013/10/04}{Fix bug in keyword printing}
-% \changes{v3.8e}{2014/01/08}{Minor style changes for \emph{J.~Med.~Chem.}
-% and \emph{ACS Appl.~Mater.}}
-% \changes{v3.8g}{2014/03/06}{Fix issue with \emph{J.~Phys.\ Chem.}\ formatting}
-% \changes{v3.8i}{2014/05/14}{Fix issue with \emph{Chem.\ Res.\ Toxicol.}\ formatting}
-% \changes{v3.8j}{2014/06/12}{Update article title requirements for all journals}
-% \changes{v3.8j}{2014/06/12}{Update keyword requirements for all journals}
-% \changes{v3.8j}{2014/06/12}{Remove \emph{Biotechnol.\ Prog.}\ configuration}
-% \changes{v3.8k}{2014/08/18}{Format date correctly for in press bibliography
-% entries}
-% \changes{v3.8l}{2014/08/23}{Fix printing of phone/fax numbers}
-% \changes{v3.9}{2015/02/01}{New \texttt{doi} option}
-% \changes{v3.9a}{2015/03/03}{Update style for \emph{ACS Central Sci.}}
-% \changes{v3.9b}{2015/03/22}{Update \emph{J. Agric. Food Chem.} style}
-% \changes{v3.10}{2015/04/07}{Update address printing to reflect new
-% ACS style}
-% \changes{v3.10}{2015/04/07}{Add starred (subs)sections to TOC}
-% \changes{v3.10a}{2015/04/21}{Add article titles for \emph{Chem.\ Mater.}
-% and \emph{Chem. Rev.}}
-% \changes{v3.10c}{2016/05/10}{Add support for \emph{ACS Omega} and
-% \emph{ACS Energy Lett.}}
-% \changes{v3.10d}{2016/06/17}{Improve handling of \textsc{doi} values}
-% \changes{v3.10e}{2016/08/31}{Tweak \emph{Macromolecules} formatting}
-% \changes{v3.10f}{2016/09/07}{Various formatting updates}
-% \changes{v3.10h}{2017/01/14}{Add style for \emph{ACS Biomater.\ Sci.\ Eng.}}
-% \changes{v3.10h}{2017/01/20}{Add style for \emph{ACS Earth Space Chem.}}
-% \changes{v3.10h}{2017/01/20}{Add style for \emph{ACS Infect.\ Dis.}}
-% \changes{v3.10h}{2017/01/20}{Add style for \emph{ACS Sensors}}
-% \changes{v3.10h}{2017/01/20}{Style update for \emph{J.~Chem.\ Theory.\
-% Comput.}}
-% \changes{v3.10h}{2017/01/20}{Update supplementary information text}
-% \changes{v3.10i}{2017/02/09}{Style update for \emph{Biochemistry}}
-% \changes{v3.10i}{2017/05/18}{Fix issue with \cs{doi} command}
-% \changes{v3.10i}{2017/05/18}{Updates for \emph{Org.\ Lett.}}
-% \changes{v3.11}{2018/01/07}{Print article titles for all journals}
-% \changes{v3.11b}{2018/07/12}{Correct handling of \texttt{and others} in
-% bibliography}
-% \changes{v3.11c}{2018/07/12}{Further work on bibliography}
-%
%\begin{abstract}
% The \pkg{achemso} bundle provides a \LaTeX\ class file and \BibTeX\
% style file in accordance with the requirements of the American
@@ -498,62 +289,64 @@ This work consists of the files achemso.dtx,
% Journal & \rmfamily Setting & Journal & \rmfamily Setting \\
% \midrule
% Acc.\ Chem.\ Res. & achre4 &
-% Chem.\ Res.\ Toxicol. & crtoec \\
+% Chem.\ Mater. & cmatex \\
% ACS Appl.\ Energy Mater. & aaemcq &
-% Chem.\ Rev. & chreay \\
+% Chem.\ Res.\ Toxicol. & crtoec \\
% ACS Appl.\ Electron.\ Mater. & aaembp &
-% Cryst.\ Growth Des. & cgdefu \\
+% Chem.\ Rev. & chreay \\
% ACS Appl.\ Mater.\ Interfaces & aamick &
-% Energy Fuels & enfuem \\
+% Cryst.\ Growth Des. & cgdefu \\
% ACS Appl.\ Nano Mater. & aanmf6 &
% Environ.\ Sci.\ Technol. & esthag \\
% ACS Appl.\ Polym.\ Mater. & aapmcd &
-% Environ.\ Sci.\ Technol.\ Lett. & estlcu \\
+% Energy Fuels & enfuem \\
% ACS Biomater.\ Sci.\ Eng. & abseba &
-% Ind.\ Eng.\ Chem.\ Res. & iecred \\
+% Environ.\ Sci.\ Technol.\ Lett. & estlcu \\
% ACS Catal. & accacs &
-% Inorg.\ Chem. & inoraj \\
+% Ind.\ Eng.\ Chem.\ Res. & iecred \\
% ACS Central Sci. & acscii &
-% J.~Agric.\ Food Chem. & jafcau \\
+% Inorg.\ Chem. & inoraj \\
% ACS Chem.\ Biol. & acbcct &
-% J.~Chem.\ Ed. & jceda8 \\
+% J.~Agric.\ Food Chem. & jafcau \\
% ACS Chem.\ Neurosci. & acncdm &
-% J.~Chem.\ Eng.\ Data & jceaax \\
+% J.~Chem.\ Ed. & jceda8 \\
% ACS Combinatorial Sci. & acsccc &
-% J.~Chem.\ Inf.\ Model. & jcisd8 \\
+% J.~Chem.\ Eng.\ Data & jceaax \\
% ACS Earth Space Chem. & aesccq &
-% J.~Chem.\ Theory Comput. & jctcce \\
+% J.~Chem.\ Inf.\ Model. & jcisd8 \\
% ACS Energy Lett. & aelccp &
+% J.~Chem.\ Theory Comput. & jctcce \\
+% ACS ES\&T Eng. & aeecco &
% J.~Med.\ Chem. & jmcmar \\
-% ACS Infect.\ Dis. & ascefj &
+% ACS ES\&T Water & aewcaa &
% J.~Nat.\ Prod. & jnprdf \\
-% ACS Macro Lett. & amlccd &
+% ACS Infect.\ Dis. & ascefj &
% J.~Org.\ Chem. & joceah \\
-% ACS Mater.\ Lett. & amlcef \\
+% ACS Macro Lett. & amlccd &
% J.~Phys.\ Chem.~A & jpcafh \\
-% ACS Med.\ Chem.\ Lett. & amclct &
+% ACS Mater.\ Lett. & amlcef &
% J.~Phys.\ Chem.~B & jpcbfk \\
-% ACS Nano & ancac3 &
+% ACS Med.\ Chem.\ Lett. & amclct &
% J.~Phys.\ Chem.~C & jpccck \\
-% ACS Omega & acsodf &
+% ACS Nano & ancac3 &
% J.~Phys.\ Chem.\ Lett. & jpclcd \\
-% ACS Photon. & apchd5 &
+% ACS Omega & acsodf &
% J.~Proteome Res. & jprobs \\
-% ACS Sensors & ascefj &
+% ACS Photon. & apchd5 &
% J.~Am.\ Chem.\ Soc. & jacsat \\
-% ACS Sustainable Chem.\ Eng. & ascecg &
+% ACS Sensors & ascefj &
% Langmuir & langd5 \\
-% ACS Synth.\ Biol. & asbcd6 &
+% ACS Sustainable Chem.\ Eng. & ascecg &
% Macromolecules & mamobx \\
-% Anal.\ Chem. & ancham &
+% ACS Synth.\ Biol. & asbcd6 &
% Mol.\ Pharm. & mpohbp \\
-% Biochemistry & bichaw &
+% Anal.\ Chem. & ancham &
% Nano Lett. & nalefd \\
-% Bioconjugate Chem. & bcches &
+% Biochemistry & bichaw &
% Org.\ Lett. & orlef7 \\
-% Biomacromolecules & bomaf6 &
+% Bioconjugate Chem. & bcches &
% Organometallics & orgnd7 \\
-% Chem.\ Mater. & cmatex \\
+% Biomacromolecules & bomaf6 \\
% \bottomrule
% \end{tabular}
% \caption{Values for \opt{journal} option}
@@ -969,7 +762,7 @@ This work consists of the files achemso.dtx,
% \begin{macrocode}
%<*class>
\ProvidesClass{achemso}
- [2019-02-14 v3.12a Submission to ACS journals]
+ [2020-05-06 v3.13 Submission to ACS journals]
\LoadClass[12pt,letter]{article}
% \end{macrocode}
%
@@ -989,7 +782,7 @@ This work consists of the files achemso.dtx,
% \begin{macrocode}
%<*package>
\ProvidesPackage{achemso}
- [2019-02-14 v3.12a Support for ACS journals]
+ [2020-05-06 v3.13 Support for ACS journals]
\@ifclassloaded{achemso}{%
\PackageInfo{achemso}{%
You have already loaded the `achemso' class:\MessageBreak
@@ -2953,8 +2746,6 @@ This work consists of the files achemso.dtx,
% \begin{macro}{\acs@tocentry@print}
% \begin{macro}{\acs@tocentry@print@aux}
% \begin{macro}{\acs@tocentry@text}
-% \changes{v3.10b}{2015/06/24}{Define \cs{acs@tocentry@text} in all cases}
-% \changes{v3.11a}{2018/04/02}{Print abstract at full size}
% The same approach is taken for the graphical table of content
% printing. This is done in a box so that everything has a frame around
% it.
@@ -2985,8 +2776,8 @@ This work consists of the files achemso.dtx,
\begin{center}
\fbox
{%
- \begin{minipage}{\acs@tocentry@height}
- \vbox to \acs@tocentry@width{\acs@tocentry@text}%
+ \begin{minipage}{\acs@tocentry@width}
+ \vbox to \acs@tocentry@height{\acs@tocentry@text}%
\end{minipage}%
}%
\end{center}%
@@ -2995,8 +2786,8 @@ This work consists of the files achemso.dtx,
\newcommand*\acs@tocentry@text{TOC ENTRY REQUIRED}
\newlength{\acs@tocentry@height}
\newlength{\acs@tocentry@width}
-\setlength{\acs@tocentry@height}{9 cm}
-\setlength{\acs@tocentry@width}{3.5 cm}
+\setlength{\acs@tocentry@height}{3.25in}
+\setlength{\acs@tocentry@width}{1.75in}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3210,8 +3001,6 @@ This work consists of the files achemso.dtx,
%\subsection{Late shared code}
%
%\begin{macro}{\citenumfont}
-% \changes{v3.9b}{2015/03/22}{Allow for setting \opt{super} after
-% loading}
% Changes to citations can now be made. The citation styles supplied
% here require \pkg{natbib}, which is loaded with the appropriate
% options. This part applies to the package as well as the class: it is
@@ -3520,64 +3309,64 @@ This work consists of the files achemso.dtx,
% \begin{macrocode}
%<*achre4>
\ProvidesFile{achemso-achre4.cfg}
- [2019-02-14 v3.12a achemso configuration: Acc. Chem. Res.]
+ [2020-05-06 v3.13 achemso configuration: Acc. Chem. Res.]
\setkeys{acs}{biblabel = plain}
\def\acs@type@list{article,suppinfo}
\def\abstractname{Conspectus}
%</achre4>
%<*aaembp>
\ProvidesFile{achemso-aaembp.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Appl. Electron. Mater.]
+ [2020-05-06 v3.13 achemso configuration: ACS Appl. Electron. Mater.]
\def\acs@type@list{article,letter,suppinfo}
\setkeys{acs}{keywords = true}
%</aaembp>
%<*aaemcq>
\ProvidesFile{achemso-aaemcq.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Appl. Energy Mater.]
+ [2020-05-06 v3.13 achemso configuration: ACS Appl. Energy Mater.]
\def\acs@type@list{article,letter,suppinfo}
\setkeys{acs}{keywords = true}
%</aaemcq>
%<*aamick>
\ProvidesFile{achemso-aamick.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Appl. Mater. Interfaces]
+ [2020-05-06 v3.13 achemso configuration: ACS Appl. Mater. Interfaces]
\def\acs@type@list{article,letter,suppinfo}
\setkeys{acs}{keywords = true}
%</aamick>
%<*aanmf6>
\ProvidesFile{achemso-aanmf6.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Appl. Nano Mater.]
+ [2020-05-06 v3.13 achemso configuration: ACS Appl. Nano Mater.]
\def\acs@type@list{article,letter,suppinfo}
\setkeys{acs}{keywords = true}
%</aanmf6>
%<*aapmcd>
\ProvidesFile{achemso-aapmcd.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Appl. Polym. Mater.]
+ [2020-05-06 v3.13 achemso configuration: ACS Appl. Polym. Mater.]
\def\acs@type@list{article,letter,suppinfo}
\setkeys{acs}{keywords = true}
%</aapmcd>
%<*abseba>
\ProvidesFile{achemso-abseba.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Biomater. Sci. Eng.]
+ [2020-05-06 v3.13 achemso configuration: ACS Biomater. Sci. Eng.]
\setkeys{acs}{keywords = true}
\def\acs@type@list{article,review,suppinfo}
%</abseba>
%<*accacs>
\ProvidesFile{achemso-accacs.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Catal.]
+ [2020-05-06 v3.13 achemso configuration: ACS Catal.]
\setkeys{acs}{keywords = true}
\def\acs@type@list{article,letter,perspective,review,viewpoints,suppinfo}
\SectionNumbersOff
%</accacs>
%<*acscii>
\ProvidesFile{achemso-acscii.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Central Sci.]
+ [2020-05-06 v3.13 achemso configuration: ACS Central Sci.]
\def\acs@type@list{article,review,suppinfo}
\setkeys{acs}{doi = true}
\SectionNumbersOff
%</acscii>
%<*acbcct>
\ProvidesFile{achemso-acbcct.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Chem. Biol.]
+ [2020-05-06 v3.13 achemso configuration: ACS Chem. Biol.]
\setkeys{acs}{
biblabel = fullstop,
biochem = true,
@@ -3588,7 +3377,7 @@ This work consists of the files achemso.dtx,
%</acbcct>
%<*acncdm>
\ProvidesFile{achemso-acncdm.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Chem. Neurosci.]
+ [2020-05-06 v3.13 achemso configuration: ACS Chem. Neurosci.]
\def\acs@type@list{article,review,letter,suppinfo,viewpoint}
\setkeys{acs}{
biblabel = fullstop,
@@ -3599,56 +3388,63 @@ This work consists of the files achemso.dtx,
%</acncdm>
%<*acsccc>
\ProvidesFile{achemso-acsccc.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Combinatorial Sci.]
+ [2020-05-06 v3.13 achemso configuration: ACS Combinatorial Sci.]
\def\acs@type@list{article,letter,review,perspective,account,note,suppinfo}
\setkeys{acs}{keywords = true}
\SectionNumbersOff
%</acsccc>
%<*aesccq>
\ProvidesFile{achemso-aesccq.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Earth Space Chem.]
+ [2020-05-06 v3.13 achemso configuration: ACS Earth Space Chem.]
\def\acs@type@list{article,suppinfo}
\setkeys{acs}{keywords = true}
%</aesccq>
%<*aelccp>
\ProvidesFile{achemso-aelccp.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Energy Lett.]
+ [2020-05-06 v3.13 achemso configuration: ACS Energy Lett.]
\def\acs@type@list{letter,perspective,review,viewpoint,focus}
\SectionsOff
%</aelccp>
+%<*aeecco>
+\ProvidesFile{achemso-aeecco.cfg}
+ [2020-05-06 v3.13 achemso configuration: ACS ES&T Eng.]
+\def\acs@type@list{article,feature,perspective,review,viewpoint}
+%</aeecco>
+%<*aewcaa>
+\ProvidesFile{achemso-aewcaa.cfg}
+ [2020-05-06 v3.13 achemso configuration: ACS ES&T Water]
+\def\acs@type@list{article,feature,perspective,review,viewpoint}
+%</aewcaa>
%<*ascefj>
\ProvidesFile{achemso-ascefj.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Infect. Dis.]
+ [2020-05-06 v3.13 achemso configuration: ACS Infect. Dis.]
\def\acs@type@list{article,letter,perspective,review,viewpoint,suppinfo}
\setkeys{acs}{keywords = true}
\SectionsOff
%</ascefj>
%<*amlccd>
\ProvidesFile{achemso-amlccd.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Macro Lett.]
+ [2020-05-06 v3.13 achemso configuration: ACS Macro Lett.]
\def\acs@type@list{letter,suppinfo}
\SectionsOff
\setlength{\acs@tocentry@height}{8 cm}
\setlength{\acs@tocentry@width}{4 cm}
%</amlccd>
-% \changes{v3.12a}{2019-02-14}{New \texttt{amlcef} configuration}
%<*amlcef>
\ProvidesFile{achemso-amlcef.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Mater. Lett.]
+ [2020-05-06 v3.13 achemso configuration: ACS Mater. Lett.]
\def\acs@type@list{letter,perspective,review,viewpoint,focus}
\SectionsOff
%</amlcef>
%<*amclct>
\ProvidesFile{achemso-amclct.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Med. Chem. Lett.]
+ [2020-05-06 v3.13 achemso configuration: ACS Med. Chem. Lett.]
\def\acs@type@list{article,letter,perspective,suppinfo}
\SectionNumbersOff
%</amclct>
-% \changes{v3.8n}{2015/01/13}{\emph{ACS Nano} want abbreviations}
-% \changes{v3.11}{2018/04/02}{Change \emph{ACS Nano} truncation}
%<*ancac3>
\ProvidesFile{achemso-ancac3.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Nano]
+ [2020-05-06 v3.13 achemso configuration: ACS Nano]
\setkeys{acs}{
abbreviations = true,
biblabel = fullstop,
@@ -3662,12 +3458,12 @@ This work consists of the files achemso.dtx,
%</ancac3>
%<*acsodf>
\ProvidesFile{achemso-acsodf.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Omega.]
+ [2020-05-06 v3.13 achemso configuration: ACS Omega.]
\def\acs@type@list{article}
%</acsodf>
%<*apchd5>
\ProvidesFile{achemso-apchd5.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Photon.]
+ [2020-05-06 v3.13 achemso configuration: ACS Photon.]
\def\acs@type@list{article,letter,perspective,review,suppinfo}
\setkeys{acs}{keywords = true}
\ifx\acs@manuscript\acs@manuscript@letter
@@ -3676,14 +3472,14 @@ This work consists of the files achemso.dtx,
%</apchd5>
%<*aidcbc>
\ProvidesFile{achemso-aidcbc.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Sensors]
+ [2020-05-06 v3.13 achemso configuration: ACS Sensors]
\def\acs@type@list{article,letter,perspective,review,suppinfo}
\setkeys{acs}{keywords = true}
\SectionNumbersOff
%</aidcbc>
%<*ascecg>
\ProvidesFile{achemso-ascecg.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Sustainable Chem Eng.]
+ [2020-05-06 v3.13 achemso configuration: ACS Sustainable Chem Eng.]
\setkeys{acs}{
biblabel = fullstop,
keywords = true
@@ -3693,7 +3489,7 @@ This work consists of the files achemso.dtx,
%</ascecg>
%<*asbcd6>
\ProvidesFile{achemso-asbcd6.cfg}
- [2019-02-14 v3.12a achemso configuration: ACS Synth. Biol.]
+ [2020-05-06 v3.13 achemso configuration: ACS Synth. Biol.]
\setkeys{acs}{
abbreviations = true,
biblabel = fullstop,
@@ -3705,13 +3501,13 @@ This work consists of the files achemso.dtx,
%</asbcd6>
%<*ancham>
\ProvidesFile{achemso-ancham.cfg}
- [2019-02-14 v3.12a achemso configuration: Anal. Chem.]
+ [2020-05-06 v3.13 achemso configuration: Anal. Chem.]
\def\acs@type@list{article,note,suppinfo}
\SectionNumbersOff
%</ancham>
%<*bichaw>
\ProvidesFile{achemso-bichaw.cfg}
- [2019-02-14 v3.12a achemso configuration: Biochemistry]
+ [2020-05-06 v3.13 achemso configuration: Biochemistry]
\setkeys{acs}{
abbreviations = true,
biblabel = brackets,
@@ -3759,7 +3555,7 @@ This work consists of the files achemso.dtx,
%</bichaw>
%<*bcches>
\ProvidesFile{achemso-bcches.cfg}
- [2019-02-14 v3.12a achemso configuration: Bioconjugate Chem.]
+ [2020-05-06 v3.13 achemso configuration: Bioconjugate Chem.]
\setkeys{acs}{
biochem = true,
super = false
@@ -3768,14 +3564,14 @@ This work consists of the files achemso.dtx,
%</bcches>
%<*bomaf6>
\ProvidesFile{achemso-bomaf6.cfg}
- [2019-02-14 v3.12a achemso configuration: Biomacromolecules]
+ [2020-05-06 v3.13 achemso configuration: Biomacromolecules]
\def\acs@type@list{article,comment,communication,note,review,suppinfo}
\SectionNumbersOff
\AtEndOfClass{\SectionsOn}
%</bomaf6>
%<*crtoec>
\ProvidesFile{achemso-crtoec.cfg}
- [2019-02-14 v3.12a achemso configuration: Chem. Res. Toxicol.]
+ [2020-05-06 v3.13 achemso configuration: Chem. Res. Toxicol.]
\setkeys{acs}{
abbreviations = true,
biochem = true,
@@ -3792,7 +3588,7 @@ This work consists of the files achemso.dtx,
%</crtoec>
%<*chreay>
\ProvidesFile{achemso-chreay.cfg}
- [2019-02-14 v3.12a achemso configuration: Chem. Rev.]
+ [2020-05-06 v3.13 achemso configuration: Chem. Rev.]
\def\acs@type@default{review}
\def\acs@type@list{review}
% \end{macrocode}
@@ -3803,7 +3599,7 @@ This work consists of the files achemso.dtx,
%<*cmatex>
% \begin{macrocode}
\ProvidesFile{achemso-cmatex.cfg}
- [2019-02-14 v3.12a achemso configuration: Chem. Mater.]
+ [2020-05-06 v3.13 achemso configuration: Chem. Mater.]
\setkeys{acs}{keywords = true}
\SectionNumbersOff
\ifx\acs@manuscript\acs@manuscript@communication
@@ -3813,7 +3609,7 @@ This work consists of the files achemso.dtx,
%</cmatex>
%<*cgdefu>
\ProvidesFile{achemso-cgdefu.cfg}
- [2019-02-14 v3.12a achemso configuration: Cryst. Growth Des.]
+ [2020-05-06 v3.13 achemso configuration: Cryst. Growth Des.]
\def\acs@type@list{%
article,communication,perspective,suppinfo%
}
@@ -3826,32 +3622,31 @@ This work consists of the files achemso.dtx,
%</cgdefu>
%<*enfuem>
\ProvidesFile{achemso-enfuem.cfg}
- [2019-02-14 v3.12a achemso configuration: Energy Fuels]
+ [2020-05-06 v3.13 achemso configuration: Energy Fuels]
\def\acs@type@list{article,review,suppinfo}
\SectionNumbersOff
%</enfuem>
%<*esthag>
\ProvidesFile{achemso-esthag.cfg}
- [2019-02-14 v3.12a achemso configuration: Environ. Sci. Technol.]
+ [2020-05-06 v3.13 achemso configuration: Environ. Sci. Technol.]
\def\acs@type@list{article,suppinfo}
\SectionNumbersOff
%</esthag>
%<*estlcu>
\ProvidesFile{achemso-estlcu.cfg}
- [2019-02-14 v3.12a achemso configuration: Environ. Sci. Technol. Lett.]
+ [2020-05-06 v3.13 achemso configuration: Environ. Sci. Technol. Lett.]
\def\acs@type@list{letter,suppinfo}
\SectionNumbersOff
%</estlcu>
-% \changes{v3.8m}{2014/11/24}{Fixes for \emph{Ind.\ Eng.\ Chem.\ Res.}\ style}
%<*iecred>
\ProvidesFile{achemso-iecred.cfg}
- [2019-02-14 v3.12a achemso configuration: Ind. Eng. Chem. Res.]
+ [2020-05-06 v3.13 achemso configuration: Ind. Eng. Chem. Res.]
\setkeys{acs}{biblabel = brackets}
\SectionNumbersOff
%</iecred>
%<*inoraj>
\ProvidesFile{achemso-inoraj.cfg}
- [2019-02-14 v3.12a achemso configuration: Inorg. Chem.]
+ [2020-05-06 v3.13 achemso configuration: Inorg. Chem.]
\SectionNumbersOff
\ifx\acs@manuscript\acs@manuscript@communication
\AbstractOff
@@ -3861,14 +3656,14 @@ This work consists of the files achemso.dtx,
%</inoraj>
%<*jafcau>
\ProvidesFile{achemso-jafcau.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Agric. Food Chem.]
+ [2020-05-06 v3.13 achemso configuration: J. Agric. Food Chem.]
\setkeys{acs}{keywords = true}
\def\acs@type@list{article,suppinfo}
\SectionNumbersOff
%</jafcau>
%<*jceda8>
\ProvidesFile{achemso-jceda8.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Chem. Ed.]
+ [2020-05-06 v3.13 achemso configuration: J. Chem. Ed.]
\setkeys{acs}{keywords = true}
\SectionNumbersOff
\def\acs@type@list{article,suppinfo}
@@ -3876,26 +3671,26 @@ This work consists of the files achemso.dtx,
%</jceda8>
%<*jceaax>
\ProvidesFile{achemso-jceaax.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Chem. Eng. Data]
+ [2020-05-06 v3.13 achemso configuration: J. Chem. Eng. Data]
\def\acs@type@list{article,suppinfo}
\def\refname{Literature Cited}
\SectionNumbersOff
%</jceaax>
%<*jcisd8>
\ProvidesFile{achemso-jcisd8.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Chem. Inf. Model.]
+ [2020-05-06 v3.13 achemso configuration: J. Chem. Inf. Model.]
\def\acs@type@list{article,suppinfo}
\SectionNumbersOff
%</jcisd8>
%<*jctcce>
\ProvidesFile{achemso-jctcce.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Chem. Theory Comput.]
+ [2020-05-06 v3.13 achemso configuration: J. Chem. Theory Comput.]
\def\acs@type@list{article,suppinfo}
\setkeys{acs}{maxauthors = 0}
%</jctcce>
%<*jmcmar>
\ProvidesFile{achemso-jmcmar.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Med. Chem.]
+ [2020-05-06 v3.13 achemso configuration: J. Med. Chem.]
\def\acs@type@list{article,letter,perspective,suppinfo}
\SectionNumbersOff
\setlength{\acs@tocentry@height}{5.5cm}
@@ -3903,7 +3698,7 @@ This work consists of the files achemso.dtx,
%</jmcmar>
%<*jnprdf>
\ProvidesFile{achemso-jnprdf.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Nat. Prod.]
+ [2020-05-06 v3.13 achemso configuration: J. Nat. Prod.]
\renewcommand*{\abstractname}{ABSTRACT}
\renewcommand*{\acknowledgementname}{ACKNOWLEDGEMENT}
\renewcommand*{\suppinfoname}{ASSOCIATED CONTENT}
@@ -3925,7 +3720,7 @@ This work consists of the files achemso.dtx,
%</jnprdf>
%<*joceah>
\ProvidesFile{achemso-joceah.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Org. Chem.]
+ [2020-05-06 v3.13 achemso configuration: J. Org. Chem.]
\ifx\acs@manuscript\acs@manuscript@communication
\AbstractOff
\SectionsOff
@@ -3936,12 +3731,10 @@ This work consists of the files achemso.dtx,
\renewcommand*\acs@type@list{article,communication,note,perspective,review,suppinfo}
%</joceah>
% \end{macrocode}
-% \changes{v3.8n}{2015/01/13}{Drop use of keywords for \emph{J.~Phys.\ Chem.}\
-% A, B and C}
% \begin{macrocode}
%<*jpcafh>
\ProvidesFile{achemso-jpcafh.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Phys. Chem. A]
+ [2020-05-06 v3.13 achemso configuration: J. Phys. Chem. A]
\def\acs@type@list{article,suppinfo}
\setkeys{acs}{
etalmode = truncate,
@@ -3956,7 +3749,7 @@ This work consists of the files achemso.dtx,
%</jpcafh>
%<*jpcbfk>
\ProvidesFile{achemso-jpcbfk.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Phys. Chem. B]
+ [2020-05-06 v3.13 achemso configuration: J. Phys. Chem. B]
\def\acs@type@list{article,suppinfo}
\setkeys{acs}{
etalmode = truncate,
@@ -3968,7 +3761,7 @@ This work consists of the files achemso.dtx,
%</jpcbfk>
%<*jpccck>
\ProvidesFile{achemso-jpccck.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Phys. Chem. C]
+ [2020-05-06 v3.13 achemso configuration: J. Phys. Chem. C]
\def\acs@type@list{article,suppinfo}
\setkeys{acs}{
etalmode = truncate,
@@ -3979,12 +3772,10 @@ This work consists of the files achemso.dtx,
\g@addto@macro{\maketitle}{\newpage}
%</jpccck>
% \end{macrocode}
-% \changes{v3.8m}{2014/08/24}{\emph{J.~Phys.\ Chem.\ Lett.}\ uses a
-% non-standard size for the TOC graphic}
% \begin{macrocode}
%<*jpclcd>
\ProvidesFile{achemso-jpclcd.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Phys. Chem. Lett.]
+ [2020-05-06 v3.13 achemso configuration: J. Phys. Chem. Lett.]
\setkeys{acs}{
etalmode = truncate,
maxauthors = 10
@@ -4009,20 +3800,19 @@ This work consists of the files achemso.dtx,
%</jpclcd>
%<*jprobs>
\ProvidesFile{achemso-jprobs.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Proteome Res.]
+ [2020-05-06 v3.13 achemso configuration: J. Proteome Res.]
\setkeys{acs}{keywords = true}
\def\acs@type@list{article,review,suppinfo}
\SectionNumbersOff
%</jprobs>
% \end{macrocode}
-% \changes{v3.12a}{2019-02-14}{\emph{J.~Am.\ Chem.\ Soc.}\ now requires titles}
% The \emph{J.~Am.\ Chem.\ Soc.}~configuration is rather more
% complicated as there is the need to construct a ``galley-like''
% layout for communications.
% \begin{macrocode}
%<*jacsat>
\ProvidesFile{achemso-jacsat.cfg}
- [2019-02-14 v3.12a achemso configuration: J. Am. Chem. Soc.]
+ [2020-05-06 v3.13 achemso configuration: J. Am. Chem. Soc.]
\SectionNumbersOff
\ifx\acs@manuscript\acs@manuscript@communication\else
\expandafter\endinput
@@ -4226,26 +4016,26 @@ This work consists of the files achemso.dtx,
%</jacsat>
%<*langd5>
\ProvidesFile{achemso-langd5.cfg}
- [2019-02-14 v3.12a achemso configuration: Langmuir]
+ [2020-05-06 v3.13 achemso configuration: Langmuir]
\def\acs@type@list{article,letter,suppinfo}
\SectionNumbersOff
%</langd5>
%<*mamobx>
\ProvidesFile{achemso-mamobx.cfg}
- [2019-02-14 v3.12a achemso configuration: Macromolecules]
+ [2020-05-06 v3.13 achemso configuration: Macromolecules]
\SectionNumbersOff
\setkeys{acs}{doi = true}
%</mamobx>
%<*mpohbp>
\ProvidesFile{achemso-mpohbp.cfg}
- [2019-02-14 v3.12a achemso configuration: Mol. Pharm.]
+ [2020-05-06 v3.13 achemso configuration: Mol. Pharm.]
\setkeys{acs}{keywords = true}
\def\acs@type@list{article,suppinfo}
\SectionNumbersOff
%</mpohbp>
%<*nalefd>
\ProvidesFile{achemso-nalefd.cfg}
- [2019-02-14 v3.12a achemso configuration: Nano Lett.]
+ [2020-05-06 v3.13 achemso configuration: Nano Lett.]
\setkeys{acs}{keywords = true}
\def\acs@type@default{letter}
\def\acs@type@list{letter}
@@ -4253,7 +4043,7 @@ This work consists of the files achemso.dtx,
%</nalefd>
%<*orlef7>
\ProvidesFile{achemso-orlef7.cfg}
- [2019-02-14 v3.12a achemso configuration: Org. Lett.]
+ [2020-05-06 v3.13 achemso configuration: Org. Lett.]
\def\acs@type@default{communication}
\def\acs@type@list{communication}
\SectionNumbersOff
@@ -4263,13 +4053,13 @@ This work consists of the files achemso.dtx,
%</orlef7>
%<*oprdfk>
\ProvidesFile{achemso-oprdfk.cfg}
- [2019-02-14 v3.12a achemso configuration: Org. Proc. Res. Dev.]
+ [2020-05-06 v3.13 achemso configuration: Org. Proc. Res. Dev.]
\def\acs@type@list{article,highlight,review,suppinfo}
\SectionNumbersOff
%</oprdfk>
%<*orgnd7>
\ProvidesFile{achemso-orgnd7.cfg}
- [2019-02-14 v3.12a achemso configuration: Organometallics]
+ [2020-05-06 v3.13 achemso configuration: Organometallics]
\SectionNumbersOff
%</orgnd7>
% \end{macrocode}
@@ -4934,7 +4724,7 @@ FUNCTION { count.entries } {
% Start and end of bibliography functions
FUNCTION { begin.bib } {
- "achemso 2019-02-14 v3.12a" top$
+ "achemso 2020-05-06 v3.13" top$
preamble$ empty$
{ }
{
diff --git a/macros/latex/contrib/achemso/achemso.ins b/macros/latex/contrib/achemso/achemso.ins
new file mode 100644
index 0000000000..a1237e114a
--- /dev/null
+++ b/macros/latex/contrib/achemso/achemso.ins
@@ -0,0 +1,149 @@
+\iffalse meta-comment
+
+File: achemso.ins Copyright (C) 2020 Joseph Wright
+
+It may be distributed and/or modified under the conditions of the
+LaTeX Project Public License (LPPL), either version 1.3c of this
+license or (at your option) any later version. The latest version
+of this license is in the file
+
+ https://www.latex-project.org/lppl.txt
+
+This file is part of the "achemso bundle" (The Work in LPPL)
+and all files in that bundle must be distributed together.
+
+The released version of this bundle is available from CTAN.
+
+-----------------------------------------------------------------------
+
+The development version of the bundle can be found at
+
+ https://github.com/josephwright/achemso
+
+for those people who are interested.
+
+-----------------------------------------------------------------------
+
+\fi
+
+\input docstrip.tex
+\askforoverwritefalse
+
+\postamble
+
+Originally developed by Mats Dahlgren
+Copyright (C) 1996-1998 by Mats Dahlgren
+Copyright (C) 2008-2020 by
+ Joseph Wright <joseph.wright@morningstar2.co.uk>
+
+Part of this bundle is derived from cite.sty, to which the
+following license applies:
+ Copyright (C) 1989-2009 by Donald Arseneau
+ These macros may be freely transmitted, reproduced, or
+ modified provided that this notice is left intact.
+
+It may be distributed and/or modified under the conditions of
+the LaTeX Project Public License (LPPL), either version 1.3c of
+this license or (at your option) any later version. The latest
+version of this license is in the file:
+
+ http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status) by
+ Joseph Wright.
+
+This work consists of the files achemso.dtx,
+ achemso-demo.bib and
+ achemso-demo.tex,
+ and the derived files achemso.cls,
+ achemso.ins,
+ achemso.pdf,
+ achemso.sty,
+ natmove.sty and
+ a number of configuration files.
+
+\endpostamble
+
+\keepsilent
+
+\generate{
+ \file{achemso.cls}{\from{achemso.dtx}{class}}
+ \file{achemso.sty}{\from{achemso.dtx}{package}}
+ \file{natmove.sty}{\from{achemso.dtx}{natmove}}
+}
+
+\generate{\file{achemso-aaembp.cfg}{\from{achemso.dtx}{aaembp}}
+ \file{achemso-aaemcq.cfg}{\from{achemso.dtx}{aaemcq}}
+ \file{achemso-aamick.cfg}{\from{achemso.dtx}{aamick}}
+ \file{achemso-aanmf6.cfg}{\from{achemso.dtx}{aanmf6}}
+ \file{achemso-aapmcd.cfg}{\from{achemso.dtx}{aapmcd}}
+ \file{achemso-abseba.cfg}{\from{achemso.dtx}{abseba}}
+ \file{achemso-accacs.cfg}{\from{achemso.dtx}{accacs}}
+ \file{achemso-achre4.cfg}{\from{achemso.dtx}{achre4}}
+}
+\generate{\file{achemso-acscii.cfg}{\from{achemso.dtx}{acscii}}
+ \file{achemso-acbcct.cfg}{\from{achemso.dtx}{acbcct}}
+ \file{achemso-acncdm.cfg}{\from{achemso.dtx}{acncdm}}
+ \file{achemso-acsccc.cfg}{\from{achemso.dtx}{acsccc}}
+ \file{achemso-aeecco.cfg}{\from{achemso.dtx}{aeecco}}
+ \file{achemso-aesccq.cfg}{\from{achemso.dtx}{aesccq}}
+ \file{achemso-aelccp.cfg}{\from{achemso.dtx}{aelccp}}
+ \file{achemso-aewcaa.cfg}{\from{achemso.dtx}{aewcaa}}
+}
+\generate{\file{achemso-ascefj.cfg}{\from{achemso.dtx}{ascefj}}
+ \file{achemso-amlccd.cfg}{\from{achemso.dtx}{amlccd}}
+ \file{achemso-amlcef.cfg}{\from{achemso.dtx}{amlcef}}
+ \file{achemso-amclct.cfg}{\from{achemso.dtx}{amclct}}
+ \file{achemso-ancac3.cfg}{\from{achemso.dtx}{ancac3}}
+ \file{achemso-acsodf.cfg}{\from{achemso.dtx}{acsodf}}
+ \file{achemso-apchd5.cfg}{\from{achemso.dtx}{apchd5}}
+ \file{achemso-aidcbc.cfg}{\from{achemso.dtx}{aidcbc}}
+}
+\generate{\file{achemso-ascecg.cfg}{\from{achemso.dtx}{ascecg}}
+ \file{achemso-asbcd6.cfg}{\from{achemso.dtx}{asbcd6}}
+ \file{achemso-ancham.cfg}{\from{achemso.dtx}{ancham}}
+ \file{achemso-bichaw.cfg}{\from{achemso.dtx}{bichaw}}
+ \file{achemso-bcches.cfg}{\from{achemso.dtx}{bcches}}
+ \file{achemso-bomaf6.cfg}{\from{achemso.dtx}{bomaf6}}
+ \file{achemso-crtoec.cfg}{\from{achemso.dtx}{crtoec}}
+ \file{achemso-chreay.cfg}{\from{achemso.dtx}{chreay}}
+}
+\generate{\file{achemso-cmatex.cfg}{\from{achemso.dtx}{cmatex}}
+ \file{achemso-cgdefu.cfg}{\from{achemso.dtx}{cgdefu}}
+ \file{achemso-enfuem.cfg}{\from{achemso.dtx}{enfuem}}
+ \file{achemso-esthag.cfg}{\from{achemso.dtx}{esthag}}
+ \file{achemso-estlcu.cfg}{\from{achemso.dtx}{estlcu}}
+ \file{achemso-iecred.cfg}{\from{achemso.dtx}{iecred}}
+ \file{achemso-inoraj.cfg}{\from{achemso.dtx}{inoraj}}
+ \file{achemso-jafcau.cfg}{\from{achemso.dtx}{jafcau}}
+}
+\generate{\file{achemso-jceda8.cfg}{\from{achemso.dtx}{jceda8}}
+ \file{achemso-jceaax.cfg}{\from{achemso.dtx}{jceaax}}
+ \file{achemso-jcisd8.cfg}{\from{achemso.dtx}{jcisd8}}
+ \file{achemso-jctcce.cfg}{\from{achemso.dtx}{jctcce}}
+ \file{achemso-jmcmar.cfg}{\from{achemso.dtx}{jmcmar}}
+ \file{achemso-jnprdf.cfg}{\from{achemso.dtx}{jnprdf}}
+ \file{achemso-joceah.cfg}{\from{achemso.dtx}{joceah}}
+ \file{achemso-jpcafh.cfg}{\from{achemso.dtx}{jpcafh}}
+}
+\generate{\file{achemso-jpcbfk.cfg}{\from{achemso.dtx}{jpcbfk}}
+ \file{achemso-jpccck.cfg}{\from{achemso.dtx}{jpccck}}
+ \file{achemso-jpclcd.cfg}{\from{achemso.dtx}{jpclcd}}
+ \file{achemso-jprobs.cfg}{\from{achemso.dtx}{jprobs}}
+ \file{achemso-jacsat.cfg}{\from{achemso.dtx}{jacsat}}
+ \file{achemso-langd5.cfg}{\from{achemso.dtx}{langd5}}
+ \file{achemso-mamobx.cfg}{\from{achemso.dtx}{mamobx}}
+ \file{achemso-mpohbp.cfg}{\from{achemso.dtx}{mpohbp}}
+}
+\generate{\file{achemso-nalefd.cfg}{\from{achemso.dtx}{nalefd}}
+ \file{achemso-orlef7.cfg}{\from{achemso.dtx}{orlef7}}
+ \file{achemso-oprdfk.cfg}{\from{achemso.dtx}{oprdfk}}
+ \file{achemso-orgnd7.cfg}{\from{achemso.dtx}{orgnd7}}
+}
+
+\generate{
+ \file{achemso.bst}{\from{achemso.dtx}{bst}}
+ \file{biochem.bst}{\from{achemso.dtx}{bst,bio}}
+}
+
+\endbatchfile
diff --git a/macros/latex/contrib/achemso/achemso.pdf b/macros/latex/contrib/achemso/achemso.pdf
index 8f2958cb75..c4d7a79346 100644
--- a/macros/latex/contrib/achemso/achemso.pdf
+++ b/macros/latex/contrib/achemso/achemso.pdf
Binary files differ
diff --git a/macros/latex/contrib/animate/ChangeLog b/macros/latex/contrib/animate/ChangeLog
index 66592c1bb6..b67e5692c8 100644
--- a/macros/latex/contrib/animate/ChangeLog
+++ b/macros/latex/contrib/animate/ChangeLog
@@ -1,3 +1,6 @@
+2020-05-06
+ * fix: control button transparency (all drivers)
+
2020-04-25
* fix: compilation error in case of `dvisvgm' + [french]{babel}. For
slightly better performance, \animategraphics doesn't pass `clip' anymore
diff --git a/macros/latex/contrib/animate/animate.pdf b/macros/latex/contrib/animate/animate.pdf
index 75dad51500..bc969083f5 100644
--- a/macros/latex/contrib/animate/animate.pdf
+++ b/macros/latex/contrib/animate/animate.pdf
Binary files differ
diff --git a/macros/latex/contrib/animate/animate.sty b/macros/latex/contrib/animate/animate.sty
index b4e05000ab..eaf27e7440 100644
--- a/macros/latex/contrib/animate/animate.sty
+++ b/macros/latex/contrib/animate/animate.sty
@@ -13,7 +13,7 @@
\NeedsTeXFormat{LaTeX2e}
-\def\@anim@version{2020/04/25}
+\def\@anim@version{2020/05/06}
\ProvidesPackage{animate}
[\@anim@version\space PDF & SVG animations from files and inline graphics]
@@ -618,7 +618,6 @@
%dvips .OR. dvisvgm
%stroking commands
\def\@anim@btnend{%
- \@anim@fg\space
0.5 setlinewidth
1 setlinecap
1 setlinejoin
@@ -632,8 +631,9 @@
14 1 6.5 1 2 arct
closepath
\ifx\empty\@anim@bg\empty\else
- gsave \@anim@bg\space fill grestore
+ gsave \@anim@bg\space bgfill grestore
\fi
+ \@anim@fg\space
stroke
%
1 setlinewidth
@@ -647,7 +647,6 @@
stroke
}
\def\@anim@btnstep{%
- \@anim@fg\space
0.5 setlinewidth
1 setlinecap
1 setlinejoin
@@ -661,8 +660,9 @@
14 1 6.5 1 2 arct
closepath
\ifx\empty\@anim@bg\empty\else
- gsave \@anim@bg\space fill grestore
+ gsave \@anim@bg\space bgfill grestore
\fi
+ \@anim@fg\space
stroke
%
1 setlinewidth
@@ -672,7 +672,6 @@
stroke
}
\def\@anim@btnplay{%
- \@anim@fg\space
0.5 setlinewidth
1 setlinecap
1 setlinejoin
@@ -682,8 +681,9 @@
14 14 1 14 2 arct
0 14 lineto
\ifx\empty\@anim@bg\empty\else
- gsave closepath \@anim@bg\space fill grestore
+ gsave closepath \@anim@bg\space bgfill grestore
\fi
+ \@anim@fg\space
stroke
0.1 setlinewidth
0 14 moveto
@@ -698,7 +698,6 @@
stroke
}
\def\@anim@btnpause{%
- \@anim@fg\space
0.5 setlinewidth
1 setlinecap
1 setlinejoin
@@ -708,8 +707,9 @@
14 14 1 14 2 arct
0 14 lineto
\ifx\empty\@anim@bg\empty\else
- gsave closepath \@anim@bg\space fill grestore
+ gsave closepath \@anim@bg\space bgfill grestore
\fi
+ \@anim@fg\space
stroke
%
0 setlinecap
@@ -719,7 +719,6 @@
stroke
}
\def\@anim@btnminus{%
- \@anim@fg\space
0.5 setlinewidth
1 setlinecap
1 setlinejoin
@@ -733,8 +732,9 @@
14 1 6.5 1 2 arct
closepath
\ifx\empty\@anim@bg\empty\else
- gsave \@anim@bg\space fill grestore
+ gsave \@anim@bg\space bgfill grestore
\fi
+ \@anim@fg\space
stroke
%
1.0 setlinewidth
@@ -744,7 +744,6 @@
stroke
}
\def\@anim@btnplus{%
- \@anim@fg\space
0.5 setlinewidth
1 setlinecap
1 setlinejoin
@@ -758,8 +757,9 @@
14 1 6.5 1 2 arct
closepath
\ifx\empty\@anim@bg\empty\else
- gsave \@anim@bg\space fill grestore
+ gsave \@anim@bg\space bgfill grestore
\fi
+ \@anim@fg\space
stroke
%
1.0 setlinewidth
@@ -770,8 +770,19 @@
7.5 10.3 lineto
stroke
}
+ \def\@anim@btnresetbg{% Reset-button background for dvisvgm
+ 6.5 1 moveto
+ 1 1 1 6.5 2 arct
+ 1 6.5 lineto
+ 1 14 6.5 14 2 arct
+ 6.5 14 lineto
+ 14 14 14 6.5 2 arct
+ 14 6.5 lineto
+ 14 1 6.5 1 2 arct
+ closepath
+ \@anim@bg\space fill
+ }
\def\@anim@btnreset{%
- \@anim@fg\space
0.5 setlinewidth
1 setlinecap
1 setlinejoin
@@ -784,9 +795,10 @@
14 6.5 lineto
14 1 6.5 1 2 arct
closepath
- \ifx\empty\@anim@bg\empty\else
- gsave \@anim@bg\space fill grestore
- \fi
+ \ifx\empty\@anim@bg\empty\else\if@anim@dvisvgm\else
+ gsave \@anim@bg\space bgfill grestore
+ \fi\fi
+ \@anim@fg\space
stroke
%
1 setlinewidth
@@ -817,66 +829,137 @@
\ifx\@anim@EndLeft\@anim@arg%
\@anim@xbutton{EndLeft}{%
[-1 0 0 1 15 0] concat
- \ifx\@anim@lscape\@anim@@lscape [0 -1 -1 0 15 15] concat \fi%
+ \if@anim@dvisvgm\else\ifx\@anim@lscape\@anim@@lscape
+ [0 1 -1 0 15 0] concat
+ \fi\fi%
\@anim@btnend}{#2}%
\fi%
\ifx\@anim@EndRight\@anim@arg%
\@anim@xbutton{EndRight}{%
- \ifx\@anim@lscape\@anim@@lscape [0 1 -1 0 15 0] concat \fi%
+ \if@anim@dvisvgm\else\ifx\@anim@lscape\@anim@@lscape
+ [0 1 -1 0 15 0] concat
+ \fi\fi%
\@anim@btnend}{#2}%
\fi%
\ifx\@anim@Minus\@anim@arg%
\@anim@xbutton{Minus}{%
- \ifx\@anim@lscape\@anim@@lscape [0 1 -1 0 15 0] concat \fi%
+ \if@anim@dvisvgm\else\ifx\@anim@lscape\@anim@@lscape
+ [0 1 -1 0 15 0] concat
+ \fi\fi%
\@anim@btnminus}{#2}%
\fi%
\ifx\@anim@PauseLeft\@anim@arg%
\@anim@xbutton{PauseLeft}{%
[-1 0 0 1 15 0] concat
- \ifx\@anim@lscape\@anim@@lscape [0 -1 -1 0 15 15] concat \fi%
+ \if@anim@dvisvgm\else\ifx\@anim@lscape\@anim@@lscape
+ [0 1 -1 0 15 0] concat
+ \fi\fi%
\@anim@btnpause}{#2}%
\fi%
\ifx\@anim@PauseRight\@anim@arg%
\@anim@xbutton{PauseRight}{%
- \ifx\@anim@lscape\@anim@@lscape [0 1 -1 0 15 0] concat \fi%
+ \if@anim@dvisvgm\else\ifx\@anim@lscape\@anim@@lscape
+ [0 1 -1 0 15 0] concat
+ \fi\fi%
\@anim@btnpause}{#2}%
\fi%
\ifx\@anim@PlayLeft\@anim@arg%
\@anim@xbutton{PlayLeft}{%
[-1 0 0 1 15 0] concat
- \ifx\@anim@lscape\@anim@@lscape [0 -1 -1 0 15 15] concat \fi%
+ \if@anim@dvisvgm\else\ifx\@anim@lscape\@anim@@lscape
+ [0 1 -1 0 15 0] concat
+ \fi\fi%
\@anim@btnplay}{#2}%
\fi%
\ifx\@anim@PlayRight\@anim@arg%
\@anim@xbutton{PlayRight}{%
- \ifx\@anim@lscape\@anim@@lscape [0 1 -1 0 15 0] concat \fi%
+ \if@anim@dvisvgm\else\ifx\@anim@lscape\@anim@@lscape
+ [0 1 -1 0 15 0] concat
+ \fi\fi%
\@anim@btnplay}{#2}%
\fi%
\ifx\@anim@Plus\@anim@arg%
\@anim@xbutton{Plus}{\@anim@btnplus}{#2}%
\fi%
\ifx\@anim@Reset\@anim@arg%
- \@anim@xbutton{Reset}{%
- \ifx\@anim@lscape\@anim@@lscape [0 1 -1 0 15 0] concat \fi%
- \@anim@btnreset}{#2}%
+ \if@anim@dvisvgm% Reset btn has filled foreground parts. In dvisvgm, for
+ % filling and setting transparency correctly, BG and FG are treated
+ % separately.
+ \ifcsname btn#1:#2\endcsname\else%
+ \ifx\empty\@anim@bg\empty\else%
+ \@anim@xbutton{ResetBG}{%
+ \@anim@btnresetbg}{#2}%
+ \fi%
+ \begingroup%
+ \def\@anim@alpha{}%
+ \@anim@xbutton{ResetFG}{%
+ \@anim@btnreset}{#2}%
+ \endgroup%
+ \ifx\empty\@anim@bg\empty\else%
+ \global\setbox\@anim@box=\hbox to \@anim@btnsize {%
+ \vbox to \@anim@btnsize {\vss%
+ \@anim@refxform{\@anim@getkeyval{btnResetBG:#2}}%
+ \@anim@refxform{\@anim@lastxform}%
+ }\hss%
+ }%
+ \@anim@xform{0}{1}{}{}{\@anim@box}%
+ \fi%
+ \@anim@newkey{btn#1:#2}{\@anim@lastxform}%
+ \fi%
+ \else%
+ \@anim@xbutton{Reset}{%
+ \ifx\@anim@lscape\@anim@@lscape [0 1 -1 0 15 0] concat \fi%
+ \@anim@btnreset}{#2}%
+ \fi%
\fi%
\ifx\@anim@StepLeft\@anim@arg%
\@anim@xbutton{StepLeft}{%
[-1 0 0 1 15 0] concat
- \ifx\@anim@lscape\@anim@@lscape [0 -1 -1 0 15 15] concat \fi%
+ \if@anim@dvisvgm\else\ifx\@anim@lscape\@anim@@lscape
+ [0 1 -1 0 15 0] concat
+ \fi\fi%
\@anim@btnstep}{#2}%
\fi%
\ifx\@anim@StepRight\@anim@arg%
\@anim@xbutton{StepRight}{%
- \ifx\@anim@lscape\@anim@@lscape [0 1 -1 0 15 0] concat \fi%
+ \if@anim@dvisvgm\else\ifx\@anim@lscape\@anim@@lscape
+ [0 1 -1 0 15 0] concat
+ \fi\fi%
\@anim@btnstep}{#2}%
\fi%
}
\def\@anim@xbutton#1#2#3{% #1: name; #2: stroking commands,
+ % only create if button face doesn't exist yet
\ifcsname btn#1:#3\endcsname\else% #3: current colour+alpha+ ... combination
- % only create if button face doesn't exist yet
\global\setbox\@anim@box=\hbox to 15bp {\vbox to 15bp {\vss%
- \@anim@literal{}{#2}%
+ \@anim@literal{}{%
+ save
+ \ifx\empty\@anim@alpha\empty%
+ /bgfill {fill} bind def
+ \else\if@anim@dvisvgm
+ /bgfill {fill} bind def
+ \else%
+ /bgfill {%
+ /.setfillconstantalpha where {%
+ pop gsave \@anim@alpha\space .setfillconstantalpha fill
+ 1 .setfillconstantalpha newpath fill grestore newpath%
+ }{%
+ /.setopacityalpha where {%
+ pop gsave \@anim@alpha\space .setopacityalpha fill
+ 1 .setopacityalpha newpath fill grestore newpath%
+ }{%
+ %Distiller
+ gsave
+ mark /ca \@anim@alpha\space/SetTransparency pdfmark fill
+ mark /ca 1.0 /SetTransparency pdfmark newpath fill
+ grestore newpath%
+ } ifelse%
+ } ifelse%
+ } bind def
+ \fi\fi%
+ #2
+ restore%
+ }%
}\hss}%
\if@anim@dvisvgm%
\global\setbox\@anim@box=\hbox{%
@@ -884,32 +967,10 @@
\fi%
%distill box into XObject
\@anim@xform{0}{1}{}{%
- \ifx\empty\@anim@alpha\empty\else%
- \if@anim@dvisvgm%
- opacity='\@anim@alpha'%
- \else%
- /Group <</S/Transparency>>%
- \fi%
- \fi%
+ \ifx\empty\@anim@alpha\empty\else\if@anim@dvisvgm%
+ fill-opacity='\@anim@alpha'%
+ \fi\fi%
}{\@anim@box}%
- %nested XObject if transparency is to be added
- \if@anim@dvisvgm\else%
- \ifx\empty\@anim@alpha\empty\else%
- \global\setbox\@anim@box=\hbox to 15bp {\vbox to 15bp {\vss%
- \@anim@literal{direct}{%
- /.setopacityalpha where {%
- %Ghostscript
- pop \@anim@alpha\space .setopacityalpha%
- }{%
- %Distiller
- mark /CA \@anim@alpha /ca \@anim@alpha /SetTransparency pdfmark%
- } ifelse%
- }%
- \@anim@refxform{\@anim@lastxform}%
- }\hss}%
- \@anim@xform{0}{0}{}{}{\@anim@box}%
- \fi%
- \fi%
\@anim@newkey{btn#1:#3}{\@anim@lastxform}%
\fi%
}
@@ -940,7 +1001,7 @@
0 j
100 47 m
100 103 l
- S
+ S%
}
\def\@anim@btnstep{%
5 w
@@ -963,7 +1024,7 @@
55 47 m
96 75 l
55 103 l
- S
+ S%
}
\def\@anim@btnplay{%
5 w
@@ -987,7 +1048,7 @@
50 40 m
50 110 l
100 75 l
- s
+ s%
}
\def\@anim@btnpause{%
5 w
@@ -1007,7 +1068,7 @@
20 w
22 40 m
22 110 l
- S
+ S%
}
\def\@anim@btnminus{%
5 w
@@ -1030,7 +1091,7 @@
0 J
47 75 m
103 75 l
- S
+ S%
}
\def\@anim@btnplus{%
5 w
@@ -1055,7 +1116,7 @@
103 75 l
75 47 m
75 103 l
- S
+ S%
}
\def\@anim@btnreset{%
5 w
@@ -1079,6 +1140,7 @@
75 103 l
S
\@anim@@@fg\space
+ \ifx\empty\@anim@alpha\empty\else/R2 gs \fi
35 50 m
70 75 l
35 100 l
@@ -1093,7 +1155,7 @@
35 75 l
120 75 m
115 75 l
- S
+ S%
}
\def\@anim@makebutton#1#2{% #1: name ; #2: current colour, alpha, ...
\edef\@anim@arg{#1}%
@@ -1176,26 +1238,21 @@
}
%XObject creation
\def\@anim@xbutton#1#2#3{% #1 name, #2 stroking commands, #3 @anim@num
- \ifcsname btn#1:#3\endcsname\else% only create if button face doesn't
- \@anim@streamobj{% % exist yet
- /Type/XObject/Subtype/Form/BBox [0 0 15 15]
+ \ifcsname btn#1:#3\endcsname\else% only create if button face doesn't% exist yet
+ \edef\@anim@arg{#1}%
+ \@anim@streamobj{%
+ /Type/XObject/Subtype/Form/BBox [0 0 15 15]%
\ifx\empty\@anim@alpha\empty\else%
- /Group <</S/Transparency>>%
- \fi%
- }{#2}%
- \ifx\empty\@anim@alpha\empty\else%
- \@anim@streamobj{%
- /Type/XObject/Subtype/Form/BBox [0 0 15 15]%
/Resources <<%
/ExtGState <<%
- /R1 <<%
- /Type/ExtGState/ca \@anim@alpha/CA \@anim@alpha/AIS false%
- >>%
+ /R1 <</Type/ExtGState/ca \@anim@alpha>>%
+ \ifx\@anim@Reset\@anim@arg%
+ /R2 <</Type/ExtGState/ca 1.0>>%
+ \fi%
>>%
- /XObject <</R2 \@anim@lastobj>>%
>>%
- }{/R1 gs /R2 Do}%
- \fi%
+ \fi%
+ }{\ifx\empty\@anim@alpha\empty\else/R1 gs\fi\space #2}%
\@anim@newkey{btn#1:#3}{\@anim@lastobj}%
\fi%
}
@@ -1527,6 +1584,7 @@
\let\input@path\Ginput@path%
\fi%
\setkeys{anim@user}{#1}%
+ \ifx\empty\@anim@bg\empty\xdef\@anim@alpha{}\fi%
\xdef\@anim@btnsize{\the\dimexpr\@anim@btnsize\relax}%
%correct wrong option combination; totalheight overrides height
\ifnum\@anim@resizeflags=3\relax% height+totalheight->totalheight
@@ -1962,7 +2020,7 @@
\@anim@annot{\@anim@btnsize}{\@anim@btnsize}{\z@}{%
cursor='pointer' onmousedown='\@anim@btnJS{#1}{\@anim@arg}'%
}%
- \@anim@updatebbox{\@anim@btnsize}{\@anim@btnsize}{\z@}%
+ \@anim@updatebbox{\@anim@btnsize}{\@anim@btnsize}{0pt}%
\hbox to \@anim@btnsize {%
\vrule width \z@ height \@anim@btnsize depth \z@%
\hss%
@@ -2048,6 +2106,7 @@
\let\input@path\Ginput@path%
\fi%
\setkeys{anim@user}{#1}%
+ \ifx\empty\@anim@bg\empty\xdef\@anim@alpha{}\fi%
\xdef\@anim@btnsize{\the\dimexpr\@anim@btnsize\relax}%
%correct wrong option combination; totalheight overrides height
\ifnum\@anim@resizeflags=3\relax% height+totalheight->totalheight
diff --git a/macros/latex/contrib/animate/animate.tex b/macros/latex/contrib/animate/animate.tex
index 0249961249..bd9c37de1e 100644
--- a/macros/latex/contrib/animate/animate.tex
+++ b/macros/latex/contrib/animate/animate.tex
@@ -112,7 +112,7 @@
\section{Introduction}
This package provides an interface for creating PDF and SVG files with animated content from sets of graphics or image files, from inline graphics, such as \LaTeX-picture, PSTricks or pgf/TikZ generated pictures, or just from typeset text. Unlike standard movie/video formats, package `animate' allows for animating vector graphics. The result is roughly similar to the SWF (Flash) format, although not as space-efficient.
-Package `animate' supports the usual workflows for making PDF, i.\,e. pdf\LaTeX{}, Lua\LaTeX{}, \LaTeX{} $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+/Distiller and \pXepLaTeX{} $\rightarrow$ \verb+(x)dvipdfmx+. For animated SVG, it supports the \verb+dvisvgm+ driver. The DVI/XDV used as input for \verb+dvisvgm+ can be generated with \LaTeX{}, Lua\LaTeX{} (in DVI mode with command `\verb+dvilualatex+') and \XeLaTeX{} (with option `\verb+--no-pdf+').
+Package `animate' supports the usual workflows for making PDF, i.\,e. pdf\LaTeX{}, Lua\-\LaTeX{}, \LaTeX{} $\rightarrow$ \verb+dvips+ $\rightarrow$ \verb+ps2pdf+/Distiller and \pXepLaTeX{} $\rightarrow$ \verb+(x)dvipdfmx+. For animated SVG, it supports the \verb+dvisvgm+ driver. The DVI/XDV used as input for \verb+dvisvgm+ can be generated with \LaTeX{}, Lua\LaTeX{} (in DVI mode with command `\verb+dvilualatex+') and \XeLaTeX{} (with option `\verb+--no-pdf+').
PDF files with animations can be viewed in Acrobat Reader (except on mobile devices), PDF-XChange and Foxit Reader.
@@ -1377,8 +1377,11 @@ dvilualatex
xelatex -no-pdf
\end{verbatim}
to produce DVI or XDV output from the \LaTeX{} source. After this, SVG is obtained by running
+%\begin{verbatim}
+%dvisvgm --font-format=woff --exact --zoom=-1 --page=1,- --optimize ...
+%\end{verbatim}
\begin{verbatim}
-dvisvgm --font-format=woff --exact --zoom=-1 --page=1,- --optimize ...
+dvisvgm --font-format=woff --exact --zoom=-1 --page=1,- ...
\end{verbatim}
on the intermediate DVI or XDV file.
@@ -1390,7 +1393,7 @@ The purpose of `\verb+--zoom=-1+' is to produce responsive SVG. If embedded in a
By default, \verb+dvisvgm+ processes only the very first page of the input file. To convert multipage DVI/XDV with several animations, add option `\verb+--page=1,-+'.
-With option `\verb+--optimize+', \verb+dvisvgm+ applies several optimizations to reduce the output file size.
+%With option `\verb+--optimize+', \verb+dvisvgm+ applies several optimizations to reduce the output file size.
As SVG derives from XML it is not known to be particularly economical in terms of file size. Compressed SVG, with file extension `\verb+svgz+', shortens download times and is supported by most Web browsers. It can be generated by adding option `\verb+-z+'. Also, option `\verb+--precision=1+' may be used to reduce the SVG file size. It limits the precision of floating point numbers, such as coordinates, to one decimal figure. Sometimes, animations may behave stangely after applying this option. Then, of course, it should be omitted.
diff --git a/macros/latex/contrib/beamer/CHANGELOG.md b/macros/latex/contrib/beamer/CHANGELOG.md
index 7d5020ab7b..ee19a1148e 100644
--- a/macros/latex/contrib/beamer/CHANGELOG.md
+++ b/macros/latex/contrib/beamer/CHANGELOG.md
@@ -8,6 +8,20 @@ a major and minor version only.
## [Unreleased]
+## [v3.58]
+
+### Changed
+
+- re-introduced `\strut` after the frametitle (see #535)
+- Promote bookmark level for index (see #554)
+- clip `\insertslideintonotes` to show only visible area
+- using biblatex filehooks to make adjustments to the bibliography appearence (see #581)
+
+### Fixed
+
+- Avoid loop with overlayarea in vmode (issue #580)
+- Handling of `\\` in article mode (issue #582)
+
## [v3.57]
### Changed
@@ -81,7 +95,8 @@ a major and minor version only.
- Support for `noxcolor` with `beamerarticle` (see #483)
- Treatment of mixed overlay/alert specifications
-[Unreleased]: https://github.com/josephwright/beamer/compare/v3.57...HEAD
+[Unreleased]: https://github.com/josephwright/beamer/compare/v3.58...HEAD
+[v3.58]: https://github.com/josephwright/beamer/compare/v3.57...v3.58
[v3.57]: https://github.com/josephwright/beamer/compare/v3.56...v3.57
[v3.56]: https://github.com/josephwright/beamer/compare/v3.55...v3.56
[v3.55]: https://github.com/josephwright/beamer/compare/v3.54...v3.55
diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls
index f3564e183c..8da6b10836 100644
--- a/macros/latex/contrib/beamer/base/beamer.cls
+++ b/macros/latex/contrib/beamer/base/beamer.cls
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesClass{beamer}
- [2019/09/29 v3.57 A class for typesetting presentations]
+ [2020/05/06 v3.58 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/macros/latex/contrib/beamer/base/beamerarticle.sty b/macros/latex/contrib/beamer/base/beamerarticle.sty
index 2972dd7fb0..1b3de32744 100644
--- a/macros/latex/contrib/beamer/base/beamerarticle.sty
+++ b/macros/latex/contrib/beamer/base/beamerarticle.sty
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesPackage{beamerarticle}
- [2019/09/29 v3.57 beamer input in article mode]
+ [2020/05/06 v3.58 beamer input in article mode]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/macros/latex/contrib/beamer/base/beamerbaseframe.sty b/macros/latex/contrib/beamer/base/beamerbaseframe.sty
index 5da51c7ef2..bda14b5d5a 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseframe.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseframe.sty
@@ -755,6 +755,9 @@
{
\expandafter\let\expandafter\beamer@origbreak\expandafter=%
\csname\expandafter\@gobble\string\\ \endcsname% evil trickery to add a space to the name
+ \ifx\beamer@origbreak\relax
+ \let\beamer@origbreak\\
+ \fi
\DeclareRobustCommand\\{\beamer@ifnextcharospec{\beamer@breaker}{\beamer@@breaker}}
\def\beamer@breaker<#1>{\only<#1>{\beamer@origbreak}}
\def\beamer@@breaker{\ifbeamer@inframe\else\expandafter\beamer@origbreak\fi}
diff --git a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
index adf021aae7..c0d85832b5 100644
--- a/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaselocalstructure.sty
@@ -495,6 +495,29 @@
{\ifcsundef{abx@field@title}{}{\ifpunct{}{\midsentence\newunitpunct}}%
\newblock\unspace\usebeamercolor[fg]{bibliography entry note}}{}{}}
{}}
+
+% Adding patches to some biblatex styles
+\csappto{blx@filehook@postload@numeric.bbx}{%
+ \mode<presentation>{\setbeamertemplate{bibliography item}{\insertbiblabel}}}
+\csappto{blx@filehook@postload@alphabetic.bbx}{%
+ \mode<presentation>{\setbeamertemplate{bibliography item}{\insertbiblabel}}}
+\csappto{blx@filehook@postload@authoryear.bbx}{%
+ \mode<presentation>{%
+ \newlength{\beamer@bibiconwidth}
+ \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}}
+ \setlength{\labelwidth}{-\beamer@bibiconwidth}
+ \addtolength{\labelwidth}{2\labelsep}
+ \addtolength{\bibhang}{\labelsep}
+ }}
+\csappto{blx@filehook@postload@authortitle.bbx}{%
+ \mode<presentation>{%
+ \newlength{\beamer@bibiconwidth}
+ \settowidth\beamer@bibiconwidth{\usebeamertemplate*{bibliography item}}
+ \setlength{\labelwidth}{-\beamer@bibiconwidth}
+ \addtolength{\labelwidth}{2\labelsep}
+ \addtolength{\bibhang}{\labelsep}
+ }}
+
\mode
<article>
diff --git a/macros/latex/contrib/beamer/base/beamerbasenotes.sty b/macros/latex/contrib/beamer/base/beamerbasenotes.sty
index b0cc196c31..d15fb1c8fd 100644
--- a/macros/latex/contrib/beamer/base/beamerbasenotes.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasenotes.sty
@@ -203,7 +203,7 @@
\begin{pgflowlevelscope}{\pgftransformscale{#1}}%
\color{normal text.bg}
\pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\paperwidth}{\paperheight}}
- \pgfusepath{fill}
+ \pgfusepath{fill,clip}
\color{normal text.fg}
{\pgftransformshift{\pgfpoint{\beamer@origlmargin}{\footheight}}\pgftext[left,bottom]{\copy\beamer@frameboxcopy}}
\end{pgflowlevelscope}
diff --git a/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty b/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty
index 9b7d9268a0..0f718e7287 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty
@@ -661,7 +661,7 @@
\raggedright
}
{%
- \end{minipage}\vfil
+ \end{minipage}\endgraf\vfil
\egroup
\wd\beamer@areabox=\beamer@animht
\ht\beamer@areabox=\beamer@animwd
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemedefault.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemedefault.sty
index cd7537d36c..dac39b1ffb 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemedefault.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemedefault.sty
@@ -158,11 +158,11 @@
\usebeamerfont{frametitle}%
\vbox{}\vskip-1ex%
\if@tempswa\else\csname beamer@fte#1\endcsname\fi%
- \strut\insertframetitle\par%
+ \strut\insertframetitle\strut\par%
{%
\ifx\insertframesubtitle\@empty%
\else%
- {\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle\par}%
+ {\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle\strut\par}%
\fi
}%
\vskip-1ex%
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty
index f76955cbf9..9e4385341d 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeshadow.sty
@@ -51,7 +51,7 @@
\vbox{}\vskip-.75ex%
\leftskip0.3cm%
\rightskip0.3cm plus1fil\leavevmode
- \usebeamercolor[fg]{frametitle}\usebeamerfont{frametitle}\strut\insertframetitle\par%
+ \usebeamercolor[fg]{frametitle}\usebeamerfont{frametitle}\strut\insertframetitle\strut\par%
\ifx\insertframesubtitle\@empty\else%
{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\insertframesubtitle}\strut\par}%
\fi%
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty
index 36d1622e23..0a68ff0598 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty
@@ -97,11 +97,11 @@
\vskip-.5ex%
\nointerlineskip%
\begin{beamercolorbox}[wd=\paperwidth,leftskip=.3cm,rightskip=.3cm plus1fil,vmode]{frametitle}
- \usebeamerfont*{frametitle}\insertframetitle%
+ \usebeamerfont*{frametitle}\strut\insertframetitle%
\ifx\insertframesubtitle\@empty%
\strut\par%
\else
- \par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\insertframesubtitle}\strut\par}%
+ \par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle}\strut\par}%
\fi%%
\usebeamerfont{headline}%
\vskip.5ex
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty
index 21ca7701eb..6af2e39505 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty
@@ -75,11 +75,11 @@
\vskip-.5ex%
\nointerlineskip%
\begin{beamercolorbox}[wd=\paperwidth,leftskip=.935cm,rightskip=.3cm plus1fil]{frametitle}
- \usebeamerfont*{frametitle}\insertframetitle%
+ \usebeamerfont*{frametitle}\strut\insertframetitle%
\ifx\insertframesubtitle\@empty%
\strut\par%
\else
- \par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\insertframesubtitle}\strut\par}%
+ \par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle}\strut\par}%
\fi%%
\usebeamerfont{headline}%
\vskip.5ex
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
index ab417b4578..506fc7cfd8 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
index 4bf5fa4cbd..41ca0bf479 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
index 730113c37a..315c8f9f58 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerug-animations.tex b/macros/latex/contrib/beamer/doc/beamerug-animations.tex
index 78ccfb7d34..66cff33d76 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-animations.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-animations.tex
@@ -26,7 +26,7 @@ To include an animation in a presentation, you can use, for example, the package
\begin{package}{{multimedia}}
A stand-alone package that implements several commands for including external animation and sound files in a \pdf\ document. The package can be used together with both |dvips| plus |ps2pdf| and |pdflatex|, though the special sound support is available only in |pdflatex|.
- When including this package, you must also include the |hyperref| package. Since you will typically want to include |hyperref| only at the very end of the preamble, |multimedia| will not include |hyperref| itself. However, |multimedia| can be included both before and after |hyperref|. Since \beamer\ includes |hyperref| automatically, you need not worry about this when creating a presentation using \beamer.
+ When including this package, you must also include the |hyperref| package. The |multimedia| is one of the few packages that needs to be loaded after |hyperref|. Since \beamer\ includes |hyperref| automatically, you need not worry about this when creating a presentation using \beamer.
\end{package}
For including an animation in a \pdf\ file, you can use the command |\movie|, which is explained below. Depending on the used options, this command will either setup the \pdf\ file such that the viewer application (like the Acrobat Reader) itself will try to play the movie or that an external program will be called. The latter approach, though much less flexible, must be taken if the viewer application is unable to display the movie itself.
@@ -354,6 +354,8 @@ The \pdf\ specification introduces special sound objects, which are treated quit
\item
\declare{|encoding=|}\meta{method}. Specifies the encoding method, which may be |Raw|, |Signed|, |muLaw|, or |ALaw|. If the method is |muLaw|, this option need not be specified.
\item
+ \declare{|externalviewer|} causes an external application to be launched for playing the sound. Most options, like |loop|, have no effect since they are not passed along to the external application.
+ \item
\declare{|height=|}\meta{\TeX\ dimension}. Overrides the height of the \meta{sound poster text} box and sets it to the given dimension.
\item
\declare{|inlinesound|} causes the sound data to be stored directly in the \pdf-file.
diff --git a/macros/latex/contrib/beamer/doc/beamerug-color.tex b/macros/latex/contrib/beamer/doc/beamerug-color.tex
index 47945b8922..2413c38967 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-color.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-color.tex
@@ -193,7 +193,7 @@ This section explains how \beamer's color management works.
In \beamer's philosophy, every element of a presentation can have a different color. Unfortunately, it turned out that simply assigning a single color to every element of a presentation is not such a good idea. First of all, we sometimes want colors of elements to change during a presentation, like the color of the item indicators when they become alerted or inside an example block. Second, some elements naturally have two colors, namely a foreground and a background, but not always. Third, sometimes elements somehow should not have any special color but should simply ``run along'' with the color of their surrounding. Finally, giving a special color to every element makes it very hard to globally change colors (like changing all the different kind-of-blue things into kind-of-red things) and it makes later extensions even harder.
-For all these reasons, the color of an element in \beamer\ is a structured object, which we call a \emph{\beamer-color}. Every \beamer-color has two parts: a foreground and a background. Either of these may be ``empty,'' which means that whatever foreground or background was active before should remain active when the color is used.
+For all these reasons, the color of an element in \beamer\ is a structured object, which we call a \emph{\textsl{\beamer}-color}. Every \beamer-color has two parts: a foreground and a background. Either of these may be ``empty,'' which means that whatever foreground or background was active before should remain active when the color is used.
\beamer-colors can \emph{inherit} from other \beamer-colors and the default themes make extensive use of this feature. For example, there is a \beamer-color called |structure| and all sorts of elements inherit from this color. Thus, if someone changes |structure|, the color of all these elements automatically change accordingly. When a color inherits from another color, it can nevertheless still override only the foreground or the background.
diff --git a/macros/latex/contrib/beamer/doc/beamerug-installation.tex b/macros/latex/contrib/beamer/doc/beamerug-installation.tex
index 6c2c2f8226..ef35ef53cc 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-installation.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-installation.tex
@@ -37,7 +37,7 @@ If you use |pdflatex|, which is optional, you need
\subsection{Installation of Pre-bundled Packages}
-We do not create or manage pre-bundled packages of \beamer, but, fortunately, other nice people do. We cannot give detailed instructions on how to install these packages, since we do not manage them, but we \emph{can} tell you were to find them and we can tell you what these nice people told us on how to install them. If you have a problem with installing, you might wish to have a look at the following first.
+We do not create or manage pre-bundled packages of \beamer, but, fortunately, other nice people do. We cannot give detailed instructions on how to install these packages, since we do not manage them, but we \emph{can} tell you where to find them and we can tell you what these nice people told us on how to install them. If you have a problem with installing, you might wish to have a look at the following first.
\subsubsection{\TeX\ Live and Mac\TeX}
@@ -90,9 +90,9 @@ The package contains a bunch of files; |beamer.cls| is one of these files and ha
When you ask \TeX\ to use a certain class or package, it usually looks for the necessary files in so-called |texmf| trees. These trees are simply huge directories that contain these files. By default, \TeX\ looks for files in three different |texmf| trees:
\begin{itemize}
\item
- The root |texmf| tree, which is usually located at |/usr/share/texmf/|, |/usr/local/texlive/texmf/|, |c:\texmf\|, or\\ |c:\texlive\texmf\|.
+ The root |texmf| tree, which is usually located at |/usr/share/texmf/|, |/usr/local/texlive/texmf/|, |c:\texmf\|, or |c:\texlive\texmf\|.
\item
- The local |texmf| tree, which is usually located at |/usr/local/share/texmf/|, |/usr/local/texlive/texmf-local/| |c:\localtexmf\|, or\\ |c:\texlive\texmf-local\|.
+ The local |texmf| tree, which is usually located at |/usr/local/share/texmf/|,\\ |/usr/local/texlive/texmf-local/|, |c:\localtexmf\|, or |c:\texlive\texmf-local\|.
\item
Your personal |texmf| tree, which is usually located in your home directory at |~/texmf/| or |~/Library/texmf/|.
\end{itemize}
diff --git a/macros/latex/contrib/beamer/doc/beamerug-introduction.tex b/macros/latex/contrib/beamer/doc/beamerug-introduction.tex
index 9a5f278941..3f2399f83d 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-introduction.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-introduction.tex
@@ -48,12 +48,12 @@ After being unmaintained since 2007, in April 2010 Till handed over the maintena
\subsection{Acknowledgments}
-Till Tantau: \emph{``Where to begin? \beamer's development depends not only on me, but on the feedback I get from other people. Many features have been implemented because someone requested them and I thought that these features would be nice to have and reasonably easy to implement. Other people have given valuable feedback on themes, on the user's guide, on features of the class, on the internals of the implementation, on special \LaTeX\ features, and on life in general. A small selection of these people includes (in no particular order and I have surely forgotten to name lots of people who really, really deserve being in this list): Carsten (for everything), Birgit (for being the first person to use \beamer\ besides me), Tux (for his silent criticism), Rolf Niepraschk (for showing me how to program \LaTeX\ correctly), Claudio Beccari (for writing part of the documentation on font encodings), Thomas Baumann (for the emacs stuff), Stefan M\"uller (for not loosing hope), Uwe Kern (for \textsc{xcolor}),
-Hendri Adriaens (for \textsc{ha-prosper}), Ohura Makoto (for spotting typos). People who have contributed to the themes include Paul Gomme, Manuel Carro, and Marlon R\'egis Schmitz.''}
+Till Tantau: \emph{``Where to begin? \textsl{\beamer}'s development depends not only on me, but on the feedback I get from other people. Many features have been implemented because someone requested them and I thought that these features would be nice to have and reasonably easy to implement. Other people have given valuable feedback on themes, on the user's guide, on features of the class, on the internals of the implementation, on special \LaTeX\ features, and on life in general. A small selection of these people includes (in no particular order and I have surely forgotten to name lots of people who really, really deserve being in this list): Carsten (for everything), Birgit (for being the first person to use \textsl{\beamer} besides me), Tux (for his silent criticism), Rolf Niepraschk (for showing me how to program \LaTeX\ correctly), Claudio Beccari (for writing part of the documentation on font encodings), Thomas Baumann (for the emacs stuff), Stefan M\"uller (for not loosing hope), Uwe Kern (for \textsl{\textsc{xcolor}}),
+Hendri Adriaens (for \textsl{\textsc{ha-prosper}}), Ohura Makoto (for spotting typos). People who have contributed to the themes include Paul Gomme, Manuel Carro, and Marlon R\'egis Schmitz.''}
-Joseph Wright: \emph{``Thanks to Till Tantau for the huge development effort in creating \beamer. Sincere thanks to Vedran Mileti\'c for taking the lead in continuing development.''}
+Joseph Wright: \emph{``Thanks to Till Tantau for the huge development effort in creating \textsl{\beamer}. Sincere thanks to Vedran Mileti\'c for taking the lead in continuing development.''}
-Vedran Mileti\'c: \emph{``First, I would like to thank Karl Berry and Sanda Buja\v ci\'c for encouragement, without which I wouldn't ever be anything but a \LaTeX\ user. I would also like to thank Ana Me\v strovi\'c, my colleague, who was excited by the prospect of using \beamer\ for preparing class material; Ivona Frankovi\'c and Marina Rajnovi\'c, my students at Department of Informatics, who were the first to hear about \LaTeX, \beamer\ and how it can help in preparing class material. I would like to thank Heiko Oberdiek (for \textsc{hyperref}), Johannes Braams (for \textsc{babel}) and Philipp Lehman (for \textsc{biblatex}). Above all, I owe a lot to Till Tantau for developing \beamer\ in the first place and to Joseph Wright for developing \textsc{siunitx} and for helping me develop \beamer\ further.''}
+Vedran Mileti\'c: \emph{``First, I would like to thank Karl Berry and Sanda Buja\v ci\'c for encouragement, without which I wouldn't ever be anything but a \LaTeX\ user. I would also like to thank Ana Me\v strovi\'c, my colleague, who was excited by the prospect of using \textsl{\beamer} for preparing class material; Ivona Frankovi\'c and Marina Rajnovi\'c, my students at Department of Informatics, who were the first to hear about \LaTeX, \textsl{\beamer} and how it can help in preparing class material. I would like to thank Heiko Oberdiek (for \textsl{\textsc{hyperref}}), Johannes Braams (for \textsl{\textsc{babel}}) and Philipp Lehman (for \textsl{\textsc{biblatex}}). Above all, I owe a lot to Till Tantau for developing \textsl{\beamer} in the first place and to Joseph Wright for developing \textsl{\textsc{siunitx}} and for helping me develop \textsl{\beamer} further.''}
\subsection{How to Read this User's Guide}
diff --git a/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex b/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex
index bc961c2bf0..b66371a703 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex
@@ -932,8 +932,8 @@ The \beamer\ class offers several commands and environments for splitting (perha
The main environment for creating columns is called |columns|. Inside this environment, you can either place several |column| environments, each of which creates a new column, or use the |\column| command to create new columns.
-\begin{environment}{{columns}\oarg{options}}
- A multi-column area. Inside the environment you should place only |column| environments or |\column| commands (see below). The following \meta{options} may be given:
+\begin{environment}{{columns}\sarg{overlay specification}\oarg{options}}
+ A multi-column area. If \meta{overlay specification} is present, the environment will only be shown on the specified slides. Inside the environment you should place only |column| environments or |\column| commands (see below). The following \meta{options} may be given:
\begin{itemize}
\item
\declare{|b|} will cause the bottom lines of the columns to be vertically aligned.
@@ -980,8 +980,8 @@ The main environment for creating columns is called |columns|. Inside this envir
To create a column, you can either use the |column| environment or the |\column| command.
-\begin{environment}{{column}\oarg{placement}\marg{column width}}
- Creates a single column of width \meta{column width}. The vertical placement of the enclosing |columns| environment can be overruled by specifying a specific \meta{placement} (|t| and |T| for the two top modes, |c| for centered, and |b| for bottom).
+\begin{environment}{{column}\sarg{overlay specification}\oarg{placement}\marg{column width}}
+ Creates a single column of width \meta{column width}. If \meta{overlay specification} is present, the column will only be shown on the specified slides. The vertical placement of the enclosing |columns| environment can be overruled by specifying a specific \meta{placement} (|t| and |T| for the two top modes, |c| for centered, and |b| for bottom).
\example
The following code has the same effect as the above examples:
@@ -1001,7 +1001,7 @@ To create a column, you can either use the |column| environment or the |\column|
\end{environment}
-\begin{command}{{\column}\oarg{placement}\marg{column width}}
+\begin{command}{{\column}\sarg{overlay specification}\oarg{placement}\marg{column width}}
Starts a single column. The parameters and options are the same as for the |column| environment. The column automatically ends with the next occurrence of |\column| or of a |column| environment or of the end of the current |columns| environment.
\example
diff --git a/macros/latex/contrib/beamer/doc/beamerug-macros.tex b/macros/latex/contrib/beamer/doc/beamerug-macros.tex
index f7580a1ff2..a097076dac 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-macros.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-macros.tex
@@ -319,7 +319,7 @@
}
\makeatletter
-\def\index@prologue{\section*{Index}\addcontentsline{toc}{section}{Index}
+\def\index@prologue{\let\toclevel@section\toclevel@part\section*{Index}\addcontentsline{toc}{section}{Index}
This index only contains automatically generated entries, sorry. A good
index should also contain carefully selected keywords.
\bigskip
diff --git a/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex b/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex
index e454665631..ea2c228ab7 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex
@@ -269,6 +269,38 @@ In addition to these modes, \beamer\ recognizes the following names for modes se
\declare{|presentation|} refers to the first four modes, that is, to all modes except for the |article| mode.
\end{itemize}
+\begin{center}
+ \begin{pgfpicture}
+ \pgftransformshift{\pgfpoint{0cm}{0cm}}
+ \pgfnode{rectangle}{center}{|all|}{allnode}{}
+ \pgftransformshift{\pgfpoint{-2cm}{-1.25cm}}
+ \pgfnode{rectangle}{center}{|presentation|}{presentationnode}{}
+ \pgftransformshift{\pgfpoint{4cm}{0cm}}
+ \pgfnode{rectangle}{center}{|article|}{articlenode}{}
+ \pgftransformshift{\pgfpoint{-7cm}{-1.5cm}}
+ \pgfnode{rectangle}{center}{|beamer|}{beamernode}{}
+ \pgftransformshift{\pgfpoint{2cm}{0cm}}
+ \pgfnode{rectangle}{center}{|second|}{secondnode}{}
+ \pgftransformshift{\pgfpoint{2cm}{0cm}}
+ \pgfnode{rectangle}{center}{|handout|}{handoutnode}{}
+ \pgftransformshift{\pgfpoint{2cm}{0cm}}
+ \pgfnode{rectangle}{center}{|trans|}{transnode}{}
+ \pgfpathmoveto{\pgfpointanchor{allnode}{south west}}
+ \pgfpathlineto{\pgfpointanchor{presentationnode}{north}}
+ \pgfpathmoveto{\pgfpointanchor{allnode}{south east}}
+ \pgfpathlineto{\pgfpointanchor{articlenode}{north}}
+ \pgfpathmoveto{\pgfpointanchor{presentationnode}{south west}}
+ \pgfpathlineto{\pgfpointanchor{beamernode}{north}}
+ \pgfpathmoveto{\pgfpointadd{\pgfpointanchor{presentationnode}{south}}{\pgfpoint{-0.3cm}{0cm}}}
+ \pgfpathlineto{\pgfpointanchor{secondnode}{north}}
+ \pgfpathmoveto{\pgfpointadd{\pgfpointanchor{presentationnode}{south}}{\pgfpoint{0.3cm}{0cm}}}
+ \pgfpathlineto{\pgfpointanchor{handoutnode}{north}}
+ \pgfpathmoveto{\pgfpointanchor{presentationnode}{south east}}
+ \pgfpathlineto{\pgfpointanchor{transnode}{north}}
+ \pgfusepath{stroke}
+ \end{pgfpicture}
+\end{center}
+
Depending on the current mode, you may wish to have certain text inserted only in that mode. For example, you might wish a certain frame or a certain table to be left out of your article version. In some situations, you can use the |\only| command for this purpose. However, the command |\mode|, which is described in the following, is much more powerful than |\only|.
The command actually comes in three ``flavors,'' which only slightly differ in syntax. The first, and simplest, is the version that takes one argument. It behaves essentially the same way as |\only|.
diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.pdf b/macros/latex/contrib/beamer/doc/beameruserguide.pdf
index 26156e2632..aab2a6503e 100644
--- a/macros/latex/contrib/beamer/doc/beameruserguide.pdf
+++ b/macros/latex/contrib/beamer/doc/beameruserguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.tex b/macros/latex/contrib/beamer/doc/beameruserguide.tex
index 9fe25be46f..1623634ed3 100644
--- a/macros/latex/contrib/beamer/doc/beameruserguide.tex
+++ b/macros/latex/contrib/beamer/doc/beameruserguide.tex
@@ -13,7 +13,7 @@
\documentclass{ltxdoc}
-\def\beamerugversion{3.57}
+\def\beamerugversion{3.58}
\def\beamerugpgfversion{1.00}
\def\beamerugxcolorversion{2.00}
diff --git a/macros/latex/contrib/media9/ChangeLog b/macros/latex/contrib/media9/ChangeLog
index f5b9f4ce3e..66d442ad26 100644
--- a/macros/latex/contrib/media9/ChangeLog
+++ b/macros/latex/contrib/media9/ChangeLog
@@ -1,4 +1,10 @@
-2020-03-24
+2020-05-06
+ * v1.11 : media9.sty
+ * v0.42 : pdfbase.sty
+ * fix : pdfbase.sty: \pbs_pdfxform:nnnnn (dvips version) using full clipping
+ path (= page size)
+
+2020-03-25
* v1.10 : media9.sty
* v0.41 : pdfbase.sty
* fix : pdfbase.sty, dvisvgm driver: missing id and class attrs in
diff --git a/macros/latex/contrib/media9/doc/media9.pdf b/macros/latex/contrib/media9/doc/media9.pdf
index d125af86c3..705a7870f2 100644
--- a/macros/latex/contrib/media9/doc/media9.pdf
+++ b/macros/latex/contrib/media9/doc/media9.pdf
Binary files differ
diff --git a/macros/latex/contrib/media9/media9.sty b/macros/latex/contrib/media9/media9.sty
index 69c563bfab..259bec096f 100644
--- a/macros/latex/contrib/media9/media9.sty
+++ b/macros/latex/contrib/media9/media9.sty
@@ -37,8 +37,8 @@
\RequirePackage{xparse}
\RequirePackage{atbegshi}
-\def\g@mix@date@tl{2020/03/25}
-\def\g@mix@version@tl{1.10}
+\def\g@mix@date@tl{2020/05/06}
+\def\g@mix@version@tl{1.11}
\ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
{acrobat-9/X compatible media}
@@ -213,7 +213,7 @@
\tl_set:Nn\l_mix_pkgtt_tl{}
}
},
- height .value_required:n = {true},
+ totalheight .value_required:n = {true},
depth .code:n = {
\msg_warning:nnnn{media9}{deprecated~option}{depth}{
@@ -1384,7 +1384,7 @@
\tl_set:Nn\l_mix_usrtt_tl{}
}
},
- height .value_required:n = {true},
+ totalheight .value_required:n = {true},
depth .code:n = {
\msg_warning:nnnn{media9}{deprecated~option}{depth}{
diff --git a/macros/latex/contrib/media9/pdfbase.sty b/macros/latex/contrib/media9/pdfbase.sty
index b30650dc99..cde66c506c 100644
--- a/macros/latex/contrib/media9/pdfbase.sty
+++ b/macros/latex/contrib/media9/pdfbase.sty
@@ -159,8 +159,8 @@
\RequirePackage{expl3}
\RequirePackage{l3keys2e}
-\def\g@pbs@date@tl{2020/03/25}
-\def\g@pbs@version@tl{0.41}
+\def\g@pbs@date@tl{2020/05/06}
+\def\g@pbs@version@tl{0.42}
\ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
{driver independent access to low-level PDF features}
@@ -676,7 +676,7 @@
\int_gincr:N\g_pbs_obj_int
}
- \cs_new_protected_nopar:Nn\pbs_pdfrefxform:n{\special{pdf:uxobj~#1}}% #1: xform obj ID
+ \cs_new_protected_nopar:Nn\pbs_pdfrefxform:n{\special{pdf:uxobj~#1}}
\cs_new_protected_nopar:Nn\pbs_pdfximage:n{
\filename@parse{#1}
@@ -686,9 +686,7 @@
||\str_if_eq_p:Vn\l_pbs_ext_tl{jpg}
||\str_if_eq_p:Vn\l_pbs_ext_tl{jpeg}
}{
- \special{pdf:image~@pbs@obj\int_use:N\g_pbs_obj_int\space
- %move initial display off the page
- matrix~0.000001~0~0~0.000001~-1000000~-1000000~(#1)}
+ \special{pdf:image~@pbs@obj\int_use:N\g_pbs_obj_int\space hide~(#1)}
\tl_gset:Nx\g_pbs_pdflastximage_tl{@pbs@obj\int_use:N\g_pbs_obj_int}
\int_gincr:N\g_pbs_obj_int
}{
@@ -698,7 +696,8 @@
}
}
- \cs_new_protected_nopar:Nn\pbs_pdfcatalog:n{\special{pdf:put~@catalog~<<#1>>}}
+ \cs_new_protected_nopar:Nn\pbs_pdfcatalog:n{
+ \special{pdf:put~@catalog~<<#1>>}}
\int_new:N\g_pbs_oc_int %object ID
\cs_new_protected_nopar:Nn\pbs_pdfbdc:nn{
@@ -761,7 +760,8 @@
\special{dvisvgm:raw~{?nl}</g>{?nl}</defs>}
}
}
- \tl_gset:Nx\g_pbs_pdflastxform_tl{\g_pbs_hash_tl pbs@obj\int_use:N\g_pbs_obj_int}
+ \tl_gset:Nx\g_pbs_pdflastxform_tl{
+ \g_pbs_hash_tl pbs@obj\int_use:N\g_pbs_obj_int}
\int_gincr:N\g_pbs_obj_int
}
@@ -771,9 +771,6 @@
}
}{
%dvips
- \bool_new:N\g_pbs_powerdot_bool %to cope with some powerdot oddity
- \@ifclassloaded{powerdot}{\bool_gset_true:N\g_pbs_powerdot_bool}{}
-
\sys_if_engine_pdftex:TF{
\cs_new_nopar:Nn\pbs_filedump:nnn{\pdffiledump~offset~#1~length~#2~{#3}}
}{
@@ -784,8 +781,8 @@
}
\AtBeginDocument{
- \@ifpackageloaded{hyperref}{}{
- %define `?pdfmark' operator as in file pdfmark.def from package `hyperref'
+ \@ifpackageloaded{hyperref}{}{ % `hyperref'
+ %define `?pdfmark' operator as in file pdfmark.def from package
\special{!~
systemdict~/pdfmark~known
{
@@ -1088,9 +1085,9 @@
output.
}
- \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{ % #1, #3 not used (resources are
- %this allows nesting \pbs_pdfxform:nnnnn{...} % managed by pdfmarks)
- \pbs_special:n{
+ \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{ % #1, #3 not used (resources
+ %this allows nesting \pbs_pdfxform:nnnnn{...} % are managed
+ \pbs_special:n{ % automaticlly)
gsave~
pbs@xform@level~0~eq~{/pbs@ctm@0~matrix~currentmatrix~def}~if~
pbs@ctm@0~setmatrix~
@@ -1132,24 +1129,28 @@
\pbs_special:n{
gsave~
currentpoint~/pbs@cury~exch~def~/pbs@curx~exch~def~
- %translate graphics to upper left page corner
- \bool_if:nF{\g_pbs_powerdot_bool||\g_pbs_lscape_bool}{
- {
- pbs@llx~neg~pbs@ury~neg~translate~
- Resolution~neg~VResolution~neg~translate %one inch left, one inch up
- }?pdfmark~
- }
+ %translate graphics to upper left page corner, so we have the whole
+ %clipbox (i. e. page area) available for distilling; outlying parts
+ %get clipped
+ {
+ clippath~pathbbox~pop~pop~
+ pbs@ury~sub~exch~pbs@llx~sub~exch~translate~
+ }?pdfmark~
+ %move origin (0,0) to the current position
+ gsave~pbs@curx~pbs@cury~translate~
+ %distillation-bbox left and top coords
+ clippath~pathbbox~pop~pop~/pbs@bbox@top~exch~def~
+ /pbs@bbox@left~exch~def~
%distill graphics to XObject
- gsave~pbs@curx~pbs@cury~translate~ %move origin (0,0) to the current
- mark~ %position
- /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}
+ mark~
+ /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~
/BBox~[
- pbs@llx~pbs@curx~sub~pbs@lly~pbs@cury~sub~
- pbs@urx~pbs@curx~sub~pbs@ury~pbs@cury~sub
- ]
+ pbs@bbox@left~pbs@bbox@top~pbs@bbox@left~pbs@urx~
+ pbs@llx~sub~add~pbs@bbox@top~pbs@lly~pbs@ury~sub~add
+ ]~
%insert additional dict entries (the Distiller way)
\str_if_eq:eeF{\l_tmpa_tl}{}{
- product~(Distiller)~search~{pop~pop~pop~\l_tmpa_tl}{pop}ifelse
+ product~(Distiller)~search~{pop~pop~pop~\l_tmpa_tl}{pop}ifelse~
}
/BP~pdfmark~grestore~
\int_compare:nT{#2>\c_zero_int}{
@@ -1157,17 +1158,16 @@
{
isls{%landscape mode (powerdot, geometry /w landscape option)
/pbs@dxdy~{
- pbs@urx~pbs@llx~sub~abs~
- pbs@ury~pbs@lly~sub~abs~div
- }~bind~def
- /pbs@dydx~{1~pbs@dxdy~div}~bind~def
- /pbs@cx~{pbs@urx~pbs@llx~add~2~div}~bind~def
- /pbs@cy~{pbs@ury~pbs@lly~add~2~div}~bind~def
+ pbs@urx~pbs@llx~sub~abs~pbs@ury~pbs@lly~sub~abs~div
+ }~bind~def~
+ /pbs@dydx~{1~pbs@dxdy~div}~bind~def~
+ /pbs@cx~{pbs@urx~pbs@llx~add~2~div}~bind~def~
+ /pbs@cy~{pbs@ury~pbs@lly~add~2~div}~bind~def~
%graphics needs to be rescaled for some reason ...
[pbs@dxdy~0~0~pbs@dydx~1~pbs@dxdy~sub~pbs@cx~mul~
- 1~pbs@dydx~sub~pbs@cy~mul]~concat
+ 1~pbs@dydx~sub~pbs@cy~mul]~concat~
%... rotated by 270 degrees ...
- [0~-1~1~0~pbs@cx~pbs@cy~sub~pbs@cx~pbs@cy~add]~concat
+ [0~-1~1~0~pbs@cx~pbs@cy~sub~pbs@cx~pbs@cy~add]~concat~
%... and flipped around vertical axis
[-1~0~0~1~pbs@llx~pbs@urx~add~0]~concat
}{%flip around horizontal axis in portrait mode