Return-Path: X-Original-To: apmail-corinthia-commits-archive@minotaur.apache.org Delivered-To: apmail-corinthia-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9DAA6CD36 for ; Tue, 30 Dec 2014 14:45:16 +0000 (UTC) Received: (qmail 82831 invoked by uid 500); 30 Dec 2014 14:45:17 -0000 Delivered-To: apmail-corinthia-commits-archive@corinthia.apache.org Received: (qmail 82814 invoked by uid 500); 30 Dec 2014 14:45:17 -0000 Mailing-List: contact commits-help@corinthia.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@corinthia.incubator.apache.org Delivered-To: mailing list commits@corinthia.incubator.apache.org Received: (qmail 82804 invoked by uid 99); 30 Dec 2014 14:45:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Dec 2014 14:45:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD,T_TVD_FUZZY_SECTOR X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 30 Dec 2014 14:44:46 +0000 Received: (qmail 81762 invoked by uid 99); 30 Dec 2014 14:44:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Dec 2014 14:44:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 97023A39B3C; Tue, 30 Dec 2014 14:44:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: pmkelly@apache.org To: commits@corinthia.incubator.apache.org Date: Tue, 30 Dec 2014 14:44:27 -0000 Message-Id: In-Reply-To: <37b7c4a06d7b497db8bc2e76f585a136@git.apache.org> References: <37b7c4a06d7b497db8bc2e76f585a136@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/63] [abbrv] [partial] incubator-corinthia git commit: Moved 3rdparty to platform This is the first part of isolating 3rdparty within platform. The idea is that only platform.h should be used outside platform platform.h might contain includes to inter X-Virus-Checked: Checked by ClamAV on apache.org http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_660397.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_660397.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_660397.html deleted file mode 100644 index 5c9320e..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_660397.html +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - -
�Aufkl�rung ist der Ausgang des Menschen -
aus seiner selbstverschuldeten Unm�ndigkeit.� -
/Immanuel Kant/
- - -

�TCPA� und �Palladium�

-

Ein weiterer Schritt in die Unm�ndigkeit -
oder ein Schritt hin zur Emanzipation? �

- -

Von der �ffentlichkeit weitgehend unbemerkt geistern seit einigen Wochen -geheimnisvolle neue Schlagworte und K�rzel durch die Welt der -EDV-Profis: �TCPA� und �Palladium�. Interessiert habe ich mich damit -n�her besch�ftigt, denn allein die Tatsache, da� die Bezeichnung -�Palladium� in unserem Fall anders als in den Naturwissenschaften nicht -ein wertvolles Metall meint, sondern eine Wortsch�pfung der Firma -�Microsoft� darstellt, verhei�t nichts Gutes und weckte daher meinen -Argwohn. Der wesentlich neutralere Begriff �TCPA� (das steht f�r -�Trusted Computing Platform Alliance�) dagegen scheint auf den ersten -Blick positive oder zumindest neutrale Emotionen zu wecken - aber auch -nur auf den ersten Blick, denn wenn man sich des Horrorszenarios bewu�t -wird, das hinter �TCPA� in Kombination mit �Palladium� steckt, so d�rfte -wohl selbst der unbedarfteste EDV-Anwender schlaflose N�chte bekommen.

- -

Was hat es also mit diesen Begriffen auf sich, welche Intentionen liegen -diesen Schlagworten zugrunde und was bedeuten die dahintersteckenden -neuen Techniken f�r den EDV-Anwender?

- -

Die �TCPA� ist ein Zusammenschlu� f�hrender Hardwarehersteller, darunter -IBM, HP, AMD und Intel, die sich vorgenommen haben, den Personal -Computer durch Implementation neuer Hardwaretechnologien sicherer zu -machen. Wie uns allen bewu�t ist, hat die Monokultur im -Betriebssystemsektor dazu gef�hrt, da� durch das uns�gliche Monopol von -�Microsoft� in Kombination mit der grottenschlechten Software dieser -Firma allerorten und allenthalben eine wahre Flut von Computerviren, -sogenannten trojanischen Pferden, W�rmern und Sicherheitsl�chern -entstanden ist und t�glich neu auf den Anwender zurollt, die den Umgang -mit dem PC immer wieder zum �rgernis werden l��t. Diesem �bel wollen die -an der �TCPA� beteiligten Konzerne nun durch den sogenannten -�Fritz�-Chip (benannt nach dem US-Senator Fritz Hollings) abhelfen - ein -hehrer Wunsch. Bei dem Fritz-Chip handelt es sich um einen -Krypto-Baustein, der in zuk�nftige Generationen von Personal Computern -integriert werden und allgemein die Systeme sicherer machen soll. Dieser -Chip speichert mehrere Schl�ssel, die hardware- und anwenderspezifisch -definiert sind. Sobald der PC eingeschaltet wird, nimmt der Fritz-Chip -seine Arbeit auf und fragt einen Schl�ssel nach dem anderen ab: Zun�chst -wird das BIOS abgefragt, anschlie�end alle im Rechner vorhandenen -BIOS-Erweiterungen der Steckkarten. Danach wird die Festplatte -�berpr�ft, und anschlie�end pr�ft der TCPA-Chip auch noch den -Bootsektor, den Bootloader, den Kernel und die Ger�tetreiber. Da bei -jedem dieser Schritte eine Pr�fsumme abgespeichert und ein 160 Bit -langer eindeutiger Wert aus den gewonnenen Daten und einem speziellen -Schl�ssel generiert wird, hat der Fritz-Chip jederzeit die v�llige -Kontrolle �ber das Gesamtsystem.

- -

Damit taucht schon die erste Problematik f�r den Anwender auf: Bereits -ein Flash-Update des Rechner-BIOS legt das gesamte System lahm, da dann -die generierten Werte des Fritz-Chip nicht mehr mit den gespeicherten -Werten, die zertifiziert sind, �bereinstimmen. In Zeiten, in denen -aufgrund der oftmals schlampig implementierten BIOS-Versionen -Flash-Updates derselben zumindest bei den �blichen Consumer-Produkten an -der Tagesordnung sind, ist also der Fritz-Chip eher hinderlich denn ein -Segen f�r den Anwender. Gleiches gilt �brigens f�r diejenigen Anwender, -die beispielsweise eine neue Grafikkarte oder eine gr��ere Festplatte -einbauen wollen - auch f�r sie bedeutet jede Hardware-Modifikation eine -- vermutlich nat�rlich kostenpflichtige - Neuzertifizierung des -Gesamtsystems, damit dieses wieder als �TCPA-konform� angesehen werden -kann. Bei der Neuzertifizierung wird online anhand einer Liste mit -gepr�fter Hardware (HCL) und einer weiteren Liste mit gesperrten -Seriennummern (SRL) die Konformit�tstabelle des Rechners gepr�ft und -aktualisiert.

- -

Hat der Fritz-Chip beim Bootvorgang alle Komponenten als �TCPA-konform� -�berpr�ft und erkannt, �bergibt er die Kontrolle schlie�lich an das -Betriebssystem. Ab diesem Punkt hakt nun - wie k�nnte es anders sein? - -die Firma �Microsoft� ein mit ihrer �Palladium�-Technologie. Sobald der -Anwender jetzt ein Programm startet, �berpr�ft das Betriebssystem dieses -anhand der im Fritz-Chip gespeicherten Werte f�r die SRL. Sollte sich -herausstellen, da� dieses Programm keine g�ltige Lizenz und/oder -Seriennummer besitzt oder die Lizenz abgelaufen ist, wird es gar nicht -erst gestartet. Stellt es sich als �TCPA-konform� heraus, so wird nach -der Freigabe und dem anschlie�enden Start erneut online eine Liste mit -gesperrten Dokumenten f�r dieses Programm abgerufen (DRL), um zu -verhindern, da� der Anwender f�r ihn nicht vorgesehene Dateien �ffnet -oder unerlaubterweise nutzt.

- -

Was sich auf den ersten Blick tats�chlich als wirksame Waffe gegen -Viren, Trojaner, W�rmer und �hnliche Probleme geriert, entm�ndigt jedoch -den Anwender: �Palladium� st��t vor allem bei der -Unterhaltungsindustrie, die einen erbitterten Kampf gegen jegliche -Weiterverbreitung urheberrechtlich gesch�tzter Produkte im Internet -f�hrt, auf gro�e Zustimmung, bietet sich hier jedoch erstmals -vordergr�ndig die M�glichkeit, MP3-Tauschb�rsen und �hnliche Dienste -effizient trockenzulegen dank �Microsoft�. Auch das Kopieren einzelner -Musikst�cke zu privaten Zwecken am heimischen PC wird damit unterbunden -- dank �Microsoft� werden also vermutlich die ohnehin �bervollen Kassen -der Unterhaltungsindustrie zuk�nftig noch kr�ftiger klingeln!

- -

Doch der Anwender hat nat�rlich noch die M�glichkeit, auch nicht -�TCPA-konforme� Software auf seinem heimischen PC zu installieren und zu -starten. Bemerkt �Palladium� eine solche Anwendung, wird das -Gesamtsystem als �kompromittiert� gekennzeichnet und alle konformen -Anwendungen samt Dateien werden geschlossen. Der Nutzwert eines solchen -Systems d�rfte f�r den Anwender dann wohl gegen Null tendieren.

- -

Doch gehen wir einen Schritt weiter und bedenken wir die Folgen dieser -Technologie:

- -
    -
  1. - Die SRL's, DRL's und HCL's, die f�r die - Konformit�ts-Authentifizierung eines PC's unbedingt ben�tigt - werden, werden an zentraler Stelle im Internet gespeichert und - abgerufen. Hacker brauchen jetzt also nicht mehr einzelne PC's - anzugreifen, sondern k�nnen ihr Engagement auf diese Server - konzentrieren - und damit unter Umst�nden mit einem einzigen - gelungenen Angriff Millionen von Rechnern unbrauchbar machen. -
  2. -
  3. - Es bedarf keiner ausgesprochen ausgepr�gten Phantasie, um sich - auszumalen, wie �Palladium� mit unerw�nschten Konkurrenzprodukten - verfahren kann: Sollen bestimmte Softwareprodukte anderer - Hersteller als �Microsoft� nicht als �konform� zertifiziert - werden, so gen�gt es, sie auf die �schwarze Liste� des - �Palladium�-Systems zu setzen. Bei einem Start solcher Software - w�re der Rechner nur noch sehr eingeschr�nkt nutzbar, da - �kompromittiert� - jeder Anwender w�rde sich wohl zumindest - �berlegen, ob er beim n�chsten Mal nicht doch zur drittklassigen - Spyware aus dem Hause �Microsoft� greift. -
  4. -
  5. - Die Zertifizierungen f�r Software und Dateien kosten Geld: - Sch�tzungen gehen von bis zu sechsstelligen Dollarsummen aus f�r - eine einzige Anwendung. Die Folge dieser Lizenzierungspraxis w�re, - da� die Freewareszene von der Bildfl�che verschwindet. Viele - tausend Programmierer, die unter oftmals gro�em pers�nlichen - Engagament und erheblichem Zeitaufwand ansehnliche Projekte als - Freeware entwickelt haben, h�tten keine M�glichkeit und auch keine - Motivation mehr, ihre oft wirklich innovativen Projekte der - Anwendergemeinde zur Verf�gung zu stellen dank der kriminellen - Krake �Microsoft�. -
  6. -
  7. - Der gesamte von der GPL-Lizenz abgedeckte Bereich w�rde ebenfalls - sang- und klanglos vor dem Aus stehen, da auch hier zun�chst - erhebliche Betr�ge in eine Zertifizierung gesteckt werden m��ten, - denen keine Einnahmen gegen�berstehen. Die wohl gef�hrlichste - Konkurrenz f�r �Microsoft�, n�mlich die oftmals aus idealistischer - und moralischer Intention heraus handelnden freien Entwickler, die - ihre Software unter der GPL-Lizenz vertreiben, w�re mit einem - Schlag ausgeschaltet. -
  8. -
  9. - Dem uns�glichen Monopol der Firma �Microsoft� im - Betriebssystemmarkt w�rde ein weiterer nachhaltiger Schub - verliehen, denn Konkurrenzsysteme m��ten, um mit dem Fritz-Chip - und damit letztendlich auch mit �Palladium� zu harmonieren, - ebenfalls �TCPA-konform� gestaltet werden. F�r OS/2 WARP ebenso - wie f�r die meisten Linux-Distributionen und auch Systeme wie - FreeBSD, NetBSD oder auch BeOS und (mit Einschr�nkungen) QNX w�rde - der Zwang zur �TCPA-� und �Palladium�-Konformit�t das Verschwinden - vom EDV-Markt bedeuten, denn ohne diese Konformit�t w�rden diese - meist besseren Betriebssysteme als �unsicher� gelten. OS/2 WARP - und die eComStation w�rden aus den gro�en Banken und - Versicherungen, bei TK-Dienstleistern und bei den anderen - Anwendern im professionellen Umfeld ge�chtet und von den - Festplatten verbannt zugunsten der wesentlich schlechteren - �Windows�-Systeme. Die einzige Alternative bliebe nach dem - derzeitigen Stand der Dinge HP-Linux, da HP bereits an der �TCPA-� - und �Palladium�-Konformit�t seines Linux arbeitet. -
  10. -
  11. - Mit dem �Palladium�-System w�rde die offene, basisdemokratische - Struktur des Internet endg�ltig zu Grabe getragen und einem - Meinungs- und Zensurmonopol der Firma �Microsoft� weichen. - �Microsoft� k�nnte �ber die variable Gestaltung von - Zertifizierungsgeb�hren die Weiterverbreitung kritischer Dokumente - im Internet oder im Rahmen von Software-Distributionen verhindern. - Obendrein w�ren alle Newsdienste au�er den �Microsoft�-eigenen - davon betroffen - freiwillige, sehr anerkennenswerte Initiativen - wie beispielsweise auch die VOICE, die sich der Aufkl�rung der - OS/2-Gemeinde verschrieben hat, m��ten f�r die einzelnen Beitr�ge - Zertifizierungsgeb�hren an �Microsoft� zahlen f�r die - �Palladium�-Konformit�t, um nicht auf der �schwarzen Liste� der - DRL-Server zu landen. Das Internet als Transporteur - basisdemokratischer Ideale w�re zerst�rt und zu einem Sprachrohr - von �Microsoft� verkommen. -
  12. -
  13. - Durch die enge Kopplung der �Palladium�-Technologie in Kooperation - mit dem Fritz-Chip an Hard- und Software w�rde der - Gebrauchtsoftwaremarkt zum Erliegen kommen - weil bereits einmal - durch TCPA und �Palladium� zertifizierte Software aufgrund der - Verschl�sselung untrennbar an die Hardware gekoppelt ist. F�r - �Microsoft� erf�llt sich damit ein lange gehegter Traum: Jeder - K�ufer eines PC mu� Software aus Redmond neu kaufen, da die alte - Software nur �ber eine Seriennummern-Freigabe auf ein anderes - Ger�t �bertragbar w�re - und davon steht nicht ein einziges Wort - in den entsprechenden Standardisierungs-Richtlinien. -
  14. -
- -

Das hier geschilderte Horrorszenario erscheint keineswegs abwegig: Bill -Gates hat mit der Unterhaltungsindustrie starke Kombattanten im R�cken, -denen es genauso wie ihm um die Profitmaximierung um jeden Preis geht - -auch wenn dabei demokratische und ethische Prinzipien nicht nur -ausgeh�hlt, sondern offen mit F��en getreten werden und auf der Strecke -bleiben. Offen diskutiert werden die Folgen seiner Technologie noch -nicht; bislang hat Gates gr��ten Wert darauf gelegt, sich stets -�ffentlich und lauthals als Vork�mpfer gegen Raubkopierertum zum Wohle -der Software- und der Unterhaltungsindustrie und auch zum angeblichen -Nutzen des Endverbrauchers zu gerieren - mit �Palladium� jedoch -�berschreitet �Microsoft� im Halbdunkel ein- f�r allemal eine Grenze, -die dem vermeintlichen Vork�mpfer Gates f�r die Durchsetzung von -Urheberrechten bislang Fesseln anlegte: Nun geht es um die vollkommene -Kontrolle der Informationsgesellschaft durch einen Konzern, der -krimineller Machenschaften mehrfach �berf�hrt ist - die Weltherrschaft -einer einzelnen kleinen Clique im Mediensektor droht, und das auch noch -mit blau�ugiger Zustimmung einiger international agierender -Medienkonzerne, die bisher offenbar noch gar nicht realisiert haben, da� -sie sich mit ihrer offensichtlich blinden Profitsucht einem Mann -ausliefern, den andere als den gef�hrlichsten Zeitgenossen seit Adolf -Hitler betrachten.

- -

Es wird Zeit, da� die Demokraten unter den EDV-Profis und -Anwendern -endlich aus ihrem Dornr�schenschlaf aufwachen, denn:

- -
�Man darf nicht -warten, bis aus dem Schneeball eine Lawine geworden ist. Man mu� den -rollenden Schneeball zertreten. Die Lawine h�lt keiner mehr auf. Sie -ruht erst, wenn sie alles unter sich begraben hat...� -
/Erich K�stner/
- - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_661606.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_661606.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_661606.html deleted file mode 100644 index f804f18..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_661606.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - [661606] Two bytes at the last line, w/ asian options - - - - -

18

- -

����ԁ@�����ς�����
���܂��܂����B

- �u�ǂ����悤�c�H�

- - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_663548.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_663548.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_663548.html deleted file mode 100644 index f26332e..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_663548.html +++ /dev/null @@ -1,22 +0,0 @@ - - -[663548] Javascript and Tidy - missing code - - - -

foo - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_671087.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_671087.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_671087.html deleted file mode 100644 index a51f200..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_671087.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -tidy loops with --new-inline-tags table,tr,td - - - - - - -
table heading
- - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_676156.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_676156.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_676156.html deleted file mode 100644 index f822cb6..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_676156.html +++ /dev/null @@ -1,5 +0,0 @@ -foo -bar - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_676205.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_676205.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_676205.html deleted file mode 100644 index 77b87b5..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_676205.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - [676205] <img src="> crashes Tidy - - - - - - -[ 676205 ] <img src="> crashes Tidy - - - - - - - -Error: File Copy Error! File=C:\WinNT\ -System32\PERFLIB_PERFDATA_<#>.DAT (copying to a -'.fil'). - - -Error: File Copy Error! File=C:\WinNT\ -System32\PERFLIB_PERFDATA_ -<#>.DAT (copying to a '.fil'). -
id
- - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_679135.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_679135.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_679135.html deleted file mode 100644 index 4a5c5f6..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_679135.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - [ 679135 ] Crashes while checking attributes - - - - -

- - - -
- - - -
- - -
-
- - - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_680664.xhtml ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_680664.xhtml b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_680664.xhtml deleted file mode 100644 index ef1de47..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_680664.xhtml +++ /dev/null @@ -1,17 +0,0 @@ - - - - -[ 680664 ] Malformed comment generates bad (X)HTML - - - - -
-This is a test of some pre stuff.
-See what happens to this comment 
-  
-   
-
-
-  

How to…
- Place an extended-hours order:

- - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_695408.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_695408.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_695408.html deleted file mode 100644 index e38c76f..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_695408.html +++ /dev/null @@ -1,14 +0,0 @@ - - - [ 695408 ] Empty spans getting dropped, even if they have attrs - - - - - - - - -
- - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_696799.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_696799.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_696799.html deleted file mode 100644 index b2d909b..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_696799.html +++ /dev/null @@ -1,12 +0,0 @@ - - - [ 696799 ] Crash: <script language=""> - - - - - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_706260.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_706260.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_706260.html deleted file mode 100644 index 07cc79c..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_706260.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - #706260 size not accepted for input - - - -
- -
- - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_765852.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_765852.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_765852.html deleted file mode 100644 index 7113f63..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_765852.html +++ /dev/null @@ -1,3 +0,0 @@ - -#765852 Empty tag striping -

Text following italics without a blank after the i end tag is not cleaned up correctly (the bold blank is eliminated).

\ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_795643-1.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_795643-1.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_795643-1.html deleted file mode 100755 index 0902f05..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_795643-1.html +++ /dev/null @@ -1 +0,0 @@ -

Hi

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_795643-2.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_795643-2.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_795643-2.html deleted file mode 100755 index 7fdd496..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_795643-2.html +++ /dev/null @@ -1 +0,0 @@ -

Hi

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462-2.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462-2.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462-2.html deleted file mode 100755 index 1bfd16c..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462-2.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -836462-2 - - -

Heading

- -
    -
  1. First ordered list item

  2. -
  3. Second ordered list item

  4. -
  5. Third ordered list item

  6. -
      -
    • First unordered list item

    • -
    • Second unordered list item

    • -
    -
  7. Fourth unordered list item

  8. -
  9. Fifth unordered list item

  10. -
- - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462-3.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462-3.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462-3.html deleted file mode 100755 index b9e980c..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462-3.html +++ /dev/null @@ -1,9 +0,0 @@ - -test - -
    - -
    -
- - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462.html deleted file mode 100755 index 727c9e5..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_836462.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -836462 - - -

Heading

- -
    -
  • First list item

  • -
  • Second list item

  • -
  • Third list item

  • -
      -
    • First list item 2

    • -
    • Second list item 2

    • -
    -
  • Fourth list item

  • -
  • Fifth list item

  • -
- - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_837023.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_837023.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_837023.html deleted file mode 100644 index 201f993..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_837023.html +++ /dev/null @@ -1,12 +0,0 @@ - - -[ 837023 ] segfault on doctype-like element - - - -Just text. - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_978947.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_978947.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_978947.html deleted file mode 100644 index b68fa10..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_978947.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - -Bug: &nbsp; disappears after </pre> - - -Here the non-breaking spaces (     ) -remain. -

     Works multiple times -(     ) as well.
-But . . .  :

-
-A block of 
-preformatted text.
-
-Now the non-breaking spaces (     ) -are replaced with ordinary spaces, and disappear. - - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_996484.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_996484.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_996484.html deleted file mode 100644 index 89a05a3..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/input/in_996484.html +++ /dev/null @@ -1,40 +0,0 @@ - - - -test whether xx<...>yy</...> is wrapped properly - - -

test 1.1 (no space)

-

xxyy

- -

test 1.2 (with space)

-

xx yy

- -

test 1.3 (with non breaking space)

-

xx yy

- -

test 2.1 (no space)

-

xxyy

- -

test 2.2 (with space)

-

xx yy

- -

test 2.3 (with non breaking space)

-

xx yy

- -

test 3 (no space)

-

xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

-

xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

- -

test 4 (<br>)

-

zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
xx

- -

test 5 (no space in the front)

-

aa

- -

test 6 (no space in the front)

-

aaxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

- - - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/onetest.cmd ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/onetest.cmd b/DocFormats/3rdparty/external/w3c-tidy-html5/test/onetest.cmd deleted file mode 100755 index 5700766..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/onetest.cmd +++ /dev/null @@ -1,103 +0,0 @@ -@echo off - -REM onetest.cmd - execute a single test case -REM -REM (c) 1998-2006 (W3C) MIT, ERCIM, Keio University -REM See tidy.c for the copyright notice. -REM -REM -REM - -@if "%TIDY%." == "." goto Err1 -@if NOT EXIST %TIDY% goto Err2 -@if "%TIDYOUT%." == "." goto Err3 -@if NOT EXIST %TIDYOUT%\nul goto Err4 -@if NOT EXIST input\nul goto Err5 - -set TESTNO=%1 -set EXPECTED=%2 - -set INFILES=input\in_%1.*ml -set CFGFILE=input\cfg_%1.txt - -set TIDYFILE=%TIDYOUT%\out_%1.html -set MSGFILE=%TIDYOUT%\msg_%1.txt - -set HTML_TIDY= - -REM If no test specific config file, use default. -if NOT exist %CFGFILE% set CFGFILE=input\cfg_default.txt - -REM Get specific input file name -@set INFILE= -for %%F in ( %INFILES% ) do set INFILE=%%F -@if "%INFILE%." == "." goto Err6 -@if NOT EXIST %INFILE% goto Err7 - -REM Remove any pre-exising test outputs -if exist %MSGFILE% del %MSGFILE% -if exist %TIDYFILE% del %TIDYFILE% - -@REM Noisy output, or quiet -@REM echo Testing %1 input %INFILE% config %CFGFILE% ... -echo Testing %1 - -%TIDY% -f %MSGFILE% -config %CFGFILE% %3 %4 %5 %6 %7 %8 %9 --tidy-mark no -o %TIDYFILE% %INFILE% -set STATUS=%ERRORLEVEL% - -if %STATUS% EQU %EXPECTED% goto done -set ERRTESTS=%ERRTESTS% %TESTNO% -echo *** Failed - got %STATUS%, expected %EXPECTED% *** -type %MSGFILE% -goto done - -:Err1 -@echo ============================================================== -@echo ERROR: runtime exe not set in TIDY environment variable ... -@echo ============================================================== -@goto TRYAT - -:Err2 -@echo ============================================================== -@echo ERROR: runtime exe %TIDY% not found ... check name, location ... -@echo ============================================================== -@goto TRYAT - -:Err3 -@echo ============================================================== -@echo ERROR: output folder TIDYOUT not set in environment ... -@echo ============================================================== -@goto TRYAT - -:Err4 -@echo ============================================================== -@echo ERROR: output folder %TIDYOUT% does not exist ... -@echo ============================================================== -@goto TRYAT - -:Err5 -@echo ============================================================== -@echo ERROR: input folder 'input' does not exist ... check name, location .. -@echo ============================================================== -@goto TRYAT - -:TRYAT -@echo Try running alltest.cmd ..\build\msvc\Release\Tidy.exe tmp ... -@echo ============================================================== -@goto done - -:Err6 -@echo ============================================================== -@echo ERROR: Failed to find input matching '%INFILES%'!!! -@echo ============================================================== -@pause -@goto done - -:Err7 -@echo ============================================================== -@echo ERROR: Failed to find input file '%INFILE%'!!! -@echo ============================================================== -@pause -@goto done - -:done http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/onetesta.cmd ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/onetesta.cmd b/DocFormats/3rdparty/external/w3c-tidy-html5/test/onetesta.cmd deleted file mode 100755 index b06bfe5..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/onetesta.cmd +++ /dev/null @@ -1,68 +0,0 @@ -@echo off - -REM execute a single test case of the accessibility test suite -REM -REM (c) 2006 (W3C) MIT, ERCIM, Keio University -REM See tidy.c for the copyright notice. -REM -REM -REM - -echo Testing %1 %2 %3 -set TESTNO=%1 -set TESTEXPECTED=%2 -set ACCESSLEVEL=%3 - -set INFILES=%TIDYINPUT%\%1.*ml -set CFGFILE=%TIDYINPUT%\cfg_%1.txt - -set TIDYFILE=%TIDYOUT%\out_%1.html -set MSGFILE=%TIDYout%\msg_%1.txt - -set HTML_TIDY= - -REM If no test specific config file, use default. -if NOT exist %CFGFILE% set CFGFILE=%TIDYINPUT%\cfg_default.txt - -REM Get specific input file name -for %%F in ( %INFILES% ) do set INFILE=%%F - -if EXIST %INFILE% goto DOIT -@echo ERROR: Can NOT locate [%INFILE%] ... aborting test ... -@echo ======================================= >> ACCERR.TXT -@echo Testing %1 %2 %3 >> ACCERR.TXT -@echo ERROR: Can NOT locate [%INFILE%] ... aborting test ... >> ACCERR.TXT -@goto done - -:DOIT -REM Remove any pre-existing test outputs -if exist %MSGFILE% del %MSGFILE% -if exist %TIDYFILE% del %TIDYFILE% - -REM this has to all one line ... -%TIDY% -f %MSGFILE% --accessibility-check %ACCESSLEVEL% -config %CFGFILE% --gnu-emacs yes --tidy-mark no -o %TIDYFILE% %INFILE% - -@REM output the FIND count to the a result file -find /c "%TESTEXPECTED%" %MSGFILE% > tempres.txt -@REM load the find count, token 3, into variable RESULT -for /F "tokens=3" %%i in (tempres.txt) do set RESULT=%%i -@REM test the RESULT variable ... -if "%RESULT%." == "0." goto Err -if "%RESULT%." == "1." goto done -@REM echo note - test '%TESTEXPECTED%' found %RESULT% times in file '%INFILE%' -goto done - -:Err -echo FAILED --- test '%TESTEXPECTED%' not detected in file '%INFILE%' -type %MSGFILE% -echo FAILED --- test '%TESTEXPECTED%' not detected in above -set FAILEDACC=%FAILEDACC% %1 -REM append results to the ACCERR.TXT file -echo ======================================= >> ACCERR.TXT -echo %TIDY% -f %MSGFILE% --accessibility-check %ACCESSLEVEL% -config %CFGFILE% --gnu-emacs yes --tidy-mark no -o %TIDYFILE% %INFILE% >> ACCERR.TXT -echo FAILED --- test '%TESTEXPECTED%' not detected in file '%MSGFILE%', as follows - >> ACCERR.TXT -type %MSGFILE% >> ACCERR.TXT -echo FAILED --- test '%TESTEXPECTED%' not detected in above >> ACCERR.TXT -goto done - -:done http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_427820.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_427820.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_427820.html deleted file mode 100644 index 83d5bd1..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_427820.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Test Input For Bug #427820 - - - - - - - -

- - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_427826.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_427826.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_427826.html deleted file mode 100644 index d73cfa9..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_427826.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - [#427826] Script source needs escaping/CDATA - section - - - - - - - -

If converted to XML/XHTML, the < in the javascript source - above causes problems for XML tools.

- - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_431721.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_431721.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_431721.html deleted file mode 100644 index 716a09b..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_431721.html +++ /dev/null @@ -1,54 +0,0 @@ - - - Joe-Bob Briggs LLP - - - -
-

Joe-Bob Briggs LLP

- -

- -

Bryan Joe-Bob LLP is a leading national and international - corporate, litigation and private client law firm.  We - represent a wide variety of business, institutional and - individual clients for whom our lawyers handle a wide range - of matters.  As a result, our lawyers are well prepared - to meet the needs of clients whether large or small, public - or private, for-profit or not-for-profit.

- -

- -

Joe-Bob Briggs has more offices than you can shake a stick - at.  These locations give Joe-Bob the geographic reach - to assist his clients where their needs are most - pressing.

- -
    -
  • Estate Planning
  • - -
  • Closely-Held Business Practice
  • - -
  • Estate, Gift, Income and Other Tax Advice
  • -
- -

- -

Joe-Bob joined the Firm in 1995 after 15 years with the - Kansas City firm of Fish, Gill, Smoker & Butts, where he - was a Shareholder/Director.  John is a past Chair of the - Estate Planning, Probate and Trust Committee of the Kansas - City Metropolitan Bar Association and co-authored the - Drinking Procedures Manual for County Practitioners.  - Currently, JB is a member of the Missouri Bar Probate and - Trust Committee, the Estate Planning Society and the - Mid-America Planned Giving Council.  A fellow of the - American College of Trust and Estate Counsel, JB lectures - frequently on Estate Planning topics for both legal and lay - organizations. 

- -

-
- - - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_480701.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_480701.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_480701.html deleted file mode 100644 index 645c106..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_480701.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_533233.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_533233.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_533233.html deleted file mode 100644 index 08c786f..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_533233.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Test for bug #533233 - - - - - -

Script sample 1

- -

Headline project—Link to - offsite page.

- -

Input 1

- -

texttext

- - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_540571.html ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_540571.html b/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_540571.html deleted file mode 100644 index 66077b3..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/output/out_540571.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - #540571 Inconsistent behaviour with span inline element - - - -

- Hello World -

- -

The font inline is moved so it becomes a child of the h1 element.

- -

- Hello World -

- -

The span inline is not moved so it becomes a child of the h1 element, which is inconsistent and does not correspond with current browser behaviour any more.

- - - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/testaccess.sh ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testaccess.sh b/DocFormats/3rdparty/external/w3c-tidy-html5/test/testaccess.sh deleted file mode 100755 index b2c3899..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testaccess.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh - -# -# testaccess.sh - execute all testcases for regression testing -# -# (c) 2005 (W3C) MIT, ERCIM, Keio University -# See tidy.c for the copyright notice. -# -# -# -# set -x - -VERSION='$Id' - -cat accesscases.txt | sed 1d | \ -{ -while read bugNo expected -do - ./testaccessone.sh $bugNo $expected "$@" | tee -a testaccess.log -done -} http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/testaccessone.sh ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testaccessone.sh b/DocFormats/3rdparty/external/w3c-tidy-html5/test/testaccessone.sh deleted file mode 100755 index 85ee82e..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testaccessone.sh +++ /dev/null @@ -1,76 +0,0 @@ -#! /bin/sh - -# -# execute a single testcase -# -# (c) 2005 (W3C) MIT, ERCIM, Keio University -# See tidy.c for the copyright notice. -# -# -# -# set -x - -VERSION='$Id' - -echo Testing $1 - -set +f - -TESTNO=$1 -TESTEXPECTED=$2 -ACCESSLEVEL=$3 - -TIDY=../bin/tidy -INFILES=./accessTest/$1.*ml -CFGFILE=./accessTest/cfg_$1.txt - -TIDYFILE=./tmp/out_$1.html -MSGFILE=./tmp/msg_$1.txt - -unset HTML_TIDY - -shift -shift -shift - -# Remove any pre-exising test outputs -for INFIL in $MSGFILE $TIDYFILE -do - if [ -f $INFIL ] - then - rm $INFIL - fi -done - -for INFILE in $INFILES -do - if [ -r $INFILE ] - then - break - fi -done - -# If no test specific config file, use default. -if [ ! -f $CFGFILE ] -then - CFGFILE=./accessTest/cfg_default.txt -fi - -# Make sure output directory exists. -if [ ! -d ./tmp ] -then - mkdir ./tmp -fi - -$TIDY -f $MSGFILE --accessibility-check $ACCESSLEVEL -config $CFGFILE "$@" --gnu-emacs yes --tidy-mark no -o $TIDYFILE $INFILE -STATUS=$? - -if [ `grep -c -e ' \['$TESTEXPECTED'\]: ' $MSGFILE` = 0 ] -then - echo "--- test '$TESTEXPECTED' not detected in file '$INFILE'" - cat $MSGFILE - exit 1 -fi - -exit 0 - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/testall.sh ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testall.sh b/DocFormats/3rdparty/external/w3c-tidy-html5/test/testall.sh deleted file mode 100755 index adc0ee7..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testall.sh +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh - -# -# testall.sh - execute all testcases for regression testing -# -# (c) 1998-2003 (W3C) MIT, ERCIM, Keio University -# See tidy.c for the copyright notice. -# -# -# -# set -x - -VERSION='$Id' - -BUGS="426885 427633 427662 427664 427671 427672 427675 427676 427677\ - 427810 427811 427813 427816 427818 427819 427820 427821 427822 427823\ - 427825 427826 427827 427830 427833 427834 427835 427836 427837 427838 427839\ - 427840 427841 427845 427846 431716 431721 431731 431736\ - 431739 431874 431889 431895 431898 431958 431964 432677 433012\ - 433021 433040 433359 433360 433656 433666 433672 433856 434047 434100\ - 434940 435903 435917 435919 435920 435922 435923 437468 438650\ - 438658 438954 438956 441508 441568 443362 443576 443678 445074 445394\ - 445557 449348 470663 480701 487204 487283 501669 504206 505770 511679\ - 533233 540571 543262 545772 553468 566542 586555 586562 588061 593705 616744\ - 620531 629885 634889 640473 640474 646946 647255 647900 649812 655338\ - 656889 658230 660397 661606 676156 676205 688746 695408 696799" - -# for bugNo in ${BUGS} - -while read bugNo expected -do -# echo Testing $bugNo | tee -a testall.log - ./testone.sh $bugNo $expected "$@" | tee -a testall.log -done < testcases.txt - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/testcases.txt ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testcases.txt b/DocFormats/3rdparty/external/w3c-tidy-html5/test/testcases.txt deleted file mode 100644 index 87db9ab..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testcases.txt +++ /dev/null @@ -1,227 +0,0 @@ -426885 1 -427633 0 -427662 1 -427664 1 -427671 1 -427672 1 -427675 1 -427676 2 -427677 1 -427810 1 -427811 1 -427813 1 -427816 1 -427818 1 -427819 1 -427820 1 -427821 0 -427822 1 -427823 1 -427825 1 -427826 0 -427827 1 -427830 1 -427833 0 -427834 0 -427835 1 -427836 1 -427837 0 -427838 1 -427839 0 -427840 1 -427841 1 -427845 0 -427846 1 -431716 0 -431721 1 -431731 1 -431736 1 -431739 1 -431874 1 -431889 1 -431895 1 -431898 1 -431958 0 -431964 1 -432677 0 -433012 1 -433021 1 -433040 0 -433359 0 -433360 1 -433604 0 -433607 0 -433656 0 -433666 1 -433672 1 -433856 1 -434047 0 -434100 2 -434940 0 -435903 1 -435917 1 -435919 1 -435920 1 -435922 1 -435923 0 -437468 0 -438650 1 -438658 1 -438954 0 -438956 1 -441508 1 -441568 0 -443362 1 -443576 1 -443678 1 -445074 1 -445394 1 -445557 1 -449348 0 -470663 1 -473490 1 -480406 0 -480701 0 -487204 1 -487283 1 -500236 1 -501669 0 -503436 1 -504206 1 -505770 1 -511679 1 -511243 0 -533233 0 -540571 1 -543262 0 -545772 0 -553468 0 -566542 1 -586555 1 -586562 1 -588061 1 -590716 1 -593705 0 -609058 0 -616744 0 -620531 1 -629885 1 -634889 1 -640473 1 -640474 0 -646946 0 -647255 1 -647900 2 -649812 0 -655338 1 -656889 1 -658230 1 -660397 1 -661606 0 -671087 0 -676156 1 -676205 1 -678268 1 -688746 1 -695408 1 -696799 1 -706260 0 -765852 1 -795643-1 1 -795643-2 1 -836462 1 -836462-2 1 -836462-3 1 -837023 1 -978947 0 -996484 0 -1002509 2 -1003361 0 -1004051 0 -1004512 0 -1014993 1 -1015959 1 -1027888 1 -1050673 1 -1052758 0 -1053626 1 -1055304 1 -1055398 1 -1056023 1 -1056910 0 -1062345 1 -1062511 1 -1062661 1 -1063256 2 -1067112 1 -1068087 1 -1069549 0 -1069553 0 -1072528 1 -1078345 0 -1079820 1 -1086083 1 -1090318 1 -1098012 1 -1107622 1 -1117013 0 -1115094 1 -1145571 1 -1145572 0 -1168193 1 -1183751 0 -1198501 0 -1207443 0 -1210752 1 -1231279 1 -1235296 0 -1241723 0 -1263391 1 -1266647 1 -1282835 0 -1286029 0 -1286278 0 -1316258 1 -1316307 1 -1316307-2 1 -1326520 1 -1331849 1 -1333579 1 -1359292 1 -1398397 1 -1407266 1 -1408034 1 -1410061 1 -1410061-1 1 -1410061-2 1 -1415137 1 -1423252 1 -1426419 1 -1436578 0 -1452744 0 -1445570 1 -1503897 1 -1586158 0 -1590220-1 1 -1590220-2 1 -1603538-1 1 -1603538-2 1 -1610888-1 0 -1610888-2 0 -1632470 1 -1632218 1 -1638062 1 -1674502 1 -1707836 1 -1715153 1 -1720953 0 -1773932 1 -1986717-1 0 -1986717-2 0 -1986717-3 0 -2046048 2 -2085175 0 -2359929 1 -2705873-1 0 -2705873-2 0 -2709860 0 http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/testone.sh ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testone.sh b/DocFormats/3rdparty/external/w3c-tidy-html5/test/testone.sh deleted file mode 100755 index b8ec0b2..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testone.sh +++ /dev/null @@ -1,73 +0,0 @@ -#! /bin/sh - -# -# testone.sh - execute a single testcase -# -# (c) 1998-2006 (W3C) MIT, ERCIM, Keio University -# See tidy.c for the copyright notice. -# -# -# -# set -x - -VERSION='$Id' - -echo Testing $1 - -set +f - -TESTNO=$1 -EXPECTED=$2 -TIDY=../bin/tidy -INFILES=./input/in_${TESTNO}.*ml -CFGFILE=./input/cfg_${TESTNO}.txt - -TIDYFILE=./tmp/out_${TESTNO}.html -MSGFILE=./tmp/msg_${TESTNO}.txt - -unset HTML_TIDY - -shift -shift - -# Remove any pre-exising test outputs -for INFIL in $MSGFILE $TIDYFILE -do - if [ -f $INFIL ] - then - rm $INFIL - fi -done - -for INFILE in $INFILES -do - if [ -r $INFILE ] - then - break - fi -done - -# If no test specific config file, use default. -if [ ! -f $CFGFILE ] -then - CFGFILE=./input/cfg_default.txt -fi - -# Make sure output directory exists. -if [ ! -d ./tmp ] -then - mkdir ./tmp -fi - -$TIDY -f $MSGFILE -config $CFGFILE "$@" --tidy-mark no -o $TIDYFILE $INFILE -STATUS=$? - -if [ $STATUS -ne $EXPECTED ] -then - echo "== $TESTNO failed (Status received: $STATUS vs expected: $EXPECTED)" - cat $MSGFILE - exit 1 -fi - -exit 0 - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/testxml.sh ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testxml.sh b/DocFormats/3rdparty/external/w3c-tidy-html5/test/testxml.sh deleted file mode 100644 index 08a46a0..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/testxml.sh +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh - -# -# testxml.sh - execute all XML testcases -# -# (c) 1998-2005 (W3C) MIT, ERCIM, Keio University -# See tidy.c for the copyright notice. -# -# -# -# set -x - -VERSION='$Id' - -BUGS="427837 431956 433604 433607 433670 434100\ - 480406 480701 500236 503436 537604 616744 640474 646946" - -while read bugNo expected -do -# echo Testing $bugNo | tee -a testxml.log - ./testone.sh "$bugNo" "$expected" "$@" | tee -a testxml.log - if test -f "./tmp/out_$bugNo.html" - then - mv "./tmp/out_$bugNo.html" "./tmp/out_$bugNo.xml" - fi -done < xmlcases.txt - http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/xmlcases.txt ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/xmlcases.txt b/DocFormats/3rdparty/external/w3c-tidy-html5/test/xmlcases.txt deleted file mode 100644 index 16bccfe..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/xmlcases.txt +++ /dev/null @@ -1,27 +0,0 @@ -427837 0 -431956 0 -432677 0 -433604 0 -433607 0 -433670 0 -434100 2 -473490 1 -480406 0 -480701 0 -500236 1 -503436 1 -537604 0 -540045 0 -542029 1 -586555 1 -616744 0 -634889 1 -640474 0 -646946 0 -1003994 2 -1004008 1 -1030944 0 -1365706 0 -1448730 0 -1510101 0 -1573338 0 http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/test/xmltest.cmd ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/test/xmltest.cmd b/DocFormats/3rdparty/external/w3c-tidy-html5/test/xmltest.cmd deleted file mode 100755 index e34e6aa..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/test/xmltest.cmd +++ /dev/null @@ -1,11 +0,0 @@ -@echo off - -REM xmltest.cmd - execute all XML test cases -REM -REM (c) 1998-2003 (W3C) MIT, ERCIM, Keio University -REM See tidy.c for the copyright notice. -REM -REM -REM - -for /F "tokens=1*" %%i in (xmlcases.txt) do call onetest.cmd %%i %%j http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/3rdparty/external/w3c-tidy-html5/tidy.css ---------------------------------------------------------------------- diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/tidy.css b/DocFormats/3rdparty/external/w3c-tidy-html5/tidy.css deleted file mode 100644 index a600db9..0000000 --- a/DocFormats/3rdparty/external/w3c-tidy-html5/tidy.css +++ /dev/null @@ -1,329 +0,0 @@ -/* 1st Style ignored by Netscape */ -td.dummy, font.dummy, .dummy, a:link.dummy, a:visited.dummy, a:active.dummy -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 16pt; -color: #336699; -text-decoration: none; -font-weight: normal -} - -body -{ -margin-left: 10%; -margin-right: 10%; -font-family: sans-serif; -background-color: #FFFFFF -} - -/* Blue TITLE */ -td.title, font.title, .title, a:link.title, a:visited.title, a:active.title -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 16pt; -color: #336699; -text-decoration: none; -font-weight: normal -} - -/* BODY TEXT */ -td.text, font.text, .text, a:link.text, a:visited.text, a:active.text -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 9pt; -color: #000000; -text-decoration: none; -font-weight: normal -} - -/* BOLD BODY TEXT */ -td.textbold, font.textbold, .textbold, a:link.textbold, a:visited.textbold, a:active.textbold -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 9pt; -color: #000000; -text-decoration: none; -font-weight: bold -} - -/* BOLD BODY TEXT LINK WITH UNDERLINE*/ -td.textboldlink, font.textboldlink, .textboldlink, a:link.textboldlink, a:visited.textboldlink, a:active.textboldlink -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 9pt; -color: #000000; -font-weight: bold -} - -/* SMALL BODY TEXT */ -td.smtext, font.smtext, .smtext, a:link.smtext, a:visited.smtext, a:active.smtext -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 8pt; -color: #000000; -text-decoration: none; -font-weight: normal -} - -/* SMALL BOLD BODY TEXT */ -td.smtextbold, font.smtextbold, .smtextbold, a:link.smtextbold, a:visited.smtextbold, a:active.smtextbold -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 8pt; -color: #000000; -text-decoration: none; -font-weight: bold -} - -/* TITLES -td.title, font.title, .title, a:link.title, a:visited.title, a:active.title -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 12pt; -color: #CC3300; -text-decoration: none; -font-weight: bold -} -*/ - -/* SUBTITLES */ -td.subtitle, font.subtitle, .subtitle, a:link.subtitle, a:visited.subtitle, a:active.subtitle -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 11pt; -color: #000000; -text-decoration: none; -font-weight: bold -} - -/* LEGAL TEXT */ -td.legal, font.legal, .legal, a:link.legal, a:visited.legal, a:active.legal -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 8pt; -color: #000000; -text-decoration: none; -font-weight: normal -} - -td.legallink, font.legallink, .legallink, a:link.legallink, a:visited.legallink, a:active.legallink -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 8pt; -color: #CC3300; -font-weight: normal -} - -/* RED TEXT */ -td.textred, font.textred, .textred, a:link.textred, a:visited.textred, a:active.textred -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -color: #CC3300; -text-decoration: none; -font-weight: normal -} - -/* RED TEXT BOLD*/ -td.textredbold, font.textredbold, .textredbold, a:link.textredbold, a:visited.textredbold, a:active.textredbold -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -color: #CC3300; -text-decoration: none; -font-weight: bold -} - -/* LINKS */ -td.link, font.link, .link, a:link.link, a:visited.link, a:active.link -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -color: #3366CC; -font-weight: normal -} - -td.tabletitlelink, font.tabletitlelink, .tabletitlelink, a:link.tabletitlelink, a:visited.tabletitlelink, a:active.tabletitlelink -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -background-color: #e9e9d3; -color: #000000; -} - -/* TABLE TITLES */ -td.tabletitle, font.tabletitle, .tabletitle, a:link.tabletitle, a:visited.tabletitle, a:active.tabletitle -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -color: #336699; -background-color: #e9e9d3; -/* text-decoration: none; */ -font-weight: bold -} - -/* TABLE CELL */ -td.cell, tr.cell, font.cell, .cell, a:link.cell, a:visited.cell, a:active.cell -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 12pt; -color: #000000; -font-weight: normal; -/* background-color: #e9e9d3 */ -background-color: #f5f5f5 -} - -/* SHADED TABLE CELL */ -td.shaded, tr.shaded, font.shaded, .shaded, a:link.shaded, a:visited.shaded, a:active.shaded -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 12pt; -color: #000000; -font-weight: normal; -background-color: #f5f5f5 -} - -/* GLOSSARY TERM */ -td.term, font.term, .term, a:link.term, a:visited.term, a:active.term -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -font-style: normal; -color: #000000; -text-decoration: none; -font-weight: normal -} - -/* ELEMENT TAGS */ -ul -{ -font-family: Arial, Helvetica, sans-serif; -font-size: 10pt; -font-style: normal; -font-weight: normal -} -li -{ -font-family: Arial, Helvetica, sans-serif; -font-size: 10pt; -font-style: normal; -font-weight: normal -} - -a:link.h1, a:visited.h1, .h1 -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 12pt; -color: #0066CC -} -a:active.h1 -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 12pt; -font-weight: bold; -color: #0066CC -} -h1 -{ -margin-left: -8%; -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 12pt; -color: #0066CC -} - -.h2 -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 11pt; -/* font-weight: bold; */ -color: #000000 -} - -h2 -{ -margin-left: -4%; -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 11pt; -/* font-weight: bold; */ -color: #000000 -} - -A:link.h3, A:visited.h3, .h3 -{ font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -color: #000000; -font-weight: bold -} - -A:active.h3 -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -color: #000000; -font-weight: bold -} - -h3 -{ -margin-left: -4%; -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -font-weight: bold; -color: #000000 -} - -h4 -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 9pt; -font-weight: bold; -color: #000000 -} - -.code, A:active.code, A:link.code, A:visited.code -{ -font-family: "Courier New", Courier, monospace; -} - -.abstract -{ - font-style : italic; -} - -p -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -font-style: normal -} - -td -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -font-style: normal -} - -/* LINKS */ -a:link, a:active -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -color: #3366CC; -font-weight: normal -} - -a:visited -{ -font-family: Arial, Helvetica, "Trebuchet MS", sans-serif; -font-size: 10pt; -color: #333366; -font-weight: normal -} - -code { - /* use browser/user default for `font-family` */ - font-weight: bold; - color: brown; - background: transparent; -} http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/DocFormats/CMakeLists.txt b/DocFormats/CMakeLists.txt index 330159f..9d7ce6a 100644 --- a/DocFormats/CMakeLists.txt +++ b/DocFormats/CMakeLists.txt @@ -10,9 +10,9 @@ add_subdirectory(filters/latex) add_subdirectory(filters/odf) include_directories(/usr/include/libxml2) -include_directories(../DocFormats/3rdparty/external/w3c-tidy-html5/include) -include_directories(../DocFormats/3rdparty/external/w3c-tidy-html5/src) -include_directories(../DocFormats/3rdparty/external/minizip) +include_directories(../DocFormats/platform/3rdparty/w3c-tidy-html5/include) +include_directories(../DocFormats/platform/3rdparty/w3c-tidy-html5/src) +include_directories(../DocFormats/platform/3rdparty/minizip) include_directories(SYSTEM ${INCLUDE_DIRS}) include_directories(SYSTEM ./api/headers) http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/core/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/DocFormats/core/CMakeLists.txt b/DocFormats/core/CMakeLists.txt index b026cac..55b8fe8 100644 --- a/DocFormats/core/CMakeLists.txt +++ b/DocFormats/core/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(/usr/include/libxml2) -include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/include) -include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/src) -include_directories(../../DocFormats/3rdparty/external/minizip) +include_directories(../../DocFormats/platform/3rdparty/w3c-tidy-html5/include) +include_directories(../../DocFormats/platform/3rdparty//w3c-tidy-html5/src) +include_directories(../../DocFormats/platform/3rdparty/minizip) include_directories(SYSTEM ${INCLUDE_DIRS}) include_directories(SYSTEM ../api/headers) http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/platform/3rdparty/minizip/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/DocFormats/platform/3rdparty/minizip/CMakeLists.txt b/DocFormats/platform/3rdparty/minizip/CMakeLists.txt new file mode 100644 index 0000000..44d4076 --- /dev/null +++ b/DocFormats/platform/3rdparty/minizip/CMakeLists.txt @@ -0,0 +1,5 @@ +cmake_minimum_required(VERSION 2.8) +include_directories(SYSTEM ${INCLUDE_DIRS}) +include_directories() +include_directories(.) +add_library(minizip ioapi.c unzip.c zip.c) http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/platform/3rdparty/minizip/crypt.h ---------------------------------------------------------------------- diff --git a/DocFormats/platform/3rdparty/minizip/crypt.h b/DocFormats/platform/3rdparty/minizip/crypt.h new file mode 100644 index 0000000..2d69da4 --- /dev/null +++ b/DocFormats/platform/3rdparty/minizip/crypt.h @@ -0,0 +1,132 @@ +/* crypt.h -- base code for crypt/uncrypt ZIPfile + + + Version 1.01h, December 28th, 2009 + + Copyright (C) 1998-2009 Gilles Vollant + + This code is a modified version of crypting code in Infozip distribution + + The encryption/decryption parts of this source code (as opposed to the + non-echoing password parts) were originally written in Europe. The + whole source package can be freely distributed, including from the USA. + (Prior to January 2000, re-export from the US was a violation of US law.) + + This encryption code is a direct transcription of the algorithm from + Roger Schlafly, described by Phil Katz in the file appnote.txt. This + file (appnote.txt) is distributed with the PKZIP program (even in the + version without encryption capabilities). + + If you don't need crypting in your application, just define symbols + NOCRYPT and NOUNCRYPT. + + This code support the "Traditional PKWARE Encryption". + + The new AES encryption added on Zip format by Winzip (see the page + http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong + Encryption is not supported. +*/ + +#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8)) + +/*********************************************************************** + * Return the next byte in the pseudo-random sequence + */ +static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) +{ + unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an + * unpredictable manner on 16-bit systems; not a problem + * with any known compiler so far, though */ + + temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; + return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); +} + +/*********************************************************************** + * Update the encryption keys with the next byte of plain text + */ +static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c) +{ + (*(pkeys+0)) = CRC32((*(pkeys+0)), c); + (*(pkeys+1)) += (*(pkeys+0)) & 0xff; + (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1; + { + register int keyshift = (int)((*(pkeys+1)) >> 24); + (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift); + } + return c; +} + + +/*********************************************************************** + * Initialize the encryption keys and the random header according to + * the given password. + */ +static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab) +{ + *(pkeys+0) = 305419896L; + *(pkeys+1) = 591751049L; + *(pkeys+2) = 878082192L; + while (*passwd != '\0') { + update_keys(pkeys,pcrc_32_tab,(int)*passwd); + passwd++; + } +} + +#define zdecode(pkeys,pcrc_32_tab,c) \ + (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab))) + +#define zencode(pkeys,pcrc_32_tab,c,t) \ + (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c)) + +#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED + +#define RAND_HEAD_LEN 12 + /* "last resort" source for second part of crypt seed pattern */ +# ifndef ZCR_SEED2 +# define ZCR_SEED2 3141592654UL /* use PI as default pattern */ +# endif + +static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting) + const char *passwd; /* password string */ + unsigned char *buf; /* where to write header */ + int bufSize; + unsigned long* pkeys; + const unsigned long* pcrc_32_tab; + unsigned long crcForCrypting; +{ + int n; /* index in random header */ + int t; /* temporary */ + int c; /* random byte */ + unsigned char header[RAND_HEAD_LEN-2]; /* random header */ + static unsigned calls = 0; /* ensure different random header each time */ + + if (bufSize> 7) & 0xff; + header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t); + } + /* Encrypt random header (last two bytes is high word of crc) */ + init_keys(passwd, pkeys, pcrc_32_tab); + for (n = 0; n < RAND_HEAD_LEN-2; n++) + { + buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t); + } + buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t); + buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t); + return n; +} + +#endif http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/platform/3rdparty/minizip/ioapi.c ---------------------------------------------------------------------- diff --git a/DocFormats/platform/3rdparty/minizip/ioapi.c b/DocFormats/platform/3rdparty/minizip/ioapi.c new file mode 100644 index 0000000..51a9058 --- /dev/null +++ b/DocFormats/platform/3rdparty/minizip/ioapi.c @@ -0,0 +1,178 @@ +/* ioapi.c -- IO base function header for compress/uncompress .zip + files using zlib + zip or unzip API + + Version 1.01h, December 28th, 2009 + + Copyright (C) 1998-2009 Gilles Vollant +*/ + +#include +#include +#include + +#include "zlib.h" +#include "ioapi.h" + + + +/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */ + +#ifndef SEEK_CUR +#define SEEK_CUR 1 +#endif + +#ifndef SEEK_END +#define SEEK_END 2 +#endif + +#ifndef SEEK_SET +#define SEEK_SET 0 +#endif + +voidpf ZCALLBACK fopen_file_func OF(( + voidpf opaque, + const char* filename, + int mode)); + +uLong ZCALLBACK fread_file_func OF(( + voidpf opaque, + voidpf stream, + void* buf, + uLong size)); + +uLong ZCALLBACK fwrite_file_func OF(( + voidpf opaque, + voidpf stream, + const void* buf, + uLong size)); + +long ZCALLBACK ftell_file_func OF(( + voidpf opaque, + voidpf stream)); + +long ZCALLBACK fseek_file_func OF(( + voidpf opaque, + voidpf stream, + uLong offset, + int origin)); + +int ZCALLBACK fclose_file_func OF(( + voidpf opaque, + voidpf stream)); + +int ZCALLBACK ferror_file_func OF(( + voidpf opaque, + voidpf stream)); + + +voidpf ZCALLBACK fopen_file_func (opaque, filename, mode) + voidpf opaque; + const char* filename; + int mode; +{ + FILE* file = NULL; + const char* mode_fopen = NULL; + if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) + mode_fopen = "rb"; + else + if (mode & ZLIB_FILEFUNC_MODE_EXISTING) + mode_fopen = "r+b"; + else + if (mode & ZLIB_FILEFUNC_MODE_CREATE) + mode_fopen = "wb"; + + if ((filename!=NULL) && (mode_fopen != NULL)) + file = fopen(filename, mode_fopen); + return file; +} + + +uLong ZCALLBACK fread_file_func (opaque, stream, buf, size) + voidpf opaque; + voidpf stream; + void* buf; + uLong size; +{ + uLong ret; + ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); + return ret; +} + + +uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size) + voidpf opaque; + voidpf stream; + const void* buf; + uLong size; +{ + uLong ret; + ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); + return ret; +} + +long ZCALLBACK ftell_file_func (opaque, stream) + voidpf opaque; + voidpf stream; +{ + long ret; + ret = ftell((FILE *)stream); + return ret; +} + +long ZCALLBACK fseek_file_func (opaque, stream, offset, origin) + voidpf opaque; + voidpf stream; + uLong offset; + int origin; +{ + int fseek_origin=0; + long ret; + switch (origin) + { + case ZLIB_FILEFUNC_SEEK_CUR : + fseek_origin = SEEK_CUR; + break; + case ZLIB_FILEFUNC_SEEK_END : + fseek_origin = SEEK_END; + break; + case ZLIB_FILEFUNC_SEEK_SET : + fseek_origin = SEEK_SET; + break; + default: return -1; + } + ret = 0; + if (fseek((FILE *)stream, offset, fseek_origin) != 0) + ret = -1; + return ret; +} + +int ZCALLBACK fclose_file_func (opaque, stream) + voidpf opaque; + voidpf stream; +{ + int ret; + ret = fclose((FILE *)stream); + return ret; +} + +int ZCALLBACK ferror_file_func (opaque, stream) + voidpf opaque; + voidpf stream; +{ + int ret; + ret = ferror((FILE *)stream); + return ret; +} + +void fill_fopen_filefunc (pzlib_filefunc_def) + zlib_filefunc_def* pzlib_filefunc_def; +{ + pzlib_filefunc_def->zopen_file = fopen_file_func; + pzlib_filefunc_def->zread_file = fread_file_func; + pzlib_filefunc_def->zwrite_file = fwrite_file_func; + pzlib_filefunc_def->ztell_file = ftell_file_func; + pzlib_filefunc_def->zseek_file = fseek_file_func; + pzlib_filefunc_def->zclose_file = fclose_file_func; + pzlib_filefunc_def->zerror_file = ferror_file_func; + pzlib_filefunc_def->opaque = NULL; +} http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ac70cb0e/DocFormats/platform/3rdparty/minizip/ioapi.h ---------------------------------------------------------------------- diff --git a/DocFormats/platform/3rdparty/minizip/ioapi.h b/DocFormats/platform/3rdparty/minizip/ioapi.h new file mode 100644 index 0000000..1dba776 --- /dev/null +++ b/DocFormats/platform/3rdparty/minizip/ioapi.h @@ -0,0 +1,75 @@ +/* ioapi.h -- IO base function header for compress/uncompress .zip + files using zlib + zip or unzip API + + Version 1.01h, December 28th, 2009 + + Copyright (C) 1998-2009 Gilles Vollant +*/ + +#ifndef _ZLIBIOAPI_H +#define _ZLIBIOAPI_H + + +#define ZLIB_FILEFUNC_SEEK_CUR (1) +#define ZLIB_FILEFUNC_SEEK_END (2) +#define ZLIB_FILEFUNC_SEEK_SET (0) + +#define ZLIB_FILEFUNC_MODE_READ (1) +#define ZLIB_FILEFUNC_MODE_WRITE (2) +#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3) + +#define ZLIB_FILEFUNC_MODE_EXISTING (4) +#define ZLIB_FILEFUNC_MODE_CREATE (8) + + +#ifndef ZCALLBACK + +#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK) +#define ZCALLBACK CALLBACK +#else +#define ZCALLBACK +#endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); +typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); +typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); +typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream)); +typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin)); +typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream)); +typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream)); + +typedef struct zlib_filefunc_def_s +{ + open_file_func zopen_file; + read_file_func zread_file; + write_file_func zwrite_file; + tell_file_func ztell_file; + seek_file_func zseek_file; + close_file_func zclose_file; + testerror_file_func zerror_file; + voidpf opaque; +} zlib_filefunc_def; + + + +void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); + +#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size)) +#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size)) +#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream)) +#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode)) +#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream)) +#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream)) + + +#ifdef __cplusplus +} +#endif + +#endif +