emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Combined leftover attribute API stuff into single, new file.

Browse source
This commit is contained in:
Jim Derry 2017-02-18 16:56:31 -05:00
parent f6ce4d130e
commit cbb8354f74
4 changed files with 15 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -140,9 +140,9 @@ set ( INCDIR include )
set ( CFILES set ( CFILES
${SRCDIR}/access.c ${SRCDIR}/attrs.c ${SRCDIR}/istack.c ${SRCDIR}/access.c ${SRCDIR}/attrs.c ${SRCDIR}/istack.c
${SRCDIR}/parser.c ${SRCDIR}/tags.c ${SRCDIR}/entities.c ${SRCDIR}/parser.c ${SRCDIR}/tags.c ${SRCDIR}/entities.c
${SRCDIR}/lexer.c ${SRCDIR}/pprint.c ${SRCDIR}/charsets.c ${SRCDIR}/clean.c ${SRCDIR}/lexer.c ${SRCDIR}/pprint.c ${SRCDIR}/charsets.c
${SRCDIR}/message.c ${SRCDIR}/config.c ${SRCDIR}/alloc.c ${SRCDIR}/clean.c ${SRCDIR}/message.c ${SRCDIR}/config.c
${SRCDIR}/attrask.c ${SRCDIR}/attrdict.c ${SRCDIR}/attrget.c ${SRCDIR}/alloc.c ${SRCDIR}/attrapi.c ${SRCDIR}/attrdict.c
${SRCDIR}/buffio.c ${SRCDIR}/fileio.c ${SRCDIR}/streamio.c ${SRCDIR}/buffio.c ${SRCDIR}/fileio.c ${SRCDIR}/streamio.c
${SRCDIR}/tagask.c ${SRCDIR}/tmbstr.c ${SRCDIR}/utf8.c ${SRCDIR}/tagask.c ${SRCDIR}/tmbstr.c ${SRCDIR}/utf8.c
${SRCDIR}/tidylib.c ${SRCDIR}/mappedio.c ${SRCDIR}/gdoc.c ${SRCDIR}/tidylib.c ${SRCDIR}/mappedio.c ${SRCDIR}/gdoc.c

25
include/attrask.c
View file

@ -1,25 +0,0 @@
/* attrask.c -- Interrogate attribute type
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
*/
#include "tidy-int.h"
#include "tidy.h"
#include "attrs.h"
Bool TIDY_CALL tidyAttrIsEvent( TidyAttr tattr )
{
return TY_(attrIsEvent)( tidyAttrToImpl(tattr) );
}
/*
* local variables:
* mode: c
* indent-tabs-mode: nil
* c-basic-offset: 4
* eval: (c-set-offset 'substatement-open 0)
* end:
*/

17
include/tidy.h
View file

@ -812,7 +812,7 @@ TIDY_EXPORT void TIDY_CALL tidyAttrDiscard( TidyDoc itdoc, TidyNode tnod,
/* Node info */ /* Node info */
TIDY_EXPORT TidyNodeType TIDY_CALL tidyNodeGetType( TidyNode tnod ); TIDY_EXPORT TidyNodeType TIDY_CALL tidyNodeGetType( TidyNode tnod );
TIDY_EXPORT ctmbstr TIDY_CALL tidyNodeGetName( TidyNode tnod ); TIDY_EXPORT ctmbstr TIDY_CALL tidyNodeGetName( TidyNode tnod );
TIDY_EXPORT Bool TIDY_CALL tidyNodeIsText( TidyNode tnod ); TIDY_EXPORT Bool TIDY_CALL tidyNodeIsText( TidyNode tnod );
TIDY_EXPORT Bool TIDY_CALL tidyNodeIsProp( TidyDoc tdoc, TidyNode tnod ); TIDY_EXPORT Bool TIDY_CALL tidyNodeIsProp( TidyDoc tdoc, TidyNode tnod );
@ -832,27 +832,18 @@ TIDY_EXPORT uint TIDY_CALL tidyNodeColumn( TidyNode tnod );
/** @} End NodeAsk group */ /** @} End NodeAsk group */
/** @defgroup Attribute Attribute Interrogation /** @defgroup Attribute Attribute Interrogation and Retrieval
** **
** Get information about any given attribute. ** Get information about attributes, and retrieve them from nodes.
** @{ ** @{
*/ */
TIDY_EXPORT TidyAttrId TIDY_CALL tidyAttrGetId( TidyAttr tattr ); TIDY_EXPORT TidyAttrId TIDY_CALL tidyAttrGetId( TidyAttr tattr );
TIDY_EXPORT Bool TIDY_CALL tidyAttrIsEvent( TidyAttr tattr ); TIDY_EXPORT Bool TIDY_CALL tidyAttrIsEvent( TidyAttr tattr );
/** @} end AttrAsk group */
/** @defgroup AttrGet Attribute Retrieval
**
** Lookup an attribute from a given node
** @{
*/
TIDY_EXPORT TidyAttr TIDY_CALL tidyAttrGetById( TidyNode tnod, TidyAttrId attId ); TIDY_EXPORT TidyAttr TIDY_CALL tidyAttrGetById( TidyNode tnod, TidyAttrId attId );
/** @} end AttrGet group */ /** @} end Attribute group */
/** @defgroup MessagesKeys Message Key Management /** @defgroup MessagesKeys Message Key Management

11
src/attrget.c → src/attrapi.c
View file

@ -1,4 +1,4 @@
/* attrget.c -- Locate attribute value by type /* attrget.c -- Additional attribute API
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University (c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice. See tidy.h for the copyright notice.
@ -6,8 +6,6 @@
*/ */
#include "tidy-int.h" #include "tidy-int.h"
#include "tags.h"
#include "attrs.h"
#include "tidy.h" #include "tidy.h"
TidyAttr TIDY_CALL tidyAttrGetById( TidyNode tnod, TidyAttrId attId ) TidyAttr TIDY_CALL tidyAttrGetById( TidyNode tnod, TidyAttrId attId )
@ -16,6 +14,13 @@ TidyAttr TIDY_CALL tidyAttrGetById( TidyNode tnod, TidyAttrId attId )
return tidyImplToAttr( TY_(AttrGetById)( nimp, attId ) ); return tidyImplToAttr( TY_(AttrGetById)( nimp, attId ) );
} }
Bool TIDY_CALL tidyAttrIsEvent( TidyAttr tattr )
{
return TY_(attrIsEvent)( tidyAttrToImpl(tattr) );
}
/* /*
* local variables: * local variables:
* mode: c * mode: c