[gtksourceview] def.lang: Rename "underlined" style to "net-address"
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] def.lang: Rename "underlined" style to "net-address"
- Date: Mon, 4 Nov 2019 21:19:32 +0000 (UTC)
commit adc85255563830459fa67ea7c0373fea634d247b
Author: Jeffery To <jeffery to gmail com>
Date: Sun Oct 27 18:06:02 2019 +0800
def.lang: Rename "underlined" style to "net-address"
This renames the "underlined" style to "net-address":
* Default styles all have logical/functional names, e.g. "constant",
"function". The "underlined" style is the only one with a stylistic
name.
* Almost all current uses of the "underlined" style are for URLs or
email addresses.
The only non-address use of the "underlined" style is for
"markup-emphasis" in asciidoc.lang. This also changes this mapping to
"def:doc-comment-element" (following markdown.lang).
This also keeps the "underlined" style, mapping it to "net-address", for
backwards-compatibility with third-party language definitions.
data/language-specs/asciidoc.lang | 4 ++--
data/language-specs/def.lang | 10 ++++++----
data/language-specs/haddock.lang | 2 +-
data/language-specs/markdown.lang | 2 +-
data/language-specs/mediawiki.lang | 2 +-
data/language-specs/rst.lang | 2 +-
data/styles/classic.xml | 2 +-
data/styles/cobalt.xml | 2 +-
data/styles/kate.xml | 2 +-
data/styles/oblivion.xml | 2 +-
data/styles/solarized-dark.xml | 2 +-
data/styles/solarized-light.xml | 2 +-
data/styles/tango.xml | 2 +-
13 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/data/language-specs/asciidoc.lang b/data/language-specs/asciidoc.lang
index fe6d4f12..717452a9 100644
--- a/data/language-specs/asciidoc.lang
+++ b/data/language-specs/asciidoc.lang
@@ -28,7 +28,7 @@
<styles>
<style id="markup-monospace" name="Monospaced Text" map-to="def:constant"/>
- <style id="markup-emphasis" name="Emphasized Text" map-to="def:underlined"/>
+ <style id="markup-emphasis" name="Emphasized Text" map-to="def:doc-comment-element"/>
<style id="markup-strong" name="Strong Text" map-to="def:statement"/>
<style id="markup-pass" name="Passthrough Text" map-to="def:special-char"/>
<style id="markup-replace" name="Replacement" map-to="def:special-char"/>
@@ -36,7 +36,7 @@
<style id="markup-admonition" name="Admonition" map-to="def:note"/>
<style id="markup-anchor" name="Anchor" map-to="def:identifier"/>
<style id="markup-crosslink" name="Link" map-to="def:identifier"/>
- <style id="markup-url" name="URL" map-to="def:underlined"/>
+ <style id="markup-url" name="URL" map-to="def:net-address"/>
<style id="markup-att-entry" name="Attribute Entry Invocation" map-to="def:preprocessor"/>
<style id="struct-title" name="Title" map-to="def:type"/>
<style id="struct-blocktitle" name="Block Title" map-to="def:identifier"/>
diff --git a/data/language-specs/def.lang b/data/language-specs/def.lang
index f95c1f67..4a1b4e1d 100644
--- a/data/language-specs/def.lang
+++ b/data/language-specs/def.lang
@@ -105,8 +105,10 @@
<style id="reserved" name="Reserved keyword" map-to="def:error" />
<!-- Anything that needs extra attention; mostly the keywords TODO, FIXME and XXX -->
<style id="note" name="Note (FIXME, TODO, XXX, etc.)"/>
- <!-- Text that stands out, HTML links, e-mail addresses, etc. -->
- <style id="underlined" name="Underlined"/>
+ <!-- Internet address: URLs, email addresses, etc. -->
+ <style id="net-address" name="Net address (URL, email address, etc.)"/>
+ <!-- Deprecated: will be removed in a future version -->
+ <style id="underlined" name="Underlined (DEPRECATED)" map-to="def:net-address"/>
<!-- Text that acts as some kind of heading, such as h1, h2, ... in html. -->
<style id="heading0" name="Heading 0"/>
<style id="heading1" name="Heading 1"/>
@@ -184,10 +186,10 @@
<context id="in-comment" class-disabled="no-spell-check">
<include>
- <context id="net-address" extend-parent="false" style-ref="underlined" class="no-spell-check">
+ <context id="net-address" extend-parent="false" style-ref="net-address" class="no-spell-check">
<match>\%{net-address}</match>
</context>
- <context id="email-address" extend-parent="false" style-ref="underlined" class="no-spell-check">
+ <context id="email-address" extend-parent="false" style-ref="net-address" class="no-spell-check">
<match>\%{email-address}</match>
</context>
<context id="comment-note" extend-parent="false" style-ref="note" class="no-spell-check
comment-note">
diff --git a/data/language-specs/haddock.lang b/data/language-specs/haddock.lang
index fb901d0d..d4e90f9d 100644
--- a/data/language-specs/haddock.lang
+++ b/data/language-specs/haddock.lang
@@ -35,7 +35,7 @@
<style id="itemized" name="Itemized list" map-to="def:doc-comment-element"/>
<style id="enumerated" name="Enumerated list" map-to="def:doc-comment-element"/>
<style id="definition" name="Definition list" map-to="def:doc-comment-element"/>
- <style id="url" name="URL" map-to="def:underlined"/>
+ <style id="url" name="URL" map-to="def:net-address"/>
<style id="anchor" name="Anchor" map-to="def:doc-comment-element"/>
</styles>
diff --git a/data/language-specs/markdown.lang b/data/language-specs/markdown.lang
index 9a46d365..577532b9 100644
--- a/data/language-specs/markdown.lang
+++ b/data/language-specs/markdown.lang
@@ -36,7 +36,7 @@
<style id="list-marker" name="List Marker" map-to="def:statement"/>
<style id="code" name="Code" map-to="def:identifier"/>
<style id="blockquote-marker" name="Blockquote Marker" map-to="def:shebang"/>
- <style id="url" name="URL" map-to="def:underlined"/>
+ <style id="url" name="URL" map-to="def:net-address"/>
<style id="link-text" name="Link Text" map-to="def:comment"/>
<style id="label" name="Label" map-to="def:preprocessor"/>
<style id="attribute-value" name="Attribute Value" map-to="def:constant"/>
diff --git a/data/language-specs/mediawiki.lang b/data/language-specs/mediawiki.lang
index ae394ab5..a803f811 100644
--- a/data/language-specs/mediawiki.lang
+++ b/data/language-specs/mediawiki.lang
@@ -29,7 +29,7 @@
<style id="strong-emphasis" name="Strong Emphasis" map-to="def:statement"/>
<style id="light-emphasis" name="Light Emphasis" map-to="def:doc-comment-element"/>
<style id="signature" name="Signature" map-to="def:statement"/>
- <style id="url" name="URL" map-to="def:underlined"/>
+ <style id="url" name="URL" map-to="def:net-address"/>
<style id="link" name="Link" map-to="def:comment"/>
<style id="link-symbol" name="Symbol on a Link" map-to="def:shebang"/>
<style id="line" name="Line" map-to="def:type"/>
diff --git a/data/language-specs/rst.lang b/data/language-specs/rst.lang
index b7b9806b..6fe2b55f 100644
--- a/data/language-specs/rst.lang
+++ b/data/language-specs/rst.lang
@@ -36,7 +36,7 @@
<style id="link" name="Link" map-to="def:type"/>
<style id="substitution" name="Substitution" map-to="def:type"/>
<style id="code" name="Code" map-to="def:identifier"/>
- <style id="url" name="Url" map-to="def:underlined"/>
+ <style id="url" name="Url" map-to="def:net-address"/>
</styles>
<definitions>
diff --git a/data/styles/classic.xml b/data/styles/classic.xml
index d61fa964..dee22a9e 100644
--- a/data/styles/classic.xml
+++ b/data/styles/classic.xml
@@ -80,7 +80,7 @@
<style name="def:error" background="red" bold="true"/>
<style name="def:warning" background="yellow"/>
<style name="def:note" foreground="blue" background="yellow" bold="true"/>
- <style name="def:underlined" italic="true" underline="single"/>
+ <style name="def:net-address" italic="true" underline="single"/>
<style name="def:struckthrough" strikethrough="true"/>
<!-- Heading styles, uncomment to enable -->
diff --git a/data/styles/cobalt.xml b/data/styles/cobalt.xml
index 65b82650..673cb84b 100644
--- a/data/styles/cobalt.xml
+++ b/data/styles/cobalt.xml
@@ -101,7 +101,7 @@
<style name="def:error" foreground="white" background="dark_red" bold="true"/>
<style name="def:warning" foreground="white" background="nail_polish_pink"/>
<style name="def:note" foreground="neon_pink" bold="true"/>
- <style name="def:net-address-in-comment" foreground="teal_blue" italic="false" underline="single"/>
+ <style name="def:net-address" foreground="teal_blue" italic="false" underline="single"/>
<style name="def:preprocessor" foreground="light_grey"/>
<style name="def:underlined" underline="single"/>
<style name="def:struckthrough" strikethrough="true"/>
diff --git a/data/styles/kate.xml b/data/styles/kate.xml
index c0a91455..9183878e 100644
--- a/data/styles/kate.xml
+++ b/data/styles/kate.xml
@@ -89,7 +89,7 @@
<style name="def:note" foreground="#BF0303" background="#F7E7E7" bold="true"
italic="false"/>
<style name="def:error" foreground="red" underline="true"/>
<style name="def:warning" foreground="brown" underline="true"/>
- <style name="def:underlined" underline="single"/>
+ <style name="def:net-address" underline="single"/>
<style name="def:struckthrough" strikethrough="true"/>
<!-- Heading styles, uncomment to enable -->
diff --git a/data/styles/oblivion.xml b/data/styles/oblivion.xml
index 6efaf60f..a5013675 100644
--- a/data/styles/oblivion.xml
+++ b/data/styles/oblivion.xml
@@ -105,7 +105,7 @@
<style name="def:error" foreground="aluminium1" background="scarletred2" bold="true"/>
<style name="def:warning" foreground="aluminium1" background="plum1"/>
<style name="def:note" background="butter1" foreground="aluminium4" bold="true"/>
- <style name="def:underlined" italic="true" underline="single"/>
+ <style name="def:net-address" italic="true" underline="single"/>
<style name="def:struckthrough" strikethrough="true"/>
<!-- Heading styles, uncomment to enable -->
diff --git a/data/styles/solarized-dark.xml b/data/styles/solarized-dark.xml
index f71451fc..aefa210e 100644
--- a/data/styles/solarized-dark.xml
+++ b/data/styles/solarized-dark.xml
@@ -88,7 +88,7 @@
<style name="def:preprocessor" foreground="violet"/>
<style name="def:error" foreground="red" bold="true"/>
<style name="def:note" foreground="magenta" bold="true"/>
- <style name="def:underlined" italic="true" underline="single"/>
+ <style name="def:net-address" italic="true" underline="single"/>
<style name="def:struckthrough" strikethrough="true"/>
<!-- Heading styles, uncomment to enable -->
diff --git a/data/styles/solarized-light.xml b/data/styles/solarized-light.xml
index 43c4c82a..e929e673 100644
--- a/data/styles/solarized-light.xml
+++ b/data/styles/solarized-light.xml
@@ -87,7 +87,7 @@
<style name="def:preprocessor" foreground="violet"/>
<style name="def:error" foreground="red" bold="true"/>
<style name="def:note" foreground="magenta" bold="true"/>
- <style name="def:underlined" italic="true" underline="single"/>
+ <style name="def:net-address" italic="true" underline="single"/>
<style name="def:struckthrough" strikethrough="true"/>
<!-- Heading styles, uncomment to enable -->
diff --git a/data/styles/tango.xml b/data/styles/tango.xml
index 3f9ff0d1..1b71d067 100644
--- a/data/styles/tango.xml
+++ b/data/styles/tango.xml
@@ -92,7 +92,7 @@
<style name="def:error" background="scarletred2" bold="true"/>
<style name="def:warning" background="plum1"/>
<style name="def:note" background="orange1" bold="true"/>
- <style name="def:underlined" italic="true" underline="single"/>
+ <style name="def:net-address" italic="true" underline="single"/>
<style name="def:struckthrough" strikethrough="true"/>
<!-- Heading styles, uncomment to enable -->
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
