From: <mi...@us...> - 2016-05-26 07:59:48
|
Revision: 7944 http://sourceforge.net/p/docutils/code/7944 Author: milde Date: 2016-05-26 07:59:45 +0000 (Thu, 26 May 2016) Log Message: ----------- Avoid misleading name "simple" for unescaped character-level inline markup setting. Modified Paths: -------------- trunk/docutils/docs/user/config.txt trunk/docutils/docutils/parsers/rst/__init__.py trunk/docutils/docutils/parsers/rst/states.py Modified: trunk/docutils/docs/user/config.txt =================================================================== --- trunk/docutils/docs/user/config.txt 2016-05-25 22:57:12 UTC (rev 7943) +++ trunk/docutils/docs/user/config.txt 2016-05-26 07:59:45 UTC (rev 7944) @@ -649,18 +649,30 @@ Default: "http://www.faqs.org/rfcs/". Option: ``--rfc-base-url``. -simple_inline_markup -~~~~~~~~~~~~~~~~~~~~ +character_level_inline_markup +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Relax the `inline markup recognition rules`_ -- -no constraints on the characters before/after inline markup. +Relax the `inline markup recognition rules`_ requiring whitespace or +punctuation around inline markup. -This results in simpler to predict behaviour and is especially suited for -langauges that do not use whitespace to separate words (e.g. Japanese, -Chinese). +This allows character level inline markup without escaped whithespace and is +especially suited for langauges that do not use whitespace to separate words +(e.g. Japanese, Chinese). +.. WARNING:: Potentially dangerous; use with caution. + + When changing this setting to "True", inline markup charactes in + URLs, names and formulas must be escaped to prevent errors. + Examples:: + + http://rST_for_all.html (hyperlinks to rST_ and for_) + x_2, inline_markup (hyperlinks to x_ and inline_) + 2*x (starts emphasised text) + a|b (starts a substitution reference) + + Default: disabled (False). -Options: ``--simple-inline-markup, --conservative-inline-markup``. +Options: ``--character-level-inline-markup, --conservative-inline-markup``. New in Docutils 0.12. Modified: trunk/docutils/docutils/parsers/rst/__init__.py =================================================================== --- trunk/docutils/docutils/parsers/rst/__init__.py 2016-05-25 22:57:12 UTC (rev 7943) +++ trunk/docutils/docutils/parsers/rst/__init__.py 2016-05-26 07:59:45 UTC (rev 7944) @@ -145,11 +145,11 @@ ('Ignore inline markup unless surrounded by whitespace ' 'or punctuation. Enabled by default.', ['--conservative-inline-markup'], - {'action': 'store_false', 'dest': 'simple_inline_markup'}), + {'action': 'store_false', 'dest': 'character_level_inline_markup'}), ('No restrictions on characters around inline markup.', - ['--simple-inline-markup'], + ['--character-level-inline-markup'], {'action': 'store_true', 'default': False, - 'dest': 'simple_inline_markup'}), + 'dest': 'character_level_inline_markup'}), )) config_section = 'restructuredtext parser' Modified: trunk/docutils/docutils/parsers/rst/states.py =================================================================== --- trunk/docutils/docutils/parsers/rst/states.py 2016-05-25 22:57:12 UTC (rev 7943) +++ trunk/docutils/docutils/parsers/rst/states.py 2016-05-26 07:59:45 UTC (rev 7944) @@ -467,7 +467,7 @@ def init_customizations(self, settings): # lookahead and look-behind expressions for inline markup rules - if settings.simple_inline_markup: + if settings.character_level_inline_markup: start_string_prefix = u'(^|(?<!\x00))' end_string_suffix = u'' else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |