fix & refactor plugin mapping

README.md

@@ -48,18 +48,16 @@ This plugin does not provide or override any default key-mappings.
 To use this plugin, you need to assign the plugin key-mapping to the key you like, as shown below:
 
 ```vim
-nmap  <C-a>  <Plug>(dial-increment)
-nmap  <C-x>  <Plug>(dial-decrement)
-nmap g<C-a> g<Plug>(dial-increment)
-nmap g<C-x> g<Plug>(dial-decrement)
-vmap  <C-a>  <Plug>(dial-increment)
-vmap  <C-x>  <Plug>(dial-decrement)
-vmap g<C-a> g<Plug>(dial-increment)
-vmap g<C-x> g<Plug>(dial-decrement)
+nnoremap  <C-a> <Plug>(dial-increment)
+nnoremap  <C-x> <Plug>(dial-decrement)
+nnoremap g<C-a> <Plug>(dial-g-increment)
+nnoremap g<C-x> <Plug>(dial-g-decrement)
+xnoremap  <C-a> <Plug>(dial-increment)
+xnoremap  <C-x> <Plug>(dial-decrement)
+xnoremap g<C-a> <Plug>(dial-g-increment)
+xnoremap g<C-x> <Plug>(dial-g-decrement)
 ```
 
-Note: When you use "g<Plug>(dial-increment)" or "g<Plug>(dial-decrement)" on the right side, `remap` option must be enabled.
-
 Or you can configure it with Lua as follows:
 
 ```lua

README_ja.md

@@ -61,8 +61,6 @@ vmap g<C-a> g<Plug>(dial-increment)
 vmap g<C-x> g<Plug>(dial-decrement)
 ```
 
-注意: `g<Plug>(dial-increment)` や `g<Plug>(dial-decrement)` を右辺で用いる場合は remap を有効にする必要があります。
-
 または Lua 上で以下のように設定することもできます。
 
 ```lua

doc/dial.jax

@@ -95,14 +95,14 @@ USAGE									*dial-usage*
 |dial.nvim|自身はキーマップの設定および上書きを行わないため、プラグインを動作
 させるために以下の設定を追加する必要があります。
 >
-	nmap  <C-a>  <Plug>(dial-increment)
-	nmap  <C-x>  <Plug>(dial-decrement)
-	nmap g<C-a> g<Plug>(dial-increment)
-	nmap g<C-x> g<Plug>(dial-decrement)
-	vmap  <C-a>  <Plug>(dial-increment)
-	vmap  <C-x>  <Plug>(dial-decrement)
-	vmap g<C-a> g<Plug>(dial-increment)
-	vmap g<C-x> g<Plug>(dial-decrement)
+	nnoremap  <C-a> <Plug>(dial-increment)
+	nnoremap  <C-x> <Plug>(dial-decrement)
+	nnoremap g<C-a> <Plug>(dial-g-increment)
+	nnoremap g<C-x> <Plug>(dial-g-decrement)
+	xnoremap  <C-a> <Plug>(dial-increment)
+	xnoremap  <C-x> <Plug>(dial-decrement)
+	xnoremap g<C-a> <Plug>(dial-g-increment)
+	xnoremap g<C-x> <Plug>(dial-g-decrement)
 <
 
 もしくは Lua 上で以下のように設定することもできます。
@@ -1381,13 +1381,13 @@ ADDITIVE DOT REPEATING					*dial-additive-dot-repeating*
 Vim の便利な機能の1つに、VISUAL モードにおける g<C-a> があります
 （|v_g_CTRL-A| 参照）。これは加数を行ごとに1ずつ増やすことができる機能であり、
 番号付きの箇条書きなどを生成する際に重宝します。もちろん |dial.nvim| でも同等
-の機能を備えています (|v_g<Plug>(dial-increment)|)。この機能は便利ながら、増加
+の機能を備えています (|v_<Plug>(dial-g-increment)|)。この機能は便利ながら、増加
 対象が離れた場所にあると使いづらいという制限がありました。
 これを解決するため、|dial.nvim| ではノーマルモードの g<C-a> に相当する機能を提
 供しています。これを有効にするには、以下の設定を書いておく必要があります:
 >
-	nmap g<C-a> g<Plug>(dial-increment)
-	nmap g<C-x> g<Plug>(dial-decrement)
+	nmap g<C-a> <Plug>(dial-g-increment)
+	nmap g<C-x> <Plug>(dial-g-decrement)
 <
 もしくは Lua 上で以下のように設定することもできます。
 >
@@ -1475,7 +1475,7 @@ MAPPING									*dial-mapping*
 {VISUAL}["x]<Plug>(dial-decrement)		*v_<Plug>(dial-decrement)*
 	VISUAL モードにおける CTRL-X に相当する機能を提供します。
 
-{VISUAL}["x]g<Plug>(dial-increment)		*v_g<Plug>(dial-increment)*
+{VISUAL}["x]<Plug>(dial-g-increment)	*v_<Plug>(dial-g-increment)*
 	VISUAL モードにおける |v_g_CTRL-A| に相当する機能を提供します。
 
 	使用方法は|v_<Plug>(dial-increment)| と似ているものの、上から数えてn行目に
@@ -1497,14 +1497,14 @@ MAPPING									*dial-mapping*
 <
 	のように、1週間ごとの日付が得られます（日付の被加数が有効のときに限る）。
 
-{VISUAL}["x]g<Plug>(dial-decrement)		*v_g<Plug>(dial-decrement)*
+{VISUAL}["x]<Plug>(dial-g-decrement)	*v_<Plug>(dial-g-decrement)*
 	VISUAL モードにおける |v_g_CTRL-X| に相当する機能を提供します。
 
-["x]g<Plug>(dial-increment)				*g<Plug>(dial-increment)*
+["x]<Plug>(dial-g-increment)			*<Plug>(dial-g-increment)*
 	基本的に |<Plug>(dial-increment)| と同じですが、ドットリピートを実行したと
 	きの挙動が異なります。 |dial-additive-dot-repeating| 参照。
 
-["x]g<Plug>(dial-decrement)				*g<Plug>(dial-decrement)*
+["x]<Plug>(dial-g-decrement)			*<Plug>(dial-g-decrement)*
 	基本的に |<Plug>(dial-decrement)| と同じですが、ドットリピートを実行したと
 	きの挙動が異なります。 |dial-additive-dot-repeating| 参照。
 

doc/dial.txt

@@ -98,14 +98,14 @@ Since this plugin does not replace the default key-mapping, you need to add
 the following description to the configuration file after installing the
 plugin.
 >
-	nmap  <C-a>  <Plug>(dial-increment)
-	nmap  <C-x>  <Plug>(dial-decrement)
-	nmap g<C-a> g<Plug>(dial-increment)
-	nmap g<C-x> g<Plug>(dial-decrement)
-	vmap  <C-a>  <Plug>(dial-increment)
-	vmap  <C-x>  <Plug>(dial-decrement)
-	vmap g<C-a> g<Plug>(dial-increment)
-	vmap g<C-x> g<Plug>(dial-decrement)
+	nnoremap  <C-a> <Plug>(dial-increment)
+	nnoremap  <C-x> <Plug>(dial-decrement)
+	nnoremap g<C-a> <Plug>(dial-g-increment)
+	nnoremap g<C-x> <Plug>(dial-g-decrement)
+	xnoremap  <C-a> <Plug>(dial-increment)
+	xnoremap  <C-x> <Plug>(dial-decrement)
+	xnoremap g<C-a> <Plug>(dial-g-increment)
+	xnoremap g<C-x> <Plug>(dial-g-decrement)
 <
 
 Alternatively, you can configure with Lua as follows:
@@ -122,16 +122,16 @@ Alternatively, you can configure with Lua as follows:
 	vim.keymap.set("n", "g<C-x>", function()
 		require("dial.map").manipulate("decrement", "gnormal")
 	end)
-	vim.keymap.set("v", "<C-a>", function()
+	vim.keymap.set("x", "<C-a>", function()
 		require("dial.map").manipulate("increment", "visual")
 	end)
-	vim.keymap.set("v", "<C-x>", function()
+	vim.keymap.set("x", "<C-x>", function()
 		require("dial.map").manipulate("decrement", "visual")
 	end)
-	vim.keymap.set("v", "g<C-a>", function()
+	vim.keymap.set("x", "g<C-a>", function()
 		require("dial.map").manipulate("increment", "gvisual")
 	end)
-	vim.keymap.set("v", "g<C-x>", function()
+	vim.keymap.set("x", "g<C-x>", function()
 		require("dial.map").manipulate("decrement", "gvisual")
 	end)
 <
@@ -1434,14 +1434,14 @@ ADDITIVE DOT REPEATING					*dial-additive-dot-repeating*
 One convenient feature of Vim is g<C-a> in VISUAL mode (see |v_g_CTRL-A|).
 This allows you to increase the addend by one per line, which is useful for
 generating numbered list, etc. Of course, |dial.nvim| provides the same
-functionality (|v_g<Plug>(dial-increment)|). However, this feature had the
+functionality (|v_<Plug>(dial-g-increment)|). However, this feature had the
 limitation that it was difficult to use when the increase targets were located
 far away.
 To solve this, |dial.nvim| provides the equivalent of g<C-a> in normal mode.
 To enable it, the following configuration must be written: .
 >
-	nmap g<C-a> g<Plug>(dial-increment)
-	nmap g<C-x> g<Plug>(dial-decrement)
+	nmap g<C-a> <Plug>(dial-g-increment)
+	nmap g<C-x> <Plug>(dial-g-decrement)
 
 Alternatively, you can configure with Lua as follows:
 >
@@ -1533,7 +1533,7 @@ MAPPING									*dial-mapping*
 {VISUAL}["x]<Plug>(dial-decrement)		*v_<Plug>(dial-decrement)*
 	An alternative to the existing CTRL-X command in VISUAL mode.
 
-{VISUAL}["x]g<Plug>(dial-increment)		*v_g<Plug>(dial-increment)*
+{VISUAL}["x]<Plug>(dial-g-increment)	*v_<Plug>(dial-g-increment)*
 	An alternative to the existing |v_g_CTRL-A| command in VISUAL mode.
 	Its usage is similar to |v_<Plug>(dial-increment)|, but the number of
 	addends on line n, counting from the top, is increased by n * [count]. It
@@ -1555,14 +1555,14 @@ MAPPING									*dial-mapping*
 		10/03
 <
 
-{VISUAL}["x]g<Plug>(dial-decrement)		*v_g<Plug>(dial-decrement)*
+{VISUAL}["x]<Plug>(dial-g-decrement)	*v_<Plug>(dial-g-decrement)*
 	An alternative to the existing |v_g_CTRL-X| command in VISUAL mode.
 
-["x]g<Plug>(dial-increment)				*g<Plug>(dial-increment)*
+["x]<Plug>(dial-g-increment)			*<Plug>(dial-g-increment)*
 	Almost the same as |<Plug>(dial-increment)|, but but the behavior differs
 	during dot repeating. See |dial-additive-dot-repeating|.
 
-["x]g<Plug>(dial-decrement)				*g<Plug>(dial-decrement)*
+["x]<Plug>(dial-g-decrement)			*<Plug>(dial-g-decrement)*
 	Almost the same as |<Plug>(dial-decrement)|, but but the behavior differs
 	during dot repeating. See |dial-additive-dot-repeating|.
 

plugin/dial.lua

@@ -0,0 +1,18 @@
+if vim.fn.exists "g:loaded_dial" then
+    return
+end
+
+local cpo = vim.o.cpoptions
+vim.cmd [[set cpo&vim]]
+
+vim.keymap.set("n", "<Plug>(dial-increment)", require("dial.map").inc_normal())
+vim.keymap.set("n", "<Plug>(dial-decrement)", require("dial.map").dec_normal())
+vim.keymap.set("n", "<Plug>(dial-g-increment)", require("dial.map").inc_gnormal())
+vim.keymap.set("n", "<Plug>(dial-g-decrement)", require("dial.map").dec_gnormal())
+vim.keymap.set("v", "<Plug>(dial-increment)", require("dial.map").inc_visual() .. "gv")
+vim.keymap.set("v", "<Plug>(dial-decrement)", require("dial.map").dec_visual() .. "gv")
+vim.keymap.set("v", "<Plug>(dial-g-increment)", require("dial.map").inc_gvisual() .. "gv")
+vim.keymap.set("v", "<Plug>(dial-g-decrement)", require("dial.map").dec_gvisual() .. "gv")
+
+vim.o.cpoptions = cpo
+vim.g.loaded_dial = 1