diff options
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/metapost/contrib/macros/hershey-mp/LICENSE | 287 | ||||
-rw-r--r-- | graphics/metapost/contrib/macros/hershey-mp/README | 18 | ||||
-rw-r--r-- | graphics/metapost/contrib/macros/hershey-mp/hershey.mp | 84 | ||||
-rw-r--r-- | graphics/metapost/contrib/macros/hershey-mp/hershey.pdf | bin | 0 -> 285317 bytes | |||
-rw-r--r-- | graphics/metapost/contrib/macros/hershey-mp/hershey.tex | 156 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/README.md | 1 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-scalepicture.tex | 113 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-body.tex | 9 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-preamble.tex | 1 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.pdf | bin | 574442 -> 424759 bytes | |||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.tex | 4 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/pgfcalendar-ext.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfcalendar-ext.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/pgfkeyslibraryext.pgfkeys-plus.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfkeyslibraryext.pgfkeys-plus.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.pgfkeys-plus.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.pgfkeys-plus.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.circlearrow.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.circlecrosssplit.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.heatmark.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.heatmark.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.rectangleroundedcorners.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.superellipse.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.superellipse.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.uncenteredrectangle.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.uncenteredrectangle.code.tex) | 4 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.transformations.mirror.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.transformations.mirror.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.calendar-plus.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.calendar-plus.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.misc.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.misc.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.node-families.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.node-families.shapes.geometric.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.paths.arcto.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.arcto.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.paths.ortho.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.ortho.code.tex) | 5 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.paths.timer.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.timer.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.patterns.images.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.patterns.images.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.positioning-plus.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.positioning-plus.code.tex) | 2 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.scalepicture.code.tex | 194 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.topaths.arcthrough.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.transformations.mirror.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.transformations.mirror.code.tex) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/latex/pgfcalendar-ext.sty (renamed from graphics/pgf/contrib/tikz-ext/tex/latex/tikz-ext/pgfcalendar-ext.sty) | 0 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-ext/tex/plain/pgfcalendar-ext.tex (renamed from graphics/pgf/contrib/tikz-ext/tex/plain/tikz-ext/pgfcalendar-ext.tex) | 2 |
35 files changed, 870 insertions, 10 deletions
diff --git a/graphics/metapost/contrib/macros/hershey-mp/LICENSE b/graphics/metapost/contrib/macros/hershey-mp/LICENSE new file mode 100644 index 0000000000..4153cd3775 --- /dev/null +++ b/graphics/metapost/contrib/macros/hershey-mp/LICENSE @@ -0,0 +1,287 @@ + EUROPEAN UNION PUBLIC LICENCE v. 1.2 + EUPL © the European Union 2007, 2016 + +This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined +below) which is provided under the terms of this Licence. Any use of the Work, +other than as authorised under this Licence is prohibited (to the extent such +use is covered by a right of the copyright holder of the Work). + +The Work is provided under the terms of this Licence when the Licensor (as +defined below) has placed the following notice immediately following the +copyright notice for the Work: + + Licensed under the EUPL + +or has expressed by any other means his willingness to license under the EUPL. + +1. Definitions + +In this Licence, the following terms have the following meaning: + +- ‘The Licence’: this Licence. + +- ‘The Original Work’: the work or software distributed or communicated by the + Licensor under this Licence, available as Source Code and also as Executable + Code as the case may be. + +- ‘Derivative Works’: the works or software that could be created by the + Licensee, based upon the Original Work or modifications thereof. This Licence + does not define the extent of modification or dependence on the Original Work + required in order to classify a work as a Derivative Work; this extent is + determined by copyright law applicable in the country mentioned in Article 15. + +- ‘The Work’: the Original Work or its Derivative Works. + +- ‘The Source Code’: the human-readable form of the Work which is the most + convenient for people to study and modify. + +- ‘The Executable Code’: any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. + +- ‘The Licensor’: the natural or legal person that distributes or communicates + the Work under the Licence. + +- ‘Contributor(s)’: any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. + +- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of + the Work under the terms of the Licence. + +- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending, + renting, distributing, communicating, transmitting, or otherwise making + available, online or offline, copies of the Work or providing access to its + essential functionalities at the disposal of any other natural or legal + person. + +2. Scope of the rights granted by the Licence + +The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +sublicensable licence to do the following, for the duration of copyright vested +in the Original Work: + +- use the Work in any circumstance and for all usage, +- reproduce the Work, +- modify the Work, and make Derivative Works based upon the Work, +- communicate to the public, including the right to make available or display + the Work or copies thereof to the public and perform publicly, as the case may + be, the Work, +- distribute the Work or copies thereof, +- lend and rent the Work or copies thereof, +- sublicense rights in the Work or copies thereof. + +Those rights can be exercised on any media, supports and formats, whether now +known or later invented, as far as the applicable law permits so. + +In the countries where moral rights apply, the Licensor waives his right to +exercise his moral right to the extent allowed by law in order to make effective +the licence of the economic rights here above listed. + +The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to +any patents held by the Licensor, to the extent necessary to make use of the +rights granted on the Work under this Licence. + +3. Communication of the Source Code + +The Licensor may provide the Work either in its Source Code form, or as +Executable Code. If the Work is provided as Executable Code, the Licensor +provides in addition a machine-readable copy of the Source Code of the Work +along with each copy of the Work that the Licensor distributes or indicates, in +a notice following the copyright notice attached to the Work, a repository where +the Source Code is easily and freely accessible for as long as the Licensor +continues to distribute or communicate the Work. + +4. Limitations on copyright + +Nothing in this Licence is intended to deprive the Licensee of the benefits from +any exception or limitation to the exclusive rights of the rights owners in the +Work, of the exhaustion of those rights or of other applicable limitations +thereto. + +5. Obligations of the Licensee + +The grant of the rights mentioned above is subject to some restrictions and +obligations imposed on the Licensee. Those obligations are the following: + +Attribution right: The Licensee shall keep intact all copyright, patent or +trademarks notices and all notices that refer to the Licence and to the +disclaimer of warranties. The Licensee must include a copy of such notices and a +copy of the Licence with every copy of the Work he/she distributes or +communicates. The Licensee must cause any Derivative Work to carry prominent +notices stating that the Work has been modified and the date of modification. + +Copyleft clause: If the Licensee distributes or communicates copies of the +Original Works or Derivative Works, this Distribution or Communication will be +done under the terms of this Licence or of a later version of this Licence +unless the Original Work is expressly distributed only under this version of the +Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee +(becoming Licensor) cannot offer or impose any additional terms or conditions on +the Work or Derivative Work that alter or restrict the terms of the Licence. + +Compatibility clause: If the Licensee Distributes or Communicates Derivative +Works or copies thereof based upon both the Work and another work licensed under +a Compatible Licence, this Distribution or Communication can be done under the +terms of this Compatible Licence. For the sake of this clause, ‘Compatible +Licence’ refers to the licences listed in the appendix attached to this Licence. +Should the Licensee's obligations under the Compatible Licence conflict with +his/her obligations under this Licence, the obligations of the Compatible +Licence shall prevail. + +Provision of Source Code: When distributing or communicating copies of the Work, +the Licensee will provide a machine-readable copy of the Source Code or indicate +a repository where this Source will be easily and freely available for as long +as the Licensee continues to distribute or communicate the Work. + +Legal Protection: This Licence does not grant permission to use the trade names, +trademarks, service marks, or names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the copyright notice. + +6. Chain of Authorship + +The original Licensor warrants that the copyright in the Original Work granted +hereunder is owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each Contributor warrants that the copyright in the modifications he/she brings +to the Work are owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each time You accept the Licence, the original Licensor and subsequent +Contributors grant You a licence to their contributions to the Work, under the +terms of this Licence. + +7. Disclaimer of Warranty + +The Work is a work in progress, which is continuously improved by numerous +Contributors. It is not a finished work and may therefore contain defects or +‘bugs’ inherent to this type of development. + +For the above reason, the Work is provided under the Licence on an ‘as is’ basis +and without warranties of any kind concerning the Work, including without +limitation merchantability, fitness for a particular purpose, absence of defects +or errors, accuracy, non-infringement of intellectual property rights other than +copyright as stated in Article 6 of this Licence. + +This disclaimer of warranty is an essential part of the Licence and a condition +for the grant of any rights to the Work. + +8. Disclaimer of Liability + +Except in the cases of wilful misconduct or damages directly caused to natural +persons, the Licensor will in no event be liable for any direct or indirect, +material or moral, damages of any kind, arising out of the Licence or of the use +of the Work, including without limitation, damages for loss of goodwill, work +stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such damage. +However, the Licensor will be liable under statutory product liability laws as +far such laws apply to the Work. + +9. Additional agreements + +While distributing the Work, You may choose to conclude an additional agreement, +defining obligations or services consistent with this Licence. However, if +accepting obligations, You may act only on your own behalf and on your sole +responsibility, not on behalf of the original Licensor or any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor harmless +for any liability incurred by, or claims asserted against such Contributor by +the fact You have accepted any warranty or additional liability. + +10. Acceptance of the Licence + +The provisions of this Licence can be accepted by clicking on an icon ‘I agree’ +placed under the bottom of a window displaying the text of this Licence or by +affirming consent in any other similar way, in accordance with the rules of +applicable law. Clicking on that icon indicates your clear and irrevocable +acceptance of this Licence and all of its terms and conditions. + +Similarly, you irrevocably accept this Licence and all of its terms and +conditions by exercising any rights granted to You by Article 2 of this Licence, +such as the use of the Work, the creation by You of a Derivative Work or the +Distribution or Communication by You of the Work or copies thereof. + +11. Information to the public + +In case of any Distribution or Communication of the Work by means of electronic +communication by You (for example, by offering to download the Work from a +remote location) the distribution channel or media (for example, a website) must +at least provide to the public the information requested by the applicable law +regarding the Licensor, the Licence and the way it may be accessible, concluded, +stored and reproduced by the Licensee. + +12. Termination of the Licence + +The Licence and the rights granted hereunder will terminate automatically upon +any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has +received the Work from the Licensee under the Licence, provided such persons +remain in full compliance with the Licence. + +13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete +agreement between the Parties as to the Work. + +If any provision of the Licence is invalid or unenforceable under applicable +law, this will not affect the validity or enforceability of the Licence as a +whole. Such provision will be construed or reformed so as necessary to make it +valid and enforceable. + +The European Commission may publish other linguistic versions or new versions of +this Licence or updated versions of the Appendix, so far this is required and +reasonable, without reducing the scope of the rights granted by the Licence. New +versions of the Licence will be published with a unique version number. + +All linguistic versions of this Licence, approved by the European Commission, +have identical value. Parties can take advantage of the linguistic version of +their choice. + +14. Jurisdiction + +Without prejudice to specific agreement between parties, + +- any litigation resulting from the interpretation of this License, arising + between the European Union institutions, bodies, offices or agencies, as a + Licensor, and any Licensee, will be subject to the jurisdiction of the Court + of Justice of the European Union, as laid down in article 272 of the Treaty on + the Functioning of the European Union, + +- any litigation arising between other parties and resulting from the + interpretation of this License, will be subject to the exclusive jurisdiction + of the competent court where the Licensor resides or conducts its primary + business. + +15. Applicable Law + +Without prejudice to specific agreement between parties, + +- this Licence shall be governed by the law of the European Union Member State + where the Licensor has his seat, resides or has his registered office, + +- this licence shall be governed by Belgian law if the Licensor has no seat, + residence or registered office inside a European Union Member State. + +Appendix + +‘Compatible Licences’ according to Article 5 EUPL are: + +- GNU General Public License (GPL) v. 2, v. 3 +- GNU Affero General Public License (AGPL) v. 3 +- Open Software License (OSL) v. 2.1, v. 3.0 +- Eclipse Public License (EPL) v. 1.0 +- CeCILL v. 2.0, v. 2.1 +- Mozilla Public Licence (MPL) v. 2 +- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 +- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for + works other than software +- European Union Public Licence (EUPL) v. 1.1, v. 1.2 +- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong + Reciprocity (LiLiQ-R+). + +The European Commission may update this Appendix to later versions of the above +licences without producing a new version of the EUPL, as long as they provide +the rights granted in Article 2 of this Licence and protect the covered Source +Code from exclusive appropriation. + +All other changes or additions to this Appendix require the production of a new +EUPL version. diff --git a/graphics/metapost/contrib/macros/hershey-mp/README b/graphics/metapost/contrib/macros/hershey-mp/README new file mode 100644 index 0000000000..4c5c6ad8dc --- /dev/null +++ b/graphics/metapost/contrib/macros/hershey-mp/README @@ -0,0 +1,18 @@ +SUMMARY + +This metapost file adds support for reading jhl vector font files, used by +(mostly? only?) the so-called Hershey Fonts of the late 1960s. + +It does not include the actual font files, which you can probably find in the +software repository included with your operating system. + + +COPYING + +(c) 2022 Esger Renkema + +These files may be distributed under the terms of the European Union Public +Licence (EUPL) version 1.2 or later. A copy can be obtained at: + +https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + diff --git a/graphics/metapost/contrib/macros/hershey-mp/hershey.mp b/graphics/metapost/contrib/macros/hershey-mp/hershey.mp new file mode 100644 index 0000000000..80b7a0d105 --- /dev/null +++ b/graphics/metapost/contrib/macros/hershey-mp/hershey.mp @@ -0,0 +1,84 @@ + +if known loadHershey: expandafter endinput fi + +% this default is for Debian with ‘hershey-fonts-data’ installed. +newinternal string hersheyFonts; +hersheyFonts := "/usr/share/hershey-fonts/"; + +vardef loadHershey @# = + if known hershey.loaded.@# : + message("Hershey font "&str(@#)&" already known: skipping rereading."); + else: + hershey.loaded.font := 1; + doLoadHershey.@# ; + fi +enddef; +vardef doLoadHershey suffix font = + % create the variable hershey.<fontname> + save var; string var; var := "hershey." & str font & "."; + scantokens ("path "&var)[][]; + % variables used for reading the file + save file, line; + string file, line; + file := hersheyFonts & str font & ".jhf"; + save pnum, lnum, wd, i, x, y, first; + boolean first; lnum := 0; + % read the font line by line + forever : + line := readfrom file; + exitif line = EOF; + lnum := lnum + 1; pnum := 1; first := true; + % the line starts with a width, followed by min/max x coordinates, + % followed by the data describing the glyph, in pairs of coordinates, + % every coördinate encoded as a single character. + wd := scantokens (substring(5,8) of line) - 1; + if wd > 0 : + line := substring (8, infinity) of line; + x := ASCII(line) - 82; line := substring(1, infinity) of line; + y := ASCII(line) - 82; line := substring(1, infinity) of line; + scantokens(var)[lnum].lft := x; + scantokens(var)[lnum].rt := y; + %message char(lnum+31) & " (" & decimal(lnum) & "): (" & decimal x & ", " & decimal y & ")"; + scantokens(var)[lnum][pnum] := fi + for i = 1 upto wd : + hide( % 82 is ASCII("R") + x := ASCII(line) - 82; line := substring(1, infinity) of line; + y := 82 - ASCII(line); line := substring(1, infinity) of line;) + if (x,y) = (-50,0) : + % the special string " R" separates paths + ; pnum := pnum+1; first := true; + scantokens(var)[lnum][pnum] := + else : + if first : hide(first := false) + else : -- fi (x,y) + fi + endfor; + endfor + closefrom file; +enddef; + +vardef drawHershey @# (expr s) text t = + if numeric s: drawHersheyChar @# (s) t; + else : drawHersheyString @# (s) t; fi +enddef; +vardef drawHersheyChar @# (expr c) text t = + save i; i := 1; forever : + exitif unknown hershey.@#[c][i]; + draw hershey.@#[c][i] t; + i := i + 1; + endfor +enddef; +vardef drawHersheyString @# (expr s) text t = + save c, ss, sh; string ss; ss := s; sh := 0; + forever : + c := ASCII(ss) - 31; + sh := sh + hershey.@#[c].rt; + % NB. -9 is the baseline of the hershey fonts; + % we put the baseline on x=0 instead. + drawHersheyChar @# (c) shifted (sh, 9) t; + sh := sh - hershey.@#[c].lft; + ss := substring(1, infinity) of ss; + exitif length(ss) = 0; + endfor +enddef; + diff --git a/graphics/metapost/contrib/macros/hershey-mp/hershey.pdf b/graphics/metapost/contrib/macros/hershey-mp/hershey.pdf Binary files differnew file mode 100644 index 0000000000..d6a47d817f --- /dev/null +++ b/graphics/metapost/contrib/macros/hershey-mp/hershey.pdf diff --git a/graphics/metapost/contrib/macros/hershey-mp/hershey.tex b/graphics/metapost/contrib/macros/hershey-mp/hershey.tex new file mode 100644 index 0000000000..70138b7b4a --- /dev/null +++ b/graphics/metapost/contrib/macros/hershey-mp/hershey.tex @@ -0,0 +1,156 @@ + +\input minim-doc.sty +\closeout0 + +\newmetapostinstance\hershey +\runmetapost\hershey{ + input "hershey"; + loadHershey timesib; +} + +\def\chapter#1\hfill#2\par{% + \startelement{Chapter}% + \outline open {#1}% + \nextpartag{H}\quitvmode + \startelement{Span}% + \red{\runmetapostimage\hershey{ + baseline origin; + pickup pencircle scaled .4pt; + drawHershey timesib ("hershey.mp") withcolor .75red; + }\setactualtext{hershey.mp}% + \stopelement{Span}% + \hfill#2\bigskip\nobreak}} + +\def\mailname{hershey} +\startmetadata + author {Esger Renkema} + title {hershey.mp} + date {2022-08-24} + version {2022/1.0} + keywords {MetaPost; Hershey fonts} +stopmetadata + +\maketitle + +This package can read the ⟦jhl⟧ format, used for the well known Hershey Fonts. +Use it like so: + +⟦% Where to look for font files (this is also the default) +hersheyFonts := "/usr/share/hershey-fonts/"; +% Load the font you want to use +loadHershey timesib; +% Draw a character +beginfig(1) + drawHershey timesib(7) rotated 180 withcolor .75red; +endfig; +% Or typeset a string +beginfig(2) + drawHershey timesib("Hello!") withcolor .75red; +endfig;⟧ + +This results in the following pictures: + +\bigskip\strut\hfill +\startelement{Figure} +\setalttext{An upside-down ampersand.} +\runmetapostimage \hershey { +baseline origin; +drawHershey timesib(7) rotated 180 withcolor .75red;} +\stopelement{Figure} +\hfill and\hfill +\startelement{Figure} +\setalttext{The text ‘Hello!’.} +\runmetapostimage \hershey { +baseline origin; +drawHershey timesib("Hello!") withcolor .75red;} +\stopelement{Figure} +\hfill\strut\bigskip + +Typesetting a string will only make sense for the latin fonts, where Hershey’s +encoding is in ASCII order. For strings, the baseline is adjusted upward by 9~units. + +Typical x-height is 14 units (of which 9 are below $y=0$), with an em-space of 21 units. + +The paths that make up each character are available to you in the array +⟦hershey.<fontname>[<charid>][]⟧. You will rarely need this, however, since the trailing tokens to ⟦drawHershey⟧ will be applied to all paths. + +Proof sheets of Hershey’s original fonts are included in the following pages. + +\licencesection \stopelement{Section} + +\font\fiverm {Latin Modern Roman:script=latn;protrusion=default;} at 5pt +\runmetapost \hershey { +vardef testfont suffix name = + save c; c := 1; + for i = 1 upto 7: draw (45i+22.5,-22.5) -- (45i+22.5,-45*12-22.5); endfor + for j = 1 upto 11: draw (22.5, -45j-22.5) -- (45*8+22.5, -45j-22.5); endfor + for i = 1 upto 8: + for j = 1 upto 12: + drawHershey.name(c) shifted 45(i,-j); + draw maketext("{\fiverm "&decimal c&"}") shifted (45(i,-j) + (13,16)); + c := c + 1; + endfor + endfor + setbounds currentpicture to + unitsquare xscaled 8 yscaled -12 scaled 45 shifted (22.5, -22.5); +enddef; } + +\def\testfont#1 #2 {\vfil\break +\chapter{#1}{#2}% +\startelement{Figure} +\setalttext{A listing of the ‘#2’ font.} +\stoptagging +\runmetapostimage \hershey { testfont #2; } +\starttagging +\stopelement{Figure}} + +\def\chapter#1#2{% + \ensurestopelement{Section}% + \startelement{Chapter}% + \outline open {#2}% + \nextpartag{H}\quitvmode + \vrule depth 20pt height 35pt width 0pt\relax + \startelement{Span}% + \red{\runmetapostimage\hershey{ + loadHershey #2; + baseline origin; + pickup pencircle scaled .4pt; + drawHershey #1 ("#2") withcolor .75red; + }}\setactualtext{#2}\bigskip + \stopelement{Span}\nobreak} + +\testfont timesr timesr +\testfont timesi timesi +\testfont timesrb timesrb +\testfont timesib timesib +\testfont timesr timesg +\testfont timesr cyrillic + +\testfont gothiceng gothiceng +\testfont gothicger gothicger +\testfont gothicita gothicita + +\testfont rowmans rowmans +\testfont rowmand rowmand +\testfont rowmant rowmant + +\testfont futural futural +\testfont futuram futuram + +\testfont timesr greeks +\testfont timesr greekc + +\testfont scripts scripts +\testfont scriptc scriptc + +\testfont timesr mathlow +\testfont timesr mathupp + +\testfont astrology astrology +\testfont meteorology meteorology +\testfont timesr symbolic +\testfont timesr markers +\testfont music music + +\vfil\break\end + diff --git a/graphics/pgf/contrib/tikz-ext/README.md b/graphics/pgf/contrib/tikz-ext/README.md index 76ea094357..33ec46d366 100644 --- a/graphics/pgf/contrib/tikz-ext/README.md +++ b/graphics/pgf/contrib/tikz-ext/README.md @@ -31,7 +31,6 @@ These are * `ext.shapes.heatmark` * `ext.shapes.rectangleroundedcorners` * `ext.shapes.superellipse` - * `ext.shapes.uncenteredrectangle` These were developed in response to questions on tex.stackexchange.com. Some of these can be find by searching for my [user id](https://tex.stackexchange.com/search?q=user%3A16595+%22my+library%22).
\ No newline at end of file diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-scalepicture.tex b/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-scalepicture.tex new file mode 100644 index 0000000000..b14c4c4f0f --- /dev/null +++ b/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-scalepicture.tex @@ -0,0 +1,113 @@ +% !TeX spellcheck = en_US +% !TeX root = tikz-ext-manual.tex +% Copyright 2022 by Qrrbrbirlbel +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Free Documentation License. +% +\clearpage +\section{Scaling Pictures to a Specific Size} +\label{library:scalepicture} + +\begin{tikzlibrary}{ext.scalepicture} + This library scales \tikzname\ pictures to a specific width or height + by scaling the whole picture. +\end{tikzlibrary} + +\begin{multicols}{2} +If one of the keys below are used on a \tikzname\ picture, i.\,e. +as an option to |\tikzpicture| or \texttt{\textbackslash begin\{tikzpicture\}} +the size of the picture\footnote{This is the size of the pseudo-node \texttt{current bounding box}.} +will be measured and written to the \filetype{aux} file +so that it will be available at the next compilation run +and an appropriate scaling for the picture can be installed. + +\begin{command}{\tikzextpicturewidth} + Returns the last measured width of the picture. + + This will expand to |0pt| if the picture hasn't been measured before. +\end{command} +\begin{command}{\tikzextpictureheight} + Returns the last measured height of the picture. + + This will expand to |0pt| if the picture hasn't been measured before. +\end{command} + +\begin{stylekey}{/tikz/save picture size} + This key is usually used by the keys provided by this library. + Normally, this is not needed to be explicitly given. +\end{stylekey} +\subsection{Keeping the aspect ratio} +The following \emph{unstarred} keys do not change the aspect ratio of the picture. + +\begin{key}{/tikz/picture width=\meta{dimension}} + Scales the picture so that the width of the picture will be \meta{dimension}. + This will keep the aspect ratio the same. +\end{key} + +\begin{key}{/tikz/minimum picture width=\meta{dimension}} + As above but will not change the size of the picture + if its width is greater than \meta{dimension}. +\end{key} + +\begin{key}{/tikz/maximum picture width=\meta{dimension}} + As above but will not change the size of the picture + if its width is less than \meta{dimension}. +\end{key} + +\begin{key}{/tikz/picture height=\meta{dimension}} + Scales the picture so that the height of the picture will be \meta{dimension}. + This will keep the aspect ratio the same. +\end{key} + +\begin{key}{/tikz/minimum picture height=\meta{dimension}} + As above but will not change the size of the picture + if its height is greater than \meta{dimension}. +\end{key} + +\begin{key}{/tikz/maximum picture height=\meta{dimension}} + As above but will not change the size of the picture + if its height is less than \meta{dimension}. +\end{key} + +\begin{key}{/tikz/minimum picture size=\marg{width}\marg{height}} + Scales the picture so that its height will be at least \meta{width} + and its height will be at least \meta{height}. +\end{key} + +\begin{key}{/tikz/maximum picture size=\marg{width}\marg{height}} + Scales the picture so that its height will be at most \meta{width} + and its height will be at most \meta{height}. +\end{key} + +\subsection{Changing the aspect ratio.} +The following \emph{starred} keys do change the aspect ratio. +\begin{key}{/tikz/picture width*=\meta{dimension}} + Scales the picture so that the width of the picture will be \meta{dimension}. + This will only scale the $x$ axis. +\end{key} + +\begin{key}{/tikz/minimum picture width*=\meta{dimension}} + As above but will not change the size of the picture + if its width is greater than \meta{dimension}. +\end{key} + +\begin{key}{/tikz/maximum picture width*=\meta{dimension}} + As above but will not change the size of the picture + if its width is less than \meta{dimension}. +\end{key} + +\begin{key}{/tikz/picture height*=\meta{dimension}} + Scales the picture so that the height of the picture will be \meta{dimension}. + This will only scale the $y$ axis. +\end{key} + +\begin{key}{/tikz/picture size*=\marg{width}\marg{height}} + Scales the picture so that its width will be \meta{width} + and its height will be \meta{height}. + + This will scale both axes but independent from each other. +\end{key} +\end{multicols}
\ No newline at end of file diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-body.tex b/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-body.tex index 41e56c390e..bf6620a2be 100644 --- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-body.tex +++ b/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-body.tex @@ -8,7 +8,7 @@ % 2. under the GNU Free Documentation License. % \newcommand*\tikzextname{Ti\textit kZ-Extensions} -\newcommand*\tikzextversion{0.4.1} +\newcommand*\tikzextversion{0.4.2} \begin{document} {\colorlet{blue}{black}% links shall be black \title{\bfseries The \tikzextname\space Package\\ @@ -71,6 +71,8 @@ These libraries only work with \tikzname. \tikzsetfigurename{patterns.images} \include{tikz-ext-manual-en-library-patterns.images} \tikzsetfigurename{positioning-plus} \include{tikz-ext-manual-en-library-positioning-plus} +\tikzsetfigurename{scalepicture} +\include{tikz-ext-manual-en-library-scalepicture} \tikzsetfigurename{topaths.arcthrough} \include{tikz-ext-manual-en-library-topaths.arcthrough} \tikzsetfigurename{trans} @@ -170,6 +172,11 @@ These libraries (should) work with both \pgfname\space and \tikzname. \section*{Changelog}\addcontentsline{toc}{section}{Changelog} \begin{multicols}{2}\raggedright \noindent +Version 0.4.2 +\begin{itemize} +\item \addTikz{scalepicture} +\item Bugfixes to |shapes.uncenteredrectangle|, |paths.ortho|, |positioning-plus| and |pgfcalender-ext|. +\end{itemize} Version 0.4.1 \begin{itemize} \item Cleaned up directory structure of documentary. diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-preamble.tex b/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-preamble.tex index 2ba6defa10..682b83b435 100644 --- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-preamble.tex +++ b/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-preamble.tex @@ -115,6 +115,7 @@ ext.paths.timer, ext.patterns.images, ext.positioning-plus, + ext.scalepicture, ext.shapes.heatmark, ext.shapes.circlearrow, ext.shapes.circlecrosssplit, diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.pdf b/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.pdf Binary files differindex 51ba04c7d1..855ee19374 100644 --- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.pdf +++ b/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.pdf diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.tex b/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.tex index 253944ca7d..3070585487 100644 --- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.tex +++ b/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.tex @@ -19,8 +19,8 @@ %mode=list and make, %mode=list only,export=true,% simply skips EVERY picture -> good for debugging the text. ] - \tikzexternalenable -% \tikzexternaldisable +% \tikzexternalenable + \tikzexternaldisable \tikzifexternalizing{ \pgfkeys{/pdflinks/codeexample links=false} }{} diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfcalendar-ext.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/pgfcalendar-ext.code.tex index fae3508e15..fae3508e15 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfcalendar-ext.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/pgfcalendar-ext.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfkeyslibraryext.pgfkeys-plus.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/pgfkeyslibraryext.pgfkeys-plus.code.tex index 49aedb64c6..49aedb64c6 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfkeyslibraryext.pgfkeys-plus.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/pgfkeyslibraryext.pgfkeys-plus.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.pgfkeys-plus.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.pgfkeys-plus.code.tex index 6101ca8cad..6101ca8cad 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.pgfkeys-plus.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.pgfkeys-plus.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.circlearrow.code.tex index 9eb1c6ab09..9eb1c6ab09 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.circlearrow.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.circlecrosssplit.code.tex index 7bc2761fb4..7bc2761fb4 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.circlecrosssplit.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.heatmark.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.heatmark.code.tex index 477d0442da..477d0442da 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.heatmark.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.heatmark.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.rectangleroundedcorners.code.tex index 37baf7abbf..37baf7abbf 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.rectangleroundedcorners.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.superellipse.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.superellipse.code.tex index 9a89b5a8a6..9a89b5a8a6 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.superellipse.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.superellipse.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.uncenteredrectangle.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.uncenteredrectangle.code.tex index 630a22da14..182ebbbcb7 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.uncenteredrectangle.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.shapes.uncenteredrectangle.code.tex @@ -6,8 +6,8 @@ % 2. under the GNU Free Documentation License. % \pgfutil@IfUndefined{pgfnodepartthreebox}{% - \newbox\pgfnodepartleftbox - \newbox\pgfnodepartrightbox + \csname newbox\endcsname\pgfnodepartleftbox + \csname newbox\endcsname\pgfnodepartrightbox }{% \let\pgfnodepartleftbox\pgfnodeparttwobox \let\pgfnodepartrightbox\pgfnodepartthreebox diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.transformations.mirror.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.transformations.mirror.code.tex index 4d962ccb1c..4d962ccb1c 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.transformations.mirror.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/pgflibraryext.transformations.mirror.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.calendar-plus.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.calendar-plus.code.tex index 195ecf9414..195ecf9414 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.calendar-plus.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.calendar-plus.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.misc.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.misc.code.tex index a5a982020f..a5a982020f 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.misc.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.misc.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.node-families.code.tex index c0ecda441a..c0ecda441a 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.node-families.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.node-families.shapes.geometric.code.tex index 58384960a8..58384960a8 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.node-families.shapes.geometric.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.arcto.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.paths.arcto.code.tex index e97bbf939d..e97bbf939d 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.arcto.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.paths.arcto.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.ortho.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.paths.ortho.code.tex index 9740c39cc2..216d3e74e3 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.ortho.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.paths.ortho.code.tex @@ -42,8 +42,9 @@ %% TikZ interjects are done, the rest is independent: -\newlength\tikzext@tikz@udlr@distance -\newlength\tikzext@tikz@hvvh@distance + +\newdimen\tikzext@tikz@udlr@distance +\newdimen\tikzext@tikz@hvvh@distance \newif\iftikzext@tikz@hvvh@middle % checks whether spacing = 0 was selected \newif\iftikzext@tikz@hvvh@fromcenter \newif\iftikzext@ortho@preflush diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.timer.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.paths.timer.code.tex index 3a4d30e68f..3a4d30e68f 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.timer.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.paths.timer.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.patterns.images.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.patterns.images.code.tex index aa732ab835..aa732ab835 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.patterns.images.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.patterns.images.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.positioning-plus.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.positioning-plus.code.tex index 98de181c27..e430f42a7e 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.positioning-plus.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.positioning-plus.code.tex @@ -67,7 +67,7 @@ \tikzset{east below/.code=\tikz@lib@place@handle@{#1}{north east}{0}{-1}{south east}{1}} \newif\iftikzext@tikz@lib@place@postransform -\tikzset{node distance transformation/.is if=qrr@tikz@lib@place@postransform} +\tikzset{node distance transformation/.is if=tikzext@tikz@lib@place@postransform} \def\tikz@lib@place@handle@@#1#2#3#4{% \pgfutil@in@{of }{#1}% \ifpgfutil@in@ diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.scalepicture.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.scalepicture.code.tex new file mode 100644 index 0000000000..5ae055bb5d --- /dev/null +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.scalepicture.code.tex @@ -0,0 +1,194 @@ +% Copyright 2022 by Qrrbrbirlbel +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Free Documentation License. +% +\def\tikzext@scalepicture@savepicturesize{% + \pgf@process{% + \pgfpointdiff + {\pgfpointanchor{current bounding box}{south west}} + {\pgfpointanchor{current bounding box}{north east}}}% + \immediate\write\pgfutil@auxout{% + \noexpand\expandafter\gdef + \noexpand\csname tikzext@scalepicture@\pgfpictureid\endcsname{{\the\pgf@x}{\the\pgf@y}}% + }% + \let\tikzext@scalepicture@savepicturesize\relax +} + +\def\tikzext@scalepicture@width{% + \expandafter\expandafter\expandafter\pgfutil@firstoftwo + \csname tikzext@scalepicture@\pgfpictureid\endcsname +} +\def\tikzext@scalepicture@height{% + \expandafter\expandafter\expandafter\pgfutil@secondoftwo + \csname tikzext@scalepicture@\pgfpictureid\endcsname +} + +\def\tikzextpicturewidth{% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{0pt}{\tikzext@scalepicture@width}} +\def\tikzextpictureheight{% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{0pt}{\tikzext@scalepicture@height}} +\tikzset{ + save picture size/.style={execute at end picture=\tikzext@scalepicture@savepicturesize}, + save picture size/.value forbidden, + %%% keep aspect ratio + %% width and height + minimum picture size/.code 2 args={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \pgfmathsetlength\pgf@xa{#1}% + \pgfmathsetlength\pgf@ya{#2}% + \def\tikz@tempa{0}% + \def\tikz@temp{0}% + \ifdim\tikzext@scalepicture@width<\pgf@xa + \pgfmathsetmacro\tikz@tempa{\pgf@xa/\tikzext@scalepicture@width}% + \fi + \ifdim\tikzext@scalepicture@height<\pgf@ya + \pgfmathsetmacro\tikz@temp{\pgf@ya/\tikzext@scalepicture@height}% + \fi + \ifdim\tikz@tempa pt>\tikz@temp pt + \let\tikz@temp\tikz@tempa + \fi + \ifdim\tikz@temp pt>0pt + \tikzset{scale/.expand once=\tikz@temp}% + \fi + }% + }, + maximum picture size/.code 2 args={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \pgfmathsetlength\pgf@xa{#1}% + \pgfmathsetlength\pgf@ya{#2}% + \def\tikz@tempa{0}% + \def\tikz@temp{0}% + \ifdim\tikzext@scalepicture@width>\pgf@xa + \pgfmathsetmacro\tikz@tempa{\pgf@xa/\tikzext@scalepicture@width}% + \fi + \ifdim\tikzext@scalepicture@height>\pgf@ya + \pgfmathsetmacro\tikz@temp{\pgf@ya/\tikzext@scalepicture@height}% + \fi + \ifdim\tikz@tempa pt<\tikz@temp pt + \let\tikz@temp\tikz@tempa + \fi + \ifdim\tikz@temp pt>0pt + \tikzset{scale/.expand once=\tikz@temp}% + \fi + }% + }, + %%% keep aspect ratio + %% width + picture width/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \tikzset{scale={(#1)/\tikzext@scalepicture@width}}% + }% + }, + minimum picture width/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \pgfmathsetlength\pgf@xa{#1}% + \ifdim\tikzext@scalepicture@width<\pgf@xa + \tikzset{scale={\pgf@xa/\tikzext@scalepicture@width}} + \fi + }% + }, + maximum picture width/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \pgfmathsetlength\pgf@xa{#1}% + \ifdim\tikzext@scalepicture@width>\pgf@xa + \tikzset{scale={\pgf@xa/\tikzext@scalepicture@width}} + \fi + }% + }, + %%% xscale only + %% width + picture width*/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \tikzset{xscale={(#1)/\tikzext@scalepicture@width}}% + }% + }, + minimum picture width*/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \pgfmathsetlength\pgf@xa{#1}% + \ifdim\tikzext@scalepicture@width<\pgf@xa + \tikzset{xscale={\pgf@xa/\tikzext@scalepicture@width}} + \fi + }% + }, + maximum picture width*/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \pgfmathsetlength\pgf@xa{#1}% + \ifdim\tikzext@scalepicture@width>\pgf@xa + \tikzset{xscale={\pgf@xa/\tikzext@scalepicture@width}} + \fi + }% + }, + %%% keep aspect ratio + %% height + picture height/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \tikzset{yscale={(#1)/\tikzext@scalepicture@height}}% + }% + }, + minimum picture height/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \pgfmathsetlength\pgf@ya{#1}% + \ifdim\tikzext@scalepicture@height<\pgf@ya + \tikzset{scale={\pgf@ya/\tikzext@scalepicture@height}} + \fi + }% + }, + maximum picture height/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \pgfmathsetlength\pgf@ya{#1}% + \ifdim\tikzext@scalepicture@height<\pgf@ya + \tikzset{scale={\pgf@ya/\tikzext@scalepicture@height}} + \fi + }% + }, + %%% yscale only + %% height + picture height*/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \tikzset{yscale={(#1)/\tikzext@scalepicture@height}}% + }% + }, + minimum picture height*/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \pgfmathsetlength\pgf@ya{#1}% + \ifdim\tikzext@scalepicture@height<\pgf@ya + \tikzset{yscale={\pgf@ya/\tikzext@scalepicture@height}} + \fi + }% + }, + maximum picture height*/.code={% + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \pgfmathsetlength\pgf@ya{#1}% + \ifdim\tikzext@scalepicture@height<\pgf@ya + \tikzset{yscale={\pgf@ya/\tikzext@scalepicture@height}} + \fi + }% + }, + %%% xscale or yscale + picture size*/.code 2 args={% #1 = width, #2 = height + \tikzset{save picture size}% + \pgfutil@IfUndefined{tikzext@scalepicture@\pgfpictureid}{}{% + \tikzset{ + xscale={(#1)/\tikzext@scalepicture@width}, + yscale={(#2)/\tikzext@scalepicture@height}}% + }% + }, +} +\endinput
\ No newline at end of file diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.topaths.arcthrough.code.tex index d90a2edc78..d90a2edc78 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.topaths.arcthrough.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.transformations.mirror.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.transformations.mirror.code.tex index 026b39ab2f..026b39ab2f 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.transformations.mirror.code.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikzlibraryext.transformations.mirror.code.tex diff --git a/graphics/pgf/contrib/tikz-ext/tex/latex/tikz-ext/pgfcalendar-ext.sty b/graphics/pgf/contrib/tikz-ext/tex/latex/pgfcalendar-ext.sty index a0f5ef3bc0..a0f5ef3bc0 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/latex/tikz-ext/pgfcalendar-ext.sty +++ b/graphics/pgf/contrib/tikz-ext/tex/latex/pgfcalendar-ext.sty diff --git a/graphics/pgf/contrib/tikz-ext/tex/plain/tikz-ext/pgfcalendar-ext.tex b/graphics/pgf/contrib/tikz-ext/tex/plain/pgfcalendar-ext.tex index 30c44187a4..11507d5a7a 100644 --- a/graphics/pgf/contrib/tikz-ext/tex/plain/tikz-ext/pgfcalendar-ext.tex +++ b/graphics/pgf/contrib/tikz-ext/tex/plain/pgfcalendar-ext.tex @@ -6,7 +6,7 @@ % 2. under the GNU Free Documentation License. % -\input pgfcalendar.text +\input pgfcalendar.tex \catcode`\@=11 \input pgfcalendar-ext.code.tex \catcode`\@=\pgfcalendaratcode |