Commit graph

732 commits

Author SHA1 Message Date
Geoff McLane 87e0e11b49 Merge of issue-228 to master 2015-09-04 15:03:08 +02:00
Geoff r. McLane f0bf30e3cc Merge remote-tracking branch 'upstream/issue-228' 2015-08-30 20:53:36 +02:00
Geoff McLane 2cfae04d19 Merge pull request #242 from b4hand/drop-include-semicolons
Drop unnecessary semicolons from includes in example.
2015-08-27 14:04:42 +02:00
Brandon Forehand 7bc824feec Updated include name. 2015-08-26 09:07:29 -07:00
Brandon Forehand 5cb55761ef Drop unnecessary semicolons from includes in example. 2015-08-25 13:53:54 -07:00
Geoff McLane fd056e353b Bump version to 5.1.7 for #239 addition 2015-08-22 14:04:38 +02:00
Geoff McLane 66e288a8e2 Issue #239 - no warn for apos enitity in html5++ mode 2015-08-22 14:03:02 +02:00
Geoff McLane 5380eb0413 Bump version for #238 2015-08-22 14:00:56 +02:00
Geoff McLane e79137de7f Issue #238 - only except the pre element 2015-08-22 14:00:18 +02:00
Ionel Roiban 91885af638 Merge pull request #236 from skynet/master
Add PHP support section
2015-08-15 19:03:56 -04:00
Geoff McLane 1d67dc940a Merge branch 'Andrew-Dunn-patch-1' into issue-228.
That is reordering windows includes per #234

In general the order of includes should be system <headers>,
then local "headers", except perhaps for the ocassional local
"version" or "config" header...

Resolved conflicts in src/pprint.c by reverting to current master, and in
version.txt by increasing the version.
2015-08-10 18:49:13 +02:00
Geoff McLane 652d4b464b change name of exe in cmd file 2015-08-10 18:10:46 +02:00
Ionel Roiban e2e2cde2ed Add PHP support section 2015-08-09 14:15:36 -04:00
Andrew Dunn dfdffd0cb3 Reordered Windows Includes
Moved the <windows.h> include above the "streamio.h" include to fix compilation with the latest Windows SDK.

<winnt.h> now has the following struct. In particular the `CR` member of this struct conflicts with a define in streamio.h.

    typedef struct _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY {
        DWORD BeginAddress;
        union {
            DWORD UnwindData;
            struct {
                DWORD Flag : 2;
                DWORD FunctionLength : 11;
                DWORD RegF : 3;
                DWORD RegI : 4;
                DWORD H : 1;
                DWORD CR : 2; // This line causes a compile error because CR is redefined in streamio.h
                DWORD FrameSize : 9;
            } DUMMYSTRUCTNAME;
        } DUMMYUNIONNAME;
    } IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY, * PIMAGE_ARM64_RUNTIME_FUNCTION_ENTRY;
2015-08-07 17:06:33 +10:00
Geoff McLane 4e7c52607c Bump version to 5.1.4 for table fix. #231 2015-07-31 13:44:46 +02:00
Geoff McLane cbae924a40 Oops, missed setting 'type' for TidyVertSpace.
This was evidenced by an 'assert' failure, that the type was not an 'int'!

And also in the -xml-help output, thus effecting the tidy.1 manual page
for this new feature --vertical-space auto, which produces almost single
line html output.

This 'fix' began in the issue-228 branch - see Issue #231
2015-07-31 13:39:06 +02:00
Geoff McLane 6a24f50466 Bump version to 5.1.3 for issue #232 2015-07-30 14:52:07 +02:00
Geoff McLane 38ef5bfe85 Issue #232 remove CM_HEAD from 'object' tag 2015-07-30 14:50:15 +02:00
Geoff McLane d639181afc Make it clear this is RC_VERSION=D231 running 2015-07-30 14:47:59 +02:00
Geoff McLane 750f31704b Bump version for #158 fixed by PR #229, but re-done here 2015-07-17 19:16:04 +02:00
Geoff McLane ae620a63a2 merge @camoy fix #158 to this branch 2015-07-17 19:00:16 +02:00
Geoff McLane d26cd72084 Add macros to get TidyVertSpace config, and implement 2015-07-15 20:58:00 +02:00
Geoff McLane 154a61543b Expand xml TidyVertSpace text to include tri-state 2015-07-15 20:56:22 +02:00
Geoff McLane 16580e0926 Revert TidyVertSpace to 'no', and make AutoBool option 2015-07-15 20:54:50 +02:00
Geoff McLane 4246c2c462 Issue #230: Need to KEEP this newline char sometimes.
This is a case where the lexer, in GetTokenfromStream, does NOT eat any
trailing newline after a LEX_STARTTAG: case...

So far have identified pre, script, style as NEEDING this user newline
character for later pprint output. Any others?
2015-07-15 19:41:02 +02:00
Geoff McLane 54130dce48 Default to no DLL if WIN32, 64-bit build 2015-07-15 19:29:53 +02:00
Geoff McLane 33494a4aea Bump version for #158 fix by PR #229 2015-07-14 11:27:15 +02:00
Geoff McLane 2c886155d0 Merge pull request #229 from camoy/master
Fix #158 - remove inserted newlines in pre

It seems this does fix this specific issue... thanks...

See #228 for some other comments on this...
2015-07-14 11:24:59 +02:00
Cameron Moy d50391a984 Fix #158 - remove inserted newlines in pre 2015-07-13 16:31:52 -04:00
Geoff McLane cb2543efac Merge branch 'master' of https://github.com/stencila/tidy-html5 into issue-228 2015-07-13 19:11:30 +02:00
Geoff McLane 97c7065177 Remove RC_NUMBER from development master branch 2015-07-13 12:42:19 +02:00
Geoff McLane 7f9df1c746 Issue #226 - bump version on API extension 2015-07-13 12:18:10 +02:00
Geoff McLane 3fccc15ae8 Merge pull request #226 from flok99/master
Added methods for delete-ing nodes and/or attributes. #226
2015-07-13 12:15:52 +02:00
Nokome Bentley 991630e523 Changes default for vertical-space to yes
Makes this more similar (but not the same) as the previous default
behaviour.
2015-07-13 15:56:15 +12:00
Nokome Bentley b6bcf0408c Applies "smart" new lines to start of script like tags 2015-07-13 15:49:07 +12:00
Nokome Bentley f6979787d1 Adds "smart" line flushing functions.
See in-code comments for more details
2015-07-13 15:40:59 +12:00
Geoff McLane 0d02731679 Add development and release branch meaning 2015-07-13 03:08:24 +02:00
Geoff McLane 2da67a2bbc Bump version to 5.1.0, after 5.0.0 release.
As per the chosen versioning system, this immediately becomes 5.1.0, the
master development stream - hopefully ALWAYS stable - with improvements of
all types...

Should any bug fix be interesting for 5.0.0 release, this change would be
push to the release/5.0.0 branch, making it version 5.0.1... or 5.0.0RC2
if still in the RC stage of release...
2015-07-13 02:17:08 +02:00
Folkert van Heusden 784c7d7f79 Added methods for deleteing nodes and/or attributes.
This is useful when e.g. writing an HTML cleaner.
2015-07-12 18:34:35 +00:00
Geoff McLane f450263d43 Update vershist.log 2015-07-01 15:57:50 +02:00
Geoff McLane 9736aa8af8 Adjust batch files for 'tidy5' to 'tidy' 2015-07-01 15:50:19 +02:00
Geoff R. McLane 8d70783a63 clean up the new names 2015-07-01 12:08:49 +02:00
Geoff R. McLane 1b461ec624 ignore gcc built items 2015-06-30 20:18:14 +02:00
Geoff McLane 1e70fc6f15 Rename two headers. Issues #224 #223 #221
But this seemed a good time to release 5.0.0.RC1...
2015-06-30 20:06:02 +02:00
Geoff McLane daef037156 Bump version of #207 change 2015-06-24 13:12:31 +02:00
Geoff McLane 3a524f1710 Issue #207 - deal with 2 cases of an unambiguous ampersand.
html5 allows a naked ampersand unquoted, and now tidy will not issue a
warning. This only deals with a & b, and P&<li>O</li>

More may need to be done for other cases.
2015-06-24 13:10:27 +02:00
Geoff McLane b65988c95a Bump version for #215 fix 2015-06-21 19:50:56 +02:00
Geoff McLane 3aa50740da Issue #215 - only issue warning if NOT HTML5 mode 2015-06-21 19:49:44 +02:00
Geoff McLane 0b0eb32843 Begin adding some doxygen syntax for next API doc gen 2015-06-09 20:06:39 +02:00
Geoff McLane e71bda718f Add TIDY_CALL to tidyLibraryVersion func. 2015-06-09 20:04:49 +02:00