Warning: Cannot modify header information - headers already sent by (output started at /var/www/jonas-eriksen.dk/pic/private/index.php:1) in /var/www/jonas-eriksen.dk/pic/private/index.php on line 215
!A?hlE d Z g dZddlmZ ddlmZ ddlm Z edd Z
d Z G d d
Z d+d
Z
d Z G d d ZddlZ ej d j fdZd,dZd Z d-dZd Z d-dZd Z d.d Zdefd Zddefd!Z d"Z d#Z d$Z d%Z G d& d'e! Z"[d( Z#d) Z$e%d*k r e$ dS dS )/ae
Module difflib -- helpers for computing deltas between objects.
Function get_close_matches(word, possibilities, n=3, cutoff=0.6):
Use SequenceMatcher to return list of the best "good enough" matches.
Function context_diff(a, b):
For two lists of strings, return a delta in context diff format.
Function ndiff(a, b):
Return a delta: the difference between `a` and `b` (lists of strings).
Function restore(delta, which):
Return one of the two sequences that generated an ndiff delta.
Function unified_diff(a, b):
For two lists of strings, return a delta in unified diff format.
Class SequenceMatcher:
A flexible class for comparing pairs of sequences of any type.
Class Differ:
For producing human-readable deltas from sequences of lines of text.
Class HtmlDiff:
For producing HTML side by side comparison with change highlights.
) get_close_matchesndiffrestoreSequenceMatcherDifferIS_CHARACTER_JUNK IS_LINE_JUNK context_diff unified_diff
diff_bytesHtmlDiffMatch )nlargest)
namedtuple) GenericAliasr
za b sizec |rd| z |z S dS )Ng @ ? )matcheslengths /usr/lib64/python3.11/difflib.py_calculate_ratior ' s
&W}v%% 3 c v e Zd ZdZddZd Zd Zd Zd Zdd Z d Z
d
Z ddZ d Z
d Zd Z ee ZdS )r ao
SequenceMatcher is a flexible class for comparing pairs of sequences of
any type, so long as the sequence elements are hashable. The basic
algorithm predates, and is a little fancier than, an algorithm
published in the late 1980's by Ratcliff and Obershelp under the
hyperbolic name "gestalt pattern matching". The basic idea is to find
the longest contiguous matching subsequence that contains no "junk"
elements (R-O doesn't address junk). The same idea is then applied
recursively to the pieces of the sequences to the left and to the right
of the matching subsequence. This does not yield minimal edit
sequences, but does tend to yield matches that "look right" to people.
SequenceMatcher tries to compute a "human-friendly diff" between two
sequences. Unlike e.g. UNIX(tm) diff, the fundamental notion is the
longest *contiguous* & junk-free matching subsequence. That's what
catches peoples' eyes. The Windows(tm) windiff has another interesting
notion, pairing up elements that appear uniquely in each sequence.
That, and the method here, appear to yield more intuitive difference
reports than does diff. This method appears to be the least vulnerable
to syncing up on blocks of "junk lines", though (like blank lines in
ordinary text files, or maybe "" lines in HTML files). That may be
because this is the only method of the 3 that has a *concept* of
"junk" .
Example, comparing two strings, and considering blanks to be "junk":
>>> s = SequenceMatcher(lambda x: x == " ",
... "private Thread currentThread;",
... "private volatile Thread currentThread;")
>>>
.ratio() returns a float in [0, 1], measuring the "similarity" of the
sequences. As a rule of thumb, a .ratio() value over 0.6 means the
sequences are close matches:
>>> print(round(s.ratio(), 3))
0.866
>>>
If you're only interested in where the sequences match,
.get_matching_blocks() is handy:
>>> for block in s.get_matching_blocks():
... print("a[%d] and b[%d] match for %d elements" % block)
a[0] and b[0] match for 8 elements
a[8] and b[17] match for 21 elements
a[29] and b[38] match for 0 elements
Note that the last tuple returned by .get_matching_blocks() is always a
dummy, (len(a), len(b), 0), and this is the only case in which the last
tuple element (number of elements matched) is 0.
If you want to know how to change the first sequence into the second,
use .get_opcodes():
>>> for opcode in s.get_opcodes():
... print("%6s a[%d:%d] b[%d:%d]" % opcode)
equal a[0:8] b[0:8]
insert a[8:8] b[8:17]
equal a[8:29] b[17:38]
See the Differ class for a fancy human-friendly file differencer, which
uses SequenceMatcher both to compare sequences of lines, and to compare
sequences of characters within similar (near-matching) lines.
See also function get_close_matches() in this module, which shows how
simple code building on SequenceMatcher can be used to do useful work.
Timing: Basic R-O is cubic time worst case and quadratic time expected
case. SequenceMatcher is quadratic time for the worst case and has
expected-case behavior dependent in a complicated way on how many
elements the sequences have in common; best case time is linear.
N Tc j || _ dx| _ | _ || _ | || dS )a! Construct a SequenceMatcher.
Optional arg isjunk is None (the default), or a one-argument
function that takes a sequence element and returns true iff the
element is junk. None is equivalent to passing "lambda x: 0", i.e.
no elements are considered to be junk. For example, pass
lambda x: x in " \t"
if you're comparing lines as sequences of characters, and don't
want to synch up on blanks or hard tabs.
Optional arg a is the first of two sequences to be compared. By
default, an empty string. The elements of a must be hashable. See
also .set_seqs() and .set_seq1().
Optional arg b is the second of two sequences to be compared. By
default, an empty string. The elements of b must be hashable. See
also .set_seqs() and .set_seq2().
Optional arg autojunk should be set to False to disable the
"automatic junk heuristic" that treats popular elements as junk
(see module documentation for more information).
N)isjunkabautojunkset_seqs)selfr r r r s r __init__zSequenceMatcher.__init__x s; v
ar c Z | | | | dS )zSet the two sequences to be compared.
>>> s = SequenceMatcher()
>>> s.set_seqs("abcd", "bcde")
>>> s.ratio()
0.75
N)set_seq1set_seq2)r" r r s r r! zSequenceMatcher.set_seqs s.
a
ar c F || j u rdS || _ dx| _ | _ dS )aM Set the first sequence to be compared.
The second sequence to be compared is not changed.
>>> s = SequenceMatcher(None, "abcd", "bcde")
>>> s.ratio()
0.75
>>> s.set_seq1("bcde")
>>> s.ratio()
1.0
>>>
SequenceMatcher computes and caches detailed information about the
second sequence, so if you want to compare one sequence S against
many sequences, use .set_seq2(S) once and call .set_seq1(x)
repeatedly for each of the other sequences.
See also set_seqs() and set_seq2().
N)r matching_blocksopcodes)r" r s r r% zSequenceMatcher.set_seq1 s. *
;; F.22 t|||r c | || j u rdS || _ dx| _ | _ d| _ | dS )aM Set the second sequence to be compared.
The first sequence to be compared is not changed.
>>> s = SequenceMatcher(None, "abcd", "bcde")
>>> s.ratio()
0.75
>>> s.set_seq2("abcd")
>>> s.ratio()
1.0
>>>
SequenceMatcher computes and caches detailed information about the
second sequence, so if you want to compare one sequence S against
many sequences, use .set_seq2(S) once and call .set_seq1(x)
repeatedly for each of the other sequences.
See also set_seqs() and set_seq1().
N)r r( r)
fullbcount_SequenceMatcher__chain_b)r" r s r r& zSequenceMatcher.set_seq2 sG *
;; F.22 t| r c n | j }i x| _ }t | D ]0\ }}| |g }| | 1t x| _ }| j }|r?| D ]"} || r| | #|D ]}||= t x| _
}t | } | j rX| dk rT| dz dz }
|
D ]-\ }} t | |
k r| | .|D ] }||= d S d S d S )N d )r b2j enumerate
setdefaultappendsetbjunkr keysaddbpopularlenr items) r" r r1 ieltindicesjunkr popularnntestidxss r __chain_bzSequenceMatcher.__chain_b
ss
F3 ll FAsnnS"--G NN1 EE!
T xxzz
"
"6#;; "HHSMMM
HH #&%%'
FF = Q#XXHqLE YY[[
%
% Tt99u$$KK$$$
HH
XX
r r c | j | j | j | j j f\ }}}}|t | }|t | }||d} }
} i } g }
t
|| D ]j}| j }i }| || |
D ]@}||k r ||k r n0 ||dz
d dz x}||< || k r||z
dz ||z
dz |} }
} A|} k| |k ry|
|k rs |||
dz
s_|| dz
||
dz
k rG| dz
|
dz
| dz } }
} | |k r2|
|k r, |||
dz
s|| dz
||
dz
k G| | z |k rx|
| z |k ro |||
| z s[|| | z ||
| z k rC| dz
} | | z |k r5|
| z |k r, |||
| z s|| | z ||
| z k C| |k ry|
|k rs |||
dz
r_|| dz
||
dz
k rG| dz
|
dz
| dz } }
} | |k r2|
|k r, |||
dz
r|| dz
||
dz
k G| | z |k rx|
| z |k ro |||
| z r[|| | z ||
| z k rC| dz } | | z |k r5|
| z |k r, |||
| z r|| | z ||
| z k Ct | |
| S )aA Find longest matching block in a[alo:ahi] and b[blo:bhi].
By default it will find the longest match in the entirety of a and b.
If isjunk is not defined:
Return (i,j,k) such that a[i:i+k] is equal to b[j:j+k], where
alo <= i <= i+k <= ahi
blo <= j <= j+k <= bhi
and for all (i',j',k') meeting those conditions,
k >= k'
i <= i'
and if i == i', j <= j'
In other words, of all maximal matching blocks, return one that
starts earliest in a, and of all those maximal matching blocks that
start earliest in a, return the one that starts earliest in b.
>>> s = SequenceMatcher(None, " abcd", "abcd abcd")
>>> s.find_longest_match(0, 5, 0, 9)
Match(a=0, b=4, size=5)
If isjunk is defined, first the longest matching block is
determined as above, but with the additional restriction that no
junk element appears in the block. Then that block is extended as
far as possible by matching (only) junk elements on both sides. So
the resulting block never matches on junk except as identical junk
happens to be adjacent to an "interesting" match.
Here's the same example as before, but considering blanks to be
junk. That prevents " abcd" from matching the " abcd" at the tail
end of the second sequence directly. Instead only the "abcd" can
match, and matches the leftmost "abcd" in the second sequence:
>>> s = SequenceMatcher(lambda x: x==" ", " abcd", "abcd abcd")
>>> s.find_longest_match(0, 5, 0, 9)
Match(a=1, b=0, size=4)
If no blocks match, return (alo, blo, 0).
>>> s = SequenceMatcher(None, "ab", "c")
>>> s.find_longest_match(0, 2, 0, 1)
Match(a=0, b=0, size=0)
Nr r0 ) r r r1 r6 __contains__r: rangegetr
)r" aloahiblobhir r r1 isbjunkbestibestjbestsizej2lennothingr< j2lengetnewj2lenjks r find_longest_matchz"SequenceMatcher.find_longest_match1 s t "VTVTXtz7N N1c7 ;a&&C ;a&&C!$c1hu sC A yHHWWQqT7++
=
=s77 88E"*(1Q3"2"2Q"66HQKx<<-.qSUAaCE1(5E EE ckkeckk'!E!G*%% *ajAeAgJ&&%*1WeAgxz(5E ckkeckk'!E!G*%% *ajAeAgJ&&Hns""uX~';';'!E(N+,, (<h 1U8^#444 MH Hns""uX~';';'!E(N+,, (<h 1U8^#444 ckkeckkgaaj!! *ajAeAgJ&&%*1WeAgxz(5E ckkeckkgaaj!! *ajAeAgJ&&Hns""uX~';';gah'(( (<h 1U8^#444 !|H Hns""uX~';';gah'(( (<h 1U8^#444 UE8,,,r c T | j | j S t | j t | j }}d|d|fg}g }|r| \ }}}}| |||| x\ } }
} } | rk| | || k r ||
k r| || ||
f | | z |k r(|
| z |k r | | | z ||
| z |f || dx}
x}}g }|D ]>\ }}}|
|z |k r||z |k r||z
} |r| |
||f |||}}}
?|r| |
||f | ||df t t t j | | _ | j S )a Return list of triples describing matching subsequences.
Each triple is of the form (i, j, n), and means that
a[i:i+n] == b[j:j+n]. The triples are monotonically increasing in
i and in j. New in Python 2.5, it's also guaranteed that if
(i, j, n) and (i', j', n') are adjacent triples in the list, and
the second is not the last triple in the list, then i+n != i' or
j+n != j'. IOW, adjacent triples never describe adjacent equal
blocks.
The last triple is a dummy, (len(a), len(b), 0), and is the only
triple with n==0.
>>> s = SequenceMatcher(None, "abxcd", "abcd")
>>> list(s.get_matching_blocks())
[Match(a=0, b=0, size=2), Match(a=3, b=2, size=2), Match(a=5, b=4, size=0)]
Nr ) r( r: r r poprW r4 sortlistmapr
_make)r" lalbqueuer( rI rJ rK rL r< rU rV xi1j1k1 non_adjacenti2j2k2s r get_matching_blocksz#SequenceMatcher.get_matching_blocks s & +' 'TVc$&kkB RB 7!& Cc3 11#sCEE EGAq!a
7 &&q)))77sQwwLL#q#q!1222Q3991sLL!A#sAaC!5666 7
R" )
(
(JBBBw"}}bB b
6 ''R 555 RB
. R - - -b"a[*** #C \$B$B C C ##r c : | j | j S dx}}g x| _ }| D ]j\ }}}d}||k r ||k rd}n||k rd}n||k rd}|r| |||||f ||z ||z }}|r| d||||f k|S )a[ Return list of 5-tuples describing how to turn a into b.
Each tuple is of the form (tag, i1, i2, j1, j2). The first tuple
has i1 == j1 == 0, and remaining tuples have i1 == the i2 from the
tuple preceding it, and likewise for j1 == the previous j2.
The tags are strings, with these meanings:
'replace': a[i1:i2] should be replaced by b[j1:j2]
'delete': a[i1:i2] should be deleted.
Note that j1==j2 in this case.
'insert': b[j1:j2] should be inserted at a[i1:i1].
Note that i1==i2 in this case.
'equal': a[i1:i2] == b[j1:j2]
>>> a = "qabxcd"
>>> b = "abycdf"
>>> s = SequenceMatcher(None, a, b)
>>> for tag, i1, i2, j1, j2 in s.get_opcodes():
... print(("%7s a[%d:%d] (%s) b[%d:%d] (%s)" %
... (tag, i1, i2, a[i1:i2], j1, j2, b[j1:j2])))
delete a[0:1] (q) b[0:0] ()
equal a[1:3] (ab) b[0:2] (ab)
replace a[3:4] (x) b[2:3] (y)
equal a[4:6] (cd) b[3:5] (cd)
insert a[6:6] () b[5:6] (f)
Nr r replacedeleteinsertequal)r) ri r4 )r" r< rU answeraibjsizetags r get_opcodeszSequenceMatcher.get_opcodes s : < #< A "" v 4 4 6 6 9 9LBD C2vv!b&& R R
5
QAr 2444d7BtGqA
9
QA 6888
r c # K | }|sdg}|d d dk r:|d \ }}}}}|t |||z
|t |||z
|f|d< |d d dk r:|d \ }}}}}||t |||z |t |||z f|d< ||z }g } |D ]\ }}}}}|dk rq||z
|k rh| ||t |||z |t |||z f | V g } t |||z
t |||z
}}| |||||f | r+t | dk r| d d dk s| V dS dS dS )a Isolate change clusters by eliminating ranges with no changes.
Return a generator of groups with up to n lines of context.
Each group is in the same format as returned by get_opcodes().
>>> from pprint import pprint
>>> a = list(map(str, range(1,40)))
>>> b = a[:]
>>> b[8:8] = ['i'] # Make an insertion
>>> b[20] += 'x' # Make a replacement
>>> b[23:28] = [] # Make a deletion
>>> b[30] += 'y' # Make another replacement
>>> pprint(list(SequenceMatcher(None,a,b).get_grouped_opcodes()))
[[('equal', 5, 8, 5, 8), ('insert', 8, 8, 8, 9), ('equal', 8, 11, 9, 12)],
[('equal', 16, 19, 17, 20),
('replace', 19, 20, 20, 21),
('equal', 20, 22, 21, 23),
('delete', 22, 27, 23, 23),
('equal', 27, 30, 23, 26)],
[('equal', 31, 34, 27, 30),
('replace', 34, 35, 30, 31),
('equal', 35, 38, 31, 34)]]
)rn r r0 r r0 r rn r0 N)rt maxminr4 r: )
r" rA codesrs rb rf rc rg nngroups
r get_grouped_opcodesz#SequenceMatcher.get_grouped_opcodes# s 2 "" ,*+E 8A;' ! !"'( CRRCBqDMM2s2r!t}}b@E!H 9Q<7 " ""') CRRRRA CBqDMMAE"I
U#( 0 0 CRR g~~"R%"** c2s2r!t}}b#b"Q$-- HIII RA B1
B LL#r2r2. / / / / #e**a--E!HQK7,B,BKKKKK ,B,Br c t d | D }t |t | j t | j z S )a Return a measure of the sequences' similarity (float in [0,1]).
Where T is the total number of elements in both sequences, and
M is the number of matches, this is 2.0*M / T.
Note that this is 1 if the sequences are identical, and 0 if
they have nothing in common.
.ratio() is expensive to compute if you haven't already computed
.get_matching_blocks() or .get_opcodes(), in which case you may
want to try .quick_ratio() or .real_quick_ratio() first to get an
upper bound.
>>> s = SequenceMatcher(None, "abcd", "bcde")
>>> s.ratio()
0.75
>>> s.quick_ratio()
0.75
>>> s.real_quick_ratio()
1.0
c 3 & K | ] }|d V
dS )rw Nr ).0triples r z(SequenceMatcher.ratio..k s& JJVfRjJJJJJJr )sumri r r: r r )r" r s r ratiozSequenceMatcher.ratioU sQ , JJt/G/G/I/IJJJJJ TVs46{{)BCCCr c | j /i x| _ }| j D ] }| |d dz ||< | j }i }|j d}}| j D ]?} || r || }n| |d }|dz
||< |dk r|dz }@t |t
| j t
| j z S )zReturn an upper bound on ratio() relatively quickly.
This isn't defined beyond that it is an upper bound on .ratio(), and
is faster to compute.
Nr r0 )r+ r rH rF r r r: )r" r+ r= availavailhasr numbs r quick_ratiozSequenceMatcher.quick_ration s ? "+- -DOjv
=
=",..a"8"81"<
3_
! .'6 & &Cx}}
. Sz!~~c1-- E#Jaxx!A+ TVs46{{)BCCCr c t | j t | j }}t t || ||z S )zReturn an upper bound on ratio() very quickly.
This isn't defined beyond that it is an upper bound on .ratio(), and
is faster to compute than either .ratio() or .quick_ratio().
)r: r r r ry )r" r^ r_ s r real_quick_ratioz SequenceMatcher.real_quick_ratio s; TVc$&kkB B R"W555r )Nr r T)r Nr N)ru )__name__
__module__ __qualname____doc__r# r! r% r& r, rW ri rt r} r r r classmethodr __class_getitem__r r r r r , s H HT> > > > @
3 3 34 X% % % Nr- r- r- r-hE$ E$ E$N5 5 5n0 0 0 0dD D D2D D D:
6
6
6 $ L11r r ru 333333?c |dk st d| d|cxk rdk sn t d| g }t }| | |D ]}| | | |k rY| |k rA| |k r)| | |f t || }d |D S )a Use SequenceMatcher to return list of the best "good enough" matches.
word is a sequence for which close matches are desired (typically a
string).
possibilities is a list of sequences against which to match word
(typically a list of strings).
Optional arg n (default 3) is the maximum number of close matches to
return. n must be > 0.
Optional arg cutoff (default 0.6) is a float in [0, 1]. Possibilities
that don't score at least that similar to word are ignored.
The best (no more than n) matches among the possibilities are returned
in a list, sorted by similarity score, most similar first.
>>> get_close_matches("appel", ["ape", "apple", "peach", "puppy"])
['apple', 'ape']
>>> import keyword as _keyword
>>> get_close_matches("wheel", _keyword.kwlist)
['while']
>>> get_close_matches("Apple", _keyword.kwlist)
[]
>>> get_close_matches("accept", _keyword.kwlist)
['except']
r zn must be > 0: g r z cutoff must be in [0.0, 1.0]: c g | ]\ }}|S r r )r scorera s r
z%get_close_matches.. s % % %(%A % % %r )
ValueErrorr r& r% r r r r4 _nlargest)word
possibilitiesrA cutoffresultsra s r r r s :
66j3444 & C jvvGHHH
FAJJt
* *
1
6 ) ) ==??f $ $ 7799 MM17799a. ) ) ) q&
!
!F % %f % % %%r c \ d d t | | D S )zAReplace whitespace with the original whitespace characters in `s`r c 3 X K | ]%\ }}|d k r| r|n|V &dS ) N)isspace)r ctag_cs r r z$_keep_original_ws.. sR Au c\\aiikk\u r )joinzip)r tag_ss r _keep_original_wsr s<
77 Au
r c > e Zd ZdZd
dZd Zd Zd Zd Zd Z d Z
dS ) r a
Differ is a class for comparing sequences of lines of text, and
producing human-readable differences or deltas. Differ uses
SequenceMatcher both to compare sequences of lines, and to compare
sequences of characters within similar (near-matching) lines.
Each line of a Differ delta begins with a two-letter code:
'- ' line unique to sequence 1
'+ ' line unique to sequence 2
' ' line common to both sequences
'? ' line not present in either input sequence
Lines beginning with '? ' attempt to guide the eye to intraline
differences, and were not present in either input sequence. These lines
can be confusing if the sequences contain tab characters.
Note that Differ makes no claim to produce a *minimal* diff. To the
contrary, minimal diffs are often counter-intuitive, because they synch
up anywhere possible, sometimes accidental matches 100 pages apart.
Restricting synch points to contiguous matches preserves some notion of
locality, at the occasional cost of producing a longer diff.
Example: Comparing two texts.
First we set up the texts, sequences of individual single-line strings
ending with newlines (such sequences can also be obtained from the
`readlines()` method of file-like objects):
>>> text1 = ''' 1. Beautiful is better than ugly.
... 2. Explicit is better than implicit.
... 3. Simple is better than complex.
... 4. Complex is better than complicated.
... '''.splitlines(keepends=True)
>>> len(text1)
4
>>> text1[0][-1]
'\n'
>>> text2 = ''' 1. Beautiful is better than ugly.
... 3. Simple is better than complex.
... 4. Complicated is better than complex.
... 5. Flat is better than nested.
... '''.splitlines(keepends=True)
Next we instantiate a Differ object:
>>> d = Differ()
Note that when instantiating a Differ object we may pass functions to
filter out line and character 'junk'. See Differ.__init__ for details.
Finally, we compare the two:
>>> result = list(d.compare(text1, text2))
'result' is a list of strings, so let's pretty-print it:
>>> from pprint import pprint as _pprint
>>> _pprint(result)
[' 1. Beautiful is better than ugly.\n',
'- 2. Explicit is better than implicit.\n',
'- 3. Simple is better than complex.\n',
'+ 3. Simple is better than complex.\n',
'? ++\n',
'- 4. Complex is better than complicated.\n',
'? ^ ---- ^\n',
'+ 4. Complicated is better than complex.\n',
'? ++++ ^ ^\n',
'+ 5. Flat is better than nested.\n']
As a single multi-line string it looks like this:
>>> print(''.join(result), end="")
1. Beautiful is better than ugly.
- 2. Explicit is better than implicit.
- 3. Simple is better than complex.
+ 3. Simple is better than complex.
? ++
- 4. Complex is better than complicated.
? ^ ---- ^
+ 4. Complicated is better than complex.
? ++++ ^ ^
+ 5. Flat is better than nested.
Nc " || _ || _ dS )a
Construct a text differencer, with optional filters.
The two optional keyword parameters are for filter functions:
- `linejunk`: A function that should accept a single string argument,
and return true iff the string is junk. The module-level function
`IS_LINE_JUNK` may be used to filter out lines without visible
characters, except for at most one splat ('#'). It is recommended
to leave linejunk None; the underlying SequenceMatcher class has
an adaptive notion of "noise" lines that's better than any static
definition the author has ever been able to craft.
- `charjunk`: A function that should accept a string of length 1. The
module-level function `IS_CHARACTER_JUNK` may be used to filter out
whitespace characters (a blank or tab; **note**: bad idea to include
newline in this!). Use of IS_CHARACTER_JUNK is recommended.
Nlinejunkcharjunk)r" r r s r r# zDiffer.__init__* s ( !
r c # K t | j || }| D ]\ }}}}}|dk r| |||||| } no|dk r| d||| } nP|dk r| d||| } n1|dk r| d||| } nt d| | E d {V d S )
a
Compare two sequences of lines; generate the resulting delta.
Each sequence must contain individual single-line strings ending with
newlines. Such sequences can be obtained from the `readlines()` method
of file-like objects. The delta generated also consists of newline-
terminated strings, ready to be printed as-is via the writelines()
method of a file-like object.
Example:
>>> print(''.join(Differ().compare('one\ntwo\nthree\n'.splitlines(True),
... 'ore\ntree\nemu\n'.splitlines(True))),
... end="")
- one
? ^
+ ore
? ^
- two
- three
? -
+ tree
+ emu
rk rl -rm +rn r unknown tag N)r r rt _fancy_replace_dumpr )
r" r r cruncherrs rI rJ rK rL gs
r comparezDiffer.compareA s 4 #4=!Q77'/';';'='= #Cc3i ''3QSAA JJsAsC00 JJsAsC00 JJsAsC00 jSS!:;;;LLLLLLLL r c # N K t || D ]}|d|| V dS )z4Generate comparison results for a same-tagged range.r N)rG )r" rs ra lohir< s r r z Differ._dumpj sE r2 ( (A SS!A$$' ' ' ' ' ( (r c # K ||k r||k sJ ||z
||z
k r1| d||| }| d||| }n0| d||| }| d||| }||fD ]
} | E d {V d S )Nr r )r )
r" r rI rJ r rK rL firstsecondr s
r _plain_replacezDiffer._plain_replaceo s SyyS3YYY& 9sSy ZZQS11EZZQS11FFZZQS11EZZQS11F ALLLLLLLL r c # ~ K d\ }}t | j } d\ }
} t || D ]} || }
| |
t || D ]}|| }||
k r|
|| } }
| | | |k rH| |k r0| |k r| || }}}||k r+|
"| |||||| E d{V dS |
| d}}}nd}
| |||||| E d{V || || }}|
dx}}|
|| | D ]o\ }}}}}||z
||z
} }|dk r|d|z z
}|d| z z
})|dk r |d |z z
}8|d
k r |d | z z
}G|d k r|d
|z z
}|d
| z z
}^t d| |
|||| E d{V nd|z V | ||dz |||dz | E d{V dS )aL
When replacing one block of lines with another, search the blocks
for *similar* lines; the best-matching pair (if any) is used as a
synch point, and intraline difference marking is done on the
similar pair. Lots of work, but often worth it.
Example:
>>> d = Differ()
>>> results = d._fancy_replace(['abcDefghiJkl\n'], 0, 1,
... ['abcdefGhijkl\n'], 0, 1)
>>> print(''.join(results), end="")
- abcDefghiJkl
? ^ ^ ^
+ abcdefGhijkl
? ^ ^ ^
)gGz?g ?NNNr r rk ^rl r rm r rn r r r0 )r r rG r& r% r r r r
_fancy_helperr! rt r _qformat) r" r rI rJ r rK rL
best_ratior r eqieqjrU rq r< rp best_ibest_jaeltbeltatagsbtagsrs ai1ai2bj1bj2r^ r_ s r r zDiffer._fancy_replace} s+ * (
F"4=11 S
sC H HA1B b ! ! !3__
H
HqT88{#$aS !!"%%% ,,..;; **,,z99 nn&&3319 1A1A1aJ!
H" { ..q#sAsCHHHHHHHHH),c3JFFF C %%afafEEEEEEEEE vY& d ; EE dD ) ) )+3+?+?+A+A
@
@'S#sC sC#IB)##S2X%ES2X%EEH__S2X%EEH__S2X%EEG^^S2X%ES2X%EE$*%>???}}T4>> > > > > > > > > + %%a36!8SIIIIIIIIIIIr c # K g }||k r:||k r| |||||| }n7| d||| }n ||k r| d||| }|E d {V d S )Nr r )r r )r" r rI rJ r rK rL r s r r zDiffer._fancy_helper s 99Syy''3QSAAJJsAsC00
3YY
33,,A r c # K t || }t || }d|z V |rd| dV d|z V |r
d| dV dS dS )a
Format "?" output and deal with tabs.
Example:
>>> d = Differ()
>>> results = d._qformat('\tabcDefghiJkl\n', '\tabcdefGhijkl\n',
... ' ^ ^ ^ ', ' ^ ^ ^ ')
>>> for line in results: print(repr(line))
...
'- \tabcDefghiJkl\n'
'? \t ^ ^ ^\n'
'+ \tabcdefGhijkl\n'
'? \t ^ ^ ^\n'
- z?
+ N)r rstrip)r" alinebliner r s r r zDiffer._qformat s "%//6688!%//6688Ul ! u... Ul ! u... ! !r r ) r r r r r# r r r r r r r r r r r s S Sj! ! ! !.' ' 'R( ( (
\J \J \J|
! ! ! ! !r r Nz
\s*(?:#\s*)?$c || duS )z
Return True for ignorable line: iff `line` is blank or contains a single '#'.
Examples:
>>> IS_LINE_JUNK('\n')
True
>>> IS_LINE_JUNK(' # \n')
True
>>> IS_LINE_JUNK('hello\n')
False
Nr )linepats r r r s 3t99D r c
| |v S )z
Return True for ignorable character: iff `ch` is a space or tab.
Examples:
>>> IS_CHARACTER_JUNK(' ')
True
>>> IS_CHARACTER_JUNK('\t')
True
>>> IS_CHARACTER_JUNK('\n')
False
>>> IS_CHARACTER_JUNK('x')
False
r )chwss r r r % s
8Or c | dz }|| z
}|dk rd | S |s|dz }d || S z Convert range to the "ed" formatr0 z{}z{},{}formatstartstop beginningr s r _format_range_unifiedr < sV I
E\F
{{{{9%%% Q >>)V , ,,r r r c # K t | |||||| d}t d| | | D ]"} |sfd}|rd | nd}
|rd | nd} d ||
| V d || | V | d | d }
} t | d
|
d }t | d |
d
}d ||| V | D ]S\ }}}}}|dk r| || D ] }d|z V
#|dv r| || D ] }d|z V
|dv r||| D ] }d|z V
T$dS )a
Compare two sequences of lines; generate the delta as a unified diff.
Unified diffs are a compact way of showing line changes and a few
lines of context. The number of context lines is set by 'n' which
defaults to three.
By default, the diff control lines (those with ---, +++, or @@) are
created with a trailing newline. This is helpful so that inputs
created from file.readlines() result in diffs that are suitable for
file.writelines() since both the inputs and outputs have trailing
newlines.
For inputs that do not have trailing newlines, set the lineterm
argument to "" so that the output will be uniformly newline free.
The unidiff format normally has a header for filenames and modification
times. Any or all of these may be specified using strings for
'fromfile', 'tofile', 'fromfiledate', and 'tofiledate'.
The modification times are normally expressed in the ISO 8601 format.
Example:
>>> for line in unified_diff('one two three four'.split(),
... 'zero one tree four'.split(), 'Original', 'Current',
... '2005-01-26 23:30:50', '2010-04-02 10:20:52',
... lineterm=''):
... print(line) # doctest: +NORMALIZE_WHITESPACE
--- Original 2005-01-26 23:30:50
+++ Current 2010-04-02 10:20:52
@@ -1,4 +1,4 @@
+zero
one
-two
-three
+tree
four
FNT {}r
--- {}{}{}z
+++ {}{}{}r rw r0 ru z@@ -{} +{} @@{}rn r > rl rk r > rm rk r ) _check_typesr r} r r )r r fromfiletofile fromfiledate
tofiledaterA linetermstartedr| fromdatetodater last file1_range file2_rangers rb rf rc rg r s r r
r
G s R Ax z8LLLG a**>>qAA % % @G6BJv}}\222H2<DV]]:..."F %%h(CC C C C %%ffh?? ? ? ?Ahb t+E!Hd1g>> +E!Hd1g>> &&{KJJJJJ#(
%
% CRRg~~ beH % %D *$$$$+++ beH % %D *$$$$+++ beH % %D *$$$$
%% %r c | dz }|| z
}|s|dz }|dk rd | S d |||z dz
S r r r s r _format_range_contextr s` I
E\F Q
{{{{9%%% >>)Y%7!%; < <>> print(''.join(context_diff('one\ntwo\nthree\nfour\n'.splitlines(True),
... 'zero\none\ntree\nfour\n'.splitlines(True), 'Original', 'Current')),
... end="")
*** Original
--- Current
***************
*** 1,4 ****
one
! two
! three
four
--- 1,4 ----
+ zero
one
! tree
four
r r z! r )rm rl rk rn FNTr r z
*** {}{}{}r r rw z***************r0 r z
*** {} ****{}c 3 * K | ]\ }}}}}|d v V dS )> rl rk Nr r rs _s r r z context_diff.. 2 IIQ1as++IIIIIIr rm ru r z
--- {} ----{}c 3 * K | ]\ }}}}}|d v V dS )> rm rk Nr r s r r z context_diff.. r r rl )r dictr r} r r any)r r r r r r rA r prefixr r| r r r r r rs rb rf r r r rc rg s r r r s^ X Ax z8LLL
dD
E
E
EFG a**>>qAA 1 1 @G6BJv}}\222H2<DV]]:..."F %%h(CC C C C %%ffh?? ? ? ?Ahb t (****+E!Hd1g>> $$[(;;;;; II5III I I 1%*
1
1!RQ(?? !"R% 1 1 $SkD 00000+E!Hd1g>> $$[(;;;;; II5III I I 1%*
1
1!Q2r(?? !"R% 1 1 $SkD 0000071 1r c | rOt | d t s4t dt | d j d| d d |rOt |d t s4t dt |d j d|d d |D ])}t |t st d| *d S )Nr z"lines to compare must be str, not ()z all arguments must be str, not: )
isinstancestr TypeErrortyper )r r argsargs r r r s 5AaD#&& 5i ad,,,addd4 5 5 5 5AaD#&& 5i ad,,,addd4 5 5 5 K K#s## K)CC IJJ J KK Kr r
c
# P K d } t t | | }t t | | } | | } | | } | | } | | } | | } | |||||||| }
|
D ]} | dd V dS )a
Compare `a` and `b`, two sequences of lines represented as bytes rather
than str. This is a wrapper for `dfunc`, which is typically either
unified_diff() or context_diff(). Inputs are losslessly converted to
strings so that `dfunc` only has to worry about strings, and encoded
back to bytes on return. This is necessary to compare files with
unknown or inconsistent encoding. All other inputs (except `n`) must be
bytes rather than str.
c | dd S # t $ r0}dt | j d| d}t | |d }~ww xY w)Nasciisurrogateescapez!all arguments must be bytes, not r r )decodeAttributeErrorr
r r )r errmsgs r r zdiff_bytes..decode sm *88G%677 7 * * * *GG$$$aaa)CC..c ) *s
A+A
Ar r N)r[ r\ encode) dfuncr r r r r r rA r r linesr s r r r s * * *
S^^ A S^^ Avh H
VF^^F6,''L
##Jvh H E!Q&,
Ax P PE 6 6kk'#45555556 6r c J t || | | S )aJ
Compare `a` and `b` (lists of strings); return a `Differ`-style delta.
Optional keyword parameters `linejunk` and `charjunk` are for filter
functions, or can be None:
- linejunk: A function that should accept a single string argument and
return true iff the string is junk. The default is None, and is
recommended; the underlying SequenceMatcher class has an adaptive
notion of "noise" lines.
- charjunk: A function that accepts a character (string of length
1), and returns true iff the character is junk. The default is
the module-level function IS_CHARACTER_JUNK, which filters out
whitespace characters (a blank or tab; note: it's a bad idea to
include newline in this!).
Tools/scripts/ndiff.py is a command-line front-end to this function.
Example:
>>> diff = ndiff('one\ntwo\nthree\n'.splitlines(keepends=True),
... 'ore\ntree\nemu\n'.splitlines(keepends=True))
>>> print(''.join(diff), end="")
- one
? ^
+ ore
? ^
- two
- three
? -
+ tree
+ emu
)r r )r r r r s r r r s% F (H % % - -a 3 33r c # 6 K ddl } |j d t | ||| ddgffd fdfd} | }|
|E d{V dS |dz
}d} ddg|z }
} d } | d u r< t | \ } }
} n# t $ r Y dS w xY w| |z }| |
| f|
|< | dz
} | d u <| |k rd
V |}n| }d} |r| |z }| dz
} |
| V |dz }||dz
} |r)t | \ } }
} | r|dz
}n|dz }| |
| fV |)n# t $ r Y dS w xY w) a Returns generator yielding marked up from/to side by side differences.
Arguments:
fromlines -- list of text lines to compared to tolines
tolines -- list of text lines to be compared to fromlines
context -- number of context lines to display on each side of difference,
if None, all from/to text lines will be generated.
linejunk -- passed on to ndiff (see ndiff documentation)
charjunk -- passed on to ndiff (see ndiff documentation)
This function returns an iterator which returns a tuple:
(from line tuple, to line tuple, boolean flag)
from/to line tuple -- (line num, line text)
line num -- integer or None (to indicate a context separation)
line text -- original line text with following markers inserted:
'\0+' -- marks start of added text
'\0-' -- marks start of deleted text
'\0^' -- marks start of changed text
'\1' -- marks end of added/deleted/changed text
boolean flag -- None indicates context separation, True indicates
either "from" or "to" line contains a change, otherwise False.
This function/iterator was originally developed to generate side by side
file difference for making HTML pages (see HtmlDiff class for example
usage).
Note, this function utilizes the ndiff function to generate the side by
side difference markup. Optional ndiff arguments may be passed to this
function and they in turn will be passed to ndiff.
r Nz
(\++|\-+|\^+)c ||xx dz
cc< |%|| | d dd fS |dk r| d | d }}g }|fd} || t | D ]1\ }\ } }
|d| dz |z || |
z dz ||
d z }2|dd }n,| d dd }|sd }d|z |z dz }|| |fS )
a Returns line of text with user's change markup and line formatting.
lines -- list of lines from the ndiff generator to produce a line of
text from. When producing the line of text to return, the
lines used are removed from this list.
format_key -- '+' return first line in list with "add" markup around
the entire line.
'-' return first line in list with "delete" markup around
the entire line.
'?' return first line in list with add/delete/change
intraline markup (indices obtained from second line)
None return first line in list with no markup
side -- indice into the num_lines list (0=from,1=to)
num_lines -- from/to current line number. This is NOT intended to be a
passed parameter. It is present as a keyword argument to
maintain memory of the current line numbers between calls
of this function.
Note, this function is purposefully not defined at the module scope so
that data it needs from its parent function (within whose context it
is defined) does not need to be of module scope.
r0 Nr r ?c | | d d | g | d S )Nr0 r )r4 r| span) match_objectsub_infos r record_sub_infoz3_mdiff.._make_line..record_sub_info sL !3!3A!6!6q!9,:K:K:M:M NOOO#))!,,,r r )rY subreversed) r
format_keyside num_linestextmarkersr r! keybeginend change_res r
_make_linez_mdiff.._make_linef sW . $1 dOEIIaLL$45 5 !IIaLL%))A,,'DH6>
-
-
-
-
MM/' 2 2 2 $,H#5#5
N
NKU3AeG}T)#-d59o=dB4:M8DD 99Q<<#D
*$t+d2D $%%r c 3 | K g } d\ }} t | dk r6| t d t | dk 6d d | D }| d r|}n| d r | dd | dd
dfV | d r|d
z } | d d d
dfV | d r | d d d
}}|d
z
d }}nZ| d r | d
d | dd
dfV C| d r | dd | d
d
dfV w| d r|d
z } | d d d
dfV | d r|d
z
}d
| dd
dfV | d rd
| dd
}}|d
z d }}nj| d r|d
z
}d
| dd
dfV -| d r' | d
d
d
d | d
d
dfV i|d k r|d
z
}dV |d k |d k r|d
z }dV |d k | d rd
S ||dfV )a Yields from/to lines of text with a change indication.
This function is an iterator. It itself pulls lines from a
differencing iterator, processes them and yields them. When it can
it yields both a "from" and a "to" line, otherwise it will yield one
or the other. In addition to yielding the lines of from/to text, a
boolean flag is yielded to indicate if the text line(s) have
differences in them.
Note, this function is purposefully not defined at the module scope so
that data it needs from its parent function (within whose context it
is defined) does not need to be of module scope.
)r r Tr Xr c g | ]
}|d S )r r )r r s r r z2_mdiff.._line_iterator.. s 333Ta333r z-?+?r r r0 z--++r N)z--?+z--+r z-+?z-?+z+--r )r z+-r F)Nr r T)r3 NT)r: r4 nextr
startswith)r num_blanks_pendingnum_blanks_to_yieldr from_lineto_liner/ diff_lines_iterators r _line_iteratorz _mdiff.._line_iterator s 26/ /F - e**q.. T"5s ; ;<<< e**q..33U33344A||C 3
'9## f%% .
js1--zz%A/F/FLLLL f%% *
#a'" js1--tT9999 344 $
%/JuS$;$;T' 9KA9Ma$6## e$$
jtA..
5Q0G0GMMMM e$$
js1--zz%Q/G/GMMMM c""
"a'" js1--tT9999 e$$
#a'"JJuS 3 3T9999 l++
%)::eC+B+B7 9KA9Ma$6## c""
"a'"JJuS 3 3T9999 c""
jqqq$q11**U42J2J5PPPP &))#q(#)))) &)) &))#q(#)))) &)) ||C
- ,,,,MF -r c 3 K } g g }} t | dk st | dk r~ t | \ }}}n# t $ r Y dS w xY w|| ||f || ||f t | dk kt | dk ~| d \ }}| d \ }}|||p|fV )at Yields from/to lines of text with a change indication.
This function is an iterator. It itself pulls lines from the line
iterator. Its difference from that iterator is that this function
always yields a pair of from/to text lines (with the change
indication). If necessary it will collect single from/to lines
until it has a matching pair from/to pair to yield.
Note, this function is purposefully not defined at the module scope so
that data it needs from its parent function (within whose context it
is defined) does not need to be of module scope.
Tr N)r: r4
StopIterationr4 rY )
line_iterator fromlinestolinesr8 r9
found_difffromDiffto_diffr; s r _line_pair_iteratorz#_mdiff.._line_pair_iterator s& '((
R' :y>>1$$G a59-5H5H2Iw
$ FF ( $$i
%;<<<&NNGJ#7888 y>>1$$G a #,--"2"2 Ix &{{1~~ GW WX%89 9 9 9 :s A
A A r0 TF)NNN)recompiler r4 r= )r? r@ contextr r rE rD line_pair_iteratorlines_to_writeindex contextLinesrA r8 r9 r< r; r/ r. r: s @@@@r _mdiffrL < su D III
+,,I '(8DD78e 6& 6& 6& 6& 6& 6&pV- V- V- V- V- V-p : : : : :B -,..%%%%%%%%%% 1 ( #$dVW%5
%(table)s%(legend)s
aH
table.diff {font-family:Courier; border:medium;}
.diff_header {background-color:#e0e0e0}
td.diff_header {text-align:right}
.diff_next {background-color:#c0c0c0}
.diff_add {background-color:#aaffaa}
.diff_chg {background-color:#ffff77}
.diff_sub {background-color:#ffaaaa}aZ
%(header_row)s
%(data_rows)s
a
| Legends |
| Colors |
|---|
| Added |
| Changed |
| Deleted |
|
| Links |
|---|
| (f)irst change |
| (n)ext change |
| (t)op |
|
c ~ e Zd ZdZeZeZeZeZdZddde fdZ
dd d
d Z d Z d
Z
d Zd Zd Zd Zd Z ddZdS )r a{ For producing HTML side by side comparison with change highlights.
This class can be used to create an HTML table (or a complete HTML file
containing the table) showing a side by side, line by line comparison
of text with inter-line and intra-line change highlights. The table can
be generated in either full or contextual difference mode.
The following methods are provided for HTML generation:
make_table -- generates HTML for a single side by side table
make_file -- generates complete HTML file with a single side by side table
See tools/scripts/diff.py for an example usage of this class.
r Nc > || _ || _ || _ || _ dS )a HtmlDiff instance initializer
Arguments:
tabsize -- tab stop spacing, defaults to 8.
wrapcolumn -- column number where lines are broken and wrapped,
defaults to None where lines are not wrapped.
linejunk,charjunk -- keyword arguments passed into ndiff() (used by
HtmlDiff() to generate the side by side HTML differences). See
ndiff() documentation for argument default values and descriptions.
N)_tabsize _wrapcolumn _linejunk _charjunk)r" tabsize
wrapcolumnr r s r r# zHtmlDiff.__init__ s%
%!!r r F zutf-8)charsetc
| j t | j | j | |||||| | z |d | S )a Returns HTML file of side by side comparison with change highlights
Arguments:
fromlines -- list of "from" lines
tolines -- list of "to" lines
fromdesc -- "from" file column header string
todesc -- "to" file column header string
context -- set to True for contextual differences (defaults to False
which shows full differences).
numlines -- number of context lines. When context is set True,
controls number of lines displayed before and after the change.
When context is False, controls the number of lines to place
the "next" link anchors before the next change (so click of
"next" link jumps to just before the change).
charset -- charset of the HTML document
)rG numlines)styleslegendtablerW xmlcharrefreplace)_file_templater _styles_legend
make_tabler r )r" r? r@ fromdesctodescrG rY rW s r make_filezHtmlDiff.make_file st & #d<<//)Wh*1H " F F '
'
'
6'. / /w
@r c P fdfd|D }fd|D }||fS )a Returns from/to line lists with tabs expanded and newlines removed.
Instead of tab characters being replaced by the number of spaces
needed to fill in to the next tab stop, this function will fill
the space with tab characters. This is done so that the difference
algorithms can identify changes in a file when tabs are replaced by
spaces and vice versa. At the end of the HTML generation, the tab
characters will be replaced with a nonbreakable space.
c | dd } | j } | dd } | dd d S )Nr r" r )rk
expandtabsrP r )r r" s r expand_tabsz2HtmlDiff._tab_newline_replace..expand_tabs s` <<D))D??4=11D <<D))D<<S))0066 6r c & g | ]
} | S r r r r ri s r r z1HtmlDiff._tab_newline_replace.. s# ===4[[&&===r c & g | ]
} | S r r rk s r r z1HtmlDiff._tab_newline_replace.. s# 999;;t$$999r r )r" r? r@ ri s ` @r _tab_newline_replacez HtmlDiff._tab_newline_replace s\ 7 7 7 7 7 >===9=== 9999999 r c < |s| ||f dS t | }| j }||k s || d dz z
|k r| ||f dS d}d}d}||k rO||k rI|| dk r|dz
}|| }|dz
}n || dk r|dz
}d}n
|dz
}|dz
}||k r||k I|d| } ||d }
|r
| dz } d|z |
z }
| || f | |d|
dS ) a Builds list of text lines by splitting text lines at wrap point
This function will determine if the input text line needs to be
wrapped (split) into separate lines. If so, the first wrap point
will be determined and the first line appended to the output
text line list. This function is used recursively to handle
the second part of the split line to further split it.
Nr" ru r r r0 r# >)r4 r: rQ count _split_line) r" data_listline_numr) rr rx r< rA markline1line2s r rq zHtmlDiff._split_line s ht_ - - - F 4yy CKKdTZZ%5%5a%7 8S @ @ ht_ - - - F
#gg!d((Aw$QAwQaD QQQ #gg!d(( RaRQRR
(DLE4K%'E (5)***
3u-----r c # 0 K |D ]\ }}}||||fV ||c\ }}\ }}g g }
} | | || | |
|| | s|
r?| r| d }nd}|
r|
d }nd}|||fV | =|
?dS )z5Returns iterator that splits (wraps) mdiff text linesNr )r r )rq rY ) r" diffsfromdatatodataflagfromlinefromtexttolinetotextfromlisttolists r
_line_wrapperzHtmlDiff._line_wrapper s %* + + HVD| vd****2:6 / Xh !VH Xhx 8 8 8 VF6 2 2 2
+f
+ ( '||AHH 'H & #ZZ]]FF %F vd****
+f
+ + +r c T g g g }}}|D ]\ }}} | | j d|g|R | | j d|g|R n:# t $ r- | d | d Y nw xY w| | |||fS )zCollects mdiff output into separate lists
Before storing the mdiff from/to data into a list, it is converted
into a single line of text with HTML markup.
r r0 N)r4 _format_liner )r" rx r r flaglistry rz r{ s r _collect_lineszHtmlDiff._collect_lines. s $&b$) " " HVD
$ 1 1!D C( C C CDDD
/d /$ ? ? ? ?@@@@
$
$
$%%%
d#####
$
OOD ! ! ! !x''s AA4B B c > d|z }d| j | |d}n# t $ r d}Y nw xY w| dd dd d d
}| d d }d
|d|d|dS )a Returns HTML markup of "from" / "to" text lines
side -- 0 or 1 indicating "from" or "to" text
flag -- indicates if difference on line
linenum -- line number (used for line number column)
text -- line text to be marked up
z%dz id=""r &z&ro z>