summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/asymptote/ChangeLog262
-rw-r--r--graphics/asymptote/ReleaseNotes10
-rw-r--r--graphics/asymptote/asy-keywords.el2
-rw-r--r--graphics/asymptote/asymptote.spec2
-rw-r--r--graphics/asymptote/base/asy.vim372
-rw-r--r--graphics/asymptote/base/geometry.asy2
-rw-r--r--graphics/asymptote/base/patterns.asy4
-rw-r--r--graphics/asymptote/base/three.asy5
-rw-r--r--graphics/asymptote/base/three_surface.asy37
-rw-r--r--graphics/asymptote/base/v3d.asy19
-rw-r--r--graphics/asymptote/base/v3dheadertypes.asy2
-rw-r--r--graphics/asymptote/base/v3dtypes.asy2
-rwxr-xr-xgraphics/asymptote/configure22
-rw-r--r--graphics/asymptote/configure.ac4
-rw-r--r--graphics/asymptote/doc/CAD.pdfbin198829 -> 198829 bytes
-rw-r--r--graphics/asymptote/doc/FAQ/asy-faq.info2
-rw-r--r--graphics/asymptote/doc/TeXShopAndAsymptote.pdfbin81043 -> 81091 bytes
-rw-r--r--graphics/asymptote/doc/asy-latex.pdfbin207102 -> 207102 bytes
-rw-r--r--graphics/asymptote/doc/asy.16
-rw-r--r--graphics/asymptote/doc/asyRefCard.pdfbin121145 -> 121145 bytes
-rw-r--r--graphics/asymptote/doc/asymptote.pdfbin1313429 -> 1313638 bytes
-rw-r--r--graphics/asymptote/doc/asymptote.texi8
-rw-r--r--graphics/asymptote/doc/png/asymptote.info344
-rw-r--r--graphics/asymptote/drawgroup.h10
-rw-r--r--graphics/asymptote/drawpath3.h4
-rw-r--r--graphics/asymptote/drawsurface.h8
-rw-r--r--graphics/asymptote/main.cc7
-rw-r--r--graphics/asymptote/pair.h3
-rw-r--r--graphics/asymptote/pen.h2
-rw-r--r--graphics/asymptote/picture.cc9
-rw-r--r--graphics/asymptote/prc/oPRCFile.h4
-rw-r--r--graphics/asymptote/psfile.cc4
-rw-r--r--graphics/asymptote/psfile.h5
-rw-r--r--graphics/asymptote/revision.cc2
-rw-r--r--graphics/asymptote/settings.cc16
-rw-r--r--graphics/asymptote/triple.h3
-rw-r--r--graphics/asymptote/v3dfile.cc12
-rw-r--r--graphics/asymptote/v3dheadertypes.h2
-rw-r--r--graphics/asymptote/v3dheadertypes.py2
-rw-r--r--graphics/asymptote/v3dtypes.h2
-rw-r--r--graphics/asymptote/v3dtypes.py2
41 files changed, 754 insertions, 448 deletions
diff --git a/graphics/asymptote/ChangeLog b/graphics/asymptote/ChangeLog
index 6b7b93752d..90734a81e6 100644
--- a/graphics/asymptote/ChangeLog
+++ b/graphics/asymptote/ChangeLog
@@ -1,3 +1,224 @@
+commit 587b26dca79cad5a31100a30bee9cc4a9dcd93e8
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Jan 6 14:15:06 2022 -0700
+
+ Use png16m driver by default (override with -pngdriver) and force pdflatex
+ mode to work around issues with pngalpha driver.
+
+commit eab735a13a12be5e9b1af44c1764b8e6d8721795
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Jan 6 13:12:58 2022 -0700
+
+ Implement better fix to bug #241.
+ This reverts commit f10c7fd9f54e5e84a7b5287579dbb29ce45aabd3.
+
+commit 2defc18699b61f9247d3042f6a504e0ae6871596
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Jan 6 12:55:08 2022 -0700
+
+ Revert "Fix commit 1ce26e54a3fb7e35389b3e9ecf7399cd1c535b66."
+
+ This reverts commit 166efc83f399a795d2fa221477034e63e8ebb235.
+
+commit af52c7800ecef8fda895f604fd9c42d9fbb3ae18
+Merge: d7f097c1 123a7300
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Jan 6 11:08:00 2022 -0700
+
+ Merge pull request #293 from tifv/patch-1
+
+ Fix documentation typo in geometry.asy
+
+commit 123a7300e7c8c36c7e0718f4c8ef50b404e8e2bb
+Author: July Tikhonov <july.tikh@gmail.com>
+Date: Thu Jan 6 20:13:48 2022 +0300
+
+ Fix documentation typo in geometry.asy
+
+commit d7f097c15e6431bd42dc9670215e6916be31f8f1
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 5 23:50:34 2022 -0700
+
+ Disable primitives for colored surfaces.
+
+commit 74a26c9d627a1b9632fb033e086ed5e76e88b79e
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 5 23:49:43 2022 -0700
+
+ Add missing currentlight.
+
+commit 509b3e8952a44b043ff58e5355113dee6efbe05a
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 5 23:44:57 2022 -0700
+
+ V3D: Fix explicitNI and explicitCI flags.
+
+commit c802fe27c172c323280607b6b600ed616711d06f
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 5 23:43:18 2022 -0700
+
+ Support specifying v3d files on the Asymptote command line.
+
+commit b30b6a88d8c1cd93838bc4c15c0611ab595ebccb
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 5 23:42:36 2022 -0700
+
+ Disable png transparency until ghostscript pngalpha supports it again.
+
+commit 166efc83f399a795d2fa221477034e63e8ebb235
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 5 23:42:06 2022 -0700
+
+ Fix commit 1ce26e54a3fb7e35389b3e9ecf7399cd1c535b66.
+
+commit f2cce72ee4ca799512904137ddf79ba5a585b261
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 5 14:51:08 2022 -0700
+
+ Revert "Merge pull request #157 from ivankokan: Inversion fixes and improvements."
+
+ This reverts commit 7f8a9987174d1136826541389148caa7a074e242.
+
+commit 7f8a9987174d1136826541389148caa7a074e242
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 5 14:36:49 2022 -0700
+
+ Merge pull request #157 from ivankokan: Inversion fixes and improvements.
+
+commit c808070eeb7bc1737b1e314c698e92d6c2889145
+Merge: 1ce26e54 9c770c62
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 5 13:46:17 2022 -0700
+
+ Merge pull request #291 from cagprado/improve_vim_syntax
+
+ Improve vim syntax.
+
+commit 1ce26e54a3fb7e35389b3e9ecf7399cd1c535b66
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 5 13:17:10 2022 -0700
+
+ Fix transparency issue in commit f10c7fd9f54e5e84a7b5287579dbb29ce45aabd3.
+
+commit 9c770c628c3d8138e1038d172fe3736a59d66a30
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Jan 5 17:04:16 2022 +0800
+
+ Limit column width of source file
+
+commit 571b6aaf5607360f309ea66def8743be8eb6687c
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Jan 5 16:36:04 2022 +0800
+
+ Review delimiter matching rules
+
+ Unmatched ), ], and } will highlight themselves as errors.
+ Unmatched (, and [ causes highlighted errors later on the next ;,
+ which should be close enough to the source of the error.
+ Unmatched { nested within other delimiters will end up highlighting the
+ extra ) or ]. However, top level unmatched { will not be marked.
+
+commit 3cc5ae13cd9325daa14eeccfbfc9e02de215c9fb
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Jan 5 16:34:04 2022 +0800
+
+ Simplify comments highlighting
+
+ - We don't need asyCommentGroup since it contains only one member
+ - asyCommentStart's only purpose is to avoide further matching on the
+ delimiters, we don't need it as we can use asyComment for that.
+ - asyComment*String don't start with L
+
+commit 0b03cdab123063b00955f80713df745be660100d
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Jan 5 10:35:07 2022 +0800
+
+ Review asyNumber highlight
+
+ Asymptote is simpler than C/C++, we should be able to use a single
+ regexp. However, implicit multiplication may lead to some problems:
+ Constants like
+ 0.1.1
+ are considered as
+ 0.1 * .1
+ and compile with a warning about implicit scaling. Since this is
+ potentially dangerous, we add a highlight error when this happens.
+
+commit 6b0f27155ae97326483029140c61021bc451856c
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Jan 5 10:33:55 2022 +0800
+
+ Make two flavors of comment strings
+
+ Since asymptote allows for "string" and 'string', make both of them also
+ allowed inside comments.
+
+commit 57ca7624641fa0691bda95a90c1df19d0969310c
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Jan 5 10:30:25 2022 +0800
+
+ Fix regexp of special characters for asyString
+
+ asyString (double quoted string) will only highlight line breaks and the
+ special \". This fix matching \" without requiring a character before
+ it.
+
+commit 456d1815b3d43a6ad80dcdaf945ea3e56d18a8f9
+Author: Caio Prado <cagprado@yandex.com>
+Date: Tue Jan 4 17:22:57 2022 +0800
+
+ Cleanup unused highlights (inherited from C syntax file)
+
+commit 3e5f7c063bb19fb272b59ce285bcb52d1da3d0b2
+Author: Caio Prado <cagprado@yandex.com>
+Date: Tue Jan 4 16:49:27 2022 +0800
+
+ Reorder file sections
+
+ Order from simple to complex:
+ - keywords
+ - string constants
+ - number constants
+ - comments and comment strings
+ - delimiter errors
+
+commit 9ee06a701ba8dc87df56b5bcb859b4dbde0beeff
+Author: Caio Prado <cagprado@yandex.com>
+Date: Tue Jan 4 16:38:11 2022 +0800
+
+ Rename a few variables
+
+ Try to be consistent with some naming:
+ asyString for normal strings
+ asyCString for strings that maps C-like escapes (single quoted)
+ asyComment2Strings renamed to asyCommentLStrings following asyCommentL
+
+commit d5f765315b44970835874f7305822e1d0afad4bf
+Author: Caio Prado <cagprado@yandex.com>
+Date: Tue Jan 4 16:31:25 2022 +0800
+
+ Add more keywords for plain, three and color modules
+
+commit db3e1c343d8a5dfd69021968e443693982e24097
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Jan 3 17:33:44 2022 -0700
+
+ Enable billboard labels, even when compiled with LIBOSMESA, to support WebGL.
+ Remove subdivision crack work around for obsolete PRC format.
+
+commit 827f4188c785a80199c9499122b04256667880bb
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Jan 2 11:15:20 2022 -0700
+
+ Support compilation again without tirpc library (not recommended,
+ as this will disable both XDR and V3D support).
+
+commit 6e6bf4a083c94d475fa2111967d260c8b623ea2d
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Jan 2 09:15:31 2022 +1100
+
+ Increment version to 2.75.
+
commit b2ae0111b8184e26ca0ff990d9d55a13753e6a1b
Author: John Bowman <bowman@ualberta.ca>
Date: Sun Jan 2 07:44:55 2022 +1100
@@ -28,6 +249,14 @@ Date: Fri Dec 31 15:24:13 2021 -0700
Fix bug #263.
+commit 2ee4ca9267d5c2b7415080bd7b074f76e99cc70a
+Author: Caio Prado <cagprado@yandex.com>
+Date: Fri Dec 31 16:30:04 2021 +0800
+
+ Remove trailing spaces highlighting
+
+ There are several plugins and alternatives to highlight trailing spaces
+
commit d29fbefaab57f095f41f6851dc5ffe4ce5b4bbcb
Author: John Bowman <bowman@ualberta.ca>
Date: Thu Dec 30 15:27:12 2021 -0700
@@ -65,6 +294,39 @@ Date: Wed Dec 29 10:20:51 2021 -0700
Update links to gallery.
+commit fd26b0d813c06c92cdab5b2573d33bc4530f722a
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Dec 29 15:40:45 2021 +0800
+
+ Add Dotted to list of constants
+
+commit 2c90bff859f9948d20065ae7fd7b048f57e93e89
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Dec 29 15:33:16 2021 +0800
+
+ Realign code
+
+commit 176572fc125d726f2ec9f61ff4a059a5dd9d01d7
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Dec 29 15:32:07 2021 +0800
+
+ Fix string highlighting
+
+ Asymptote has two flavors of strings, single and double quoted, each
+ with different escape mapping.
+
+commit b02a07991a9c01eba86775fd4680f667dffd4b79
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Dec 29 11:02:13 2021 +0800
+
+ Add a few missing keywords
+
+commit 435700d9ae05e4ec36ab5423401c2d0ea04448ec
+Author: Caio Prado <cagprado@yandex.com>
+Date: Wed Dec 29 10:14:38 2021 +0800
+
+ Remove tabs and realign the source
+
commit 3154b07e46fc0eb637acf65f17d4d08a991580a2
Author: John Bowman <bowman@ualberta.ca>
Date: Tue Dec 28 15:26:08 2021 -0700
diff --git a/graphics/asymptote/ReleaseNotes b/graphics/asymptote/ReleaseNotes
index 21e4cd9ebf..71a9e1411e 100644
--- a/graphics/asymptote/ReleaseNotes
+++ b/graphics/asymptote/ReleaseNotes
@@ -1,3 +1,13 @@
+Release Notes for Version 2.75
+
+A 2D transparency bug was fixed. Vim support was improved.
+To support PNG transparency, the default driver was changed from pngalpha
+to png16m and the pdflatex TeX engine is used instead of latex.
+A pngdriver option was added. To support WebGL, billboard labels are enabled
+when configured for offscreen rendering. The subdivision crack work around for
+PRC output was removed. Compilation without the tirpc library is supported
+again (but not recommended since the V3D format requires XDR support).
+
Release Notes for Version 2.74
Order-independent transparency is disabled if SSBO support is unavailable.
diff --git a/graphics/asymptote/asy-keywords.el b/graphics/asymptote/asy-keywords.el
index faf15c4da4..0fc87a14a5 100644
--- a/graphics/asymptote/asy-keywords.el
+++ b/graphics/asymptote/asy-keywords.el
@@ -2,7 +2,7 @@
;; This file is automatically generated by asy-list.pl.
;; Changes will be overwritten.
;;
-(defvar asy-keywords-version "2.74")
+(defvar asy-keywords-version "2.75")
(defvar asy-keyword-name '(
and controls tension atleast curl if else while for do return break continue struct typedef new access import unravel from include quote static public private restricted this explicit true false null cycle newframe operator ))
diff --git a/graphics/asymptote/asymptote.spec b/graphics/asymptote/asymptote.spec
index 079a3444a4..d1ac1ff99c 100644
--- a/graphics/asymptote/asymptote.spec
+++ b/graphics/asymptote/asymptote.spec
@@ -3,7 +3,7 @@
%global __python %{__python3}
Name: asymptote
-Version: 2.74
+Version: 2.75
Release: 1%{?dist}
Summary: Descriptive vector graphics language
diff --git a/graphics/asymptote/base/asy.vim b/graphics/asymptote/base/asy.vim
index 4cb897f131..7d0983d07c 100644
--- a/graphics/asymptote/base/asy.vim
+++ b/graphics/asymptote/base/asy.vim
@@ -1,7 +1,7 @@
" Vim syntax file
-" Language: Asymptote
-" Maintainer: Andy Hammerlindl
-" Last Change: 2005 Aug 23
+" Language: Asymptote
+" Maintainer: Andy Hammerlindl
+" Last Change: 2022 Jan 05
" Hacked together from Bram Moolenaar's C syntax file, and Claudio Fleiner's
" Java syntax file.
@@ -9,132 +9,207 @@
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
if version < 600
- syntax clear
+ syn clear
elseif exists("b:current_syntax")
finish
endif
-" A bunch of useful C keywords
-syn keyword asyStatement break return continue unravel
-syn keyword asyConditional if else
-syn keyword asyRepeat while for do
-syn keyword asyExternal access from import include
-syn keyword asyOperator new operator
-
-syn keyword asyTodo contained TODO FIXME XXX
-
-" asyCommentGroup allows adding matches for special things in comments
-syn cluster asyCommentGroup contains=asyTodo
-
-" String and Character constants
-" Highlight special characters (those proceding a double backslash) differently
-syn match asySpecial display contained "\\\\."
-" Highlight line continuation slashes
-syn match asySpecial display contained "\\$"
-syn region asyString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=asySpecial
- " asyCppString: same as asyString, but ends at end of line
-if 0
-syn region asyCppString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=asySpecial
-endif
+" useful C/C++/Java keywords
+syn keyword asyStatement break return continue unravel
+syn keyword asyConditional if else
+syn keyword asyRepeat while for do
+syn keyword asyExternal access from import include
+syn keyword asyOperator new operator
+
+" basic asymptote keywords
+syn keyword asyConstant VERSION
+syn keyword asyConstant true false default infinity inf nan
+syn keyword asyConstant null nullframe nullpath nullpen
+syn keyword asyConstant intMin intMax realMin realMax
+syn keyword asyConstant realEpsilon realDigits
+syn keyword asyPathSpec and cycle controls tension atleast curl
+syn keyword asyStorageClass static public restricted private explicit
+syn keyword asyStructure struct typedef
+syn keyword asyType void bool bool3 int real string file
+syn keyword asyType pair triple transform guide path pen frame
+syn keyword asyType picture
-"when wanted, highlight trailing white space
-if exists("asy_space_errors")
- if !exists("asy_no_trail_space_error")
- syn match asySpaceError display excludenl "\s\+$"
+" module specific keywords
+if exists("asy_syn_plain")
+ syn keyword asyConstant currentpicture currentpen defaultpen
+ syn keyword asyConstant inch inches cm mm bp pt up down right left
+ syn keyword asyConstant E NE N NW W SW S SE
+ syn keyword asyConstant ENE NNE NNW WNW WSW SSW SSE ESE
+ syn keyword asyConstant I pi twopi
+ syn keyword asyConstant CCW CW
+ syn keyword asyConstant undefined sqrtEpsilon Align mantissaBits
+ syn keyword asyConstant identity zeroTransform invert
+ syn keyword asyConstant stdin stdout
+ syn keyword asyConstant unitsquare unitcircle circleprecision
+ syn keyword asyConstant solid dotted Dotted dashed dashdotted
+ syn keyword asyConstant longdashed longdashdotted
+ syn keyword asyConstant squarecap roundcap extendcap
+ syn keyword asyConstant miterjoin roundjoin beveljoin
+ syn keyword asyConstant zerowinding evenodd basealign nobasealign
+ syn keyword asyConstant black white gray red green blue Cyan Magenta
+ syn keyword asyConstant Yellow Black cyan magenta yellow palered
+ syn keyword asyConstant palegreen paleblue palecyan palemagenta
+ syn keyword asyConstant paleyellow palegray lightred lightgreen
+ syn keyword asyConstant lightblue lightcyan lightmagenta lightyellow
+ syn keyword asyConstant lightgray mediumred mediumgreen mediumblue
+ syn keyword asyConstant mediumcyan mediummagenta mediumyellow
+ syn keyword asyConstant mediumgray heavyred heavygreen heavyblue
+ syn keyword asyConstant heavycyan heavymagenta lightolive heavygray
+ syn keyword asyConstant deepred deepgreen deepblue deepcyan
+ syn keyword asyConstant deepmagenta deepyellow deepgray darkred
+ syn keyword asyConstant darkgreen darkblue darkcyan darkmagenta
+ syn keyword asyConstant darkolive darkgray orange fuchsia chartreuse
+ syn keyword asyConstant springgreen purple royalblue salmon brown
+ syn keyword asyConstant olive darkbrown pink palegrey lightgrey
+ syn keyword asyConstant mediumgrey grey heavygrey deepgrey darkgrey
+
+ if exists("asy_syn_texcolors")
+ syn keyword asyConstant GreenYellow Yellow Goldenrod Dandelion
+ syn keyword asyConstant Apricot Peach Melon YellowOrange Orange
+ syn keyword asyConstant BurntOrange Bittersweet RedOrange Mahogany
+ syn keyword asyConstant Maroon BrickRed Red OrangeRed RubineRed
+ syn keyword asyConstant WildStrawberry Salmon CarnationPink Magenta
+ syn keyword asyConstant VioletRed Rhodamine Mulberry RedViolet
+ syn keyword asyConstant Fuchsia Lavender Thistle Orchid DarkOrchid
+ syn keyword asyConstant Purple Plum Violet RoyalPurple BlueViolet
+ syn keyword asyConstant Periwinkle CadetBlue CornflowerBlue
+ syn keyword asyConstant MidnightBlue NavyBlue RoyalBlue Blue
+ syn keyword asyConstant Cerulean Cyan ProcessBlue SkyBlue Turquoise
+ syn keyword asyConstant TealBlue Aquamarine BlueGreen Emerald
+ syn keyword asyConstant JungleGreen SeaGreen Green ForestGreen
+ syn keyword asyConstant PineGreen LimeGreen YellowGreen SpringGreen
+ syn keyword asyConstant OliveGreen RawSienna Sepia Brown Tan Gray
+ syn keyword asyConstant Black White
endif
- if !exists("asy_no_tab_space_error")
- syn match asySpaceError display " \+\t"me=e-1
+
+ if exists("asy_syn_x11colors")
+ syn keyword asyConstant AliceBlue AntiqueWhite Aqua Aquamarine Azure
+ syn keyword asyConstant Beige Bisque Black BlanchedAlmond Blue
+ syn keyword asyConstant BlueViolet Brown BurlyWood CadetBlue
+ syn keyword asyConstant Chartreuse Chocolate Coral CornflowerBlue
+ syn keyword asyConstant Cornsilk Crimson Cyan DarkBlue DarkCyan
+ syn keyword asyConstant DarkGoldenrod DarkGray DarkGreen DarkKhaki
+ syn keyword asyConstant DarkMagenta DarkOliveGreen DarkOrange
+ syn keyword asyConstant DarkOrchid DarkRed DarkSalmon DarkSeaGreen
+ syn keyword asyConstant DarkSlateBlue DarkSlateGray DarkTurquoise
+ syn keyword asyConstant DarkViolet DeepPink DeepSkyBlue DimGray
+ syn keyword asyConstant DodgerBlue FireBrick FloralWhite ForestGreen
+ syn keyword asyConstant Fuchsia Gainsboro GhostWhite Gold Goldenrod
+ syn keyword asyConstant Gray Green GreenYellow Honeydew HotPink
+ syn keyword asyConstant IndianRed Indigo Ivory Khaki Lavender
+ syn keyword asyConstant LavenderBlush LawnGreen LemonChiffon
+ syn keyword asyConstant LightBlue LightCoral LightCyan
+ syn keyword asyConstant LightGoldenrodYellow LightGreen LightGrey
+ syn keyword asyConstant LightPink LightSalmon LightSeaGreen
+ syn keyword asyConstant LightSkyBlue LightSlateGray LightSteelBlue
+ syn keyword asyConstant LightYellow Lime LimeGreen Linen Magenta
+ syn keyword asyConstant Maroon MediumAquamarine MediumBlue
+ syn keyword asyConstant MediumOrchid MediumPurple MediumSeaGreen
+ syn keyword asyConstant MediumSlateBlue MediumSpringGreen
+ syn keyword asyConstant MediumTurquoise MediumVioletRed MidnightBlue
+ syn keyword asyConstant MintCream MistyRose Moccasin NavajoWhite
+ syn keyword asyConstant Navy OldLace Olive OliveDrab Orange
+ syn keyword asyConstant OrangeRed Orchid PaleGoldenrod PaleGreen
+ syn keyword asyConstant PaleTurquoise PaleVioletRed PapayaWhip
+ syn keyword asyConstant PeachPuff Peru Pink Plum PowderBlue Purple
+ syn keyword asyConstant Red RosyBrown RoyalBlue SaddleBrown Salmon
+ syn keyword asyConstant SandyBrown SeaGreen Seashell Sienna Silver
+ syn keyword asyConstant SkyBlue SlateBlue SlateGray Snow SpringGreen
+ syn keyword asyConstant SteelBlue Tan Teal Thistle Tomato Turquoise
+ syn keyword asyConstant Violet Wheat White WhiteSmoke Yellow
+ syn keyword asyConstant YellowGreen
endif
-endif
-"catch errors caused by wrong parenthesis and brackets
-syn cluster asyParenGroup contains=asyParenError,asyIncluded,asySpecial,asyCommentSkip,asyCommentString,asyComment2String,@asyCommentGroup,asyCommentStartError,asyUserCont,asyUserLabel,asyBitField,asyCommentSkip,asyOctalZero,asyCppOut,asyCppOut2,asyCppSkip,asyFormat,asyNumber,asyFloat,asyOctal,asyOctalError,asyNumbersCom
-if exists("asy_no_bracket_error")
- syn region asyParen transparent start='(' end=')' contains=ALLBUT,@asyParenGroup,asyCppParen,asyCppString
- " asyCppParen: same as asyParen but ends at end-of-line; used in asyDefine
- syn region asyCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@asyParenGroup,asyParen,asyString
- syn match asyParenError display ")"
- syn match asyErrInParen display contained "[{}]"
-else
- syn region asyParen transparent start='(' end=')' contains=ALLBUT,@asyParenGroup,asyCppParen,asyErrInBracket,asyCppBracket,asyCppString
- " asyCppParen: same as asyParen but ends at end-of-line; used in asyDefine
- syn region asyCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@asyParenGroup,asyErrInBracket,asyParen,asyBracket,asyString
-if 0
- syn match asyParenError display "[\])]"
- syn match asyErrInParen display contained "[\]]"
-endif
- syn region asyBracket transparent start='\[' end=']' contains=ALLBUT,@asyParenGroup,asyErrInParen,asyCppParen,asyCppBracket,asyCppString
- " asyCppBracket: same as asyParen but ends at end-of-line; used in asyDefine
- syn region asyCppBracket transparent start='\[' skip='\\$' excludenl end=']' end='$' contained contains=ALLBUT,@asyParenGroup,asyErrInParen,asyParen,asyBracket,asyString
- syn match asyErrInBracket display contained "[);]"
+ if exists("asy_syn_three")
+ syn keyword asyType path3 guide3 transform3
+ syn keyword asyType projection light material patch surface tube
+ syn keyword asyConstant currentprojection currentlight defaultrender
+ syn keyword asyConstant identity4 O X Y Z
+ syn keyword asyConstant nolight nullpens
+ syn keyword asyConstant unitsphere unithemisphere unitplane octant1
+ syn keyword asyConstant unitcone unitsolidcone unitcube unitcylinder
+ syn keyword asyConstant unitdisk unittube
+ endif
endif
-"integer number, or floating point number without a dot and with "f".
-syn case ignore
-syn match asyNumbers display transparent "\<\d\|\.\d" contains=asyNumber,asyFloat
-syn match asyNumber display contained "\d\+"
-"floating point number, with dot, optional exponent
-syn match asyFloat display contained "\d\+\.\d*\(e[-+]\=\d\+\)\="
-"floating point number, starting with a dot, optional exponent
-syn match asyFloat display contained "\.\d\+\(e[-+]\=\d\+\)\="
-"floating point number, without dot, with exponent
-syn match asyFloat display contained "\d\+e[-+]\=\d\+"
-syn case match
+" string constants
+syn region asyCString start=+'+ end=+'+ skip=+\\\\\|\\'+ contains=asyCSpecial
+syn match asyCSpecial display contained +\\\(['"?\\abfnrtv]\|\o\{1,3}\)+
+syn match asyCSpecial display contained +\\\(x[0-9A-F]\{1,2\}\|$\)+
+" double quoted strings only special character is \"
+syn region asyString start=+"+ end=+"+ skip=+\\\\\|\\"+ contains=asySpecial
+syn match asySpecial display contained +\(\\\)\@1<!\(\\\\\)*\zs\\"+
+
+
+" number constants
+syn match asyNumbers display transparent "\<\d\|\.\d"
+ \ contains=asyNumber,asyNumberError
+syn match asyNumber display contained "\d*\.\=\d*\(e[-+]\=\d\+\)\="
+" highlight number constants with two '.' or with '.' after an 'e'
+syn match asyNumberError display contained "\d*\.\(\d\|e[-+]\=\)*\.[0-9.]*"
+syn match asyNumberError display contained "\d*e[-+]\=\d*\.[0-9.]*"
+syn match asyNumberError display contained "\d*e[-+]\=\(e[-+]\=\)*\.[0-9.]*"
+
+
+" comments and comment strings
+syn keyword asyTodo contained TODO FIXME XXX
+syn sync ccomment asyComment minlines=15
if exists("asy_comment_strings")
- " A comment can contain asyString, asyCharacter and asyNumber.
- " But a "*/" inside a asyString in a asyComment DOES end the comment! So we
- " need to use a special type of asyString: asyCommentString, which also ends on
+ " A comment can contain asyString, asyCString, and asyNumber. But a "*/"
+ " inside a asy*String in a asyComment DOES end the comment! So we need to
+ " use a special type of asy*String: asyComment*String, which also ends on
" "*/", and sees a "*" at the start of the line as comment again.
" Unfortunately this doesn't very well work for // type of comments :-(
- syntax match asyCommentSkip contained "^\s*\*\($\|\s\+\)"
- syntax region asyCommentString contained start=+L\="+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=asySpecial,asyCommentSkip
- syntax region asyComment2String contained start=+L\="+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=asySpecial
- syntax region asyCommentL start="//" skip="\\$" end="$" keepend contains=@asyCommentGroup,asyComment2String,asyCharacter,asyNumbersCom,asySpaceError
- syntax region asyComment matchgroup=asyCommentStart start="/\*" matchgroup=NONE end="\*/" contains=@asyCommentGroup,asyCommentStartError,asyCommentString,asyCharacter,asyNumbersCom,asySpaceError
+ syn match asyCommentSkip contained "^\s*\*\($\|\s\+\)"
+ syn region asyCommentString contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+ \ end=+\*/+me=s-1
+ \ contains=asySpecial,asyCommentSkip
+ syn region asyCommentCString contained start=+'+ skip=+\\\\\|\\'+ end=+'+
+ \ end=+\*/+me=s-1
+ \ contains=asyCSpecial,asyCommentSkip
+ syn region asyCommentLString contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+ \ end="$" contains=asySpecial
+ syn region asyCommentLCString contained start=+'+ skip=+\\\\\|\\'+ end=+'+
+ \ end="$" contains=asyCSpecial
+ syn region asyCommentL start="//" skip="\\$" end="$" keepend
+ \ contains=asyTodo,asyCommentLString,
+ \ asyCommentLCString,asyNumbers
+ syn region asyComment matchgroup=asyComment start="/\*" end="\*/"
+ \ contains=asyTodo,asyCommentStartError,
+ \ asyCommentString,asyCommentCString,asyNumbers
else
- syn region asyCommentL start="//" skip="\\$" end="$" keepend contains=@asyCommentGroup,asySpaceError
- syn region asyComment matchgroup=asyCommentStart start="/\*" matchgroup=NONE end="\*/" contains=@asyCommentGroup,asyCommentStartError,asySpaceError
+ syn region asyCommentL start="//" skip="\\$" end="$" keepend
+ \ contains=asyTodo
+ syn region asyComment matchgroup=asyComment start="/\*" end="\*/"
+ \ contains=asyTodo,asyCommentStartError
endif
-" keep a // comment separately, it terminates a preproc. conditional
-syntax match asyCommentError display "\*/"
-syntax match asyCommentStartError display "/\*"me=e-1 contained
-syn keyword asyType void bool int real string
-syn keyword asyType pair triple transform guide path pen frame
-syn keyword asyType picture
+" highlight common errors when starting/ending C comments
+syn match asyCommentError display "\*/"
+syn match asyCommentStartError display "/\*"me=e-1 contained
-syn keyword asyStructure struct typedef
-syn keyword asyStorageClass static public readable private explicit
-syn keyword asyPathSpec and cycle controls tension atleast curl
+" delimiter matching errors
+syn region asyCurly transparent start='{' end='}'
+ \ contains=TOP,asyCurlyError
+syn region asyBrack transparent start='\[' end='\]' matchgroup=asyError
+ \ end=';' contains=TOP,asyBrackError
+syn region asyParen transparent start='(' end=')' matchgroup=asyError
+ \ end=';' contains=TOP,asyParenError
+syn match asyCurlyError display '}'
+syn match asyBrackError display '\]'
+syn match asyParenError display ')'
+" for (;;) constructs are exceptions that allow ; inside parenthesis
+syn region asyParen transparent matchgroup=asyParen
+ \ start='\(for\s*\)\@<=(' end=')'
+ \ contains=TOP,asyParenError
-syn keyword asyConstant true false
-syn keyword asyConstant null nullframe nullpath
-
-if exists("asy_syn_plain")
- syn keyword asyConstant currentpicture currentpen currentprojection
- syn keyword asyConstant inch inches cm mm bp pt up down right left
- syn keyword asyConstant E NE N NW W SW S SE
- syn keyword asyConstant ENE NNE NNW WNW WSW SSW SSE ESE
- syn keyword asyConstant I pi twopi
- syn keyword asyConstant solid dotted dashed dashdotted
- syn keyword asyConstant longdashed longdashdotted
- syn keyword asyConstant squarecap roundcap extendcap
- syn keyword asyConstant miterjoin roundjoin beveljoin
- syn keyword asyConstant zerowinding evenodd
- syn keyword asyConstant invisible black gray grey white
- syn keyword asyConstant lightgray lightgrey
- syn keyword asyConstant red green blue
- syn keyword asyConstant cmyk Cyan Magenta Yellow Black
- syn keyword asyConstant yellow magenta cyan
- syn keyword asyConstant brown darkgreen darkblue
- syn keyword asyConstant orange purple royalblue olive
- syn keyword asyConstant chartreuse fuchsia salmon lightblue springgreen
- syn keyword asyConstant pink
-endif
-
-syn sync ccomment asyComment minlines=15
" Define the default highlighting.
" For version 5.7 and earlier: only when not done already
@@ -147,56 +222,39 @@ if version >= 508 || !exists("did_asy_syn_inits")
command -nargs=+ HiLink hi def link <args>
endif
- HiLink asyFormat asySpecial
- HiLink asyCppString asyString
- HiLink asyCommentL asyComment
- HiLink asyCommentStart asyComment
- HiLink asyLabel Label
- HiLink asyUserLabel Label
- HiLink asyConditional Conditional
- HiLink asyRepeat Repeat
- HiLink asyCharacter Character
- HiLink asySpecialCharacter asySpecial
- HiLink asyNumber Number
- HiLink asyOctal Number
- HiLink asyOctalZero PreProc " link this to Error if you want
- HiLink asyFloat Float
- HiLink asyOctalError asyError
- HiLink asyParenError asyError
- HiLink asyErrInParen asyError
- HiLink asyErrInBracket asyError
- HiLink asyCommentError asyError
- HiLink asyCommentStartError asyError
- HiLink asySpaceError asyError
- HiLink asySpecialError asyError
- HiLink asyOperator Operator
- HiLink asyStructure Structure
- HiLink asyStorageClass StorageClass
- HiLink asyExternal Include
- HiLink asyPreProc PreProc
- HiLink asyDefine Macro
- HiLink asyIncluded asyString
- HiLink asyError Error
- HiLink asyStatement Statement
- HiLink asyPreCondit PreCondit
- HiLink asyType Type
- HiLink asyConstant Constant
- HiLink asyCommentString asyString
- HiLink asyComment2String asyString
- HiLink asyCommentSkip asyComment
- HiLink asyString String
- HiLink asyComment Comment
- HiLink asySpecial SpecialChar
- HiLink asyTodo Todo
- HiLink asyCppSkip asyCppOut
- HiLink asyCppOut2 asyCppOut
- HiLink asyCppOut Comment
- HiLink asyPathSpec Statement
-
+ HiLink asyCommentL asyComment
+ HiLink asyConditional Conditional
+ HiLink asyRepeat Repeat
+ HiLink asyNumber Number
+ HiLink asyNumberError asyError
+ HiLink asyCurlyError asyError
+ HiLink asyBracketError asyError
+ HiLink asyParenError asyError
+ HiLink asyCommentError asyError
+ HiLink asyCommentStartError asyError
+ HiLink asyOperator Operator
+ HiLink asyStructure Structure
+ HiLink asyStorageClass StorageClass
+ HiLink asyExternal Include
+ HiLink asyDefine Macro
+ HiLink asyError Error
+ HiLink asyStatement Statement
+ HiLink asyType Type
+ HiLink asyConstant Constant
+ HiLink asyCommentString asyString
+ HiLink asyCommentCString asyString
+ HiLink asyCommentLString asyString
+ HiLink asyCommentLCString asyString
+ HiLink asyCommentSkip asyComment
+ HiLink asyString String
+ HiLink asyCString String
+ HiLink asyComment Comment
+ HiLink asySpecial SpecialChar
+ HiLink asyCSpecial SpecialChar
+ HiLink asyTodo Todo
+ HiLink asyPathSpec Statement
delcommand HiLink
endif
let b:current_syntax = "c"
-
-" vim: ts=8
diff --git a/graphics/asymptote/base/geometry.asy b/graphics/asymptote/base/geometry.asy
index 420d5bdc45..9f4be8d15c 100644
--- a/graphics/asymptote/base/geometry.asy
+++ b/graphics/asymptote/base/geometry.asy
@@ -6051,7 +6051,7 @@ triangle extouch(triangle t)
return triangle(A, B, C);
}
-/*<asyxml><function type="triangle" signature="extouch(triangle)"><code></asyxml>*/
+/*<asyxml><function type="triangle" signature="incentral(triangle)"><code></asyxml>*/
triangle incentral(triangle t)
{/*<asyxml></code><documentation>Return the incentral triangle of the triangle 't'.
It is the triangle whose vertices are determined by the intersections of the
diff --git a/graphics/asymptote/base/patterns.asy b/graphics/asymptote/base/patterns.asy
index e71690fbe9..de0fc02d03 100644
--- a/graphics/asymptote/base/patterns.asy
+++ b/graphics/asymptote/base/patterns.asy
@@ -13,9 +13,9 @@ frame tiling(string name, picture pic, pair lb=0, pair rt=0)
/XStep "+format(s,pmax.x-pmin.x,"C")+"
/YStep "+format(s,pmax.y-pmin.y,"C")+"
/PaintProc {pop");
- begingroup(tiling);
+ gsave(tiling);
add(tiling,f);
- endgroup(tiling);
+ grestore(tiling);
postscript(tiling,"} >>
matrix makepattern
/"+name+" exch def");
diff --git a/graphics/asymptote/base/three.asy b/graphics/asymptote/base/three.asy
index ab30848444..c208f59df8 100644
--- a/graphics/asymptote/base/three.asy
+++ b/graphics/asymptote/base/three.asy
@@ -56,8 +56,6 @@ struct render
// General parameters:
real margin; // shrink amount for rendered openGL viewport, in bp.
- bool labelfill; // fill PRC subdivision cracks in unlighted labels
-
bool partnames; // assign part name indices to compound objects
bool defaultnames; // assign default names to unnamed objects
interaction interaction; // billboard interaction mode
@@ -72,7 +70,6 @@ struct render
bool3 merge=render.merge,
int sphere=render.sphere,
real margin=render.margin,
- bool labelfill=render.labelfill,
bool partnames=render.partnames,
bool defaultnames=render.defaultnames,
interaction interaction=render.interaction)
@@ -84,7 +81,6 @@ struct render
this.merge=merge;
this.sphere=sphere;
this.margin=margin;
- this.labelfill=labelfill;
this.partnames=partnames;
this.defaultnames=defaultnames;
this.interaction=interaction;
@@ -101,7 +97,6 @@ defaultrender.tessellate=false;
defaultrender.merge=false;
defaultrender.margin=0.02;
defaultrender.sphere=NURBSsphere;
-defaultrender.labelfill=true;
defaultrender.partnames=false;
defaultrender.defaultnames=true;
defaultrender.interaction=Embedded;
diff --git a/graphics/asymptote/base/three_surface.asy b/graphics/asymptote/base/three_surface.asy
index e993c8d713..d0d79de464 100644
--- a/graphics/asymptote/base/three_surface.asy
+++ b/graphics/asymptote/base/three_surface.asy
@@ -1380,6 +1380,7 @@ void draw3D(frame f, patch s, material m,
int digits=s.planar && !straight ? 12 : settings.digits;
if(s.colors.length > 0) {
+ primitive=false;
if(prc() && light.on())
straight=false; // PRC vertex colors (for quads only) ignore lighting
m=material(m);
@@ -1489,8 +1490,6 @@ void draw(picture pic=currentpicture, triple[] v, int[][] vi,
project(v[vii[2]],P)--cycle;
pen p=color(n[ni[i][0]],m,light);
fill(pic,g,p);
- if(prc && opacity(m.diffuse()) == 1) // Fill subdivision cracks
- draw(pic,g,p);
}
}
}
@@ -1538,8 +1537,11 @@ void draw(transform t=identity(), frame f, surface s, int nu=1, int nv=1,
bool prc=prc();
if(s.draw != null && (primitive() || (prc && s.PRCprimitive))) {
bool noprerender=settings.prerender == 0;
- for(int k=0; k < s.s.length; ++k)
- draw3D(f,s.s[k],surfacepen[k],light,render,primitive=noprerender);
+ for(int k=0; k < s.s.length; ++k) {
+ patch p=s.s[k];
+ draw3D(f,p,surfacepen[k],light,render,primitive=noprerender);
+ if(p.colors.length > 0) noprerender=false;
+ }
if(noprerender)
s.draw(f,s.T,surfacepen,light,render);
} else {
@@ -1851,13 +1853,8 @@ void label(frame f, Label L, triple position, align align=NoAlign,
begingroup3(f2,Render);
begingroup3(f3,Render);
}
- for(patch S : s.s) {
- S=centering*S;
- draw3D(f3,S,L.p,light,Render);
- // Fill subdivision cracks
- if(prc && render.labelfill && opacity(L.p) == 1 && !lighton)
- _draw(f3,S.external(),position,L.p,light,interaction);
- }
+ for(patch S : s.s)
+ draw3D(f3,centering*S,L.p,light,Render);
endgroup3(f3);
if(L.defaulttransform3)
add(f1,T*f3);
@@ -1874,9 +1871,6 @@ void label(frame f, Label L, triple position, align align=NoAlign,
triple V=L.align.is3D ? position+L.align.dir3*labelmargin(L.p) :
position;
draw3D(f,S,L.p,light,render(interaction(interaction,center=V)));
- // Fill subdivision cracks
- if(prc && render.labelfill && opacity(L.p) == 1 && !lighton)
- _draw(f,S.external(),V,L.p,light,interaction);
}
endgroup3(f);
}
@@ -1941,13 +1935,8 @@ void label(picture pic=currentpicture, Label L, triple position,
begingroup3(f2,Render);
begingroup3(f3,Render);
}
- for(patch S : s.s) {
- S=centering*S;
- draw3D(f3,S,L.p,light,Render);
- // Fill subdivision cracks
- if(prc && render.labelfill && opacity(L.p) == 1 && !lighton)
- _draw(f3,S.external(),v,L.p,light,interaction);
- }
+ for(patch S : s.s)
+ draw3D(f3,centering*S,L.p,light,Render);
endgroup3(f3);
if(L.defaulttransform3)
add(f1,T*f3);
@@ -1963,11 +1952,7 @@ void label(picture pic=currentpicture, Label L, triple position,
begingroup3(f,name,render);
for(patch S : surface(L,v,bbox=P.bboxonly).s) {
triple V=L.align.is3D ? v+L.align.dir3*labelmargin(L.p) : v;
- render Render=render(render,interaction(interaction,V));
- draw3D(f,S,L.p,light,Render);
- // Fill subdivision cracks
- if(prc && render.labelfill && opacity(L.p) == 1 && !lighton)
- _draw(f,S.external(),V,L.p,light,interaction);
+ draw3D(f,S,L.p,light,render(render,interaction(interaction,V)));
}
endgroup3(f);
}
diff --git a/graphics/asymptote/base/v3d.asy b/graphics/asymptote/base/v3d.asy
index 0405a5d5bc..925ba505e4 100644
--- a/graphics/asymptote/base/v3d.asy
+++ b/graphics/asymptote/base/v3d.asy
@@ -461,17 +461,10 @@ struct v3dfile
for (int i=0; i < nI; ++i) {
xdrfile.dimension(3);
g.positionIndices[i]=xdrfile;
- if(explicitNI != 0)
- g.normalIndices[i]=xdrfile;
- else
- g.normalIndices[i]=g.positionIndices[i];
- if(nC > 0) {
- if(explicitCI != 0)
- g.colorIndices[i]=xdrfile;
- else
- g.colorIndices[i]=g.positionIndices[i];
- } else
- g.colorIndices[i]=g.positionIndices[i];
+ g.normalIndices[i]=explicitNI != 0 ? xdrfile :
+ g.positionIndices[i];
+ g.colorIndices[i]=nC > 0 && explicitCI != 0 ? xdrfile :
+ g.positionIndices[i];
}
int center=xdrfile;
int material=xdrfile;
@@ -606,9 +599,9 @@ void importv3d(string name)
path3[][] G=xf.paths3[c];
for(int m=0; m < G.length; ++m)
if(G.initialized(m)) {
- material material=xf.materials[m];
+ material material=material(xf.materials[m]);
material.p[0] += thin();
- draw(G[m],material,r);
+ draw(G[m],material,currentlight,r);
}
}
diff --git a/graphics/asymptote/base/v3dheadertypes.asy b/graphics/asymptote/base/v3dheadertypes.asy
index 19fad67eee..87a255db48 100644
--- a/graphics/asymptote/base/v3dheadertypes.asy
+++ b/graphics/asymptote/base/v3dheadertypes.asy
@@ -1,6 +1,6 @@
// Enum class for v3dheadertypes
// AUTO-GENERATED from v3dheadertypes.csv
-// Generated at 2022-01-01 13:56:00.166634
+// Generated at 2022-01-06 15:01:16.486016
struct v3dheadertypes
{
diff --git a/graphics/asymptote/base/v3dtypes.asy b/graphics/asymptote/base/v3dtypes.asy
index 3611e586ea..183b6a9bac 100644
--- a/graphics/asymptote/base/v3dtypes.asy
+++ b/graphics/asymptote/base/v3dtypes.asy
@@ -1,6 +1,6 @@
// Enum class for v3dtypes
// AUTO-GENERATED from v3dtypes.csv
-// Generated at 2022-01-01 13:56:00.084723
+// Generated at 2022-01-06 15:01:16.457740
struct v3dtypes
{
diff --git a/graphics/asymptote/configure b/graphics/asymptote/configure
index d76e36e669..1342116fe5 100755
--- a/graphics/asymptote/configure
+++ b/graphics/asymptote/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Asymptote 2.74.
+# Generated by GNU Autoconf 2.69 for Asymptote 2.75.
#
# Report bugs to <https://sourceforge.net/projects/asymptote>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Asymptote'
PACKAGE_TARNAME='asymptote'
-PACKAGE_VERSION='2.74'
-PACKAGE_STRING='Asymptote 2.74'
+PACKAGE_VERSION='2.75'
+PACKAGE_STRING='Asymptote 2.75'
PACKAGE_BUGREPORT='https://sourceforge.net/projects/asymptote'
PACKAGE_URL=''
@@ -1302,7 +1302,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Asymptote 2.74 to adapt to many kinds of systems.
+\`configure' configures Asymptote 2.75 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1368,7 +1368,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Asymptote 2.74:";;
+ short | recursive ) echo "Configuration of Asymptote 2.75:";;
esac
cat <<\_ACEOF
@@ -1486,7 +1486,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Asymptote configure 2.74
+Asymptote configure 2.75
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2072,7 +2072,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Asymptote $as_me 2.74, which was
+It was created by Asymptote $as_me 2.75, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -7787,8 +7787,8 @@ fi
$as_echo "#define HAVE_RPC_RPC_H 1" >>confdefs.h
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Broken rpc headers; XDR support disabled ***" >&5
-$as_echo "$as_me: WARNING: *** Broken rpc headers; XDR support disabled ***" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Broken rpc headers; XDR/V3D support disabled ***" >&5
+$as_echo "$as_me: WARNING: *** Broken rpc headers; XDR/V3D support disabled ***" >&2;}
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -9464,7 +9464,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Asymptote $as_me 2.74, which was
+This file was extended by Asymptote $as_me 2.75, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9526,7 +9526,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Asymptote config.status 2.74
+Asymptote config.status 2.75
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/graphics/asymptote/configure.ac b/graphics/asymptote/configure.ac
index 759e3d926d..fe97228976 100644
--- a/graphics/asymptote/configure.ac
+++ b/graphics/asymptote/configure.ac
@@ -3,7 +3,7 @@
# this file.
AC_PREREQ(2)
-AC_INIT([Asymptote],[2.74],[https://sourceforge.net/projects/asymptote])
+AC_INIT([Asymptote],[2.75],[https://sourceforge.net/projects/asymptote])
VERSION=$PACKAGE_VERSION
AC_SUBST(VERSION)
m4_include([ax_pthread.m4])
@@ -384,7 +384,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "xstream.h"])],
[AC_SEARCH_LIBS([xdrstdio_create],[nsl tirpc])
AC_DEFINE(HAVE_RPC_RPC_H,1,
DEFINE([a working <tirpc/rpc/rpc.h> header]))],
- AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***]))
+ AC_MSG_WARN([*** Broken rpc headers; XDR/V3D support disabled ***]))
AC_ARG_ENABLE(gsl,
[AS_HELP_STRING(--enable-gsl[[[=yes]]],enable GNU Scientific Library)])
diff --git a/graphics/asymptote/doc/CAD.pdf b/graphics/asymptote/doc/CAD.pdf
index b79020dd5b..3464fdf5ea 100644
--- a/graphics/asymptote/doc/CAD.pdf
+++ b/graphics/asymptote/doc/CAD.pdf
Binary files differ
diff --git a/graphics/asymptote/doc/FAQ/asy-faq.info b/graphics/asymptote/doc/FAQ/asy-faq.info
index 47018f683a..0ecf42e134 100644
--- a/graphics/asymptote/doc/FAQ/asy-faq.info
+++ b/graphics/asymptote/doc/FAQ/asy-faq.info
@@ -10,7 +10,7 @@ END-INFO-DIR-ENTRY
File: asy-faq.info, Node: Top, Next: Question 1.1, Up: (dir)
ASYMPTOTE FREQUENTLY ASKED QUESTIONS
- 2022-01-01
+ 2022-01-06
This is the list of Frequently Asked Questions about Asymptote (asy).
diff --git a/graphics/asymptote/doc/TeXShopAndAsymptote.pdf b/graphics/asymptote/doc/TeXShopAndAsymptote.pdf
index f6ffa2599b..9ab1bc96f2 100644
--- a/graphics/asymptote/doc/TeXShopAndAsymptote.pdf
+++ b/graphics/asymptote/doc/TeXShopAndAsymptote.pdf
Binary files differ
diff --git a/graphics/asymptote/doc/asy-latex.pdf b/graphics/asymptote/doc/asy-latex.pdf
index 1806d3333d..a39a29ade6 100644
--- a/graphics/asymptote/doc/asy-latex.pdf
+++ b/graphics/asymptote/doc/asy-latex.pdf
Binary files differ
diff --git a/graphics/asymptote/doc/asy.1 b/graphics/asymptote/doc/asy.1
index 71166fa234..360c7ae070 100644
--- a/graphics/asymptote/doc/asy.1
+++ b/graphics/asymptote/doc/asy.1
@@ -188,7 +188,7 @@ Loop 3D animations [false].
Use single precision for V3D reals [false].
.TP
.B \-lsp
-Special interactive mode for lsp-rpc [false].
+Interactive mode for the Language Server Protocol [false].
.TP
.B \-m,\-mask
Mask fpu exceptions; command-line only.
@@ -332,10 +332,10 @@ Use webgl2 if available [false].
Show where listed variables are declared [false].
.TP
.B \-wsl
-Set to WSL mode when running asy inside WSL. [false].
+Run asy under the Windows Subsystem for Linux. [false].
.TP
.B \-xasy
-Special interactive mode for xasy [false].
+Interactive mode for xasy [false].
.TP
.B \-zoomPinchCap limit
WebGL maximum zoom pinch [100].
diff --git a/graphics/asymptote/doc/asyRefCard.pdf b/graphics/asymptote/doc/asyRefCard.pdf
index 19366aaa29..64b9c58620 100644
--- a/graphics/asymptote/doc/asyRefCard.pdf
+++ b/graphics/asymptote/doc/asyRefCard.pdf
Binary files differ
diff --git a/graphics/asymptote/doc/asymptote.pdf b/graphics/asymptote/doc/asymptote.pdf
index 8afc6292ae..071be1cbb6 100644
--- a/graphics/asymptote/doc/asymptote.pdf
+++ b/graphics/asymptote/doc/asymptote.pdf
Binary files differ
diff --git a/graphics/asymptote/doc/asymptote.texi b/graphics/asymptote/doc/asymptote.texi
index 085cc77b0c..267d552e53 100644
--- a/graphics/asymptote/doc/asymptote.texi
+++ b/graphics/asymptote/doc/asymptote.texi
@@ -8264,7 +8264,13 @@ external viewer or conversion to an alternate 3D format with the Python
@code{pyv3d} library are available at
@url{https://gitlab.com/vectorgraphics/v3d}.
A @code{V3D} file @code{file.v3d} may be imported and viewed by
-Asymptote with the @code{v3d} module:
+@code{Asymptote} either by specifying @code{file.v3d} on the command line
+@verbatim
+asy -V file.v3d
+@end verbatim
+or using the @code{v3d} module and @code{importv3d} function in
+interactive mode (or within an @code{Asymptote} file):
+@cindex @code{importv3d}
@verbatim
import v3d;
importv3d("file.v3d");
diff --git a/graphics/asymptote/doc/png/asymptote.info b/graphics/asymptote/doc/png/asymptote.info
index 5c363d9e89..a17dcd8576 100644
--- a/graphics/asymptote/doc/png/asymptote.info
+++ b/graphics/asymptote/doc/png/asymptote.info
@@ -1,7 +1,7 @@
This is asymptote.info, produced by makeinfo version 6.7 from
asymptote.texi.
-This file documents 'Asymptote', version 2.74.
+This file documents 'Asymptote', version 2.75.
<https://asymptote.sourceforge.io>
@@ -22,7 +22,7 @@ File: asymptote.info, Node: Top, Next: Description, Prev: (dir), Up: (dir)
Asymptote
*********
-This file documents 'Asymptote', version 2.74.
+This file documents 'Asymptote', version 2.75.
<https://asymptote.sourceforge.io>
@@ -7127,8 +7127,11 @@ There are six choices for viewing 3D 'Asymptote' output:
external viewer or conversion to an alternate 3D format with the
Python 'pyv3d' library. The 'V3D' specification and the 'pyv3d'
library are available at <https://gitlab.com/vectorgraphics/v3d>.
- A 'V3D' file 'file.v3d' may be imported and viewed by Asymptote
- with the 'v3d' module:
+ A 'V3D' file 'file.v3d' may be imported and viewed by 'Asymptote'
+ either by specifying 'file.v3d' on the command line
+ asy -V file.v3d
+ or using the 'v3d' module and 'importv3d' function in interactive
+ mode (or within an 'Asymptote' file):
import v3d;
importv3d("file.v3d");
@@ -8310,7 +8313,7 @@ Options (negate by replacing - with -no):
-localhistory Use a local interactive history file [false]
-loop Loop 3D animations [false]
-lossy Use single precision for V3D reals [false]
--lsp Special interactive mode for lsp-rpc [false]
+-lsp Interactive mode for the Language Server Protocol [false]
-m,-mask Mask fpu exceptions; command-line only
-maxtile pair Maximum rendering tile size [(1024,768)]
-maxviewport pair Maximum viewport size [(0,0)]
@@ -8358,8 +8361,8 @@ Options (negate by replacing - with -no):
-warn string Enable warning; command-line only
-webgl2 Use webgl2 if available [false]
-where Show where listed variables are declared [false]
--wsl Set to WSL mode when running asy inside WSL. [false]
--xasy Special interactive mode for xasy [false]
+-wsl Run asy under the Windows Subsystem for Linux. [false]
+-xasy Interactive mode for xasy [false]
-zoomPinchCap limit WebGL maximum zoom pinch [100]
-zoomPinchFactor n WebGL zoom pinch sensitivity [10]
-zoomfactor factor Zoom step factor [1.05]
@@ -8931,7 +8934,7 @@ Index
* 2D graphs: graph. (line 6)
* 3D graphs: graph3. (line 6)
* 3D grids: grid3. (line 6)
-* 3D PostScript: three. (line 652)
+* 3D PostScript: three. (line 655)
* :: Arithmetic & logical.
(line 61)
* ::: Bezier curves. (line 70)
@@ -8971,7 +8974,7 @@ Index
* absolute <1>: three. (line 241)
* accel: Paths and guides. (line 126)
* accel <1>: Paths and guides. (line 132)
-* accel <2>: three. (line 553)
+* accel <2>: three. (line 556)
* access: Import. (line 6)
* access <1>: Import. (line 45)
* acknowledgments: Credits. (line 6)
@@ -8985,8 +8988,8 @@ Index
(line 217)
* add <1>: Frames and pictures.
(line 231)
-* add <2>: three. (line 329)
-* addViews: three. (line 446)
+* add <2>: three. (line 332)
+* addViews: three. (line 449)
* adjust: Pens. (line 123)
* Ai: Mathematical functions.
(line 48)
@@ -9016,16 +9019,16 @@ Index
* append <1>: Arrays. (line 39)
* arc: Paths and guides. (line 24)
* Arc: Paths and guides. (line 37)
-* arc <1>: three. (line 340)
+* arc <1>: three. (line 343)
* ArcArrow: draw. (line 26)
-* ArcArrow3: three. (line 619)
+* ArcArrow3: three. (line 622)
* ArcArrows: draw. (line 26)
-* ArcArrows3: three. (line 619)
+* ArcArrows3: three. (line 622)
* arclength: Paths and guides. (line 153)
-* arclength <1>: three. (line 553)
+* arclength <1>: three. (line 556)
* arcpoint: Paths and guides. (line 163)
* arctime: Paths and guides. (line 157)
-* arctime <1>: three. (line 553)
+* arctime <1>: three. (line 556)
* arguments: Default arguments. (line 6)
* arithmetic operators: Arithmetic & logical.
(line 6)
@@ -9039,10 +9042,10 @@ Index
* arrow keys: Drawing in interactive mode.
(line 11)
* arrow keys <1>: GUI usage. (line 6)
-* Arrow3: three. (line 619)
+* Arrow3: three. (line 622)
* arrows: draw. (line 26)
* Arrows: draw. (line 26)
-* Arrows3: three. (line 619)
+* Arrows3: three. (line 622)
* as: Import. (line 67)
* ascii: Data types. (line 309)
* ascii <1>: Data types. (line 309)
@@ -9079,7 +9082,7 @@ Index
(line 276)
* attach <1>: LaTeX usage. (line 50)
* attach <2>: graph. (line 406)
-* autoadjust: three. (line 415)
+* autoadjust: three. (line 418)
* autoimport: Options. (line 133)
* automatic scaling: graph. (line 710)
* automatic scaling <1>: graph. (line 710)
@@ -9094,11 +9097,11 @@ Index
* background <1>: three. (line 97)
* background color: Frames and pictures.
(line 180)
-* BackView: three. (line 439)
+* BackView: three. (line 442)
* Bar: draw. (line 19)
-* Bar3: three. (line 619)
+* Bar3: three. (line 622)
* Bars: draw. (line 19)
-* Bars3: three. (line 619)
+* Bars3: three. (line 622)
* barsize: draw. (line 19)
* base modules: Base modules. (line 6)
* basealign: Pens. (line 181)
@@ -9107,18 +9110,18 @@ Index
(line 6)
* beep: Data types. (line 382)
* BeginArcArrow: draw. (line 26)
-* BeginArcArrow3: three. (line 619)
+* BeginArcArrow3: three. (line 622)
* BeginArrow: draw. (line 26)
-* BeginArrow3: three. (line 619)
+* BeginArrow3: three. (line 622)
* BeginBar: draw. (line 19)
-* BeginBar3: three. (line 619)
+* BeginBar3: three. (line 622)
* BeginDotMargin: draw. (line 42)
-* BeginDotMargin3: three. (line 635)
+* BeginDotMargin3: three. (line 638)
* BeginMargin: draw. (line 42)
-* BeginMargin3: three. (line 635)
+* BeginMargin3: three. (line 638)
* BeginPenMargin: draw. (line 42)
-* BeginPenMargin2: three. (line 635)
-* BeginPenMargin3: three. (line 635)
+* BeginPenMargin2: three. (line 638)
+* BeginPenMargin3: three. (line 638)
* BeginPoint: label. (line 55)
* Bessel: Mathematical functions.
(line 48)
@@ -9130,7 +9133,7 @@ Index
* bezulate: three. (line 146)
* Bi: Mathematical functions.
(line 48)
-* Billboard: three. (line 523)
+* Billboard: three. (line 526)
* binary: Files. (line 80)
* binary format: Files. (line 80)
* binary operators: Arithmetic & logical.
@@ -9157,7 +9160,7 @@ Index
(line 6)
* Bottom: graph. (line 132)
* BottomTop: graph. (line 138)
-* BottomView: three. (line 439)
+* BottomView: three. (line 442)
* bounding box: Frames and pictures.
(line 180)
* bounds: palette. (line 43)
@@ -9166,8 +9169,8 @@ Index
(line 25)
* box <1>: Frames and pictures.
(line 130)
-* box <2>: three. (line 362)
-* box <3>: three. (line 364)
+* box <2>: three. (line 365)
+* box <3>: three. (line 367)
* bp: Drawing in batch mode.
(line 23)
* brace: Paths and guides. (line 51)
@@ -9185,7 +9188,7 @@ Index
* CAD: CAD. (line 6)
* calculateTransform: Frames and pictures.
(line 118)
-* camera: three. (line 409)
+* camera: three. (line 412)
* casts: Casts. (line 6)
* cbrt: Mathematical functions.
(line 6)
@@ -9193,7 +9196,7 @@ Index
* ceil: Mathematical functions.
(line 26)
* Center: label. (line 60)
-* center: three. (line 392)
+* center: three. (line 395)
* checker: Pens. (line 285)
* Chinese: Pens. (line 244)
* choose: Mathematical functions.
@@ -9202,7 +9205,7 @@ Index
(line 48)
* circle: Paths and guides. (line 10)
* Circle: Paths and guides. (line 18)
-* circle <1>: three. (line 336)
+* circle <1>: three. (line 339)
* circle <2>: flowchart. (line 61)
* circlebarframe: markers. (line 18)
* CJK: Pens. (line 244)
@@ -9284,7 +9287,7 @@ Index
* curlSpecifier: Paths and guides. (line 408)
* currentlight: three. (line 76)
* currentpen: Pens. (line 6)
-* currentprojection: three. (line 436)
+* currentprojection: three. (line 439)
* curve: slopefield. (line 20)
* custom axis types: graph. (line 141)
* custom mark routine: graph. (line 577)
@@ -9296,7 +9299,7 @@ Index
* cyclic: Paths and guides. (line 85)
* cyclic <1>: Paths and guides. (line 376)
* cyclic <2>: Arrays. (line 39)
-* cyclic <3>: three. (line 553)
+* cyclic <3>: three. (line 556)
* Cyrillic: Pens. (line 237)
* dashdotted: Pens. (line 102)
* dashed: Pens. (line 102)
@@ -9310,7 +9313,7 @@ Index
* default arguments: Default arguments. (line 6)
* defaultformat: graph. (line 175)
* DefaultHead: draw. (line 26)
-* DefaultHead3: three. (line 619)
+* DefaultHead3: three. (line 622)
* defaultpen: Pens. (line 49)
* defaultpen <1>: Pens. (line 122)
* defaultpen <2>: Pens. (line 127)
@@ -9338,7 +9341,7 @@ Index
* dir <1>: Data types. (line 90)
* dir <2>: Data types. (line 181)
* dir <3>: Paths and guides. (line 109)
-* dir <4>: three. (line 553)
+* dir <4>: three. (line 556)
* direction specifier: Bezier curves. (line 6)
* directory: Files. (line 26)
* dirSpecifier: Paths and guides. (line 390)
@@ -9353,11 +9356,11 @@ Index
* dot <3>: Arrays. (line 271)
* dot <4>: Arrays. (line 274)
* DotMargin: draw. (line 42)
-* DotMargin3: three. (line 635)
+* DotMargin3: three. (line 638)
* DotMargins: draw. (line 42)
-* DotMargins3: three. (line 635)
+* DotMargins3: three. (line 638)
* dotted: Pens. (line 102)
-* double deferred drawing: three. (line 314)
+* double deferred drawing: three. (line 317)
* double precision: Files. (line 80)
* draw: Drawing commands. (line 34)
* draw <1>: draw. (line 6)
@@ -9388,24 +9391,24 @@ Index
* else: Programming. (line 26)
* emacs: Editing modes. (line 6)
* embed: embed. (line 6)
-* Embedded: three. (line 523)
+* Embedded: three. (line 526)
* emissivepen: three. (line 66)
* empty: Frames and pictures.
(line 7)
* EndArcArrow: draw. (line 26)
-* EndArcArrow3: three. (line 619)
+* EndArcArrow3: three. (line 622)
* EndArrow: draw. (line 26)
-* EndArrow3: three. (line 619)
+* EndArrow3: three. (line 622)
* EndBar: draw. (line 19)
-* EndBar3: three. (line 619)
+* EndBar3: three. (line 622)
* EndDotMargin: draw. (line 42)
-* EndDotMargin3: three. (line 635)
+* EndDotMargin3: three. (line 638)
* endl: Files. (line 65)
* EndMargin: draw. (line 42)
-* EndMargin3: three. (line 635)
+* EndMargin3: three. (line 638)
* EndPenMargin: draw. (line 42)
-* EndPenMargin2: three. (line 635)
-* EndPenMargin3: three. (line 635)
+* EndPenMargin2: three. (line 638)
+* EndPenMargin3: three. (line 638)
* EndPoint: label. (line 55)
* envelope: Frames and pictures.
(line 25)
@@ -9452,12 +9455,12 @@ Index
* extension: Paths and guides. (line 246)
* extension <1>: MetaPost. (line 10)
* external: embed. (line 11)
-* extrude: three. (line 547)
+* extrude: three. (line 550)
* F: Mathematical functions.
(line 48)
* fabs: Mathematical functions.
(line 6)
-* face: three. (line 659)
+* face: three. (line 662)
* factorial: Mathematical functions.
(line 39)
* Fedora: UNIX binary distributions.
@@ -9488,7 +9491,7 @@ Index
* firstcut: Paths and guides. (line 262)
* fit: Frames and pictures.
(line 113)
-* fit3: three. (line 327)
+* fit3: three. (line 330)
* fixedscaling: Frames and pictures.
(line 81)
* floor: Mathematical functions.
@@ -9512,7 +9515,7 @@ Index
(line 7)
* freshnel0: three. (line 66)
* from: Import. (line 16)
-* FrontView: three. (line 439)
+* FrontView: three. (line 442)
* function declarations: Functions. (line 79)
* Function shading: fill. (line 100)
* function shading: fill. (line 100)
@@ -9575,14 +9578,14 @@ Index
* hex <1>: Pens. (line 64)
* hexadecimal: Data types. (line 306)
* hexadecimal <1>: Pens. (line 62)
-* hidden surface removal: three. (line 659)
+* hidden surface removal: three. (line 662)
* histogram: Mathematical functions.
(line 39)
* history: Files. (line 147)
* history <1>: Interactive mode. (line 54)
* historylines: Interactive mode. (line 57)
* HookHead: draw. (line 26)
-* HookHead3: three. (line 619)
+* HookHead3: three. (line 622)
* Horizontal: flowchart. (line 77)
* HTML5: three. (line 233)
* htmlviewer: Configuring. (line 20)
@@ -9599,7 +9602,7 @@ Index
* identity <1>: Mathematical functions.
(line 6)
* identity <2>: Arrays. (line 313)
-* identity4: three. (line 491)
+* identity4: three. (line 494)
* if: Programming. (line 26)
* IgnoreAspect: Frames and pictures.
(line 63)
@@ -9615,6 +9618,7 @@ Index
* implicit scaling: Implicit scaling. (line 6)
* implicitsurface: smoothcontour3. (line 16)
* import: Import. (line 45)
+* importv3d: three. (line 308)
* inches: Figure size. (line 18)
* incircle: Data types. (line 120)
* include: Import. (line 134)
@@ -9637,7 +9641,7 @@ Index
* inside: Paths and guides. (line 294)
* inside <1>: Paths and guides. (line 299)
* inside <2>: Paths and guides. (line 305)
-* insphere: three. (line 582)
+* insphere: three. (line 585)
* inst: Debugger. (line 35)
* installation: Installation. (line 6)
* int: Data types. (line 30)
@@ -9656,23 +9660,23 @@ Index
* interpolate: interpolate. (line 6)
* intersect: Paths and guides. (line 195)
* intersect <1>: math. (line 13)
-* intersect <2>: three. (line 553)
+* intersect <2>: three. (line 556)
* intersectionpoint: Paths and guides. (line 238)
* intersectionpoint <1>: math. (line 17)
-* intersectionpoint <2>: three. (line 553)
+* intersectionpoint <2>: three. (line 556)
* intersectionpoints: Paths and guides. (line 242)
-* intersectionpoints <1>: three. (line 553)
-* intersectionpoints <2>: three. (line 566)
+* intersectionpoints <1>: three. (line 556)
+* intersectionpoints <2>: three. (line 569)
* intersections: Paths and guides. (line 206)
* intersections <1>: Paths and guides. (line 213)
-* intersections <2>: three. (line 553)
-* intersections <3>: three. (line 559)
+* intersections <2>: three. (line 556)
+* intersections <3>: three. (line 562)
* InTicks: graph3. (line 35)
* intMax: Data types. (line 30)
* intMin: Data types. (line 30)
* inverse: Transforms. (line 16)
* inverse <1>: Arrays. (line 319)
-* invert: three. (line 481)
+* invert: three. (line 484)
* invisible: Pens. (line 43)
* isnan: Data types. (line 35)
* i_scaled: Mathematical functions.
@@ -9704,7 +9708,7 @@ Index
* label <1>: label. (line 6)
* Label <1>: label. (line 14)
* Label <2>: graph. (line 330)
-* label <2>: three. (line 517)
+* label <2>: three. (line 520)
* labelpath: labelpath. (line 6)
* labelpath3: labelpath3. (line 6)
* labelx: graph. (line 330)
@@ -9730,7 +9734,7 @@ Index
* LeftSide: label. (line 60)
* LeftTicks: graph. (line 160)
* LeftTicks <1>: graph. (line 233)
-* LeftView: three. (line 439)
+* LeftView: three. (line 442)
* legend: Drawing commands. (line 34)
* legend <1>: draw. (line 65)
* legend <2>: graph. (line 424)
@@ -9742,7 +9746,7 @@ Index
* length <3>: Paths and guides. (line 76)
* length <4>: Paths and guides. (line 373)
* length <5>: Arrays. (line 39)
-* length <6>: three. (line 553)
+* length <6>: three. (line 556)
* letter: Configuring. (line 68)
* lexorder: math. (line 63)
* lexorder <1>: math. (line 66)
@@ -9794,11 +9798,11 @@ Index
* map <2>: map. (line 6)
* Margin: draw. (line 42)
* Margin <1>: draw. (line 42)
-* Margin3: three. (line 635)
-* Margin3 <1>: three. (line 635)
+* Margin3: three. (line 638)
+* Margin3 <1>: three. (line 638)
* Margins: draw. (line 42)
-* margins: three. (line 320)
-* Margins3: three. (line 635)
+* margins: three. (line 323)
+* Margins3: three. (line 638)
* mark: graph. (line 480)
* markangle: markers. (line 35)
* marker: graph. (line 480)
@@ -9815,7 +9819,7 @@ Index
(line 7)
* max <2>: Arrays. (line 230)
* max <3>: Arrays. (line 240)
-* max <4>: three. (line 553)
+* max <4>: three. (line 556)
* maxbound: Data types. (line 134)
* maxbound <1>: Data types. (line 205)
* maxtile: three. (line 261)
@@ -9830,9 +9834,9 @@ Index
* MetaPost whatever: MetaPost. (line 10)
* Microsoft Windows: Microsoft Windows. (line 6)
* MidArcArrow: draw. (line 26)
-* MidArcArrow3: three. (line 619)
+* MidArcArrow3: three. (line 622)
* MidArrow: draw. (line 26)
-* MidArrow3: three. (line 619)
+* MidArrow3: three. (line 622)
* MidPoint: label. (line 55)
* midpoint: Paths and guides. (line 180)
* min: Paths and guides. (line 275)
@@ -9840,7 +9844,7 @@ Index
(line 7)
* min <2>: Arrays. (line 225)
* min <3>: Arrays. (line 235)
-* min <4>: three. (line 553)
+* min <4>: three. (line 556)
* minbound: Data types. (line 131)
* minbound <1>: Data types. (line 202)
* minipage: label. (line 116)
@@ -9884,11 +9888,11 @@ Index
* noglobalread <1>: Files. (line 40)
* nolight: three. (line 76)
* NoMargin: draw. (line 42)
-* NoMargin3: three. (line 635)
+* NoMargin3: three. (line 638)
* None: draw. (line 19)
* None <1>: draw. (line 26)
* none: Files. (line 65)
-* normal: three. (line 539)
+* normal: three. (line 542)
* nosafe: Options. (line 191)
* NOT: Arithmetic & logical.
(line 68)
@@ -9901,13 +9905,13 @@ Index
(line 140)
* nullpen <2>: Frames and pictures.
(line 149)
-* NURBS: three. (line 419)
-* O: three. (line 332)
+* NURBS: three. (line 422)
+* O: three. (line 335)
* obj: obj. (line 6)
-* oblique: three. (line 375)
-* obliqueX: three. (line 382)
-* obliqueY: three. (line 388)
-* obliqueZ: three. (line 375)
+* oblique: three. (line 378)
+* obliqueX: three. (line 385)
+* obliqueY: three. (line 391)
+* obliqueZ: three. (line 378)
* ode: ode. (line 6)
* offset: Pens. (line 123)
* offset <1>: Options. (line 196)
@@ -9934,10 +9938,10 @@ Index
* OR: Arithmetic & logical.
(line 68)
* orient: Data types. (line 108)
-* orient <1>: three. (line 570)
+* orient <1>: three. (line 573)
* orientation: Frames and pictures.
(line 104)
-* orthographic: three. (line 392)
+* orthographic: three. (line 395)
* outformat: three. (line 184)
* outprefix: Frames and pictures.
(line 91)
@@ -9982,31 +9986,31 @@ Index
* pdfviewerOptions: Options. (line 152)
* pen: Pens. (line 6)
* PenMargin: draw. (line 42)
-* PenMargin2: three. (line 635)
-* PenMargin3: three. (line 635)
+* PenMargin2: three. (line 638)
+* PenMargin3: three. (line 638)
* PenMargins: draw. (line 42)
-* PenMargins2: three. (line 635)
-* PenMargins3: three. (line 635)
+* PenMargins2: three. (line 638)
+* PenMargins3: three. (line 638)
* periodic: graph. (line 36)
* perl: LaTeX usage. (line 30)
* perpendicular: geometry. (line 6)
-* perspective: three. (line 419)
+* perspective: three. (line 422)
* physically based rendering: three. (line 74)
* picture: Frames and pictures.
(line 39)
* picture alignment: Frames and pictures.
(line 231)
* piecewisestraight: Paths and guides. (line 92)
-* pixel: three. (line 642)
+* pixel: three. (line 645)
* Pl: Mathematical functions.
(line 48)
* plain: plain. (line 6)
* planar: three. (line 128)
-* plane: three. (line 358)
-* planeproject: three. (line 536)
+* plane: three. (line 361)
+* planeproject: three. (line 539)
* point: Paths and guides. (line 95)
* point <1>: Paths and guides. (line 379)
-* point <2>: three. (line 553)
+* point <2>: three. (line 556)
* polar: Data types. (line 149)
* polargraph: graph. (line 88)
* polygon: graph. (line 480)
@@ -10016,7 +10020,7 @@ Index
* position: three. (line 76)
* position <1>: three. (line 184)
* postcontrol: Paths and guides. (line 146)
-* postcontrol <1>: three. (line 553)
+* postcontrol <1>: three. (line 556)
* postfix operators: Self & prefix operators.
(line 19)
* postscript: Frames and pictures.
@@ -10028,7 +10032,7 @@ Index
* prc: three. (line 279)
* precision: Files. (line 97)
* precontrol: Paths and guides. (line 139)
-* precontrol <1>: three. (line 553)
+* precontrol <1>: three. (line 556)
* prefix operators: Self & prefix operators.
(line 6)
* private: Structures. (line 6)
@@ -10060,7 +10064,7 @@ Index
* radians: Mathematical functions.
(line 17)
* radius: Paths and guides. (line 135)
-* radius <1>: three. (line 553)
+* radius <1>: three. (line 556)
* Rainbow: palette. (line 12)
* rand: Mathematical functions.
(line 39)
@@ -10101,7 +10105,7 @@ Index
* reverse <1>: Paths and guides. (line 183)
* reverse <2>: Paths and guides. (line 382)
* reverse <3>: Arrays. (line 145)
-* reverse <4>: three. (line 553)
+* reverse <4>: three. (line 556)
* rewind: Files. (line 97)
* rfind: Data types. (line 247)
* rgb: Pens. (line 30)
@@ -10113,9 +10117,9 @@ Index
* RightSide: label. (line 60)
* RightTicks: graph. (line 160)
* RightTicks <1>: graph. (line 233)
-* RightView: three. (line 439)
+* RightView: three. (line 442)
* Rotate: label. (line 36)
-* rotate: three. (line 507)
+* rotate: three. (line 510)
* Rotate(pair z): label. (line 39)
* round: Mathematical functions.
(line 26)
@@ -10138,8 +10142,8 @@ Index
* scale <2>: Transforms. (line 36)
* scale <3>: graph. (line 710)
* Scale <1>: graph. (line 727)
-* scale <4>: three. (line 506)
-* scale3: three. (line 504)
+* scale <4>: three. (line 509)
+* scale3: three. (line 507)
* scaled graph: graph. (line 690)
* scientific graph: graph. (line 387)
* scroll: Files. (line 113)
@@ -10168,12 +10172,12 @@ Index
* shift: Transforms. (line 26)
* shift <1>: Transforms. (line 28)
* shift <2>: Transforms. (line 46)
-* shift <3>: three. (line 496)
+* shift <3>: three. (line 499)
* shiftless: Transforms. (line 46)
* shininess: three. (line 66)
* shipout: Frames and pictures.
(line 91)
-* showtarget: three. (line 392)
+* showtarget: three. (line 395)
* Si: Mathematical functions.
(line 48)
* signedint: Files. (line 80)
@@ -10193,9 +10197,9 @@ Index
* singlereal <1>: Files. (line 93)
* sinh: Mathematical functions.
(line 6)
-* SixViews: three. (line 454)
-* SixViewsFR: three. (line 454)
-* SixViewsUS: three. (line 454)
+* SixViews: three. (line 457)
+* SixViewsFR: three. (line 457)
+* SixViewsUS: three. (line 457)
* size: Figure size. (line 6)
* size <1>: Paths and guides. (line 81)
* size <2>: Paths and guides. (line 370)
@@ -10203,9 +10207,9 @@ Index
(line 48)
* size <4>: Frames and pictures.
(line 74)
-* size <5>: three. (line 553)
+* size <5>: three. (line 556)
* size <6>: Options. (line 166)
-* size3: three. (line 317)
+* size3: three. (line 320)
* Slant: label. (line 42)
* slant: Transforms. (line 38)
* sleep: Data types. (line 376)
@@ -10249,7 +10253,7 @@ Index
* stop: Debugger. (line 10)
* straight: Paths and guides. (line 88)
* Straight: graph. (line 30)
-* straight <1>: three. (line 553)
+* straight <1>: three. (line 556)
* strftime: Data types. (line 321)
* strftime <1>: Data types. (line 346)
* string: Data types. (line 208)
@@ -10261,7 +10265,7 @@ Index
* struct: Structures. (line 6)
* structures: Structures. (line 6)
* subpath: Paths and guides. (line 186)
-* subpath <1>: three. (line 553)
+* subpath <1>: three. (line 556)
* subpictures: Frames and pictures.
(line 113)
* substr: Data types. (line 262)
@@ -10287,7 +10291,7 @@ Index
(line 20)
* tanh: Mathematical functions.
(line 6)
-* target: three. (line 392)
+* target: three. (line 395)
* tell: Files. (line 97)
* tension: Bezier curves. (line 56)
* tension <1>: three. (line 6)
@@ -10302,7 +10306,7 @@ Index
* TeX string: Data types. (line 208)
* texcommand: Configuring. (line 74)
* TeXHead: draw. (line 26)
-* TeXHead3: three. (line 619)
+* TeXHead3: three. (line 622)
* texpath: Configuring. (line 74)
* texpath <1>: label. (line 113)
* texpreamble: Frames and pictures.
@@ -10316,9 +10320,9 @@ Index
* thin: three. (line 166)
* this: Structures. (line 6)
* three: three. (line 6)
-* ThreeViews: three. (line 454)
-* ThreeViewsFR: three. (line 454)
-* ThreeViewsUS: three. (line 454)
+* ThreeViews: three. (line 457)
+* ThreeViewsFR: three. (line 457)
+* ThreeViewsUS: three. (line 457)
* tick: graph. (line 330)
* ticks: graph. (line 160)
* Ticks: graph. (line 160)
@@ -10333,12 +10337,12 @@ Index
* times: Paths and guides. (line 220)
* times <1>: Paths and guides. (line 224)
* Top: graph. (line 135)
-* TopView: three. (line 439)
+* TopView: three. (line 442)
* trace: Debugger. (line 50)
* trailingzero: graph. (line 175)
* transform: Transforms. (line 6)
-* transform <1>: three. (line 528)
-* transform3: three. (line 491)
+* transform <1>: three. (line 531)
+* transform3: three. (line 494)
* transparency: Pens. (line 254)
* transparent: three. (line 97)
* transpose: Arrays. (line 212)
@@ -10353,7 +10357,7 @@ Index
(line 48)
* triple: Data types. (line 137)
* TrueMargin: draw. (line 42)
-* TrueMargin3: three. (line 635)
+* TrueMargin3: three. (line 638)
* tube: three. (line 166)
* tube <1>: tube. (line 6)
* tutorial: Tutorial. (line 6)
@@ -10374,10 +10378,10 @@ Index
* unit: Data types. (line 83)
* unit <1>: Data types. (line 174)
* unitbox: Paths. (line 44)
-* unitbox <1>: three. (line 364)
+* unitbox <1>: three. (line 367)
* unitcircle: Paths. (line 17)
* unitcircle <1>: Paths. (line 17)
-* unitcircle <2>: three. (line 332)
+* unitcircle <2>: three. (line 335)
* unitrand: Mathematical functions.
(line 39)
* unitsize: Figure size. (line 39)
@@ -10387,7 +10391,7 @@ Index
(line 6)
* unpacking: Rest arguments. (line 39)
* unravel: Import. (line 29)
-* up: three. (line 392)
+* up: three. (line 395)
* update: Files. (line 38)
* UpsideDown: Frames and pictures.
(line 104)
@@ -10417,8 +10421,8 @@ Index
* Vertical: flowchart. (line 77)
* Viewport: three. (line 76)
* viewportheight: LaTeX usage. (line 50)
-* viewportmargin: three. (line 320)
-* viewportsize: three. (line 320)
+* viewportmargin: three. (line 323)
+* viewportsize: three. (line 323)
* viewportwidth: LaTeX usage. (line 50)
* views: three. (line 279)
* vim: Editing modes. (line 32)
@@ -10437,7 +10441,7 @@ Index
* word: Arrays. (line 366)
* write: Files. (line 57)
* write <1>: Arrays. (line 405)
-* X: three. (line 332)
+* X: three. (line 335)
* xasy: GUI. (line 6)
* xaxis3: graph3. (line 7)
* xdr: Files. (line 80)
@@ -10450,10 +10454,10 @@ Index
* xpart: Data types. (line 94)
* xpart <1>: Data types. (line 185)
* xscale: Transforms. (line 30)
-* xscale3: three. (line 498)
+* xscale3: three. (line 501)
* xtick: graph. (line 330)
-* XY: three. (line 513)
-* XY <1>: three. (line 528)
+* XY: three. (line 516)
+* XY <1>: three. (line 531)
* XYEquals: graph3. (line 21)
* XYZero: graph3. (line 21)
* XZEquals: graph3. (line 21)
@@ -10463,7 +10467,7 @@ Index
(line 6)
* Y <1>: Mathematical functions.
(line 48)
-* Y <2>: three. (line 332)
+* Y <2>: three. (line 335)
* yaxis3: graph3. (line 7)
* YEquals: graph. (line 128)
* yequals: graph. (line 278)
@@ -10471,14 +10475,14 @@ Index
* ypart: Data types. (line 97)
* ypart <1>: Data types. (line 188)
* yscale: Transforms. (line 32)
-* yscale3: three. (line 500)
+* yscale3: three. (line 503)
* ytick: graph. (line 330)
-* YX: three. (line 528)
-* YZ: three. (line 528)
+* YX: three. (line 531)
+* YZ: three. (line 531)
* YZEquals: graph3. (line 21)
* YZero: graph. (line 123)
* YZZero: graph3. (line 21)
-* Z: three. (line 332)
+* Z: three. (line 335)
* zaxis3: graph3. (line 7)
* zeroTransform: Transforms. (line 44)
* zerowinding: Pens. (line 164)
@@ -10495,10 +10499,10 @@ Index
* zeta: Mathematical functions.
(line 48)
* zpart: Data types. (line 191)
-* zscale3: three. (line 502)
-* ZX: three. (line 528)
-* ZX <1>: three. (line 528)
-* ZY: three. (line 528)
+* zscale3: three. (line 505)
+* ZX: three. (line 531)
+* ZX <1>: three. (line 531)
+* ZY: three. (line 531)

@@ -10620,36 +10624,36 @@ Ref: logimage267645
Ref: penimage268751
Ref: penfunctionimage269014
Node: three269786
-Ref: PostScript3D299921
-Node: obj301659
-Node: graph3301908
-Ref: GaussianSurface307190
-Node: grid3308340
-Node: solids309125
-Node: tube310117
-Node: flowchart312347
-Node: contour316990
-Node: contour3323498
-Node: smoothcontour3323810
-Node: slopefield325529
-Node: ode327018
-Node: Options327275
-Ref: configuration file334763
-Ref: settings334763
-Ref: texengines336027
-Ref: convert336027
-Node: Interactive mode339470
-Ref: history341619
-Node: GUI342922
-Node: GUI installation343472
-Node: GUI usage344205
-Node: Command-Line Interface345268
-Node: Language server protocol346710
-Node: PostScript to Asymptote348135
-Node: Help348913
-Node: Debugger350587
-Node: Credits352343
-Node: Index353520
+Ref: PostScript3D300087
+Node: obj301825
+Node: graph3302074
+Ref: GaussianSurface307356
+Node: grid3308506
+Node: solids309291
+Node: tube310283
+Node: flowchart312513
+Node: contour317156
+Node: contour3323664
+Node: smoothcontour3323976
+Node: slopefield325695
+Node: ode327184
+Node: Options327441
+Ref: configuration file334936
+Ref: settings334936
+Ref: texengines336200
+Ref: convert336200
+Node: Interactive mode339643
+Ref: history341792
+Node: GUI343095
+Node: GUI installation343645
+Node: GUI usage344378
+Node: Command-Line Interface345441
+Node: Language server protocol346883
+Node: PostScript to Asymptote348308
+Node: Help349086
+Node: Debugger350760
+Node: Credits352516
+Node: Index353693

End Tag Table
diff --git a/graphics/asymptote/drawgroup.h b/graphics/asymptote/drawgroup.h
index 5dffe5a35f..22aa858a96 100644
--- a/graphics/asymptote/drawgroup.h
+++ b/graphics/asymptote/drawgroup.h
@@ -18,11 +18,6 @@ public:
virtual ~drawBegin() {}
- bool draw(psfile *out) {
- out->lastpen=camp::pen(camp::initialpen);
- return true;
- }
-
bool begingroup() {return true;}
};
@@ -32,11 +27,6 @@ public:
virtual ~drawEnd() {}
- bool draw(psfile *out) {
- out->lastpen=camp::pen(camp::initialpen);
- return true;
- }
-
bool endgroup() {return true;}
};
diff --git a/graphics/asymptote/drawpath3.h b/graphics/asymptote/drawpath3.h
index c4153909ba..c870675188 100644
--- a/graphics/asymptote/drawpath3.h
+++ b/graphics/asymptote/drawpath3.h
@@ -35,11 +35,7 @@ public:
BezierCurve R;
#endif
void init() {
-#ifdef HAVE_LIBOSMESA
- billboard=false;
-#else
billboard=interaction == BILLBOARD;
-#endif
centerIndex=0;
}
diff --git a/graphics/asymptote/drawsurface.h b/graphics/asymptote/drawsurface.h
index 9ece42a818..4577ae8e17 100644
--- a/graphics/asymptote/drawsurface.h
+++ b/graphics/asymptote/drawsurface.h
@@ -60,11 +60,7 @@ public:
}
void init() {
-#ifdef HAVE_LIBOSMESA
- billboard=false;
-#else
billboard=interaction == BILLBOARD;
-#endif
centerIndex=0;
}
@@ -532,11 +528,7 @@ public:
public:
void init() {
-#ifdef HAVE_LIBOSMESA
- billboard=false;
-#else
billboard=interaction == BILLBOARD;
-#endif
centerIndex=0;
}
diff --git a/graphics/asymptote/main.cc b/graphics/asymptote/main.cc
index 4359111829..f4a40d0a6c 100644
--- a/graphics/asymptote/main.cc
+++ b/graphics/asymptote/main.cc
@@ -192,7 +192,12 @@ void *asymain(void *A)
}
} else {
for(int ind=0; ind < n; ind++) {
- processFile(string(getArg(ind)),n > 1);
+ string name=(getArg(ind));
+ if(name == stripExt(name)+".v3d") {
+ interact::uptodate=false;
+ runString("import v3d; importv3d(\""+name+"\");");
+ } else
+ processFile(name,n > 1);
try {
if(ind < n-1)
setOptions(args->argc,args->argv);
diff --git a/graphics/asymptote/pair.h b/graphics/asymptote/pair.h
index d9003839ab..c94be1abb4 100644
--- a/graphics/asymptote/pair.h
+++ b/graphics/asymptote/pair.h
@@ -21,7 +21,10 @@
#include "common.h"
#include "angle.h"
+
+#ifdef HAVE_RPC_RPC_H
#include "xstream.h"
+#endif
namespace camp {
diff --git a/graphics/asymptote/pen.h b/graphics/asymptote/pen.h
index 8df33b144b..f89863951c 100644
--- a/graphics/asymptote/pen.h
+++ b/graphics/asymptote/pen.h
@@ -419,7 +419,7 @@ public:
font("<invalid>"), fontsize(-1.0), lineskip(-1.0), color(INVISIBLE),
r(0.0), g(0.0), b(0.0), grey(0.0),
pattern(DEFPAT), fillrule(DEFFILL), baseline(NOBASEALIGN),
- transparency(),linecap(-2), linejoin(-2), miterlimit(-1.0),
+ transparency("",-1.0),linecap(-2), linejoin(-2), miterlimit(-1.0),
overwrite(DEFWRITE), t(nullTransform) {}
double width() const {
diff --git a/graphics/asymptote/picture.cc b/graphics/asymptote/picture.cc
index 112ff18748..bbd8adcde6 100644
--- a/graphics/asymptote/picture.cc
+++ b/graphics/asymptote/picture.cc
@@ -839,8 +839,7 @@ bool picture::postprocess(const string& prename, const string& outname,
cmd.push_back("-dNOPAUSE");
cmd.push_back("-dBATCH");
cmd.push_back("-P");
- cmd.push_back("-sDEVICE=pngalpha");
- cmd.push_back("-dEPSCrop");
+ cmd.push_back("-sDEVICE="+getSetting<string>("pngdriver"));
if(safe)
cmd.push_back("-dSAFER");
cmd.push_back("-r"+String(res)+"x"+String(res));
@@ -981,8 +980,8 @@ bool picture::shipout(picture *preamble, const string& Prefix,
string texengineSave;
- if(!empty && !deconstruct && svgformat && texengine == "latex"
- && havepng()) {
+ if(!empty && !deconstruct && (png || (svgformat && havepng())) &&
+ texengine == "latex") {
texengineSave=texengine;
Setting("tex")=texengine="pdflatex";
}
@@ -996,7 +995,7 @@ bool picture::shipout(picture *preamble, const string& Prefix,
string preformat=nativeformat();
bool epsformat=outputformat == "eps";
- bool pdfformat=pdf || outputformat == "pdf";
+ bool pdfformat=pdf || png || outputformat == "pdf";
bool dvi=false;
bool svg=svgformat && usetex &&
(!have3D() || getSetting<double>("render") == 0.0);
diff --git a/graphics/asymptote/prc/oPRCFile.h b/graphics/asymptote/prc/oPRCFile.h
index 4a1ef84282..fc45e58fb1 100644
--- a/graphics/asymptote/prc/oPRCFile.h
+++ b/graphics/asymptote/prc/oPRCFile.h
@@ -39,7 +39,11 @@
#include "PRC.h"
#include "PRCbitStream.h"
#include "writePRC.h"
+
+
+#ifdef HAVE_RPC_RPC_H
#include "xstream.h"
+#endif
namespace prc {
diff --git a/graphics/asymptote/psfile.cc b/graphics/asymptote/psfile.cc
index 2a8a92739c..6d882f4bed 100644
--- a/graphics/asymptote/psfile.cc
+++ b/graphics/asymptote/psfile.cc
@@ -202,7 +202,7 @@ void psfile::setcolor(const pen& p, const string& begin="",
}
}
-bool psfile::istargetfmt(string outputformat)
+bool psfile::transparentFormat(string outputformat)
{
return
outputformat == "pdf" || outputformat == "html" ||
@@ -218,7 +218,7 @@ void psfile::setopacity(const pen& p)
string outputformat=settings::getSetting<string>("outformat");
if(p.opacity() != lastpen.opacity() &&
- ((pdftex() && outputformat == "") || istargetfmt(outputformat))) {
+ ((pdftex() && outputformat == "") || transparentFormat(outputformat))) {
*out << p.opacity() << " .setfillconstantalpha" << newl
<< p.opacity() << " .setstrokeconstantalpha" << newl;
}
diff --git a/graphics/asymptote/psfile.h b/graphics/asymptote/psfile.h
index da74f4e658..b722fe4a43 100644
--- a/graphics/asymptote/psfile.h
+++ b/graphics/asymptote/psfile.h
@@ -133,18 +133,17 @@ public:
}
protected:
+ pen lastpen;
std::ostream *out;
public:
- pen lastpen;
-
bool pdftex() {return settings::pdf(settings::getSetting<string>("tex"));}
psfile(const string& filename, bool pdfformat);
psfile() {pdf=pdftex();}
- bool istargetfmt(string outputformat);
+ bool transparentFormat(string outputformat);
virtual ~psfile();
diff --git a/graphics/asymptote/revision.cc b/graphics/asymptote/revision.cc
index cb290fe434..3c2b391ae1 100644
--- a/graphics/asymptote/revision.cc
+++ b/graphics/asymptote/revision.cc
@@ -1,2 +1,2 @@
-const char *REVISION="2.74";
+const char *REVISION="2.75";
const char *AsyGLVersion="1.01";
diff --git a/graphics/asymptote/settings.cc b/graphics/asymptote/settings.cc
index ce5a5f8f47..ece58b018a 100644
--- a/graphics/asymptote/settings.cc
+++ b/graphics/asymptote/settings.cc
@@ -87,6 +87,7 @@ mode_t mask;
string systemDir=ASYMPTOTE_SYSDIR;
string defaultPSdriver="ps2write";
string defaultEPSdriver="eps2write";
+string defaultPNGdriver="png16m"; // pngalpha has issues at high resolutions
string defaultAsyGL="https://vectorgraphics.github.io/asymptote/base/webgl/asygl-"+
string(AsyGLVersion)+".js";
@@ -1016,13 +1017,13 @@ struct versionOption : public option {
feature("SSBO GLSL shader storage buffer objects",ssbo);
feature("GSL GNU Scientific Library (special functions)",gsl);
feature("FFTW3 Fast Fourier transforms",fftw3);
- feature("XDR external data representation (portable binary file format for V3D)",xdr);
+ feature("XDR External Data Representation (portable binary file format for V3D)",xdr);
feature("CURL URL support",curl);
- feature("lsp language server protocol",lsp);
- feature("Readline interactive history and editing",readline);
+ feature("LSP Language Server Protocol",lsp);
+ feature("Readline Interactive history and editing",readline);
if(!readline)
feature("Editline interactive editing (if Readline is unavailable)",editline);
- feature("Sigsegv distinguish stack overflows from segmentation faults",
+ feature("Sigsegv Distinguish stack overflows from segmentation faults",
sigsegv);
feature("GC Boehm garbage collector",usegc);
}
@@ -1364,9 +1365,9 @@ void initSettings() {
addOption(new boolSetting("multiline", 0,
"Input code over multiple lines at the prompt"));
addOption(new boolSetting("xasy", 0,
- "Special interactive mode for xasy"));
- addOption(new boolSetting("lsp", 0, "Special interactive mode for lsp-rpc"));
- addOption(new boolSetting("wsl", 0, "Set to WSL mode when running asy inside WSL."));
+ "Interactive mode for xasy"));
+ addOption(new boolSetting("lsp", 0, "Interactive mode for the Language Server Protocol"));
+ addOption(new boolSetting("wsl", 0, "Run asy under the Windows Subsystem for Linux."));
addOption(new envSetting("lspport", ""));
addOption(new envSetting("lsphost", "127.0.0.1"));
@@ -1459,6 +1460,7 @@ void initSettings() {
addOption(new envSetting("libgs", defaultGhostscriptLibrary));
addOption(new envSetting("epsdriver", defaultEPSdriver));
addOption(new envSetting("psdriver", defaultPSdriver));
+ addOption(new envSetting("pngdriver", defaultPNGdriver));
addOption(new envSetting("asygl", defaultAsyGL));
addOption(new envSetting("texpath", ""));
addOption(new envSetting("texcommand", ""));
diff --git a/graphics/asymptote/triple.h b/graphics/asymptote/triple.h
index c1639ceedd..5cc4c2e96c 100644
--- a/graphics/asymptote/triple.h
+++ b/graphics/asymptote/triple.h
@@ -18,7 +18,10 @@
#include "common.h"
#include "angle.h"
#include "pair.h"
+
+#ifdef HAVE_RPC_RPC_H
#include "xstream.h"
+#endif
namespace camp {
diff --git a/graphics/asymptote/v3dfile.cc b/graphics/asymptote/v3dfile.cc
index d8eebab50c..6eb7768051 100644
--- a/graphics/asymptote/v3dfile.cc
+++ b/graphics/asymptote/v3dfile.cc
@@ -217,26 +217,26 @@ void v3dfile::addTriangles(size_t nP, triple const* P, size_t nN, triple const*
getXDRFile() << (uint32_t) nN;
addTriples(N,nN);
- bool explicitNI=true;
+ bool explicitNI=false;
for(size_t i=0; i < nI; ++i) {
const uint32_t *PIi=PI[i];
const uint32_t *NIi=NI[i];
- if(!distinct(NIi,PIi)) {
- explicitNI=false;
+ if(distinct(NIi,PIi)) {
+ explicitNI=true;
break;
}
}
getXDRFile() << (uint32_t) explicitNI;
getXDRFile() << (uint32_t) nC;
- bool explicitCI=true;
+ bool explicitCI=false;
if(nC) {
addColors(C,nC);
for(size_t i=0; i < nI; ++i) {
const uint32_t *PIi=PI[i];
const uint32_t *CIi=CI[i];
- if(!distinct(CIi,PIi)) {
- explicitNI=false;
+ if(distinct(CIi,PIi)) {
+ explicitNI=true;
break;
}
}
diff --git a/graphics/asymptote/v3dheadertypes.h b/graphics/asymptote/v3dheadertypes.h
index 97e8001872..a5ac4f246f 100644
--- a/graphics/asymptote/v3dheadertypes.h
+++ b/graphics/asymptote/v3dheadertypes.h
@@ -1,6 +1,6 @@
// Enum class for v3dheadertypes
// AUTO-GENERATED from v3dheadertypes.csv
-// Generated at 2022-01-01 13:54:42.600505
+// Generated at 2022-01-06 15:00:10.552025
namespace camp
{
diff --git a/graphics/asymptote/v3dheadertypes.py b/graphics/asymptote/v3dheadertypes.py
index cea4fdd8ba..8e2cac9086 100644
--- a/graphics/asymptote/v3dheadertypes.py
+++ b/graphics/asymptote/v3dheadertypes.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# Enum class for v3dheadertypes
""" AUTO-GENERATED from v3dheadertypes.csv """
-# Generated at 2022-01-01 13:56:00.216832
+# Generated at 2022-01-06 15:01:16.537064
class v3dheadertypes:
v3dheadertypes_canvasWidth=1
diff --git a/graphics/asymptote/v3dtypes.h b/graphics/asymptote/v3dtypes.h
index 25d399d015..926fbe0ce4 100644
--- a/graphics/asymptote/v3dtypes.h
+++ b/graphics/asymptote/v3dtypes.h
@@ -1,6 +1,6 @@
// Enum class for v3dtypes
// AUTO-GENERATED from v3dtypes.csv
-// Generated at 2022-01-01 13:54:42.600940
+// Generated at 2022-01-06 15:00:10.567069
namespace camp
{
diff --git a/graphics/asymptote/v3dtypes.py b/graphics/asymptote/v3dtypes.py
index b723437fc1..5abcb046c2 100644
--- a/graphics/asymptote/v3dtypes.py
+++ b/graphics/asymptote/v3dtypes.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# Enum class for v3dtypes
""" AUTO-GENERATED from v3dtypes.csv """
-# Generated at 2022-01-01 13:56:00.164650
+# Generated at 2022-01-06 15:01:16.518838
class v3dtypes:
v3dtypes_material=1