Commit 898373c6 authored by 's avatar

Fixed stx to allow ampersands in urls.

parent ea4f09f4
...@@ -204,7 +204,7 @@ Special symbology is used to indicate special constructs: ...@@ -204,7 +204,7 @@ Special symbology is used to indicate special constructs:
</TABLE> </TABLE>
$Id: StructuredText.py,v 1.28 2000/11/10 16:51:27 brian Exp $''' $Id: StructuredText.py,v 1.29 2000/11/10 16:55:56 brian Exp $'''
# Copyright # Copyright
# #
# Copyright 1996 Digital Creations, L.C., 910 Princess Anne # Copyright 1996 Digital Creations, L.C., 910 Princess Anne
...@@ -256,6 +256,9 @@ $Id: StructuredText.py,v 1.28 2000/11/10 16:51:27 brian Exp $''' ...@@ -256,6 +256,9 @@ $Id: StructuredText.py,v 1.28 2000/11/10 16:51:27 brian Exp $'''
# (540) 371-6909 # (540) 371-6909
# #
# $Log: StructuredText.py,v $ # $Log: StructuredText.py,v $
# Revision 1.29 2000/11/10 16:55:56 brian
# Fixed stx to allow ampersands in urls.
#
# Revision 1.28 2000/11/10 16:51:27 brian # Revision 1.28 2000/11/10 16:51:27 brian
# Fixed a typo in stx # Fixed a typo in stx
# #
...@@ -580,7 +583,7 @@ class StructuredText: ...@@ -580,7 +583,7 @@ class StructuredText:
aStructuredString = gsub( aStructuredString = gsub(
'\"\([^\"\0]+\)\":' # title: <"text":> '\"\([^\"\0]+\)\":' # title: <"text":>
+ ('\([-:a-zA-Z0-9_,./?=@#~]+%s\)' + ('\([-:a-zA-Z0-9_,./?=@#~&]+%s\)'
% not_punctuation_or_whitespace) % not_punctuation_or_whitespace)
+ optional_trailing_punctuation + optional_trailing_punctuation
+ trailing_space, + trailing_space,
...@@ -589,7 +592,7 @@ class StructuredText: ...@@ -589,7 +592,7 @@ class StructuredText:
aStructuredString = gsub( aStructuredString = gsub(
'\"\([^\"\0]+\)\",[\0- ]+' # title: <"text", > '\"\([^\"\0]+\)\",[\0- ]+' # title: <"text", >
+ ('\([a-zA-Z]*:[-:a-zA-Z0-9_,./?=@#~]*%s\)' + ('\([a-zA-Z]*:[-:a-zA-Z0-9_,./?=@#~&]*%s\)'
% not_punctuation_or_whitespace) % not_punctuation_or_whitespace)
+ optional_trailing_punctuation + optional_trailing_punctuation
+ trailing_space, + trailing_space,
......
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