Mercurial > emacs
view etc/schema/xslt.rnc @ 108750:3339da3cfeb3
Redesign bidi-aware edge positions of glyph rows, fix bug #6036.
dispextern.h (struct glyph_row): New members minpos and maxpos.
(MATRIX_ROW_START_CHARPOS, MATRIX_ROW_START_BYTEPOS)
(MATRIX_ROW_END_CHARPOS, MATRIX_ROW_END_BYTEPOS): Reference minpos
and maxpos members instead of start.pos and end.pos, respectively.
xdisp.c (display_line): Compare IT_CHARPOS with the position in
row->start.pos, rather than with MATRIX_ROW_START_CHARPOS.
(cursor_row_p): Use row->end.pos rather than MATRIX_ROW_END_CHARPOS.
(try_window_reusing_current_matrix, try_window_id): Use
ROW->minpos rather than ROW->start.pos.
(init_from_display_pos, init_iterator): Use EMACS_INT for
character and byte positions.
(find_row_edges): Renamed from find_row_end. Accept additional
arguments for minimum and maximum buffer positions seen by
display_line for this row. Don't use iterator to find the
position following the maximum one; instead, increment the
position found by display_line directly. Fix logic; eol_pos
should be tested before the rest. Handle the case of characters
delivered from display vector (bug#6036). Fix tests related to
it->method. Handle the truncated_on_right_p rows.
(RECORD_MAX_MIN_POS): New macro.
(display_line): Use it to record the minimum and maximum buffer
positions for glyphs in the row being assembled. Record the
position of the newline that terminates the line. If word wrap is
in effect, restore minimum and maximum positions seen up to the
wrap point, when iterator returns to it.
(try_window_reusing_current_matrix): Give up if in bidi-reordered
row and cursor not already at point. Restore original pre-bidi
code for unidirectional buffers.
dispnew.c (increment_row_positions, check_matrix_invariants):
Increment and check row->start.pos and row->end.pos, in addition
to MATRIX_ROW_START_CHARPOS and MATRIX_ROW_END_CHARPOS.
.gdbinit (prowlims): Display row->minpos and row->maxpos.
Display truncated_on_left_p and truncated_on_right_p flags.
Formatting fixes.
(pmtxrows): Display the ordinal number of each row. Don't display
rows beyond the last one.
bidi.c (bidi_cache_iterator_state): Don't zero out new_paragraph:
it is not copied by bidi_copy_it.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 22 May 2010 22:32:21 +0300 |
parents | bb94fc610c9f |
children |
line wrap: on
line source
# Copyright (C) 2001-2008 World Wide Web Consortium, (Massachusetts # Institute of Technology, European Research Consortium for # Informatics and Mathematics, Keio University). All Rights Reserved. # This work is distributed under the W3C(R) Software License in the # hope that it will be useful, but WITHOUT ANY WARRANTY; without even # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR # PURPOSE. # This was mostly generated from the syntax summary in the XSLT # Recommendation (using XSLT of course). # Issues: this validates extension elements as literal result # elements, which is overly restrictive. namespace local = "" default namespace xsl = "http://www.w3.org/1999/XSL/Transform" start = stylesheet.element | transform.element | literal-result-element-as-stylesheet version = "1.0" top-level-elements.model = (top-level-element.category | top-level-extension)* top-level-extension = element * - (xsl:* | local:*) { grammar { start = any any = (attribute * { text } | text | element * { any })* } } template.model = (instruction.category | literal-result-element | text)* literal-result-element-as-stylesheet = element * - xsl:* { attribute xsl:version { version }, literal-result-element-no-version.atts, template.model } literal-result-element = element * - xsl:* { literal-result-element.atts, template.model } literal-result-element.atts = literal-result-element-no-version.atts, attribute xsl:version { version }? literal-result-element-no-version.atts = (attribute * - xsl:* { avt.datatype } | attribute xsl:extension-element-prefixes { prefixes.datatype } | attribute xsl:exclude-result-prefixes { prefixes.datatype } | attribute xsl:use-attribute-sets { qnames.datatype })* top-level-element.category = include.element | strip-space.element | preserve-space.element | template.element | namespace-alias.element | attribute-set.element | variable.element | param.element | key.element | decimal-format.element | output.element instruction.category = apply-templates.element | apply-imports.element | call-template.element | element.element | attribute.element | text.element | processing-instruction.element | comment.element | copy.element | value-of.element | number.element | for-each.element | if.element | choose.element | variable.element | copy-of.element | message.element | fallback.element extension.atts = attribute * - (xsl:* | local:*) { text }* stylesheet.element = element stylesheet { stylesheet.model } transform.element = element transform { stylesheet.model } stylesheet.model = extension.atts, attribute id { xsd:NCName }?, attribute extension-element-prefixes { prefixes.datatype }?, attribute exclude-result-prefixes { prefixes.datatype }?, attribute version { version }, (import.element*, top-level-elements.model) include.element = element include { extension.atts, attribute href { xsd:anyURI } } import.element = element import { extension.atts, attribute href { xsd:anyURI } } strip-space.element = element strip-space { extension.atts, attribute elements { wildcards.datatype } } preserve-space.element = element preserve-space { extension.atts, attribute elements { wildcards.datatype } } template.element = element template { extension.atts, attribute match { pattern.datatype }?, attribute name { qname.datatype }?, attribute priority { number.datatype }?, attribute mode { qname.datatype }?, (param.element*, template.model) } apply-templates.element = element apply-templates { extension.atts, attribute select { expression.datatype }?, attribute mode { qname.datatype }?, (sort.element | with-param.element)* } apply-imports.element = element apply-imports { extension.atts } call-template.element = element call-template { extension.atts, attribute name { qname.datatype }, with-param.element* } namespace-alias.element = element namespace-alias { extension.atts, attribute stylesheet-prefix { prefix.datatype }, attribute result-prefix { prefix.datatype } } element.element = element element { extension.atts, attribute name { qname.datatype | expr-avt.datatype }, attribute namespace { xsd:anyURI | brace-avt.datatype }?, attribute use-attribute-sets { qnames.datatype }?, template.model } attribute.element = element attribute { extension.atts, attribute name { qname.datatype | expr-avt.datatype }, attribute namespace { xsd:anyURI | brace-avt.datatype }?, template.model } attribute-set.element = element attribute-set { extension.atts, attribute name { qname.datatype }, attribute use-attribute-sets { qnames.datatype }?, attribute.element* } text.element = element text { extension.atts, attribute disable-output-escaping { xsd:string "yes" | xsd:string "no" }?, text } processing-instruction.element = element processing-instruction { extension.atts, attribute name { xsd:NCName | expr-avt.datatype }, template.model } comment.element = element comment { extension.atts, template.model } copy.element = element copy { extension.atts, attribute use-attribute-sets { qnames.datatype }?, template.model } value-of.element = element value-of { extension.atts, attribute select { expression.datatype }, attribute disable-output-escaping { xsd:string "yes" | xsd:string "no" }? } number.element = element number { extension.atts, attribute level { xsd:string "single" | xsd:string "multiple" | xsd:string "any" }?, attribute count { pattern.datatype }?, attribute from { pattern.datatype }?, attribute value { expression.datatype }?, attribute format { avt.datatype }?, attribute lang { xsd:NMTOKEN | expr-avt.datatype }?, attribute letter-value { xsd:string "alphabetic" | xsd:string "traditional" | expr-avt.datatype }?, attribute grouping-separator { char.datatype | expr-avt.datatype }?, attribute grouping-size { number.datatype | expr-avt.datatype }? } for-each.element = element for-each { extension.atts, attribute select { expression.datatype }, (sort.element*, template.model) } if.element = element if { extension.atts, attribute test { expression.datatype }, template.model } choose.element = element choose { extension.atts, (when.element+, otherwise.element?) } when.element = element when { extension.atts, attribute test { expression.datatype }, template.model } otherwise.element = element otherwise { extension.atts, template.model } sort.element = element sort { extension.atts, attribute select { expression.datatype }?, attribute lang { xsd:NMTOKEN | expr-avt.datatype }?, attribute data-type { xsd:string "text" | xsd:string "number" | qname-but-not-ncname.datatype | expr-avt.datatype }?, attribute order { xsd:string "ascending" | xsd:string "descending" | expr-avt.datatype }?, attribute case-order { xsd:string "upper-first" | xsd:string "lower-first" | expr-avt.datatype }? } variable.element = element variable { extension.atts, attribute name { qname.datatype }, (attribute select { expression.datatype } | template.model) } param.element = element param { extension.atts, attribute name { qname.datatype }, (attribute select { expression.datatype } | template.model) } copy-of.element = element copy-of { extension.atts, attribute select { expression.datatype } } with-param.element = element with-param { extension.atts, attribute name { qname.datatype }, (attribute select { expression.datatype } | template.model) } key.element = element key { extension.atts, attribute name { qname.datatype }, attribute match { pattern.datatype }, attribute use { expression.datatype } } decimal-format.element = element decimal-format { extension.atts, attribute name { qname.datatype }?, attribute decimal-separator { char.datatype }?, attribute grouping-separator { char.datatype }?, attribute infinity { text }?, attribute minus-sign { char.datatype }?, attribute NaN { text }?, attribute percent { char.datatype }?, attribute per-mille { char.datatype }?, attribute zero-digit { char.datatype }?, attribute digit { char.datatype }?, attribute pattern-separator { char.datatype }? } message.element = element message { extension.atts, attribute terminate { xsd:string "yes" | xsd:string "no" }?, template.model } fallback.element = element fallback { extension.atts, template.model } output.element = element output { extension.atts, attribute method { xsd:string "xml" | xsd:string "html" | xsd:string "text" | qname-but-not-ncname.datatype }?, attribute version { xsd:NMTOKEN }?, attribute encoding { text }?, attribute omit-xml-declaration { xsd:string "yes" | xsd:string "no" }?, attribute standalone { xsd:string "yes" | xsd:string "no" }?, attribute doctype-public { text }?, attribute doctype-system { text }?, attribute cdata-section-elements { qnames.datatype }?, attribute indent { xsd:string "yes" | xsd:string "no" }?, attribute media-type { text }? } prefixes.datatype = list { (xsd:NCName | "#default")* } prefix.datatype = xsd:NCName | "#default" wildcards.datatype = list { (xsd:QName | xsd:token { pattern = "\*|\i\c*:\*" })* } qname.datatype = xsd:QName qnames.datatype = list { xsd:QName* } char.datatype = xsd:string { length = "1" } number.datatype = xsd:decimal expression.datatype = text pattern.datatype = text qname-but-not-ncname.datatype = xsd:QName { pattern = ".*:.*" } # An AVT containing at least one expression. expr-avt.datatype = xsd:string { pattern = """([^\{\}]|\{\{|\}\})*\{([^"'\{\}]|"[^"]*"|'[^']*')+\}([^\{\}]|\{\{|\}\}|\{([^"'\{\}]|"[^"]*"|'[^']*')+\})*""" } # An AVT containing at least one brace; ie where instantiated AVT # is not the same as the literal AVT. brace-avt.datatype = xsd:string { pattern = """[^\{\}]*(\{\{|\}\}|\{([^"'\{\}]|"[^"]*"|'[^']*')+\})([^\{\}]|\{\{|\}\}|\{([^"'\{\}]|"[^"]*"|'[^']*')+\})*""" } avt.datatype = xsd:string { pattern = """([^\{\}]|\{\{|\}\}|\{([^"'\{\}]|"[^"]*"|'[^']*')+\})*""" }