From 96874bcdae352231092a4a5377e952b82cd26112 Mon Sep 17 00:00:00 2001
From: Giorgio Calderone <giorgio.calderone@gmail.com>
Date: Mon, 20 Apr 2020 18:43:27 +0200
Subject: [PATCH] Release v1.2.0

---
 ChangeLog.md        | 13 ++++++-------
 docs/make.jl        |  2 +-
 docs/src/options.md |  2 +-
 docs/src/recipes.md |  2 +-
 src/Gnuplot.jl      |  2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index fbc96e6..c6a4576 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,4 +1,4 @@
-# Version 1.2.0 (not yet released)
+# Version 1.2.0 (released on: Apr. 20, 2020)
 
 - New features:
     * REPL mode: a new `Gnuplot.repl_init()` function is available to
@@ -16,20 +16,19 @@
       line width and point size respectively), and the `dashed` (to
       use dashed patterns in place of solid lines) keywords;
 
-    * The new `Gnuplot.options.reset::Vector{String}` field allows to
-      set initialization commands to be executed when a session is
-      reset.  Unlike `Gnuplot.options.init`, these commands are saved
-      in the session and can be saved into a script;
+    * The new `Gnuplot.options.term::String` field allows to set the
+      default terminal for interactive sessions;
 
     * New functions: `gpvars()` to retrieve all gnuplot variables,
       `gpmargins()` to retrieve current plot margins (in screen
       coordinates, `gpranges()` to retrieve current plot axis ranges;
 
-    * New keywords for `@gp` and `@gsp`: `lmargin`, `rmargin`,
+    * New keywords accepted by `@gp` and `@gsp`: `lmargin`, `rmargin`,
       `bmargin`, `tmargin`, `margins`, to set plot margins;
 
     * Implemented new implicit recipes to display histograms (as
-      returned by `hist()`) and images;
+      returned by `hist()`), contour lines (as returned by
+      `contourlines()`) and images;
 
     * Documentation updated;
 
diff --git a/docs/make.jl b/docs/make.jl
index c3affe6..85e0141 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -2,7 +2,7 @@ using Documenter, Gnuplot
 
 makedocs(sitename="Gnuplot.jl",
          authors = "Giorgio Calderone",
-         format = Documenter.HTML(prettyurls = false),  # uncomment for local use, comment for deployment
+         #format = Documenter.HTML(prettyurls = false),  # uncomment for local use, comment for deployment
          modules=[Gnuplot],
          pages = [
              "Home" => "index.md",
diff --git a/docs/src/options.md b/docs/src/options.md
index 46f5923..af7e454 100644
--- a/docs/src/options.md
+++ b/docs/src/options.md
@@ -59,7 +59,7 @@ Gnuplot.options.term_svg = "svg dynamic";
 
 ## Package initialization
 
-If you use **Gnuplot.jl** frequently you may find convenient to collect all the package settings (see [Options](@ref)) in a single place, to quickly recall them in a Julia session.  I suggest to put the following code in the `~/.julia/config/startup.jl` initialization file (further info [here](https://docs.julialang.org/en/v1/stdlib/REPL/)):
+If you use **Gnuplot.jl** frequently you may find convenient to collect all the package settings ([Options](@ref)) in a single place, to quickly recall them in a Julia session.  I suggest to put the following code in the `~/.julia/config/startup.jl` initialization file (further info [here](https://docs.julialang.org/en/v1/stdlib/REPL/)):
 ```julia
 macro gnuplotrc()
     return :(
diff --git a/docs/src/recipes.md b/docs/src/recipes.md
index 1d7fd0d..8091225 100644
--- a/docs/src/recipes.md
+++ b/docs/src/recipes.md
@@ -18,7 +18,7 @@ There are two kinds of recipes:
 
 - *explicit* recipe: a function which is explicitly invoked by the user.  It can have any name and accept any number of arguments and keywords.  It is typically used when the visualization of a data type requires some extra information, beside data itself (e.g. to plot data from a `DataFrame` object, see [Explicit recipe (example)](@ref));
 
-- *implicit* recipe: a function which is automatically called by **Gnuplot.jl**.  It must extend the p`recipe()`](@ref) function, and accept exactly one mandatory argument.  It is typically used when the visualization is completely determined by the data type itself (e.g. the visualization of a `Matrix{ColorTypes.RGB}` object as an image, see [Image recipes](@ref));
+- *implicit* recipe: a function which is automatically called by **Gnuplot.jl**.  It must extend the [`recipe()`](@ref) function, and accept exactly one mandatory argument.  It is typically used when the visualization is completely determined by the data type itself (e.g. the visualization of a `Matrix{ColorTypes.RGB}` object as an image, see [Image recipes](@ref));
 
 An implicit recipe is invoked whenever the data type of an argument to `@gp` or `@gsp` is not among the allowed ones (see [`@gp()`](@ref) documentation).  If a suitable recipe do not exists an error is raised.  On the other hand, an explicit recipe needs to be invoked by the user, and the output passed directly to `@gp` or `@gsp`.
 
diff --git a/src/Gnuplot.jl b/src/Gnuplot.jl
index ac444e6..e882fb1 100644
--- a/src/Gnuplot.jl
+++ b/src/Gnuplot.jl
@@ -1312,7 +1312,7 @@ end
 
 Return the **Gnuplot.jl** package version.
 """
-version() = v"1.2.0-rc"
+version() = v"1.2.0"
 
 # ---------------------------------------------------------------------
 """