2019-09-29 14:42:00

17 files changed, 115 insertions, 4 deletions

diff --git a/doc/context/documents/general/manuals/luametafun.pdf b/doc/context/documents/general/manuals/luametafun.pdf
index e2b99ab2f..cc530630e 100644
--- a/doc/context/documents/general/manuals/luametafun.pdf
+++ b/doc/context/documents/general/manuals/luametafun.pdf
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index d2f987d97..20a61013b 100644
--- a/doc/context/documents/general/qrcs/setup-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-cs.pdf
diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf
index 320d8ca11..12f539a54 100644
--- a/doc/context/documents/general/qrcs/setup-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-de.pdf
diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf
index 5c0fba19a..f76346da3 100644
--- a/doc/context/documents/general/qrcs/setup-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf
index 30c60469e..176571e80 100644
--- a/doc/context/documents/general/qrcs/setup-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf
index f02842253..ac7d33b6a 100644
--- a/doc/context/documents/general/qrcs/setup-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
index fb720a611..e91b973d2 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf
index 225593507..8dc0271b8 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-de.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
index ad12ac66c..1323e0a59 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
index 07e1a5f7c..296fb3395 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
index 97b9586f7..14a763fce 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
index 3a7de7431..803262009 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
index 9f837fa1b..b67a37612 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf
index 1718a6b3d..05c21c685 100644
--- a/doc/context/documents/general/qrcs/setup-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-nl.pdf
diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf
index 6682a9bcb..7434d5d3a 100644
--- a/doc/context/documents/general/qrcs/setup-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-ro.pdf
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-surface.tex b/doc/context/sources/general/manuals/luametafun/luametafun-surface.tex
new file mode 100644
index 000000000..427187f95
--- /dev/null
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-surface.tex
@@ -0,0 +1,110 @@
+% language=us
+
+\environment luametafun-style
+
+\startcomponent luametafun-surface
+
+\startchapter[title={Surface}]
+
+This is work in progress so only some examples are shown here. Yet to be decided
+is how we deal with axis and such.
+
+In \in {figure} [surface:1] we see an example of a plot with axis as well as
+lines drawn.
+
+\startbuffer[1]
+\startMPcode{doublefun}
+    draw lmt_surface [
+        preamble  = "local sin, cos = math.sin, math.cos",
+        code      = "sin(x*x) - cos(y*y)"
+        xmin      = -3,
+        xmax      =  3,
+        ymin      = -3,
+        ymax      =  3,
+        xvector   = { -0.3, -0.3 },
+        height    = 5cm,
+        axis      = { 40mm, 40mm, 30mm },
+        clipaxis  = true,
+        axiscolor = "gray",
+    ] xsized .8TextWidth ;
+\stopMPcode
+\stopbuffer
+
+\typebuffer[1]
+
+\startplacefigure[reference=surface:1]
+    \getbuffer[1]
+\stopplacefigure
+
+In \in {figure} [surface:2] we don't draw the axis and lines. We also use a high
+resolution.
+
+\startbuffer[2]
+\startMPcode{doublefun}
+    draw lmt_surface [
+        preamble  = "local sin, cos = math.sin, math.cos",
+        code      = "sin(x*x) - cos(y*y)"
+        color     = "f, f/2, 1-f"
+        color     = "f, f, 0"
+        xstep     = .02,
+        ystep     = .02,
+        xvector   = { -0.4, -0.4 },
+        height    = 5cm,
+        lines     = false,
+    ] xsized .8TextWidth ;
+\stopMPcode
+\stopbuffer
+
+\typebuffer[2]
+
+\startplacefigure[reference=surface:2]
+    \getbuffer[2]
+\stopplacefigure
+
+The preliminary set of parameters is:
+
+\starttabulate[|T|T|T|p|]
+\FL
+\BC name          \BC type    \BC default                \BC comment \NC \NR
+\ML
+\NC code          \NC string  \NC
+\NC color         \NC string  \NC \type {"f, 0, 0"}      \NC \NC \NR
+\NC linecolor     \NC numeric \NC \type {1}              \NC gray scale \NC \NR
+\NC xmin          \NC numeric \NC \type {-1}             \NC \NC \NR
+\NC xmax          \NC numeric \NC \type { 1}             \NC \NC \NR
+\NC ymin          \NC numeric \NC \type {-1}             \NC \NC \NR
+\NC ymax          \NC numeric \NC \type { 1}             \NC \NC \NR
+\NC xstep         \NC numeric \NC \type {.1}             \NC \NC \NR
+\NC ystep         \NC numeric \NC \type {.1}             \NC \NC \NR
+\NC snap          \NC numeric \NC \type {.01}            \NC \NC \NR
+\NC xvector       \NC list    \NC \type {{ -0.7, -0.7 }} \NC \NC \NR
+\NC yvector       \NC list    \NC \type {{ 1, 0 }}       \NC \NC \NR
+\NC zvector       \NC list    \NC \type {{ 0, 1 }}       \NC \NC \NR
+\NC light         \NC list    \NC \type {{ 3, 3, 10 }}   \NC \NC \NR
+\NC bright        \NC numeric \NC \type {100}            \NC \NC \NR
+\NC clip          \NC boolean \NC \type {false}          \NC \NC \NR
+\NC lines         \NC boolean \NC \type {true}           \NC \NC \NR
+\NC axis          \NC list    \NC \type {{ }}            \NC \NC \NR
+\NC clipaxis      \NC boolean \NC \type {false}          \NC \NC \NR
+\NC axiscolor     \NC string  \NC \type {"gray"}         \NC \NC \NR
+\NC axislinewidth \NC numeric \NC \type {1/2}            \NC \NC \NR
+\LL
+\stoptabulate
+
+\startplacefigure[reference=contour:10]
+    \startcombination[3*3]
+        {\getbuffer[10a]} {\bf bitmap edge}
+        {\getbuffer[10b]} {\bf bitmap cell}
+        {\getbuffer[10c]} {\bf bitmap none}
+        {\getbuffer[10d]} {\bf shape  shape}
+        {\getbuffer[10e]} {\bf shape  edge}
+        {\getbuffer[10f]} {\bf shape  none}
+        {\getbuffer[10g]} {\bf band   edge}
+        {\getbuffer[10h]} {\bf band   cell}
+        {\getbuffer[10i]} {\bf band   none}
+    \stopcombination
+\stopplacefigure
+
+\stopchapter
+
+\stopcomponent
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun.tex b/doc/context/sources/general/manuals/luametafun/luametafun.tex
index 0e298dcd0..6f5aff173 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun.tex
@@ -13,17 +13,18 @@
 
     \startbodymatter
         \component luametafun-text
-        \component luametafun-function
-        \component luametafun-contour
       % \component luametafun-grid
         \component luametafun-axis
         \component luametafun-outline
         \component luametafun-followtext
         \component luametafun-placeholder
         \component luametafun-arrow
-        \component luametafun-chart
-        \component luametafun-mesh
         \component luametafun-shade
+        \component luametafun-contour
+        \component luametafun-surface
+        \component luametafun-mesh
+        \component luametafun-function
+        \component luametafun-chart
         \component luametafun-svg
         \component luametafun-interface
     \stopbodymatter