From 2f8fc054d05d8ff4b1de1feb05648842a771d41a Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Sun, 22 Dec 2019 08:38:43 +0100
Subject: [PATCH] Replace SymLinkOption type name to variable

---
 data/creole.dtd          | 44 ++++++++++++++++++++--------------------
 src/rougail/annotator.py |  3 ++-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/data/creole.dtd b/data/creole.dtd
index f3b06fca..e512273e 100644
--- a/data/creole.dtd
+++ b/data/creole.dtd
@@ -58,10 +58,10 @@
 <!ATTLIST action actionlist CDATA #IMPLIED>
 <!-- for apache action -->
 <!ATTLIST action apache_path CDATA #IMPLIED>
-<!ATTLIST action apache_path_type (FilenameOption|SymLinkOption) "FilenameOption">
+<!ATTLIST action apache_path_type (FilenameOption|SymLinkOption|variable) "FilenameOption">
 <!-- for external action -->
 <!ATTLIST action url CDATA #IMPLIED>
-<!ATTLIST action url_type (URLOption|SymLinkOption) "URLOption">
+<!ATTLIST action url_type (URLOption|SymLinkOption|variable) "URLOption">
 <!-- for form action -->
 <!ATTLIST action save (True|False) "False">
 
@@ -89,12 +89,12 @@
 <!ATTLIST service_access service CDATA #REQUIRED >
 
 <!ELEMENT port (#PCDATA)> <!--port_type-->
-<!ATTLIST port port_type (PortOption|SymLinkOption) "PortOption">
+<!ATTLIST port port_type (PortOption|SymLinkOption|variable) "PortOption">
 <!ATTLIST port service_accesslist CDATA #IMPLIED >
 <!ATTLIST port protocol (tcp|udp) "tcp">
 
 <!ELEMENT tcpwrapper (#PCDATA)> <!--tcpwrapper_type-->
-<!ATTLIST tcpwrapper tcpwrapper_type (UnicodeOption|SymLinkOption) "UnicodeOption">
+<!ATTLIST tcpwrapper tcpwrapper_type (UnicodeOption|SymLinkOption|variable) "UnicodeOption">
 <!ATTLIST tcpwrapper service_accesslist CDATA #IMPLIED >
 
 <!ELEMENT service_restriction (ip*)>
@@ -102,42 +102,42 @@
 
 <!ELEMENT ip (#PCDATA)> <!--ip_type-->
 <!ATTLIST ip service_restrictionlist CDATA #IMPLIED >
-<!ATTLIST ip ip_type (NetworkOption|SymLinkOption) "NetworkOption">
-<!ATTLIST ip interface_type (UnicodeOption|SymLinkOption) "UnicodeOption">
+<!ATTLIST ip ip_type (NetworkOption|SymLinkOption|variable) "NetworkOption">
+<!ATTLIST ip interface_type (UnicodeOption|SymLinkOption|variable) "UnicodeOption">
 <!ATTLIST ip interface CDATA #REQUIRED> <!--interface_type-->
-<!ATTLIST ip netmask_type (NetmaskOption|SymLinkOption) "NetmaskOption">
+<!ATTLIST ip netmask_type (NetmaskOption|SymLinkOption|variable) "NetmaskOption">
 <!ATTLIST ip netmask CDATA "255.255.255.255"> <!--netmask_type-->
 
 <!ELEMENT interface (#PCDATA)>
 <!ATTLIST interface interfacelist CDATA #IMPLIED >
 <!ATTLIST interface linkto CDATA #REQUIRED >
-<!ATTLIST interface ip CDATA #REQUIRED> <!--SymLinkOption-->
-<!ATTLIST interface ip_type (SymLinkOption) "SymLinkOption">
-<!ATTLIST interface mask CDATA #REQUIRED> <!--SymLinkOption-->
-<!ATTLIST interface mask_type (SymLinkOption) "SymLinkOption">
-<!ATTLIST interface bcast CDATA #IMPLIED> <!--SymLinkOption-->
-<!ATTLIST interface bcast_type (SymLinkOption) "SymLinkOption">
-<!ATTLIST interface gateway CDATA #IMPLIED> <!--SymLinkOption-->
-<!ATTLIST interface gateway_type (SymLinkOption) "SymLinkOption">
+<!ATTLIST interface ip CDATA #REQUIRED> <!--variable-->
+<!ATTLIST interface ip_type (SymLinkOption|variable) "variable">
+<!ATTLIST interface mask CDATA #REQUIRED> <!--variable-->
+<!ATTLIST interface mask_type (SymLinkOption|variable) "variable">
+<!ATTLIST interface bcast CDATA #IMPLIED> <!--variable-->
+<!ATTLIST interface bcast_type (SymLinkOption|variable) "variable">
+<!ATTLIST interface gateway CDATA #IMPLIED> <!--variable-->
+<!ATTLIST interface gateway_type (variable) "variable">
 <!ATTLIST interface method (bridge|macvlan) "macvlan" >
 <!ATTLIST interface redefine (True|False) "False">
 
 <!ELEMENT host EMPTY >
 <!ATTLIST host hostlist CDATA #IMPLIED >
-<!ATTLIST host name CDATA #REQUIRED > <!--SymLinkOption-->
-<!ATTLIST host name_type (SymLinkOption) "SymLinkOption">
-<!ATTLIST host ip CDATA #REQUIRED > <!--SymLinkOption-->
-<!ATTLIST host ip_type (SymLinkOption) "SymLinkOption">
+<!ATTLIST host name CDATA #REQUIRED > <!--variable-->
+<!ATTLIST host name_type (SymLinkOption|variable) "variable">
+<!ATTLIST host ip CDATA #REQUIRED > <!--variable-->
+<!ATTLIST host ip_type (SymLinkOption|variable) "variable">
 <!ATTLIST host crossed (True|False) "True" >
 <!ATTLIST host comment CDATA #IMPLIED >
 
 <!ELEMENT fstab EMPTY >
 <!ATTLIST fstab name CDATA #REQUIRED> <!--name_type-->
-<!ATTLIST fstab name_type (FilenameOption|SymLinkOption) "FilenameOption">
+<!ATTLIST fstab name_type (FilenameOption|SymLinkOption|variable) "FilenameOption">
 <!ATTLIST fstab type (bind|normal) "bind">
 <!ATTLIST fstab fstype (auto|ext3|ext4|nfs|smb) "auto">
 <!ATTLIST fstab mount_point CDATA #IMPLIED> <!--mount_point_type-->
-<!ATTLIST fstab mount_point_type (FilenameOption|SymLinkOption) "FilenameOption">
+<!ATTLIST fstab mount_point_type (FilenameOption|SymLinkOption|variable) "FilenameOption">
 <!ATTLIST fstab options CDATA #IMPLIED>
 <!ATTLIST fstab checks CDATA #IMPLIED>
 <!ATTLIST fstab fstablist CDATA #IMPLIED>
@@ -149,7 +149,7 @@
 
 <!ELEMENT file EMPTY>
 <!ATTLIST file name CDATA #REQUIRED >
-<!ATTLIST file name_type (UnicodeOption|SymLinkOption) "UnicodeOption">
+<!ATTLIST file name_type (UnicodeOption|SymLinkOption|variable) "UnicodeOption">
 <!ATTLIST file source CDATA #IMPLIED>
 <!ATTLIST file mode CDATA #IMPLIED >
 <!ATTLIST file owner CDATA #IMPLIED >
diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py
index ad5619e4..cae9122a 100644
--- a/src/rougail/annotator.py
+++ b/src/rougail/annotator.py
@@ -64,7 +64,8 @@ FORCE_CHOICE = {'oui/non': ['oui', 'non'],
                 'schedule': ['none', 'daily', 'weekly', 'monthly'],
                 'schedulemod': ['pre', 'post']}
 
-KEY_TYPE = {'SymLinkOption': 'symlink',
+KEY_TYPE = {'variable': 'symlink',
+            'SymLinkOption': 'symlink',
             'PortOption': 'port',
             'UnicodeOption': 'string',
             'NetworkOption': 'network',