Skip to content
This repository has been archived by the owner on Sep 24, 2022. It is now read-only.

Commit

Permalink
Large batch of typo fixes
Browse files Browse the repository at this point in the history
Closes #109.
  • Loading branch information
Jared Yanovich authored and nwellnhof committed Sep 30, 2019
1 parent 80b110a commit 2a350ee
Show file tree
Hide file tree
Showing 104 changed files with 524 additions and 542 deletions.
108 changes: 54 additions & 54 deletions ChangeLog

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions HTMLparser.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ htmlNodeInfoPop(htmlParserCtxtPtr ctxt)

#define SKIP_BLANKS htmlSkipBlankChars(ctxt)

/* Inported from XML */
/* Imported from XML */

/* #define CUR (ctxt->token ? ctxt->token : (int) (*ctxt->input->cur)) */
#define CUR ((int) (*ctxt->input->cur))
Expand Down Expand Up @@ -537,7 +537,7 @@ htmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
encoding_error:
/*
* If we detect an UTF8 error that probably mean that the
* input encoding didn't get properly advertized in the
* input encoding didn't get properly advertised in the
* declaration header. Report the error and switch the encoding
* to ISO-Latin-1 (if you don't like this policy, just declare the
* encoding !)
Expand Down Expand Up @@ -602,8 +602,8 @@ htmlSkipBlankChars(xmlParserCtxtPtr ctxt) {
************************************************************************/

/*
* Start Tag: 1 means the start tag can be ommited
* End Tag: 1 means the end tag can be ommited
* Start Tag: 1 means the start tag can be omitted
* End Tag: 1 means the end tag can be omitted
* 2 means it's forbidden (empty elements)
* 3 means the tag is stylistic and should be closed easily
* Depr: this element is deprecated
Expand Down Expand Up @@ -1342,7 +1342,7 @@ htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag)
if (xmlStrEqual(newtag, ctxt->nameTab[i]))
break;
/*
* A missplaced endtag can only close elements with lower
* A misplaced endtag can only close elements with lower
* or equal priority, so if we find an element with higher
* priority before we find an element with
* matching name, we just ignore this endtag
Expand Down Expand Up @@ -2218,9 +2218,9 @@ htmlNewInputStream(htmlParserCtxtPtr ctxt) {
************************************************************************/
/*
* all tags allowing pc data from the html 4.01 loose dtd
* NOTE: it might be more apropriate to integrate this information
* NOTE: it might be more appropriate to integrate this information
* into the html40ElementTable array but I don't want to risk any
* binary incomptibility
* binary incompatibility
*/
static const char *allowPCData[] = {
"a", "abbr", "acronym", "address", "applet", "b", "bdo", "big",
Expand Down
2 changes: 1 addition & 1 deletion HTMLtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr cur,
* @cur: the document
* @encoding: the encoding string
*
* Dump an HTML document. Formating return/spaces are added.
* Dump an HTML document. Formatting return/spaces are added.
*/
void
htmlDocContentDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr cur,
Expand Down
20 changes: 10 additions & 10 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@ Gansterer),
on Windows (Igor Zlatkovic), htmlCtxtReset fix (Michael Day), XPath
principal node of axis bug, HTML serialization of some codepoint
(Steven Rainwater), user data propagation in XInclude (Michael Day),
standalone and XML decl detection (Michael Day), Python id ouptut
standalone and XML decl detection (Michael Day), Python id output
for some id, fix the big python string memory leak, URI parsing fixes
(Stéphane Bidoul and William), long comments parsing bug (William),
concurrent threads initialization (Ted Phelps), invalid char
Expand All @@ -1410,7 +1410,7 @@ Gansterer),
min occurs of 0 (William), HTML script/style parsing (Mike Day)
- Improvement: make xmlTextReaderSetup() public
- Compilation and postability: fix a missing include problem (William),
__ss_familly on AIX again (Björn Wiberg), compilation without zlib
__ss_family on AIX again (Björn Wiberg), compilation without zlib
(Michael Day), catalog patch for Win32 (Christian Ehrlicher),
Windows CE fixes (Andreas Stricke)
- Various CVS to SVN infrastructure changes
Expand Down Expand Up @@ -1449,7 +1449,7 @@ Gansterer),
fix attribute serialization in writer (Rob Richards), PHP4 DTD validation
crasher, parser safety patch (Ben Darnell), _private context propagation
when parsing entities (with Michael Day), fix entities behaviour when
using SAX, URI to file path fix (Mikhail Zabaluev), disapearing validity
using SAX, URI to file path fix (Mikhail Zabaluev), disappearing validity
context, arg error in SAX callback (Mike Hommey), fix mixed-content
autodetect when using --noblanks, fix xmlIOParseDTD error handling,
fix bug in xmlSplitQName on special Names, fix Relax-NG element content
Expand Down Expand Up @@ -1533,7 +1533,7 @@ Do not use or package 2.6.25
split problem (William), issues with non-namespaced attributes in
xmlAddChild() xmlAddNextSibling() and xmlAddPrevSibling() (Rob Richards),
HTML parsing of script, Python must not output to stdout (Nic Ferrier),
exclusive C14N namespace visibility (Aleksey Sanin), XSD dataype
exclusive C14N namespace visibility (Aleksey Sanin), XSD datatype
totalDigits bug (Kasimier Buchcik), error handling when writing to an
xmlBuffer (Rob Richards), runtest schemas error not reported (Hisashi
Fujinaka), signed/unsigned problem in date/time code (Albert Chin), fix
Expand All @@ -1542,7 +1542,7 @@ Do not use or package 2.6.25
(Gary Coady), regexp bug affecting schemas (Kasimier), configuration of
runtime debugging (Kasimier), xmlNodeBufGetContent bug on entity refs
(Oleksandr Kononenko), xmlRegExecPushString2 bug (Sreeni Nair),
compilation and build fixes (Michael Day), removed dependancies on
compilation and build fixes (Michael Day), removed dependencies on
xmlSchemaValidError (Kasimier), bug with <xml:foo/>, more XPath
pattern based evaluation fixes (Kasimier)
- improvements: XSD Schemas redefinitions/restrictions (Kasimier
Expand Down Expand Up @@ -1587,7 +1587,7 @@ Do not use or package 2.6.25
foreign namespaces handling, XML Schemas facet comparison (Kupriyanov
Anatolij), xmlSchemaPSimpleTypeErr error report (Kasimier Buchcik), xml:
namespace ahndling in Schemas (Kasimier), empty model group in Schemas
(Kasimier), wilcard in Schemas (Kasimier), URI composition (William),
(Kasimier), wildcard in Schemas (Kasimier), URI composition (William),
xs:anyType in Schemas (Kasimier), Python resolver emmitting error
messages directly, Python xmlAttr.parent (Jakub Piotr Clapa), trying to
fix the file path/URI conversion, xmlTextReaderGetAttribute fix (Rob
Expand Down Expand Up @@ -1761,7 +1761,7 @@ Do not use or package 2.6.25
Buchcik), XInclude testing, Notation serialization, UTF8ToISO8859x
transcoding (Mark Itzcovitz), lots of XML Schemas cleanup and fixes
(Kasimier), ChangeLog cleanup (Stepan Kasal), memory fixes (Mark Vakoc),
handling of failed realloc(), out of bound array adressing in Schemas
handling of failed realloc(), out of bound array addressing in Schemas
date handling, Python space/tabs cleanups (Malcolm Tredinnick), NMTOKENS
E20 validation fix (Malcolm),
- improvements: added W3C XML Schemas testsuite (Kasimier Buchcik), add
Expand All @@ -1778,7 +1778,7 @@ Do not use or package 2.6.25
(Kasimier Buchcik), Schemas validation crash, xmlCheckUTF8 (William Brack
and Julius Mittenzwei), Schemas facet check (Kasimier), default namespace
problem (William), Schemas hexbinary empty values, encoding error could
genrate a serialization loop.
generate a serialization loop.
- Improvements: Schemas validity improvements (Kasimier), added --path
and --load-trace options to xmllint
- documentation: tutorial update (John Fleck)
Expand Down Expand Up @@ -1936,7 +1936,7 @@ Do not use or package 2.6.25
--with-minimum configuration.
- XInclude: allow the 2001 namespace without warning.
- Documentation: missing example/index.html (John Fleck), version
dependancies (John Fleck)
dependencies (John Fleck)
- reader API: structured error reporting (Steve Ball)
- Windows compilation: mingw, msys (Mikhail Grushinskiy), function
prototype (Cameron Johnson), MSVC6 compiler warnings, _WINSOCKAPI_
Expand Down Expand Up @@ -2070,7 +2070,7 @@ Do not use or package 2.6.25
intercepted at a structured level, with precise information
available.
- New simpler and more generic XML and HTML parser APIs, allowing to
easilly modify the parsing options and reuse parser context for multiple
easily modify the parsing options and reuse parser context for multiple
consecutive documents.
- Similar new APIs for the xmlReader, for options and reuse, provided new
functions to access content as const strings, use them for Python
Expand Down
2 changes: 1 addition & 1 deletion README.zOS
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Notes for compiling on zOS:

- since the name of files (or qualifier) in PDS are limited to 8 I had to
rename xmlschemas.c and xmlschemastypes.c in (resp.) xmlsche.c xmlschet.c
(and I had to modify all occurences of these files accordingly in the
(and I had to modify all occurrences of these files accordingly in the
rest of the Makefile !!!).

- in order to copy objects to PDS, I had the cp command at line 860
Expand Down
20 changes: 10 additions & 10 deletions SAX2.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* TODO:
*
* macro to flag unimplemented blocks
* XML_CATALOG_PREFER user env to select between system/public prefered
* XML_CATALOG_PREFER user env to select between system/public preferred
* option. C.f. Richard Tobin <[email protected]>
*> Just FYI, I am using an environment variable XML_CATALOG_PREFER with
*> values "system" and "public". I have made the default be "system" to
Expand Down Expand Up @@ -1512,8 +1512,8 @@ xmlCheckDefaultedAttributes(xmlParserCtxtPtr ctxt, const xmlChar *name,
attr = elemDecl->attributes;
while (attr != NULL) {
/*
* Make sure that attributes redefinition occuring in the
* internal subset are not overriden by definitions in the
* Make sure that attributes redefinition occurring in the
* internal subset are not overridden by definitions in the
* external subset.
*/
if (attr->defaultValue != NULL) {
Expand Down Expand Up @@ -1736,8 +1736,8 @@ xmlSAX2StartElement(void *ctx, const xmlChar *fullname, const xmlChar **atts)
}

/*
* set the namespace node, making sure that if the default namspace
* is unbound on a parent we simply kee it NULL
* set the namespace node, making sure that if the default namespace
* is unbound on a parent we simply keep it NULL
*/
if ((ns != NULL) && (ns->href != NULL) &&
((ns->href[0] != 0) || (ns->prefix != NULL)))
Expand Down Expand Up @@ -2012,7 +2012,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt,
else
ret->name = xmlStrdup(localname);

/* link at the end to preserv order, TODO speed up with a last */
/* link at the end to preserve order, TODO speed up with a last */
if (ctxt->node->properties == NULL) {
ctxt->node->properties = ret;
} else {
Expand Down Expand Up @@ -2104,7 +2104,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt,
} else {
/*
* dup now contains a string of the flattened attribute
* content with entities substitued. Check if we need to
* content with entities substituted. Check if we need to
* apply an extra layer of normalization.
* It need to be done twice ... it's an extra burden related
* to the ability to keep references in attributes
Expand Down Expand Up @@ -2137,7 +2137,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt,
}
} else {
/*
* if entities already have been substitued, then
* if entities already have been substituted, then
* the attribute as passed is already normalized
*/
dup = xmlStrndup(value, valueend - value);
Expand Down Expand Up @@ -2400,7 +2400,7 @@ xmlSAX2StartElementNs(void *ctx,
if (nb_attributes > 0) {
for (j = 0,i = 0;i < nb_attributes;i++,j+=5) {
/*
* Handle the rare case of an undefined atribute prefix
* Handle the rare case of an undefined attribute prefix
*/
if ((attributes[j+1] != NULL) && (attributes[j+2] == NULL)) {
if (ctxt->dictNames) {
Expand Down Expand Up @@ -2586,7 +2586,7 @@ xmlSAX2Characters(void *ctx, const xmlChar *ch, int len)
* The whole point of maintaining nodelen and nodemem,
* xmlTextConcat is too costly, i.e. compute length,
* reallocate a new buffer, move data, append ch. Here
* We try to minimaze realloc() uses and avoid copying
* We try to minimize realloc() uses and avoid copying
* and recomputing length over and over.
*/
if (lastChild->content == (xmlChar *)&(lastChild->properties)) {
Expand Down
8 changes: 4 additions & 4 deletions buf.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* buf.c: memory buffers for libxml2
*
* new buffer structures and entry points to simplify the maintainance
* new buffer structures and entry points to simplify the maintenance
* of libxml2 and ensure we keep good control over memory allocations
* and stay 64 bits clean.
* The new entry point use the xmlBufPtr opaque structure and
Expand Down Expand Up @@ -396,7 +396,7 @@ xmlBufShrink(xmlBufPtr buf, size_t len) {
((buf->alloc == XML_BUFFER_ALLOC_IO) && (buf->contentIO != NULL))) {
/*
* we just move the content pointer, but also make sure
* the perceived buffer size has shrinked accordingly
* the perceived buffer size has shrunk accordingly
*/
buf->content += len;
buf->size -= len;
Expand Down Expand Up @@ -958,7 +958,7 @@ xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len) {

if (start_buf > (unsigned int) len) {
/*
* We can add it in the space previously shrinked
* We can add it in the space previously shrunk
*/
buf->content -= len;
memmove(&buf->content[0], str, len);
Expand Down Expand Up @@ -1307,7 +1307,7 @@ xmlBufGetInputBase(xmlBufPtr buf, xmlParserInputPtr input) {
CHECK_COMPAT(buf)
base = input->base - buf->content;
/*
* We could do some pointer arythmetic checks but that's probably
* We could do some pointer arithmetic checks but that's probably
* sufficient.
*/
if (base > buf->size) {
Expand Down
12 changes: 6 additions & 6 deletions c14n.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ typedef enum {

typedef struct _xmlC14NVisibleNsStack {
int nsCurEnd; /* number of nodes in the set */
int nsPrevStart; /* the begginning of the stack for previous visible node */
int nsPrevStart; /* the beginning of the stack for previous visible node */
int nsPrevEnd; /* the end of the stack for previous visible node */
int nsMax; /* size of the array as allocated */
xmlNsPtr *nsTab; /* array of ns in no particular order */
Expand Down Expand Up @@ -226,7 +226,7 @@ xmlC14NErrRelativeNamespace(const char *ns_uri)
* xmlC14NErr:
* @ctxt: a C14N evaluation context
* @node: the context node
* @error: the erorr code
* @error: the error code
* @msg: the message
* @extra: extra informations
*
Expand Down Expand Up @@ -1827,7 +1827,7 @@ xmlC14NNewCtx(xmlDocPtr doc,
}

/*
* Set "mode" flag and remember list of incluseve prefixes
* Set "mode" flag and remember list of inclusive prefixes
* for exclusive c14n
*/
ctx->mode = mode;
Expand Down Expand Up @@ -2039,7 +2039,7 @@ xmlC14NDocDumpMemory(xmlDocPtr doc, xmlNodeSetPtr nodes,
(void) xmlOutputBufferClose(buf);

if ((*doc_txt_ptr == NULL) && (ret > 0)) {
xmlC14NErrMemory("coping canonicanized document");
xmlC14NErrMemory("coping canonicalized document");
return (-1);
}
return (ret);
Expand All @@ -2057,7 +2057,7 @@ xmlC14NDocDumpMemory(xmlDocPtr doc, xmlNodeSetPtr nodes,
* canonicalization, ignored otherwise)
* @with_comments: include comments in the result (!=0) or not (==0)
* @filename: the filename to store canonical XML image
* @compression: the compression level (zlib requred):
* @compression: the compression level (zlib required):
* -1 - libxml default,
* 0 - uncompressed,
* >0 - compression level
Expand Down Expand Up @@ -2100,7 +2100,7 @@ xmlC14NDocSave(xmlDocPtr doc, xmlNodeSetPtr nodes,
ret = xmlC14NDocSaveTo(doc, nodes, mode, inclusive_ns_prefixes,
with_comments, buf);
if (ret < 0) {
xmlC14NErrInternal("cannicanize document to buffer");
xmlC14NErrInternal("canonize document to buffer");
(void) xmlOutputBufferClose(buf);
return (-1);
}
Expand Down
2 changes: 1 addition & 1 deletion catalog.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
* TODO:
*
* macro to flag unimplemented blocks
* XML_CATALOG_PREFER user env to select between system/public prefered
* XML_CATALOG_PREFER user env to select between system/public preferred
* option. C.f. Richard Tobin <[email protected]>
*> Just FYI, I am using an environment variable XML_CATALOG_PREFER with
*> values "system" and "public". I have made the default be "system" to
Expand Down
4 changes: 2 additions & 2 deletions check-xinclude-test-suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,13 @@ def runTestCases(case):
old_test_failed = test_failed
old_test_error = test_error
runTestCases(case)
print " Ran %d tests: %d suceeded, %d failed and %d generated an error" % (
print " Ran %d tests: %d succeeded, %d failed and %d generated an error" % (
test_nr - old_test_nr, test_succeed - old_test_succeed,
test_failed - old_test_failed, test_error - old_test_error)
case = case.next

conf.freeDoc()
log.close()

print "Ran %d tests: %d suceeded, %d failed and %d generated an error in %.2f s." % (
print "Ran %d tests: %d succeeded, %d failed and %d generated an error in %.2f s." % (
test_nr, test_succeed, test_failed, test_error, time.time() - start)
6 changes: 3 additions & 3 deletions check-xml-test-suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ def runTest(test):
#elif extra == 'both' or extra == 'parameter':
res = testNotWfEntDtd(URI, id)
#else:
# print "Unknow value %s for an ENTITIES test value" % (extra)
# print "Unknown value %s for an ENTITIES test value" % (extra)
# return -1
elif type == "error":
res = testError(URI, id)
Expand Down Expand Up @@ -397,13 +397,13 @@ def runTestCases(case):
old_test_failed = test_failed
old_test_error = test_error
runTestCases(case)
print " Ran %d tests: %d suceeded, %d failed and %d generated an error" % (
print " Ran %d tests: %d succeeded, %d failed and %d generated an error" % (
test_nr - old_test_nr, test_succeed - old_test_succeed,
test_failed - old_test_failed, test_error - old_test_error)
case = case.next

conf.freeDoc()
log.close()

print "Ran %d tests: %d suceeded, %d failed and %d generated an error in %.2f s." % (
print "Ran %d tests: %d succeeded, %d failed and %d generated an error in %.2f s." % (
test_nr, test_succeed, test_failed, test_error, time.time() - start)
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ fi
AM_CONDITIONAL([REBUILD_DOCS], [test "$enable_rebuild_docs" = "yes" -o "$USER" = "veillard"])

dnl
dnl hard dependancies on options
dnl hard dependencies on options
dnl
if test "$with_schemas" = "yes"
then
Expand Down
Loading

0 comments on commit 2a350ee

Please sign in to comment.