Commit adc85255 authored by Jeffery To's avatar Jeffery To Committed by Christian Hergert

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.
parent 765960fd
......@@ -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"/>
......
......@@ -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">
......
......@@ -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>
......
......@@ -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"/>
......
......@@ -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"/>
......
......@@ -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>
......
......@@ -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 -->
......
......@@ -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"/>
......
......@@ -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 -->
......
......@@ -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 -->
......
......@@ -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 -->
......
......@@ -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 -->
......
......@@ -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 -->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment